Update translations from Translation Project

146 files changed, 26827 insertions, 53810 deletions

diff --git a/gettext-runtime/po/LINGUAS b/gettext-runtime/po/LINGUAS
index 2fec8f35d..0dc3f9c22 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 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
+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/be.po b/gettext-runtime/po/be.po
index f84a79896..c7d8eec17 100644
--- a/gettext-runtime/po/be.po
+++ b/gettext-runtime/po/be.po
@@ -5,200 +5,265 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.5\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2002-08-06 16:01+0200\n"
 "PO-Revision-Date: 2002-09-04 18:51+0300\n"
 "Last-Translator: Ales Nyakhaychyk <i18n@infonet.by>\n"
 "Language-Team: Belarusian <i18n@tut.by>\n"
-"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: gnulib-lib/closeout.c:66
-msgid "write error"
-msgstr ""
+#: 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\" для запісу"
 
-#: gnulib-lib/error.c:188
+#: 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\""
+
+#: lib/error.c:116
 msgid "Unknown system error"
 msgstr "Невядомая сістэмная памылка"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: 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 падпрацэс спынены з-за памылкі"
+
+#: lib/getopt.c:691
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: выбар `%s' неадназначны\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: lib/getopt.c:716
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: выбар `--%s' не патрабуе аргумэнтаў\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: lib/getopt.c:721
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: выбар `%c%s' не патрабуе аргумэнтаў\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: lib/getopt.c:739 lib/getopt.c:912
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: выбар `%s' патрабуе аргумэнт\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: lib/getopt.c:768
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: нераспазнаны выбар `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
+#: lib/getopt.c:772
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: нераспазнаны выбар `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
+#: 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"
 msgstr "%s: нерэчаісны выбар -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
+#: lib/getopt.c:831 lib/getopt.c:961
+#, 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"
+#: lib/getopt.c:878
+#, 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"
+#: lib/getopt.c:896
+#, 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"
+#: lib/javacomp.c:462
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "Java кампілятар ня знойдзен, паспрабуйце ўсталяваць gcj ці $JAVAC"
 
-#: gnulib-lib/xmalloc.c:37
-#, c-format
+#: 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 "памяць вычарпана"
 
-#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
-#, 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 ""
+#: 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 "не магчыма стварыць канвеэр"
 
-#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
+#: lib/wait-process.c:110
 #, c-format
-msgid "Written by %s.\n"
-msgstr "Аўтар %s.\n"
+msgid "%s subprocess"
+msgstr "%s падпрацэс"
 
-#. This is a proper name. See the gettext manual, section Names.
-#: src/envsubst.c:118
-msgid "Bruno Haible"
-msgstr ""
+#: lib/wait-process.c:124
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "%s падрацэс атрымаў фатальны сігнал %d"
 
-#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
+#: src/format-c.c:760 src/format-python.c:506
 #, c-format
-msgid "too many arguments"
-msgstr "вельмі шмат аргумэнтаў"
+msgid "number of format specifications in 'msgid' and '%s' does not match"
+msgstr "колькасьць спэцыфікацый фармату ў 'msgid' і '%s' не супадае"
 
-#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
+#: 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
 #, c-format
-msgid "missing arguments"
-msgstr "прапушчаны аргумэнты"
+msgid "format specifications in 'msgid' and '%s' for argument %u are not the same"
+msgstr "спэцыфікатары фармату ў 'msgid' і '%s' для аргумэнта %u неаднолькавыя"
 
-#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Паспрабуйце \"%s --help\" для больш падрабязных зьвестак.\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'"
 
-#: src/envsubst.c:176
-#, fuzzy, c-format, no-wrap
-msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
-msgstr "Выкарыстаньне: %s [ВЫБАР] [ФАЙЛ]...\n"
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
+#, c-format
+msgid "a format specification for argument %u doesn't exist in '%s'"
+msgstr "спэцыфікацыя фармату для аргумэнта %u ня йснуе ў '%s'"
 
-#: src/envsubst.c:181
-#, c-format, no-wrap
-msgid "Substitutes the values of environment variables.\n"
-msgstr ""
+#: src/format-java.c:660
+#, c-format
+msgid "a format specification for argument {%u}, as in '%s', doesn't exist in 'msgid'"
+msgstr "спэцыфікацыя фармату для аргумэнта {%u}, як у '%s', не йснуе ў 'msgid'"
 
-#: src/envsubst.c:185
-#, c-format, no-wrap
-msgid "Operation mode:\n"
-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:188
-#, c-format, no-wrap
-msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-msgstr ""
+#: 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:192
-#, c-format, no-wrap
-msgid "Informative output:\n"
-msgstr ""
+#: src/format-lisp.c:3381
+#, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
+msgstr "спэцыфікацыі фармата ў 'msgid' і '%s' нераўназначныя"
 
-#: src/envsubst.c:195
-#, c-format, no-wrap
-msgid "  -h, --help                  display this help and exit\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:198
-#, fuzzy, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\n"
+#: src/format-python.c:397
+#, c-format
+msgid "format specifications in 'msgid' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
-"Інфармацыйны вывад:\n"
-"  -h, --help                  адлюстроўвае дапамогу й выходзіць\n"
-"  -V, --version               выводзіць зьвесткі аб версіі й выходзіць\n"
 
-#: src/envsubst.c:202
-#, 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"
+#: src/format-python.c:409
+#, c-format
+msgid "format specifications in 'msgid' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 
-#: src/envsubst.c:211
+#: 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/format-python.c:452
+#, c-format
+msgid "a format specification for argument '%s' doesn't exist in '%s'"
+msgstr "спцэыфікацыя фармату для аргумэнта \"%s\" ня йснуе ў \"%s\""
+
+#: 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/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
 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"
+"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 ""
-
-#. 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
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Паведамляйце аб памылках на адрас <bug-gnu-gettext@gnu.org>.\n"
-
-#: src/envsubst.c:442
+"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 "error while reading \"%s\""
-msgstr "памылка ў час чытаньня \"%s\""
+msgid "Written by %s.\n"
+msgstr "Аўтар %s.\n"
 
-#: src/envsubst.c:443
-msgid "standard input"
-msgstr "стандартны ўвод"
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
+msgid "too many arguments"
+msgstr "вельмі шмат аргумэнтаў"
 
-#. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:139 src/ngettext.c:129
-msgid "Ulrich Drepper"
-msgstr ""
+#: src/gettext.c:168 src/ngettext.c:155
+msgid "missing arguments"
+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"
 
-#: src/gettext.c:243
+#: src/gettext.c:245
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -207,13 +272,13 @@ msgstr ""
 "Выкарыстаньне: %s [ВЫБАР] [[TEXTDOMAIN] MSGID]\n"
 "        ці:    %s [ВЫБАР] -s [MSGID]...\n"
 
-#: src/gettext.c:249
-#, c-format, no-wrap
+#: src/gettext.c:251
+#, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "Адлюстроўвае пераклады на родную мову тэкставых паведамленьняў.\n"
 
-#: src/gettext.c:253
-#, c-format, no-wrap
+#: src/gettext.c:255
+#, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
 "  -e                        enable expansion of some escape sequences\n"
@@ -233,14 +298,14 @@ msgstr ""
 "  [TEXTDOMAIN] MSGID        вяртае перакладзеныя паведамленьні суадносна\n"
 "                            MSGID з TEXTDOMAIN\n"
 
-#: src/gettext.c:264
-#, fuzzy, c-format, no-wrap
+#: src/gettext.c:266
+#, 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"
@@ -254,13 +319,1624 @@ msgstr ""
 "замест існуючых паведамленьняў знаходзіць у азначаным каталёгу перакладзеныя.\n"
 "Стандартная дырэкторыя для пошуку: %s\n"
 
-#: src/ngettext.c:212
+#: 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
+#, 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 узаема выключны"
+
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
+#, 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"
+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: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"
+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
+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"
+
+#: 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
+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"
+
+#: 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
+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/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
+#, 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"
+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 "...але гэта вызначэньне падобна"
+
+#: 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 "увага: гэта паведамленьне не выкарыстоўваецца"
+
+#: 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"
+
+#: 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"
+
+#: 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"
+
+#: 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"
+
+#: src/msgexec.c:180
+msgid "missing command name"
+msgstr "прапушчана назва каманды"
+
+#: src/msgexec.c:228
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
+msgstr "Выкарыстаньне: %s [ВЫБАР] ЗАГАД [ВЫБАР_ЗАГАДА]\n"
+
+#: 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"
+
+#: 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"
+
+#: 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"
+
+#: src/msgexec.c:313
+msgid "write to stdout failed"
+msgstr "памылка запісу ў stdout"
+
+#: src/msgexec.c:337 src/msgfilter.c:610
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "памылка запісу ў падпрацэс %s"
+
+#: src/msgfilter.c:268
+msgid "missing filter name"
+msgstr "прапушчана назва фільтра"
+
+#: src/msgfilter.c:292
+msgid "at least one sed script must be specified"
+msgstr "па меншай меры адзін sed-скрыпт павінен быць зададзены"
+
+#: src/msgfilter.c:356
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
+msgstr "Выкарыстаньне: %s [ВЫБАР] ФІЛЬТР [ВЫБАРЫ_ФІЛЬТРА]\n"
+
+#: src/msgfilter.c:361
+#, no-wrap
+msgid "Applies a filter to all translations of a translation catalog.\n"
+msgstr "Прымае фільтар да ўсіх перакладаў зь каталёгу перакладаў.\n"
+
+#: 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"
+
+#: 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"
+
+#: 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"
+
+#: src/msgfilter.c:562
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "немагчыма ўсталяваць неблакіруючы ўвод-вывад у падпрацэс %s"
+
+#: src/msgfilter.c:590
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "памылка ўзаемадзеяньня з падпрацэсам %s"
+
+#: src/msgfilter.c:641
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "памылка чытаньня з падпрацэса %s"
+
+#: src/msgfilter.c:657
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
+
+#: src/msgfmt.c:318
+#, c-format
+msgid "the argument to %s should be a single punctuation character"
+msgstr "аргумэнт %s павінен быць адзіночным знакам прыпынку"
+
+#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248
+#, c-format
+msgid "%s requires a \"-d directory\" specification"
+msgstr "%s патрабуе \"-d дырэкторыя\" спэцыфікацыі"
+
+#: src/msgfmt.c:400 src/msgunfmt.c:241
+#, 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:422 src/msgfmt.c:428
+#, c-format
+msgid "%s is only valid with %s or %s"
+msgstr "%s рэчаісны толькі з %s ці %s"
+
+#: src/msgfmt.c:501
+#, c-format
+msgid "%d translated message"
+msgid_plural "%d translated messages"
+msgstr[0] "%d паведамленьне перакладзена"
+msgstr[1] "%d паведамленьні перакладзена"
+msgstr[2] "%d паведамленьняў перакладзена"
+
+#: 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 недакладных перакладаў"
+
+#: 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 неперакладзеных паведамленьняў"
+
+#: 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"
+
+#: 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"
+
+#: 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"
+
+#: 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"
+
+#: 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"
+
+#: 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"
+
+#: 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"
+
+#: 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"
+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:967 src/msgfmt.c:982
+#, c-format
+msgid "nplurals = %lu..."
+msgstr "nplurals = %lu..."
+
+#: 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 формаў множнага ліку"
+
+#: 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 формаў множнага ліку"
+
+#: src/msgfmt.c:1015
+#, c-format
+msgid "Try using the following, valid for %s:\n"
+msgstr "Паспрабуйце выкарыстоўваць наступнае, рэчаіснае для %s\n"
+
+#: src/msgfmt.c:1028
+msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+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:1076
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "`msgid' і `msgstr[%u]' не пачынаюцца разам з \"\\n\""
+
+#: src/msgfmt.c:1088
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+msgstr "`msgid' і `msgstr' не пачынаюцца разам з '\\n'"
+
+#: src/msgfmt.c:1105
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "`msgid' і `msgid_plural' не заканчваюцца разам на '\\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'"
+
+#: src/msgfmt.c:1139
+msgid "plural handling is a GNU gettext extension"
+msgstr "апрацоўка множнага ліку - гэта пашырэньне GNU gettext"
+
+#: src/msgfmt.c:1204
+#, c-format
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
+msgstr "'%s' - гэта нерэчаісны %s фармат радку, у адрозьненьне ад 'msgid'"
+
+#: src/msgfmt.c:1242
+#, c-format
+msgid "msgstr lacks the keyboard accelerator mark '%c'"
+msgstr ""
+
+#: src/msgfmt.c:1250
+#, c-format
+msgid "msgstr has too many keyboard accelerator marks '%c'"
+msgstr ""
+
+#: src/msgfmt.c:1285
+#, c-format
+msgid "headerfield `%s' missing in header\n"
+msgstr "поле загалоку `%s' прапушчана ў загалоўку\n"
+
+#: src/msgfmt.c:1289
+#, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "поле загалоку `%s' павінна пачынацца на пачатку радка\n"
+
+#: src/msgfmt.c:1300
+msgid "some header fields still have the initial default value\n"
+msgstr "некаторыя палі загалока ўсё яшчэ маюць пачатковае значэньне\n"
+
+#: src/msgfmt.c:1312
+#, c-format
+msgid "field `%s' still has initial default value\n"
+msgstr "поле `%s' усё яшчэ мае пачатковае значэньне\n"
+
+#: src/msgfmt.c:1354
+msgid "warning: PO file header missing or invalid\n"
+msgstr "увага: загаловак PO-файла прапушчан ці нерэчаісны\n"
+
+#: src/msgfmt.c:1357
+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
+#, c-format
+msgid "domain name \"%s\" not suitable as file name"
+msgstr "даменная назва \"%s\" не падыходзіць у якасці назвы файла"
+
+#: src/msgfmt.c:1399
+#, 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"
+msgstr "дырэктыва `domain %s' ігнаруецца"
+
+#: src/msgfmt.c:1484
+msgid "empty `msgstr' entry ignored"
+msgstr "парожняе уваходжаньне `msgstr' прапушчана"
+
+#: src/msgfmt.c:1485
+msgid "fuzzy `msgstr' entry ignored"
+msgstr "недакладнае уваходжаньне `msgstr' прапушчана"
+
+#: src/msgfmt.c:1554
+#, c-format
+msgid "%s: warning: source file contains fuzzy translation"
+msgstr "%s: увага: ізыходны файл змяшчае недакладны пераклад"
+
+#: src/msggrep.c:390
+#, c-format
+msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
+msgstr "выбар '%c' не можа быць выкарыстаны раней чым 'K' ці 'T' будуць зададзены"
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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"
+
+#: 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"
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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"
+
+#: src/msginit.c:445 src/msginit.c:450
+msgid "error reading current directory"
+msgstr "памылка чытаньня бягучай дырэкторыі"
+
+#: 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"
+
+#: 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
+#, c-format
+msgid "%s subprocess failed with exit code %d"
+msgstr ""
+
+#: 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 ""
+
+#. 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"
+
+#: 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 ""
+
+#: 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\""
+
+#: src/msgl-cat.c:209
+#, c-format
+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"
+msgstr ""
+
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
+#, 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
+msgid "warning: "
+msgstr "увага: "
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: src/msgl-charset.c:100
+#, c-format
+msgid "- Set LC_ALL to a locale with encoding %s.\n"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
+msgid "conversion failure"
+msgstr "памылка пераўтварэньня"
+
+#: src/msgl-iconv.c:351
+msgid "input file doesn't contain a header entry with a charset specification"
+msgstr "уваходзячы файл не змяшчае загаловачнага запісу аб наборы сімвалаў"
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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"
+
+#: src/msgmerge.c:937
+msgid "this message should define plural forms"
+msgstr "гэтае паведамленьне павінна вызначаць хормы множнага ліка"
+
+#: src/msgmerge.c:960
+msgid "this message should not define plural forms"
+msgstr "гэтае паведамленьне не павінна вызначаць хормы множнага ліка"
+
+#: 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"
+
+#: src/msgmerge.c:1099
+msgid " done.\n"
+msgstr " зроблена.\n"
+
+#: src/msgunfmt.c:226 src/msgunfmt.c:235
+#, c-format
+msgid "%s and explicit file names are mutually exclusive"
+msgstr "%s і яўная назва файла ўзаема выключальны"
+
+#: src/msgunfmt.c:319
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] [FILE]...\n"
+msgstr "Выкарыстаньне: %s [ВЫБАР] [ФАЙЛ]...\n"
+
+#: src/msgunfmt.c:324
+#, no-wrap
+msgid "Convert binary message catalog to Uniforum style .po file.\n"
+msgstr "Пераўтварае дваічны каталёг паведамленьняў у Uniforum .po файл.\n"
+
+#: 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"
+
+#: 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"
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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:217
-#, c-format, no-wrap
+#: src/ngettext.c:220
+#, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
@@ -268,8 +1944,8 @@ msgstr ""
 "Адлюстроўвае пераклады тэкставых паведамленьняў на родную мову, чыя\n"
 "граматычная хорма патрабуе ліку (множнага ці адзіночнага).\n"
 
-#: src/ngettext.c:222
-#, c-format, no-wrap
+#: src/ngettext.c:225
+#, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
 "  -e                        enable expansion of some escape sequences\n"
@@ -281,7 +1957,7 @@ msgid ""
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
 
-#: src/ngettext.c:233
+#: src/ngettext.c:236
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -296,1603 +1972,412 @@ msgstr ""
 "асяроддзя TEXTDOMAINDIR.\n"
 "Стандартная дырэкторыя для пошуку: %s\n"
 
-#~ msgid "invalid argument `%s' for `%s'"
-#~ msgstr "нерэчаісны аргумэнт `%s' для `%s'"
+#: 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: увага: "
+
+#: 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"
+
+#: 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
+#, 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"
+
+#: 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"
+
+#: src/po-charset.c:298 src/po-charset.c:323
+#, c-format
+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"
+
+#: po-gram-gen.y:92
+msgid "inconsistent use of #~"
+msgstr "несумяшчальнае ўжываньне #~"
 
-#~ msgid "ambiguous argument `%s' for `%s'"
-#~ msgstr "неадназначны аргумэнт `%s' для `%s'"
+#: po-gram-gen.y:182
+msgid "missing `msgstr[]' section"
+msgstr "прапушчана секцыя \"msgstr[]\""
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "Рэчаісныя аргумэнты:"
+#: po-gram-gen.y:190
+msgid "missing `msgid_plural' section"
+msgstr "прапушчана секцыя \"msgid_plural\""
 
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "памылка ў час чытаньня файла \"%s\""
+#: po-gram-gen.y:197
+msgid "missing `msgstr' section"
+msgstr "прапушчана секцыя \"msgstr\""
 
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "немагчыма адчыніць дубліруючы файл \"%s\" для запісу"
+#: po-gram-gen.y:242
+msgid "first plural form has nonzero index"
+msgstr "першая форма ліку мае ненулявы індэкс"
 
-#~ msgid "error reading \"%s\""
-#~ msgstr "памылка чытаньня \"%s\""
+#: po-gram-gen.y:244
+msgid "plural form has wrong index"
+msgstr "формы множнага ліку маюць дрэнныі індэкс"
 
-#~ msgid "error writing \"%s\""
-#~ msgstr "памылка запісу файла \"%s\""
+#: 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 "error after reading \"%s\""
-#~ msgstr "памылка пасля чытаньня \"%s\""
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
+msgid "invalid multibyte sequence"
+msgstr "нерэчаісная шматсімвальная паслядоўнасць"
 
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s падпрацэс спынены з-за памылкі"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: несапраўдны выбар -- %c\n"
-
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr "Java кампілятар ня знойдзен, паспрабуйце ўсталяваць gcj ці $JAVAC"
-
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr ""
-#~ "Віртуальная Java-машына ня знойдзена, паспрабуйце ўсталяваць gij ці $JAVA"
-
-#~ msgid "cannot create pipe"
-#~ msgstr "не магчыма стварыць канвеэр"
-
-#~ msgid "%s subprocess"
-#~ msgstr "%s падпрацэс"
-
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "%s падрацэс атрымаў фатальны сігнал %d"
+#: src/po-lex.c:543
+msgid "incomplete multibyte sequence at end of file"
+msgstr "няпоўная шматбайтная пасьлядоўнасьць на прыканцы файла"
 
-#~ msgid "number of format specifications in 'msgid' and '%s' does not match"
-#~ msgstr "колькасьць спэцыфікацый фармату ў 'msgid' і '%s' не супадае"
-
-#~ msgid ""
-#~ "format specifications in 'msgid' and '%s' for argument %u are not the same"
-#~ msgstr ""
-#~ "спэцыфікатары фармату ў 'msgid' і '%s' для аргумэнта %u неаднолькавыя"
-
-#~ msgid ""
-#~ "a format specification for argument %u, as in '%s', doesn't exist in "
-#~ "'msgid'"
-#~ msgstr ""
-#~ "спэцыфікацыя фармату для аргумэнта %u, як у '%s', ня йснуе ў 'msgid'"
-
-#~ msgid "a format specification for argument %u doesn't exist in '%s'"
-#~ msgstr "спэцыфікацыя фармату для аргумэнта %u ня йснуе ў '%s'"
-
-#~ msgid ""
-#~ "a format specification for argument {%u}, as in '%s', doesn't exist in "
-#~ "'msgid'"
-#~ msgstr ""
-#~ "спэцыфікацыя фармату для аргумэнта {%u}, як у '%s', не йснуе ў 'msgid'"
-
-#~ msgid "a format specification for argument {%u} doesn't exist in '%s'"
-#~ msgstr "спэцыфікацыя фармату для аргумэнта {%u} не йснуе ў '%s'"
-
-#~ msgid ""
-#~ "format specifications in 'msgid' and '%s' for argument {%u} are not the "
-#~ "same"
-#~ msgstr ""
-#~ "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта {%u} не аднолькавыя"
-
-#~ msgid "format specifications in 'msgid' and '%s' are not equivalent"
-#~ msgstr "спэцыфікацыі фармата ў 'msgid' і '%s' нераўназначныя"
-
-#~ msgid "format specifications in '%s' are not a subset of those in 'msgid'"
-#~ msgstr ""
-#~ "спэцыфікацыі фармата ў '%s' не з'яўляюцца падмноствам спэцыфікацый у "
-#~ "'msgid'"
-
-#~ msgid ""
-#~ "a format specification for argument '%s', as in '%s', doesn't exist in "
-#~ "'msgid'"
-#~ msgstr ""
-#~ "спэцыфікацыі фармату для аргумэнту '%s', як у '%s', не існуюць у'msgid'"
-
-#~ msgid "a format specification for argument '%s' doesn't exist in '%s'"
-#~ msgstr "спцэыфікацыя фармату для аргумэнта \"%s\" ня йснуе ў \"%s\""
-
-#~ msgid ""
-#~ "format specifications in 'msgid' and '%s' for argument '%s' are not the "
-#~ "same"
-#~ msgstr ""
-#~ "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта '%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"
-#~ msgstr ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "Гэта вольнае праграмнае забесьпячэньне; глядзіце зыходны тэкст для\n"
-#~ "пагадненьня аб распаўсюджваньні. Ня йснуе НІЯКАЙ гарантыі; нават аб\n"
-#~ "магчымасьці выкарыстньня зь якой небудзь мэтай.\n"
-
-#~ msgid "Usage: %s [OPTION]\n"
-#~ msgstr "Выкарыстаньне: %s [ВЫБАР]\n"
-
-#~ msgid "Print the machine's hostname.\n"
-#~ msgstr "Друкуе назву вузла.\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"
-
-#~ msgid "could not get host name"
-#~ msgstr "немагчыма атрымаць назву вузла"
-
-#~ msgid "at most one input file allowed"
-#~ msgstr "па большай частцы адзін уваходзячы файл зацьверджан"
-
-#~ msgid "%s and %s are mutually exclusive"
-#~ msgstr "%s і %s узаема выключны"
-
-#~ msgid "Usage: %s [OPTION] [INPUTFILE]\n"
-#~ msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]\n"
-
-#~ msgid ""
-#~ "Filters the messages of a translation catalog according to their "
-#~ "attributes,\n"
-#~ "and manipulates the attributes.\n"
-#~ msgstr ""
-#~ "Фільтруе паведамленьні каталёга перакладаў суадносна іх атрыбутам, а так "
-#~ "сама,\n"
-#~ "узьдзейнічае на іх\n"
-
-#~ msgid ""
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ msgstr ""
-#~ "Аргумэнты, абавязковыя для доўгіх выбараў, абавязковы й для кароткіх.\n"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ msgid "impossible selection criteria specified (%d < n < %d)"
-#~ msgstr "зададзен немагчымы крытэрый выбару (%d < n < %d)"
-
-#~ msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
-#~ msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]...\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 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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 уводзячых файла"
-
-#~ msgid "Usage: %s [OPTION] def.po ref.pot\n"
-#~ msgstr "Выкарыстаньне: %s [ВЫБАР] def.po ref.pot\n"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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 "...але гэта вызначэньне падобна"
-
-#~ msgid "this message is used but not defined in %s"
-#~ msgstr "гэта паведамленьне выкарыстоўваецца, але не вызначана ў %s"
-
-#~ msgid "warning: this message is not used"
-#~ msgstr "увага: гэта паведамленьне не выкарыстоўваецца"
-
-#~ 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 "неабходна задаць не менш двух файлаў"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ msgid "Converts a translation catalog to a different character encoding.\n"
-#~ msgstr "Пераўтварае каталёг з перакладамі ў розныя сімвальныя кадзіроўкі.\n"
-
-#~ 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 ""
-#~ "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 "патрабуецца менавіта адзін уваходзячы файл"
-
-#~ msgid "Usage: %s [OPTION] INPUTFILE\n"
-#~ msgstr "Выкарыстаньне: %s [ВЫБАР] УВАХОДЗЯЧЫ_ФАЙЛ\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"
-#~ msgstr ""
-#~ "Стварае каталёг ангельскіх перакладаў.  Файл уводу - гэта апошні "
-#~ "створаны\n"
-#~ "ангельскі PO файл, ці шаблён PO файлу (звычайна створаны xgettext).\n"
-#~ "Неперакладзеныя уваходжаньні прымаюцца як пераклады, аднолькавыя msgid, "
-#~ "і\n"
-#~ "пазначаюцца як недакладныя (fuzzy).\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"
-#~ "If input file is -, standard input is read.\n"
-#~ msgstr ""
-#~ "Уваходзячы файл:\n"
-#~ "  INPUTFILE                   уваходзячы PO ці POT файл\n"
-#~ "  -D, --directory=ДЫРЭКТОРЫЯ  дадае ДЫРЭКТОРЫю ў сьпіс пошуку файлаў "
-#~ "уводу\n"
-#~ "Калі файл уводу гэта -, чытаецца стандартны ўвод.\n"
-
-#~ msgid "missing command name"
-#~ msgstr "прапушчана назва каманды"
-
-#~ msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-#~ msgstr "Выкарыстаньне: %s [ВЫБАР] ЗАГАД [ВЫБАР_ЗАГАДА]\n"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ msgid "write to stdout failed"
-#~ msgstr "памылка запісу ў stdout"
-
-#~ msgid "write to %s subprocess failed"
-#~ msgstr "памылка запісу ў падпрацэс %s"
-
-#~ msgid "missing filter name"
-#~ msgstr "прапушчана назва фільтра"
-
-#~ msgid "at least one sed script must be specified"
-#~ msgstr "па меншай меры адзін sed-скрыпт павінен быць зададзены"
-
-#~ msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-#~ msgstr "Выкарыстаньне: %s [ВЫБАР] ФІЛЬТР [ВЫБАРЫ_ФІЛЬТРА]\n"
-
-#~ msgid "Applies a filter to all translations of a translation catalog.\n"
-#~ msgstr "Прымае фільтар да ўсіх перакладаў зь каталёгу перакладаў.\n"
-
-#~ 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 ""
-#~ "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"
-
-#~ 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"
-
-#~ msgid "cannot set up nonblocking I/O to %s subprocess"
-#~ msgstr "немагчыма ўсталяваць неблакіруючы ўвод-вывад у падпрацэс %s"
-
-#~ msgid "communication with %s subprocess failed"
-#~ msgstr "памылка ўзаемадзеяньня з падпрацэсам %s"
-
-#~ msgid "read from %s subprocess failed"
-#~ msgstr "памылка чытаньня з падпрацэса %s"
-
-#~ msgid "%s subprocess terminated with exit code %d"
-#~ msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
-
-#~ msgid "the argument to %s should be a single punctuation character"
-#~ msgstr "аргумэнт %s павінен быць адзіночным знакам прыпынку"
-
-#~ msgid "%s requires a \"-d directory\" specification"
-#~ msgstr "%s патрабуе \"-d дырэкторыя\" спэцыфікацыі"
-
-#~ msgid "%s requires a \"-l locale\" specification"
-#~ msgstr "%s патрабуе \"-l locale\" спэцыфікацыі"
-
-#~ msgid "%s is only valid with %s"
-#~ msgstr "%s рэчаісны толькі з %s"
-
-#~ msgid "%s is only valid with %s or %s"
-#~ msgstr "%s рэчаісны толькі з %s ці %s"
-
-#~ msgid "%d translated message"
-#~ msgid_plural "%d translated messages"
-#~ msgstr[0] "%d паведамленьне перакладзена"
-#~ msgstr[1] "%d паведамленьні перакладзена"
-#~ msgstr[2] "%d паведамленьняў перакладзена"
-
-#~ msgid ", %d fuzzy translation"
-#~ msgid_plural ", %d fuzzy translations"
-#~ msgstr[0] ""
-#~ ",\n"
-#~ "%d недакладны пераклад"
-#~ msgstr[1] ""
-#~ ",\n"
-#~ "%d недакладных пераклада"
-#~ msgstr[2] ""
-#~ ",\n"
-#~ "%d недакладных перакладаў"
-
-#~ msgid ", %d untranslated message"
-#~ msgid_plural ", %d untranslated messages"
-#~ msgstr[0] ""
-#~ ",\n"
-#~ "%d неперакладзенае паведамленьне"
-#~ msgstr[1] ""
-#~ ",\n"
-#~ "%d неперакладзеных паведамленьні"
-#~ msgstr[2] ""
-#~ ",\n"
-#~ "%d неперакладзеных паведамленьняў"
-
-#~ msgid "Usage: %s [OPTION] filename.po ...\n"
-#~ msgstr "Выкарыстаньне: %s [ВЫБАР] файл.po ...\n"
-
-#~ msgid ""
-#~ "Generate binary message catalog from textual translation description.\n"
-#~ msgstr ""
-#~ "Стварае дваічны каталёг паведамленьняў зь іх тэкставага апісаньня.\n"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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 ""
-#~ "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"
-
-#~ 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 ""
-#~ "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"
-
-#~ 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 ""
-#~ "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 "plural expression can produce negative values"
-#~ msgstr "выраз множнага ліку можа ўтвараць адмоўнае значэньне"
-
-#~ msgid ""
-#~ "nplurals = %lu but plural expression can produce values as large as %lu"
-#~ msgstr ""
-#~ "nplurals = %lu але выраз множнага ліку можа ўтвараць значэньні такія як "
-#~ "%lu"
-
-#~ msgid "plural expression can produce division by zero"
-#~ msgstr "выраз множнага ліку можа ўтвараць дзяленьне на нуль"
-
-#~ msgid "plural expression can produce integer overflow"
-#~ msgstr "выраз множнага ліку можа ўтвараць цэлалікавае перапаўненьне"
-
-#~ msgid ""
-#~ "plural expression can produce arithmetic exceptions, possibly division by "
-#~ "zero"
-#~ msgstr ""
-#~ "выраз множнага ліку можа ўтвараць арыфмэтычныя выключэньні, магчыма\n"
-#~ "дзяленьне на нуль"
-
-#~ msgid "message catalog has plural form translations..."
-#~ msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
-
-#~ msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
-#~ msgstr "...але ў загалоўку нехапае атрыбута \"plural=ВЫРАЗ\""
-
-#~ msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
-#~ msgstr "...але ў загалоўку нехапае атрыбута \"plural=ЦЭЛЫ_ЛІК\""
-
-#~ msgid "invalid nplurals value"
-#~ msgstr "нерэчаіснае значэньне nplurals"
-
-#~ msgid "invalid plural expression"
-#~ msgstr "нерэчаісны выраз формы мнножнага ліку (plural)"
-
-#~ msgid "nplurals = %lu..."
-#~ msgstr "nplurals = %lu..."
-
-#~ 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 "...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 "Try using the following, valid for %s:\n"
-#~ msgstr "Паспрабуйце выкарыстоўваць наступнае, рэчаіснае для %s\n"
-
-#~ msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
-#~ msgstr "`msgid' і `msgid_plural' не пачынаюцца разам з '\\n'"
-
-#~ msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
-#~ msgstr "`msgid' і `msgstr[%u]' не пачынаюцца разам з \"\\n\""
-
-#~ msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
-#~ msgstr "`msgid' і `msgstr' не пачынаюцца разам з '\\n'"
-
-#~ msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
-#~ msgstr "`msgid' і `msgid_plural' не заканчваюцца разам на '\\n'"
-
-#~ msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
-#~ msgstr "`msgid' і `msgstr[%u]' не заканчваюцца разам на '\\n'"
-
-#~ msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
-#~ msgstr "`msgid' і `msgstr' не заканчваюцца разам на '\\n'"
-
-#~ msgid "plural handling is a GNU gettext extension"
-#~ msgstr "апрацоўка множнага ліку - гэта пашырэньне GNU gettext"
-
-#~ msgid "'%s' is not a valid %s format string, unlike 'msgid'"
-#~ msgstr "'%s' - гэта нерэчаісны %s фармат радку, у адрозьненьне ад 'msgid'"
-
-#~ msgid "headerfield `%s' missing in header\n"
-#~ msgstr "поле загалоку `%s' прапушчана ў загалоўку\n"
-
-#~ 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"
+#: src/po-lex.c:553
+msgid "incomplete multibyte sequence at end of line"
+msgstr "няпоўная шматбайтная пасьлядоўнасьць на прыканцы радка"
 
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "поле `%s' усё яшчэ мае пачатковае значэньне\n"
+#: src/po-lex.c:561
+msgid "iconv failure"
+msgstr "памылка iconv"
 
-#~ msgid "warning: PO file header missing or invalid\n"
-#~ msgstr "увага: загаловак PO-файла прапушчан ці нерэчаісны\n"
+#: 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 "warning: charset conversion will not work\n"
-#~ msgstr "увага: пераўтварэньне кадзіровак не будзе працаваць\n"
+#: src/po-lex.c:825
+#, c-format
+msgid "keyword \"%s\" unknown"
+msgstr "невядомае ключавое слова \"%s\""
 
-#~ msgid "warning: PO file header fuzzy\n"
-#~ msgstr "увага: загаловак PO-файла мае недакладны пераклад\n"
+#: src/po-lex.c:935
+msgid "invalid control sequence"
+msgstr "нерэчаісная кантралюючая паслядоўнасць"
 
-#~ msgid "domain name \"%s\" not suitable as file name"
-#~ msgstr "даменная назва \"%s\" не падыходзіць у якасці назвы файла"
+#: src/po-lex.c:1043
+msgid "end-of-file within string"
+msgstr "сімвал канца файла знаходзіцца ўнутры радка"
 
-#~ msgid "domain name \"%s\" not suitable as file name: will use prefix"
-#~ msgstr ""
-#~ "даменная назва \"%s\" не падыходзіць у якасці назвы файла;\n"
-#~ "будзе выкарыстаны прэфікс"
+#: src/po-lex.c:1049
+msgid "end-of-line within string"
+msgstr "сімвал канца радка знаходзіцца ўнутры радка"
 
-#~ msgid "`domain %s' directive ignored"
-#~ msgstr "дырэктыва `domain %s' ігнаруецца"
+#: 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\" абрэзан"
+
+#: src/read-mo.c:143
+#, c-format
+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 "empty `msgstr' entry ignored"
-#~ msgstr "парожняе уваходжаньне `msgstr' прапушчана"
+#: src/read-mo.c:194
+#, c-format
+msgid "file \"%s\" contains a not NUL terminated string, at %s"
+msgstr "файл \"%s\" зьмяшчае радок не завершаны нулём, ля %s"
 
-#~ msgid "fuzzy `msgstr' entry ignored"
-#~ msgstr "недакладнае уваходжаньне `msgstr' прапушчана"
+#: src/urlget.c:150
+msgid "expected two arguments"
+msgstr "чакалісь два аргумэнты"
 
-#~ msgid "%s: warning: source file contains fuzzy translation"
-#~ msgstr "%s: увага: ізыходны файл змяшчае недакладны пераклад"
+#: src/urlget.c:169
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] URL FILE\n"
+msgstr "Выкарыстаньне: %s [ВЫБАР] URL ФАЙЛ\n"
 
-#~ msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
-#~ msgstr ""
-#~ "выбар '%c' не можа быць выкарыстаны раней чым 'K' ці 'T' будуць зададзены"
+#: 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 "write to grep subprocess failed"
-#~ msgstr "памылка запісу ў падпрацэс grep"
+#: src/urlget.c:222
+msgid "error writing stdout"
+msgstr "памылка запісу ў stdout"
 
-#~ 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 "Created %s.\n"
-#~ msgstr "Створан %s.\n"
-
-#~ msgid ""
-#~ "Creates a new PO file, initializing the meta information with values from "
-#~ "the\n"
-#~ "user's environment.\n"
-#~ msgstr ""
-#~ "Стварае новы PO файл, задае пачатковыя мэтададзеныя значэньнямі з "
-#~ "асяродзьдзя\n"
-#~ "карыстальніка.\n"
-
-#~ 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 "error reading current directory"
-#~ msgstr "памылка чытаньня бягучай дырэкторыі"
-
-#~ 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 "fdopen() failed"
-#~ msgstr "fdopen() памылка"
-
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "падпрацэс %s, памылка ўводу-вываду"
-
-#~ msgid "English translations for %s package"
-#~ msgstr "Беларускі пераклад для %s"
-
-#~ msgid "two different charsets \"%s\" and \"%s\" in input file"
-#~ msgstr "уваходзячы файл зьмяшчае два розных набора сімвалаў \"%s\" і \"%s\""
-
-#~ msgid ""
-#~ "input file `%s' doesn't contain a header entry with a charset "
-#~ "specification"
-#~ msgstr ""
-#~ "уваходзячы файл `%s' не зьмяшчае загаловачны запіс\n"
-#~ "са сьпецыфікацыей кодавай старонкі"
-
-#~ msgid "warning: "
-#~ msgstr "увага: "
-
-#~ msgid "conversion failure"
-#~ msgstr "памылка пераўтварэньня"
-
-#~ msgid ""
-#~ "input file doesn't contain a header entry with a charset specification"
-#~ msgstr "уваходзячы файл не змяшчае загаловачнага запісу аб наборы сімвалаў"
-
-#~ 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 "this message should define plural forms"
-#~ msgstr "гэтае паведамленьне павінна вызначаць хормы множнага ліка"
-
-#~ msgid "this message should not define plural forms"
-#~ msgstr "гэтае паведамленьне не павінна вызначаць хормы множнага ліка"
-
-#~ 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"
-
-#~ msgid "%s and explicit file names are mutually exclusive"
-#~ msgstr "%s і яўная назва файла ўзаема выключальны"
-
-#~ msgid "Convert binary message catalog to Uniforum style .po file.\n"
-#~ msgstr "Пераўтварае дваічны каталёг паведамленьняў у Uniforum .po файл.\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"
-#~ msgstr ""
-#~ "Рэжым дзеяньня:\n"
-#~ "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
-#~ "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
-
-#~ 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 ""
-#~ "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"
-
-#~ 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"
-
-#~ 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"
-
-#~ msgid "<stdin>"
-#~ msgstr "<stdin>"
-
-#~ msgid "%s: warning: "
-#~ msgstr "%s: увага: "
-
-#~ 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 "Continuing anyway, expect parse errors."
-#~ msgstr "Працяг выкананьня... чакаюцца памылкі разбору."
-
-#~ msgid "Continuing anyway."
-#~ msgstr "Працяг выкананьня..."
-
-#~ 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 ""
-#~ "Installing GNU libiconv and then reinstalling GNU gettext\n"
-#~ "would fix this problem.\n"
-#~ msgstr ""
-#~ "Усталяваньне GNU libiconv і пераўсталяваньне GNU gettext\n"
-#~ "павінна выправіць гэту праблему.\n"
-
-#~ msgid "%s\n"
-#~ msgstr "%s\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"
-
-#~ msgid ""
-#~ "Charset missing in header.\n"
-#~ "Message conversion to user's charset will not work.\n"
-#~ msgstr ""
-#~ "Прапушчан набор сімвалаў ў загалоўке.\n"
-#~ "Пераўтварэньне паведамленьняў у набор сімвалаў карыстальніка працаваць не "
-#~ "будзе.\n"
-
-#~ msgid "inconsistent use of #~"
-#~ msgstr "несумяшчальнае ўжываньне #~"
-
-#~ msgid "missing `msgstr[]' section"
-#~ msgstr "прапушчана секцыя \"msgstr[]\""
-
-#~ msgid "missing `msgid_plural' section"
-#~ msgstr "прапушчана секцыя \"msgid_plural\""
-
-#~ msgid "missing `msgstr' section"
-#~ msgstr "прапушчана секцыя \"msgstr\""
-
-#~ msgid "first plural form has nonzero index"
-#~ msgstr "першая форма ліку мае ненулявы індэкс"
-
-#~ msgid "plural form has wrong index"
-#~ msgstr "формы множнага ліку маюць дрэнныі індэкс"
-
-#~ msgid "too many errors, aborting"
-#~ msgstr "вельмі шмат памылак..."
-
-#~ msgid "invalid multibyte sequence"
-#~ msgstr "нерэчаісная шматсімвальная паслядоўнасць"
-
-#~ msgid "incomplete multibyte sequence at end of file"
-#~ msgstr "няпоўная шматбайтная пасьлядоўнасьць на прыканцы файла"
-
-#~ msgid "incomplete multibyte sequence at end of line"
-#~ msgstr "няпоўная шматбайтная пасьлядоўнасьць на прыканцы радка"
-
-#~ msgid "iconv failure"
-#~ msgstr "памылка iconv"
+#: src/write-java.c:1109
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "немагчыма знайсці часовую дырэкторыю, паспрабуйце ўсталяваць $TMPDIR"
 
-#~ msgid "keyword \"%s\" unknown"
-#~ msgstr "невядомае ключавое слова \"%s\""
+#: src/write-java.c:1119
+#, c-format
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr ""
+"немагчыма стварыць часовую дырэкторыю,\n"
+"выкарыстоўвываючы ўзор \"%s\""
 
-#~ msgid "invalid control sequence"
-#~ msgstr "нерэчаісная кантралюючая паслядоўнасць"
+#: src/write-java.c:1132
+#, c-format
+msgid "not a valid Java class name: %s"
+msgstr "нерэчаісная назва Java-класа: %s"
 
-#~ msgid "end-of-file within string"
-#~ msgstr "сімвал канца файла знаходзіцца ўнутры радка"
+#: src/write-java.c:1189 src/write-java.c:1202
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "немагчыма стварыць \"%s\""
 
-#~ msgid "end-of-line within string"
-#~ msgstr "сімвал канца радка знаходзіцца ўнутры радка"
+#: 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 "file \"%s\" is truncated"
-#~ 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 "file \"%s\" contains a not NUL terminated string"
-#~ msgstr "файл \"%s\" змяшчае радок не завершаны нулём"
+#: src/write-mo.c:701
+#, c-format
+msgid "error while opening \"%s\" for writing"
+msgstr "памылка ў час адкрыцця \"%s\" для запісу"
 
-#~ msgid "file \"%s\" is not in GNU .mo format"
-#~ msgstr "фармат файла \"%s\" не GNU .mo"
+#: src/write-po.c:415
+#, c-format
+msgid "internationalized messages should not contain the `\\%c' escape sequence"
+msgstr "перакладзеныя паведамленьні не павінны зьмяшчаць \"\\%c\" ESC-пасьлядоўнасьці"
 
-#~ msgid "file \"%s\" contains a not NUL terminated string, at %s"
-#~ msgstr "файл \"%s\" зьмяшчае радок не завершаны нулём, ля %s"
+#: 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 "expected two arguments"
-#~ msgstr "чакалісь два аргумэнты"
+#: src/write-po.c:944
+#, c-format
+msgid "cannot create output file \"%s\""
+msgstr "немагчыма стварыць файл вываду \"%s\""
 
-#~ msgid "Usage: %s [OPTION] URL FILE\n"
-#~ msgstr "Выкарыстаньне: %s [ВЫБАР] URL ФАЙЛ\n"
+#: src/write-po.c:951
+#, no-c-format
+msgid "standard output"
+msgstr "стандартны вывад"
 
-#~ msgid "error writing stdout"
-#~ msgstr "памылка запісу ў stdout"
+#: src/x-c.c:954
+#, c-format
+msgid "%s:%d: warning: unterminated character constant"
+msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
 
-#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr ""
-#~ "немагчыма знайсці часовую дырэкторыю, паспрабуйце ўсталяваць $TMPDIR"
-
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr ""
-#~ "немагчыма стварыць часовую дырэкторыю,\n"
-#~ "выкарыстоўвываючы ўзор \"%s\""
+#: src/x-c.c:978
+#, c-format
+msgid "%s:%d: warning: unterminated string literal"
+msgstr "%s:%d: увага: незавершаны радок"
 
-#~ msgid "not a valid Java class name: %s"
-#~ msgstr "нерэчаісная назва Java-класа: %s"
-
-#~ msgid "failed to create \"%s\""
-#~ msgstr "немагчыма стварыць \"%s\""
-
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "памылка ў час запісу файла \"%s\""
-
-#~ msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-#~ msgstr ""
-#~ "памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
-#~ "ці ўсталяваць пераменную асяроддзя $JAVAC"
-
-#~ msgid "error while opening \"%s\" for writing"
-#~ msgstr "памылка ў час адкрыцця \"%s\" для запісу"
-
-#~ msgid ""
-#~ "internationalized messages should not contain the `\\%c' escape sequence"
-#~ msgstr ""
-#~ "перакладзеныя паведамленьні не павінны зьмяшчаць \"\\%c\" ESC-"
-#~ "пасьлядоўнасьці"
-
-#~ 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 "cannot create output file \"%s\""
-#~ msgstr "немагчыма стварыць файл вываду \"%s\""
-
-#~ msgid "standard output"
-#~ msgstr "стандартны вывад"
-
-#~ msgid "%s:%d: warning: unterminated character constant"
-#~ msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
-
-#~ msgid "%s:%d: warning: unterminated string literal"
-#~ msgstr "%s:%d: увага: незавершаны радок"
-
-#~ msgid "this file may not contain domain directives"
-#~ msgstr "гэты файл можа не змяшчаць дырэктыў дамену"
-
-#~ msgid "%s:%d: invalid string definition"
-#~ msgstr "%s:%d: нерэчаіснае вызначэньне радка"
-
-#~ msgid "%s:%d: missing number after #"
-#~ msgstr "%s:%d: прапушчан нумар пасьля #"
-
-#~ msgid "%s:%d: invalid string expression"
-#~ msgstr "%s:%d: нерэчаісны выраз-радок"
-
-#~ msgid "--join-existing cannot be used when output is written to stdout"
-#~ msgstr "--joun-existing не можа быць выкарастаны пры запісы ў stdout"
-
-#~ msgid "xgettext cannot work without keywords to look for"
-#~ msgstr "xgettext не можа працаваць без ключавых слоў для пошуку"
-
-#~ msgid "warning: file `%s' extension `%s' is unknown; will try C"
-#~ msgstr "увага: файл \"%s\" суфікс \"%s\" невядомы; паспрабуйце C"
-
-#~ msgid "Extract translatable strings from given input files.\n"
-#~ msgstr "Атрымлівае перакладаемыя радкі з дадзеных уваходзячых файлаў.\n"
-
-#~ msgid ""
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "Similarly for optional arguments.\n"
-#~ msgstr ""
-#~ "Аргумэнты, абавязковыя для доўгх выбараў, абавязковы так сама\n"
-#~ "і для кароткі.  Тое саме-ж і для выбарачных аргумэнтаў.\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"
-#~ "                                 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
-#~ 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"
-
-#~ msgid "language `%s' unknown"
-#~ msgstr "невядомая мова `%s'"
+#: src/x-po.c:106 src/xgettext.c:648
+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: нерэчаіснае вызначэньне радка"
+
+#: src/x-rst.c:168
+#, c-format
+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: нерэчаісны выраз-радок"
+
+#: src/xgettext.c:401
+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 не можа працаваць без ключавых слоў для пошуку"
+
+#: src/xgettext.c:502
+#, c-format
+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"
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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'"
diff --git a/gettext-runtime/po/bg.po b/gettext-runtime/po/bg.po
index 44f1fa3c0..293b10eb9 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2014-05-10 13:36+0900\n"
 "PO-Revision-Date: 2014-05-11 13:30+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
 "Language-Team: Bulgarian <dict@ludost.net>\n"
diff --git a/gettext-runtime/po/ca.po b/gettext-runtime/po/ca.po
index 0d9bc11f9..dd2dde2c1 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2014-05-10 13:36+0900\n"
 "PO-Revision-Date: 2014-05-11 20:59+0200\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
diff --git a/gettext-runtime/po/cs.po b/gettext-runtime/po/cs.po
index 2939d6b90..fbd09e0a5 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.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2012-12-25 14:19+0900\n"
 "PO-Revision-Date: 2013-06-07 12:59+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
diff --git a/gettext-runtime/po/da.po b/gettext-runtime/po/da.po
index 40fbb0714..6721ebb04 100644
--- a/gettext-runtime/po/da.po
+++ b/gettext-runtime/po/da.po
@@ -11,11 +11,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2011-01-08 01:45+0100\n"
 "Last-Translator: Keld Simonsen <keld@keldix.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -26,62 +25,62 @@ msgstr ""
 msgid "write error"
 msgstr "skrivefejl"
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Ukendt systemfejl"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: tilvalget '%s' kan betyde flere ting\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: tilvalget '--%s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: tilvalget `%c%s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: tilvalget `--%s' kr�ver et argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ukendt tilvalg `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ukendt tilvalg `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldigt tilvalg -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: tilvalget '%c' kr�ver et argument\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: tilvalget '-W %s' er flertydigt\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: tilvalget '-W %s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: tilvalget `%s' kr�ver et argument\n"
@@ -125,8 +124,8 @@ msgid "missing arguments"
 msgstr "argumenter mangler"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Pr�v '%s --help' for yderligere oplysninger.\n"
 
 #: src/envsubst.c:176
@@ -247,13 +246,13 @@ msgstr ""
 "                            TEKSTID fra TEKSTDOM�NE\n"
 
 #: src/gettext.c:264
-#, fuzzy, c-format, no-wrap
+#, 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"
diff --git a/gettext-runtime/po/de.po b/gettext-runtime/po/de.po
index f8aade898..a5c14cc1e 100644
--- a/gettext-runtime/po/de.po
+++ b/gettext-runtime/po/de.po
@@ -78,7 +78,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2012-12-25 14:19+0900\n"
 "PO-Revision-Date: 2013-04-09 22:17+0200\n"
 "Last-Translator: Jakob Kramer <jakob.kramer@gmx.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
diff --git a/gettext-runtime/po/el.po b/gettext-runtime/po/el.po
index 348a2dacd..f22108f51 100644
--- a/gettext-runtime/po/el.po
+++ b/gettext-runtime/po/el.po
@@ -6,11 +6,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.34\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2007-11-02 03:22+0100\n"
 "PO-Revision-Date: 1998-05-17 13:12+0200\n"
 "Last-Translator: Simos KSenitellis <simos@teiath.gr>\n"
 "Language-Team: Greek <simos@teiath.gr>\n"
-"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,78 +20,79 @@ msgid "write error"
 msgstr ""
 
 #
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:125
 msgid "Unknown system error"
 msgstr "������� ������ ����������"
 
 #
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: � ������� `%s' ����� �����������\n"
 
 #
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c: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:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: � ������� `%c%s' ��� ��������� ���������\n"
 
 #
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c: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:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%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:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%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:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: �� �������� ������� -- %c\n"
+
+#
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr "%s: �� ������ ������� -- %c\n"
 
 #
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
+#: gnulib-lib/getopt.c: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: � ������� ������� ��������� -- %c\n"
 
 #
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c: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:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\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/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: � ������� `%s' ������� ���������\n"
-
-#
 #: gnulib-lib/xmalloc.c:37
 #, fuzzy, c-format
 msgid "memory exhausted"
@@ -132,8 +132,8 @@ msgstr "������������ ��������"
 
 #
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "��������� `%s --help' ��� ������������ �����������.\n"
 
 #: src/envsubst.c:176
@@ -259,7 +259,7 @@ msgid ""
 "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"
@@ -329,10 +329,6 @@ msgstr ""
 "������������ ��������� ����������: %s\n"
 
 #
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: �� �������� ������� -- %c\n"
-
-#
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
@@ -1570,8 +1566,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 7d63c7d4e..22fca5834 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.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2012-12-25 14:19+0900\n"
 "PO-Revision-Date: 2013-10-30 16:17-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
diff --git a/gettext-runtime/po/es.po b/gettext-runtime/po/es.po
index bf9b15284..3e63a1f66 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.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2012-12-25 14:19+0900\n"
 "PO-Revision-Date: 2013-11-25 19:54+0200\n"
 "Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
diff --git a/gettext-runtime/po/et.po b/gettext-runtime/po/et.po
index a3d68cf90..907778709 100644
--- a/gettext-runtime/po/et.po
+++ b/gettext-runtime/po/et.po
@@ -5,11 +5,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2007-11-02 03:22+0100\n"
 "PO-Revision-Date: 2001-04-30 16:25+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
-"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,66 +18,67 @@ msgstr ""
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:125
 msgid "Unknown system error"
 msgstr "Tundmatu s�steemne viga"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: v�ti `%s' on mitmet�henduslik\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c: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:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: v�tmel `%c%s' ei tohi olla argumente\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c: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: v�tme `%s' j�rel peab olema argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: gnulib-lib/getopt.c: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:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%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:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\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"
 msgstr "%s: vigane v�ti -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%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: v�tme j�rel peab olema argument -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c: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:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\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/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: v�tme `%s' j�rel peab olema argument\n"
-
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -114,8 +114,8 @@ msgid "missing arguments"
 msgstr "argumendid on puudu"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "T�iendava info saamiseks proovi `%s --help'.\n"
 
 #: src/envsubst.c:176
@@ -238,7 +238,7 @@ msgid ""
 "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"
@@ -308,9 +308,6 @@ msgstr ""
 "lugeda keskkonnamuutujast TEXTDOMAINDIR.\n"
 "Standardne otsinukataloog: %s\n"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: lubamatu v�ti -- %c\n"
-
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
@@ -1089,8 +1086,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"
@@ -1456,8 +1453,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 b2b87f0eb..350bc26d7 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.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2012-12-25 14:19+0900\n"
 "PO-Revision-Date: 2013-03-03 11:37+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -196,10 +196,8 @@ msgstr ""
 #: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245
 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
diff --git a/gettext-runtime/po/fr.po b/gettext-runtime/po/fr.po
index 01bb3ce9d..1395096d9 100644
--- a/gettext-runtime/po/fr.po
+++ b/gettext-runtime/po/fr.po
@@ -10,11 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2010-07-23 01:20+0100\n"
 "Last-Translator: Christophe Combelles <ccomb@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,62 +23,62 @@ msgstr ""
 msgid "write error"
 msgstr "erreur d'écriture"
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Erreur système non identifiée"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s : l'option « %s » est ambiguë\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s : l'option « --%s » ne tolère pas d'argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s : l'option « %c%s » ne tolère pas d'argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s : l'option « --%s » exige un argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s : l'option « --%s » n'est pas connue\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s : l'option « %c%s » n'est pas connue\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s : option non valable -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s : l'option exige un argument -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s : l'option « -W %s » est ambiguë\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s : l'option « -W %s » ne tolère pas d'argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s : l'option « -W %s » exige un argument\n"
@@ -123,8 +122,8 @@ msgid "missing arguments"
 msgstr "arguments manquants"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Pour plus d'information, essayez « %s --help ».\n"
 
 #: src/envsubst.c:176
@@ -245,13 +244,13 @@ msgstr ""
 "  [DOMAINE] MSGID        récupère la traduction de MSGID, depuis le DOMAINE\n"
 
 #: src/gettext.c:264
-#, fuzzy, c-format, no-wrap
+#, 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"
@@ -321,14 +320,11 @@ 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 ""
 #~ "Copyright © %s Free Software Foundation, Inc.\n"
-#~ "Ce programme est un logiciel libre.  Consultez le code source pour plus "
-#~ "de détail sur\n"
+#~ "Ce programme est un logiciel libre.  Consultez le code source pour plus de détail sur\n"
 #~ "les permissions de copie.  Il est distribué SANS AUCUNE GARANTIE\n"
 #~ "pas même de QUALITÉ MARCHANDE ni d'ADÉQUATION À UN BUT PARTICULIER.\n"
 
@@ -360,14 +356,10 @@ msgstr ""
 #~ msgstr "échec du sous-processus %s"
 
 #~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr ""
-#~ "Compilateur Java n'a pas été repéré, essayer d'installer gcj ou "
-#~ "défitni $JAVAC"
+#~ msgstr "Compilateur Java n'a pas été repéré, essayer d'installer gcj ou défitni $JAVAC"
 
 #~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr ""
-#~ "Machine virtuelle Java n'a pas été repérée, essayer d'installer gij "
-#~ "ou définir $JAVA"
+#~ msgstr "Machine virtuelle Java n'a pas été repérée, essayer d'installer gij ou définir $JAVA"
 
 #~ msgid "cannot create pipe"
 #~ msgstr "incapable de créer le pipe"
@@ -379,86 +371,46 @@ msgstr ""
 #~ msgstr "le sous-processus %s a reçu le signal fatal %d"
 
 #~ msgid "number of format specifications in 'msgid' and '%s' does not match"
-#~ msgstr ""
-#~ "nombre de spécifications de format entre « msgid » et « %s » ne "
-#~ "concorde pas"
+#~ msgstr "nombre de spécifications de format entre « msgid » et « %s » ne concorde pas"
 
-#~ msgid ""
-#~ "format specifications in 'msgid' and '%s' for argument %u are not the same"
-#~ msgstr ""
-#~ "spécifications de format entre « msgid » et « %s » de l'argument %u "
-#~ "ne sont pas identiques"
+#~ msgid "format specifications in 'msgid' and '%s' for argument %u are not the same"
+#~ msgstr "spécifications de format entre « msgid » et « %s » de l'argument %u ne sont pas identiques"
 
-#~ msgid ""
-#~ "a format specification for argument %u, as in '%s', doesn't exist in "
-#~ "'msgid'"
-#~ msgstr ""
-#~ "spécification de format de l'argument « %u », comme dans « %s », "
-#~ "n'existe pas dans « msgid »"
+#~ msgid "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+#~ msgstr "spécification de format de l'argument « %u », comme dans « %s », n'existe pas dans « msgid »"
 
 #~ msgid "a format specification for argument %u doesn't exist in '%s'"
-#~ msgstr ""
-#~ "spécification de format de l'argument %u n'existe pas dans « %s »"
+#~ msgstr "spécification de format de l'argument %u n'existe pas dans « %s »"
 
-#~ msgid ""
-#~ "a format specification for argument {%u}, as in '%s', doesn't exist in "
-#~ "'msgid'"
-#~ msgstr ""
-#~ "spécification de format de l'argument {%u}, comme dans « %s », "
-#~ "n'existe pas dans « msgid »"
+#~ msgid "a format specification for argument {%u}, as in '%s', doesn't exist in 'msgid'"
+#~ msgstr "spécification de format de l'argument {%u}, comme dans « %s », n'existe pas dans « msgid »"
 
 #~ msgid "a format specification for argument {%u} doesn't exist in '%s'"
-#~ msgstr ""
-#~ "spécification de format de l'argument {%u} n'existe pas dans « %s »"
+#~ msgstr "spécification de format de l'argument {%u} n'existe pas dans « %s »"
 
-#~ msgid ""
-#~ "format specifications in 'msgid' and '%s' for argument {%u} are not the "
-#~ "same"
-#~ msgstr ""
-#~ "spécifications de format de « msgid » et « %s » de l'argument {%u} "
-#~ "ne sont pas les mêmes"
+#~ msgid "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+#~ msgstr "spécifications de format de « msgid » et « %s » de l'argument {%u} ne sont pas les mêmes"
 
 #~ msgid "format specifications in 'msgid' and '%s' are not equivalent"
-#~ msgstr ""
-#~ "spécifications de format de « msgid » et « %s » ne sont pas "
-#~ "équivalentes"
+#~ msgstr "spécifications de format de « msgid » et « %s » ne sont pas équivalentes"
 
 #~ msgid "format specifications in '%s' are not a subset of those in 'msgid'"
-#~ msgstr ""
-#~ "spécifications de format dans « %s » ne sont pas un sous-ensemble de "
-#~ "celles de « msgid »"
+#~ msgstr "spécifications de format dans « %s » ne sont pas un sous-ensemble de celles de « msgid »"
 
-#~ msgid ""
-#~ "format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-#~ "tuple"
-#~ msgstr ""
-#~ "spécifications de format de « msgid » requièrent un mapping, celles "
-#~ "de « %s » requièrent un tuple"
+#~ msgid "format specifications in 'msgid' expect a mapping, those in '%s' expect a tuple"
+#~ msgstr "spécifications de format de « msgid » requièrent un mapping, celles de « %s » requièrent un tuple"
 
-#~ msgid ""
-#~ "format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-#~ "mapping"
-#~ msgstr ""
-#~ "spécifications de format de « msgid » requièrent un tuple, celles de "
-#~ "« %s » requièrent un mapping"
+#~ msgid "format specifications in 'msgid' expect a tuple, those in '%s' expect a mapping"
+#~ msgstr "spécifications de format de « msgid » requièrent un tuple, celles de « %s » requièrent un mapping"
 
-#~ msgid ""
-#~ "a format specification for argument '%s', as in '%s', doesn't exist in "
-#~ "'msgid'"
-#~ msgstr ""
-#~ "spécification de format de l'argument « %s », comme dans « %s », "
-#~ "n'existe pas dans « msgid »"
+#~ msgid "a format specification for argument '%s', as in '%s', doesn't exist in 'msgid'"
+#~ msgstr "spécification de format de l'argument « %s », comme dans « %s », n'existe pas dans « msgid »"
 
 #~ msgid "a format specification for argument '%s' doesn't exist in '%s'"
-#~ msgstr ""
-#~ "spécification de format de l'argument « %s » n'existe pas « %s »"
+#~ msgstr "spécification de format de l'argument « %s » n'existe pas « %s »"
 
-#~ msgid ""
-#~ "format specifications in 'msgid' and '%s' for argument '%s' are not the "
-#~ "same"
-#~ msgstr ""
-#~ "spécifications de format de « msgid » et de « %s » de l'argument « "
-#~ "%s » ne sont pas les mêmes"
+#~ msgid "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+#~ msgstr "spécifications de format de « msgid » et de « %s » de l'argument « %s » ne sont pas les mêmes"
 
 #~ msgid "Usage: %s [OPTION]\n"
 #~ msgstr "Usage: %s [OPTION]\n"
@@ -469,15 +421,13 @@ 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 ""
 #~ "Format de sortie:\n"
 #~ "  -s, --short           nom court de l'hôte\n"
-#~ "  -f, --fqdn, --long    nom long de l'hôte, incluant le nom complet "
-#~ "qualifié de domaine\n"
+#~ "  -f, --fqdn, --long    nom long de l'hôte, incluant le nom complet qualifié de domaine\n"
 #~ "                          et les aliases\n"
 #~ "  -i, --ip-address      addresses IP de la machine hôte\n"
 
@@ -494,15 +444,13 @@ msgstr ""
 #~ msgstr "Usage: %s [OPTION] [FICHIER-D-ENTRÉE]\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 ""
 #~ "Filtrer les messages d'un catalogue de traduction selon leurs attributs\n"
 #~ "et manipuler leurs attributs.\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 ""
 #~ "Les arguments obligatoires pour la forme longue des options sont aussi\n"
 #~ "obligatoires pour les formes courtes qui leur correspondent.\n"
@@ -510,36 +458,28 @@ 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 ""
 #~ "Localisation du fichier d'entrée:\n"
 #~ "  FICHIER-D-ENTRÉE            fichier PO d'entrée\n"
-#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des "
-#~ "fichiers d'entrée\n"
-#~ "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée "
-#~ "standard.\n"
+#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des fichiers d'entrée\n"
+#~ "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée standard.\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 ""
 #~ "Localisation du fichier de sortie:\n"
-#~ "  -o, --output-file=FICHIER   écrire la sortie dans le FICHIER "
-#~ "spécifié\n"
-#~ "Les résultats sont écrits sur la sortie standard si aucun fichier n'est "
-#~ "spécifié.\n"
+#~ "  -o, --output-file=FICHIER   écrire la sortie dans le FICHIER spécifié\n"
+#~ "Les résultats sont écrits sur la sortie standard si aucun fichier n'est spécifié.\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"
@@ -548,11 +488,9 @@ msgstr ""
 #~ "Sélection de messages:\n"
 #~ "      --translated            conserver les messages traduits, \n"
 #~ "                               enlever ceux qui ne sont pas traduits\n"
-#~ "      --untranslated          conserver les non traduits, enlever ceux "
-#~ "traduits\n"
+#~ "      --untranslated          conserver les non traduits, enlever ceux traduits\n"
 #~ "      --no-fuzzy              enlever les messages marqués « fuzzy »\n"
-#~ "      --only-fuzzy            conserver les messages marqués « fuzzy "
-#~ "»\n"
+#~ "      --only-fuzzy            conserver les messages marqués « fuzzy »\n"
 #~ "      --no-obsolete           enlever les messages obsolètes #~\n"
 #~ "      --only-obsolete         conserver les messages obsolètes #~\n"
 
@@ -563,20 +501,15 @@ 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 ""
 #~ "Manipulation des attributs:\n"
-#~ "      --set-fuzzy             marquer tous les messages comme « fuzzy "
-#~ "»\n"
-#~ "      --clear-fuzzy           marquer tous les messages comme non-« "
-#~ "fuzzy »\n"
+#~ "      --set-fuzzy             marquer tous les messages comme « fuzzy »\n"
+#~ "      --clear-fuzzy           marquer tous les messages comme non-« fuzzy »\n"
 #~ "      --set-obsolete          marquer tous les messages comme obsolètes\n"
-#~ "      --clear-obsolete        marquer tous les messages comme non-"
-#~ "obsolètes\n"
+#~ "      --clear-obsolete        marquer tous les messages comme non-obsolètes\n"
 #~ "      --fuzzy                 identique à --only-fuzzy --clear-fuzzy\n"
-#~ "      --obsolete              identique à --only-obsolete --clear-"
-#~ "obsolete\n"
+#~ "      --obsolete              identique à --only-obsolete --clear-obsolete\n"
 
 #~ msgid ""
 #~ "Output details:\n"
@@ -585,34 +518,25 @@ 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 ""
 #~ "Détails de sortie:\n"
-#~ "  -e, --no-escape             éviter les échappement C en sortie "
-#~ "(implicite)\n"
-#~ "  -E, --escape                échappements C en sortie, éviter les 8-"
-#~ "bits\n"
+#~ "  -e, --no-escape             éviter les échappement C en sortie (implicite)\n"
+#~ "  -E, --escape                échappements C en sortie, éviter les 8-bits\n"
 #~ "      --force-po              produire un fichier PO, même vide\n"
 #~ "  -i, --indent                sortie en style indenté\n"
-#~ "      --no-location           ne pas produire les lignes « #: fichier:"
-#~ "ligne »\n"
-#~ "  -n, --add-location          générer les lignes de format « #: "
-#~ "fichier:ligne » (par défaut)\n"
-#~ "      --strict                générer un fichier .po avec conformité "
-#~ "stricte Uniforum\n"
+#~ "      --no-location           ne pas produire les lignes « #: fichier:ligne »\n"
+#~ "  -n, --add-location          générer les lignes de format « #: fichier:ligne » (par défaut)\n"
+#~ "      --strict                générer un fichier .po avec conformité stricte Uniforum\n"
 #~ "  -w, --width=COLONNES        limiter le nombre de COLONNES en sortie\n"
 #~ "  -s, --sort-output           générer une sortie triée\n"
-#~ "  -F, --sort-by-file          trier la sortie selon la localisation des "
-#~ "fichiers\n"
+#~ "  -F, --sort-by-file          trier la sortie selon la localisation des fichiers\n"
 
 #~ msgid "impossible selection criteria specified (%d < n < %d)"
 #~ msgstr "Critère de sélection irréalisable (%d < N < %d)"
@@ -627,19 +551,15 @@ 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 ""
 #~ "Concaténer et faire la fusion des ficheirs PO spécifiés.\n"
 #~ "Trouver les messages communs dans un ensemble de plus d'un fichier PO.\n"
-#~ "L'option « -> ou --more-than » exige un plus grand nombre d'occurrences "
-#~ "communes.\n"
-#~ "Inversement l'option « -< ou --less-than=2 » exige moins d'occurrences "
-#~ "communes, par exemple,\n"
-#~ "(i.e. « --less-than=2 » ne garde que les message uniques.  Les "
-#~ "traductions et commentaires\n"
+#~ "L'option « -> ou --more-than » exige un plus grand nombre d'occurrences communes.\n"
+#~ "Inversement l'option « -< ou --less-than=2 » exige moins d'occurrences communes, par exemple,\n"
+#~ "(i.e. « --less-than=2 » ne garde que les message uniques.  Les traductions et commentaires\n"
 #~ "sauf si l'option « --use-first » est spécifiée, seront cumulés et\n"
 #~ "proviennent du premier fichier PO où elles ont été définies.\n"
 #~ "Les positions de tous les fichiers PO seront cumulées.\n"
@@ -648,36 +568,30 @@ 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 ""
 #~ "Localisation des fichiers d'entrée:\n"
 #~ "  FICHIERS-D-ENTRÉE ...          fichiers d'entrée\n"
-#~ "  -f, --files-from=FICHIER       obtenir la liste des fichiers d'entrée "
-#~ "à partir du FICHIER\n"
-#~ "  -D, --directory=RÉPERTOIRE     ajouter le RÉPERTOIRE pour rechercher la "
-#~ "liste des fichiers d'entrée\n"
+#~ "  -f, --files-from=FICHIER       obtenir la liste des fichiers d'entrée à partir du FICHIER\n"
+#~ "  -D, --directory=RÉPERTOIRE     ajouter le RÉPERTOIRE pour rechercher la liste des fichiers d'entrée\n"
 #~ "Si le fichier d'entrée est -, lire de l'entrée standard.\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 ""
 #~ "Localisation du fichier de sortie:\n"
 #~ "  -o, --output-file=FICHIER      produire la sortie dans le FICHIER\n"
-#~ "Les résultats sont écrits sur la sortie standard si aucun fichier "
-#~ "n'est\n"
+#~ "Les résultats sont écrits sur la sortie standard si aucun fichier n'est\n"
 #~ "spécifié ou si -.\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"
@@ -685,64 +599,44 @@ msgstr ""
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
 #~ "Sélection de messages:\n"
-#~ "  -<, --less-than=N              montrer les messages définis moins de N "
-#~ "fois\n"
+#~ "  -<, --less-than=N              montrer les messages définis moins de N fois\n"
 #~ "                                 (sans limite par défaut)\n"
-#~ "  ->, --more-than=N              montrer les messages définis plus de N "
-#~ "fois\n"
-#~ "                                 (sans limite par défaut i.e. = à "
-#~ "zéro)\n"
-#~ "  -u, --unique                   identique à « -< 2 ou --less-than=2 "
-#~ "»\n"
+#~ "  ->, --more-than=N              montrer les messages définis plus de N fois\n"
+#~ "                                 (sans limite par défaut i.e. = à zéro)\n"
+#~ "  -u, --unique                   identique à « -< 2 ou --less-than=2 »\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 ""
 #~ "Détails de sortie:\n"
 #~ "  -t, --to-code=NOM           NOM de l'encodage de sortie\n"
-#~ "      --use-first             utiliser la première traduction disponible "
-#~ "pour chaque\n"
-#~ "                              message, ne pas faire la fusion de "
-#~ "plusieurs traductions\n"
-#~ "  -e, --no-escape             éviter les échappement C en sortie "
-#~ "(implicite)\n"
-#~ "  -E, --escape                échappements C en sortie, éviter les 8-"
-#~ "bits\n"
+#~ "      --use-first             utiliser la première traduction disponible pour chaque\n"
+#~ "                              message, ne pas faire la fusion de plusieurs traductions\n"
+#~ "  -e, --no-escape             éviter les échappement C en sortie (implicite)\n"
+#~ "  -E, --escape                échappements C en sortie, éviter les 8-bits\n"
 #~ "      --force-po              produire un fichier PO, même vide\n"
 #~ "  -i, --indent                sortie en style indenté\n"
-#~ "      --no-location           ne pas produire les lignes « #: fichier:"
-#~ "ligne »\n"
-#~ "  -n, --add-location          générer les lignes de format « #: "
-#~ "fichier:ligne » (par défaut)\n"
-#~ "      --strict                générer un fichier .po avec conformité "
-#~ "stricte Uniforum\n"
+#~ "      --no-location           ne pas produire les lignes « #: fichier:ligne »\n"
+#~ "  -n, --add-location          générer les lignes de format « #: fichier:ligne » (par défaut)\n"
+#~ "      --strict                générer un fichier .po avec conformité stricte Uniforum\n"
 #~ "  -w, --width=COLONNES        limiter le nombre de COLONNES en sortie\n"
 #~ "  -s, --sort-output           générer une sortie triée\n"
-#~ "  -F, --sort-by-file          trier la sortie selon la localisation des "
-#~ "fichiers\n"
+#~ "  -F, --sort-by-file          trier la sortie selon la localisation des fichiers\n"
 
 #~ msgid ""
 #~ "Informative output:\n"
@@ -765,20 +659,14 @@ 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"
-#~ msgstr ""
-#~ "Comparer deux fichiers .po style Uniforum et vérifier qu'ils "
-#~ "contiennent\n"
-#~ "le même ensemble de chaînes « msgid ».  Le fichier def.po contient "
-#~ "les vieilles\n"
-#~ "traductions.  Le fichier ref.pot est le dernier fichier PO récemment "
-#~ "créé ou un \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 ""
+#~ "Comparer deux fichiers .po style Uniforum et vérifier qu'ils contiennent\n"
+#~ "le même ensemble de chaînes « msgid ».  Le fichier def.po contient les vieilles\n"
+#~ "traductions.  Le fichier ref.pot est le dernier fichier PO récemment créé ou un \n"
 #~ "fichier patron PO (souvent créé par xgettext).\n"
 #~ "Cela vous permet de vérifier que vous avez traduit chacun des messages\n"
 #~ "de votre programme.  Lorsqu'un appariement exact n'est pas possible,\n"
@@ -788,23 +676,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 ""
 #~ "Localisation des fichiers d'entrée:\n"
 #~ "  def.po                      traductions\n"
 #~ "  ref.pot                     références aux sources\n"
-#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour rechercher la "
-#~ "liste des fichiers d'entrée\n"
+#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour rechercher la liste des fichiers d'entrée\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 ""
 #~ "Modificateurs d'opération:\n"
-#~ "  -m, --multi-domain          appliquer ref.pot à chaque domaine défini "
-#~ "dans def.po\n"
+#~ "  -m, --multi-domain          appliquer ref.pot à chaque domaine défini dans def.po\n"
 
 #~ msgid "this message is used but not defined..."
 #~ msgstr "ce message, utilisé, n'est pas défini..."
@@ -843,12 +727,9 @@ msgstr ""
 #~ "cumulated.\n"
 #~ msgstr ""
 #~ "Trouver les messages communs dans un ensemble de plus d'un fichier PO.\n"
-#~ "L'option « -> ou --more-than » exige un plus grand nombre d'occurrences "
-#~ "communes.\n"
-#~ "Inversement l'option « -< ou --less-than=2 » exige moins d'occurrences "
-#~ "communes, par exemple,\n"
-#~ "(i.e. « --less-than=2 » ne garde que les message uniques.  Les "
-#~ "traductions et commentaires\n"
+#~ "L'option « -> ou --more-than » exige un plus grand nombre d'occurrences communes.\n"
+#~ "Inversement l'option « -< ou --less-than=2 » exige moins d'occurrences communes, par exemple,\n"
+#~ "(i.e. « --less-than=2 » ne garde que les message uniques.  Les traductions et commentaires\n"
 #~ "sauf si l'option « --use-first » est spécifiée, seront cumulés et\n"
 #~ "proviennent du premier fichier PO où elles ont été définies.\n"
 #~ "Les positions de tous les fichiers PO seront cumulées.\n"
@@ -856,8 +737,7 @@ 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"
@@ -865,63 +745,43 @@ msgstr ""
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
 #~ "Sélection des messages:\n"
-#~ "  -<, --less-than=N              montrer les messages définis moins de N "
-#~ "fois\n"
+#~ "  -<, --less-than=N              montrer les messages définis moins de N fois\n"
 #~ "                                 (sans limite par défaut)\n"
-#~ "  ->, --more-than=N              montrer les messages définis plus de N "
-#~ "fois\n"
-#~ "                                 (sans limite par défaut i.e. = à "
-#~ "zéro)\n"
-#~ "  -u, --unique                   identique à « -< 2 ou --less-than=2 "
-#~ "»\n"
+#~ "  ->, --more-than=N              montrer les messages définis plus de N fois\n"
+#~ "                                 (sans limite par défaut i.e. = à zéro)\n"
+#~ "  -u, --unique                   identique à « -< 2 ou --less-than=2 »\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 ""
 #~ "Détails de sortie:\n"
-#~ "  -e, --no-escape             éviter les échappement C en sortie "
-#~ "(implicite)\n"
-#~ "  -E, --escape                échappements C en sortie, éviter les 8-"
-#~ "bits\n"
+#~ "  -e, --no-escape             éviter les échappement C en sortie (implicite)\n"
+#~ "  -E, --escape                échappements C en sortie, éviter les 8-bits\n"
 #~ "      --force-po              produire un fichier PO, même vide\n"
 #~ "  -i, --indent                sortie en style indenté\n"
-#~ "      --no-location           ne pas produire les lignes « #: fichier:"
-#~ "ligne »\n"
-#~ "  -n, --add-location          générer les lignes de format « #: "
-#~ "fichier:ligne » (par défaut)\n"
-#~ "      --strict                générer un fichier .po avec conformité "
-#~ "stricte Uniforum\n"
+#~ "      --no-location           ne pas produire les lignes « #: fichier:ligne »\n"
+#~ "  -n, --add-location          générer les lignes de format « #: fichier:ligne » (par défaut)\n"
+#~ "      --strict                générer un fichier .po avec conformité stricte Uniforum\n"
 #~ "  -w, --width=COLONNES        limiter le nombre de COLONNES en sortie\n"
 #~ "  -s, --sort-output           générer une sortie triée\n"
-#~ "  -F, --sort-by-file          trier la sortie selon la localisation des "
-#~ "fichiers\n"
-#~ "      --omit-header           omettre les en-têtes pour « msgid \"\" "
-#~ "»\n"
+#~ "  -F, --sort-by-file          trier la sortie selon la localisation des fichiers\n"
+#~ "      --omit-header           omettre les en-têtes pour « msgid \"\" »\n"
 
 #~ msgid "Converts a translation catalog to a different character encoding.\n"
-#~ msgstr ""
-#~ "Convertir un catalogue de traduction selon un encodage de caractères "
-#~ "différent.\n"
+#~ msgstr "Convertir un catalogue de traduction selon un encodage de caractères différent.\n"
 
 #~ msgid ""
 #~ "Conversion target:\n"
@@ -939,33 +799,25 @@ 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 ""
 #~ "Détails de sortie:\n"
-#~ "  -e, --no-escape             éviter les échappement C en sortie "
-#~ "(implicite)\n"
-#~ "  -E, --escape                échappements C en sortie, éviter les 8-"
-#~ "bits\n"
+#~ "  -e, --no-escape             éviter les échappement C en sortie (implicite)\n"
+#~ "  -E, --escape                échappements C en sortie, éviter les 8-bits\n"
 #~ "      --force-po              produire un fichier PO, même vide\n"
 #~ "  -i, --indent                sortie en style indenté\n"
-#~ "      --no-location           ne pas produire les ligne « #: fichier:"
-#~ "ligne »\n"
-#~ "      --add-location          produire les « #: fichier:ligne "
-#~ "» (implicite)\n"
-#~ "      --strict                produire un fichier PO strictement "
-#~ "Uniforum\n"
+#~ "      --no-location           ne pas produire les ligne « #: fichier:ligne »\n"
+#~ "      --add-location          produire les « #: fichier:ligne » (implicite)\n"
+#~ "      --strict                produire un fichier PO strictement Uniforum\n"
 #~ "  -w, --width=COLONNES        limiter le nombre de COLONNES en sortie\n"
 #~ "  -s, --sort-output           générer une sortie triée\n"
-#~ "  -F, --sort-by-file          trier la sortie selon la localisation des "
-#~ "fichiers\n"
+#~ "  -F, --sort-by-file          trier la sortie selon la localisation des fichiers\n"
 
 #~ msgid "no input file given"
 #~ msgstr "aucun fichier d'entrée fourni"
@@ -982,25 +834,20 @@ msgstr ""
 #~ "xgettext).  Untranslated entries are assigned a translation that is\n"
 #~ "identical to the msgid, and are marked fuzzy.\n"
 #~ msgstr ""
-#~ "Créer un catalogue anglais de traduction. Le fichier d'entrée est le "
-#~ "dernier\n"
-#~ "fichier PO anglais créé ou un fichier patron PO (généralement créé "
-#~ "par\n"
-#~ "xgettext).  Les entrées non traduites ont alors une traduction "
-#~ "contenant\n"
+#~ "Créer un catalogue anglais de traduction. Le fichier d'entrée est le dernier\n"
+#~ "fichier PO anglais créé ou un fichier patron PO (généralement créé par\n"
+#~ "xgettext).  Les entrées non traduites ont alors une traduction contenant\n"
 #~ "le texte du champ  « msgid » et sont marqués fuzzy.\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 ""
 #~ "Localisation du fichier d'entrée:\n"
 #~ "  FICHIER-D-ENTRÉE ...          fichier d'entrée PO ou POT\n"
-#~ "  -D, --directory=RÉPERTOIRE    ajouter le RÉPERTOIRE pour rechercher la "
-#~ "liste des fichiers d'entrée\n"
+#~ "  -D, --directory=RÉPERTOIRE    ajouter le RÉPERTOIRE pour rechercher la liste des fichiers d'entrée\n"
 #~ "Si le fichier d'entrée est -, lire de l'entrée standard.\n"
 
 #~ msgid "missing command name"
@@ -1016,40 +863,29 @@ msgstr ""
 #~ "msgexec's output.  msgexec's return code is the maximum return code\n"
 #~ "across all invocations.\n"
 #~ msgstr ""
-#~ "Appliquer la commande à toutes les traductions du catalogue de "
-#~ "traductions.\n"
-#~ "La COMMANDE peut être n'importe quel programme qui lit une traduction de "
-#~ "l'entrée\n"
-#~ "standard.  Elle est invoquée une fois pour chaque traduction.  Sa sortie "
-#~ "devient\n"
-#~ "la sortie de msgexec.  msgexec retourne un code qui correspond au maximum "
-#~ "du code de\n"
+#~ "Appliquer la commande à toutes les traductions du catalogue de traductions.\n"
+#~ "La COMMANDE peut être n'importe quel programme qui lit une traduction de l'entrée\n"
+#~ "standard.  Elle est invoquée une fois pour chaque traduction.  Sa sortie devient\n"
+#~ "la sortie de msgexec.  msgexec retourne un code qui correspond au maximum du code de\n"
 #~ "retour pour toutes les invocations.\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 ""
-#~ "Une commande spéciale interne appelée sorties « 0 » de traduction, "
-#~ "suivi par un\n"
-#~ "octet null.  La sortie de \"msgexec 0\" est acceptable comme entrée pour "
-#~ "\"xargs -0\".\n"
+#~ "Une commande spéciale interne appelée sorties « 0 » de traduction, suivi par un\n"
+#~ "octet null.  La sortie de \"msgexec 0\" est acceptable comme entrée pour \"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 ""
 #~ "Localisation du fichier d'entrée:\n"
 #~ "  FICHIER-D-ENTRÉE            fichier PO d'entrée\n"
-#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des "
-#~ "fichier d'entrée\n"
-#~ "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée "
-#~ "standard.\n"
+#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des fichier d'entrée\n"
+#~ "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée standard.\n"
 
 #~ msgid "write to stdout failed"
 #~ msgstr "échec d'écriture sur stdout"
@@ -1067,32 +903,24 @@ msgstr ""
 #~ msgstr "Usage: %s [OPTION] FILTRE [OPTIONS-DE-FILTRAGE]\n"
 
 #~ msgid "Applies a filter to all translations of a translation catalog.\n"
-#~ msgstr ""
-#~ "Appliquer un filtre à toutes les traductions d'un catalogue de "
-#~ "traductions.\n"
+#~ msgstr "Appliquer un filtre à toutes les traductions d'un catalogue de traductions.\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 ""
-#~ "Le FILTRE peut être n'importe quel programme qui lit une traduction à "
-#~ "partir\n"
-#~ "de l'entrée standard et qui modifie la traduction sur la sortie "
-#~ "standard.\n"
+#~ "Le FILTRE peut être n'importe quel programme qui lit une traduction à partir\n"
+#~ "de l'entrée standard et qui modifie la traduction sur la sortie standard.\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 ""
 #~ "Options utiles de FILTRE lorsque le filtre est « sed »:\n"
-#~ "  -e, --expression=SCRIPT     ajouter le SCRIPT aux commandes à "
-#~ "exécuter\n"
+#~ "  -e, --expression=SCRIPT     ajouter le SCRIPT aux commandes à exécuter\n"
 #~ "  -f, --file=FICHIER-SCRIPT   ajouter le contenu du FICHIER-SCRIPT\n"
 #~ "                                aux commandes à exécuter\n"
 #~ "  -n, --quiet, --silent       supprimer l'affichage automatique d'espace\n"
@@ -1103,46 +931,33 @@ 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 ""
 #~ "Détails de sortie:\n"
-#~ "      --no-escape             éviter les échappement C en sortie "
-#~ "(implicite)\n"
-#~ "  -E, --escape                échappements C en sortie, éviter les 8-"
-#~ "bits\n"
+#~ "      --no-escape             éviter les échappement C en sortie (implicite)\n"
+#~ "  -E, --escape                échappements C en sortie, éviter les 8-bits\n"
 #~ "      --force-po              produire un fichier PO, même vide\n"
 #~ "      --indent                sortie en style indenté\n"
-#~ "      --keep-header           conserver l'en-tête sans la modifier, ne "
-#~ "pas la filtrer\n"
+#~ "      --keep-header           conserver l'en-tête sans la modifier, ne pas la filtrer\n"
 #~ "      --no-location           ne pas produire les « #: FICHIER:LIGNE »\n"
-#~ "      --add-location          produire les « #: FICHIER:LIGNE "
-#~ "» (implicite)\n"
-#~ "      --strict                produire un fichier PO strictement "
-#~ "Uniforum\n"
+#~ "      --add-location          produire les « #: FICHIER:LIGNE » (implicite)\n"
+#~ "      --strict                produire un fichier PO strictement Uniforum\n"
 #~ "  -w, --width=COLONNES        limiter le nombre de COLONNES en sortie\n"
-#~ "      --no-wrap               ne pas briser les lignes de longs messages "
-#~ "plus longues que\n"
-#~ "                              que la largeur des pages de sortie en "
-#~ "plusieurs lignes\n"
+#~ "      --no-wrap               ne pas briser les lignes de longs messages plus longues que\n"
+#~ "                              que la largeur des pages de sortie en plusieurs lignes\n"
 #~ "  -s, --sort-output           générer une sortie triée\n"
-#~ "  -F, --sort-by-file          trier la sortie selon la localisation des "
-#~ "fichiers\n"
+#~ "  -F, --sort-by-file          trier la sortie selon la localisation des fichiers\n"
 
 #~ msgid "cannot set up nonblocking I/O to %s subprocess"
-#~ msgstr ""
-#~ "ne peut opérer les Entrées/Sorties en mode non bloquant pour le sous-"
-#~ "processus %s"
+#~ msgstr "ne peut opérer les Entrées/Sorties en mode non bloquant pour le sous-processus %s"
 
 #~ msgid "communication with %s subprocess failed"
 #~ msgstr "échec de communication avec le sous-processus %s"
@@ -1151,8 +966,7 @@ msgstr ""
 #~ msgstr "échec de lecture du sous-processus %s"
 
 #~ msgid "%s subprocess terminated with exit code %d"
-#~ msgstr ""
-#~ "fin d'exécution du sous-processus %s avec le code de terminaison %d"
+#~ msgstr "fin d'exécution du sous-processus %s avec le code de terminaison %d"
 
 #~ msgid "the argument to %s should be a single punctuation character"
 #~ msgstr "l'argument de %s devrait être un simple caractère de ponctuation"
@@ -1187,41 +1001,30 @@ msgstr ""
 #~ msgid "Usage: %s [OPTION] filename.po ...\n"
 #~ msgstr "Usage: %s [OPTION] nom-de-fichier.po ...\n"
 
-#~ msgid ""
-#~ "Generate binary message catalog from textual translation description.\n"
-#~ msgstr ""
-#~ "Générer un catalogue binaire de messages à partir de la description "
-#~ "des traductions textuelles.\n"
+#~ msgid "Generate binary message catalog from textual translation description.\n"
+#~ msgstr "Générer un catalogue binaire de messages à partir de la description des traductions textuelles.\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 ""
 #~ "Localisation du fichier d'entrée:\n"
 #~ "  nom-du-fichier.po ...       fichier PO d'entrée\n"
-#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des "
-#~ "fichiers d'entrée\n"
-#~ "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée "
-#~ "standard.\n"
+#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des fichiers d'entrée\n"
+#~ "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée standard.\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 ""
 #~ "Mode d'exécution:\n"
-#~ "  -j, --java                  mode Java: générer une classe "
-#~ "ResourceBundle en Java\n"
-#~ "      --java2                 identique à --java et assume Java2 (i.e. "
-#~ "JDK 1.2 ou plus)\n"
-#~ "      --tcl                   mode Tcl: générer un fichier .msg  tcl/"
-#~ "msgcat\n"
+#~ "  -j, --java                  mode Java: générer une classe ResourceBundle en Java\n"
+#~ "      --java2                 identique à --java et assume Java2 (i.e. JDK 1.2 ou plus)\n"
+#~ "      --tcl                   mode Tcl: générer un fichier .msg  tcl/msgcat\n"
 
 #~ msgid ""
 #~ "Output file location:\n"
@@ -1230,98 +1033,70 @@ msgstr ""
 #~ "If output file is -, output is written to standard output.\n"
 #~ msgstr ""
 #~ "Localisation du fichier de sortie:\n"
-#~ "  -o, --output-file=FICHIER   écrire la sortie dans le FICHIER "
-#~ "spécifié\n"
-#~ "      --strict                permettre le mode de conformité strict au "
-#~ "mode Uniforum\n"
-#~ "Si le fichier de sortie est -, la sortie est produite sur la sortie "
-#~ "standard.\n"
+#~ "  -o, --output-file=FICHIER   écrire la sortie dans le FICHIER spécifié\n"
+#~ "      --strict                permettre le mode de conformité strict au mode Uniforum\n"
+#~ "Si le fichier de sortie est -, la sortie est produite sur la sortie standard.\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 ""
 #~ "Localisation du fichier de sortie en mode Java:\n"
 #~ "  -r, --resource=RESSOURCE  nom de la ressource\n"
-#~ "  -l, --locale=LOCALE       nom de la locale, soit langage ou "
-#~ "language_COUNTRY\n"
-#~ "Le nom de la classe est déterminé en ajoutant le nom de la locale au "
-#~ "nom de la ressource,\n"
-#~ "séparé par un souligné. L'option -d est obligatoire. La classe est "
-#~ "produite\n"
+#~ "  -l, --locale=LOCALE       nom de la locale, soit langage ou language_COUNTRY\n"
+#~ "Le nom de la classe est déterminé en ajoutant le nom de la locale au nom de la ressource,\n"
+#~ "séparé par un souligné. L'option -d est obligatoire. La classe est produite\n"
 #~ "dans le répertoire spécifié.\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"
 #~ msgstr ""
 #~ "Localisation du fichier de sortie en mode Tcl:\n"
-#~ "  -l, --locale=LOCALE       nom de la locale, soit langage ou "
-#~ "language_COUNTRY\n"
-#~ "  -d RÉPERTOIRE             répertoire de base des catalogues de "
-#~ "messages .msg\n"
+#~ "  -l, --locale=LOCALE       nom de la locale, soit langage ou language_COUNTRY\n"
+#~ "  -d RÉPERTOIRE             répertoire de base des catalogues de messages .msg\n"
 #~ "Les options -l et -d sont obligatoires. Le fichier .msg est écrit dans\n"
 #~ "le répertoire spécifié.\n"
 
 #~ 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 ""
 #~ "Interprétation du fichier d'entrée:\n"
-#~ "  -c, --check                 faire toutes les vérifications "
-#~ "équivalentes à \n"
-#~ "                                --check-format, --check-header, --check-"
-#~ "domain\n"
-#~ "      --check-format          vérifier la dépendance du format des "
-#~ "chaîne au langage\n"
-#~ "      --check-header          vérifier la présence et le contenu des en-"
-#~ "têtes\n"
-#~ "      --check-domain          vérifier la présence de conflit entre les "
-#~ "directives du domaine\n"
+#~ "  -c, --check                 faire toutes les vérifications équivalentes à \n"
+#~ "                                --check-format, --check-header, --check-domain\n"
+#~ "      --check-format          vérifier la dépendance du format des chaîne au langage\n"
+#~ "      --check-header          vérifier la présence et le contenu des en-têtes\n"
+#~ "      --check-domain          vérifier la présence de conflit entre les directives du domaine\n"
 #~ "                                et l'option --output-file\n"
-#~ "  -C, --check-compatibility   vérifier que GNU msgfmt se comporte comme "
-#~ "X/Open msgfmt\n"
-#~ "  -f, --use-fuzzy             utiliser les entrées floues pour la "
-#~ "sortie\n"
+#~ "  -C, --check-compatibility   vérifier que GNU msgfmt se comporte comme X/Open msgfmt\n"
+#~ "  -f, --use-fuzzy             utiliser les entrées floues pour la sortie\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 ""
 #~ "Détails de sortie:\n"
-#~ "  -a, --alignment=NOMBRE      aligner les chaînes selon le NOMBRE "
-#~ "d'octets (%d par défaut)\n"
-#~ "      --no-hash               ne pas inclure la table de hachage dans le "
-#~ "fichier binaire\n"
+#~ "  -a, --alignment=NOMBRE      aligner les chaînes selon le NOMBRE d'octets (%d par défaut)\n"
+#~ "      --no-hash               ne pas inclure la table de hachage dans le fichier binaire\n"
 
 #~ msgid ""
 #~ "Informative output:\n"
@@ -1334,17 +1109,13 @@ msgstr ""
 #~ "  -h, --help                  fournir ce message d'aide, puis terminer\n"
 #~ "  -V, --version               identifier le programme, puis terminer\n"
 #~ "      --statistics            afficher les statistiques de traductions\n"
-#~ "  -v, --verbose               diagnostiquer toute anomalie dans chaque "
-#~ "FICHIER\n"
+#~ "  -v, --verbose               diagnostiquer toute anomalie dans chaque FICHIER\n"
 
 #~ msgid "plural expression can produce negative values"
 #~ msgstr "L'expression au pluriel peut produire des valeurs négatives."
 
-#~ 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"
+#~ 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"
 
 #~ msgid "plural expression can produce division by zero"
 #~ msgstr "L'expression au pluriel peut produire une division par zéro."
@@ -1352,20 +1123,14 @@ msgstr ""
 #~ msgid "plural expression can produce integer overflow"
 #~ msgstr "L'expression au pluriel peut produire un débordement d'entier"
 
-#~ msgid ""
-#~ "plural expression can produce arithmetic exceptions, possibly division by "
-#~ "zero"
-#~ msgstr ""
-#~ "L'expression au pluriel peut produire une exception arithmétique, "
-#~ "possiblement une division par zéro"
+#~ msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+#~ msgstr "L'expression au pluriel peut produire une exception arithmétique, possiblement une division par zéro"
 
 #~ msgid "message catalog has plural form translations..."
-#~ msgstr ""
-#~ "le catalogue de messages contient des formes de traduction au pluriel..."
+#~ msgstr "le catalogue de messages contient des formes de traduction au pluriel..."
 
 #~ msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
-#~ msgstr ""
-#~ "...mais l'attribut « plural=EXPRESSION » est absente de l'en-tête"
+#~ msgstr "...mais l'attribut « plural=EXPRESSION » est absente de l'en-tête"
 
 #~ msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
 #~ msgstr "...mais l'attribut « nplurals=ENTIER » est absent de l'en-tête"
@@ -1381,10 +1146,8 @@ msgstr ""
 
 #~ msgid "...but some messages have only one plural form"
 #~ msgid_plural "...but some messages have only %lu plural forms"
-#~ msgstr[0] ""
-#~ "...mais quelques messages n'ont seulement qu'une forme au pluriel"
-#~ msgstr[1] ""
-#~ "...mais quelques messages n'ont seulement que %lu formes au pluriel"
+#~ msgstr[0] "...mais quelques messages n'ont seulement qu'une forme au pluriel"
+#~ msgstr[1] "...mais quelques messages n'ont seulement que %lu formes au pluriel"
 
 #~ msgid "...but some messages have one plural form"
 #~ msgid_plural "...but some messages have %lu plural forms"
@@ -1394,51 +1157,32 @@ msgstr ""
 #~ msgid "Try using the following, valid for %s:\n"
 #~ msgstr "Essayer d'utiliser ce qui suit, valide pour %s:\n"
 
-#~ 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 formes de traduction au pluriel, "
-#~ "mais l'entrée \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\" est "
-#~ "manquante"
+#~ 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 formes de traduction au pluriel, mais l'entrée \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\" est manquante"
 
 #~ msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
-#~ msgstr ""
-#~ "les chaînes « msgid » et « msgid_plural » ne débutent pas par « "
-#~ "\\n »"
+#~ msgstr "les chaînes « msgid » et « msgid_plural » ne débutent pas par « \\n »"
 
 #~ msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
-#~ msgstr ""
-#~ "les chaînes « msgid » et « msgstr[%u] » ne débutent pas par « \\n "
-#~ "»"
+#~ msgstr "les chaînes « msgid » et « msgstr[%u] » ne débutent pas par « \\n »"
 
 #~ msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
-#~ msgstr ""
-#~ "les chaînes « msgid » et « msgstr » ne débutent pas par « \\n »"
+#~ msgstr "les chaînes « msgid » et « msgstr » ne débutent pas par « \\n »"
 
 #~ msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
-#~ msgstr ""
-#~ "les chaînes « msgid » et « msgid_plural » ne se terminent pas par « "
-#~ "\\n »"
+#~ msgstr "les chaînes « msgid » et « msgid_plural » ne se terminent pas par « \\n »"
 
 #~ msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
-#~ msgstr ""
-#~ "les chaînes « msgid » et « msgstr[%u] » ne se terminent pas par « "
-#~ "\\n »"
+#~ msgstr "les chaînes « msgid » et « msgstr[%u] » ne se terminent pas par « \\n »"
 
 #~ msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
-#~ msgstr ""
-#~ "l'une des chaînes « msgid » ou « msgstr » se termine par « \\n », "
-#~ "l'autre pas"
+#~ msgstr "l'une des chaînes « msgid » ou « msgstr » se termine par « \\n », l'autre pas"
 
 #~ msgid "plural handling is a GNU gettext extension"
-#~ msgstr ""
-#~ "le traitement des chaînes au pluriel est une extention de GNU gettext"
+#~ msgstr "le traitement des chaînes au pluriel est une extention de GNU gettext"
 
 #~ msgid "'%s' is not a valid %s format string, unlike 'msgid'"
-#~ msgstr ""
-#~ "« %s » n'a pas une chaîne de format %s valide, contrairement à « "
-#~ "msgid »"
+#~ msgstr "« %s » n'a pas une chaîne de format %s valide, contrairement à « msgid »"
 
 #~ msgid "msgstr lacks the keyboard accelerator mark '%c'"
 #~ msgstr "« msgstr » n'a pas de raccourci clavier pour la marque « %c »"
@@ -1450,12 +1194,10 @@ msgstr ""
 #~ msgstr "Le champ en-tête « %s » est absent de l'en-tête\n"
 
 #~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr ""
-#~ "Le champ en-tête « %s » devrait s'appuyer au début de la ligne\n"
+#~ msgstr "Le champ en-tête « %s » devrait s'appuyer au début de la ligne\n"
 
 #~ msgid "some header fields still have the initial default value\n"
-#~ msgstr ""
-#~ "Quelques champs en-tête ont toujours leur valeur initiale par défaut\n"
+#~ msgstr "Quelques champs en-tête ont toujours leur valeur initiale par défaut\n"
 
 #~ msgid "field `%s' still has initial default value\n"
 #~ msgstr "le champ « %s » a toujours sa valeur initiale par défaut\n"
@@ -1470,16 +1212,13 @@ msgstr ""
 #~ msgstr "AVERTISSEMENT: l'en-tête du fichier PO est floue\n"
 
 #~ msgid "warning: older versions of msgfmt will give an error on this\n"
-#~ msgstr ""
-#~ "AVERTISSEMENT: les vieilles versions de msgfmt donneront une erreur là "
-#~ "dessus\n"
+#~ msgstr "AVERTISSEMENT: les vieilles versions de msgfmt donneront une erreur là dessus\n"
 
 #~ msgid "domain name \"%s\" not suitable as file name"
 #~ msgstr "« %s » n'est pas approprié comme nom de domaine"
 
 #~ msgid "domain name \"%s\" not suitable as file name: will use prefix"
-#~ msgstr ""
-#~ "domaine « %s » inadéquat comme nom de fichier: utilisera un préfixe"
+#~ msgstr "domaine « %s » inadéquat comme nom de fichier: utilisera un préfixe"
 
 #~ msgid "`domain %s' directive ignored"
 #~ msgstr "la directive « domain %s » sera ignorée"
@@ -1494,28 +1233,22 @@ msgstr ""
 #~ msgstr "%s: AVERTISSEMENT: certaines traductions sont approximatives"
 
 #~ msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
-#~ msgstr ""
-#~ "l'option « %c » ne peut être utilisée avant que « K » ou « T » ne "
-#~ "soit spécifié"
+#~ msgstr "l'option « %c » ne peut être utilisée avant que « K » ou « T » ne soit spécifié"
 
 #~ 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 ""
-#~ "Extraire tous les messages du catalogue de traduction qui concordent "
-#~ "avec\n"
+#~ "Extraire tous les messages du catalogue de traduction qui concordent avec\n"
 #~ "un patron particulier ou qui appartiennent à un fichier source donné.\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"
@@ -1528,13 +1261,11 @@ 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"
@@ -1542,43 +1273,28 @@ msgstr ""
 #~ "Sélection de messages:\n"
 #~ "  [-N FICHIER-SOURCE]... [-M DOMAINE]...\n"
 #~ "  [-K PATRON-MSGID] [-T PATRON-MSGSTR] [-C PATRON-COMMENTAIRE]\n"
-#~ "Un message est sélectionné s'il provient d'un des fichiers sources "
-#~ "spécifiés,\n"
+#~ "Un message est sélectionné s'il provient d'un des fichiers sources spécifiés,\n"
 #~ "ou s'il provient d'un des domaines spécifiés,\n"
-#~ "ou si -K est fourni et ses clés (msgid ou msgid_plural) concordent avec "
-#~ "le PATRON-MSGID,\n"
-#~ "ou si -T est fourni et ses traductions (msgstr) concordent avec le PATRON-"
-#~ "MSGSTR.\n"
-#~ "ou si -C est fourni et les commentaires du traducteurs concordent avec le "
-#~ "PATRON-COMMENTAIRE.\n"
+#~ "ou si -K est fourni et ses clés (msgid ou msgid_plural) concordent avec le PATRON-MSGID,\n"
+#~ "ou si -T est fourni et ses traductions (msgstr) concordent avec le PATRON-MSGSTR.\n"
+#~ "ou si -C est fourni et les commentaires du traducteurs concordent avec le PATRON-COMMENTAIRE.\n"
 #~ "\n"
-#~ "Lorsque plus d'un critère de sélection est spécifié, l'ensemble des "
-#~ "messages\n"
-#~ "sélectionnés est l'union des messages sélectionnés de chaque "
-#~ "critère.\n"
+#~ "Lorsque plus d'un critère de sélection est spécifié, l'ensemble des messages\n"
+#~ "sélectionnés est l'union des messages sélectionnés de chaque critère.\n"
 #~ "\n"
 #~ "Syntaxe de PATRON-MSGID ou PATRON-MSGSTR:\n"
 #~ "  [-E | -F] [-e PATRON | -f FICHIER]...\n"
-#~ "le PATRON est une expression régulière de base par défaut ou une "
-#~ "expression\n"
-#~ "régulière étendue si -E est fourni ou une chaîne fixe si -F est "
-#~ "fourni.\n"
+#~ "le PATRON est une expression régulière de base par défaut ou une expression\n"
+#~ "régulière étendue si -E est fourni ou une chaîne fixe si -F est fourni.\n"
 #~ "\n"
-#~ "  -N, --location=FICHIER-SOURCE extraire les messages à partir du FCHIER-"
-#~ "SOURCE\n"
-#~ "  -M, --domain=DOMAINE          extraire les messages appartenant au "
-#~ "DOMAINE\n"
-#~ "  -K, --msgid                   début des patrons pour les chaînes "
-#~ "msgid\n"
-#~ "  -T, --msgstr                  début des patrons pour les chaînes "
-#~ "msgstr\n"
-#~ "  -E, --extended-regexp         PATRON est une expression régulière "
-#~ "étendue\n"
-#~ "  -F, --fixed-strings           PATRON est un ensemble de chaînes "
-#~ "séparées\n"
+#~ "  -N, --location=FICHIER-SOURCE extraire les messages à partir du FCHIER-SOURCE\n"
+#~ "  -M, --domain=DOMAINE          extraire les messages appartenant au DOMAINE\n"
+#~ "  -K, --msgid                   début des patrons pour les chaînes msgid\n"
+#~ "  -T, --msgstr                  début des patrons pour les chaînes msgstr\n"
+#~ "  -E, --extended-regexp         PATRON est une expression régulière étendue\n"
+#~ "  -F, --fixed-strings           PATRON est un ensemble de chaînes séparées\n"
 #~ "                                 par des retours de chariot\n"
-#~ "  -e, --regexp=PATRON           utiliser le PATRON comme expression "
-#~ "régulière\n"
+#~ "  -e, --regexp=PATRON           utiliser le PATRON comme expression régulière\n"
 #~ "  -f, --file=FICHIER            obtenir le patron à partir du FICHIER\n"
 #~ "  -i, --ignore-case             ignorer la distinction liée à la casse\n"
 
@@ -1589,32 +1305,25 @@ 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 ""
 #~ "Détails de sortie:\n"
-#~ "      --no-escape             éviter les échappement C en sortie "
-#~ "(implicite)\n"
-#~ "      --escape                échappements C en sortie, éviter les 8-"
-#~ "bits\n"
+#~ "      --no-escape             éviter les échappement C en sortie (implicite)\n"
+#~ "      --escape                échappements C en sortie, éviter les 8-bits\n"
 #~ "      --force-po              produire un fichier PO, même vide\n"
 #~ "      --indent                sortie en style indenté\n"
 #~ "      --no-location           ne pas produire les « #: fichier:ligne »\n"
-#~ "      --add-location          produire les « #: fichier:ligne "
-#~ "» (implicite)\n"
-#~ "      --strict                produire un fichier PO strictement "
-#~ "Uniforum\n"
+#~ "      --add-location          produire les « #: fichier:ligne » (implicite)\n"
+#~ "      --strict                produire un fichier PO strictement Uniforum\n"
 #~ "  -w, --width=COLONNES        limiter le nombre de COLONNES en sortie\n"
 #~ "      --sort-output           générer une sortie triée\n"
-#~ "      --sort-by-file          trier la sortie selon la localisation des "
-#~ "fichiers\n"
+#~ "      --sort-by-file          trier la sortie selon la localisation des fichiers\n"
 
 #~ msgid "write to grep subprocess failed"
 #~ msgstr "écriture vers le sous-processus de grep a échoué"
@@ -1626,8 +1335,7 @@ msgstr ""
 #~ msgstr ""
 #~ "Vous êtes dans un environnement indifférent au langage.  SVP\n"
 #~ "définir votre variable d'environnement LANG, tel que décrit dans\n"
-#~ "le fichier ABOUT-NLS. Cela est nécessaire afin de tester votre "
-#~ "traduction.\n"
+#~ "le fichier ABOUT-NLS. Cela est nécessaire afin de tester votre traduction.\n"
 
 #~ msgid ""
 #~ "Output file %s already exists.\n"
@@ -1642,63 +1350,49 @@ msgstr ""
 #~ msgstr "%s créé.\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 ""
-#~ "Créer un nouveau fichier PO en initialisant la méta-information avec "
-#~ "des valeurs\n"
+#~ "Créer un nouveau fichier PO en initialisant la méta-information avec des valeurs\n"
 #~ "provenant de l'environnement de l'usager.\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 ""
 #~ "Localisation du fichier d'entrée:\n"
 #~ " -i, --input=FICHIER-D-ENTRÉE fichier POT d'entrée\n"
-#~ " -D, --directory=RÉPERTOIRE   ajouter le RÉPERTOIRE pour la recherche des "
-#~ "fichiers d'entrée\n"
-#~ "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée "
-#~ "standard.\n"
+#~ " -D, --directory=RÉPERTOIRE   ajouter le RÉPERTOIRE pour la recherche des fichiers d'entrée\n"
+#~ "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée standard.\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 ""
 #~ "Localisation du fichier de sortie:\n"
-#~ "  -o, --output-file=FICHIER   écrire la sortie dans le FICHIER "
-#~ "spécifié\n"
-#~ "Si aucun fichier de sortie n'est spécifié, la sortie est produite selon "
-#~ "l'option\n"
-#~ "--locale ou selon celle de l'usager. Si la sortie est -, les résultats "
-#~ "sont écrits\n"
+#~ "  -o, --output-file=FICHIER   écrire la sortie dans le FICHIER spécifié\n"
+#~ "Si aucun fichier de sortie n'est spécifié, la sortie est produite selon l'option\n"
+#~ "--locale ou selon celle de l'usager. Si la sortie est -, les résultats sont écrits\n"
 #~ "sur la sortie standard.\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 ""
 #~ "Détails de sortie:\n"
 #~ "  -l, --locale=LL_CC          définir la locale cible\n"
-#~ "      --no-translator         assumer que le fichier PO est "
-#~ "automatiquement généré\n"
+#~ "      --no-translator         assumer que le fichier PO est automatiquement généré\n"
 #~ "  -w, --width=NOMBRE          initialiser la largeur de page\n"
-#~ "      --no-wrap               ne pas briser les lignes de longs messages "
-#~ "plus longues que\n"
-#~ "                              que la largeur des pages de sortie en "
-#~ "plusieurs lignes\n"
+#~ "      --no-wrap               ne pas briser les lignes de longs messages plus longues que\n"
+#~ "                              que la largeur des pages de sortie en plusieurs lignes\n"
 
 #~ msgid ""
 #~ "Found more than one .pot file.\n"
@@ -1727,14 +1421,11 @@ msgstr ""
 #~ msgstr "échec du sous-processus %s avec le code de fin d'exécution %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 ""
-#~ "Le nouveau catalogue de messages devrait contenir votre adresse de "
-#~ "courrier,\n"
+#~ "Le nouveau catalogue de messages devrait contenir votre adresse de courrier,\n"
 #~ "de telle manière que les usagers puissent vous donner du feedabck\n"
 #~ "à propos des traductions et de telle sorte que le mainteneur puisse\n"
 #~ "vous contacter dans le cas d'erreurs techniques inattendues.\n"
@@ -1746,22 +1437,13 @@ msgstr ""
 #~ msgstr "le présent charset « %s » n'a pas un nom d'encodage portable"
 
 #~ msgid "two different charsets \"%s\" and \"%s\" in input file"
-#~ msgstr ""
-#~ "deux charsets différents « %s » et « %s » dans le fichier d'entrée"
+#~ msgstr "deux charsets différents « %s » et « %s » dans le fichier d'entrée"
 
-#~ msgid ""
-#~ "input file `%s' doesn't contain a header entry with a charset "
-#~ "specification"
-#~ msgstr ""
-#~ "le fichier d'entrée « %s » ne contient pas d'en-tête ayant une "
-#~ "spécification de charset"
+#~ msgid "input file `%s' doesn't contain a header entry with a charset specification"
+#~ msgstr "le fichier d'entrée « %s » ne contient pas d'en-tête ayant une spécification de charset"
 
-#~ msgid ""
-#~ "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
-#~ "charset specification"
-#~ msgstr ""
-#~ "Le domaine « %s » dans le fichier d'entrée « %s » ne contient pas "
-#~ "d'en-tête avec la spécification d'un charset"
+#~ msgid "domain \"%s\" in input file `%s' doesn't contain a header entry with a charset specification"
+#~ msgstr "Le domaine « %s » dans le fichier d'entrée « %s » ne contient pas d'en-tête avec la spécification d'un charset"
 
 #~ msgid "target charset \"%s\" is not a portable encoding name."
 #~ msgstr "Le charset cible « %s » n'a pas un nom d'encodage portable."
@@ -1773,21 +1455,17 @@ msgstr ""
 #~ "Input files contain messages in different encodings, UTF-8 among others.\n"
 #~ "Converting the output to UTF-8.\n"
 #~ msgstr ""
-#~ "Fichier d'entrée contiennent des messages encodés différemment, UTF-8 "
-#~ "entre autres.\n"
+#~ "Fichier d'entrée contiennent des messages encodés différemment, UTF-8 entre autres.\n"
 #~ "Conversion de la sortie en UTF-8.\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 ""
-#~ "Les fichiers d'entrée contiennent des messages encodés différemment, "
-#~ "%s et %s entre autres.\n"
+#~ "Les fichiers d'entrée contiennent des messages encodés différemment, %s et %s entre autres.\n"
 #~ "Conversion de la sortie en format UTF-8.\n"
-#~ "Pour sélectionner un encodage différent de sortie, utiliser l'option --"
-#~ "to-code.\n"
+#~ "Pour sélectionner un encodage différent de sortie, utiliser l'option --to-code.\n"
 
 #~ msgid ""
 #~ "Locale charset \"%s\" is different from\n"
@@ -1808,8 +1486,7 @@ msgstr ""
 #~ "  then apply '%s',\n"
 #~ "  then convert back to %s using 'msgconv'.\n"
 #~ msgstr ""
-#~ "- convertir le catalogue de traduction vers %s en utilisant « msgconv  "
-#~ "»,\n"
+#~ "- convertir le catalogue de traduction vers %s en utilisant « msgconv  »,\n"
 #~ "  puis appliquer « %s »,\n"
 #~ "  et convertir à noveau vers %s en utilisant « msgconv ».\n"
 
@@ -1820,8 +1497,7 @@ msgstr ""
 #~ "  then convert back to %s using 'msgconv'.\n"
 #~ msgstr ""
 #~ "- définir LC_ALL en une locale ayant l'encodage %s,\n"
-#~ "  convertir le catalogue de traduction vers %s en utilisant « msgconv "
-#~ "»,\n"
+#~ "  convertir le catalogue de traduction vers %s en utilisant « msgconv »,\n"
 #~ "  puis appliquer « %s »,\n"
 #~ "  et convertir à nouveau vers %s en utlisant « msgconv ».\n"
 
@@ -1837,25 +1513,14 @@ msgstr ""
 #~ msgid "conversion failure"
 #~ msgstr "échec de conversion"
 
-#~ msgid ""
-#~ "input file doesn't contain a header entry with a charset specification"
-#~ msgstr ""
-#~ "Le fichier d'entrée ne contient pas d'en-tête avec la spécification "
-#~ "d'un charset"
+#~ msgid "input file doesn't contain a header entry with a charset specification"
+#~ msgstr "Le fichier d'entrée ne contient pas d'en-tête avec la spécification d'un charset"
 
-#~ msgid ""
-#~ "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() "
-#~ "does not support this conversion."
-#~ msgstr ""
-#~ "Ne peut convertir de « %s » vers « %s ». %s s'appuie sur iconv() qui "
-#~ "ne supporte pas cette conversion."
+#~ msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
+#~ msgstr "Ne peut convertir de « %s » vers « %s ». %s s'appuie sur iconv() qui ne supporte pas cette conversion."
 
-#~ msgid ""
-#~ "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version "
-#~ "was built without iconv()."
-#~ msgstr ""
-#~ "Ne peut convertir de « %s » vers « %s ». %s s'appuie sur iconv(). "
-#~ "Cette version a été compilée sans iconv()."
+#~ msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
+#~ msgstr "Ne peut convertir de « %s » vers « %s ». %s s'appuie sur iconv(). Cette version a été compilée sans iconv()."
 
 #~ msgid "backup type"
 #~ msgstr "type d'archive"
@@ -1864,25 +1529,21 @@ 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"
 #~ "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 ""
-#~ "Fusionner deux fichiers PO de style Uniforum ensemble.  Le fichier def.po "
-#~ "contient les\n"
+#~ "Fusionner deux fichiers PO de style Uniforum ensemble.  Le fichier def.po contient les\n"
 #~ "anciennes traductions qui sont transportées au fichier nouvellement\n"
 #~ "créé dans la mesure où les chaînes à traduire se correspondent; les\n"
 #~ "commentaires sont préservés, mais les commentaires automatiquement\n"
 #~ "extraits et les positions dans le fichiers sont éliminés.  Le fichier\n"
 #~ "ref.po est le dernier fichier PO créé avec les mises à jour, mais\n"
-#~ "les vieilles traductions ou le fichier de patron PO (généralement "
-#~ "créé par xgettext);\n"
-#~ "toute traduction ou commentaire en sera éliminé, toutefois les "
-#~ "commentaires « . » et\n"
+#~ "les vieilles traductions ou le fichier de patron PO (généralement créé par xgettext);\n"
+#~ "toute traduction ou commentaire en sera éliminé, toutefois les commentaires « . » et\n"
 #~ "les positions de fichier seront conservés.  Lorsqu'un appariement\n"
 #~ "exact n'est pas possible, un appariement flou permet de produire de\n"
 #~ "meilleurs résultats. \n"
@@ -1891,20 +1552,15 @@ 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 ""
 #~ "Localisation du fichier d'entrée:\n"
-#~ "  def.po                      traductions se référant aux vieux "
-#~ "sources\n"
+#~ "  def.po                      traductions se référant aux vieux sources\n"
 #~ "  ref.pot                     références aux nouveaux sources\n"
-#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des "
-#~ "fichiers d'entrée\n"
-#~ "  -C, --compendium=FICHIER    librairie additionnelle de messages "
-#~ "traduits,\n"
+#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des fichiers d'entrée\n"
+#~ "  -C, --compendium=FICHIER    librairie additionnelle de messages traduits,\n"
 #~ "                              peut-être spécifié plus d'une fois\n"
 
 #~ msgid ""
@@ -1914,42 +1570,34 @@ msgstr ""
 #~ msgstr ""
 #~ "Mode d'exécution:\n"
 #~ "  -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"
 
 #~ 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"
+#~ "The backup suffix is `~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
 #~ "environment variable.\n"
 #~ msgstr ""
 #~ "Localisation du fichier de sortie en mode mise-à-jour:\n"
 #~ "Le résultat est réécrit dans le fichier def.po.\n"
 #~ "      --backup=CONTRÔLE       produire une archive de def.po\n"
 #~ "      --suffix=SUFFIXE        écraser le suffixe usuel d'archive\n"
-#~ "La méthdode de contrôle de version peut être sélectionné à l'aide "
-#~ "de l'option --backup ou\n"
-#~ "par la variable d'environnement VERSION_CONTROL.  En voici les valeurs "
-#~ "possibles:\n"
-#~ "  none, off                   ne jamais produire d'archive (même si --"
-#~ "backup est spécifiée)\n"
+#~ "La méthdode de contrôle de version peut être sélectionné à l'aide de l'option --backup ou\n"
+#~ "par la variable d'environnement VERSION_CONTROL.  En voici les valeurs possibles:\n"
+#~ "  none, off                   ne jamais produire d'archive (même si --backup est spécifiée)\n"
 #~ "  numbered, t                 produire des archives numérotées\n"
-#~ "  existing, nil               numéroter si des archives numérotées "
-#~ "existent,\n"
+#~ "  existing, nil               numéroter si des archives numérotées existent,\n"
 #~ "                                simple autrement\n"
 #~ "  simple, never               toujours produire des archives simples\n"
-#~ "Le suffixe d'archive est « ~ », à moins que défini à l'aide de --"
-#~ "suffix ou par la variable\n"
+#~ "Le suffixe d'archive est « ~ », à moins que défini à l'aide de --suffix ou par la variable\n"
 #~ "d'environnement SIMPLE_BACKUP_SUFFIX\n"
 
 #~ msgid ""
@@ -1962,8 +1610,7 @@ msgstr ""
 #~ "Sortie informative:\n"
 #~ "  -h, --help                  fournir ce message d'aide, puis terminer\n"
 #~ "  -V, --version               identifier le programme, puis terminer\n"
-#~ "  -v, --verbose               diagnostiquer toute anomalie dans chaque "
-#~ "FICHIER\n"
+#~ "  -v, --verbose               diagnostiquer toute anomalie dans chaque FICHIER\n"
 #~ "  -q, --quiet, --silent       supprimer les indicateurs de progression\n"
 
 #~ msgid "this message should define plural forms"
@@ -1972,12 +1619,8 @@ msgstr ""
 #~ msgid "this message should not define plural forms"
 #~ msgstr "ce message ne devrait pas définir les formes au pluriel"
 
-#~ msgid ""
-#~ "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
-#~ "obsolete %ld.\n"
-#~ msgstr ""
-#~ "%s lus %ld anciens + %ld références, %ld fusionnés, %ld "
-#~ "approximatives, %ld manquants, %ld périmés.\n"
+#~ msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
+#~ msgstr "%s lus %ld anciens + %ld références, %ld fusionnés, %ld approximatives, %ld manquants, %ld périmés.\n"
 
 #~ msgid " done.\n"
 #~ msgstr " terminé.\n"
@@ -1986,21 +1629,16 @@ msgstr ""
 #~ msgstr "%s et les noms de fichiers explicites s'excluent mutuellement"
 
 #~ msgid "Convert binary message catalog to Uniforum style .po file.\n"
-#~ msgstr ""
-#~ "Convertir le catalogue binaire de messages au style Uniforum de fichiers ."
-#~ "po\n"
+#~ msgstr "Convertir le catalogue binaire de messages au style Uniforum de fichiers .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 ""
 #~ "Mode d'exécution:\n"
-#~ "  -j, --java               mode Java: l'entrée est une classe Java "
-#~ "ResourceBundle\n"
-#~ "      --tcl                mode Tcl:  l'entrée est un fichier .msg tcl/"
-#~ "msgcat\n"
+#~ "  -j, --java               mode Java: l'entrée est une classe Java ResourceBundle\n"
+#~ "      --tcl                mode Tcl:  l'entrée est un fichier .msg tcl/msgcat\n"
 
 #~ msgid ""
 #~ "Input file location:\n"
@@ -2009,58 +1647,44 @@ msgstr ""
 #~ msgstr ""
 #~ "Localisation du fichier d'entrée:\n"
 #~ "  FICHIER ...                 fichier .mo d'entrée\n"
-#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des "
-#~ "fichiers d'entrée\n"
-#~ "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée "
-#~ "standard.\n"
+#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des fichiers d'entrée\n"
+#~ "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée standard.\n"
 
 #~ 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 ""
 #~ "Localisation du fichier d'entrée en mode Java:\n"
 #~ "  -r, --resource=RESSOURCE  nom de la ressource\n"
-#~ "  -l, --locale=LOCALE       nom de la locale, soit langage ou "
-#~ "language_COUNTRY\n"
-#~ "Le nom de la classe est déterminé en ajoutant le nom de la locale au "
-#~ "nom de la ressource,\n"
-#~ "séparé par un souligné. La classe est localisée en utilisant "
-#~ "CLASSPATH.\n"
+#~ "  -l, --locale=LOCALE       nom de la locale, soit langage ou language_COUNTRY\n"
+#~ "Le nom de la classe est déterminé en ajoutant le nom de la locale au nom de la ressource,\n"
+#~ "séparé par un souligné. La classe est localisée en utilisant 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"
 #~ msgstr ""
 #~ "Localisation du fichier d'entrée en mode Tcl:\n"
-#~ "  -l, --locale=LOCALE       nom de la locale, soit langage ou "
-#~ "language_COUNTRY\n"
-#~ "  -d RÉPERTOIRE             répertoire de base des catalogues de "
-#~ "messages .msg\n"
-#~ "Les options -l et -d sont obligatoires. Le fichier .msg est localisé "
-#~ "dans\n"
+#~ "  -l, --locale=LOCALE       nom de la locale, soit langage ou language_COUNTRY\n"
+#~ "  -d RÉPERTOIRE             répertoire de base des catalogues de messages .msg\n"
+#~ "Les options -l et -d sont obligatoires. Le fichier .msg est localisé dans\n"
 #~ "le répertoire spécifié.\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 ""
 #~ "Localisation du fichier de sortie:\n"
-#~ "  -o, --output-file=FICHIER   écrire la sortie dans le FICHIER "
-#~ "spécifié\n"
-#~ "Les résultats sont écrits sur la sortie standard si aucun fichier n'est "
-#~ "spécifié.\n"
+#~ "  -o, --output-file=FICHIER   écrire la sortie dans le FICHIER spécifié\n"
+#~ "Les résultats sont écrits sur la sortie standard si aucun fichier n'est spécifié.\n"
 
 #~ msgid ""
 #~ "Output details:\n"
@@ -2075,20 +1699,15 @@ msgstr ""
 #~ "  -s, --sort-output        generate sorted output\n"
 #~ msgstr ""
 #~ "Détails de sortie:\n"
-#~ "  -e, --no-escape             éviter les échappement C en sortie "
-#~ "(implicite)\n"
-#~ "  -E, --escape                échappements C en sortie, éviter les 8-"
-#~ "bits\n"
+#~ "  -e, --no-escape             éviter les échappement C en sortie (implicite)\n"
+#~ "  -E, --escape                échappements C en sortie, éviter les 8-bits\n"
 #~ "      --force-po              produire un fichier PO, même vide\n"
 #~ "  -i, --indent                sortie en style indenté\n"
-#~ "      --strict                produire un fichier .po strictement "
-#~ "Uniforum\n"
+#~ "      --strict                produire un fichier .po strictement Uniforum\n"
 #~ "  -w, --width=COLONNES        limiter le nombre de COLONNES en sortie\n"
 #~ "  -s, --sort-output           générer une sortie triée\n"
-#~ "      --no-wrap               ne pas briser les lignes de longs messages "
-#~ "plus longues que\n"
-#~ "                              que la largeur des pages de sortie en "
-#~ "plusieurs lignes\n"
+#~ "      --no-wrap               ne pas briser les lignes de longs messages plus longues que\n"
+#~ "                              que la largeur des pages de sortie en plusieurs lignes\n"
 
 #~ msgid ""
 #~ "Informative output:\n"
@@ -2099,46 +1718,33 @@ msgstr ""
 #~ "Sortie informative:\n"
 #~ "  -h, --help                  fournir ce message d'aide, puis terminer\n"
 #~ "  -V, --version               identifier le programme, puis terminer\n"
-#~ "  -v, --verbose               diagnostiquer toute anomalie dans chaque "
-#~ "FICHIER\n"
+#~ "  -v, --verbose               diagnostiquer toute anomalie dans chaque FICHIER\n"
 
 #~ 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 ""
 #~ "Unifier les duplicatas de traductions dans un catalgue de traductions.\n"
-#~ "Trouver les duplicatas de traductions du même IDentificateur de "
-#~ "message.\n"
-#~ "De tels duplicatas constituent des entrées invalides pour d'autres "
-#~ "programmes\n"
-#~ "comme msgftm, msgmerge ou msgcat. Par défaut les duplicatas sont "
-#~ "fusionnés\n"
-#~ "ensembles. Lorsque l'option --repeated est utilisée, seuls les "
-#~ "duplicatas sont\n"
+#~ "Trouver les duplicatas de traductions du même IDentificateur de message.\n"
+#~ "De tels duplicatas constituent des entrées invalides pour d'autres programmes\n"
+#~ "comme msgftm, msgmerge ou msgcat. Par défaut les duplicatas sont fusionnés\n"
+#~ "ensembles. Lorsque l'option --repeated est utilisée, seuls les duplicatas sont\n"
 #~ "sont affichés sur la sortie et tous les autres messages sont ignorés.\n"
-#~ "Les commentaires et les extraits sont cumulés sauf si l'option --use-"
-#~ "first\n"
+#~ "Les commentaires et les extraits sont cumulés sauf si l'option --use-first\n"
 #~ "est spécifiée, ils seront pris à partir de la première traduction.\n"
-#~ "Les positions dans les fichiers seront cumulées. Lorsque l'option --"
-#~ "unique\n"
+#~ "Les positions dans les fichiers seront cumulées. Lorsque l'option --unique\n"
 #~ "est utilisée les duplicatas sont écartés.\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 ""
 #~ "Sélection de messages:\n"
 #~ "  -d, --repeated                 afficher seulement les duplicatas\n"
@@ -2175,8 +1781,7 @@ msgstr ""
 #~ "Installing GNU libiconv and then reinstalling GNU gettext\n"
 #~ "would fix this problem.\n"
 #~ msgstr ""
-#~ "L'installation de GNU libiconv suivi de la réinstallation de GNU "
-#~ "gettext\n"
+#~ "L'installation de GNU libiconv suivi de la réinstallation de GNU gettext\n"
 #~ "devrait corriger ce problème.\n"
 
 #~ msgid "%s\n"
@@ -2194,8 +1799,7 @@ msgstr ""
 #~ "Message conversion to user's charset will not work.\n"
 #~ msgstr ""
 #~ "Charset est manquant dans l'en-tête.\n"
-#~ "La conversion de message dans le charset de l'usager ne fonctionnera "
-#~ "pas.\n"
+#~ "La conversion de message dans le charset de l'usager ne fonctionnera pas.\n"
 
 #~ msgid "inconsistent use of #~"
 #~ msgstr "utilisation inconsistente de #~"
@@ -2252,8 +1856,7 @@ msgstr ""
 #~ msgstr "le fichier \"%s\" n'est pas en format .mo pour GNU"
 
 #~ msgid "file \"%s\" contains a not NUL terminated string, at %s"
-#~ msgstr ""
-#~ "fichier \"%s\" contient une chaîne qui se termine pas par un NUL, à %s"
+#~ msgstr "fichier \"%s\" contient une chaîne qui se termine pas par un NUL, à %s"
 
 #~ msgid "expected two arguments"
 #~ msgstr "deux arguments attendus"
@@ -2262,24 +1865,20 @@ msgstr ""
 #~ msgstr "Usage: %s [OPTION] URL FICHIER-D-ENTRÉE\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 ""
-#~ "Recherche et sorties des contenus d'un URL.  Si le URL ne peut être "
-#~ "atteint,\n"
+#~ "Recherche et sorties des contenus d'un URL.  Si le URL ne peut être atteint,\n"
 #~ "le FICHIER local est utilisé à la place.\n"
 
 #~ msgid "error writing stdout"
 #~ msgstr "erreur d'écriture sur stdout"
 
 #~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr ""
-#~ "ne peut repérer un répertoire temporaire, essayer de définir $TMPDIR"
+#~ msgstr "ne peut repérer un répertoire temporaire, essayer de définir $TMPDIR"
 
 #~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr ""
-#~ "ne peut créer un répertoire temporaire en utilisant le patron « %s »"
+#~ msgstr "ne peut créer un répertoire temporaire en utilisant le patron « %s »"
 
 #~ msgid "not a valid Java class name: %s"
 #~ msgstr "n'est pas un nom de classe Java valide: %s"
@@ -2291,18 +1890,13 @@ msgstr ""
 #~ msgstr "erreur pendant l'écriture du fichier « %s »"
 
 #~ msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-#~ msgstr ""
-#~ "échec de compilation de la classe Java, essayer --verbose ou définir "
-#~ "$JAVAC"
+#~ msgstr "échec de compilation de la classe Java, essayer --verbose ou définir $JAVAC"
 
 #~ msgid "error while opening \"%s\" for writing"
 #~ msgstr "erreur lors de l'ouverture de « %s » en écriture"
 
-#~ msgid ""
-#~ "internationalized messages should not contain the `\\%c' escape sequence"
-#~ msgstr ""
-#~ "un message à traduire ne doit pas contenir la séquence d'échappement "
-#~ "« \\%c »"
+#~ msgid "internationalized messages should not contain the `\\%c' escape sequence"
+#~ msgstr "un message à traduire ne doit pas contenir la séquence d'échappement « \\%c »"
 
 #~ msgid ""
 #~ "The following msgid contains non-ASCII characters.\n"
@@ -2311,10 +1905,8 @@ msgstr ""
 #~ "%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. Considérer l'utilisation de chaîne « msgid » en "
-#~ "pur ASCII à la place.\n"
+#~ "Cela causera un problème aux traducteurs qui utilisent un encodage de caractères\n"
+#~ "différent du vôtre. Considérer l'utilisation de chaîne « msgid » en pur ASCII à la place.\n"
 #~ "%s\n"
 
 #~ msgid "cannot create output file \"%s\""
@@ -2348,9 +1940,7 @@ msgstr ""
 #~ msgstr "xgettext ne peut fonctionner sans mots clés à rechercher"
 
 #~ msgid "warning: file `%s' extension `%s' is unknown; will try C"
-#~ msgstr ""
-#~ "attention: « %s » sans classification pour « %s », le langage C sera "
-#~ "présumé"
+#~ msgstr "attention: « %s » sans classification pour « %s », le langage C sera présumé"
 
 #~ msgid "Extract translatable strings from given input files.\n"
 #~ msgstr "Extraire les chaînes traduisibles de fichiers d'entrée donnés.\n"
@@ -2364,40 +1954,30 @@ 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 ""
 #~ "Localisation du fichier de sortie:\n"
-#~ "  -d, --default-domain=NOM       utiliser NOM.po pour la sortie (au lieu "
-#~ "de messages.po)\n"
-#~ "  -o, --output=FICHIER           écrire la sortie dans le FICHIER "
-#~ "spécifié\n"
-#~ "  -p, --output-dir=RÉPERTOIRE    placer les fichiers de sortie dans le "
-#~ "RÉPERTOIRE\n"
+#~ "  -d, --default-domain=NOM       utiliser NOM.po pour la sortie (au lieu de messages.po)\n"
+#~ "  -o, --output=FICHIER           écrire la sortie dans le FICHIER spécifié\n"
+#~ "  -p, --output-dir=RÉPERTOIRE    placer les fichiers de sortie dans le RÉPERTOIRE\n"
 #~ "Si la sortie est -, la sortie est écrite sur la sortie standard.\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 ""
 #~ "Choix du langage du fichier d'entrée:\n"
 #~ "  -L, --language=NOM             reconnaître le langage spécifié\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++                      identique à --language=C++\n"
 #~ "Par défaut, le langage est deviné selon l'extension du nom du fichier.\n"
@@ -2410,97 +1990,65 @@ msgstr ""
 #~ "                                 preceding keyword lines) in output file\n"
 #~ msgstr ""
 #~ "Mode d'exécution:\n"
-#~ "  -j, --join-existing            ajouter les messages au fichier "
-#~ "existant\n"
+#~ "  -j, --join-existing            ajouter les messages au fichier existant\n"
 #~ "  -x, --exclude-file=FICHIER     ne pas extraire d'entrées de FICHIER\n"
-#~ "  -c, --add-comments[=CLÉ]       sauver le commentaire précédent "
-#~ "possédant CLÉ,\n"
-#~ "                                 ou celui qui précède immédiatement le "
-#~ "mot-clef\n"
+#~ "  -c, --add-comments[=CLÉ]       sauver le commentaire précédent possédant CLÉ,\n"
+#~ "                                 ou celui qui précède immédiatement le mot-clef\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 ""
 #~ "Options spécifiques au language=C/C++:\n"
 #~ "  -a, --extract-all              extraire toutes les chaînes\n"
-#~ "  -k, --keyword[=MOTS]           mots clés additionnels à rechercher "
-#~ "(sans\n"
-#~ "                                 MOTS indique de ne pas utiliser les mots "
-#~ "clés par défaut)\n"
-#~ "  -T, --trigraphs                traiter les trigraphes ANSI C à "
-#~ "l'entrée\n"
-#~ "      --debug                    fournir plus de détails sur la "
-#~ "reconnaissance\n"
+#~ "  -k, --keyword[=MOTS]           mots clés additionnels à rechercher (sans\n"
+#~ "                                 MOTS indique de ne pas utiliser les mots clés par défaut)\n"
+#~ "  -T, --trigraphs                traiter les trigraphes ANSI C à l'entrée\n"
+#~ "      --debug                    fournir plus de détails sur la reconnaissance\n"
 #~ "                                 des chaînes de format\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 ""
 #~ "Détails de sortie:\n"
-#~ "  -e, --no-escape                éviter les échappement C en sortie "
-#~ "(implicite)\n"
-#~ "  -E, --escape                   échappements C en sortie, éviter les 8-"
-#~ "bits\n"
+#~ "  -e, --no-escape                éviter les échappement C en sortie (implicite)\n"
+#~ "  -E, --escape                   échappements C en sortie, éviter les 8-bits\n"
 #~ "      --force-po                 produire un fichier PO, même vide\n"
 #~ "  -i, --indent                   sortie en style indenté\n"
-#~ "      --no-location              ne pas produire les « #: FICHIER:LIGNE "
-#~ "»\n"
-#~ "  -n, --add-location             générer les lignes de format '#: "
-#~ "fichier:ligne' (par défaut)\n"
-#~ "      --strict                   générer un fichier .po avec "
-#~ "conformité stricte Uniforum\n"
+#~ "      --no-location              ne pas produire les « #: FICHIER:LIGNE »\n"
+#~ "  -n, --add-location             générer les lignes de format '#: fichier:ligne' (par défaut)\n"
+#~ "      --strict                   générer un fichier .po avec conformité stricte Uniforum\n"
 #~ "  -w, --width=COLONNES           limiter le nombre de COLONNES en sortie\n"
-#~ "      --no-wrap                  ne pas briser les lignes de longs "
-#~ "messages plus longues que\n"
-#~ "                                 que la largeur des pages de sortie, en "
-#~ "plusieurs lignes\n"
+#~ "      --no-wrap                  ne pas briser les lignes de longs messages plus longues que\n"
+#~ "                                 que la largeur des pages de sortie, en plusieurs lignes\n"
 #~ "  -s, --sort-output              générer une sortie triée\n"
-#~ "  -F, --sort-by-file             trier la sortie selon la localisation "
-#~ "des fichiers\n"
-#~ "      --omit-header              omettre les en-têtes pour « msgid \"\" "
-#~ "»\n"
-#~ "      --copyright-holder=CHAÎNE  identifier le champ des droits d'auteur "
-#~ "dans la sortie\n"
-#~ "      --foreign-user             inhiber la production d'un copyright "
-#~ "FSF\n"
-#~ "  -m, --msgstr-prefix[=CHAÎNE]   préfixer les msgstr's par CHAÎNE, sinon "
-#~ "\\\"\\\"\n"
-#~ "  -M, --msgstr-suffix[=CHAÎNE]   suffixer les msgstr's par CHAÎNE, sinon "
-#~ "\\« \\ »\n"
+#~ "  -F, --sort-by-file             trier la sortie selon la localisation des fichiers\n"
+#~ "      --omit-header              omettre les en-têtes pour « msgid \"\" »\n"
+#~ "      --copyright-holder=CHAÎNE  identifier le champ des droits d'auteur dans la sortie\n"
+#~ "      --foreign-user             inhiber la production d'un copyright FSF\n"
+#~ "  -m, --msgstr-prefix[=CHAÎNE]   préfixer les msgstr's par CHAÎNE, sinon \\\"\\\"\n"
+#~ "  -M, --msgstr-suffix[=CHAÎNE]   suffixer les msgstr's par CHAÎNE, sinon \\« \\ »\n"
 
 #~ msgid ""
 #~ "Empty msgid.  It is reserved by GNU gettext:\n"
@@ -2515,36 +2063,26 @@ msgstr ""
 #~ msgstr "langage « %s » inconnu"
 
 #~ msgid "file \"%s\" contains a not NUL terminated sysdep segment"
-#~ msgstr ""
-#~ "fichier \"%s\" contient un segement sysdep qui n'est pas terminé par un "
-#~ "NUL"
+#~ msgstr "fichier \"%s\" contient un segement sysdep qui n'est pas terminé par un NUL"
 
 #~ msgid "seek \"%s\" offset %ld failed"
 #~ msgstr "le repositionnement de « %s » à l'endroit %ld a échoué"
 
 #~ 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 ""
 #~ "Mode d'exécution:\n"
-#~ "  -j, --java               mode Java: générer une classe ResourceBundle "
-#~ "Java\n"
+#~ "  -j, --java               mode Java: générer une classe ResourceBundle Java\n"
 
 #~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
-#~ msgstr ""
-#~ "les spécifications de format pour l'argument {%u} n'existent pas dans « "
-#~ "msgstr »"
+#~ msgstr "les spécifications de format pour l'argument {%u} n'existent pas dans « msgstr »"
 
 #~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-#~ msgstr ""
-#~ "les spécifications de format de l'argument «%s» n'existent pas « "
-#~ "msgstr »"
+#~ msgstr "les spécifications de format de l'argument «%s» n'existent pas « msgstr »"
 
 #~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
-#~ msgstr ""
-#~ "les spécifications de format de l'argument %u n'existent pas dans « "
-#~ "msgstr »"
+#~ msgstr "les spécifications de format de l'argument %u n'existent pas dans « msgstr »"
 
 #~ msgid "this message has no definition in the \"%s\" domain"
 #~ msgstr "ce message n'a pas de définition dans le domaine « %s »"
@@ -2555,14 +2093,10 @@ 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"
@@ -2572,58 +2106,37 @@ msgstr ""
 #~ "Les arguments obligatoires pour la forme longue des options sont aussi\n"
 #~ "obligatoires pour les formes courtes qui leur correspondent.\n"
 #~ "\n"
-#~ "  -d, --default-domain=DOMAINE   sortir sur DOMAINE.po (non pas messages."
-#~ "po)\n"
-#~ "  -D, --directory=RÉPERT         fouiller RÉPERT aussi pour trouver les "
-#~ "fichiers\n"
-#~ "  -e, --no-escape                éviter les échappement C en sortie "
-#~ "(implicite)\n"
-#~ "  -E, --escape                   échappements C en sortie, éviter les 8-"
-#~ "bits\n"
-#~ "  -f, --files-from=FICHIER       lire la liste des fichiers d'entrée de "
-#~ "FICHIER\n"
+#~ "  -d, --default-domain=DOMAINE   sortir sur DOMAINE.po (non pas messages.po)\n"
+#~ "  -D, --directory=RÉPERT         fouiller RÉPERT aussi pour trouver les fichiers\n"
+#~ "  -e, --no-escape                éviter les échappement C en sortie (implicite)\n"
+#~ "  -E, --escape                   échappements C en sortie, éviter les 8-bits\n"
+#~ "  -f, --files-from=FICHIER       lire la liste des fichiers d'entrée de FICHIER\n"
 #~ "      --force-po                 produire un fichier PO, même vide\n"
-#~ "  -F, --sort-by-file             trier selon la position dans chaque "
-#~ "fichier\n"
-#~ "  -h, --help                     fournir ce message d'aide, puis "
-#~ "terminer\n"
+#~ "  -F, --sort-by-file             trier selon la position dans chaque fichier\n"
+#~ "  -h, --help                     fournir ce message d'aide, puis terminer\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                   utiliser un style indenté pour le "
-#~ "fichier PO\n"
-#~ "      --no-location              inhiber la production des « #: FICHIER:"
-#~ "LIGNE »\n"
-#~ "  -n, --add-location             produire les « #: FICHIER:LIGNE "
-#~ "» (implicite)\n"
-#~ "      --omit-header              omettre les en-têtes pour « msgid \"\" "
-#~ "»\n"
-#~ "  -o, --output=FICHIER           produire la sortie sur le FICHIER "
-#~ "indiqué\n"
-#~ "  -p, --output-dir=RÉPERTOIRE    sortir le fichier produit dans tel "
-#~ "RÉPERTOIRE\n"
-#~ "  -s, --sort-output              trier la sortie et éliminer les "
-#~ "duplicats\n"
-#~ "      --strict                   produire un fichier PO strictement "
-#~ "Uniforum\n"
-#~ "  -T, --trigraphs                reconnaître les trigraphes ANSI C en "
-#~ "entrée\n"
+#~ "  -i, --indent                   utiliser un style indenté pour le fichier PO\n"
+#~ "      --no-location              inhiber la production des « #: FICHIER:LIGNE »\n"
+#~ "  -n, --add-location             produire les « #: FICHIER:LIGNE » (implicite)\n"
+#~ "      --omit-header              omettre les en-têtes pour « msgid \"\" »\n"
+#~ "  -o, --output=FICHIER           produire la sortie sur le FICHIER indiqué\n"
+#~ "  -p, --output-dir=RÉPERTOIRE    sortir le fichier produit dans tel RÉPERTOIRE\n"
+#~ "  -s, --sort-output              trier la sortie et éliminer les duplicats\n"
+#~ "      --strict                   produire un fichier PO strictement Uniforum\n"
+#~ "  -T, --trigraphs                reconnaître les trigraphes ANSI C en entrée\n"
 #~ "  -u, --unique                   même chose que « -< 2 »\n"
 
 #~ msgid ""
@@ -2631,16 +2144,12 @@ 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"
@@ -2653,34 +2162,25 @@ msgstr ""
 #~ "output is written to standard output.\n"
 #~ msgstr ""
 #~ "Usage: %s [OPTION] FICHIER.po ...\n"
-#~ "Compiler un fichier source décrivant une série de traductions de "
-#~ "messages.\n"
+#~ "Compiler un fichier source décrivant une série de traductions de messages.\n"
 #~ "\n"
 #~ "Les arguments obligatoires pour la forme longue des options sont aussi\n"
 #~ "obligatoires pour les formes courtes qui leur correspondent.\n"
 #~ "\n"
-#~ "  -a, --alignment=OCTETS     aligner chaînes sur tant d'OCTETS (%d "
-#~ "présumé)\n"
-#~ "  -c, --check                vérifier ce qui dépend du langage de "
-#~ "programmation\n"
-#~ "  -D, --directory=RÉPERT     fouiller RÉPERT aussi pour trouver les "
-#~ "fichiers\n"
-#~ "  -f, --use-fuzzy            aussi transmettre les traductions "
-#~ "approximées\n"
+#~ "  -a, --alignment=OCTETS     aligner chaînes sur tant d'OCTETS (%d présumé)\n"
+#~ "  -c, --check                vérifier ce qui dépend du langage de programmation\n"
+#~ "  -D, --directory=RÉPERT     fouiller RÉPERT aussi pour trouver les fichiers\n"
+#~ "  -f, --use-fuzzy            aussi transmettre les traductions approximées\n"
 #~ "  -h, --help                 fournir ce message d'aide, puis terminer\n"
-#~ "      --no-hash              exclure la table de dispersion du binaire "
-#~ "produit\n"
+#~ "      --no-hash              exclure la table de dispersion du binaire produit\n"
 #~ "  -o, --output-file=SORTIE   choisir le fichier de sortie\n"
-#~ "      --statistics           donner quelques statistiques sur les "
-#~ "traductions\n"
+#~ "      --statistics           donner quelques statistiques sur les traductions\n"
 #~ "      --strict               se conformer à Uniforum strictement\n"
-#~ "  -v, --verbose              diagnostiquer toute anomalie dans chaque "
-#~ "FICHIER\n"
+#~ "  -v, --verbose              diagnostiquer toute anomalie dans chaque FICHIER\n"
 #~ "  -V, --version              identifier le programme, puis terminer\n"
 #~ "\n"
 #~ "La répétition de l'option « -v » augment le niveau de verbosité.\n"
-#~ "Si FICHIER vaut « - », lit l'entrée standard.  Si SORTIE vaut « - "
-#~ "»,\n"
+#~ "Si FICHIER vaut « - », lit l'entrée standard.  Si SORTIE vaut « - »,\n"
 #~ "écrit sur la sortie standard.\n"
 
 #~ msgid "while creating hash table"
@@ -2690,8 +2190,7 @@ msgstr ""
 #~ "%s: warning: PO file header missing, fuzzy, or invalid\n"
 #~ "%*s  warning: charset conversion will not work"
 #~ msgstr ""
-#~ "%s: AVERTISSEMENT: en-tête du fichier PO manquante, approximative ou "
-#~ "invalide\n"
+#~ "%s: AVERTISSEMENT: en-tête du fichier PO manquante, approximative ou invalide\n"
 #~ "%*s  AVERTISSEMENT: la conversion du charset ne fonctionnera pas"
 
 #~ msgid ""
@@ -2704,11 +2203,9 @@ msgstr ""
 #~ "\n"
 #~ "Convertir un fichier .mo, binaire, en fichier .po à la manière\n"
 #~ "d'Uniforum.  Les fichiers grand-boutiens et petit-boutiens sont tous\n"
-#~ "deux traités.  Si le fichier d'entrée vaut « - », lit l'entrée "
-#~ "standard.\n"
+#~ "deux traités.  Si le fichier d'entrée vaut « - », lit l'entrée standard.\n"
 #~ "Sans fichier d'entrée ou lorsque « - », lit l'entrée standard.  Sauf\n"
-#~ "indication contraire, les résultats sont produits sur la sortie "
-#~ "standard.\n"
+#~ "indication contraire, les résultats sont produits sur la sortie standard.\n"
 
 #~ msgid ""
 #~ "Usage: %s [OPTION] INPUTFILE ...\n"
@@ -2719,20 +2216,14 @@ 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 ""
 #~ "Usage: %s [OPTION] FICHIER ...\n"
@@ -2742,79 +2233,49 @@ msgstr ""
 #~ "obligatoires pour les formes courtes qui leur correspondent.\n"
 #~ "\n"
 #~ "  -a, --extract-all              extraire toutes les chaînes\n"
-#~ "  -c, --add-comments[=CLÉ]       sauver le commentaire précédent "
-#~ "possédant CLÉ,\n"
-#~ "                                 ou celui qui précède immédiatement le "
-#~ "mot-clef\n"
+#~ "  -c, --add-comments[=CLÉ]       sauver le commentaire précédent possédant CLÉ,\n"
+#~ "                                 ou celui qui précède immédiatement le mot-clef\n"
 #~ "  -C, --c++                      voir « --language=C++ »\n"
-#~ "      --debug                    détailler l'analyse des chaînes de "
-#~ "format\n"
-#~ "  -d, --default-domain=DOMAINE   sortir sur DOMAINE.po (non pas messages."
-#~ "po)\n"
-#~ "  -D, --directory=RÉPERT         fouiller RÉPERT aussi pour trouver les "
-#~ "fichiers\n"
-#~ "  -e, --no-escape                pas d'échappements C en sortie "
-#~ "(implicite)\n"
-#~ "  -E, --escape                   échappements C en sortie, éviter les 8-"
-#~ "bits\n"
-#~ "  -f, --files-from=FICHIER       lire la liste des fichiers d'entrée de "
-#~ "FICHIER\n"
+#~ "      --debug                    détailler l'analyse des chaînes de format\n"
+#~ "  -d, --default-domain=DOMAINE   sortir sur DOMAINE.po (non pas messages.po)\n"
+#~ "  -D, --directory=RÉPERT         fouiller RÉPERT aussi pour trouver les fichiers\n"
+#~ "  -e, --no-escape                pas d'échappements C en sortie (implicite)\n"
+#~ "  -E, --escape                   échappements C en sortie, éviter les 8-bits\n"
+#~ "  -f, --files-from=FICHIER       lire la liste des fichiers d'entrée de FICHIER\n"
 #~ "      --force-po                 produire un fichier PO, même vide\n"
-#~ "      --foreign-user             inhiber la production d'un copyright "
-#~ "FSF\n"
-#~ "  -F, --sort-by-file             trier selon la position dans chaque "
-#~ "fichier\n"
+#~ "      --foreign-user             inhiber la production d'un copyright FSF\n"
+#~ "  -F, --sort-by-file             trier selon la position dans chaque fichier\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                     fournir ce message d'aide, puis "
-#~ "terminer\n"
-#~ "  -i, --indent                   produire le fichier .po dans un style "
-#~ "indenté\n"
-#~ "  -j, --join-existing            ajouter les messages au fichier "
-#~ "existant\n"
-#~ "  -k, --keyword[=MOT]            mot-clef supplémentaire, défauts si "
-#~ "MOT absent\n"
-#~ "  -l, --string-limit=LONGUEUR    indiquer si LONGUEUR (%u) octets "
-#~ "dépassés\n"
-#~ "  -L, --language=NOM             analyser le langage indiqué (C, C++, "
-#~ "PO),\n"
-#~ "                                 sinon, le deviner de l'extension du "
-#~ "fichier\n"
-#~ "  -m, --msgstr-prefix[=CHAÎNE]   préfixer les msgstr's par CHAÎNE, sinon "
-#~ "\"\"\n"
-#~ "  -M, --msgstr-suffix[=CHAÎNE]   suffixer les msgstr's par CHAÎNE, sinon "
-#~ "\"\"\n"
-#~ "      --no-location              ne pas produire les « #: FICHIER:LIGNE "
-#~ "»\n"
-
-#~ msgid ""
-#~ "  -n, --add-location             generate '#: filename:line' lines "
-#~ "(default)\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' "
-#~ "entry\n"
+#~ "  -h, --help                     fournir ce message d'aide, puis terminer\n"
+#~ "  -i, --indent                   produire le fichier .po dans un style indenté\n"
+#~ "  -j, --join-existing            ajouter les messages au fichier existant\n"
+#~ "  -k, --keyword[=MOT]            mot-clef supplémentaire, défauts si MOT absent\n"
+#~ "  -l, --string-limit=LONGUEUR    indiquer si LONGUEUR (%u) octets dépassés\n"
+#~ "  -L, --language=NOM             analyser le langage indiqué (C, C++, PO),\n"
+#~ "                                 sinon, le deviner de l'extension du fichier\n"
+#~ "  -m, --msgstr-prefix[=CHAÎNE]   préfixer les msgstr's par CHAÎNE, sinon \"\"\n"
+#~ "  -M, --msgstr-suffix[=CHAÎNE]   suffixer les msgstr's par CHAÎNE, sinon \"\"\n"
+#~ "      --no-location              ne pas produire les « #: FICHIER:LIGNE »\n"
+
+#~ 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"
+#~ "  -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"
@@ -2822,20 +2283,13 @@ msgstr ""
 #~ "\n"
 #~ "If INPUTFILE is -, standard input is read.\n"
 #~ msgstr ""
-#~ "  -n, --add-location             produire les « #: FICHIER:LIGNE "
-#~ "» (implicite)\n"
-#~ "      --omit-header              omettre les en-têtes pour « msgid \"\" "
-#~ "»\n"
-#~ "  -o, --output=FICHIER           produire la sortie sur le FICHIER "
-#~ "indiqué\n"
-#~ "  -p, --output-dir=RÉPERTOIRE    sortir le fichier produit dans tel "
-#~ "RÉPERTOIRE\n"
-#~ "  -s, --sort-output              trier la sortie et éliminer les "
-#~ "duplicats\n"
-#~ "      --strict                   produire un fichier PO strictement "
-#~ "Uniforum\n"
-#~ "  -T, --trigraphs                reconnaître les trigraphes ANSI C en "
-#~ "entrée\n"
+#~ "  -n, --add-location             produire les « #: FICHIER:LIGNE » (implicite)\n"
+#~ "      --omit-header              omettre les en-têtes pour « msgid \"\" »\n"
+#~ "  -o, --output=FICHIER           produire la sortie sur le FICHIER indiqué\n"
+#~ "  -p, --output-dir=RÉPERTOIRE    sortir le fichier produit dans tel RÉPERTOIRE\n"
+#~ "  -s, --sort-output              trier la sortie et éliminer les duplicats\n"
+#~ "      --strict                   produire un fichier PO strictement Uniforum\n"
+#~ "  -T, --trigraphs                reconnaître les trigraphes ANSI C en entrée\n"
 #~ "  -V, --version                  identifier le programme, puis terminer\n"
 #~ "  -w, --width=COLONNES           limiter le nombre de COLONNES en sortie\n"
 #~ "  -x, --exclude-file=FICHIER     ne pas extraire d'entrées de FICHIER\n"
@@ -2843,13 +2297,10 @@ msgstr ""
 #~ "Si le FICHIER est « - », lit l'entrée standard.\n"
 
 #~ msgid "%s:%d: warning: keyword nested in keyword arg"
-#~ msgstr ""
-#~ "%s:%d: AVERTISSEMENT: mot clé imbriqué dans un argument de mots clés"
+#~ msgstr "%s:%d: AVERTISSEMENT: mot clé imbriqué dans un argument de mots clés"
 
 #~ msgid "%s:%d: warning: keyword between outer keyword and its arg"
-#~ msgstr ""
-#~ "%s:%d: AVERTISSEMENT: mot clé entre un mot clé extérieur et son "
-#~ "argument"
+#~ msgstr "%s:%d: AVERTISSEMENT: mot clé entre un mot clé extérieur et son argument"
 
 #~ msgid "%s: warning: no header entry found"
 #~ msgstr "%s: attention: l'en-tête n'a pas été trouvé"
diff --git a/gettext-runtime/po/ga.po b/gettext-runtime/po/ga.po
index bbb3a54bd..558d2fa47 100644
--- a/gettext-runtime/po/ga.po
+++ b/gettext-runtime/po/ga.po
@@ -6,11 +6,10 @@ 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: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2007-10-07 23:09+0200\n"
 "PO-Revision-Date: 2007-10-14 12:15-0500\n"
 "Last-Translator: Kevin Patrick Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,66 +18,67 @@ msgstr ""
 msgid "write error"
 msgstr "earr�id sa scr�obh"
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:125
 msgid "Unknown system error"
 msgstr "Earr�id ch�rais anaithnid"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: 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:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\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:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: n� cheada�tear arg�int i ndiaidh na rogha `%c%s'\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c: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:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%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:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%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:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\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:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
+#: gnulib-lib/getopt.c: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:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: T� an rogha `-W %s' d�bhr�och\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: n� cheada�tear arg�int i ndiaidh na rogha `-W %s'\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: t� arg�int de dh�th i ndiaidh na rogha `%s'\n"
-
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -118,8 +118,8 @@ msgid "missing arguments"
 msgstr "arg�int� ar iarraidh"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+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
@@ -241,13 +241,13 @@ msgstr ""
 "                            leis an MSGID �n FHEARANN\n"
 
 #: src/gettext.c:264
-#, fuzzy, c-format, no-wrap
+#, 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"
@@ -311,15 +311,10 @@ msgstr ""
 "tr� �s�id na hathr�ige timpeallachta TEXTDOMAINDIR.\n"
 "Gn�thchomhadlann chuardaigh: %s\n"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: rogha neamhcheadaithe -- %c\n"
-
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is "
-#~ "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"
diff --git a/gettext-runtime/po/gl.po b/gettext-runtime/po/gl.po
index 99187ec9a..558f19758 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2014-05-10 13:36+0900\n"
 "PO-Revision-Date: 2014-05-10 16:37+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -323,14 +323,11 @@ 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 ""
 #~ "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"
 
@@ -343,8 +340,7 @@ 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"
@@ -356,25 +352,19 @@ 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..."
@@ -418,85 +408,64 @@ 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"
@@ -519,18 +488,13 @@ 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"
@@ -564,16 +528,12 @@ 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"
@@ -588,21 +548,16 @@ 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"
@@ -611,8 +566,7 @@ 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"
@@ -622,8 +576,7 @@ 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"
@@ -659,31 +612,25 @@ 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"
@@ -691,11 +638,9 @@ 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"
@@ -703,8 +648,7 @@ 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"
@@ -713,26 +657,20 @@ 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 3425f026d..5f949d400 100644
--- a/gettext-runtime/po/hr.po
+++ b/gettext-runtime/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-runtime 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2012-11-02 14:40+0100\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -15,8 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.4\n"
 
 # Provjeriti koje nazive parametara i varijabli okoline treba prevesti... (TK)
@@ -24,62 +23,62 @@ msgstr ""
 msgid "write error"
 msgstr "greška pisanja"
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Nepoznata greška sustava"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: opcija „%s” je višeznačna\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: opcija „--%s” ne dozvoljava argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: opcija „%c%s” ne dozvoljava argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: opcija „--%s” zahtijeva argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: neprepoznata opcija „--%s”\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: neprepoznata opcija „%c%s”\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: neispravna opcija -- „%c”\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: opcija zahtijeva argument -- „%c”\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: opcija „-W %s” je višeznačna\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: opcija „-W %s” ne dozvoljava argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: opcija „-W %s” zahtijeva argument\n"
@@ -123,8 +122,8 @@ msgid "missing arguments"
 msgstr "nedostaju argumenti"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Pokušajte „%s --help” za više informacija.\n"
 
 #: src/envsubst.c:176
@@ -248,13 +247,13 @@ msgstr ""
 "                            ID-PORUKE iz TEKSTDOMENA\n"
 
 #: src/gettext.c:264
-#, fuzzy, c-format, no-wrap
+#, 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"
diff --git a/gettext-runtime/po/hu.po b/gettext-runtime/po/hu.po
new file mode 100644
index 000000000..019c23e33
--- /dev/null
+++ b/gettext-runtime/po/hu.po
@@ -0,0 +1,318 @@
+# Hungarian translation for gettext-runtime.
+# This file is distributed under the same license as the gettext package.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+#
+# Balázs Úr <urbalazs@gmail.com>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU gettext-runtime 0.19-rc1\n"
+"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
+"POT-Creation-Date: 2014-05-10 13:36+0900\n"
+"PO-Revision-Date: 2014-05-11 17:49+0200\n"
+"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
+"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: gnulib-lib/closeout.c:66
+msgid "write error"
+msgstr "írási hiba"
+
+#: gnulib-lib/error.c:188
+msgid "Unknown system error"
+msgstr "Ismeretlen rendszerhiba"
+
+#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
+#, 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:624 gnulib-lib/getopt.c:628
+#, 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:637 gnulib-lib/getopt.c:642
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: a(z) „%c%s” kapcsoló nem fogad el argumentumot\n"
+
+#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: a(z) „--%s” kapcsolóhoz egy argumentum szükséges\n"
+
+#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: ismeretlen „--%s” kapcsoló\n"
+
+#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: ismeretlen „%c%s” kapcsoló\n"
+
+#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: érvénytelen -- „%c” kapcsoló\n"
+
+#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
+#: gnulib-lib/getopt.c:1106
+#, 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:934 gnulib-lib/getopt.c:950
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: a „-W %s” kapcsoló nem egyértelmű\n"
+
+#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: a „-W %s” kapcsoló nem fogad el argumentumot\n"
+
+#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#, 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:37
+#, c-format
+msgid "memory exhausted"
+msgstr "elfogyott a memória"
+
+#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
+#, 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"
+"Licenc GPLv3+: GNU GPL 3. vagy későbbi verzió <http://gnu.org/licenses/gpl.html>\n"
+"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:139 src/ngettext.c:129
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Írta: %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:157 src/ngettext.c:141
+#, c-format
+msgid "too many arguments"
+msgstr "túl sok argumentum"
+
+#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
+#, c-format
+msgid "missing arguments"
+msgstr "hiányzó argumentumok"
+
+#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
+#, 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
+#, c-format, no-wrap
+msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
+msgstr "Használat: %s [KAPCSOLÓ] [SHELL-FORMÁTUM]\n"
+
+#: src/envsubst.c:181
+#, 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
+#, c-format, no-wrap
+msgid "Operation mode:\n"
+msgstr "Működési mód:\n"
+
+#: src/envsubst.c:188
+#, 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
+#, c-format, no-wrap
+msgid "Informative output:\n"
+msgstr "Tájékoztató kimenet:\n"
+
+#: src/envsubst.c:195
+#, 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
+#, 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
+#, 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 ""
+"Normál működési módban a szabványos bemenet a szabványos kimenetre van\n"
+"másolva az űrlapnak a megfelelő változókkal helyettesített $VÁLTOZÓ vagy\n"
+"${VÁLTOZÓ} értékeinek környezeti változóira mutató hivatkozással. Ha meg\n"
+"van adva a SHELL-FORMÁTUM, akkor csak a SHELL-FORMÁTUM értékében hivatkozott\n"
+"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
+#, 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 ""
+"A --variables használatakor a szabványos bemenet mellőzve lesz, és a kimenet\n"
+"a SHELL-FORMÁTUMBAN hivatkozott környezeti változókból áll, soronként egy.\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
+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
+#, c-format
+msgid "error while reading \"%s\""
+msgstr "hiba a(z) „%s” olvasása közben"
+
+#: src/envsubst.c:443
+msgid "standard input"
+msgstr "szabványos bemenet"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: src/gettext.c:139 src/ngettext.c:129
+msgid "Ulrich Drepper"
+msgstr "Ulrich Drepper"
+
+#: src/gettext.c:243
+#, c-format, no-wrap
+msgid ""
+"Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
+"or:    %s [OPTION] -s [MSGID]...\n"
+msgstr ""
+"Használat: %s [KAPCSOLÓ] [[SZÖVEGTARTOMÁNY] MSGID]\n"
+"vagy:    %s [KAPCSOLÓ] -s [MSGID]...\n"
+
+#: src/gettext.c:249
+#, 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:253
+#, 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"
+
+#: src/gettext.c:264
+#, 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 ""
+"Ha a SZÖVEGTARTOMÁNY paraméter nincs megadva, a tartomány a SZÖVEGTARTOMÁNY\n"
+"környezeti változóból lesz meghatározva. Ha az üzenetkatalógus nem található\n"
+"a szabályos könyvtárban, megadható egy másik hely a SZÖVEGTARTOMÁNYKÖNYVTÁR\n"
+"környezeti változóval.\n"
+"A -s kapcsoló használata esetén a program úgy viselkedik mint az „echo”\n"
+"parancs. De nem csak egyszerűen átmásolja az argumentumokat a szabványos\n"
+"kimenetre. Ehelyett a kiválasztott katalógusban található üzenetek le vannak\n"
+"fordítva.\n"
+"Szabványos keresési könyvtár: %s\n"
+
+#: src/ngettext.c:212
+#, 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:217
+#, c-format, no-wrap
+msgid ""
+"Display native language translation of a textual message whose grammatical\n"
+"form depends on a number.\n"
+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:222
+#, 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"
+
+#: src/ngettext.c:233
+#, 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 ""
+"Ha a SZÖVEGTARTOMÁNY paraméter nincs megadva, a tartomány a SZÖVEGTARTOMÁNY\n"
+"környezeti változóból lesz meghatározva. Ha az üzenetkatalógus nem található\n"
+"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"
diff --git a/gettext-runtime/po/id.po b/gettext-runtime/po/id.po
index 417219438..21d69a231 100644
--- a/gettext-runtime/po/id.po
+++ b/gettext-runtime/po/id.po
@@ -10,11 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2010-05-09 13:18+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"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,62 +22,62 @@ msgstr ""
 msgid "write error"
 msgstr "kesalahan penulisan"
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Kesalahan sistem tak dikenal"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: pilihan '%s' rancu\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c: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:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: pilihan '%c%s' tidak membolehkan argumen\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: pilihan '--%s' memerlukan sebuah argumen\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: pilihan tak dikenal '--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: pilihan tak dikenal '%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: pilihan tidak valid -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: pilihan membutuhkan sebuah argumen -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: pilihan '-W %s' rancu\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: pilihan '-W %s' tidak membolehkan sebuah argumen\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: pilihan '-W %s' memerlukan sebuah argumen\n"
@@ -122,8 +121,8 @@ msgid "missing arguments"
 msgstr "Argumen hilang"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Coba `%s --help' untuk informasi lebih jauh.\n"
 
 #: src/envsubst.c:176
@@ -246,13 +245,13 @@ msgstr ""
 "                            untuk ID-PESAN dari TEXTDOMAIN\n"
 
 #: src/gettext.c:264
-#, fuzzy, c-format, no-wrap
+#, 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"
@@ -323,12 +322,9 @@ 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 ""
 #~ "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 1e3a70cb0..663cf34bb 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.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2012-12-25 14:19+0900\n"
 "PO-Revision-Date: 2013-07-01 10:46+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
diff --git a/gettext-runtime/po/ja.po b/gettext-runtime/po/ja.po
index a8f7dcec1..d3a4e3fcb 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.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2012-12-25 14:19+0900\n"
 "PO-Revision-Date: 2013-02-27 06:08+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
diff --git a/gettext-runtime/po/ko.po b/gettext-runtime/po/ko.po
index d9e700278..ec579ffe3 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.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2012-12-25 14:19+0900\n"
 "PO-Revision-Date: 2013-03-12 03:38+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
diff --git a/gettext-runtime/po/nb.po b/gettext-runtime/po/nb.po
index 279ef6fe1..da2758d17 100644
--- a/gettext-runtime/po/nb.po
+++ b/gettext-runtime/po/nb.po
@@ -6,11 +6,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2007-11-02 03:22+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"
-"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,66 +19,67 @@ msgstr ""
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:125
 msgid "Unknown system error"
 msgstr "Ukjent systemfeil"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: 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:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\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:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: flagget �%c%s� tillater ikke argumenter\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c: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:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\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:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%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:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ulovlig flagg -- %c\n"
+
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr "%s: ugyldig flagg -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
+#: gnulib-lib/getopt.c: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: flagg krever et argument -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c: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:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\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/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: flagget �%s� krever et argument\n"
-
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -115,8 +115,8 @@ msgid "missing arguments"
 msgstr "mangler argumenter"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Pr�v �%s --help� for mer informasjon.\n"
 
 #: src/envsubst.c:176
@@ -236,7 +236,7 @@ msgid ""
 "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"
@@ -301,9 +301,6 @@ msgstr ""
 "milj�variabelen TEXTDOMAINDIR.\n"
 "Standard s�kekatalog er: %s\n"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: ulovlig flagg -- %c\n"
-
 # Hva skal MERCHANTABILITY og FITNESS FOR PARTICULAR PURPOSE oversettes med?
 # Er denne oversettelsen grei nok?
 #~ msgid ""
@@ -1398,8 +1395,8 @@ msgstr ""
 #~ "Generate binary message catalog from textual translation description.\n"
 #~ "\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
-#~ "%d)\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %"
+#~ "d)\n"
 #~ "  -c, --check                 perform language dependent checks on "
 #~ "strings\n"
 #~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
diff --git a/gettext-runtime/po/nl.po b/gettext-runtime/po/nl.po
index acbf9f860..93b550261 100644
--- a/gettext-runtime/po/nl.po
+++ b/gettext-runtime/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime-0.19-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2014-05-10 13:36+0900\n"
 "PO-Revision-Date: 2014-05-11 12:10+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
diff --git a/gettext-runtime/po/nn.po b/gettext-runtime/po/nn.po
index e25a7ec82..f5cff53e7 100644
--- a/gettext-runtime/po/nn.po
+++ b/gettext-runtime/po/nn.po
@@ -8,11 +8,10 @@ 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: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2007-10-07 23:09+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"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -23,66 +22,67 @@ msgstr ""
 msgid "write error"
 msgstr "skrivefeil"
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:125
 msgid "Unknown system error"
 msgstr "Ukjend systemfeil"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: Valet «%s» er fleirtydig\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: 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:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: Valet «%c%s» tek ikkje argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c: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: Valet «%s» treng eit argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: Ukjent val – «--%s»\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
+#: gnulib-lib/getopt.c: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:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\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"
 msgstr "%s: Ugyldig val – %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
+#: gnulib-lib/getopt.c: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: Valet treng eit argument – %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c: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:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\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/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: Valet «%s» treng eit argument\n"
-
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -122,8 +122,8 @@ msgid "missing arguments"
 msgstr "manglar argument"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for meir informasjon.\n"
 
 #: src/envsubst.c:176
@@ -244,13 +244,13 @@ msgstr ""
 "                            MSGID frå «TEXTDOMAIN»\n"
 
 #: src/gettext.c:264
-#, fuzzy, c-format, no-wrap
+#, 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"
@@ -313,14 +313,8 @@ msgstr ""
 "«TEXTDOMAIN».\n"
 "Standard søkjekatalog er: %s\n"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: Ulovleg val – %c\n"
-
-#~ msgid ""
-#~ "internationalized messages should not contain the `\\%c' escape sequence"
-#~ msgstr ""
-#~ "internasjonaliserte meldingar skal ikkje innehalde escape-sekvensen «\\"
-#~ "%c»"
+#~ 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\""
@@ -339,8 +333,7 @@ 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"
@@ -352,19 +345,15 @@ 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..."
@@ -396,22 +385,17 @@ 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"
@@ -420,10 +404,8 @@ 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"
 
@@ -431,25 +413,18 @@ 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"
@@ -479,16 +454,12 @@ 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"
@@ -501,10 +472,8 @@ 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"
@@ -512,8 +481,7 @@ 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"
@@ -553,11 +521,8 @@ 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"
@@ -566,8 +531,7 @@ 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"
@@ -575,19 +539,16 @@ 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"
@@ -609,25 +570,18 @@ 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
@@ -639,8 +593,7 @@ 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"
@@ -651,8 +604,7 @@ 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"
 
@@ -665,10 +617,8 @@ 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"
@@ -692,8 +642,7 @@ 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 ""
@@ -705,25 +654,18 @@ 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"
@@ -732,10 +674,8 @@ 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"
 
@@ -744,29 +684,20 @@ 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"
@@ -777,17 +708,12 @@ 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"
@@ -795,10 +721,8 @@ 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 a1f981ecf..936b62b32 100644
--- a/gettext-runtime/po/pl.po
+++ b/gettext-runtime/po/pl.po
@@ -1,22 +1,21 @@
 # Polish translations for the GNU gettext messages, gettext-runtime domain
-# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2006, 2007, 2010, 2013 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2006, 2007, 2010, 2013, 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
-# Rafał Maszkowski <rzm@icm.edu.pl>, 1995-1999, 2001, 2003, 2006, 2007, 2010, 2013
+# Rafał Maszkowski <rzm@icm.edu.pl>, 1995-1999, 2001, 2003, 2006, 2007, 2010, 2013, 2014
 # Piotr Pogorzelski <ppogorze@ippt.gov.pl>, 1995
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-runtime 0.18.2\n"
+"Project-Id-Version: GNU gettext-runtime 0.19-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
-"PO-Revision-Date: 2013-03-08 15:40+0100\n"
+"POT-Creation-Date: 2014-05-10 13:36+0900\n"
+"PO-Revision-Date: 2014-06-03 13:00+0100\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=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"
+"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"
@@ -143,7 +142,7 @@ msgstr "Tryb działania:\n"
 #: src/envsubst.c:188
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-msgstr "  -v, --variables             wypisanie zmiennich z FORMATU-POWŁOKI\n"
+msgstr "  -v, --variables             wypisanie zmiennych z FORMATU-POWŁOKI\n"
 
 #: src/envsubst.c:192
 #, c-format, no-wrap
diff --git a/gettext-runtime/po/pt.po b/gettext-runtime/po/pt.po
index 923f92703..0dcc31a0d 100644
--- a/gettext-runtime/po/pt.po
+++ b/gettext-runtime/po/pt.po
@@ -7,11 +7,10 @@ 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: 2014-06-01 11:19+0900\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"
 "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"
@@ -20,66 +19,67 @@ msgstr ""
 msgid "write error"
 msgstr "erro de escrita"
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:125
 msgid "Unknown system error"
 msgstr "Erro desconhecido do sistema"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: 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:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\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:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: a opção `%c%s' não permite um argumento\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: 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:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\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:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%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:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\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:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
+#: gnulib-lib/getopt.c: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:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: a opção '-W %s' é ambígua\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: a opção '-W %s' não permite um argumento\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: a opção `%s' requere um argumento\n"
-
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
@@ -119,8 +119,8 @@ msgid "missing arguments"
 msgstr "argumentos insuficientes"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Tente '%s --help' para mais informação.\n"
 
 #: src/envsubst.c:176
@@ -242,13 +242,13 @@ msgstr ""
 "                            MSGID do DIALECTO\n"
 
 #: src/gettext.c:264
-#, fuzzy, c-format, no-wrap
+#, 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"
@@ -316,6 +316,3 @@ msgstr ""
 "stdout. Em vez disso as mensagens encontradas no catálogo seleccionado\n"
 "são traduzidas.\n"
 "Pasta padrão de pesquisa: %s\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: opção ilegal -- %c\n"
diff --git a/gettext-runtime/po/pt_BR.po b/gettext-runtime/po/pt_BR.po
index 0fa7682e3..dad333bff 100644
--- a/gettext-runtime/po/pt_BR.po
+++ b/gettext-runtime/po/pt_BR.po
@@ -10,11 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2012-12-25 14:19+0900\n"
 "PO-Revision-Date: 2013-03-01 06:03-0300\n"
 "Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\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"
@@ -329,16 +328,12 @@ 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 ""
 #~ "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,18 +360,14 @@ 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
@@ -384,9 +375,7 @@ 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
@@ -394,38 +383,27 @@ 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
@@ -433,9 +411,7 @@ 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"
@@ -449,13 +425,10 @@ 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"
@@ -463,18 +436,15 @@ 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"
 
@@ -489,18 +459,15 @@ 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"
@@ -517,8 +484,7 @@ 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"
@@ -527,11 +493,9 @@ 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"
@@ -548,44 +512,33 @@ 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"
 
@@ -599,32 +552,25 @@ 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..."
@@ -659,11 +605,9 @@ 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"
@@ -680,8 +624,7 @@ 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"
@@ -690,11 +633,9 @@ 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"
@@ -710,42 +651,32 @@ 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"
 
@@ -757,12 +688,10 @@ 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"
@@ -770,18 +699,15 @@ 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"
 
@@ -811,15 +737,12 @@ 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"
@@ -827,18 +750,15 @@ 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"
 
@@ -901,8 +821,7 @@ 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"
@@ -930,9 +849,7 @@ 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"
@@ -960,12 +877,10 @@ 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"
@@ -973,18 +888,15 @@ 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"
 
@@ -1001,8 +913,7 @@ 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"
@@ -1011,14 +922,11 @@ 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"
@@ -1032,12 +940,8 @@ 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"
@@ -1063,8 +967,7 @@ 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"
@@ -1168,11 +1071,8 @@ 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\""
@@ -1190,9 +1090,7 @@ 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"
@@ -1203,49 +1101,36 @@ 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"
 
@@ -1287,14 +1172,10 @@ 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"
@@ -1306,48 +1187,36 @@ 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 ""
@@ -1355,16 +1224,12 @@ 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"
@@ -1377,32 +1242,25 @@ 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 ""
@@ -1427,20 +1285,14 @@ 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"
@@ -1450,56 +1302,40 @@ 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"
@@ -1507,17 +1343,12 @@ 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"
@@ -1525,29 +1356,24 @@ 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 1c2797e53..915622bd6 100644
--- a/gettext-runtime/po/ro.po
+++ b/gettext-runtime/po/ro.po
@@ -6,117 +6,113 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.13-pre1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2003-10-16 21:36+0200\n"
 "PO-Revision-Date: 2003-11-23 09:19+0200\n"
 "Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 
-#: gnulib-lib/closeout.c:66
+#: ../gettext-tools/lib/closeout.c:66
 msgid "write error"
 msgstr "eroare de scriere"
 
-#: gnulib-lib/error.c:188
+#: ../gettext-tools/lib/error.c:137 ../gettext-tools/lib/error.c:165
 msgid "Unknown system error"
 msgstr "Eroare de sistem necunoscut�"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: ../gettext-tools/lib/getopt.c:689 ../gettext-tools/lib/getopt.c:701
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: op�iunea `%s' este ambigu�\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: ../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:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\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"
 msgstr "%s: op�iunea `%c%s' nu permite parametri\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\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"
 msgstr "%s: op�iunea `%s' necesit� un parametru\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: ../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"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%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"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\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"
 msgstr "%s: op�iune invalid� -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
+#: ../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"
 msgstr "%s: op�iunea necesit� un parametru -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\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"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\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"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: op�iunea `%s' necesit� un parametru\n"
-
-#: gnulib-lib/xmalloc.c:37
+#: ../gettext-tools/lib/xmalloc.c:41
 #, c-format
 msgid "memory exhausted"
 msgstr "memorie plin�"
 
-#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
+#: src/envsubst.c:113 src/gettext.c:135 src/ngettext.c:125
 #, 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"
+"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"
 
-#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
+#: src/envsubst.c:118 src/gettext.c:140 src/ngettext.c:130
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scris de %s.\n"
 
-#. 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:157 src/ngettext.c:141
+#: src/envsubst.c:127 src/gettext.c:158 src/ngettext.c:142
 #, c-format
 msgid "too many arguments"
 msgstr "prea mul�i parametri"
 
-#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
+#: src/envsubst.c:138 src/gettext.c:168 src/ngettext.c:154
 #, c-format
 msgid "missing arguments"
 msgstr "parametri lips�"
 
-#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/envsubst.c:171 src/gettext.c:239 src/ngettext.c:208
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "�ncerca�i `%s --help' pentru mai multe informa�ii.\n"
 
 #: src/envsubst.c:176
@@ -182,29 +178,20 @@ msgstr ""
 "(output) va consta �n variabilele de mediula care se face referire �n\n"
 "FORMAT-SHELL, c�te una pe linie.\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:215 src/gettext.c:276 src/ngettext.c:242
 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:442
+#: src/envsubst.c:438
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "eroare �n citirea \"%s\""
 
-#: src/envsubst.c:443
+#: src/envsubst.c:439
 msgid "standard input"
 msgstr "intrare(input) standard"
 
-#. This is a proper name. See the gettext manual, section Names.
-#: src/gettext.c:139 src/ngettext.c:129
-msgid "Ulrich Drepper"
-msgstr ""
-
-#: src/gettext.c:243
+#: src/gettext.c:244
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -213,12 +200,12 @@ msgstr ""
 "Folosire: %s [OP�IUNE] [[DOMENIU_TEXT] MSGID]\n"
 "sau:    %s [OP�IUNE] -s [MSGID]...\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, 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:253
+#: src/gettext.c:254
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
@@ -239,14 +226,14 @@ msgstr ""
 "  [DOMENIU_TEXT] MSGID        preia mesajele traduse corespunz�toare\n"
 "                            lui MSGID din DOMENIU_TEXT\n"
 
-#: src/gettext.c:264
-#, fuzzy, c-format, no-wrap
+#: src/gettext.c:265
+#, 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"
@@ -260,12 +247,12 @@ msgstr ""
 "sunt traduse acele mesaje care sunt g�site �n catalogul selectat.\n"
 "Directorul de c�utare standard: %s\n"
 
-#: src/ngettext.c:212
+#: src/ngettext.c:213
 #, 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:217
+#: src/ngettext.c:218
 #, c-format, no-wrap
 msgid ""
 "Display native language translation of a textual message whose grammatical\n"
@@ -274,7 +261,7 @@ 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:222
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -295,7 +282,7 @@ msgstr ""
 "  MSGID MSGID-PLURAL        traduce MSGID (singular) / MSGID-PLURAL (plural)\n"
 "  NUM�RARE                     alege forma singular�/plural� bazat� pe aceast� valoare\n"
 
-#: src/ngettext.c:233
+#: src/ngettext.c:234
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -309,18 +296,3 @@ 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"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: op�iune ilegal� -- %c\n"
-
-#~ msgid ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is "
-#~ "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"
diff --git a/gettext-runtime/po/ru.po b/gettext-runtime/po/ru.po
index 10bad140b..a2ca33c76 100644
--- a/gettext-runtime/po/ru.po
+++ b/gettext-runtime/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.19-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2014-05-10 13:36+0900\n"
 "PO-Revision-Date: 2014-05-11 07:59+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -16,8 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%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"
 "X-Generator: Lokalize 1.5\n"
 
 #: gnulib-lib/closeout.c:66
@@ -323,13 +322,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 ""
 #~ "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 10935d46f..35ee4bd06 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.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2012-12-25 14:19+0900\n"
 "PO-Revision-Date: 2013-10-02 06:40+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -193,10 +193,8 @@ msgstr ""
 #: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245
 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
 #, c-format
diff --git a/gettext-runtime/po/sl.po b/gettext-runtime/po/sl.po
index ab2c921c8..65c5653a5 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.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2012-12-25 14:19+0900\n"
 "PO-Revision-Date: 2013-03-07 23:03+0100\n"
 "Last-Translator: Primoz PETERLIN <primozz.peterlin@gmail.com>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -17,8 +17,7 @@ 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"
+"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"
@@ -317,10 +316,8 @@ 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 ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "To je prost program; pogoji, pod katerimi ga lahko razmnožujete in\n"
@@ -358,8 +355,7 @@ 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"
@@ -373,29 +369,22 @@ 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"
@@ -404,31 +393,19 @@ 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"
@@ -440,15 +417,13 @@ 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"
 
@@ -465,15 +440,13 @@ 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"
@@ -481,49 +454,39 @@ 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"
 
@@ -534,16 +497,13 @@ 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"
 
@@ -554,29 +514,23 @@ 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"
@@ -595,8 +549,7 @@ 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 ""
@@ -604,88 +557,67 @@ 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 ""
@@ -693,17 +625,14 @@ 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"
@@ -730,18 +659,14 @@ 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"
@@ -750,19 +675,16 @@ 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"
@@ -808,17 +730,14 @@ 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"
@@ -826,51 +745,38 @@ 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"
@@ -896,28 +802,23 @@ 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"
@@ -938,25 +839,20 @@ 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"
@@ -978,26 +874,21 @@ 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"
@@ -1019,27 +910,22 @@ 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"
 
@@ -1049,31 +935,25 @@ 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"
@@ -1130,38 +1010,31 @@ 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"
@@ -1171,19 +1044,15 @@ 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 ""
@@ -1191,16 +1060,13 @@ 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"
@@ -1213,50 +1079,36 @@ 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"
@@ -1272,14 +1124,10 @@ 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č"
@@ -1287,12 +1135,9 @@ 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..."
@@ -1340,9 +1185,7 @@ 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;\""
@@ -1420,27 +1263,22 @@ 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"
@@ -1453,13 +1291,11 @@ 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"
@@ -1471,25 +1307,20 @@ 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"
@@ -1499,8 +1330,7 @@ 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"
@@ -1509,28 +1339,23 @@ 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"
@@ -1561,8 +1386,7 @@ 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"
@@ -1571,45 +1395,37 @@ 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"
 
@@ -1640,10 +1456,8 @@ 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"
@@ -1659,17 +1473,11 @@ 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."
@@ -1681,18 +1489,15 @@ 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"
 
@@ -1742,23 +1547,14 @@ 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"
@@ -1767,8 +1563,7 @@ 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"
@@ -1777,35 +1572,27 @@ 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 ""
@@ -1822,26 +1609,22 @@ 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"
@@ -1868,12 +1651,8 @@ 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"
@@ -1882,20 +1661,17 @@ 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"
@@ -1909,24 +1685,19 @@ 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"
@@ -1939,14 +1710,12 @@ 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 ""
@@ -1967,8 +1736,7 @@ 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"
@@ -1986,38 +1754,27 @@ 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"
@@ -2138,8 +1895,7 @@ 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"
@@ -2164,17 +1920,13 @@ 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"
@@ -2182,10 +1934,8 @@ 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"
 
@@ -2220,8 +1970,7 @@ 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"
@@ -2235,41 +1984,31 @@ 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"
 
@@ -2282,27 +2021,21 @@ 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"
@@ -2310,55 +2043,40 @@ 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"
 
@@ -2382,8 +2100,7 @@ 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"
@@ -2408,14 +2125,10 @@ 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"
@@ -2424,15 +2137,11 @@ 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"
@@ -2441,35 +2150,26 @@ 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 ""
@@ -2477,16 +2177,12 @@ 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"
@@ -2502,8 +2198,7 @@ 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"
@@ -2517,10 +2212,8 @@ 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"
@@ -2543,8 +2236,7 @@ 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
@@ -2557,44 +2249,31 @@ 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"
 
@@ -2602,30 +2281,21 @@ 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"
@@ -2633,17 +2303,12 @@ 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"
@@ -2651,14 +2316,12 @@ 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"
@@ -2670,9 +2333,7 @@ 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 f272de347..9c3a9d48a 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.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2012-12-25 14:19+0900\n"
 "PO-Revision-Date: 2013-10-03 09:12+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnu@prevod.org>\n"
@@ -15,8 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
diff --git a/gettext-runtime/po/sv.po b/gettext-runtime/po/sv.po
index 1c034ca72..03ed42e60 100644
--- a/gettext-runtime/po/sv.po
+++ b/gettext-runtime/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2012-12-25 14:19+0900\n"
 "PO-Revision-Date: 2013-03-10 16:05+0100\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -192,8 +192,7 @@ msgstr ""
 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
 #, c-format
diff --git a/gettext-runtime/po/tr.po b/gettext-runtime/po/tr.po
index 660db17d6..d9bbe0af2 100644
--- a/gettext-runtime/po/tr.po
+++ b/gettext-runtime/po/tr.po
@@ -6,156 +6,159 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2006-04-20 15:54+0200\n"
 "PO-Revision-Date: 2006-07-01 08:58+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: gnulib-lib/closeout.c:66
+#: ../gettext-tools/lib/closeout.c:64
 msgid "write error"
 msgstr "yazma hatası"
 
-#: gnulib-lib/error.c:188
+#: ../gettext-tools/lib/error.c:121
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatası"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: ../gettext-tools/lib/getopt.c:551 ../gettext-tools/lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: `%s' seçeneği belirsiz\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: ../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' seçeneği argümansız kullanılır\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: ../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"
 msgstr "%s: `%c%s' seçeneği argümansız kullanılır\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: ../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"
 msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: ../gettext-tools/lib/getopt.c:727 ../gettext-tools/lib/getopt.c:730
+#, 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
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%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' seçeneği bilinmiyor\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
+#: ../gettext-tools/lib/getopt.c:796 ../gettext-tools/lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: kuraldışı seçenek -- %c\n"
+
+#: ../gettext-tools/lib/getopt.c:805 ../gettext-tools/lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr "%s: geçersiz seçenek -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
+#: ../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"
 msgstr "%s: seçenek için bir argüman gerekli -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\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' seçeneği belirsiz\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
+#: ../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' seçeneği bir argümanla kullanılmaz\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
-
-#: gnulib-lib/xmalloc.c:37
+#: ../gettext-tools/lib/xmalloc.c:41
 #, c-format
 msgid "memory exhausted"
 msgstr "bellek tükendi"
 
-#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
+#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125
 #, 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"
+"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"
 
-#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
+#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130
 #, 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/envsubst.c:118
+#: src/envsubst.c:119
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
+#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142
 #, 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:139 src/gettext.c:168 src/ngettext.c:154
 #, c-format
 msgid "missing arguments"
 msgstr "argümanlar eksik"
 
-#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgilendirilmek için `%s --help' yazınız.\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:177
 #, 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:182
 #, 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:186
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "İşlem kipi:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:189
 #, 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:193
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Bilgilendirici çıktı:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:196
 #, 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:199
 #, 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:203
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -172,7 +175,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:212
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -182,31 +185,27 @@ msgstr ""
 "her satırda bir tane olmak üzere KABUK-BİÇİMİ içindeki ortam değişkenleri\n"
 "çıktılanır.\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:216 src/gettext.c:276 src/ngettext.c:242
 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:439
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" okunurken hata"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:440
 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:140 src/ngettext.c:130
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:243
+#: src/gettext.c:244
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -215,12 +214,12 @@ msgstr ""
 "Kullanımı: %s [SEÇENEK] [[PAKET] MSGID]\n"
 "ya da:     %s [SEÇENEK] -s [MSGID]...\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, 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:254
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
@@ -240,14 +239,14 @@ msgstr ""
 "  -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
-#, fuzzy, c-format, no-wrap
+#: src/gettext.c:265
+#, 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"
@@ -259,19 +258,19 @@ msgstr ""
 "Ancak iletiyi standart çıktıya basitçe kopyalamak yerine çevirisini verir.\n"
 "Standart arama dizini: %s\n"
 
-#: src/ngettext.c:212
+#: src/ngettext.c:213
 #, 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:218
 #, 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:223
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -292,7 +291,7 @@ msgstr ""
 "  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:234
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -306,22 +305,6 @@ msgstr ""
 "TEXTDOMAINDIR çevre değişkeni ile belirtilebilir.\n"
 "Standart arama dizini: %s\n"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: kuraldışı seçenek -- %c\n"
-
-#~ msgid ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is "
-#~ "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"
-
 #~ msgid "invalid argument `%s' for `%s'"
 #~ msgstr "argüman `%s' `%s' için geçersiz"
 
@@ -350,9 +333,7 @@ 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 ""
@@ -371,69 +352,43 @@ 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"
@@ -445,15 +400,13 @@ 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"
 
@@ -470,38 +423,30 @@ 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"
@@ -511,20 +456,16 @@ 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"
@@ -537,19 +478,15 @@ 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"
@@ -558,20 +495,16 @@ 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"
@@ -580,8 +513,7 @@ 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"
@@ -599,23 +531,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 ""
 #~ "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"
 
@@ -623,34 +550,29 @@ 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"
@@ -659,51 +581,37 @@ 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"
@@ -712,8 +620,7 @@ 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"
@@ -739,40 +646,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 ""
 #~ "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"
@@ -815,23 +714,18 @@ 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"
@@ -840,44 +734,32 @@ 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"
@@ -886,8 +768,7 @@ 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"
@@ -912,19 +793,16 @@ 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"
@@ -933,8 +811,7 @@ 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"
@@ -954,8 +831,7 @@ 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"
@@ -963,16 +839,13 @@ 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"
@@ -994,28 +867,22 @@ 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ı"
@@ -1036,8 +903,7 @@ 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"
@@ -1046,11 +912,9 @@ 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"
@@ -1064,22 +928,18 @@ 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"
@@ -1089,8 +949,7 @@ 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"
@@ -1140,37 +999,29 @@ 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 ""
@@ -1182,18 +1033,14 @@ 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 ""
@@ -1206,8 +1053,7 @@ 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"
@@ -1220,34 +1066,25 @@ 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"
@@ -1255,14 +1092,11 @@ 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 ""
@@ -1281,8 +1115,7 @@ 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"
@@ -1291,12 +1124,8 @@ 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"
@@ -1329,31 +1158,25 @@ 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"
@@ -1386,8 +1209,7 @@ 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"
@@ -1417,8 +1239,7 @@ 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"
@@ -1428,11 +1249,9 @@ 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"
@@ -1445,13 +1264,11 @@ 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"
@@ -1459,12 +1276,10 @@ 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"
@@ -1475,8 +1290,7 @@ 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"
@@ -1493,19 +1307,16 @@ 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"
@@ -1514,8 +1325,7 @@ 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"
@@ -1545,18 +1355,14 @@ 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"
@@ -1567,8 +1373,7 @@ 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"
@@ -1579,20 +1384,16 @@ 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 ""
@@ -1600,8 +1401,7 @@ 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"
@@ -1611,8 +1411,7 @@ 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"
@@ -1624,10 +1423,8 @@ 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"
@@ -1643,17 +1440,12 @@ 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."
@@ -1670,8 +1462,7 @@ 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 ""
@@ -1691,8 +1482,7 @@ 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"
@@ -1726,20 +1516,15 @@ 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ış."
@@ -1751,8 +1536,7 @@ 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"
@@ -1763,8 +1547,7 @@ 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"
@@ -1774,19 +1557,15 @@ 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 ""
@@ -1803,15 +1582,13 @@ 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"
@@ -1822,8 +1599,7 @@ 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"
@@ -1848,12 +1624,8 @@ 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"
@@ -1866,15 +1638,12 @@ 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"
@@ -1888,10 +1657,8 @@ 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"
@@ -1902,23 +1669,20 @@ 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"
@@ -1938,15 +1702,13 @@ 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"
 
@@ -1963,36 +1725,27 @@ 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"
@@ -2104,8 +1857,7 @@ 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"
@@ -2114,8 +1866,7 @@ 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"
@@ -2125,8 +1876,7 @@ 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"
@@ -2148,8 +1898,7 @@ 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 ""
@@ -2208,11 +1957,9 @@ 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"
@@ -2225,20 +1972,16 @@ 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"
 
@@ -2252,18 +1995,15 @@ 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"
@@ -2271,43 +2011,31 @@ 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"
@@ -2316,8 +2044,7 @@ 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"
@@ -2325,11 +2052,9 @@ 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 ""
@@ -2345,8 +2070,7 @@ 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 05b9bfd92..48338e067 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.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2012-12-25 14:19+0900\n"
 "PO-Revision-Date: 2013-02-26 22:34+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -321,14 +321,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"
-#~ "коді. Не надається НІЯКОЇ гарантії; навіть гарантії КОМЕРЦІЙНОЇ "
-#~ "ПРИДАТНОСТІ\n"
+#~ "Це - вільне програмне забезпечення; умови копіювання викладені у вихідному\n"
+#~ "коді. Не надається НІЯКОЇ гарантії; навіть гарантії КОМЕРЦІЙНОЇ ПРИДАТНОСТІ\n"
 #~ "або ПРИДАТНОСТІ ДО ПЕВНОЇ МЕТИ.\n"
diff --git a/gettext-runtime/po/vi.po b/gettext-runtime/po/vi.po
index 995726a0b..b105f071d 100644
--- a/gettext-runtime/po/vi.po
+++ b/gettext-runtime/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2012-12-25 14:19+0900\n"
 "PO-Revision-Date: 2013-04-15 08:11+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -199,8 +199,7 @@ msgstr ""
 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
 #, c-format
diff --git a/gettext-runtime/po/zh_CN.po b/gettext-runtime/po/zh_CN.po
index 8d438491c..8fd5873ab 100644
--- a/gettext-runtime/po/zh_CN.po
+++ b/gettext-runtime/po/zh_CN.po
@@ -12,11 +12,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2010-07-11 15:29+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@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"
@@ -26,62 +25,62 @@ msgstr ""
 msgid "write error"
 msgstr "写错误"
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "未知的系统错误"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s：选项“%s”是不明确的\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s：选项“--%s”不允许有参数\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s：选项“%c%s”不允许有参数\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s：选项“%s”需要一个参数\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s：无法识别的选项“--%s”\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s：无法识别的选项“%c%s”\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s：无效选项 ─ %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s：选项需要一个参数 ─ %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s：选项“-W %s”是不明确的\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s：选项“-W %s”不允许有参数\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s：选项“%s”需要一个参数\n"
@@ -125,8 +124,8 @@ msgid "missing arguments"
 msgstr "缺少了参数"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "试试“%s --help”来获取更多信息。\n"
 
 #: src/envsubst.c:176
@@ -244,13 +243,13 @@ msgstr ""
 "  [文本域] MSGID            由<文本域>读取相应于 MSGID 的翻译消息\n"
 
 #: src/gettext.c:264
-#, fuzzy, c-format, no-wrap
+#, 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"
diff --git a/gettext-runtime/po/zh_HK.po b/gettext-runtime/po/zh_HK.po
index 530e1063b..554bc9de3 100644
--- a/gettext-runtime/po/zh_HK.po
+++ b/gettext-runtime/po/zh_HK.po
@@ -10,155 +10,157 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-runtime 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2006-04-20 15:54+0200\n"
 "PO-Revision-Date: 2006-07-05 17:16+0800\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
-"Language: zh_HK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: gnulib-lib/closeout.c:66
+#: ../gettext-tools/lib/closeout.c:64
 msgid "write error"
 msgstr "寫入時發生錯誤"
 
-#: gnulib-lib/error.c:188
+#: ../gettext-tools/lib/error.c:121
 msgid "Unknown system error"
 msgstr "不明的系統錯誤"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: ../gettext-tools/lib/getopt.c:551 ../gettext-tools/lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s：選項「%s」不明確\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: ../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:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\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"
 msgstr "%s：選項「%c%s」不允許有參數\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: ../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"
 msgstr "%s：選項「%s」需要參數\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%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"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%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"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\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"
 msgstr "%s：選項無效 -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
+#: ../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"
 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"
+#: ../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"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\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"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s：選項「%s」需要參數\n"
-
-#: gnulib-lib/xmalloc.c:37
+#: ../gettext-tools/lib/xmalloc.c:41
 #, c-format
 msgid "memory exhausted"
 msgstr "記憶體耗盡"
 
-#: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
+#: src/envsubst.c:114 src/gettext.c:135 src/ngettext.c:125
 #, 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"
+"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"
 
-#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
+#: src/envsubst.c:119 src/gettext.c:140 src/ngettext.c:130
 #, c-format
 msgid "Written by %s.\n"
 msgstr "由 %s 編寫。\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/envsubst.c:118
+#: src/envsubst.c:119
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
+#: src/envsubst.c:128 src/gettext.c:158 src/ngettext.c:142
 #, c-format
 msgid "too many arguments"
 msgstr "參數過多"
 
-#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
+#: src/envsubst.c:139 src/gettext.c:168 src/ngettext.c:154
 #, c-format
 msgid "missing arguments"
 msgstr "缺少了參數"
 
-#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/envsubst.c:172 src/gettext.c:239 src/ngettext.c:208
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "如果想獲取額外資訊，請嘗試執行「%s --help」。\n"
 
-#: src/envsubst.c:176
+#: src/envsubst.c:177
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
 msgstr "用法：%s [選項] [SHELL-FORMAT]\n"
 
-#: src/envsubst.c:181
+#: src/envsubst.c:182
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
 msgstr "替換環境變數的值。\n"
 
-#: src/envsubst.c:185
+#: src/envsubst.c:186
 #, c-format, no-wrap
 msgid "Operation mode:\n"
 msgstr "操作模式:\n"
 
-#: src/envsubst.c:188
+#: src/envsubst.c:189
 #, 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:193
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "顯示資訊:\n"
 
-#: src/envsubst.c:195
+#: src/envsubst.c:196
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  顯示這段說明文字並結束\n"
 
-#: src/envsubst.c:198
+#: src/envsubst.c:199
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               顯示版本資訊並結束\n"
 
-#: src/envsubst.c:202
+#: src/envsubst.c:203
 #, c-format, no-wrap
 msgid ""
 "In normal operation mode, standard input is copied to standard output,\n"
@@ -172,7 +174,7 @@ msgstr ""
 "${VARIABLE}) 轉換為該變數的值，並在標準輸出顯示結果。如果指定了 SHELL-FORMAT，\n"
 "則只替換 SHELL-FORMAT 中指定的變數，否則所有環境變數都會替換。\n"
 
-#: src/envsubst.c:211
+#: src/envsubst.c:212
 #, c-format, no-wrap
 msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
@@ -181,29 +183,25 @@ msgstr ""
 "如果使用 --variables 選項，將不會理會輸入資料，只會讀取 SHELL-FORMAT 中的\n"
 "環境變數並顯示變數名稱，每個一行。\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:216 src/gettext.c:276 src/ngettext.c:242
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "請向 <bug-gnu-gettext@gnu.org> 匯報錯誤。\n"
 
-#: src/envsubst.c:442
+#: src/envsubst.c:439
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "讀取「%s」時出現錯誤"
 
-#: src/envsubst.c:443
+#: src/envsubst.c:440
 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:140 src/ngettext.c:130
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/gettext.c:243
+#: src/gettext.c:244
 #, c-format, no-wrap
 msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
@@ -212,12 +210,12 @@ msgstr ""
 "用法：%s [選項] [[文字領域] MSGID]\n"
 "或：  %s [選項] -s [MSGID]...\n"
 
-#: src/gettext.c:249
+#: src/gettext.c:250
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
 msgstr "顯示某個文字訊息的本地語言翻譯。\n"
 
-#: src/gettext.c:253
+#: src/gettext.c:254
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
@@ -237,14 +235,14 @@ msgstr ""
 "  -V, --version             顯示版本資訊並結束\n"
 "  [文字領域] MSGID          由<文字領域>讀取相應於 MSGID 的翻譯訊息\n"
 
-#: src/gettext.c:264
-#, fuzzy, c-format, no-wrap
+#: src/gettext.c:265
+#, 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"
@@ -256,19 +254,19 @@ msgstr ""
 "而是尋找訊息資料檔裏翻譯過的訊息。\n"
 "標準的搜尋目錄為：%s\n"
 
-#: src/ngettext.c:212
+#: src/ngettext.c:213
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 msgstr "用法：%s [選項] [文字領域] MSGID 複數MSGID 數字\n"
 
-#: src/ngettext.c:217
+#: src/ngettext.c:218
 #, 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:222
+#: src/ngettext.c:223
 #, c-format, no-wrap
 msgid ""
 "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
@@ -289,7 +287,7 @@ msgstr ""
 "  MSGID 複數MSGID           翻譯 MSGID (單數) / 複數MSGID (複數)\n"
 "  數字                      根據<數字>來選擇單數或複數型態\n"
 
-#: src/ngettext.c:233
+#: src/ngettext.c:234
 #, c-format, no-wrap
 msgid ""
 "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
@@ -302,17 +300,3 @@ msgstr ""
 "假如訊息資料檔不在正常的目錄下，可以用環境變數 TEXTDOMAINDIR 指定訊息資料檔\n"
 "的所在的位置。\n"
 "標準的搜尋目錄為：%s\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s：選項不合法 -- %c\n"
-
-#~ msgid ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is "
-#~ "NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
-#~ "PURPOSE.\n"
-#~ msgstr ""
-#~ "版權所有 (C) %s Free Software Foundation, Inc.\n"
-#~ "這是自由軟件；請參考源代碼的版權聲明。本軟件不提供任何保證，甚至不會包括\n"
-#~ "可售性和適用於任何特定目的的保證。\n"
diff --git a/gettext-runtime/po/zh_TW.po b/gettext-runtime/po/zh_TW.po
index 447b1c36c..6669981fe 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.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2012-12-25 14:19+0900\n"
 "PO-Revision-Date: 2013-09-03 13:00+0800\n"
 "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
diff --git a/gettext-tools/examples/Makefile.am b/gettext-tools/examples/Makefile.am
index 630f6819c..9092649b7 100644
--- a/gettext-tools/examples/Makefile.am
+++ b/gettext-tools/examples/Makefile.am
@@ -434,6 +434,7 @@ EXAMPLESPOFILES = \
   nl.po \
   pl.po \
   pt.po \
+  pt_BR.po \
   ro.po \
   ru.po \
   sk.po \
diff --git a/gettext-tools/examples/hello-c++-gnome/po/LINGUAS b/gettext-tools/examples/hello-c++-gnome/po/LINGUAS
index 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 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 9f5ec659a..339c7f92f 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 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 tr uk vi zh_CN zh_HK zh_TW
diff --git a/gettext-tools/examples/po/LINGUAS b/gettext-tools/examples/po/LINGUAS
index 9f5ec659a..339c7f92f 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 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 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 6c12e6112..0617894bd 100644
--- a/gettext-tools/examples/po/af.po
+++ b/gettext-tools/examples/po/af.po
@@ -7,64 +7,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.13.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2003-12-12 19:11+0100\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"
-"Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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
+#: 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
 msgid "Hello, world!"
 msgstr "Hallo wêreld!"
 
-#: 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: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
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Hierdie program loop as prosesnommer %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-msgstr ""
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
+#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Hierdie program loop as prosesnommer %1."
@@ -77,29 +55,28 @@ msgstr "Hallo voorbeeld"
 msgid "Hello world example"
 msgstr "Hallo wêreld voorbeeld"
 
-#: hello-sh/hello.sh:17
+#: hello-sh/hello.sh:18
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Hierdie program loop as prosesnommer $pid."
 
-#: hello-python/hello.py.in:13
+#: hello-python/hello.py.in:14
 #, 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:13 hello-guile/hello.scm:17
-#, scheme-format
+#: hello-clisp/hello.lisp.in:14
+#, lisp-format
 msgid "This program is running as process number ~D."
 msgstr "Hierdie program loop as prosesnommer ~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
+#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
+#: hello-java-swing/Hello.java:26
+#, java-format
 msgid "This program is running as process number {0}."
 msgstr "Hierdie program loop as prosesnommer {0}."
 
-#: hello-perl/hello-2.pl.in:14
+#: hello-perl/hello-2.pl.in:13
 #, 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 0fc61b5b4..03f0b9c4a 100644
--- a/gettext-tools/examples/po/ast.po
+++ b/gettext-tools/examples/po/ast.po
@@ -7,63 +7,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\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"
 "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-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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-c/hello.c:30 hello-c-gnome/hello.c:46 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 "�Hola, mundu!"
 
-#: 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 "Esti programa ta corriendo como'l procesu n�mberu %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/bg.po b/gettext-tools/examples/po/bg.po
index 96f262f62..089aa4762 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2014-05-10 13:38+0900\n"
 "PO-Revision-Date: 2014-05-11 13:29+0300\n"
 "Last-Translator:  Roumen Petrov <transl@roumenpetrov.info>\n"
 "Language-Team: Bulgarian <dict@ludost.net>\n"
@@ -16,8 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
+#: 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
@@ -47,22 +46,10 @@ msgstr "Здравейте на всички !"
 msgid "This program is running as process number %d."
 msgstr "Програмата е пусната под процес номер %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
 #: hello-c-gnome3/hello.ui:5
 msgid "Example Application"
 msgstr "Примерно приложение"
 
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/ca.po b/gettext-tools/examples/po/ca.po
index d6bf530bc..f6675ef48 100644
--- a/gettext-tools/examples/po/ca.po
+++ b/gettext-tools/examples/po/ca.po
@@ -6,66 +6,43 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.13.1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2003-12-12 19:11+0100\n"
 "PO-Revision-Date: 2003-12-18 10:41+0100\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
-"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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
+#: 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
 msgid "Hello, world!"
 msgstr "Hola, món!"
 
-#: 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
-#, php-format
+#: 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
 msgid "This program is running as process number %d."
 msgstr "Aquest programa està corrent amb el número de procés %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-msgstr ""
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
+#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Aquest programa està corrent amb el número de procés %1."
@@ -78,29 +55,26 @@ msgstr "Exemple Hola"
 msgid "Hello world example"
 msgstr "Exemple Hola Món"
 
-#: hello-sh/hello.sh:17
-#, sh-format
+#: hello-sh/hello.sh:18
 msgid "This program is running as process number $pid."
 msgstr "Aquest programa està corrent amb el número de procés $pid."
 
-#: hello-python/hello.py.in:13
+#: hello-python/hello.py.in:14
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Aquest programa està corrent amb el número de procés %(pid)d."
 
-#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
-#, scheme-format
+#: hello-clisp/hello.lisp.in:14
+#, lisp-format
 msgid "This program is running as process number ~D."
 msgstr "Aquest programa està corrent amb el número de procés ~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
+#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
+#: hello-java-swing/Hello.java:26
+#, java-format
 msgid "This program is running as process number {0}."
 msgstr "Aquest programa està corrent amb el número de procés {0}."
 
-#: hello-perl/hello-2.pl.in:14
-#, perl-brace-format
+#: hello-perl/hello-2.pl.in:13
 msgid "This program is running as process number {pid}."
 msgstr "Aquest programa està corrent amb el número de procés {pid}."
diff --git a/gettext-tools/examples/po/cs.po b/gettext-tools/examples/po/cs.po
index a3456a119..fa6a6db57 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.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
 "PO-Revision-Date: 2011-11-30 16:10+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -18,53 +18,35 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\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
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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-c/hello.c:30 hello-c-gnome/hello.c:46 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 "Ahoj světe!"
 
-#: 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 "Tento program běží jako proces číslo %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/da.po b/gettext-tools/examples/po/da.po
index be44666dc..92ecbdb1f 100644
--- a/gettext-tools/examples/po/da.po
+++ b/gettext-tools/examples/po/da.po
@@ -7,62 +7,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
 "PO-Revision-Date: 2011-01-08 12:39+0100\n"
 "Last-Translator: Keld Simonsen <keld@keldix.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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-c/hello.c:30 hello-c-gnome/hello.c:46 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 "Hej verden!"
 
-#: 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 "Dette program k�rer som proces nummer %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/de.po b/gettext-tools/examples/po/de.po
index ab307c097..340d906a6 100644
--- a/gettext-tools/examples/po/de.po
+++ b/gettext-tools/examples/po/de.po
@@ -10,7 +10,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-06-01 16:59+0900\n"
+"POT-Creation-Date: 2014-05-10 13:38+0900\n"
 "PO-Revision-Date: 2014-05-10 17:47+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -21,8 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
+#: 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
@@ -52,22 +51,10 @@ msgstr "Hallo Welt!"
 msgid "This program is running as process number %d."
 msgstr "Dieses Programm läuft mit der Prozess-Nummer %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
 #: hello-c-gnome3/hello.ui:5
 msgid "Example Application"
 msgstr "Beispielanwendung"
 
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/el.po b/gettext-tools/examples/po/el.po
index 1d382e9b7..a7b336cd3 100644
--- a/gettext-tools/examples/po/el.po
+++ b/gettext-tools/examples/po/el.po
@@ -6,65 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2004-01-17 17:57+0100\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"
-"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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
+#: 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
 msgid "Hello, world!"
 msgstr "Γεια σου, κόσμε!"
 
-#: 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: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
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-msgstr ""
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
+#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας %1."
@@ -77,29 +56,28 @@ msgstr "Παράδειγμα χαιρετισμού"
 msgid "Hello world example"
 msgstr "Παράδειγμα \"γεια σου κόσμε\""
 
-#: hello-sh/hello.sh:17
+#: hello-sh/hello.sh:18
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας $pid."
 
-#: hello-python/hello.py.in:13
+#: hello-python/hello.py.in:14
 #, 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
+#: hello-clisp/hello.lisp.in:14
+#, lisp-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
+#: 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
 msgid "This program is running as process number {0}."
 msgstr "Αυτό το πρόγραμμα εκτελείται με αριθμό διεργασίας {0}."
 
-#: hello-perl/hello-2.pl.in:14
+#: hello-perl/hello-2.pl.in:15
 #, 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 926fc2a97..41cf35422 100644
--- a/gettext-tools/examples/po/eo.po
+++ b/gettext-tools/examples/po/eo.po
@@ -7,64 +7,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2006-04-20 15:53+0200\n"
 "PO-Revision-Date: 2006-07-02 19:24+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
-"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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
+#: 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
 msgid "Hello, world!"
 msgstr "Saluton, mondo!"
 
-#: 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: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
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ĉi tiu programo rulas kiel procezo kun numero %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-msgstr ""
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
+#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Ĉi tiu programo rulas kiel procezo kun numero %1."
@@ -77,29 +57,29 @@ msgstr "Saluto-ekzemplo"
 msgid "Hello world example"
 msgstr "Saluton-mondo-ekzemplo"
 
-#: hello-sh/hello.sh:17
+#: hello-sh/hello.sh:18
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Ĉi tiu programo rulas kiel procezo kun numero $pid."
 
-#: hello-python/hello.py.in:13
+#: hello-python/hello.py.in:14
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Ĉi tiu programo rulas kiel procezo kun numero %(pid)d."
 
-#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
+#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Ĉi tiu programo rulas kiel procezo kun numero ~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
+#: 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
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Ĉi tiu programo rulas kiel procezo kun numero {0}."
 
-#: hello-perl/hello-2.pl.in:14
+#: hello-perl/hello-2.pl.in:15
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Ĉi tiu programo rulas kiel procezo kun numero {pid}."
diff --git a/gettext-tools/examples/po/es.po b/gettext-tools/examples/po/es.po
index 3c0b83c5f..77488ab2f 100644
--- a/gettext-tools/examples/po/es.po
+++ b/gettext-tools/examples/po/es.po
@@ -5,65 +5,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2004-01-17 17:57+0100\n"
 "PO-Revision-Date: 2004-01-29 13:59-0600\n"
 "Last-Translator: Max de Mendizábal <max@upn.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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
+#: 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
 msgid "Hello, world!"
 msgstr "¡Hola, 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: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
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Este programa está corriendo como el proceso número %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-msgstr ""
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
+#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Este programa está corriendo como el proceso número %1."
@@ -76,29 +55,28 @@ msgstr "Hola ejemplo"
 msgid "Hello world example"
 msgstr "Ejemplo de hola mundo"
 
-#: hello-sh/hello.sh:17
+#: hello-sh/hello.sh:18
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Este programa está corriendo como el proceso número $pid."
 
-#: hello-python/hello.py.in:13
+#: hello-python/hello.py.in:14
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Este programa está corriendo como el proceso número %(pid)d."
 
-#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
-#, scheme-format
+#: hello-clisp/hello.lisp.in:14
+#, lisp-format
 msgid "This program is running as process number ~D."
 msgstr "Este programa está corriendo como el proceso número ~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
+#: 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
 msgid "This program is running as process number {0}."
 msgstr "Este programa está corriendo como el proceso número {0}."
 
-#: hello-perl/hello-2.pl.in:14
+#: hello-perl/hello-2.pl.in:15
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Este programa está corriendo como el proceso número {pid}."
diff --git a/gettext-tools/examples/po/fi.po b/gettext-tools/examples/po/fi.po
index 78b19fc4e..e4139a802 100644
--- a/gettext-tools/examples/po/fi.po
+++ b/gettext-tools/examples/po/fi.po
@@ -6,27 +6,24 @@ 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: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2007-05-13 22:04+0200\n"
 "PO-Revision-Date: 2007-10-20 23:42+0300\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 # Tämä nimenomainen käännös valittu GNU Hellon mukaisesti.
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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-c/hello.c:30 hello-c-gnome/hello.c:46 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-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
@@ -35,34 +32,17 @@ msgstr ""
 msgid "Hello, world!"
 msgstr "Terve maailma!"
 
-#: 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 "Tämän ohjelman prosessinumero on %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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
@@ -93,8 +73,8 @@ msgid "This program is running as process number ~D."
 msgstr "Tämän ohjelman prosessinumero on ~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
+#: hello-java-swing/Hello.java:25 hello-csharp/hello.cs:17
+#: hello-csharp-forms/hello.cs:36
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Tämän ohjelman prosessinumero on {0}."
diff --git a/gettext-tools/examples/po/fr.po b/gettext-tools/examples/po/fr.po
index 9210c1b97..9f2ddc33d 100644
--- a/gettext-tools/examples/po/fr.po
+++ b/gettext-tools/examples/po/fr.po
@@ -2,70 +2,50 @@
 # Copyright © 2006 Yoyodyne, Inc.
 # Michel Robitaille <robitail@IRO.UMontreal.CA>, 2006.
 # Christophe Combelles <ccomb@free.fr>, 2006
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2006-04-20 15:53+0200\n"
 "PO-Revision-Date: 2006-10-01 02:29+0200\n"
 "Last-Translator: Christophe Combelles <ccomb@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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
+#: 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
 msgid "Hello, world!"
 msgstr "Bonjour, le monde !"
 
-#: 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: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
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Ce programme est exécuté en tant que processus numéro %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-msgstr ""
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
+#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Ce programme est exécuté en tant que processus numéro %1."
@@ -78,29 +58,29 @@ msgstr "Exemple Hello"
 msgid "Hello world example"
 msgstr "Exemple de « Hello world »"
 
-#: hello-sh/hello.sh:17
+#: hello-sh/hello.sh:18
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Ce programme est exécuté en tant que processus numéro $pid."
 
-#: hello-python/hello.py.in:13
+#: hello-python/hello.py.in:14
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Ce programme est exécuté en tant que processus numéro %(pid)d."
 
-#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
+#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Ce programme est exécuté en tant que processus numéro ~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
+#: 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
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Ce programme est exécuté en tant que processus numéro {0}."
 
-#: hello-perl/hello-2.pl.in:14
+#: hello-perl/hello-2.pl.in:15
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Ce programme est exécuté en tant que processus numéro {pid}."
diff --git a/gettext-tools/examples/po/ga.po b/gettext-tools/examples/po/ga.po
index d77aa4490..513eb1cb2 100644
--- a/gettext-tools/examples/po/ga.po
+++ b/gettext-tools/examples/po/ga.po
@@ -7,64 +7,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\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"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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
+#: 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
 msgid "Hello, world!"
 msgstr "Dia duit, a dhomhain!"
 
-#: 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: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
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "T� an cl�r seo � rith mar phr�iseas %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-msgstr ""
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
+#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "T� an cl�r seo � rith mar phr�iseas %1."
@@ -77,29 +56,28 @@ msgstr "Sampla `Dia duit'"
 msgid "Hello world example"
 msgstr "Sampla `Dia duit a dhomhain'"
 
-#: hello-sh/hello.sh:17
+#: hello-sh/hello.sh:18
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "T� an cl�r seo � rith mar phr�iseas $pid."
 
-#: hello-python/hello.py.in:13
+#: hello-python/hello.py.in:14
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "T� an cl�r seo � rith mar phr�iseas %(pid)d."
 
-#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
-#, scheme-format
+#: hello-clisp/hello.lisp.in:14
+#, lisp-format
 msgid "This program is running as process number ~D."
 msgstr "T� an cl�r seo � rith mar phr�iseas ~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
+#: 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
 msgid "This program is running as process number {0}."
 msgstr "T� an cl�r seo � rith mar phr�iseas {0}."
 
-#: hello-perl/hello-2.pl.in:14
+#: hello-perl/hello-2.pl.in:15
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "T� an cl�r seo � rith mar phr�iseas {pid}."
diff --git a/gettext-tools/examples/po/gl.po b/gettext-tools/examples/po/gl.po
index ffc9a3eeb..cfaf0c512 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-06-01 16:59+0900\n"
+"POT-Creation-Date: 2014-05-10 13:38+0900\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"
@@ -21,8 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
+#: 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
@@ -52,22 +51,10 @@ msgstr "Ola, mundo!"
 msgid "This program is running as process number %d."
 msgstr "Este programa estase executando como o proceso número %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
 #: hello-c-gnome3/hello.ui:5
 msgid "Example Application"
 msgstr "Aplicativo de exemplo"
 
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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 01cc85547..e4ebe2bc7 100644
--- a/gettext-tools/examples/po/hr.po
+++ b/gettext-tools/examples/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
 "PO-Revision-Date: 2012-07-04 18:38+0200\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -15,56 +15,37 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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-c/hello.c:30 hello-c-gnome/hello.c:46 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 "Pozdrav, svijete!"
 
-#: 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 "Ovaj program je pokrenut kao proces broj %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/hu.po b/gettext-tools/examples/po/hu.po
index 39dc5e17a..c2686d2bd 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2014-05-10 13:38+0900\n"
 "PO-Revision-Date: 2014-05-11 16:21+0200\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -19,8 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
+#: 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
@@ -50,22 +49,10 @@ msgstr "Hello, világ!"
 msgid "This program is running as process number %d."
 msgstr "Ez a program a(z) %d folyamatazonosítóval fut."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
 #: hello-c-gnome3/hello.ui:5
 msgid "Example Application"
 msgstr "Példa alkalmazás"
 
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/id.po b/gettext-tools/examples/po/id.po
index e58aedd78..646227737 100644
--- a/gettext-tools/examples/po/id.po
+++ b/gettext-tools/examples/po/id.po
@@ -7,65 +7,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2006-04-20 15:53+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"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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
+#: 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
 msgid "Hello, world!"
 msgstr "Hello, world!"
 
-#: 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: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
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Program ini berjalan sebagai proses nomor %d"
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-msgstr ""
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
+#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Program ini berjalan sebagai proses nomor %1"
@@ -78,29 +58,29 @@ msgstr "Contoh hello"
 msgid "Hello world example"
 msgstr "Contoh hello world"
 
-#: hello-sh/hello.sh:17
+#: hello-sh/hello.sh:18
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Program ini berjalan sebagai proses nomor $pid."
 
-#: hello-python/hello.py.in:13
+#: hello-python/hello.py.in:14
 #, 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:13 hello-guile/hello.scm:17
+#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Program ini berjalan sebagai proses nomor  ~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
+#: 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
 #, 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:14
+#: hello-perl/hello-2.pl.in:15
 #, 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 025f4dded..069a98d5a 100644
--- a/gettext-tools/examples/po/it.po
+++ b/gettext-tools/examples/po/it.po
@@ -7,64 +7,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2006-04-20 15:53+0200\n"
 "PO-Revision-Date: 2006-07-01 10:46+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
-"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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
+#: 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
 msgid "Hello, world!"
 msgstr "Salve, mondo!"
 
-#: 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: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
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Questo programma è in esecuzione con numero di processo %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-msgstr ""
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
+#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Questo programma è in esecuzione con numero di processo %1."
@@ -77,29 +57,29 @@ msgstr "Esempio di Salve mondo"
 msgid "Hello world example"
 msgstr "Esempio di Salve mondo"
 
-#: hello-sh/hello.sh:17
+#: hello-sh/hello.sh:18
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Questo programma è in esecuzione con numero di processo $pid."
 
-#: hello-python/hello.py.in:13
+#: hello-python/hello.py.in:14
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Questo programma è in esecuzione con numero di processo %(pid)d."
 
-#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
+#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Questo programma è in esecuzione con numero di 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
+#: 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
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Questo programma è in esecuzione con numero di processo {0}."
 
-#: hello-perl/hello-2.pl.in:14
+#: hello-perl/hello-2.pl.in:15
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Questo programma è in esecuzione con numero di processo {pid}."
diff --git a/gettext-tools/examples/po/ja.po b/gettext-tools/examples/po/ja.po
index f92f80ab4..178911276 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2014-05-10 13:38+0900\n"
 "PO-Revision-Date: 2014-05-11 14:01+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -16,8 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
+#: 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
@@ -47,22 +46,10 @@ msgstr "������, ����ˤ���!"
 msgid "This program is running as process number %d."
 msgstr "���Υץ������ϥץ������ֹ� %d ��ư���Ƥ��ޤ�."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
 #: hello-c-gnome3/hello.ui:5
 msgid "Example Application"
 msgstr "�������"
 
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/ky.po b/gettext-tools/examples/po/ky.po
index bde0c2f5b..5dac47099 100644
--- a/gettext-tools/examples/po/ky.po
+++ b/gettext-tools/examples/po/ky.po
@@ -7,28 +7,25 @@ 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: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2007-05-13 22:04+0200\n"
 "PO-Revision-Date: 2007-11-13 16:02+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"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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-c/hello.c:30 hello-c-gnome/hello.c:46 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-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
@@ -37,34 +34,17 @@ msgstr ""
 msgid "Hello, world!"
 msgstr "Салам дүйнө!"
 
-#: 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 "Бул программа %d процесс номери катары иштеп жатат."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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
@@ -95,8 +75,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-java-qtjambi/Hello.java:34
-#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
+#: hello-java-swing/Hello.java:25 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 73b86814b..02045251e 100644
--- a/gettext-tools/examples/po/lv.po
+++ b/gettext-tools/examples/po/lv.po
@@ -7,66 +7,46 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples-0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2007-10-18 03:08+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-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-gnome3/../hello.desktop.in.in:5 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-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-c/hello.c:30 hello-c-gnome/hello.c:46 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 "Sveika, pasaule!"
 
-#: 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 "Šī programma darbojas kā process ar numuru %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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 69635130d..56d0daece 100644
--- a/gettext-tools/examples/po/ms.po
+++ b/gettext-tools/examples/po/ms.po
@@ -8,64 +8,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2006-04-20 15:53+0200\n"
 "PO-Revision-Date: 2006-12-22 21:36+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
-"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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
+#: 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
 msgid "Hello, world!"
 msgstr "Hello, world!"
 
-#: 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: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
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Program ini dilaksanakan sebagai proses bernombor %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-msgstr ""
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
+#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Program ini dilaksanakan sebagai proses bernombor %1."
@@ -78,29 +58,29 @@ msgstr "Contoh hello"
 msgid "Hello world example"
 msgstr "Contoh hello world"
 
-#: hello-sh/hello.sh:17
+#: hello-sh/hello.sh:18
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "Program ini dilaksanakan sebagai proses bernombor $pid."
 
-#: hello-python/hello.py.in:13
+#: hello-python/hello.py.in:14
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Program ini dilaksanakan sebagai proses bernombor %(pid)d."
 
-#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
+#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
 #, scheme-format
 msgid "This program is running as process number ~D."
 msgstr "Program ini dilaksanakan sebagai proses bernombor ~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
+#: 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
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "Program ini dilaksanakan sebagai proses bernombor {0}."
 
-#: hello-perl/hello-2.pl.in:14
+#: hello-perl/hello-2.pl.in:15
 #, perl-brace-format
 msgid "This program is running as process number {pid}."
 msgstr "Program ini dilaksanakan sebagai proses bernombor {pid}."
diff --git a/gettext-tools/examples/po/mt.po b/gettext-tools/examples/po/mt.po
index aac70c342..3bc6bc26b 100644
--- a/gettext-tools/examples/po/mt.po
+++ b/gettext-tools/examples/po/mt.po
@@ -8,26 +8,23 @@ 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: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2007-05-13 22:04+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"
-"Language: mt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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-c/hello.c:30 hello-c-gnome/hello.c:46 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-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
@@ -36,34 +33,17 @@ msgstr ""
 msgid "Hello, world!"
 msgstr "Hello, lil kulħadd!"
 
-#: 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 "Dal-programm qed jaħdem taħt il-proċess numru %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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
@@ -94,8 +74,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-java-qtjambi/Hello.java:34
-#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
+#: hello-java-swing/Hello.java:25 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 504c6133e..edebe9f76 100644
--- a/gettext-tools/examples/po/nb.po
+++ b/gettext-tools/examples/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
 "PO-Revision-Date: 2012-10-14 06:46+0100\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@@ -18,53 +18,35 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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-c/hello.c:30 hello-c-gnome/hello.c:46 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 verden!"
 
-#: 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 "Dette programmet kjører som prosess nummer %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/nl.po b/gettext-tools/examples/po/nl.po
index 2a369a76b..4fee945f1 100644
--- a/gettext-tools/examples/po/nl.po
+++ b/gettext-tools/examples/po/nl.po
@@ -10,7 +10,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-06-01 16:59+0900\n"
+"POT-Creation-Date: 2014-05-10 13:38+0900\n"
 "PO-Revision-Date: 2014-05-11 12:17+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -21,8 +21,7 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
+#: 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
@@ -52,22 +51,10 @@ msgstr "Hallo, wereld!"
 msgid "This program is running as process number %d."
 msgstr "Dit programma draait als proces nummer %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
 #: hello-c-gnome3/hello.ui:5
 msgid "Example Application"
 msgstr "Voorbeeldtoepassing"
 
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/pl.po b/gettext-tools/examples/po/pl.po
index 690420b46..b90fa2120 100644
--- a/gettext-tools/examples/po/pl.po
+++ b/gettext-tools/examples/po/pl.po
@@ -7,7 +7,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-06-01 16:59+0900\n"
+"POT-Creation-Date: 2014-05-10 13:38+0900\n"
 "PO-Revision-Date: 2014-05-10 17:30+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -15,11 +15,9 @@ 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"
+"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-gnome3/hello.ui:22
+#: 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
@@ -49,22 +47,10 @@ msgstr "Witaj świecie!"
 msgid "This program is running as process number %d."
 msgstr "Ten program działa jako proces o numerze %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
 #: hello-c-gnome3/hello.ui:5
 msgid "Example Application"
 msgstr "Program przykładowy"
 
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/pt.po b/gettext-tools/examples/po/pt.po
index 29a562efd..32bb77826 100644
--- a/gettext-tools/examples/po/pt.po
+++ b/gettext-tools/examples/po/pt.po
@@ -7,64 +7,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\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"
 "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"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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
+#: 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
 msgid "Hello, world!"
 msgstr "Olá, 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: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
 #, 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."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-msgstr ""
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
+#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
 #, 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."
@@ -77,29 +57,29 @@ msgstr "Exemplo Olá"
 msgid "Hello world example"
 msgstr "Exemplo Olá Mundo"
 
-#: hello-sh/hello.sh:17
+#: hello-sh/hello.sh:18
 #, 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."
 
-#: hello-python/hello.py.in:13
+#: hello-python/hello.py.in:14
 #, 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."
 
-#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
+#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
 #, 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."
 
-#: 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
+#: 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
 #, 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}."
 
-#: hello-perl/hello-2.pl.in:14
+#: hello-perl/hello-2.pl.in:15
 #, 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}."
diff --git a/gettext-tools/examples/po/pt_BR.po b/gettext-tools/examples/po/pt_BR.po
new file mode 100644
index 000000000..0c85525dd
--- /dev/null
+++ b/gettext-tools/examples/po/pt_BR.po
@@ -0,0 +1,95 @@
+# Brazilian Portuguese translation for gettext-example
+# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2013 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gettext package.
+# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
+#
+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"
+"PO-Revision-Date: 2014-05-10 17:53-0300\n"
+"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\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.4\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-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: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
+#, php-format
+msgid "This program is running as process number %d."
+msgstr "Este programa está executando com número de processo %d."
+
+#: hello-c-gnome3/hello.ui:5
+msgid "Example Application"
+msgstr "Aplicativo exemplo"
+
+#: 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á executando com número de processo %1."
+
+#: hello-c++-kde/hello.cc:46
+msgid "Hello example"
+msgstr "Olá exemplo"
+
+#: hello-c++-kde/hello.cc:48
+msgid "Hello world example"
+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."
+
+#: 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."
+
+#: 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."
+
+#: 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}."
+
+#: 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}."
diff --git a/gettext-tools/examples/po/ro.po b/gettext-tools/examples/po/ro.po
index 886fc1a30..1725897f4 100644
--- a/gettext-tools/examples/po/ro.po
+++ b/gettext-tools/examples/po/ro.po
@@ -6,65 +6,40 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.13-pre1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2003-11-16 18:52+0100\n"
 "PO-Revision-Date: 2003-11-22 11:15+0200\n"
 "Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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
+#: 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:19 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.pl:14 hello-php/hello.php:13
 msgid "Hello, world!"
 msgstr "Salut, lume! (Hello, world!)"
 
-#: 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
-#, php-format
+#: 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.pl:16 hello-php/hello.php:15
 msgid "This program is running as process number %d."
 msgstr "Acest program este rulat ca procesul num�rul %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-msgstr ""
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
+#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:20 hello-ycp/hello.ycp:20
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Acest program este rulat ca procesul num�rul %1."
@@ -77,29 +52,22 @@ msgstr "Exemplu Salut(Hello)"
 msgid "Hello world example"
 msgstr "Exemplu Salut lume(Hello world)"
 
-#: hello-sh/hello.sh:17
-#, sh-format
+#: hello-sh/hello.sh:18
 msgid "This program is running as process number $pid."
 msgstr "Acest program ruleaz� ca procesul num�rul $pid."
 
-#: hello-python/hello.py.in:13
+#: hello-python/hello.py.in:14
 #, python-format
 msgid "This program is running as process number %(pid)d."
 msgstr "Acest program este rulat ca procesul num�rul %(pid)d."
 
-#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
-#, scheme-format
+#: hello-clisp/hello.lisp.in:14
+#, lisp-format
 msgid "This program is running as process number ~D."
 msgstr "Acest program este rulat ca procesul num�rul ~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
+#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
+#: hello-java-swing/Hello.java:26
+#, java-format
 msgid "This program is running as process number {0}."
 msgstr "Acest program este rulat ca procesul num�rul {0}."
-
-#: hello-perl/hello-2.pl.in:14
-#, fuzzy, perl-brace-format
-msgid "This program is running as process number {pid}."
-msgstr "Acest program ruleaz� ca procesul num�rul $pid."
diff --git a/gettext-tools/examples/po/ru.po b/gettext-tools/examples/po/ru.po
index ad0d314fc..7f78279cc 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2014-05-10 13:38+0900\n"
 "PO-Revision-Date: 2014-05-11 07:42+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -17,11 +17,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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-gnome3/hello.ui:22
+#: 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
@@ -51,22 +49,10 @@ msgstr "Здравствуй, мир!"
 msgid "This program is running as process number %d."
 msgstr "Эта программа выполняется как процесс под номером %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
 #: hello-c-gnome3/hello.ui:5
 msgid "Example Application"
 msgstr "Пример приложения"
 
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/sk.po b/gettext-tools/examples/po/sk.po
index 0f6b09704..634733ba1 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2014-05-10 13:38+0900\n"
 "PO-Revision-Date: 2014-05-10 18:15+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -16,8 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
+#: 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
@@ -47,22 +46,10 @@ msgstr "Ahoj svet!"
 msgid "This program is running as process number %d."
 msgstr "Tento program beží ako proces s číslom %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
 #: hello-c-gnome3/hello.ui:5
 msgid "Example Application"
 msgstr "Ukážková aplikácia"
 
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/sl.po b/gettext-tools/examples/po/sl.po
index 43d5f2a38..f48f51ef8 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2014-05-10 13:38+0900\n"
 "PO-Revision-Date: 2014-05-18 23:28+0200\n"
 "Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -16,11 +16,9 @@ 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"
+"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-gnome3/hello.ui:22
+#: 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
@@ -50,22 +48,10 @@ msgstr "Pozdravljen, svet!"
 msgid "This program is running as process number %d."
 msgstr "Ta program teče kot proces številka %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
 #: hello-c-gnome3/hello.ui:5
 msgid "Example Application"
 msgstr "Zgled aplikacije"
 
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/sr.po b/gettext-tools/examples/po/sr.po
index 32f2d867a..2a2f22eec 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2014-05-10 13:38+0900\n"
 "PO-Revision-Date: 2014-05-12 21:25+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -15,12 +15,10 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
+#: 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
@@ -50,22 +48,10 @@ msgstr "Здраво свима!"
 msgid "This program is running as process number %d."
 msgstr "Овај програм се извршава као процес број %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
 #: hello-c-gnome3/hello.ui:5
 msgid "Example Application"
 msgstr "Програм примера"
 
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/sv.po b/gettext-tools/examples/po/sv.po
index 6e0c25a59..c50c2af58 100644
--- a/gettext-tools/examples/po/sv.po
+++ b/gettext-tools/examples/po/sv.po
@@ -6,7 +6,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-06-01 16:59+0900\n"
+"POT-Creation-Date: 2014-05-10 13:38+0900\n"
 "PO-Revision-Date: 2014-05-15 07:02+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -15,8 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
+#: 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
@@ -46,22 +45,10 @@ msgstr "Hej världen!"
 msgid "This program is running as process number %d."
 msgstr "Detta program kör som process nummer %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
 #: hello-c-gnome3/hello.ui:5
 msgid "Example Application"
 msgstr "Exempelprogram"
 
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/tr.po b/gettext-tools/examples/po/tr.po
index 52a81cd9b..dbf147d8f 100644
--- a/gettext-tools/examples/po/tr.po
+++ b/gettext-tools/examples/po/tr.po
@@ -6,65 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.14-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\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"
 "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:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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
+#: 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
 msgid "Hello, world!"
 msgstr "Merhaba Dünyalı!"
 
-#: 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: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
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "Bu yazılım, %d süreç kimliği ile çalışıyor."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-msgstr ""
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
+#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "Bu yazılım, %1 süreç kimliği ile çalışıyor."
@@ -77,29 +56,28 @@ msgstr "Hello örneği"
 msgid "Hello world example"
 msgstr "Hello world örneği"
 
-#: hello-sh/hello.sh:17
+#: hello-sh/hello.sh:18
 #, 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:13
+#: hello-python/hello.py.in:14
 #, 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:13 hello-guile/hello.scm:17
-#, scheme-format
+#: hello-clisp/hello.lisp.in:14
+#, lisp-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: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
+#: 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
 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:14
+#: hello-perl/hello-2.pl.in:15
 #, 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 9f67f1ba2..7becc3dce 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2014-05-10 13:38+0900\n"
 "PO-Revision-Date: 2014-05-10 17:05+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -16,12 +16,10 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
+#: 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
@@ -51,22 +49,10 @@ msgstr "Привіт, світе!"
 msgid "This program is running as process number %d."
 msgstr "Ця програма виконується як процес з номером %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
 #: hello-c-gnome3/hello.ui:5
 msgid "Example Application"
 msgstr "Програма-приклад"
 
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/vi.po b/gettext-tools/examples/po/vi.po
index 7cf3f67ac..7e7c85e81 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2014-05-10 13:38+0900\n"
 "PO-Revision-Date: 2014-05-11 07:46+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -23,8 +23,7 @@ msgstr ""
 "X-Generator: Poedit 1.5.5\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
+#: 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
@@ -54,22 +53,10 @@ msgstr "Chào thế giới!"
 msgid "This program is running as process number %d."
 msgstr "Chương trình này đang chạy với số hiệu tiến trình %d."
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
 #: hello-c-gnome3/hello.ui:5
 msgid "Example Application"
 msgstr "Ứng dụng mẫu"
 
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/zh_CN.po b/gettext-tools/examples/po/zh_CN.po
index 14516e9d8..85376011c 100644
--- a/gettext-tools/examples/po/zh_CN.po
+++ b/gettext-tools/examples/po/zh_CN.po
@@ -6,65 +6,42 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.13.1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2003-12-12 19:11+0100\n"
 "PO-Revision-Date: 2003-12-18 19:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\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"
+"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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
+#: 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
 msgid "Hello, world!"
 msgstr "世界你好！"
 
-#: 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
-#, php-format
+#: 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
 msgid "This program is running as process number %d."
 msgstr "此程序正以进程号 %d 运行。"
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-msgstr ""
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
+#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "此程序正以进程号 %1 运行。"
@@ -77,29 +54,26 @@ msgstr "世界你好示例"
 msgid "Hello world example"
 msgstr "世界你好示例"
 
-#: hello-sh/hello.sh:17
-#, sh-format
+#: hello-sh/hello.sh:18
 msgid "This program is running as process number $pid."
 msgstr "此程序正以进程号 $pid 运行。"
 
-#: hello-python/hello.py.in:13
+#: hello-python/hello.py.in:14
 #, 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
+#: hello-clisp/hello.lisp.in:14
+#, lisp-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
+#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
+#: hello-java-swing/Hello.java:26
+#, java-format
 msgid "This program is running as process number {0}."
 msgstr "此程序正以进程号 {0} 运行。"
 
-#: hello-perl/hello-2.pl.in:14
-#, perl-brace-format
+#: hello-perl/hello-2.pl.in:13
 msgid "This program is running as process number {pid}."
 msgstr "此程序正以进程号 {pid} 运行。"
diff --git a/gettext-tools/examples/po/zh_HK.po b/gettext-tools/examples/po/zh_HK.po
index 283ff9689..499a7937d 100644
--- a/gettext-tools/examples/po/zh_HK.po
+++ b/gettext-tools/examples/po/zh_HK.po
@@ -6,64 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-examples 0.15-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2006-04-20 15:53+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"
-"Language: zh_HK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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
+#: 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
 msgid "Hello, world!"
 msgstr "你好！"
 
-#: 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: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
 #, php-format
 msgid "This program is running as process number %d."
 msgstr "本程式正在執行中，進程編號為 %d。"
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-msgstr ""
-
-#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
+#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
 #, ycp-format
 msgid "This program is running as process number %1."
 msgstr "本程式正在執行中，進程編號為 %1。"
@@ -76,29 +56,29 @@ msgstr "測試範例"
 msgid "Hello world example"
 msgstr "訊息測試範例"
 
-#: hello-sh/hello.sh:17
+#: hello-sh/hello.sh:18
 #, sh-format
 msgid "This program is running as process number $pid."
 msgstr "本程式正在執行中，進程編號為 $pid。"
 
-#: hello-python/hello.py.in:13
+#: hello-python/hello.py.in:14
 #, 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
+#: hello-clisp/hello.lisp.in:14 hello-guile/hello.scm:18
 #, 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
+#: 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
 #, csharp-format
 msgid "This program is running as process number {0}."
 msgstr "本程式正在執行中，進程編號為 {0}。"
 
-#: hello-perl/hello-2.pl.in:14
+#: hello-perl/hello-2.pl.in:15
 #, 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 c920e8d60..01d85f161 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.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 16:59+0900\n"
+"POT-Creation-Date: 2009-08-16 12:22+0200\n"
 "PO-Revision-Date: 2013-09-03 13:00+0800\n"
 "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -17,53 +17,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
-#: hello-c-gnome3/../hello.desktop.in.in:5 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-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-c/hello.c:30 hello-c-gnome/hello.c:46 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-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 "本程式正在執行，行程編號為 %d。"
 
-#: hello-c-gnome3/../hello.desktop.in.in:4
-msgid "Hello"
-msgstr ""
-
-#: hello-c-gnome3/hello.ui:5
-msgid "Example Application"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:7
-msgid "Set label sensitive"
-msgstr ""
-
-#: hello-c-gnome3/hello.gschema.xml:8
-msgid "Whether to set the label sensitive."
-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/po/be.po b/gettext-tools/po/be.po
index 11d882410..c7d8eec17 100644
--- a/gettext-tools/po/be.po
+++ b/gettext-tools/po/be.po
@@ -5,841 +5,346 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.5\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2002-08-06 16:01+0200\n"
 "PO-Revision-Date: 2002-09-04 18:51+0300\n"
 "Last-Translator: Ales Nyakhaychyk <i18n@infonet.by>\n"
 "Language-Team: Belarusian <i18n@tut.by>\n"
-"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: gnulib-lib/argmatch.c:133
-#, fuzzy, c-format
-msgid "invalid argument %s for %s"
+#: lib/argmatch.c:134
+#, c-format
+msgid "invalid argument `%s' for `%s'"
 msgstr "нерэчаісны аргумэнт `%s' для `%s'"
 
-#: gnulib-lib/argmatch.c:134
-#, fuzzy, c-format
-msgid "ambiguous argument %s for %s"
+#: lib/argmatch.c:135
+#, c-format
+msgid "ambiguous argument `%s' for `%s'"
 msgstr "неадназначны аргумэнт `%s' для `%s'"
 
-#: gnulib-lib/argmatch.c:153
+#: lib/argmatch.c:155
 msgid "Valid arguments are:"
 msgstr "Рэчаісныя аргумэнты:"
 
-#: gnulib-lib/clean-temp.c:332
+#: 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 "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "немагчыма знайсці часовую дырэкторыю, паспрабуйце ўсталяваць $TMPDIR"
-
-#: gnulib-lib/clean-temp.c:346
-#, c-format
-msgid "cannot create a temporary directory using template \"%s\""
-msgstr ""
-"немагчыма стварыць часовую дырэкторыю,\n"
-"выкарыстоўвываючы ўзор \"%s\""
-
-#: gnulib-lib/clean-temp.c:442
-#, fuzzy, c-format
-msgid "cannot remove temporary file %s"
-msgstr "немагчыма стварыць файл вываду \"%s\""
-
-#: gnulib-lib/clean-temp.c:457
-#, fuzzy, c-format
-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:217
-#, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:194
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
 msgstr "памылка ў час чытаньня файла \"%s\""
 
-#: gnulib-lib/copy-file.c:198
-#, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+#: lib/copy-file.c:68
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "немагчыма адчыніць дубліруючы файл \"%s\" для запісу"
 
-#: gnulib-lib/copy-file.c:202
-#, fuzzy, c-format
-msgid "error reading %s"
+#: lib/copy-file.c:81 src/urlget.c:216
+#, c-format
+msgid "error reading \"%s\""
 msgstr "памылка чытаньня \"%s\""
 
-#: gnulib-lib/copy-file.c:206
-#, fuzzy, c-format
-msgid "error writing %s"
+#: lib/copy-file.c:87 lib/copy-file.c:91
+#, c-format
+msgid "error writing \"%s\""
 msgstr "памылка запісу файла \"%s\""
 
-#: gnulib-lib/copy-file.c:210
-#, fuzzy, 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
+#: lib/copy-file.c:93 src/urlget.c:226
 #, c-format
-msgid "fdopen() failed"
-msgstr "fdopen() памылка"
-
-#: gnulib-lib/csharpcomp.c:571
-#, fuzzy, c-format
-msgid "C# compiler not found, try installing pnet"
-msgstr "Java кампілятар ня знойдзен, паспрабуйце ўсталяваць gcj ці $JAVAC"
-
-#: gnulib-lib/csharpexec.c:343
-#, fuzzy, c-format
-msgid "C# virtual machine not found, try installing pnet"
-msgstr ""
-"Віртуальная Java-машына ня знойдзена, паспрабуйце ўсталяваць gij ці $JAVA"
+msgid "error after reading \"%s\""
+msgstr "памылка пасля чытаньня \"%s\""
 
-#: gnulib-lib/error.c:188
+#: lib/error.c:116
 msgid "Unknown system error"
 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
+#: 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:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: lib/getopt.c:691
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: выбар `%s' неадназначны\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: lib/getopt.c:716
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: выбар `--%s' не патрабуе аргумэнтаў\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: lib/getopt.c:721
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: выбар `%c%s' не патрабуе аргумэнтаў\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: lib/getopt.c:739 lib/getopt.c:912
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: выбар `%s' патрабуе аргумэнт\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: lib/getopt.c:768
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: нераспазнаны выбар `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
+#: lib/getopt.c:772
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: нераспазнаны выбар `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: нерэчаісны выбар -- %c\n"
-
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: выбар патрабуе аргумэнт -- %c\n"
-
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: выбар `-W %s' неадназначны\n"
-
-#: 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"
-
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: lib/getopt.c:798
 #, c-format
-msgid "invalid source_version argument to compile_java_class"
-msgstr ""
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: несапраўдны выбар -- %c\n"
 
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: lib/getopt.c:801
 #, c-format
-msgid "invalid target_version argument to compile_java_class"
-msgstr ""
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: нерэчаісны выбар -- %c\n"
 
-#: 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
+#: lib/getopt.c:831 lib/getopt.c:961
 #, c-format
-msgid "failed to create \"%s\""
-msgstr "немагчыма стварыць \"%s\""
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: выбар патрабуе аргумэнт -- %c\n"
 
-#: 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
+#: lib/getopt.c:878
 #, c-format
-msgid "error while writing \"%s\" file"
-msgstr "памылка ў час запісу файла \"%s\""
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: выбар `-W %s' неадназначны\n"
 
-#: gnulib-lib/javacomp.c:2343
+#: lib/getopt.c:896
 #, 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"
 
-#: gnulib-lib/javaexec.c:417
-#, c-format
+#: lib/javaexec.c:414
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr ""
-"Віртуальная Java-машына ня знойдзена, паспрабуйце ўсталяваць gij ці $JAVA"
-
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
-#, c-format
-msgid "%s subprocess I/O error"
-msgstr "падпрацэс %s, памылка ўводу-вываду"
+msgstr "Віртуальная Java-машына ня знойдзена, паспрабуйце ўсталяваць gij ці $JAVA"
 
-#: 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
-#, c-format
+#: 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 "памяць вычарпана"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "памылка запісу ў падпрацэс %s"
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "памылка чытаньня з падпрацэса %s"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "немагчыма ўсталяваць неблакіруючы ўвод-вывад у падпрацэс %s"
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "памылка ўзаемадзеяньня з падпрацэсам %s"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, 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
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
-#. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
-msgid "`"
-msgstr ""
-
-#: gnulib-lib/quotearg.c:313
-msgid "'"
-msgstr ""
-
-#: gnulib-lib/set-acl.c:46
-#, c-format
-msgid "setting permissions for %s"
-msgstr ""
-
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
-#, c-format
+#: 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 "не магчыма стварыць канвеэр"
 
-#: gnulib-lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr ""
-
-#: gnulib-lib/w32spawn.h:84
-#, fuzzy, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "немагчыма стварыць файл вываду \"%s\""
-
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: lib/wait-process.c:110
 #, c-format
 msgid "%s subprocess"
 msgstr "%s падпрацэс"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: lib/wait-process.c:124
 #, 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
-#, 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 "'%s' - гэта нерэчаісны %s фармат радку, у адрозьненьне ад 'msgid'"
-
-#: 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-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 "спэцыфікацыя фармату для аргумэнта %u, як у '%s', ня йснуе ў 'msgid'"
-
-#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
-#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
-#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
-#, c-format
-msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "спэцыфікацыя фармату для аргумэнта %u ня йснуе ў '%s'"
-
-#: src/format-awk.c: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-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr "спэцыфікатары фармату ў 'msgid' і '%s' для аргумэнта %u неаднолькавыя"
-
-#: src/format-boost.c:449
-#, c-format
-msgid "The directive number %u starts with | but does not end with |."
-msgstr ""
-
-#: src/format-c.c:36
+#: src/format-c.c:760 src/format-python.c:506
 #, 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: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
-msgid "number of format specifications in '%s' and '%s' does not match"
+msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "колькасьць спэцыфікацый фармату ў 'msgid' і '%s' не супадае"
 
-#: src/format-csharp.c:88 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-c.c:774 src/format-elisp.c:389 src/format-librep.c:353
+#: src/format-pascal.c:443 src/format-python.c:520
 #, 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 '}'."
-msgstr ""
-
-#: src/format-csharp.c:139
-#, c-format
-msgid ""
-"The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr ""
-
-#: src/format-csharp.c:140
-#, 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 "
-"'{'."
-msgstr ""
-
-#: src/format-csharp.c:162
-#, 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 ""
+msgid "format specifications in 'msgid' and '%s' for argument %u are not the same"
+msgstr "спэцыфікатары фармату ў 'msgid' і '%s' для аргумэнта %u неаднолькавыя"
 
-#: src/format-java.c:323
+#: src/format-elisp.c:349 src/format-librep.c:313 src/format-pascal.c:403
+#: src/format-ycp.c:145
 #, 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 ""
+msgid "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+msgstr "спэцыфікацыя фармату для аргумэнта %u, як у '%s', ня йснуе ў 'msgid'"
 
-#: src/format-java.c:572
+#: src/format-elisp.c:364 src/format-librep.c:328 src/format-pascal.c:418
+#: src/format-ycp.c:144
 #, c-format
-msgid "In the directive number %u, a choice contains no number."
-msgstr ""
+msgid "a format specification for argument %u doesn't exist in '%s'"
+msgstr "спэцыфікацыя фармату для аргумэнта %u ня йснуе ў '%s'"
 
-#: src/format-java.c:583
+#: src/format-java.c:660
 #, 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 '%s'"
+msgid "a format specification for argument {%u}, as in '%s', doesn't exist in 'msgid'"
 msgstr "спэцыфікацыя фармату для аргумэнта {%u}, як у '%s', не йснуе ў 'msgid'"
 
-#: src/format-java.c:756
+#: src/format-java.c:675
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%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} не аднолькавыя"
-
-#: 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 ""
-
-#: src/format-lisp.c:2372 src/format-scheme.c:2398
+#: src/format-java.c:700
 #, 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] ""
+msgid "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+msgstr "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта {%u} не аднолькавыя"
 
-#: src/format-lisp.c:2496 src/format-scheme.c:2499
+#: src/format-lisp.c:3381
 #, 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
-#, c-format
-msgid "In the directive number %u, the argument %d is negative."
-msgstr ""
-
-#: src/format-lisp.c:2805
-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
-#, c-format
-msgid "Found '~%c' without matching '~%c'."
-msgstr ""
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
+msgstr "спэцыфікацыі фармата ў 'msgid' і '%s' нераўназначныя"
 
-#: src/format-lisp.c:2863 src/format-scheme.c:2860
+#: src/format-lisp.c:3402
 #, c-format
-msgid "In the directive number %u, both the @ and the : modifiers are given."
-msgstr ""
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+msgstr "спэцыфікацыі фармата ў '%s' не з'яўляюцца падмноствам спэцыфікацый у 'msgid'"
 
-#: src/format-lisp.c:2976 src/format-scheme.c:2973
+#: src/format-python.c:397
 #, c-format
-msgid ""
-"In the directive number %u, '~:[' is not followed by two clauses, separated "
-"by '~;'."
+msgid "format specifications in 'msgid' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 
-#: src/format-lisp.c:3326 src/format-scheme.c:3263
+#: src/format-python.c:409
 #, c-format
-msgid "In the directive number %u, '~;' is used in an invalid position."
+msgid "format specifications in 'msgid' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 
-#: src/format-lisp.c:3432 src/format-scheme.c:3355
-msgid "The string refers to some argument in incompatible ways."
-msgstr ""
-
-#: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "спэцыфікацыі фармата ў 'msgid' і '%s' нераўназначныя"
-
-#: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr ""
-"спэцыфікацыі фармата ў '%s' не з'яўляюцца падмноствам спэцыфікацый у 'msgid'"
-
-#: src/format-perl.c:433
+#: src/format-python.c:437
 #, c-format
-msgid ""
-"In the directive number %u, the size specifier is incompatible with the "
-"conversion specifier '%c'."
-msgstr ""
+msgid "a format specification for argument '%s', as in '%s', doesn't exist in 'msgid'"
+msgstr "спэцыфікацыі фармату для аргумэнту '%s', як у '%s', не існуюць у'msgid'"
 
-#: 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.c:452
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "спцэыфікацыя фармату для аргумэнта \"%s\" ня йснуе ў \"%s\""
 
-#: 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
+#: src/format-python.c:478
 #, 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' 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' expect a tuple, those in '%s' expect a mapping"
-msgstr ""
-"спэцыфікацыі фармата ў '%s' не з'яўляюцца падмноствам спэцыфікацый у 'msgid'"
-
-#: 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 ""
-"спэцыфікацыі фармату для аргумэнту '%s', як у '%s', не існуюць у'msgid'"
-
-#: src/format-python.c:494
-#, fuzzy, c-format
-msgid ""
-"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgid "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта '%s' неаднолькавыя"
 
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr ""
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr ""
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr ""
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-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"
-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 ""
-
-#: 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
+#: 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
 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"
+"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"
 
-#: 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
+#: 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"
 
-#. 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
-msgid "Bruno Haible"
-msgstr ""
-
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
-#, c-format
+#: src/gettext.c:158 src/hostname.c:190 src/msginit.c:271 src/ngettext.c:143
 msgid "too many arguments"
 msgstr "вельмі шмат аргумэнтаў"
 
-#: 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
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/gettext.c:168 src/ngettext.c:155
+msgid "missing arguments"
+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"
 
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/gettext.c:245
+#, 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"
+
+#: src/gettext.c:251
+#, no-wrap
+msgid "Display native language translation of a textual message.\n"
+msgstr "Адлюстроўвае пераклады на родную мову тэкставых паведамленьняў.\n"
+
+#: src/gettext.c:255
+#, 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/gettext.c:266
+#, 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"
+
+#: 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
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР]\n"
 
-#: src/hostname.c:215
-#, c-format
+#: src/hostname.c:214
+#, no-wrap
 msgid "Print the machine's hostname.\n"
 msgstr "Друкуе назву вузла.\n"
 
-#: src/hostname.c:218
-#, c-format
-msgid "Output format:\n"
-msgstr ""
-
-#: src/hostname.c:220
-#, c-format
-msgid "  -s, --short                 short host name\n"
-msgstr ""
-
-#: src/hostname.c:222
-#, fuzzy, c-format
+#: src/hostname.c:219
+#, no-wrap
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified "
-"domain\n"
-"                                name, and aliases\n"
+"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"
@@ -847,80 +352,46 @@ msgstr ""
 "                        назву маёнтка й прозьвішчы\n"
 "  -i, --ip-address      адрас для вузла\n"
 
-#: src/hostname.c:225
-#, 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
-#, c-format, no-wrap
-msgid "Informative output:\n"
-msgstr ""
-
-#: 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 ""
-
-#: 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
-#, fuzzy, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\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"
 
-#. 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 "Паведамляйце аб памылках на адрас <bug-gnu-gettext@gnu.org>.\n"
-
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
-#, c-format
+#: src/hostname.c:249 src/hostname.c:256
 msgid "could not get host name"
 msgstr "немагчыма атрымаць назву вузла"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
-#, c-format
+#: 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: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: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 узаема выключны"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
-#, c-format
+#: src/msgattrib.c:332 src/msgconv.c:253 src/msggrep.c:407 src/msguniq.c:279
+#, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]\n"
 
-#: src/msgattrib.c:426
-#, c-format, no-wrap
+#: src/msgattrib.c:337
+#, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
@@ -928,67 +399,34 @@ 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:372 src/msgmerge.c:502 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: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
-#, fuzzy, c-format
-msgid "Input file location:\n"
-msgstr "невызначан уваходзячы файл"
-
-#: 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: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: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
-#, c-format
+#: 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"
-msgstr ""
-
-#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
-#, fuzzy, c-format
-msgid "If no input file is given or if it is -, standard input is read.\n"
+"If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "Файл уводу:\n"
-"  ФАЙЛ ...                 .mo файлы\n"
+"  INPUTFILE                   уваходзячы PO файл\n"
+"  -D, --directory=ДЫРЭКТОРЫЯ  дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку ўваходзячых\n"
+"                              файлаў\n"
 "Калі ўваходзячы файл не зададзен, ці замест яго -, чытае стандартны ўвод.\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:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
-#, 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
-#, 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/msgunfmt.c:493 src/msguniq.c:358
-#, fuzzy, c-format
+#: 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"
 msgstr ""
@@ -997,266 +435,91 @@ msgstr ""
 "Вынікі запісваюцца ў стандартны вывад, калі ймя файла для вываду не\n"
 "зададзена, ці замест яго -.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
-#, c-format
-msgid "Message selection:\n"
-msgstr ""
-
-#: src/msgattrib.c:452
-#, c-format
+#: src/msgattrib.c:364
+#, no-wrap
 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 ""
-
-#: 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 ""
+"Выбар паведамленьня:\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: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/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
-#, 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:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 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: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
-#, 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
-#, 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: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
-#, 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
-#, c-format
+#: src/msgattrib.c:386
+#, no-wrap
 msgid ""
+"Output details:\n"
 "  -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
-#, c-format
-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
-#, 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
-#, 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
-#, 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
-#, c-format
-msgid ""
+"      --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"
-msgstr ""
-
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
-#, c-format
-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
-#, 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
-#, c-format
-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
-#, 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
-#, c-format
-msgid ""
+"  -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/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
-#, 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
-#, c-format
-msgid "  -F, --sort-by-file          sort output by file location\n"
-msgstr ""
-
-#: src/msgcat.c:322 src/msgcomm.c:327
+"  -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
 #, 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
-#, c-format
+#: 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:372
-#, fuzzy, c-format, no-wrap
+#: 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"
@@ -1264,9 +527,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, 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"
+"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"
@@ -1279,98 +542,118 @@ msgstr ""
 "будуць узяты  з першага PO-файла.\n"
 "Пазіцыі з усіх PO-файлаў будуць аб'яднаны ў кучу\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
-#, c-format
-msgid "  INPUTFILE ...               input files\n"
-msgstr ""
-
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
-#, 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
-#, c-format
-msgid "If input file is -, standard input is read.\n"
-msgstr ""
-
-#: src/msgcat.c:408 src/msgcomm.c:399
-#, 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
-#, 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
-#, c-format
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:558
+#, no-wrap
 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
-#, c-format
-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
-#, 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
-#, c-format
-msgid "  -t, --to-code=NAME          encoding for output\n"
+"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:430 src/msguniq.c:380
-#, c-format
+#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309
+#, no-wrap
 msgid ""
-"      --use-first             use first available translation for each\n"
-"                              message, don't merge several translations\n"
+"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"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
-#, c-format
+#: src/msgcat.c:340
+#, no-wrap
 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
-msgid "Peter Miller"
+"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
+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/msgcmp.c:189 src/msgmerge.c:370
-#, c-format
+#: src/msgcmp.c:149 src/msgmerge.c:286
 msgid "no input files given"
 msgstr "не зададзены ўводзячыя файлы"
 
-#: src/msgcmp.c:194 src/msgmerge.c:375
-#, c-format
+#: src/msgcmp.c:154 src/msgmerge.c:291
 msgid "exactly 2 input files required"
 msgstr "патрабуецца менавіта 2 уводзячых файла"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
-#, c-format
+#: src/msgcmp.c:175 src/msgmerge.c:390
+#, c-format, no-wrap
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] def.po ref.pot\n"
 
-#: src/msgcmp.c:218
-#, c-format, no-wrap
+#: 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"
@@ -1387,77 +670,46 @@ msgstr ""
 "супадзеньне ня будзе знойдзена, выкарыстоўвываецца недакладае - для\n"
 "лепшай праверкі.\n"
 
-#: src/msgcmp.c:232
-#, c-format
-msgid "  def.po                      translations\n"
-msgstr ""
-
-#: src/msgcmp.c:234
-#, c-format
-msgid "  ref.pot                     references to the sources\n"
-msgstr ""
-
-#: src/msgcmp.c:239 src/msgmerge.c:551
-#, c-format
-msgid "Operation modifiers:\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:241 src/msgmerge.c:553
-#, fuzzy, c-format
+#: src/msgcmp.c:203 src/msgmerge.c:454
+#, no-wrap
 msgid ""
-"  -m, --multi-domain          apply ref.pot to each of the domains in def."
-"po\n"
+"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"
-
-#: src/msgcmp.c:243 src/msgmerge.c:555
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgcmp.c:245
-#, c-format
-msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr ""
-
-#: src/msgcmp.c:247
-#, c-format
-msgid "      --use-untranslated      consider untranslated entries\n"
-msgstr ""
+"  -m, --multi-domain          прымяніць ref.pot для кожнага маёнтка з def.po\n"
 
-#: src/msgcmp.c:324
-#, fuzzy, c-format
-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:1505
-#, c-format
+#: src/msgcmp.c:252 src/msgmerge.c:855
 msgid "this message is used but not defined..."
 msgstr "гэта паведамленьне выкарыстоўваецца, але не вызначана..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1508
-#, c-format
+#: src/msgcmp.c:254 src/msgmerge.c:857
 msgid "...but this definition is similar"
 msgstr "...але гэта вызначэньне падобна"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: 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:546
-#, c-format
+#: src/msgcmp.c:331
 msgid "warning: this message is not used"
 msgstr "увага: гэта паведамленьне не выкарыстоўваецца"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:338 src/po-lex.c:701
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1465,20 +717,27 @@ msgstr[0] "знойдзена %d фатальная памылка"
 msgstr[1] "знойдзена %d фатальныя памылкі"
 msgstr[2] "знойдзена %d фатальных памылак"
 
-#: src/msgcomm.c:316
-#, c-format
+#: 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:364
-#, fuzzy, c-format, no-wrap
+#: 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 extracted comments will be preserved, but only from the first\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 ""
@@ -1491,106 +750,163 @@ msgstr ""
 "камэнтары будуць захаваны, але толькі зь першага PO файла, у якім яны былі\n"
 "вызначаны.  Каментары становішчаў у файлах з усіх PO файлаў будуць аб'яднаны.\n"
 
-#: src/msgcomm.c:402
-#, 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
-#, c-format
+#: src/msgcomm.c:355
+#, no-wrap
 msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
-msgstr ""
-
-#: src/msgconv.c:311
-#, c-format
+"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"
 
-#: src/msgconv.c:335
-#, fuzzy, c-format
-msgid "Conversion target:\n"
-msgstr "памылка пераўтварэньня"
-
-#: src/msgconv.c:339
-#, fuzzy, c-format
-msgid "The default encoding is the current locale's encoding.\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"
 msgstr ""
 "Мэта пераўтварэньня:\n"
 "  -t, --to-code=НАЗВА         перакаўтварае кадзіроўку для вываду\n"
 "Звычайна выкарыстоўвываецца бягучая кадзіроўка лакалі\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
-#, 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
-#, 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
-#, c-format
+#: src/msgconv.c:291 src/msgen.c:271 src/msgmerge.c:460
+#, no-wrap
 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
-#, c-format
-msgid "      --strict                strict Uniforum output style\n"
-msgstr ""
-
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
-#, c-format
+"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:263
-#, c-format
+#: src/msgen.c:197
 msgid "exactly one input file required"
 msgstr "патрабуецца менавіта адзін уваходзячы файл"
 
-#: src/msgen.c:304
-#, c-format
+#: src/msgen.c:237
+#, c-format, no-wrap
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] УВАХОДЗЯЧЫ_ФАЙЛ\n"
 
-#: src/msgen.c:309
-#, fuzzy, c-format, no-wrap
+#: 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.\n"
+"identical to the msgid, and are marked fuzzy.\n"
 msgstr ""
 "Стварае каталёг ангельскіх перакладаў.  Файл уводу - гэта апошні створаны\n"
 "ангельскі PO файл, ці шаблён PO файлу (звычайна створаны xgettext).\n"
 "Неперакладзеныя уваходжаньні прымаюцца як пераклады, аднолькавыя msgid, і\n"
 "пазначаюцца як недакладныя (fuzzy).\n"
 
-#: src/msgen.c:321
-#, c-format
-msgid "  INPUTFILE                   input PO or POT file\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"
 msgstr ""
+"Уваходзячы файл:\n"
+"  INPUTFILE                   уваходзячы PO ці POT файл\n"
+"  -D, --directory=ДЫРЭКТОРЫЯ  дадае ДЫРЭКТОРЫю ў сьпіс пошуку файлаў уводу\n"
+"Калі файл уводу гэта -, чытаецца стандартны ўвод.\n"
 
-#: src/msgexec.c:196
-#, c-format
+#: src/msgexec.c:180
 msgid "missing command name"
 msgstr "прапушчана назва каманды"
 
-#: src/msgexec.c:257
-#, c-format
+#: src/msgexec.c:228
+#, c-format, no-wrap
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] ЗАГАД [ВЫБАР_ЗАГАДА]\n"
 
-#: src/msgexec.c:262
-#, c-format, no-wrap
+#: 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"
@@ -1603,8 +919,8 @@ msgstr ""
 "адзін раз для кожнага пераклада.  Яго вывад становіцца вывадам msgexec.\n"
 "Праграма msgexec вяртае код - гэта найбольшы код вяртаньня паміж усіх выклікаў.\n"
 
-#: src/msgexec.c:271
-#, c-format, no-wrap
+#: 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"
@@ -1612,153 +928,153 @@ msgstr ""
 "Асабісты ўбудаваны загад, завецца '0', выводзіць пераклад й нулявы байт за ім.\n"
 "Вывад каманды \"msgexec 0\" падыходзіць для ўваходу каманды \"xargs -0\".\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
-#, c-format
-msgid "  -i, --input=INPUTFILE       input PO file\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"
 msgstr ""
+"Уваходзячы файл:\n"
+"  -i, --input=INPUTFILE       PO файл уводу\n"
+"  -D, --directory=ДЫРЭКТОРЫЯ  дадае ДЫРЭКТОРЫю ў сьпіс пошуку файлаў уводу\n"
+"Калі файл уводу незададзены, ці замест яго -, чытаецца стандартны ўвод.\n"
 
-#: src/msgexec.c:345
-#, c-format
+#: src/msgexec.c:313
 msgid "write to stdout failed"
 msgstr "памылка запісу ў stdout"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:337 src/msgfilter.c:610
 #, c-format
+msgid "write to %s subprocess failed"
+msgstr "памылка запісу ў падпрацэс %s"
+
+#: src/msgfilter.c:268
 msgid "missing filter name"
 msgstr "прапушчана назва фільтра"
 
-#: src/msgfilter.c:318
-#, c-format
+#: src/msgfilter.c:292
 msgid "at least one sed script must be specified"
 msgstr "па меншай меры адзін sed-скрыпт павінен быць зададзены"
 
-#: src/msgfilter.c:407
-#, c-format
+#: src/msgfilter.c:356
+#, c-format, no-wrap
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] ФІЛЬТР [ВЫБАРЫ_ФІЛЬТРА]\n"
 
-#: src/msgfilter.c:411
-#, c-format
+#: src/msgfilter.c:361
+#, no-wrap
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Прымае фільтар да ўсіх перакладаў зь каталёгу перакладаў.\n"
 
-#: src/msgfilter.c:435
-#, c-format
+#: 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"
 "й запісвае зьмененыя пераклады ў стандартны вывад.\n"
 
-#: src/msgfilter.c:440
-#, c-format
-msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
-msgstr ""
-
-#: src/msgfilter.c:442
-#, c-format
+#: 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"
-msgstr ""
-
-#: src/msgfilter.c:444
-#, 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
-#, 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:465 src/msggrep.c:600
-#, c-format
+#: src/msgfilter.c:402
+#, no-wrap
 msgid ""
+"Output details:\n"
 "      --no-escape             do not use C escapes in output (default)\n"
-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"
+"      --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/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:562
 #, c-format
-msgid "      --indent                indented output style\n"
-msgstr ""
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "немагчыма ўсталяваць неблакіруючы ўвод-вывад у падпрацэс %s"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:590
 #, c-format
-msgid ""
-"      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr ""
+msgid "communication with %s subprocess failed"
+msgstr "памылка ўзаемадзеяньня з падпрацэсам %s"
 
-#: src/msgfmt.c:345
+#: src/msgfilter.c:641
 #, c-format
-msgid "the argument to %s should be a single punctuation character"
-msgstr "аргумэнт %s павінен быць адзіночным знакам прыпынку"
+msgid "read from %s subprocess failed"
+msgstr "памылка чытаньня з падпрацэса %s"
 
-#: src/msgfmt.c:392
+#: src/msgfilter.c:657
 #, 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
-msgid "Ulrich Drepper"
-msgstr ""
+msgid "%s subprocess terminated with exit code %d"
+msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
 
-#: src/msgfmt.c:439
+#: src/msgfmt.c:318
 #, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr ""
+msgid "the argument to %s should be a single punctuation character"
+msgstr "аргумэнт %s павінен быць адзіночным знакам прыпынку"
 
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
-#: src/msgunfmt.c:353
+#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248
 #, 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:400 src/msgunfmt.c:241
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s патрабуе \"-l locale\" спэцыфікацыі"
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s патрабуе \"-l locale\" спэцыфікацыі"
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s патрабуе \"-l locale\" спэцыфікацыі"
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s і %s узаема выключны"
+#: 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:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:422 src/msgfmt.c:428
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s рэчаісны толькі з %s ці %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
-#, fuzzy, c-format
-msgid "%s is only valid with %s, %s or %s"
-msgstr "%s рэчаісны толькі з %s ці %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
-#, c-format
-msgid "%s: "
-msgstr ""
-
-#: src/msgfmt.c:744
+#: src/msgfmt.c:501
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1766,7 +1082,7 @@ msgstr[0] "%d паведамленьне перакладзена"
 msgstr[1] "%d паведамленьні перакладзена"
 msgstr[2] "%d паведамленьняў перакладзена"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:506
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1780,7 +1096,7 @@ msgstr[2] ""
 ",\n"
 "%d недакладных перакладаў"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:511
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1794,447 +1110,399 @@ msgstr[2] ""
 ",\n"
 "%d неперакладзеных паведамленьняў"
 
-#: src/msgfmt.c:774
-#, c-format
+#: src/msgfmt.c:533
+#, c-format, no-wrap
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] файл.po ...\n"
 
-#: src/msgfmt.c:778
-#, c-format
+#: src/msgfmt.c:538
+#, no-wrap
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Стварае дваічны каталёг паведамленьняў зь іх тэкставага апісаньня.\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
-#, c-format, no-wrap
+#: src/msgfmt.c:548
+#, 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
-#, 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
-#, c-format
-msgid "Operation mode:\n"
+"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:799
-#, c-format
+#: src/msgfmt.c:556
+#, no-wrap
 msgid ""
-"  -j, --java                  Java mode: generate a Java ResourceBundle "
-"class\n"
+"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:801
-#, c-format
+#: src/msgfmt.c:564
+#, no-wrap
 msgid ""
-"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
-"higher)\n"
-msgstr ""
-
-#: src/msgfmt.c:803
-#, c-format
-msgid "      --csharp                C# mode: generate a .NET .dll file\n"
+"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"
 
-#: src/msgfmt.c:805
-#, c-format
+#: src/msgfmt.c:572
+#, no-wrap
 msgid ""
-"      --csharp-resources      C# resources mode: generate a .NET .resources "
-"file\n"
+"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:807
-#, c-format
+#: src/msgfmt.c:583
+#, no-wrap
 msgid ""
-"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+"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"
 
-#: src/msgfmt.c:809
-#, c-format
-msgid "      --qt                    Qt mode: generate a Qt .qm file\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:811
-#, c-format
+#: src/msgfmt.c:607
+#, c-format, no-wrap
 msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
+"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:818
-#, c-format
-msgid "      --strict                enable strict Uniforum mode\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"
 msgstr ""
+"Інфармацыйны вывад:\n"
+"  -h, --help                  адлюстроўвае гэтую дапамогу й выходзіць\n"
+"  -V, --version               выводзіць зьвесткі аб вэрсіі й выходзіць\n"
+"      --statistics            друкуе статыстыку аб перакладах\n"
+"  -v, --verbose               павялічвае ўзровень шматслоўнасьці\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
-#, c-format
-msgid "If output file is -, output is written to standard output.\n"
-msgstr ""
+#: src/msgfmt.c:766
+msgid "plural expression can produce negative values"
+msgstr "выраз множнага ліку можа ўтвараць адмоўнае значэньне"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:779
 #, c-format
-msgid "Output file location in Java mode:\n"
-msgstr ""
+msgid "nplurals = %lu but plural expression can produce values as large as %lu"
+msgstr "nplurals = %lu але выраз множнага ліку можа ўтвараць значэньні такія як %lu"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
-#, c-format
-msgid "  -r, --resource=RESOURCE     resource name\n"
-msgstr ""
+#: src/msgfmt.c:805
+msgid "plural expression can produce division by zero"
+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
-#, c-format
-msgid ""
-"  -l, --locale=LOCALE         locale name, either language or "
-"language_COUNTRY\n"
-msgstr ""
+#: src/msgfmt.c:810
+msgid "plural expression can produce integer overflow"
+msgstr "выраз множнага ліку можа ўтвараць цэлалікавае перапаўненьне"
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
+#: src/msgfmt.c:815
+msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
 msgstr ""
+"выраз множнага ліку можа ўтвараць арыфмэтычныя выключэньні, магчыма\n"
+"дзяленьне на нуль"
 
-#: src/msgfmt.c:831
-#, c-format
-msgid ""
-"  -d DIRECTORY                base directory of classes directory hierarchy\n"
-msgstr ""
+#: src/msgfmt.c:894 src/msgfmt.c:906
+msgid "message catalog has plural form translations..."
+msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
 
-#: src/msgfmt.c:833
-#, fuzzy, 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 ""
-"Файл вываду ў рэжыме Java:\n"
-"  -r, --resource=СРОДАК       назва сродка\n"
-"  -l, --locale=МЯСЦОВАСЬЦЬ    назва мясцовасьці, ці мова ці мова_КРАІНА\n"
-"  -d ДЫРЭКТОРЫЯ               асноўная дырэкторыя гіэрархіі дырэкторый "
-"клясаў\n"
-"Назва кляса вызначаецца шляхам дапасаваньня назвы мясцовасьці да назвы "
-"сродка\n"
-"абмежаваным падкрэсьліваньнем.  Выбар -d абавязковы.  Кляс запісваецца ў\n"
-"зададзеную дырэкторыю.\n"
+#: src/msgfmt.c:897
+msgid "...but header entry lacks a \"plural=EXPRESSION\" attribute"
+msgstr "...але ў загалоўку нехапае атрыбута \"plural=ВЫРАЗ\""
 
-#: src/msgfmt.c:839
-#, c-format
-msgid "Output file location in C# mode:\n"
-msgstr ""
+#: src/msgfmt.c:909
+msgid "...but header entry lacks a \"nplurals=INTEGER\" attribute"
+msgstr "...але ў загалоўку нехапае атрыбута \"plural=ЦЭЛЫ_ЛІК\""
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
-#, c-format
-msgid ""
-"  -d DIRECTORY                base directory for locale dependent .dll "
-"files\n"
-msgstr ""
+#: src/msgfmt.c:934
+msgid "invalid nplurals value"
+msgstr "нерэчаіснае значэньне nplurals"
 
-#: src/msgfmt.c:847
-#, 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:948
+msgid "invalid plural expression"
+msgstr "нерэчаісны выраз формы мнножнага ліку (plural)"
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:967 src/msgfmt.c:982
 #, c-format
-msgid "Output file location in Tcl mode:\n"
-msgstr ""
+msgid "nplurals = %lu..."
+msgstr "nplurals = %lu..."
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:970
 #, c-format
-msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
-msgstr ""
+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/msgfmt.c:857
+#: src/msgfmt.c:985
 #, c-format
-msgid ""
-"The -l and -d options are mandatory.  The .msg file is written in the\n"
-"specified directory.\n"
-msgstr ""
+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/msgfmt.c:861
+#: src/msgfmt.c:1015
 #, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
+msgid "Try using the following, valid for %s:\n"
+msgstr "Паспрабуйце выкарыстоўваць наступнае, рэчаіснае для %s\n"
 
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
+#: src/msgfmt.c:1028
+msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\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:871 src/xgettext.c:934
+#: src/msgfmt.c:1076
 #, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "`msgid' і `msgstr[%u]' не пачынаюцца разам з \"\\n\""
 
-#: src/msgfmt.c:874
-#, 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:1088
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+msgstr "`msgid' і `msgstr' не пачынаюцца разам з '\\n'"
 
-#: src/msgfmt.c:886 src/xgettext.c:905
-#, c-format
-msgid "Input file interpretation:\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:888
+#: src/msgfmt.c:1115
 #, c-format
-msgid ""
-"  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-"
-"domain\n"
-msgstr ""
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "`msgid' і `msgstr[%u]' не заканчваюцца разам на '\\n'"
 
-#: src/msgfmt.c:891
-#, c-format
-msgid "      --check-format          check language dependent format strings\n"
-msgstr ""
+#: src/msgfmt.c:1127
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+msgstr "`msgid' і `msgstr' не заканчваюцца разам на '\\n'"
 
-#: src/msgfmt.c:893
-#, c-format
-msgid ""
-"      --check-header          verify presence and contents of the header "
-"entry\n"
-msgstr ""
+#: src/msgfmt.c:1139
+msgid "plural handling is a GNU gettext extension"
+msgstr "апрацоўка множнага ліку - гэта пашырэньне GNU gettext"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:1204
 #, c-format
-msgid ""
-"      --check-domain          check for conflicts between domain directives\n"
-"                                and the --output-file option\n"
-msgstr ""
+msgid "'%s' is not a valid %s format string, unlike 'msgid'"
+msgstr "'%s' - гэта нерэчаісны %s фармат радку, у адрозьненьне ад 'msgid'"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:1242
 #, c-format
-msgid ""
-"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
-"msgfmt\n"
+msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1250
 #, c-format
-msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
-"for\n"
-"                                menu items\n"
+msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:1285
 #, c-format
-msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
-msgstr ""
-
-#: src/msgfmt.c:908
-#, fuzzy, c-format
-msgid ""
-"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr ""
-"Падрабязнасьці вываду:\n"
-"  -a, --alignment=ЛІК         выроўніваць радкі па ЛІКу байтаў (звычайна: "
-"%d)\n"
-"      --no-hash               дваічны файл не зьмяшчае хэш табліцы\n"
+msgid "headerfield `%s' missing in header\n"
+msgstr "поле загалоку `%s' прапушчана ў загалоўку\n"
 
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1289
 #, 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:913
-#, fuzzy, c-format
-msgid ""
-"      --no-hash               binary file will not include the hash table\n"
-msgstr ""
-"Падрабязнасьці вываду:\n"
-"  -a, --alignment=ЛІК         выроўніваць радкі па ЛІКу байтаў (звычайна: "
-"%d)\n"
-"      --no-hash               дваічны файл не зьмяшчае хэш табліцы\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "поле загалоку `%s' павінна пачынацца на пачатку радка\n"
 
-#: src/msgfmt.c:922
-#, c-format
-msgid "      --statistics            print statistics about translations\n"
-msgstr ""
+#: src/msgfmt.c:1300
+msgid "some header fields still have the initial default value\n"
+msgstr "некаторыя палі загалока ўсё яшчэ маюць пачатковае значэньне\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:1312
 #, c-format
-msgid "  -v, --verbose               increase verbosity level\n"
-msgstr ""
+msgid "field `%s' still has initial default value\n"
+msgstr "поле `%s' усё яшчэ мае пачатковае значэньне\n"
 
-#: src/msgfmt.c:1037
-#, c-format
+#: src/msgfmt.c:1354
 msgid "warning: PO file header missing or invalid\n"
 msgstr "увага: загаловак PO-файла прапушчан ці нерэчаісны\n"
 
-#: src/msgfmt.c:1040
-#, c-format
+#: src/msgfmt.c:1357
 msgid "warning: charset conversion will not work\n"
 msgstr "увага: пераўтварэньне кадзіровак не будзе працаваць\n"
 
-#: src/msgfmt.c:1050
-#, c-format
+#: src/msgfmt.c:1367
 msgid "warning: PO file header fuzzy\n"
 msgstr "увага: загаловак PO-файла мае недакладны пераклад\n"
 
-#: src/msgfmt.c:1052
-#, c-format
+#: src/msgfmt.c:1369
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:1394
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "даменная назва \"%s\" не падыходзіць у якасці назвы файла"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:1399
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "даменная назва \"%s\" не падыходзіць у якасці назвы файла;\n"
 "будзе выкарыстаны прэфікс"
 
-#: src/msgfmt.c:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:1410
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "дырэктыва `domain %s' ігнаруецца"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:1484
+msgid "empty `msgstr' entry ignored"
 msgstr "парожняе уваходжаньне `msgstr' прапушчана"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:1485
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "недакладнае уваходжаньне `msgstr' прапушчана"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1554
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: увага: ізыходны файл змяшчае недакладны пераклад"
 
-#: src/msgfmt.c:1318
+#: src/msggrep.c:390
 #, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
-#, 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
-#, c-format
-msgid "error while reading \"%s\""
-msgstr "памылка ў час чытаньня \"%s\""
+msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
+msgstr "выбар '%c' не можа быць выкарыстаны раней чым 'K' ці 'T' будуць зададзены"
 
-#: src/msggrep.c:501
-#, fuzzy, c-format
-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
+#: 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 ""
 
-#: src/msggrep.c:547
-#, c-format, no-wrap
+#: src/msggrep.c:439
+#, 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"
+"  [-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 -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"
+"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"
-"MSGCTXT-PATTERN or MSGID-PATTERN or MSGSTR-PATTERN or COMMENT-PATTERN or\n"
-"EXTRACTED-COMMENT-PATTERN syntax:\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"
-"  -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
+#: 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 ""
 
-#: src/msggrep.c:623
-#, c-format
-msgid "      --sort-output           generate sorted output\n"
-msgstr ""
+#: src/msggrep.c:561
+msgid "write to grep subprocess failed"
+msgstr "памылка запісу ў падпрацэс grep"
 
-#: src/msggrep.c:625
-#, c-format
-msgid "      --sort-by-file          sort output by file location\n"
-msgstr ""
-
-#: src/msginit.c:297
+#: 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 ""
 
-#: src/msginit.c:321
+#: src/msginit.c:312
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2245,13 +1513,13 @@ msgstr ""
 "Калі ласка, задайце мясцовасьць з дапамогай выбару --locale\n"
 "ці .po файл вываду з дапамогай выбару --output-file.\n"
 
-#: src/msginit.c:347
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr "Створан %s.\n"
 
-#: src/msginit.c:367
-#, c-format, no-wrap
+#: 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"
@@ -2259,43 +1527,36 @@ msgstr ""
 "Стварае новы PO файл, задае пачатковыя мэтададзеныя значэньнямі з асяродзьдзя\n"
 "карыстальніка.\n"
 
-#: src/msginit.c:377
-#, c-format
-msgid "  -i, --input=INPUTFILE       input POT file\n"
-msgstr ""
-
-#: src/msginit.c:379
-#, c-format
+#: src/msginit.c:368
+#, no-wrap
 msgid ""
-"If no input file is given, the current directory is searched for the POT "
-"file.\n"
+"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:385
-#, c-format
-msgid "  -o, --output-file=FILE      write output to specified PO file\n"
-msgstr ""
-
-#: src/msginit.c:387
-#, c-format
+#: 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 ""
 
-#: src/msginit.c:400
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
-msgstr ""
-
-#: src/msginit.c:402
-#, c-format
+#: 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 ""
 
-#: src/msginit.c:468
+#: src/msginit.c:437
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2303,12 +1564,11 @@ msgstr ""
 "Знойдзен больш чым адзін .pot файл.\n"
 "Калі ласка задайце .pot файл уводу з дапамогай выбара --input.\n"
 
-#: src/msginit.c:476 src/msginit.c:481
-#, c-format
+#: src/msginit.c:445 src/msginit.c:450
 msgid "error reading current directory"
 msgstr "памылка чытаньня бягучай дырэкторыі"
 
-#: src/msginit.c:489
+#: 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"
@@ -2316,94 +1576,83 @@ msgstr ""
 "Ня знойдзен .pot файл у бягучай дырэкторыі.\n"
 "Калі ласка задайце .pot файл уводу з дапамогай выбара --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: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
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1118
+#: 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"
+"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:1432
 #, 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:187 src/msgl-charset.c:87 src/msgl-iconv.c:318
 #, 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:196 src/msgl-iconv.c:329
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 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"
+#: src/msgl-cat.c:209
+#, c-format
+msgid "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 "уваходзячы файл `%s' не зьмяшчае загаловачны запіс\n"
 "са сьпецыфікацыей кодавай старонкі"
 
-#: 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"
+#: 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 ""
-"уваходзячы файл `%s' не зьмяшчае загаловачны запіс\n"
-"са сьпецыфікацыей кодавай старонкі"
 
-#: src/msgl-cat.c:391 src/msgl-iconv.c:375
+#: src/msgl-cat.c:374 src/msgl-iconv.c:406
 #, 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
-#, c-format
+#: 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 "увага: "
 
-#: src/msgl-cat.c:443
-#, c-format
+#: 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 ""
 
-#: src/msgl-cat.c:449
+#: src/msgl-cat.c:431
 #, 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
-#, 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:93
 #, c-format
 msgid ""
@@ -2443,190 +1692,30 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:130
-msgid "plural expression can produce negative values"
-msgstr "выраз множнага ліку можа ўтвараць адмоўнае значэньне"
-
-#: src/msgl-check.c:141
-#, c-format
-msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr ""
-"nplurals = %lu але выраз множнага ліку можа ўтвараць значэньні такія як %lu"
-
-#: src/msgl-check.c:187
-msgid "plural expression can produce division by zero"
-msgstr "выраз множнага ліку можа ўтвараць дзяленьне на нуль"
-
-#: src/msgl-check.c:192
-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 ""
-"выраз множнага ліку можа ўтвараць арыфмэтычныя выключэньні, магчыма\n"
-"дзяленьне на нуль"
-
-#: src/msgl-check.c:266
-#, fuzzy, c-format
-msgid "Try using the following, valid for %s:"
-msgstr "Паспрабуйце выкарыстоўваць наступнае, рэчаіснае для %s\n"
-
-#: src/msgl-check.c:358 src/msgl-check.c:382
-#, fuzzy
-msgid "message catalog has plural form translations"
-msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
-
-#: src/msgl-check.c:360
-#, fuzzy
-msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr "...але ў загалоўку нехапае атрыбута \"plural=ВЫРАЗ\""
-
-#: src/msgl-check.c:384
-#, fuzzy
-msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr "...але ў загалоўку нехапае атрыбута \"plural=ЦЭЛЫ_ЛІК\""
-
-#: src/msgl-check.c:420
-msgid "invalid nplurals value"
-msgstr "нерэчаіснае значэньне nplurals"
-
-#: src/msgl-check.c:442
-msgid "invalid plural expression"
-msgstr "нерэчаісны выраз формы мнножнага ліку (plural)"
-
-#: src/msgl-check.c:472 src/msgl-check.c:488
-#, fuzzy, c-format
-msgid "nplurals = %lu"
-msgstr "nplurals = %lu..."
-
-#: src/msgl-check.c:474
-#, fuzzy, c-format
-msgid "but some messages have only one plural form"
-msgid_plural "but some messages have only %lu plural forms"
-msgstr[0] "...але некаторыя паведамленьні маюць толькі %lu форму множнага ліку"
-msgstr[1] "...але некаторыя паведамленьні маюць толькі %lu формы множнага ліку"
-msgstr[2] ""
-"...але некаторыя паведамленьні маюць толькі %lu формаў множнага ліку"
-
-#: src/msgl-check.c:490
-#, fuzzy, 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/msgl-check.c:514
-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
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
-msgstr "`msgid' і `msgid_plural' не пачынаюцца разам з '\\n'"
-
-#: src/msgl-check.c:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "`msgid' і `msgstr[%u]' не пачынаюцца разам з \"\\n\""
-
-#: src/msgl-check.c:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
-msgstr "`msgid' і `msgstr' не пачынаюцца разам з '\\n'"
-
-#: src/msgl-check.c:652
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
-msgstr "`msgid' і `msgid_plural' не заканчваюцца разам на '\\n'"
-
-#: src/msgl-check.c:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
-msgstr "`msgid' і `msgstr[%u]' не заканчваюцца разам на '\\n'"
-
-#: src/msgl-check.c:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
-msgstr "`msgid' і `msgstr' не заканчваюцца разам на '\\n'"
-
-#: src/msgl-check.c:687
-msgid "plural handling is a GNU gettext extension"
-msgstr "апрацоўка множнага ліку - гэта пашырэньне GNU gettext"
-
-#: src/msgl-check.c:729
-#, c-format
-msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr ""
-
-#: src/msgl-check.c:740
-#, c-format
-msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr ""
-
-#: src/msgl-check.c:804
-#, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "некаторыя палі загалока ўсё яшчэ маюць пачатковае значэньне\n"
-
-#: src/msgl-check.c:820
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "поле загалоку `%s' прапушчана ў загалоўку\n"
-
-#: 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 "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "памылка ў час чытаньня файла \"%s\""
+#: src/msgl-iconv.c:202 src/msgl-iconv.c:256
+msgid "conversion failure"
+msgstr "памылка пераўтварэньня"
 
-#: src/msgl-iconv.c:290
+#: src/msgl-iconv.c:351
 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
-#, 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:335
+#: src/msgl-iconv.c:369
 #, c-format
-msgid ""
-"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
-"msgids become equal."
+msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
 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:385
 #, 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:392 src/msgmerge.c:398
-#, c-format
-msgid "%s is only valid with %s"
-msgstr "%s рэчаісны толькі з %s"
-
-#: src/msgmerge.c:453
+#: src/msgmerge.c:358
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:490
-#, c-format, no-wrap
+#: 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"
@@ -2639,206 +1728,186 @@ msgid ""
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
 
-#: src/msgmerge.c:507
-#, c-format
-msgid "  def.po                      translations referring to old sources\n"
-msgstr ""
-
-#: src/msgmerge.c:509
-#, c-format
-msgid "  ref.pot                     references to new sources\n"
-msgstr ""
-
-#: src/msgmerge.c:513
-#, c-format
+#: 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 ""
 
-#: src/msgmerge.c:519
-#, c-format
+#: 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 ""
 
-#: src/msgmerge.c:531
-#, c-format
-msgid "Output file location in update mode:\n"
-msgstr ""
-
-#: src/msgmerge.c:533
-#, c-format
-msgid "The result is written back to def.po.\n"
-msgstr ""
-
-#: src/msgmerge.c:535
-#, c-format
-msgid "      --backup=CONTROL        make a backup of def.po\n"
-msgstr ""
-
-#: src/msgmerge.c:537
-#, c-format
-msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr ""
-
-#: src/msgmerge.c:539
-#, c-format
+#: src/msgmerge.c:438
+#, no-wrap
 msgid ""
-"The version control method may be selected via the --backup option or "
-"through\n"
+"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"
-msgstr ""
-
-#: src/msgmerge.c:546
-#, 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
-#, c-format
+#: src/msgmerge.c:477
+#, no-wrap
 msgid ""
-"      --previous              keep previous msgids of translated messages\n"
-msgstr ""
-
-#: src/msgmerge.c:614 src/urlget.c:192
-#, c-format
-msgid "  -q, --quiet, --silent       suppress progress indicators\n"
+"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/msgmerge.c:1609
-#, c-format
+#: src/msgmerge.c:937
 msgid "this message should define plural forms"
 msgstr "гэтае паведамленьне павінна вызначаць хормы множнага ліка"
 
-#: src/msgmerge.c:1632
-#, c-format
+#: src/msgmerge.c:960
 msgid "this message should not define plural forms"
 msgstr "гэтае паведамленьне не павінна вызначаць хормы множнага ліка"
 
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:1091
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
-#, c-format
+#: src/msgmerge.c:1099
 msgid " done.\n"
 msgstr " зроблена.\n"
 
-#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
+#: src/msgunfmt.c:226 src/msgunfmt.c:235
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s і яўная назва файла ўзаема выключальны"
 
-#: src/msgunfmt.c:427
-#, c-format
+#: src/msgunfmt.c:319
+#, c-format, no-wrap
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] [ФАЙЛ]...\n"
 
-#: src/msgunfmt.c:431
-#, c-format
+#: src/msgunfmt.c:324
+#, no-wrap
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Пераўтварае дваічны каталёг паведамленьняў у Uniforum .po файл.\n"
 
-#: src/msgunfmt.c:440
-#, fuzzy, c-format
+#: src/msgunfmt.c:334
+#, no-wrap
 msgid ""
-"  -j, --java                  Java mode: input is a Java ResourceBundle "
-"class\n"
+"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"
 
-#: 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 ""
-"      --csharp-resources      C# resources mode: input is a .NET .resources "
-"file\n"
-msgstr ""
-
-#: src/msgunfmt.c:446
-#, fuzzy, c-format
+#: src/msgunfmt.c:341
+#, no-wrap
 msgid ""
-"      --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:451
-#, c-format
-msgid "  FILE ...                    input .mo files\n"
-msgstr ""
-
-#: src/msgunfmt.c:456
-#, c-format
-msgid "Input file location in Java mode:\n"
+"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"
 
-#: src/msgunfmt.c:462
-#, c-format
+#: src/msgunfmt.c:348
+#, no-wrap
 msgid ""
-"The class name is determined by appending the locale name to the resource "
-"name,\n"
+"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 ""
 
-#: src/msgunfmt.c:467
-#, c-format
-msgid "Input file location in C# mode:\n"
-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 ""
-
-#: src/msgunfmt.c:479
-#, c-format
-msgid "Input file location in Tcl mode:\n"
-msgstr ""
-
-#: src/msgunfmt.c:485
-#, c-format
+#: 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 ""
 
-#: src/msgunfmt.c:511
-#, c-format
-msgid "  -i, --indent                write indented output style\n"
+#: 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 ""
 
-#: src/msgunfmt.c:513
-#, c-format
-msgid "      --strict                write strict uniforum style\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:331
-#, c-format, no-wrap
+#: 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"
@@ -2850,27 +1919,70 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:364
-#, c-format
-msgid "  -d, --repeated              print only duplicates\n"
-msgstr ""
-
-#: src/msguniq.c:366
-#, fuzzy, c-format
+#: src/msguniq.c:317
+#, no-wrap
 msgid ""
-"  -u, --unique                print only unique messages, discard "
-"duplicates\n"
+"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/open-catalog.c:56 libgettextpo/gettext-po.c:102
-#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
+#: 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:489
+#: 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
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2879,7 +1991,15 @@ msgstr ""
 "Кадзіроўка \"%s\" не з'яўляецца перанасімай назвай кадзіроўкі.\n"
 "Пераўтварэньне паведамленьняў у кадзіроўку карыстальніка можа не працаваць\n"
 
-#: src/po-charset.c:557
+#: 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
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2888,7 +2008,7 @@ msgstr ""
 "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv(),\n"
 "але iconv() не падтрымлівае \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: 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"
@@ -2896,15 +2016,12 @@ msgstr ""
 "Усталяваньне GNU libiconv і пераўсталяваньне GNU gettext\n"
 "павінна выправіць гэту праблему.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
-msgid "Continuing anyway, expect parse errors."
-msgstr "Працяг выкананьня... чакаюцца памылкі разбору."
-
-#: src/po-charset.c:580
-msgid "Continuing anyway."
-msgstr "Працяг выкананьня..."
+#: src/po-charset.c:298 src/po-charset.c:323
+#, c-format
+msgid "%s\n"
+msgstr "%s\n"
 
-#: src/po-charset.c:607
+#: src/po-charset.c:312
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2913,341 +2030,165 @@ msgstr ""
 "Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv().\n"
 "Гэта вэрсія пабудавана без iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:338
 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
-#, c-format
+#: po-gram-gen.y:92
 msgid "inconsistent use of #~"
 msgstr "несумяшчальнае ўжываньне #~"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: po-gram-gen.y:182
+msgid "missing `msgstr[]' section"
 msgstr "прапушчана секцыя \"msgstr[]\""
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: po-gram-gen.y:190
+msgid "missing `msgid_plural' section"
 msgstr "прапушчана секцыя \"msgid_plural\""
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: po-gram-gen.y:197
+msgid "missing `msgstr' section"
 msgstr "прапушчана секцыя \"msgstr\""
 
-#: src/po-gram-gen.y:399
-#, c-format
+#: po-gram-gen.y:242
 msgid "first plural form has nonzero index"
 msgstr "першая форма ліку мае ненулявы індэкс"
 
-#: src/po-gram-gen.y:401
-#, c-format
+#: po-gram-gen.y:244
 msgid "plural form has wrong index"
 msgstr "формы множнага ліку маюць дрэнныі індэкс"
 
-#: src/po-lex.c:90 src/po-lex.c:109
-#, c-format
+#: 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 "вельмі шмат памылак..."
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
-#, c-format
+#: src/po-lex.c:517 src/write-po.c:364 src/write-po.c:466
 msgid "invalid multibyte sequence"
 msgstr "нерэчаісная шматсімвальная паслядоўнасць"
 
-#: src/po-lex.c:465
-#, c-format
+#: src/po-lex.c:543
 msgid "incomplete multibyte sequence at end of file"
 msgstr "няпоўная шматбайтная пасьлядоўнасьць на прыканцы файла"
 
-#: src/po-lex.c:475
-#, c-format
+#: src/po-lex.c:553
 msgid "incomplete multibyte sequence at end of line"
 msgstr "няпоўная шматбайтная пасьлядоўнасьць на прыканцы радка"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:561
 msgid "iconv failure"
 msgstr "памылка iconv"
 
-#: src/po-lex.c:744
+#: 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
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "невядомае ключавое слова \"%s\""
 
-#: src/po-lex.c:854
-#, c-format
+#: src/po-lex.c:935
 msgid "invalid control sequence"
 msgstr "нерэчаісная кантралюючая паслядоўнасць"
 
-#: src/po-lex.c:981
-#, c-format
+#: src/po-lex.c:1043
 msgid "end-of-file within string"
 msgstr "сімвал канца файла знаходзіцца ўнутры радка"
 
-#: src/po-lex.c:987
-#, c-format
+#: src/po-lex.c:1049
 msgid "end-of-line within string"
 msgstr "сімвал канца радка знаходзіцца ўнутры радка"
 
-#: src/po-lex.c:1008
-#, c-format
-msgid "context separator <EOT> within string"
-msgstr ""
-
-#: src/read-catalog.c:318 src/xgettext.c:1046
-#, c-format
-msgid "this file may not contain domain directives"
-msgstr "гэты файл можа не змяшчаць дырэктыў дамену"
-
-#: src/read-catalog.c:363
-msgid "duplicate message definition"
-msgstr "двайное вызначэньне паведамленьня"
-
-#: src/read-catalog.c:365
-#, fuzzy
-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-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\" абрэзан"
 
-#: src/read-mo.c:129
+#: src/read-mo.c:143
 #, 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:181 src/read-mo.c:289
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "фармат файла \"%s\" не GNU .mo"
 
-#: src/read-mo.c:178
+#: src/read-mo.c:194
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "файл \"%s\" зьмяшчае радок не завершаны нулём, ля %s"
 
-#: src/read-properties.c:227
-msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr ""
-
-#: src/read-stringtable.c:802
-#, fuzzy
-msgid "warning: unterminated string"
-msgstr "%s:%d: увага: незавершаны радок"
-
-#: src/read-stringtable.c:810
-#, fuzzy
-msgid "warning: syntax error"
-msgstr "увага: "
-
-#: src/read-stringtable.c:871 src/read-stringtable.c:893
-#, fuzzy
-msgid "warning: unterminated key/value pair"
-msgstr "%s:%d: увага: незавершаны радок"
-
-#: src/read-stringtable.c:939
-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:116
-#, fuzzy, c-format
-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:120
-msgid "Danilo Segan"
-msgstr ""
-
-#: src/recode-sr-latin.c:153
-#, c-format, no-wrap
-msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr ""
-
-#: src/recode-sr-latin.c:156
-#, 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
-#, c-format
-msgid "input is not valid in \"%s\" encoding"
-msgstr ""
-
-#: src/recode-sr-latin.c:367
-#, fuzzy, c-format
-msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "памылка ў час чытаньня файла \"%s\""
-
-#: src/urlget.c:159
-#, c-format
+#: src/urlget.c:150
 msgid "expected two arguments"
 msgstr "чакалісь два аргумэнты"
 
-#: src/urlget.c:176
-#, c-format
+#: src/urlget.c:169
+#, c-format, no-wrap
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] URL ФАЙЛ\n"
 
-#: src/urlget.c:181
-#, c-format, no-wrap
+#: 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 ""
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "памылка чытаньня \"%s\""
-
-#: src/urlget.c:234
-#, c-format
+#: src/urlget.c:222
 msgid "error writing stdout"
 msgstr "памылка запісу ў stdout"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "памылка пасля чытаньня \"%s\""
-
-#: src/urlget.c:264
-#, c-format
-msgid "Retrieving %s..."
-msgstr ""
+#: src/write-java.c:1109
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "немагчыма знайсці часовую дырэкторыю, паспрабуйце ўсталяваць $TMPDIR"
 
-#: src/urlget.c:308
+#: src/write-java.c:1119
 #, c-format
-msgid " timed out.\n"
+msgid "cannot create a temporary directory using template \"%s\""
 msgstr ""
+"немагчыма стварыць часовую дырэкторыю,\n"
+"выкарыстоўвываючы ўзор \"%s\""
 
-#: src/urlget.c:445
+#: src/write-java.c:1132
 #, c-format
-msgid " failed.\n"
-msgstr ""
-
-#: 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 ""
-
-#: 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:162
-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 ""
-
-#: src/write-catalog.c:202
-#, fuzzy
-msgid ""
-"message catalog has plural form translations, but the output format does not "
-"support them."
-msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
+msgid "not a valid Java class name: %s"
+msgstr "нерэчаісная назва Java-класа: %s"
 
-#: src/write-catalog.c:231 src/write-catalog.c:275
+#: src/write-java.c:1189 src/write-java.c:1202
 #, c-format
-msgid "cannot create output file \"%s\""
-msgstr "немагчыма стварыць файл вываду \"%s\""
-
-#: src/write-catalog.c:239 src/write-catalog.c:283
-msgid "standard output"
-msgstr "стандартны вывад"
-
-#: src/write-csharp.c:703
-#, fuzzy, c-format
-msgid "failed to create directory \"%s\""
+msgid "failed to create \"%s\""
 msgstr "немагчыма стварыць \"%s\""
 
-#: src/write-csharp.c:766
-#, fuzzy, c-format
-msgid "compilation of C# class failed, please try --verbose"
-msgstr ""
-"памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
-"ці ўсталяваць пераменную асяроддзя $JAVAC"
-
-#: src/write-csharp.c:768
-#, fuzzy, c-format
-msgid "compilation of C# class failed"
-msgstr "памылка ўзаемадзеяньня з падпрацэсам %s"
-
-#: src/write-java.c:1091
+#: src/write-java.c:1210 src/write-mo.c:713 src/write-po.c:1025
 #, c-format
-msgid "not a valid Java class name: %s"
-msgstr "нерэчаісная назва Java-класа: %s"
+msgid "error while writing \"%s\" file"
+msgstr "памылка ў час запісу файла \"%s\""
 
-#: src/write-java.c:1210
-#, c-format
+#: src/write-java.c:1224
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
 "ці ўсталяваць пераменную асяроддзя $JAVAC"
 
-#: src/write-java.c:1213
-#, fuzzy, c-format
-msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr ""
-"памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
-"ці ўсталяваць пераменную асяроддзя $JAVAC"
-
-#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
+#: src/write-mo.c:701
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "памылка ў час адкрыцця \"%s\" для запісу"
 
-#: src/write-po.c:875
-#, fuzzy, c-format
-msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
-msgstr ""
-"перакладзеныя паведамленьні не павінны зьмяшчаць \"\\%c\" ESC-пасьлядоўнасьці"
-
-#: src/write-po.c:1326 src/write-po.c:1450
-#, fuzzy, 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"
-"кадзіроўку, якая адрозьніваецца ад вашае. Разглядзіце магчымасьць\n"
-"выкарыстаньня толькі ASCII сымбаляў у msgid\n"
-"%s\n"
+#: src/write-po.c:415
+#, c-format
+msgid "internationalized messages should not contain the `\\%c' escape sequence"
+msgstr "перакладзеныя паведамленьні не павінны зьмяшчаць \"\\%c\" ESC-пасьлядоўнасьці"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:783 src/write-po.c:877
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3261,633 +2202,172 @@ msgstr ""
 "выкарыстаньня толькі ASCII сымбаляў у msgid\n"
 "%s\n"
 
-#: src/write-qt.c:667
-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
-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:717
-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
-msgid "error while writing to %s subprocess"
-msgstr "памылка ў час запісу файла \"%s\""
-
-#: src/write-resources.c:131
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .resources format doesn't support contexts\n"
-msgstr ""
-
-#: src/write-resources.c:150
-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
-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
-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
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated string"
-msgstr "%s:%d: увага: незавершаны радок"
-
-#: src/x-awk.c:592
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated regular expression"
-msgstr "%s:%d: увага: незавершаны радок"
-
-#: src/x-c.c:1051
+#: src/write-po.c:944
 #, c-format
-msgid "warning: invalid Unicode character"
-msgstr ""
+msgid "cannot create output file \"%s\""
+msgstr "немагчыма стварыць файл вываду \"%s\""
+
+#: src/write-po.c:951
+#, no-c-format
+msgid "standard output"
+msgstr "стандартны вывад"
 
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:954
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
 
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:978
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
-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:374
-#, fuzzy, c-format
-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:1390 src/x-python.c:1138
-#, fuzzy, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
-
-#: src/x-csharp.c:1512 src/x-java.c:875
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
-
-#: src/x-csharp.c:2020 src/x-java.c:1369
-#, c-format
-msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr ""
-
-#: src/x-csharp.c:2054 src/x-java.c:1403
-#, c-format
-msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr ""
-
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
-#, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr ""
-
-#: src/x-glade.c:606
-#, fuzzy, c-format
-msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
-msgstr ""
-"Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv().\n"
-"Гэта вэрсія пабудавана без iconv().\n"
-
-#: src/x-java.c:494
-#, fuzzy, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: увага: незавершаны радок"
-
-#: src/x-javascript.c:230
-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:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: увага: незавершаны радок"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "увага: гэта паведамленьне не выкарыстоўваецца"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: увага: незавершаны радок"
-
-#: 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
-#, fuzzy, c-format
-msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s:%d: нерэчаіснае вызначэньне радка"
-
-#: 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:278
-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/x-python.c:324
-#, 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:341
-#, 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:354
-#, 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:364
-#, 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:397
-#, 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:722
-#, c-format
-msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr ""
+#: src/x-po.c:106 src/xgettext.c:648
+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: нерэчаіснае вызначэньне радка"
 
-#: src/x-rst.c:172
+#: src/x-rst.c:168
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: прапушчан нумар пасьля #"
 
-#: src/x-rst.c:207
+#: src/x-rst.c:203
 #, 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 ""
-
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: увага: незавершаны радок"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
-#, c-format
+#: src/xgettext.c:401
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--joun-existing не можа быць выкарастаны пры запісы ў stdout"
 
-#: src/xgettext.c:653
-#, c-format
+#: src/xgettext.c:406
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не можа працаваць без ключавых слоў для пошуку"
 
-#: src/xgettext.c:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+#: src/xgettext.c:502
+#, c-format
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "увага: файл \"%s\" суфікс \"%s\" невядомы; паспрабуйце C"
 
-#: src/xgettext.c:859
-#, c-format
+#: src/xgettext.c:547
+#, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Атрымлівае перакладаемыя радкі з дадзеных уваходзячых файлаў.\n"
 
-#: src/xgettext.c:882
-#, c-format
-msgid ""
-"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
-"po)\n"
-msgstr ""
-
-#: src/xgettext.c:884
-#, c-format
-msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr ""
-
-#: src/xgettext.c:886
-#, c-format
-msgid ""
-"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr ""
-
-#: src/xgettext.c:891
-#, fuzzy, c-format
-msgid "Choice of input file language:\n"
-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 ""
-
-#: src/xgettext.c:900
-#, c-format
-msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr ""
-
-#: src/xgettext.c:902
-#, c-format
-msgid ""
-"By default the language is guessed depending on the input file name "
-"extension.\n"
-msgstr ""
-
-#: src/xgettext.c:907
-#, c-format
-msgid ""
-"      --from-code=NAME        encoding of input files\n"
-"                                (except for Python, Tcl, Glade)\n"
-msgstr ""
-
-#: src/xgettext.c:910
-#, c-format
-msgid "By default the input files are assumed to be in ASCII.\n"
-msgstr ""
-
-#: src/xgettext.c:915
-#, c-format
-msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr ""
-
-#: src/xgettext.c:917
-#, c-format
-msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
-msgstr ""
-
-#: src/xgettext.c:919
-#, 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:925
-#, c-format
-msgid "Language specific options:\n"
-msgstr ""
-
-#: src/xgettext.c:927
-#, c-format
-msgid "  -a, --extract-all           extract all strings\n"
-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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: src/xgettext.c:950
-#, c-format
-msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr ""
-
-#: src/xgettext.c:952
-#, c-format
-msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr ""
-
-#: src/xgettext.c:954
-#, c-format
-msgid "      --qt                    recognize Qt format strings\n"
-msgstr ""
-
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
-#, c-format
-msgid "                                (only language C++)\n"
-msgstr ""
-
-#: src/xgettext.c:958
-#, c-format
-msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr ""
-
-#: src/xgettext.c:962
-#, c-format
-msgid "      --boost                 recognize Boost format strings\n"
-msgstr ""
-
-#: src/xgettext.c:966
-#, c-format
-msgid ""
-"      --debug                 more detailed formatstring recognition result\n"
-msgstr ""
-
-#: src/xgettext.c:991
-#, c-format
-msgid "      --properties-output     write out a Java .properties file\n"
-msgstr ""
-
-#: src/xgettext.c:1006
-#, c-format
-msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr ""
-
-#: src/xgettext.c:1008
-#, c-format
+#: src/xgettext.c:552
+#, no-wrap
 msgid ""
-"      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr ""
-
-#: src/xgettext.c:1010
-#, c-format
-msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr ""
-
-#: src/xgettext.c:1012
-#, c-format
-msgid "      --package-version=VERSION  set package version in output\n"
-msgstr ""
-
-#: src/xgettext.c:1014
-#, c-format
-msgid ""
-"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr ""
-
-#: src/xgettext.c:1016
-#, c-format
-msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
-"msgstr\n"
-"                                values\n"
-msgstr ""
-
-#: src/xgettext.c:1019
-#, c-format
-msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
-"msgstr\n"
-"                                values\n"
-msgstr ""
-
-#: src/xgettext.c:1840
-#, c-format
-msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
-"%s"
+"Mandatory arguments to long options are mandatory for short options too.\n"
+"Similarly for optional arguments.\n"
 msgstr ""
+"Аргумэнты, абавязковыя для доўгх выбараў, абавязковы так сама\n"
+"і для кароткі.  Тое саме-ж і для выбарачных аргумэнтаў.\n"
 
-#: src/xgettext.c:1965
+#: 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 ""
+
+#: 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 ""
+
+#: 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:2071
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2075
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr ""
-
-#: src/xgettext.c:2080
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
-#, fuzzy, c-format
-msgid "%s%s: warning: "
-msgstr "%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 ""
-
-#: src/xgettext.c:2190
-#, c-format
-msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: "
-"%s\n"
-msgstr ""
-
-#: 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 ""
-
-#: src/xgettext.c:2283
+#: src/xgettext.c:943
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3897,803 +2377,7 @@ msgstr ""
 "gettext(\"\") вяртае загаловак зь\n"
 "метададзенымі, а ня пусты радок.\n"
 
-#: src/xgettext.c:2979
-#, fuzzy, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "неадназначны аргумэнт `%s' для `%s'"
-
-#: src/xgettext.c:3006
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr ""
-
-#: src/xgettext.c:3031
-#, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr ""
-
-#: src/xgettext.c:3052
+#: src/xgettext.c:1299
 #, c-format
-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 ""
-
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+msgid "language `%s' unknown"
 msgstr "невядомая мова `%s'"
-
-#: libgettextpo/gettext-po.c:84
-msgid "<unnamed>"
-msgstr ""
-
-#~ 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"
-#~ msgstr ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "Гэта вольнае праграмнае забесьпячэньне; глядзіце зыходны тэкст для\n"
-#~ "пагадненьня аб распаўсюджваньні. Ня йснуе НІЯКАЙ гарантыі; нават аб\n"
-#~ "магчымасьці выкарыстньня зь якой небудзь мэтай.\n"
-
-#~ msgid "missing arguments"
-#~ msgstr "прапушчаны аргумэнты"
-
-#~ msgid ""
-#~ "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
-#~ "or:    %s [OPTION] -s [MSGID]...\n"
-#~ msgstr ""
-#~ "Выкарыстаньне: %s [ВЫБАР] [[TEXTDOMAIN] MSGID]\n"
-#~ "        ці:    %s [ВЫБАР] -s [MSGID]...\n"
-
-#~ msgid "Display native language translation of a textual message.\n"
-#~ msgstr "Адлюстроўвае пераклады на родную мову тэкставых паведамленьняў.\n"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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 ""
-#~ "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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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 ""
-#~ "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 ""
-#~ "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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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 ""
-#~ "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 ""
-#~ "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"
-
-#~ 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 "header field `%s' should start at beginning of line\n"
-#~ msgstr "поле загалоку `%s' павінна пачынацца на пачатку радка\n"
-
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "поле `%s' усё яшчэ мае пачатковае значэньне\n"
-
-#~ msgid "write to grep subprocess failed"
-#~ msgstr "памылка запісу ў падпрацэс grep"
-
-#~ 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 ""
-#~ "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"
-
-#~ 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"
-
-#~ msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-#~ msgstr "Выкарыстаньне %s [ВЫБАР] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-
-#~ msgid ""
-#~ "Display native language translation of a textual message whose "
-#~ "grammatical\n"
-#~ "form depends on a number.\n"
-#~ msgstr ""
-#~ "Адлюстроўвае пераклады тэкставых паведамленьняў на родную мову, чыя\n"
-#~ "граматычная хорма патрабуе ліку (множнага ці адзіночнага).\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"
-#~ "Standard search directory: %s\n"
-#~ msgstr ""
-#~ "Калі парамэтар TEXTDOMAIN не зададзен, маёнтак вызначаецца зь пераменнай\n"
-#~ "асяродзьдзя TEXTDOMAIN.  Калі каталёг з паведамленьнямі ня знойдзен у "
-#~ "звычайнай\n"
-#~ "дырэкторыі, іншае месцазнаходжаньне можа быць зададзена ў пераменнай\n"
-#~ "асяроддзя TEXTDOMAINDIR.\n"
-#~ "Стандартная дырэкторыя для пошуку: %s\n"
-
-#~ msgid "%s\n"
-#~ msgstr "%s\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"
-#~ "                                 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
-#~ 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"
diff --git a/gettext-tools/po/bg.po b/gettext-tools/po/bg.po
index a269e4225..de3e9a716 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2014-05-10 13:37+0900\n"
 "PO-Revision-Date: 2014-05-11 14:09+0300\n"
 "Last-Translator: Roumen Petrov <transl@roumenpetrov.info>\n"
 "Language-Team: Bulgarian <dict@ludost.net>\n"
@@ -34,8 +34,7 @@ msgstr "Правилни аргументи са:"
 #: gnulib-lib/clean-temp.c:332
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr ""
-"не можа да се намери временна директория, да се опита с задаване на $TMPDIR"
+msgstr "не можа да се намери временна директория, да се опита с задаване на $TMPDIR"
 
 #: gnulib-lib/clean-temp.c:346
 #, c-format
@@ -198,16 +197,12 @@ msgstr "грешка при записване на файл \"%s\""
 #: gnulib-lib/javacomp.c:2343
 #, 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
@@ -217,7 +212,7 @@ 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
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "паметта е изчерпана"
@@ -228,7 +223,7 @@ msgid "creation of threads failed"
 msgstr "пропадна създаването на клас нишки(threads)"
 
 #: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "пропадна записването към подпроцес %s "
@@ -331,8 +326,7 @@ msgstr "'%s' е неправилен %s форматиращ низ, за раз
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%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
@@ -360,12 +354,8 @@ msgstr "Директива номер %u започва с |, но не завъ
 
 #: 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:39
 #, c-format
@@ -395,15 +385,12 @@ 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 ""
-"Низът завършва по средата на директивата: намерено '{' без съответен '}'."
+msgid "The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr "Низът завършва по средата на директивата: намерено '{' без съответен '}'."
 
 #: src/format-csharp.c:139
 #, 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
@@ -412,9 +399,7 @@ 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 "
-"'{'."
+msgid "The string starts in the middle of a directive: found '}' without matching '{'."
 msgstr "Низът започва в средата на директива : намерено '}' без съответен '{'."
 
 #: src/format-csharp.c:162
@@ -434,18 +419,13 @@ 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
@@ -482,51 +462,33 @@ 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
@@ -535,9 +497,7 @@ 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."
+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
@@ -547,18 +507,13 @@ 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
@@ -567,19 +522,13 @@ 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'"
-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:756
 #, c-format
@@ -588,34 +537,21 @@ 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
 #, 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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -645,12 +581,8 @@ msgstr "При директива номер %u, са зададени и @, и
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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
 #, c-format
@@ -673,9 +605,7 @@ msgstr "указаните формати при '%s' не са подмноже
 
 #: 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-perl-brace.c:199 src/format-python.c:471
@@ -686,12 +616,8 @@ msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "указаният формат за аргумент '%s' не съществува при '%s'"
 
 #: 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
@@ -700,31 +626,22 @@ 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: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-python-brace.c:137
@@ -744,11 +661,8 @@ msgstr "При директива номер %u, с '%c' не може да се
 
 #: 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, не са разререни повече влагания при указание за "
-"формат."
+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
@@ -757,32 +671,20 @@ 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 име."
 
 #: 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."
@@ -790,16 +692,12 @@ 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."
+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:355 src/msgcat.c:294 src/msgcmp.c:172
@@ -873,12 +771,10 @@ msgstr "  -s, --short                 кратко мрежово име\n"
 #: src/hostname.c:222
 #, 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:225
@@ -966,11 +862,8 @@ msgstr ""
 #: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 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
@@ -990,19 +883,14 @@ msgstr "  ВХФАЙЛ                      входящ PO файл\n"
 #: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
 #: src/xgettext.c:875
 #, 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/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
@@ -1017,8 +905,7 @@ msgstr "Местоположение на резултатата:\n"
 #: src/msggrep.c:540 src/msgmerge.c:525 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: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
@@ -1027,9 +914,7 @@ msgstr ""
 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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
 #, c-format
@@ -1038,33 +923,23 @@ 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              изтриване на съобщенията отбелязани като "
-"мъгляви('fuzzy')\n"
+msgstr "      --no-fuzzy              изтриване на съобщенията отбелязани като мъгляви('fuzzy')\n"
 
 #: 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:460
 #, c-format
@@ -1084,30 +959,22 @@ msgstr "Управление на атрибутите:\n"
 #: 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: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:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
-msgstr ""
-"      --set-obsolete          установяване на всички съобщения като "
-"остаряли\n"
+msgstr "      --set-obsolete          установяване на всички съобщения като остаряли\n"
 
 #: 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:475
 #, c-format
@@ -1116,40 +983,27 @@ msgid ""
 "                              of translated messages.\n"
 msgstr ""
 "      --previous              при отбелязване като 'мъгляв', да се запазват\n"
-"                              предишните msgid-та, на преведените "
-"съобщения.\n"
+"                              предишните msgid-та, на преведените съобщения.\n"
 
 #: 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"
-msgstr ""
-"      --empty                 при изтриване на мъгляви('fuzzy'), да се "
-"зададе празен \"msgstr\"\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=ФАЙЛ.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"
-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:486
 #, c-format
@@ -1158,10 +1012,8 @@ msgstr "      --fuzzy                 синоним за --only-fuzzy --clear-f
 
 #: 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
@@ -1174,21 +1026,14 @@ 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:393 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:395 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: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
@@ -1205,15 +1050,11 @@ msgstr "Подробности за извеждане:\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"
+"                              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: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
@@ -1226,61 +1067,46 @@ msgstr "      --style=СТИЛФАЙЛ        задава CSS правила з
 #: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
 #: src/xgettext.c:977
 #, 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: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
 #, 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: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
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
 #: src/xgettext.c:983
 #, 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
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
 #: src/xgettext.c:987
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
 #: src/xgettext.c:989
 #, 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: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
@@ -1293,19 +1119,15 @@ msgstr "  -p, --properties-output     записване на Java .properties �
 #: 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
 #, 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: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
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
-msgstr ""
-"  -w, --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:416
@@ -1330,8 +1152,7 @@ msgstr "  -s, --sort-output           резултатът да е подред�
 #: src/xgettext.c:1002
 #, 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
 #, c-format
@@ -1374,9 +1195,7 @@ msgstr "  ВХФАЙЛ ...                  входящи файлове\n"
 #: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
 #, 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
@@ -1390,10 +1209,8 @@ 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
 #, c-format
@@ -1401,8 +1218,7 @@ 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
@@ -1417,11 +1233,8 @@ msgstr ""
 #: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
 #: src/msgmerge.c:562
 #, 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:564
@@ -1430,8 +1243,7 @@ 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:337 src/msguniq.c:378
@@ -1450,10 +1262,8 @@ msgstr ""
 
 #: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:359
@@ -1509,12 +1319,8 @@ msgstr "Уточняване на операциите:\n"
 
 #: src/msgcmp.c:241 src/msgmerge.c:553
 #, 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:555
 #, c-format
@@ -1561,7 +1367,7 @@ msgstr "съобщението се използва, но не е опреде�
 msgid "warning: this message is not used"
 msgstr "предупреждение: съобщението не се използва"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1600,16 +1406,13 @@ 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:1004
 #, 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
@@ -1635,17 +1438,13 @@ msgstr "  -i, --indent                резултат в стил с отмес
 #: src/msgmerge.c:586
 #, 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:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
 #: src/msgmerge.c:588
 #, 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:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
 #: src/msgmerge.c:590
@@ -1766,37 +1565,27 @@ msgstr "Полезни ФИЛТЪР-ОПЦИИ, когато ФИЛТЪР е 'se
 
 #: src/msgfilter.c:442
 #, 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:444
 #, 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:447
 #, 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
 #, 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:471 src/msggrep.c:606
 #, c-format
@@ -1805,11 +1594,8 @@ msgstr "      --indent                резултат в стил с отмес
 
 #: src/msgfilter.c:473
 #, 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
 #, c-format
@@ -1904,9 +1690,7 @@ msgstr "Употреба: %s [ОПЦИЯ] имефайл.po ...\n"
 #: src/msgfmt.c:778
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
-msgstr ""
-"Създаване на двоичен каталог със съобщения от текстово описание на "
-"преводите.\n"
+msgstr "Създаване на двоичен каталог със съобщения от текстово описание на преводите.\n"
 
 #: src/msgfmt.c:783 src/xgettext.c:864
 #, c-format, no-wrap
@@ -1929,21 +1713,13 @@ msgstr "Режими на работа:\n"
 
 #: src/msgfmt.c:799
 #, 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
 #, 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
 #, c-format
@@ -1952,19 +1728,13 @@ msgstr "      --csharp                C# режим: създаване на .NE
 
 #: src/msgfmt.c:805
 #, c-format
-msgid ""
-"      --csharp-resources      C# resources mode: generate a .NET .resources "
-"file\n"
-msgstr ""
-"      --csharp-resources      C# ресурс режим: създаване на .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:807
 #, c-format
-msgid ""
-"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr ""
-"      --tcl                   Tcl режим: създаване на tcl/msgcat .msg файл\n"
+msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr "      --tcl                   Tcl режим: създаване на tcl/msgcat .msg файл\n"
 
 #: src/msgfmt.c:809
 #, c-format
@@ -1973,11 +1743,8 @@ msgstr "      --qt                    Qt режим: създаване на Qt
 
 #: src/msgfmt.c:811
 #, 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:818
 #, c-format
@@ -2002,36 +1769,27 @@ 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
 #, 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
 #, 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:831
 #, 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
 #, 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"
 
@@ -2042,12 +1800,8 @@ msgstr "Местоположение на резултата при C# режи�
 
 #: src/msgfmt.c:845 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
 #, c-format
@@ -2066,9 +1820,7 @@ msgstr "Местоположение на резултата при Tcl режи
 #: src/msgfmt.c:855 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:857
 #, c-format
@@ -2106,12 +1858,10 @@ msgstr ""
 #: src/msgfmt.c:874
 #, 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:886 src/xgettext.c:905
@@ -2123,29 +1873,20 @@ msgstr "Тълкувания за входящия файл:\n"
 #, 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:891
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr ""
-"      --check-format          проверка на езиково зависимите форматиращи "
-"низове\n"
+msgstr "      --check-format          проверка на езиково зависимите форматиращи низове\n"
 
 #: src/msgfmt.c:893
 #, 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
 #, c-format
@@ -2153,64 +1894,46 @@ 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
 #, 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:900
 #, 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:903
 #, 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:908
 #, 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
 #, 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:913
 #, 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
 #, c-format
@@ -2250,9 +1973,7 @@ msgstr "името на област \"%s\" не е подходящо за им
 #: src/msgfmt.c:1081
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr ""
-"името на област  \"%s\" не е подходящо за име на файл: ще се използва "
-"представка"
+msgstr "името на област  \"%s\" не е подходящо за име на файл: ще се използва представка"
 
 #: src/msgfmt.c:1095
 #, c-format
@@ -2274,12 +1995,12 @@ msgstr "пренебрегнат мъгляв(fuzzy) 'msgstr' запис"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: предупреждение: файла източник съдържа мъгляви преводи"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1306
 #, c-format
 msgid "%s does not exist"
 msgstr "%s не съществува"
 
-#: src/msgfmt.c:1328
+#: src/msgfmt.c:1316
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s съществува, но е нечетим"
@@ -2298,12 +2019,8 @@ 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
@@ -2391,11 +2108,8 @@ msgstr ""
 
 #: 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:623
 #, c-format
@@ -2405,8 +2119,7 @@ msgstr "      --sort-output           резултатът да е подред�
 #: src/msggrep.c:625
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr ""
-"      --sort-by-file          подреждане на резултата по място на файла\n"
+msgstr "      --sort-by-file          подреждане на резултата по място на файла\n"
 
 #: src/msginit.c:297
 msgid ""
@@ -2451,8 +2164,7 @@ msgstr "  -i, --input=ВХФАЙЛ          входящ POT файл\n"
 #: src/msginit.c:379
 #, 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"
@@ -2461,8 +2173,7 @@ msgstr ""
 #: src/msginit.c:385
 #, 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:387
 #, c-format
@@ -2481,10 +2192,8 @@ msgstr "  -l, --locale=LL_CC          задаване на целевия ло�
 
 #: src/msginit.c:402
 #, 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:468
 msgid ""
@@ -2516,18 +2225,13 @@ msgstr "пропадна подпроцесът %s и той излезе с к�
 
 #: src/msginit.c:1118
 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 ...",
@@ -2549,18 +2253,13 @@ 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 "входящия файл '%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
 #, c-format
@@ -2580,20 +2279,17 @@ 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:449
 #, 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"
 
@@ -2607,8 +2303,7 @@ msgid ""
 msgstr ""
 "Преобразуването на файла %s от кодировка %s към кодировка %s промени някои\n"
 "msgids или msgctxts.\n"
-"Или да се променят всички msgids и msgctxts да са в ASCII или да се "
-"осигури,\n"
+"Или да се променят всички msgids и msgctxts да са в ASCII или да се осигури,\n"
 "да са кодирани в UTF-8 поначало, т.е. във файловете с програмен код.\n"
 
 #: src/msgl-charset.c:93
@@ -2671,9 +2366,7 @@ msgstr "израза за множествено число може да вър
 #: src/msgl-check.c:141
 #, 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
 msgid "plural expression can produce division by zero"
@@ -2684,12 +2377,8 @@ 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 ""
-"в израза за множествено число може да се получи аритметична грешка, възможно "
-"е деление на нула"
+msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+msgstr "в израза за множествено число може да се получи аритметична грешка, възможно е деление на нула"
 
 #: src/msgl-check.c:266
 #, c-format
@@ -2736,12 +2425,8 @@ msgstr[0] "но някой съобщения съдържат една форм
 msgstr[1] "но някой съобщения съдържат %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=ИЗРАЗ;\""
+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
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
@@ -2778,17 +2463,17 @@ msgstr "поддръжката на множествено число е доп�
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr е без отбелязване за ускорена клавишна комбинация '%c'"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr е отбелязан с твърде много отметки за клавишни комбинации '%c'"
 
-#: src/msgl-check.c:804
+#: src/msgl-check.c:801
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "все още заглавното поле '%s' е с началната стойност по подразбиране\n"
 
-#: src/msgl-check.c:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "в заглавния блок липсва поле '%s'\n"
@@ -2810,31 +2495,19 @@ 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
 #, 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
 #, 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:302 src/x-python.c:672
 #: src/xgettext.c:727
 #, 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:392 src/msgmerge.c:398
 #, c-format
@@ -2872,8 +2545,7 @@ msgstr ""
 #: src/msgmerge.c:507
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr ""
-"  def.po                      преводи препращащи към на старите източници\n"
+msgstr "  def.po                      преводи препращащи към на старите източници\n"
 
 #: src/msgmerge.c:509
 #, c-format
@@ -2886,8 +2558,7 @@ 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:519
@@ -2922,8 +2593,7 @@ msgstr "      --suffix=НАСТ           задава наставка за р�
 #: src/msgmerge.c:539
 #, 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"
@@ -2940,8 +2610,7 @@ msgstr ""
 #: src/msgmerge.c:546
 #, 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"
@@ -2949,17 +2618,13 @@ msgstr ""
 
 #: src/msgmerge.c:557
 #, 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:614 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
-msgstr ""
-"  -q, --quiet, --silent       подтискане на показването ход на процеса\n"
+msgstr "  -q, --quiet, --silent       подтискане на показването ход на процеса\n"
 
 #: src/msgmerge.c:1609
 #, c-format
@@ -2973,12 +2638,8 @@ msgstr "това съобщение не трябва да зададе форм
 
 #: src/msgmerge.c:2035
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2999,18 +2660,12 @@ msgstr "Употреба: %s [ОПЦИЯ] [ФАЙЛ]...\n"
 #: 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: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
@@ -3019,19 +2674,13 @@ msgstr "      --csharp                C# режим: входящ е .NET .dll �
 
 #: 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: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
@@ -3046,12 +2695,10 @@ 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 ""
-"Името на класа се определя като се добави име на локал към името на "
-"ресурса,\n"
+"Името на класа се определя като се добави име на локал към името на ресурса,\n"
 "разделени с долна черта.  Класът се намира използвайки CLASSPATH.\n"
 
 #: src/msgunfmt.c:467
@@ -3085,8 +2732,7 @@ msgstr ""
 #: 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
@@ -3121,12 +2767,8 @@ 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
@@ -3140,8 +2782,7 @@ msgid ""
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 "Кодовото множество, \"%s\", не е с преносимо име за кодировка.\n"
-"Преобразуването на съобщенията към потребителското кодовото множество може "
-"да не работи.\n"
+"Преобразуването на съобщенията към потребителското кодовото множество може да не работи.\n"
 
 #: src/po-charset.c:557
 #, c-format
@@ -3408,46 +3049,24 @@ 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 файл."
+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 ""
-"При указаният формат, в един файл не може да се получи резултат с много "
-"области за превод."
+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 ""
-"каталогът със съобщенията съдържа преводи в зависимост от текста, но формата "
-"за резултат не ги поддържа."
+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 файл."
+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 ""
-"каталогът със съобщенията съдържа преводи в множествено число, но формата за "
-"резултат не ги поддържа."
+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
 #, c-format
@@ -3481,15 +3100,12 @@ msgstr "неправилно име за клас на Java: %s"
 #: src/write-java.c:1210
 #, 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
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr ""
-"пропадна компилирането на клас на Java, да се опита с установяване $JAVAC"
+msgstr "пропадна компилирането на клас на Java, да се опита с установяване $JAVAC"
 
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
@@ -3498,13 +3114,10 @@ msgstr "грешка при отваряне на \"%s\" за запис"
 
 #: src/write-po.c:875
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1326 src/write-po.c:1455
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3517,7 +3130,7 @@ msgstr ""
 "кодировка. Да се обмисли използването на чисто ASCII msgid.\n"
 "%s\n"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1338 src/write-po.c:1467
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3540,8 +3153,7 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3792,9 +3404,7 @@ 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\" до края на "
-"файла"
+msgstr "%s:%d: не може да се намери ограничител за край на низ \"%s\" до края на файла"
 
 #: src/x-perl.c:1043
 #, c-format
@@ -3911,12 +3521,8 @@ 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"
+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:413
 #, c-format
@@ -3926,15 +3532,12 @@ msgstr "%s:%d: предупреждение: предсрочно прекъсн
 #: src/xgettext.c:545
 #, 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:648
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
-msgstr ""
-"--join-existing не може да се използва, когато резултата се записва на "
-"стандартния изход"
+msgstr "--join-existing не може да се използва, когато резултата се записва на стандартния изход"
 
 #: src/xgettext.c:653
 #, c-format
@@ -3944,8 +3547,7 @@ msgstr "xgettext не може да работи без ключове за тъ
 #: src/xgettext.c:808
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr ""
-"предупреждение: файлът '%s' с окончание '%s' е непознат, ще се опита Си"
+msgstr "предупреждение: файлът '%s' с окончание '%s' е непознат, ще се опита Си"
 
 #: src/xgettext.c:859
 #, c-format
@@ -3954,26 +3556,18 @@ msgstr "Извличане на низовете за превод от зада
 
 #: 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=ИМЕ   използване на ИМЕ.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:884
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr ""
-"  -o, --output=ФАЙЛ           записване на изходните данни в указания файл\n"
+msgstr "  -o, --output=ФАЙЛ           записване на изходните данни в указания файл\n"
 
 #: src/xgettext.c:886
 #, 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:891
 #, c-format
@@ -3984,20 +3578,16 @@ msgstr "Избиране на език на входящия файл:\n"
 #, 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"
+"                                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"
+"                                (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"
 
@@ -4008,12 +3598,8 @@ msgstr "  -C, --c++                   за краткост на --language=C++\
 
 #: src/xgettext.c:902
 #, 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:907
 #, c-format
@@ -4032,8 +3618,7 @@ msgstr "По подразбиране входящите файлове са в
 #: src/xgettext.c:915
 #, 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:917
 #, c-format
@@ -4045,8 +3630,7 @@ msgstr "  -x, --exclude-file=ФАЙЛ.po  да не се извличат зап
 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"
@@ -4068,14 +3652,12 @@ msgstr "  -a, --extract-all           извличане на всички ни�
 #, 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"
 
@@ -4083,22 +3665,19 @@ msgstr ""
 #, 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:942
 #, 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"
@@ -4108,23 +3687,19 @@ msgstr ""
 #, 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:950
 #, 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:952
 #, c-format
@@ -4153,11 +3728,8 @@ msgstr "      --boost                 разпознава Boost формат з
 
 #: src/xgettext.c:966
 #, 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:991
 #, c-format
@@ -4167,14 +3739,11 @@ msgstr "      --properties-output     записва Java .properties файл\n
 #: src/xgettext.c:1006
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr ""
-"      --copyright-holder=НИЗ     задава носител на авторско право в "
-"резултата\n"
+msgstr "      --copyright-holder=НИЗ     задава носител на авторско право в резултата\n"
 
 #: src/xgettext.c:1008
 #, 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"
@@ -4191,39 +3760,30 @@ msgstr "      --package-version=ВЕРСИЯ   задава версия на п
 
 #: src/xgettext.c:1014
 #, 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:1016
 #, 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:1019
 #, 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:1840
 #, 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:1965
@@ -4252,21 +3812,13 @@ 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
@@ -4336,5 +3888,4 @@ msgstr "<неназован>"
 #~ msgstr "заглавно поле '%s' трябва да започне от началото на реда\n"
 
 #~ msgid "some header fields still have the initial default value\n"
-#~ msgstr ""
-#~ "все още някой заглавни полета са с началните стойност по подразбиране\n"
+#~ msgstr "все още някой заглавни полета са с началните стойност по подразбиране\n"
diff --git a/gettext-tools/po/ca.po b/gettext-tools/po/ca.po
index 719de6849..dffd2c2d0 100644
--- a/gettext-tools/po/ca.po
+++ b/gettext-tools/po/ca.po
@@ -52,7 +52,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-06-01 11:19+0900\n"
+"POT-Creation-Date: 2014-05-10 13:37+0900\n"
 "PO-Revision-Date: 2014-05-11 21:36+0200\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -81,9 +81,7 @@ msgstr "Els arguments vàlids són:"
 #: gnulib-lib/clean-temp.c:332
 #, 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:346
@@ -256,16 +254,12 @@ msgstr "error en escriure el fitxer «%s»"
 #: gnulib-lib/javacomp.c:2343
 #, 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:905 src/msginit.c:980
 #: src/msginit.c:1140
@@ -275,7 +269,7 @@ msgstr "error d’E/S amb el subprocés «%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
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "la memòria s’ha exhaurit"
@@ -286,7 +280,7 @@ 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:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "no s’ha pogut escriure al subprocés «%s»"
@@ -387,19 +381,15 @@ msgstr "error en obrir «%s» per a llegir"
 #: src/format.c:151
 #, 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"
+msgstr "«%s» no és una cadena vàlida de format de %s, com la de «%s».  Motiu: %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-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»"
+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-librep.c:323 src/format-lua.c:235
@@ -417,9 +407,7 @@ msgstr "no existeix una especificació de format de l’argument %u en «%s»"
 #: 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:449
 #, c-format
@@ -428,26 +416,18 @@ msgstr "La directiva número %u comença amb «|» però no acaba en «|»."
 
 #: 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."
+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: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:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
 #: src/format-javascript.c:215 src/format-python.c:515
@@ -467,18 +447,13 @@ 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:130 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."
+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:139
 #, 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:140
 #, c-format
@@ -486,12 +461,8 @@ 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:161 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."
+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:162
 #, c-format
@@ -506,25 +477,17 @@ 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
@@ -561,55 +524,33 @@ 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
@@ -618,12 +559,8 @@ msgstr "La cadena es refereix a l’argument número %u de formes incompatibles.
 
 #: 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:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
@@ -632,19 +569,13 @@ msgstr "A la directiva número %u, «%s» no està seguit d’una coma."
 
 #: 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: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:572
@@ -654,20 +585,13 @@ msgstr "A la directiva número %u, una selecció («choice») no conté cap núm
 
 #: 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: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:756
 #, c-format
@@ -676,36 +600,21 @@ msgstr "no existeix una especificació de format de l’argument {%u} en «%s»"
 
 #: 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-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 ""
-"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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -732,18 +641,12 @@ msgstr "S’ha trobat «~%c» sense el «~%c» corresponent."
 #: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, 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:2976 src/format-scheme.c:2973
 #, 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:3326 src/format-scheme.c:3263
 #, c-format
@@ -762,17 +665,12 @@ msgstr "les especificacions de format en «%s» i «%s» no són equivalents"
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr ""
-"les especificacions de format de «%s» no són un subconjunt de les de «%s»"
+msgstr "les especificacions de format de «%s» no són un subconjunt de les 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 ""
-"A la directiva número %u, l’especificació de mida no és compatible amb "
-"l’especificació de conversió «%c»."
+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-perl-brace.c:199 src/format-python.c:471
 #: src/format-python-brace.c:434 src/format-python-brace.c:447
@@ -782,50 +680,33 @@ 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: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."
+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 "The string refers to the argument named '%s' in incompatible ways."
-msgstr ""
-"La cadena es refereix a l’argument anomenat «%s» de formes incompatibles."
+msgstr "La cadena es refereix a l’argument anomenat «%s» de formes incompatibles."
 
 #: src/format-python.c:430
 #, 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 "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.c:437
 #, 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 "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.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 ""
-"no existeix, com en «%2$s», una especificació de format de l’argument «%1$s» "
-"en «%3$s»"
+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.c:494
 #, 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 "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-python-brace.c:137
 #, c-format
@@ -835,57 +716,39 @@ msgstr "A la directiva número %u, «%c» no pot començar un nom de camp."
 #: src/format-python-brace.c:150
 #, 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()»."
+msgstr "A la directiva número %u, «%c» no pot començar un argument per a «getattr()»."
 
 #: src/format-python-brace.c:165
 #, 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()»."
+msgstr "A la directiva número %u, «%c» no pot començar un argument per a «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 ""
-"A la directiva número %u, no s’admet més niament en l’especificació de "
-"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."
 
 #: src/format-python-brace.c:270
 #, 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."
+msgstr "A la directiva número %u, hi ha una directiva de format sense terminar."
 
 #: 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: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: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."
+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: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."
+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:85
 msgid "The string refers to a shell variable with an empty name."
@@ -893,18 +756,13 @@ msgstr "La cadena es refereix a una variable d’intèrpret amb un nom buit."
 
 #: 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: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."
+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: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
@@ -977,8 +835,7 @@ msgstr "  -s, --short          Nom curt de l’estació.\n"
 #: src/hostname.c:222
 #, 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"
@@ -1067,8 +924,7 @@ msgstr ""
 #: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 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"
@@ -1091,8 +947,7 @@ msgstr "  FITXER_ENTRADA       Fitxer PO d’entrada.\n"
 #: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
 #: src/xgettext.c:875
 #, 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"
@@ -1131,8 +986,7 @@ 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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
@@ -1142,19 +996,13 @@ msgstr "Selecció dels missatges:\n"
 
 #: 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: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:456
 #, c-format
@@ -1199,8 +1047,7 @@ msgstr "      --set-obsolete    Marca tots els missatges com a obsolets.\n"
 #: 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:475
 #, c-format
@@ -1213,25 +1060,21 @@ 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 ""
 "      --clear-previous    Elimina de tots els missatges el comentari amb el\n"
 "                       «msgid» anterior.\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          En eliminar la marca «fuzzy» també deixa buit el\n"
 "                       «msgstr» corresponent.\n"
 
 #: 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"
@@ -1239,12 +1082,10 @@ 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 ""
 "      --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:486
@@ -1254,8 +1095,7 @@ msgstr "      --fuzzy          Equival a «--only-fuzzy --clear-fuzzy».\n"
 
 #: 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:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
@@ -1269,20 +1109,16 @@ msgstr "Sintaxi del fitxer d’entrada:\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:393 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: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
 #, 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"
@@ -1303,14 +1139,11 @@ msgstr "Detalls de l’eixida:\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"
+"                              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:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
@@ -1326,8 +1159,7 @@ msgstr ""
 #: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
 #: src/xgettext.c:977
 #, 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"
@@ -1336,8 +1168,7 @@ msgstr ""
 #: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
 #: src/msguniq.c:391 src/xgettext.c:979
 #, 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"
@@ -1364,8 +1195,7 @@ msgstr "      --no-location    No escriu les línies «#: nom_fitxer:línia».\n
 #: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
 #: src/xgettext.c:987
 #, 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"
@@ -1373,11 +1203,8 @@ msgstr ""
 #: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
 #: src/xgettext.c:989
 #, 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: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
@@ -1392,8 +1219,7 @@ msgstr ""
 #: 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
 #, 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"
@@ -1429,8 +1255,7 @@ msgstr "  -s, --sort-output    Genera una eixida ordenada.\n"
 #: src/xgettext.c:1002
 #, 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:322 src/msgcomm.c:327
 #, c-format
@@ -1502,8 +1327,7 @@ msgid ""
 "                              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:414 src/msgcomm.c:405
@@ -1512,19 +1336,16 @@ 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:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
 #: src/msgmerge.c:562
 #, 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:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
@@ -1535,8 +1356,7 @@ msgid ""
 "                              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:428 src/msgconv.c:337 src/msguniq.c:378
@@ -1550,18 +1370,15 @@ 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:433 src/msgen.c:345 src/msgmerge.c:570
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:359
@@ -1618,12 +1435,8 @@ msgstr "Modificadors del funcionament:\n"
 
 #: src/msgcmp.c:241 src/msgmerge.c:553
 #, 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:243 src/msgmerge.c:555
 #, c-format
@@ -1674,7 +1487,7 @@ msgstr "aquest missatge s’empra però no s’ha definit en «%s»"
 msgid "warning: this message is not used"
 msgstr "avís: aquest missatge no s’empra"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1717,23 +1530,18 @@ msgid ""
 "                              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:452 src/xgettext.c:1004
 #, 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: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:335
 #, c-format
@@ -1759,8 +1567,7 @@ msgstr "      --no-location    No escriu les línies «#: nom_fitxer:línia».\n
 #: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
 #: src/msgmerge.c:588
 #, 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"
@@ -1769,9 +1576,7 @@ msgstr ""
 #: src/msgmerge.c:590
 #, 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:258 src/msgfmt.c:433 src/xgettext.c:661
 #, c-format
@@ -1888,34 +1693,27 @@ msgstr "OPCIONS_DE_FILTRE útils quan el FILTRE és «sed»:\n"
 
 #: src/msgfilter.c:442
 #, 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:444
 #, 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:447
 #, 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:465 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"
@@ -1927,11 +1725,8 @@ msgstr "      --indent         Genera el fitxer PO emprant l’estil indentat.\n
 
 #: src/msgfilter.c:473
 #, 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/msgfmt.c:345
 #, c-format
@@ -2056,21 +1851,13 @@ msgstr "Mode de funcionament:\n"
 
 #: src/msgfmt.c:799
 #, 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:801
 #, 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:803
 #, c-format
@@ -2080,20 +1867,16 @@ 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:805
 #, 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:807
 #, 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"
@@ -2105,16 +1888,14 @@ msgstr "      --qt             Mode Qt: genera un fitxer «.qm» de Qt.\n"
 
 #: src/msgfmt.c:811
 #, 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"
 
 # Ull!  En aquest cas no és un fitxer PO!  ivb
 #: src/msgfmt.c:818
 #, 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:820 src/xgettext.c:888
 #, c-format
@@ -2134,24 +1915,17 @@ msgstr "  -r, --resource=RECURS    Nom del recurs.\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
 #, 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:829
 #, 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:831
 #, 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"
@@ -2159,13 +1933,11 @@ msgstr ""
 #: src/msgfmt.c:833
 #, 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"
 
@@ -2176,9 +1948,7 @@ msgstr "Ubicació del fitxer d’eixida al mode C#:\n"
 
 #: src/msgfmt.c:845 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"
@@ -2189,8 +1959,7 @@ 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"
 
@@ -2202,8 +1971,7 @@ msgstr "Ubicació del fitxer d’eixida al mode Tcl:\n"
 #: src/msgfmt.c:855 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:857
 #, c-format
@@ -2211,8 +1979,7 @@ 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:861
@@ -2223,8 +1990,7 @@ msgstr "Opcions del mode Desktop:\n"
 #: src/msgfmt.c:867
 #, 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:869
 #, c-format
@@ -2244,12 +2010,10 @@ msgstr ""
 #: src/msgfmt.c:874
 #, 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"
 
@@ -2262,12 +2026,10 @@ msgstr "Interpretació del fitxer d’entrada:\n"
 #, 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:891
@@ -2279,9 +2041,7 @@ msgstr ""
 
 #: src/msgfmt.c:893
 #, 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"
@@ -2298,9 +2058,7 @@ msgstr ""
 
 #: src/msgfmt.c:898
 #, 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"
@@ -2309,8 +2067,7 @@ msgstr ""
 #: src/msgfmt.c:900
 #, 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"
@@ -2324,8 +2081,7 @@ msgstr "  -f, --use-fuzzy      Empra a l’eixida les entrades difuses.\n"
 
 #: src/msgfmt.c:908
 #, 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"
@@ -2333,21 +2089,17 @@ msgstr ""
 #: src/msgfmt.c:910
 #, 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:913
 #, 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"
@@ -2390,9 +2142,7 @@ msgstr "el nom de domini «%s» no és adequat com a nom de fitxer"
 #: src/msgfmt.c:1081
 #, 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:1095
 #, c-format
@@ -2415,13 +2165,13 @@ 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:1318
+#: src/msgfmt.c:1306
 #, c-format
 msgid "%s does not exist"
 msgstr "«%s» no existeix"
 
 # No empra quote().  ivb
-#: src/msgfmt.c:1328
+#: src/msgfmt.c:1316
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "«%s» existeix però no s’ha pogut llegir"
@@ -2440,11 +2190,8 @@ msgstr "error en llegir «%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 ""
-"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:521
 #, c-format, no-wrap
@@ -2538,11 +2285,9 @@ 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         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:623
@@ -2553,8 +2298,7 @@ msgstr "      --sort-output    Genera una eixida ordenada.\n"
 #: 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:297
@@ -2604,12 +2348,10 @@ msgstr ""
 #: src/msginit.c:379
 #, 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:385
@@ -2625,8 +2367,7 @@ 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"
 
@@ -2634,16 +2375,12 @@ msgstr ""
 #: src/msginit.c:400
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
-msgstr ""
-"  -l, --locale=ii_PP    Estableix el locale objectiu (idioma i país).\n"
+msgstr "  -l, --locale=ii_PP    Estableix el locale objectiu (idioma i país).\n"
 
 #: src/msginit.c:402
 #, 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:468
 msgid ""
@@ -2677,16 +2414,12 @@ msgstr "el subprocés «%s» ha fallat amb codi d’eixida %d"
 # Aquest missatge va directament per pantalla…  ivb
 #: src/msginit.c:1118
 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"
 
@@ -2710,26 +2443,18 @@ msgstr "el fitxer d’entrada conté dos jocs de caràcters distints, «%s» i �
 
 #: 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: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:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
-msgstr ""
-"el joc de caràcters destinació, «%s», no és un nom portable de codificació"
+msgstr "el joc de caràcters destinació, «%s», no és un nom portable de codificació"
 
 #: 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
@@ -2752,8 +2477,7 @@ msgstr ""
 #: src/msgl-cat.c:449
 #, 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 ""
@@ -2845,9 +2569,7 @@ msgstr "l’expressió de «plural» pot produir valors negatius"
 #: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr ""
-"«nplurals» és %lu, però l’expressió de «plural» pot produir valors de fins a "
-"%lu"
+msgstr "«nplurals» és %lu, però l’expressió de «plural» pot produir valors de fins a %lu"
 
 #: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
@@ -2858,12 +2580,8 @@ msgid "plural expression can produce integer overflow"
 msgstr "l’expressió de «plural» pot produir un desbordament enter"
 
 #: src/msgl-check.c:197
-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"
+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
@@ -2914,12 +2632,8 @@ msgstr[0] "però alguns missatges tenen una forma plural"
 msgstr[1] "però alguns missatges tenen %lu formes plurals"
 
 #: 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 ""
-"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Ó;»"
+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:611
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
@@ -2956,17 +2670,17 @@ msgstr "el maneig de plurals és una extensió del «gettext» de GNU"
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "manca la marca d’accelerador de teclat «%c» en «msgstr»"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, 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:804
+#: src/msgl-check.c:801
 #, 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:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "manca el camp de capçalera «%s» a la capçalera\n"
@@ -2983,39 +2697,25 @@ msgstr "%s: error en convertir de la condificació «%s» a la codificació «%s
 
 #: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
-msgstr ""
-"el fitxer d’entrada no conté una entrada de capçalera amb una especificació "
-"de joc de caràcters"
+msgstr "el fitxer d’entrada no conté una entrada de capçalera amb una especificació de joc de caràcters"
 
 #: 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
 #, 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:335
 #, 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:341 src/recode-sr-latin.c:302 src/x-python.c:672
 #: src/xgettext.c:727
 #, 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í.
@@ -3069,8 +2769,7 @@ msgid ""
 "                              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:519
@@ -3079,8 +2778,7 @@ 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:531
@@ -3101,15 +2799,12 @@ msgstr "      --backup=CONTROL    Crea una còpia de seguretat de «def.po».\n"
 #: src/msgmerge.c:537
 #, 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:539
 #, 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"
@@ -3121,28 +2816,23 @@ 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:546
 #, 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:557
 #, 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:614 src/urlget.c:192
 #, c-format
@@ -3165,12 +2855,8 @@ msgstr "no s’han de definir formes plurals d’aquest missatge"
 # ivb  (o no) una nova línia.
 #: src/msgmerge.c:2035
 #, 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.
@@ -3193,31 +2879,24 @@ msgstr "Forma d’ús: %s [OPCIÓ] [FITXER]…\n"
 #: 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: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: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: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"
@@ -3226,11 +2905,9 @@ msgstr ""
 # Amb «tcl/msgcat» es refereix al paquet «msgcat» de Tcl.  ivb
 #: 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:451
@@ -3246,14 +2923,11 @@ msgstr "Ubicació del fitxer d’entrada al 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 ""
-"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:467
@@ -3267,10 +2941,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 ""
-"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:479
@@ -3295,9 +2967,7 @@ msgstr "  -i, --indent         Genera el fitxer PO emprant l’estil indentat.\n
 #: 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:331
 #, c-format, no-wrap
@@ -3328,9 +2998,7 @@ msgstr "  -d, --repeated       Només mostra els missatges duplicats.\n"
 
 #: 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"
@@ -3628,46 +3296,24 @@ msgid " failed.\n"
 msgstr " ha fallat.\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 ""
-"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."
+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:129
-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."
+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:162
-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."
+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: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 ""
-"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»."
+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:202
-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."
+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:231 src/write-catalog.c:275
 #, c-format
@@ -3701,16 +3347,12 @@ msgstr "«%s» no és un nom vàlid de classe Java"
 #: src/write-java.c:1210
 #, 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:1213
 #, 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"
+msgstr "no s’ha pogut compil·lar la classe Java, per favor establiu la variable d’entorn JAVAC"
 
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
@@ -3719,14 +3361,11 @@ msgstr "error en obrir «%s» per a escriure"
 
 #: src/write-po.c:875
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1326 src/write-po.c:1455
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3740,7 +3379,7 @@ msgstr ""
 "%s\n"
 
 # Multilínia.  ivb
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1338 src/write-po.c:1467
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3766,8 +3405,7 @@ msgstr ""
 # Multilínia.  ivb
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3856,8 +3494,7 @@ msgstr "%s:%d: avís: el literal cadena no està terminat"
 
 #: src/x-csharp.c:224 src/xgettext.c:2106
 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:269
@@ -3969,8 +3606,7 @@ msgstr "%s:%d: avís: el punt de codi surrogat U+%04X està solt"
 
 #: src/x-javascript.c:230
 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:275
@@ -4042,8 +3678,7 @@ msgstr "%s:%d: avís: l’etiquetatge XML no està terminat"
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr ""
-"%s:%d: no s’ha trobat el terminador de cadena «%s» abans del final de fitxer"
+msgstr "%s:%d: no s’ha trobat el terminador de cadena «%s» abans del final de fitxer"
 
 #: src/x-perl.c:1043
 #, c-format
@@ -4181,12 +3816,8 @@ msgstr "%s:%d: l’expressió de cadena no és vàlida"
 # És una funció d’intèrpret.  ivb
 #: 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: avís: la sintaxi «$\"…\"» està desaprovada per motius de seguretat; "
-"useu «eval_gettext» al seu lloc"
+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:413
 #, c-format
@@ -4196,8 +3827,7 @@ msgstr "%s:%d: avís: el literal expressió regular termina massa aviat"
 #: src/xgettext.c:545
 #, 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"
+msgstr "«%s» no és nom de codificació vàlid, s’emprarà ASCII com a alternativa\n"
 
 #: src/xgettext.c:648
 #, c-format
@@ -4212,9 +3842,7 @@ msgstr "«xgettext» no funciona sense paraules clau que cercar"
 #: src/xgettext.c:808
 #, 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»"
+msgstr "avís: l’extensió «%2$s» del fitxer «%1$s» no és coneguda; es provarà amb el llenguatge «C»"
 
 #: src/xgettext.c:859
 #, c-format
@@ -4223,13 +3851,10 @@ msgstr "Extreu les cadenes traduïbles dels fitxers d’entrada indicats.\n"
 
 #: src/xgettext.c:882
 #, 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=NOM\n"
-"                       Empra «NOM.po» com a eixida (en lloc de «messages."
-"po»).\n"
+"                       Empra «NOM.po» com a eixida (en lloc de «messages.po»).\n"
 
 #: src/xgettext.c:884
 #, c-format
@@ -4238,8 +3863,7 @@ msgstr "  -o, --output=FITXER    Escriu l’eixida al FITXER especificat.\n"
 
 #: src/xgettext.c:886
 #, 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=DIRECTORI\n"
 "                       Els fitxers d’eixida es desaran al DIRECTORI.\n"
@@ -4254,21 +3878,16 @@ msgstr "Selecció del llenguatge del fitxer d’entrada:\n"
 #, 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"
+"                                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"
+"                       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:900
@@ -4278,12 +3897,9 @@ msgstr "  -C, --c++            Equival a «--language=C++».\n"
 
 #: src/xgettext.c:902
 #, 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 ""
-"Per defecte s’endevina el llenguatge fent servir l’extensió del nom del "
-"fitxer\n"
+"Per defecte s’endevina el llenguatge fent servir l’extensió del nom del fitxer\n"
 "d’entrada.\n"
 
 #: src/xgettext.c:907
@@ -4298,8 +3914,7 @@ msgstr ""
 #: src/xgettext.c:910
 #, 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"
+msgstr "Per defecte s’assumeix que els fitxers d’entrada estan codificats en ASCII.\n"
 
 #: src/xgettext.c:915
 #, c-format
@@ -4321,17 +3936,14 @@ msgstr ""
 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 ""
 "  -cETIQUETA, --add-comments=ETIQUETA\n"
-"                       Inclou al fitxer d’eixida els blocs de comentaris "
-"que\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"
+"  -c, --add-comments    Inclou al fitxer d’eixida tots els blocs de comentaris\n"
 "                       que precedeixen les línies amb una paraula clau.\n"
 
 #: src/xgettext.c:925
@@ -4349,15 +3961,12 @@ msgstr "  -a, --extract-all    Extreu totes les cadenes.\n"
 #, 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 ""
-"                       (Només per als llenguatges C, C++, ObjectiveC, "
-"Shell,\n"
-"                       Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, "
-"awk,\n"
+"                       (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"
 
@@ -4366,28 +3975,23 @@ msgstr ""
 #, 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 ""
-"                       (Només per als llenguatges C, C++, ObjectiveC, "
-"Shell,\n"
-"                       Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, "
-"awk,\n"
+"                       (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:942
 #, 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=PARAULA:ARG:INDICADOR\n"
-"                       Indicador addicional per a les cadenes que es troben "
-"a\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
@@ -4395,30 +3999,25 @@ msgstr ""
 #, 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 ""
-"                       (Només per als llenguatges C, C++, ObjectiveC, "
-"Shell,\n"
-"                       Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, "
-"awk,\n"
+"                       (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:950
 #, 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"
+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:952
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr ""
-"                       (Només per als llenguatges C, C++ i ObjectiveC.)\n"
+msgstr "                       (Només per als llenguatges C, C++ i ObjectiveC.)\n"
 
 #: src/xgettext.c:954
 #, c-format
@@ -4444,11 +4043,9 @@ msgstr "      --boost          Reconeix les cadenes de format de Boost.\n"
 # Simplement mireu l’info.  ivb
 #: src/xgettext.c:966
 #, c-format
-msgid ""
-"      --debug                 more detailed formatstring recognition result\n"
+msgid "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
-"      --debug          Escriu unes marques més detallades de reconeixement "
-"de\n"
+"      --debug          Escriu unes marques més detallades de reconeixement de\n"
 "                       cadenes de format.\n"
 
 #: src/xgettext.c:991
@@ -4468,11 +4065,9 @@ msgstr ""
 
 #: src/xgettext.c:1008
 #, 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    Omet a l’eixida la nota de copyright de la FSF, per "
-"a\n"
+"      --foreign-user    Omet a l’eixida la nota de copyright de la FSF, per a\n"
 "                       uns usuaris diferents.\n"
 
 #: src/xgettext.c:1010
@@ -4491,31 +4086,26 @@ msgstr ""
 
 #: src/xgettext.c:1014
 #, 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=ADREÇA@CORREU\n"
-"                       Indica l’adreça on informar dels errors de les "
-"cadenes\n"
+"                       Indica l’adreça on informar dels errors de les cadenes\n"
 "                       «msgid».\n"
 
 #: src/xgettext.c:1016
 #, 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]\n"
-"                       Empra la CADENA (o la cadena buida) com a prefix "
-"dels\n"
+"                       Empra la CADENA (o la cadena buida) com a prefix dels\n"
 "                       valors les entrades «msgstr».\n"
 
 #: src/xgettext.c:1019
 #, 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]\n"
@@ -4525,11 +4115,8 @@ msgstr ""
 # Missatge d’error.  ivb
 #: src/xgettext.c:1840
 #, 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"
+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:1965
 msgid "standard input"
@@ -4565,12 +4152,8 @@ msgstr "%s%s: avís: "
 # El motiu està traduït.  ivb
 #: 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 ""
-"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)
@@ -4579,12 +4162,8 @@ msgstr ""
 # El motiu està traduït.  ivb
 #: src/xgettext.c:2190
 #, 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:2221
@@ -4624,8 +4203,7 @@ msgstr "avís: manca el context de la paraula clau «%.*s»"
 #: src/xgettext.c:3031
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr ""
-"avís: manca el context de l’argument «plural» de la paraula clau «%.*s»"
+msgstr "avís: manca el context de l’argument «plural» de la paraula clau «%.*s»"
 
 #: src/xgettext.c:3052
 #, c-format
diff --git a/gettext-tools/po/cs.po b/gettext-tools/po/cs.po
index 661e140a5..ff0333622 100644
--- a/gettext-tools/po/cs.po
+++ b/gettext-tools/po/cs.po
@@ -12,1408 +12,221 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.38\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2001-05-23 23:03+0200\n"
 "PO-Revision-Date: 2001-08-18 15:22+0200\n"
 "Last-Translator: Vladimir Michl <Vladimir.Michl@seznam.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: gnulib-lib/argmatch.c:133
-#, c-format
-msgid "invalid argument %s for %s"
-msgstr ""
-
-#: gnulib-lib/argmatch.c:134
-#, c-format
-msgid "ambiguous argument %s for %s"
-msgstr ""
-
-#: gnulib-lib/argmatch.c:153
-msgid "Valid arguments are:"
-msgstr ""
-
-#: gnulib-lib/clean-temp.c:332
-#, c-format
-msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr ""
-
-# src/message.c:1115
-#: gnulib-lib/clean-temp.c:346
-#, fuzzy, c-format
-msgid "cannot create a temporary directory using template \"%s\""
-msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
-
-# src/message.c:1115
-#: gnulib-lib/clean-temp.c:442
-#, fuzzy, c-format
-msgid "cannot remove temporary file %s"
-msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
-
-#: gnulib-lib/clean-temp.c:457
-#, 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:217
-#, 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:194
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
-msgstr "chyba p�i otev�r�n� souboru \"%s\" pro �ten�"
-
-#: gnulib-lib/copy-file.c:198
-#, 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:202
-#, fuzzy, c-format
-msgid "error reading %s"
-msgstr "chyba p�i �ten� \"%s\""
-
-# src/message.c:1182
-#: gnulib-lib/copy-file.c:206
-#, fuzzy, c-format
-msgid "error writing %s"
-msgstr "chyba p�i z�pisu do souboru \"%s\""
-
-# src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: gnulib-lib/copy-file.c:210
-#, fuzzy, c-format
-msgid "error after reading %s"
-msgstr "chyba p�i �ten� \"%s\""
-
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
-#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
-#: src/read-tcl.c:110 src/write-resources.c:77
-#, c-format
-msgid "fdopen() failed"
-msgstr ""
-
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
-msgstr ""
-
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
-msgstr ""
+"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/error.c:91
-#: gnulib-lib/error.c:188
+#: lib/error.c:115
 msgid "Unknown system error"
 msgstr "Nezn�m� syst�mov� chyba"
 
-#: 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
-#, c-format
-msgid "%s subprocess failed"
-msgstr ""
-
 # lib/getopt.c:628
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: lib/getopt.c:691
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: p�ep�na� `%s' nen� jednozna�n�\n"
 
 # lib/getopt.c:652
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: 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:657
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: lib/getopt.c:721
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: p�ep�na� `%c%s' mus� b�t zad�n bez argumentu\n"
 
 # lib/getopt.c:674 lib/getopt.c:847
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: lib/getopt.c:739 lib/getopt.c:912
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: p�ep�na� `%s' vy�aduje argument\n"
 
 # lib/getopt.c:703
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#. --option
+#: lib/getopt.c:768
+#, 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:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
+#. +option or -option
+#: lib/getopt.c:772
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: nezn�m� p�ep�na� `%c%s'\n"
 
+# lib/getopt.c:733
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:798
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: nezn�m� p�ep�na� -- %c\n"
+
 # lib/getopt.c:736
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
+#: lib/getopt.c:801
+#, 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:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:831 lib/getopt.c:961
+#, 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:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: lib/getopt.c:878
+#, 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:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: p�ep�na� ` -W %s' mus� b�t zad�n bez argumentu\n"
-
-# lib/getopt.c:674 lib/getopt.c:847
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: p�ep�na� `%s' vy�aduje argument\n"
-
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
-#, c-format
-msgid "invalid source_version argument to compile_java_class"
-msgstr ""
-
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
-#, 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
-#, c-format
-msgid "failed to create \"%s\""
-msgstr ""
-
-# src/message.c:1182
-#: 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
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "chyba p�i z�pisu do souboru \"%s\""
-
-#: gnulib-lib/javacomp.c:2343
-#, c-format
-msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr ""
-
-#: gnulib-lib/javaexec.c:417
+#: lib/getopt.c:896
 #, c-format
-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
-#, c-format
-msgid "%s subprocess I/O error"
-msgstr ""
+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/xmalloc.c:82
-#: 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
-#, c-format
+#: 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
 msgid "memory exhausted"
 msgstr "pam� vy�erp�na"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, 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
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
-#. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
-msgid "`"
-msgstr ""
-
-#: gnulib-lib/quotearg.c:313
-msgid "'"
-msgstr ""
-
-#: gnulib-lib/set-acl.c:46
-#, c-format
-msgid "setting permissions for %s"
-msgstr ""
-
-# src/message.c:1115
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
-
-#: gnulib-lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr ""
-
-# src/message.c:1115
-#: gnulib-lib/w32spawn.h:84
-#, fuzzy, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
-
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
-#, c-format
-msgid "%s subprocess got fatal signal %d"
-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: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
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "chyba p�i otev�r�n� souboru \"%s\" pro �ten�"
-
-#: src/format.c:151
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr ""
-
-# src/msgfmt.c:909
-#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c: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-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 "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-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-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
-#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
-
-# src/msgfmt.c:909
-#: src/format-awk.c: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-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr "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.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: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
-msgid "number of format specifications in '%s' and '%s' does not match"
-msgstr "po�et form�tovac�ch specifik�tor� v `msgid' a `msgstr' nen� stejn�"
-
-#: src/format-csharp.c:88 src/format-java.c:205
-#, c-format
-msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr ""
-
-#: src/format-csharp.c:109
-#, 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 '}'."
-msgstr ""
-
-#: src/format-csharp.c:139
-#, c-format
-msgid ""
-"The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr ""
-
-#: src/format-csharp.c:140
-#, 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 "
-"'{'."
-msgstr ""
-
-#: src/format-csharp.c:162
-#, 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 ""
-"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 "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 in '%s' and '%s' for argument {%u} are not the same"
-msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
-
-#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
-#: 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 ""
-
-#: src/format-lisp.c:2372 src/format-scheme.c:2398
-#, c-format
-msgid ""
-"In the directive number %u, too many parameters are given; expected at most "
-"%u parameter."
-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:2496 src/format-scheme.c:2499
-#, 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
-#, c-format
-msgid "In the directive number %u, the argument %d is negative."
-msgstr ""
-
-#: src/format-lisp.c:2805
-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
-#, c-format
-msgid "Found '~%c' without matching '~%c'."
-msgstr ""
-
-#: src/format-lisp.c:2863 src/format-scheme.c:2860
-#, 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
-#, 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
-#, 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
-msgid "The string refers to some argument in incompatible ways."
-msgstr ""
-
-# src/msgfmt.c:909
-#: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, fuzzy, c-format
-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:3490 src/format-scheme.c:3413
-#, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
-
-#: src/format-perl.c:433
-#, c-format
-msgid ""
-"In the directive number %u, the size specifier is incompatible with the "
-"conversion specifier '%c'."
-msgstr ""
-
-# src/msgfmt.c:909
-#: 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
-#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
-
-#: src/format-python.c: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 ""
-"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 in '%s' and '%s' for argument '%s' are not the same"
-msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
-
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr ""
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr ""
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr ""
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-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"
-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 ""
-
-#: 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
+# 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
 #, 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"
+"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:139 src/msgcmp.c:149 src/msgfmt.c:262 src/msgmerge.c:256
 # src/msgunfmt.c:180 src/xgettext.c:399
-#: src/hostname.c:184 src/msgattrib.c: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
+#: 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
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Autor: %s\n"
 
-#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c: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
-msgid "Bruno Haible"
-msgstr ""
-
 # src/gettextp.c:164
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
-#, c-format
+#: src/gettext.c:163 src/ngettext.c:137
 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/gettextp.c:228 src/msgcmp.c:181 src/msgfmt.c:361 src/msgmerge.c:298
 # src/msgunfmt.c:210 src/xgettext.c:532
-#: src/hostname.c:207 src/msgattrib.c: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
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: 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
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "V�ce informac� z�sk�te p��kazem `%s --help'.\n"
 
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+# src/gettextp.c:233
+#: src/gettext.c:250
 #, c-format, no-wrap
-msgid "Usage: %s [OPTION]\n"
-msgstr ""
-
-#: src/hostname.c:215
-#, c-format
-msgid "Print the machine's hostname.\n"
-msgstr ""
-
-#: src/hostname.c:218
-#, c-format
-msgid "Output format:\n"
-msgstr ""
-
-#: src/hostname.c:220
-#, c-format
-msgid "  -s, --short                 short host name\n"
-msgstr ""
-
-#: src/hostname.c:222
-#, c-format
 msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified "
-"domain\n"
-"                                name, and aliases\n"
-msgstr ""
-
-#: src/hostname.c:225
-#, 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
-#, c-format, no-wrap
-msgid "Informative output:\n"
-msgstr ""
-
-#: 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 ""
+"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/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
+# src/gettextp.c:245
+#: src/gettext.c:262
 #, c-format, no-wrap
-msgid "  -V, --version               output version information and exit\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"
+"  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/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/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
-#, fuzzy
-msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
+#: 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"
 msgstr ""
-"  Chyby v programu oznamujte na adrese <bug-gnu-utils@prep.ai.mit.edu> "
-"(pouze\n"
+"  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/hostname.c:255 src/hostname.c:261 src/hostname.c:268
-#, c-format
-msgid "could not get host name"
-msgstr ""
-
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: 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: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
-#, 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 ""
-"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: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/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: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
-#, fuzzy, c-format
-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: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
-#, 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:285 src/msgfilter.c:424
-#: 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
-#, 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
-#, 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/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:406 src/msgcomm.c:397 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: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/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
-#, 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:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 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: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
-#, 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
-#, 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: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
-#, 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
-#, c-format
-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
-#, c-format
-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
-#, 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
-#, 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
-#, 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
-#, c-format
-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
-#, c-format
-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
-#, 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
-#, c-format
-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
-#, 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
-#, 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
-#, 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
-#, c-format
-msgid "  -F, --sort-by-file          sort output by file location\n"
-msgstr ""
-
-#: src/msgcat.c:322 src/msgcomm.c:327
-#, 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:367 src/msgcomm.c:359 src/xgettext.c:855
-#, c-format
-msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
-msgstr ""
-
-#: src/msgcat.c:372
-#, 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, 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"
-"  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/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
-#, c-format
-msgid "  INPUTFILE ...               input files\n"
-msgstr ""
-
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
-#, 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
-#, c-format
-msgid "If input file is -, standard input is read.\n"
-msgstr ""
-
-#: src/msgcat.c:408 src/msgcomm.c:399
-#, 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
-#, 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
-#, 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
-#, c-format
-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
-#, 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
-#, c-format
-msgid "  -t, --to-code=NAME          encoding for output\n"
-msgstr ""
-
-#: src/msgcat.c:430 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
-#, 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:178 src/msgcomm.c:291 src/msgmerge.c:359
-msgid "Peter Miller"
-msgstr ""
-
 # src/msgcmp.c:160 src/msgmerge.c:267
-#: src/msgcmp.c:189 src/msgmerge.c:370
-#, c-format
+#: src/msgcmp.c:156 src/msgmerge.c:271
 msgid "no input files given"
 msgstr "vstupn� soubory nejsou zad�ny"
 
 # src/msgcmp.c:165 src/msgmerge.c:272
-#: src/msgcmp.c:194 src/msgmerge.c:375
-#, c-format
+#: src/msgcmp.c:161 src/msgmerge.c:276
 msgid "exactly 2 input files required"
 msgstr "jsou po�adov�ny p�esn� 2 vstupn� soubory"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
-#, c-format
-msgid "Usage: %s [OPTION] def.po ref.pot\n"
-msgstr ""
-
 # src/msgcmp.c:186
-#: src/msgcmp.c:218
-#, fuzzy, c-format, no-wrap
+#: src/msgcmp.c:182
+#, 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"
-"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"
+"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 ""
 "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"
@@ -1430,80 +243,29 @@ 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:232
-#, c-format
-msgid "  def.po                      translations\n"
-msgstr ""
-
-#: src/msgcmp.c:234
-#, c-format
-msgid "  ref.pot                     references to the sources\n"
-msgstr ""
-
-#: src/msgcmp.c:239 src/msgmerge.c:551
-#, c-format
-msgid "Operation modifiers:\n"
-msgstr ""
-
-#: src/msgcmp.c:241 src/msgmerge.c:553
-#, c-format
-msgid ""
-"  -m, --multi-domain          apply ref.pot to each of the domains in def."
-"po\n"
-msgstr ""
-
-#: src/msgcmp.c:243 src/msgmerge.c:555
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgcmp.c:245
-#, c-format
-msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr ""
-
-#: src/msgcmp.c:247
-#, c-format
-msgid "      --use-untranslated      consider untranslated entries\n"
-msgstr ""
-
-# src/msgcmp.c:281
-#: src/msgcmp.c:324
-#, fuzzy, c-format
-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:369 src/msgmerge.c:1505
-#, c-format
+#: src/msgcmp.c:255 src/msgmerge.c:741
 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:372 src/msgmerge.c:1508
-#, c-format
+#: src/msgcmp.c:257 src/msgmerge.c:743
 msgid "...but this definition is similar"
 msgstr "...ale tato definice je podobn�"
 
 # src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:263 src/msgmerge.c:770
 #, 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:546
-#, c-format
+#: src/msgcmp.c:277
 msgid "warning: this message is not used"
 msgstr "upozorn�n�: tato zpr�va nen� pou�ita"
 
 # src/po-lex.c:84
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:283 src/po-lex.c:103
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1511,22 +273,123 @@ 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/msgcomm.c:316
+# 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
 #, 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:364
-#, fuzzy, c-format, no-wrap
+#: 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
 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 extracted comments will be preserved, but only from the first\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"
+"preserved.\n"
 msgstr ""
 "  -V, --version               vyp��e ozna�en� verze a ukon�� se\n"
 "  -w, --width=��SLO           nastav� v�stupn� ���ku str�nky\n"
@@ -1544,263 +407,32 @@ msgstr ""
 "ponech�ny, ale pouze z prvn�ho .po souboru, kter� je definuje. Ozna�en� pozic\n"
 "v souborech bude ponech�no ze v�ech .po soubor�.\n"
 
-#: src/msgcomm.c:402
-#, 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
-#, 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:584
-#, 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
-#, 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/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
 #, c-format
-msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr ""
+msgid "error while opening \"%s\" for reading"
+msgstr "chyba p�i otev�r�n� souboru \"%s\" pro �ten�"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
-#, c-format
-msgid "      --strict                strict Uniforum output style\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/msgfmt.c:273 src/xgettext.c:410
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
-#, c-format
+#: src/msgfmt.c:286 src/xgettext.c:404
 msgid "no input file given"
 msgstr "vstupn� soubor nen� zad�n"
 
-# src/msgcmp.c:165 src/msgmerge.c:272
-#: src/msgen.c:263
-#, fuzzy, c-format
-msgid "exactly one input file required"
-msgstr "jsou po�adov�ny p�esn� 2 vstupn� soubory"
-
-#: src/msgen.c:304
-#, c-format
-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:196
-#, c-format
-msgid "missing command name"
-msgstr ""
-
-#: src/msgexec.c:257
-#, c-format
-msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-msgstr ""
-
-#: src/msgexec.c:262
-#, 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:271
-#, c-format, no-wrap
-msgid ""
-"A special builtin command called '0' outputs the translation, followed by a\n"
-"null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
-msgstr ""
-
-#: src/msgexec.c:281 src/msgfilter.c:420
-#, c-format
-msgid "  -i, --input=INPUTFILE       input PO file\n"
-msgstr ""
-
-#: src/msgexec.c:345
-#, c-format
-msgid "write to stdout failed"
-msgstr ""
-
-# src/gettextp.c:154
-#: src/msgfilter.c:298
-#, fuzzy, c-format
-msgid "missing filter name"
-msgstr "chyb� argumenty"
-
-#: src/msgfilter.c:318
-#, fuzzy, c-format
-msgid "at least one sed script must be specified"
-msgstr "mus� b�t zad�ny nejm�n� dva r�zn� soubory"
-
-#: src/msgfilter.c:407
-#, c-format
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr ""
-
-#: src/msgfilter.c:411
-#, c-format
-msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr ""
-
-#: src/msgfilter.c:435
-#, 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
-#, c-format
-msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
-msgstr ""
-
-#: src/msgfilter.c:442
-#, c-format
-msgid ""
-"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr ""
-
-#: src/msgfilter.c:444
-#, c-format
-msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
-"commands\n"
-"                                to be executed\n"
-msgstr ""
-
-#: src/msgfilter.c:447
-#, c-format
-msgid ""
-"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr ""
-
-#: src/msgfilter.c:465 src/msggrep.c:600
-#, c-format
-msgid ""
-"      --no-escape             do not use C escapes in output (default)\n"
-msgstr ""
-
-#: src/msgfilter.c:471 src/msggrep.c:606
-#, c-format
-msgid "      --indent                indented output style\n"
-msgstr ""
-
-#: src/msgfilter.c:473
-#, c-format
-msgid ""
-"      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr ""
-
-#: src/msgfmt.c:345
-#, c-format
-msgid "the argument to %s should be a single punctuation character"
-msgstr ""
-
-#: src/msgfmt.c:392
-#, 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
-msgid "Ulrich Drepper"
-msgstr ""
-
-#: src/msgfmt.c:439
-#, 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/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
-#, c-format
-msgid "%s requires a \"-l locale\" specification"
-msgstr ""
-
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr ""
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr ""
-
-# src/xgettext.c:378 src/xgettext.c:382
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s a %s se vz�jemn� vylu�uj�"
-
-#: src/msgfmt.c:565 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
-#, c-format
-msgid "%s is only valid with %s, %s or %s"
-msgstr ""
-
-#. TRANSLATORS: The prefix before a statistics message.  The argument
-#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:740
+# src/msgfmt.c:321
+#: src/msgfmt.c:337
 #, c-format
-msgid "%s: "
-msgstr ""
+msgid "error while opening \"%s\" for writing"
+msgstr "chyba p�i otev�r�n� souboru \"%s\" pro z�pis"
 
 # src/msgfmt.c:343
-#: src/msgfmt.c:744
+#: src/msgfmt.c:360
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1809,7 +441,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:749
+#: src/msgfmt.c:365
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1818,7 +450,7 @@ msgstr[1] ", %d ne�pln� p�eklady"
 msgstr[2] ", %d ne�pln�ch p�eklad�"
 
 # src/msgfmt.c:347
-#: src/msgfmt.c:754
+#: src/msgfmt.c:370
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1826,835 +458,227 @@ 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:774
-#, c-format
-msgid "Usage: %s [OPTION] filename.po ...\n"
-msgstr ""
-
-#: src/msgfmt.c:778
-#, c-format
-msgid "Generate binary message catalog from textual translation description.\n"
-msgstr ""
-
-#: src/msgfmt.c:783 src/xgettext.c:864
+# src/msgfmt.c:366
+#: src/msgfmt.c:392
 #, 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"
-"Similarly for optional arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:790
-#, 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
-#, c-format
-msgid "Operation mode:\n"
-msgstr ""
-
-#: src/msgfmt.c:799
-#, c-format
-msgid ""
-"  -j, --java                  Java mode: generate a Java ResourceBundle "
-"class\n"
-msgstr ""
-
-#: src/msgfmt.c:801
-#, c-format
-msgid ""
-"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
-"higher)\n"
-msgstr ""
-
-#: src/msgfmt.c:803
-#, c-format
-msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr ""
-
-#: src/msgfmt.c:805
-#, c-format
-msgid ""
-"      --csharp-resources      C# resources mode: generate a .NET .resources "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:807
-#, c-format
-msgid ""
-"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr ""
-
-#: src/msgfmt.c:809
-#, c-format
-msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
-msgstr ""
-
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#: src/msgfmt.c:818
-#, c-format
-msgid "      --strict                enable strict Uniforum mode\n"
-msgstr ""
-
-#: src/msgfmt.c:820 src/xgettext.c:888
-#, c-format
-msgid "If output file is -, output is written to standard output.\n"
-msgstr ""
-
-#: src/msgfmt.c:823
-#, 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
-#, 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
-#, c-format
-msgid ""
-"  -l, --locale=LOCALE         locale name, either language or "
-"language_COUNTRY\n"
-msgstr ""
-
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:831
-#, c-format
-msgid ""
-"  -d DIRECTORY                base directory of classes directory hierarchy\n"
-msgstr ""
-
-#: src/msgfmt.c:833
-#, 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:839
-#, c-format
-msgid "Output file location in C# mode:\n"
-msgstr ""
-
-#: src/msgfmt.c:845 src/msgunfmt.c:473
-#, c-format
-msgid ""
-"  -d DIRECTORY                base directory for locale dependent .dll "
-"files\n"
-msgstr ""
-
-#: src/msgfmt.c:847
-#, 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
-#, c-format
-msgid "Output file location in Tcl mode:\n"
-msgstr ""
-
-#: src/msgfmt.c:855 src/msgunfmt.c:483
-#, c-format
-msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
-msgstr ""
-
-#: src/msgfmt.c:857
-#, 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
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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
-#, 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:886 src/xgettext.c:905
-#, c-format
-msgid "Input file interpretation:\n"
-msgstr ""
-
-#: src/msgfmt.c:888
-#, c-format
-msgid ""
-"  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-"
-"domain\n"
-msgstr ""
-
-#: src/msgfmt.c:891
-#, c-format
-msgid "      --check-format          check language dependent format strings\n"
-msgstr ""
-
-#: src/msgfmt.c:893
-#, c-format
-msgid ""
-"      --check-header          verify presence and contents of the header "
-"entry\n"
-msgstr ""
-
-#: src/msgfmt.c:895
-#, c-format
-msgid ""
-"      --check-domain          check for conflicts between domain directives\n"
-"                                and the --output-file option\n"
-msgstr ""
-
-#: src/msgfmt.c:898
-#, c-format
-msgid ""
-"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
-"msgfmt\n"
-msgstr ""
-
-#: src/msgfmt.c:900
-#, c-format
-msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
-"for\n"
-"                                menu items\n"
-msgstr ""
-
-#: src/msgfmt.c:903
-#, c-format
-msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
-msgstr ""
-
-#: src/msgfmt.c:908
-#, c-format
-msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr ""
-
-#: src/msgfmt.c:910
-#, 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:913
-#, c-format
-msgid ""
+"  -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:922
-#, c-format
-msgid "      --statistics            print statistics about translations\n"
-msgstr ""
-
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
-#, c-format
-msgid "  -v, --verbose               increase verbosity level\n"
-msgstr ""
-
-#: src/msgfmt.c:1037
-#, c-format
-msgid "warning: PO file header missing or invalid\n"
-msgstr ""
-
-#: src/msgfmt.c:1040
-#, fuzzy, c-format
-msgid "warning: charset conversion will not work\n"
-msgstr ""
-"V hlavi�ce chyb� definice znakov� sady.\n"
-"Konverze zpr�v do u�ivatelovy znakov� sady nen� mo�n�.\n"
-
-#: src/msgfmt.c:1050
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr ""
+# src/msgfmt.c:407
+#: src/msgfmt.c:435
+msgid "while creating hash table"
+msgstr "p�i tvorb� ha�ovac� tabulky"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:479
 #, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
+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:471
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:503
 #, 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:1081
+#: src/msgfmt.c:508
 #, 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
-#: src/msgfmt.c:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#. 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"
 msgstr "p��kaz `domain %s' ignorov�n"
 
 # src/msgfmt.c:517
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:551
+msgid "empty `msgstr' entry ignored"
 msgstr "pr�zdn� polo�ka `msgstr' ignorov�na"
 
 # src/msgfmt.c:518
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:552
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "ne�pln� polo�ka `msgstr' ignorov�na"
 
-# src/msgfmt.c:668
-#: src/msgfmt.c:1205
-#, c-format
-msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s: upozorn�n�: zdrojov� soubor obsahuje ne�pln� p�eklad"
-
-#: src/msgfmt.c:1318
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
-
-# src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: 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
-#, c-format
-msgid "error while reading \"%s\""
-msgstr "chyba p�i �ten� \"%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 ""
-
-#: 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:297
-msgid ""
-"You are in a language indifferent environment.  Please set\n"
-"your LANG environment variable, as described in the ABOUT-NLS\n"
-"file.  This is necessary so you can test your translations.\n"
-msgstr ""
-
-#: src/msginit.c:321
-#, 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:347
-#, c-format
-msgid "Created %s.\n"
-msgstr ""
-
-#: src/msginit.c:367
-#, c-format, no-wrap
-msgid ""
-"Creates a new PO file, initializing the meta information with values from the\n"
-"user's environment.\n"
-msgstr ""
-
-#: src/msginit.c:377
-#, c-format
-msgid "  -i, --input=INPUTFILE       input POT file\n"
-msgstr ""
-
-#: src/msginit.c:379
-#, 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:385
-#, c-format
-msgid "  -o, --output-file=FILE      write output to specified PO file\n"
-msgstr ""
-
-#: src/msginit.c:387
-#, c-format
-msgid ""
-"If no output file is given, it depends on the --locale option or the user's\n"
-"locale setting.  If it is -, the results are written to standard output.\n"
-msgstr ""
-
-#: src/msginit.c:400
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
-msgstr ""
-
-#: src/msginit.c:402
-#, c-format
-msgid ""
-"      --no-translator         assume the PO file is automatically generated\n"
-msgstr ""
-
-#: src/msginit.c:468
-msgid ""
-"Found more than one .pot file.\n"
-"Please specify the input .pot file through the --input option.\n"
-msgstr ""
-
-#: src/msginit.c:476 src/msginit.c:481
-#, c-format
-msgid "error reading current directory"
-msgstr ""
-
-#: src/msginit.c:489
-msgid ""
-"Found no .pot file in the current directory.\n"
-"Please specify the input .pot file through the --input option.\n"
-msgstr ""
-
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
-#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
-#: src/read-tcl.c:127 src/write-resources.c:104
-#, c-format
-msgid "%s subprocess failed with exit code %d"
-msgstr ""
-
-#: src/msginit.c:1118
-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:1534
-#, c-format
-msgid "English translations for %s package"
-msgstr ""
-
-#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
-#, c-format
-msgid "present charset \"%s\" is not a portable encoding name"
-msgstr ""
-
-#: src/msgl-cat.c:188 src/msgl-iconv.c:259
-#, 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:391 src/msgl-iconv.c:375
-#, 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
-#, fuzzy, c-format
-msgid "warning: "
-msgstr "%s: upozorn�n�: "
-
-#: src/msgl-cat.c:443
-#, c-format
-msgid ""
-"Input files contain messages in different encodings, UTF-8 among others.\n"
-"Converting the output to UTF-8.\n"
-msgstr ""
-
-#: src/msgl-cat.c:449
-#, 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:488
-#, 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: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 ""
-
-#: src/msgl-charset.c:100
-#, c-format
-msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: src/msgl-check.c:130
-msgid "plural expression can produce negative values"
-msgstr ""
-
-#: src/msgl-check.c:141
+# src/msgfmt.c:561
+#: src/msgfmt.c:594
 #, c-format
-msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr ""
-
-#: src/msgl-check.c:187
-msgid "plural expression can produce division by zero"
-msgstr ""
-
-#: src/msgl-check.c:192
-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 ""
+msgid "headerfield `%s' missing in header"
+msgstr "polo�ka hlavi�ky `%s' v hlavi�ce chyb�"
 
-#: src/msgl-check.c:266
+# src/msgfmt.c:564
+#: src/msgfmt.c:597
 #, c-format
-msgid "Try using the following, valid for %s:"
-msgstr ""
-
-#: src/msgl-check.c:358 src/msgl-check.c:382
-msgid "message catalog has plural form translations"
-msgstr ""
-
-#: src/msgl-check.c:360
-msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr ""
-
-#: src/msgl-check.c:384
-msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr ""
-
-# src/po-lex.c:332
-#: src/msgl-check.c:420
-#, fuzzy
-msgid "invalid nplurals value"
-msgstr "neplatn� ��d�c� sekvence"
-
-#: src/msgl-check.c:442
-msgid "invalid plural expression"
-msgstr ""
+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/msgl-check.c:472 src/msgl-check.c:488
-#, c-format
-msgid "nplurals = %lu"
-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/msgl-check.c:474
+# src/msgfmt.c:583
+#: src/msgfmt.c:618
 #, 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] ""
+msgid "field `%s' still has initial default value"
+msgstr "polo�ka `%s' m� st�le po��te�n� implicitn� hodnotu"
 
-#: src/msgl-check.c:490
+# src/msgfmt.c:668
+#: src/msgfmt.c:708
 #, 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:514
-msgid ""
-"message catalog has plural form translations, but lacks a header entry with "
-"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr ""
+msgid "%s: warning: source file contains fuzzy translation"
+msgstr "%s: upozorn�n�: zdrojov� soubor obsahuje ne�pln� p�eklad"
 
 # src/msgfmt.c:870
-#: src/msgl-check.c:611
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgfmt.c:930
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "ob� polo�ky `msgid' a `msgid_plural' neza��naj� '\\n'"
 
 # src/msgfmt.c:870
-#: src/msgl-check.c:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgfmt.c:938
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "ob� polo�ky `msgid' a `msgstr[%u]' neza��naj� '\\n'"
 
 # src/msgfmt.c:870
-#: src/msgl-check.c:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgfmt.c:948
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "ob� polo�ky `msgid' a `msgstr' neza��naj� '\\n'"
 
 # src/msgfmt.c:878
-#: src/msgl-check.c:652
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgfmt.c:963
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "ob� polo�ky `msgid' a `msgid_plural' nekon�� '\\n'"
 
 # src/msgfmt.c:878
-#: src/msgl-check.c:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgfmt.c:971
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "ob� polo�ky `msgid' a `msgstr[%u]' nekon�� '\\n'"
 
 # src/msgfmt.c:878
-#: src/msgl-check.c:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgfmt.c:981
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "ob� polo�ky `msgid' a `msgstr' nekon�� '\\n'"
 
-#: src/msgl-check.c:687
-msgid "plural handling is a GNU gettext extension"
-msgstr ""
-
-#: src/msgl-check.c:729
-#, c-format
-msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr ""
-
-#: src/msgl-check.c:740
-#, c-format
-msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr ""
-
-# src/msgfmt.c:573
-#: src/msgl-check.c:804
-#, fuzzy, c-format
-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:820
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "polo�ka hlavi�ky `%s' v hlavi�ce chyb�"
-
-#: 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 "%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:290
-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
-#, fuzzy, c-format
-msgid ""
-"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/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-iconv.c:335
+# src/msgfmt.c:909
+#: src/msgfmt.c:1014
 #, c-format
-msgid ""
-"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
-"msgids become equal."
-msgstr ""
+msgid "format specifications for argument %lu are not the same"
+msgstr "form�tovac� specifik�tory pro argument %lu nejsou stejn�"
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
-#, fuzzy, c-format
+# src/msgmerge.c:303
+#: src/msgmerge.c:320
+#, c-format, no-wrap
 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:392 src/msgmerge.c:398
-#, c-format
-msgid "%s is only valid with %s"
-msgstr ""
-
-#: src/msgmerge.c:453
-msgid "backup type"
+"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/msgmerge.c:321
-#: src/msgmerge.c:490
-#, fuzzy, c-format, no-wrap
+#: src/msgmerge.c:340
+#, no-wrap
 msgid ""
+"\n"
 "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"
+"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.\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"
 msgstr ""
 "\n"
 "  Slije dva .po soubory stylu Uniforum dohromady. Soubor def.po je existuj�c�\n"
@@ -2668,1838 +692,442 @@ 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:507
-#, c-format
-msgid "  def.po                      translations referring to old sources\n"
-msgstr ""
-
-#: src/msgmerge.c:509
-#, c-format
-msgid "  ref.pot                     references to new sources\n"
-msgstr ""
-
-#: src/msgmerge.c:513
-#, c-format
-msgid ""
-"  -C, --compendium=FILE       additional library of message translations,\n"
-"                              may be specified more than once\n"
-msgstr ""
-
-#: src/msgmerge.c:519
-#, c-format
-msgid ""
-"  -U, --update                update def.po,\n"
-"                              do nothing if def.po already up to date\n"
-msgstr ""
-
-#: src/msgmerge.c:531
-#, c-format
-msgid "Output file location in update mode:\n"
-msgstr ""
-
-#: src/msgmerge.c:533
-#, c-format
-msgid "The result is written back to def.po.\n"
-msgstr ""
-
-#: src/msgmerge.c:535
-#, c-format
-msgid "      --backup=CONTROL        make a backup of def.po\n"
-msgstr ""
-
-#: src/msgmerge.c:537
-#, c-format
-msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr ""
-
-#: src/msgmerge.c:539
-#, 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:546
-#, c-format
-msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
-"SIMPLE_BACKUP_SUFFIX\n"
-"environment variable.\n"
-msgstr ""
-
-#: src/msgmerge.c:557
-#, c-format
-msgid ""
-"      --previous              keep previous msgids of translated messages\n"
-msgstr ""
-
-#: src/msgmerge.c:614 src/urlget.c:192
-#, c-format
-msgid "  -q, --quiet, --silent       suppress progress indicators\n"
-msgstr ""
-
-# src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgmerge.c:1609
-#, fuzzy, c-format
-msgid "this message should define plural forms"
-msgstr "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
-
-# src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgmerge.c:1632
-#, fuzzy, c-format
-msgid "this message should not define plural forms"
-msgstr "tato zpr�va je pou�ita, ale nikoli definov�na v %s"
-
 # src/msgmerge.c:769
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:799
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
-#, c-format
+#: src/msgmerge.c:806
 msgid " done.\n"
 msgstr " dokon�eno.\n"
 
-# 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 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 ""
-"  -j, --java                  Java mode: input is a Java ResourceBundle "
-"class\n"
-msgstr ""
-
-#: 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 ""
-"      --csharp-resources      C# resources mode: input is a .NET .resources "
-"file\n"
-msgstr ""
-
-#: src/msgunfmt.c:446
-#, c-format
+# src/msgunfmt.c:215
+#: src/msgunfmt.c:210
+#, c-format, no-wrap
 msgid ""
-"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
-msgstr ""
-
-#: 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 ""
+"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:462
-#, c-format
+# src/msgunfmt.c:229
+#: src/msgunfmt.c:224
+#, no-wrap
 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"
+"\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:467
+# 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
 #, c-format
-msgid "Input file location in C# mode:\n"
-msgstr ""
+msgid "error while reading \"%s\""
+msgstr "chyba p�i �ten� \"%s\""
 
-#: src/msgunfmt.c:475
+# src/msgunfmt.c:267 src/msgunfmt.c:331
+#: src/msgunfmt.c:262 src/msgunfmt.c:327
 #, 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 ""
+msgid "file \"%s\" truncated"
+msgstr "soubor \"%s\" je useknut�"
 
-#: src/msgunfmt.c:479
+# src/msgunfmt.c:298
+#: src/msgunfmt.c:293
 #, c-format
-msgid "Input file location in Tcl mode:\n"
-msgstr ""
+msgid "seek \"%s\" offset %ld failed"
+msgstr "posun v souboru \"%s\" na pozici %ld selhal"
 
-#: 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
+# src/msgunfmt.c:373
+#: src/msgunfmt.c:332
 #, c-format
-msgid "  -i, --indent                write indented output style\n"
-msgstr ""
+msgid "file \"%s\" contains a not NUL terminated string"
+msgstr "soubor \"%s\" obsahuje �et�zec, kter� nen� ukon�en NUL"
 
-#: src/msgunfmt.c:513
+# src/msgunfmt.c:373
+#: src/msgunfmt.c:377
 #, c-format
-msgid "      --strict                write strict uniforum style\n"
-msgstr ""
+msgid "file \"%s\" is not in GNU .mo format"
+msgstr "soubor \"%s\" nen� v GNU .mo form�tu"
 
-#: src/msguniq.c:331
+# src/gettextp.c:233
+#: src/ngettext.c:209
 #, 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 ""
+"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/msguniq.c:364
-#, c-format
-msgid "  -d, --repeated              print only duplicates\n"
-msgstr ""
-
-#: src/msguniq.c:366
-#, c-format
+# src/gettextp.c:245
+#: src/ngettext.c:221
+#, c-format, no-wrap
 msgid ""
-"  -u, --unique                print only unique messages, discard "
-"duplicates\n"
+"\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"
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
-#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
+#: src/open-po.c:64
 msgid "<stdin>"
 msgstr "<standardn� vstup>"
 
-#: 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:93
-#, c-format
+#: po-gram-gen.y:87
 msgid "inconsistent use of #~"
 msgstr "nekonzistentn� pou�it� #~"
 
 # ../../src/po-gram.y:83
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: po-gram-gen.y:168
+msgid "missing `msgstr[]' section"
 msgstr "chyb� sekce `msgstr[]'"
 
 # ../../src/po-gram.y:83
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: po-gram-gen.y:176
+msgid "missing `msgid_plural' section"
 msgstr "chyb� sekce `msgid_plural'"
 
 # ../../src/po-gram.y:83
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: po-gram-gen.y:183
+msgid "missing `msgstr' section"
 msgstr "chyb� sekce `msgstr'"
 
-#: src/po-gram-gen.y:399
-#, c-format
+#: po-gram-gen.y:228
 msgid "first plural form has nonzero index"
 msgstr "prvn� mno�n� ��slo m� nenulov� index"
 
-#: src/po-gram-gen.y:401
-#, c-format
+#: po-gram-gen.y:230
 msgid "plural form has wrong index"
 msgstr "mno�n� ��slo m� chybn� index"
 
 # src/po-lex.c:129 src/po-lex.c:168
-#: src/po-lex.c:90 src/po-lex.c:109
-#, c-format
+#. 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
 msgid "too many errors, aborting"
 msgstr "p��li� mnoho chyb, kon��m"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
-#, c-format
-msgid "invalid multibyte sequence"
-msgstr "neplatn� v�ceznakov� sekvence"
-
-#: src/po-lex.c:465
-#, fuzzy, c-format
-msgid "incomplete multibyte sequence at end of file"
-msgstr "neplatn� v�ceznakov� sekvence"
-
-#: src/po-lex.c:475
-#, fuzzy, c-format
-msgid "incomplete multibyte sequence at end of line"
-msgstr "neplatn� v�ceznakov� sekvence"
-
-#: src/po-lex.c:487
-msgid "iconv failure"
-msgstr ""
-
 # src/po-lex.c:241
-#: src/po-lex.c:744
+#: src/po-lex.c:274
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "kl��ov� slovo \"%s\" nen� zn�mo"
 
 # src/po-lex.c:332
-#: src/po-lex.c:854
-#, c-format
+#: src/po-lex.c:377
 msgid "invalid control sequence"
 msgstr "neplatn� ��d�c� sekvence"
 
 # src/po-lex.c:420
-#: src/po-lex.c:981
-#, c-format
+#: src/po-lex.c:480
 msgid "end-of-file within string"
 msgstr "konec souboru uprost�ed �et�zce"
 
 # src/po-lex.c:415
-#: src/po-lex.c:987
-#, c-format
+#: src/po-lex.c:485
 msgid "end-of-line within string"
 msgstr "konec ��dku uprost�ed �et�zce"
 
-#: src/po-lex.c:1008
-#, c-format
-msgid "context separator <EOT> within string"
-msgstr ""
-
-# src/xgettext.c:658 src/xgettext.c:968
-#: src/read-catalog.c:318 src/xgettext.c:1046
-#, c-format
-msgid "this file may not contain domain directives"
-msgstr "tento soubor nem��e obsahovat p��kazy pro dom�nu"
-
-# src/msgcmp.c:355 src/msgfmt.c:628 src/msgmerge.c:490 src/xgettext.c:1061
-#: src/read-catalog.c:363
-msgid "duplicate message definition"
-msgstr "dvojn�sobn� definice zpr�vy"
-
-# src/msgcmp.c:356 src/msgfmt.c:629 src/msgmerge.c:491 src/xgettext.c:1062
-#: src/read-catalog.c:365
-#, fuzzy
-msgid "this is the location of the first definition"
-msgstr "...toto je um�st�n� prvn� definice"
-
-# src/msgunfmt.c:267 src/msgunfmt.c:331
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
-#, fuzzy, c-format
-msgid "file \"%s\" is truncated"
-msgstr "soubor \"%s\" je useknut�"
+#: 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/msgunfmt.c:373
-#: src/read-mo.c:129
+#: src/po.c:302 src/po.c:374 src/po.c:409 src/po.c:439
 #, c-format
-msgid "file \"%s\" contains a not NUL terminated string"
-msgstr "soubor \"%s\" obsahuje �et�zec, kter� nen� ukon�en NUL"
+msgid "%s: warning: "
+msgstr "%s: upozorn�n�: "
 
-# src/msgunfmt.c:373
-#: src/read-mo.c:165 src/read-mo.c:274
+#: src/po.c:303
 #, c-format
-msgid "file \"%s\" is not in GNU .mo format"
-msgstr "soubor \"%s\" nen� v GNU .mo form�tu"
-
-# src/msgunfmt.c:373
-#: src/read-mo.c:178
-#, fuzzy, c-format
-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:227
-msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr ""
-
-# src/xget-lex.c:914
-#: src/read-stringtable.c:802
-#, fuzzy
-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 "warning: unterminated key/value pair"
-msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
-
-#: src/read-stringtable.c:939
-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:116
-#, fuzzy, c-format
-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:120
-msgid "Danilo Segan"
-msgstr ""
-
-#: src/recode-sr-latin.c:153
-#, c-format, no-wrap
-msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr ""
-
-#: src/recode-sr-latin.c:156
-#, 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
-#, c-format
-msgid "input is not valid in \"%s\" encoding"
+"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/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:367
-#, fuzzy, c-format
-msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "chyba p�i otev�r�n� souboru \"%s\" pro �ten�"
+#: src/po.c:370 src/po.c:405
+msgid "Continuing anyway, expect parse errors."
+msgstr "Pokra�uji, p�edpokl�d�na chyba parsingu."
 
-# src/gettextp.c:164
-#: src/urlget.c:159
-#, fuzzy, c-format
-msgid "expected two arguments"
-msgstr "p��li� mnoho argument�"
+#: src/po.c:372
+msgid "Continuing anyway."
+msgstr "Pokra�uji."
 
-#: src/urlget.c:176
+#: src/po.c:375
 #, c-format
-msgid "Usage: %s [OPTION] URL FILE\n"
-msgstr ""
-
-#: src/urlget.c:181
-#, c-format, no-wrap
 msgid ""
-"Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
-"the locally accessible FILE is used instead.\n"
+"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/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: src/urlget.c:228
-#, fuzzy, c-format
-msgid "error reading \"%s\""
-msgstr "chyba p�i �ten� \"%s\""
-
-# src/message.c:1182
-#: src/urlget.c:234
-#, fuzzy, c-format
-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:238
-#, fuzzy, c-format
-msgid "error after reading \"%s\""
-msgstr "chyba p�i �ten� \"%s\""
-
-#: src/urlget.c:264
-#, c-format
-msgid "Retrieving %s..."
+#: src/po.c:385 src/po.c:418
+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/urlget.c:308
+#: src/po.c:393 src/po.c:425
 #, c-format
-msgid " timed out.\n"
-msgstr ""
+msgid "%s\n"
+msgstr "%s\n"
 
-#: src/urlget.c:445
+#: src/po.c:410
 #, c-format
-msgid " failed.\n"
-msgstr ""
-
-#: 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 ""
-
-#: 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:162
-msgid ""
-"message catalog has context dependent translations, but the output format "
-"does not support them."
+"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/write-catalog.c:197
+#: src/po.c:440
 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."
+"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/write-catalog.c:202
-msgid ""
-"message catalog has plural form translations, but the output format does not "
-"support them."
-msgstr ""
+# 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/message.c:1115
-#: src/write-catalog.c:231 src/write-catalog.c:275
+#: src/write-po.c:863
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
 
 # src/message.c:1122
-#: src/write-catalog.c:239 src/write-catalog.c:283
+#: src/write-po.c:870
+#, no-c-format
 msgid "standard output"
 msgstr "standardn� v�stup"
 
-#: src/write-csharp.c:703
-#, c-format
-msgid "failed to create directory \"%s\""
-msgstr ""
-
-#: src/write-csharp.c:766
-#, c-format
-msgid "compilation of C# class failed, please try --verbose"
-msgstr ""
-
-#: src/write-csharp.c:768
-#, c-format
-msgid "compilation of C# class failed"
-msgstr ""
-
-#: src/write-java.c:1091
-#, c-format
-msgid "not a valid Java class name: %s"
-msgstr ""
-
-#: src/write-java.c:1210
-#, c-format
-msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr ""
-
-#: src/write-java.c:1213
-#, c-format
-msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr ""
-
-# src/msgfmt.c:321
-#: 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 "chyba p�i otev�r�n� souboru \"%s\" pro z�pis"
-
-# src/message.c:784
-#: src/write-po.c:875
-#, fuzzy, c-format
-msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "zpr�vy katalogu nesm� obsahovat escape sekvenci `\\%c'"
-
-#: src/write-po.c:1326 src/write-po.c:1450
-#, 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:1338 src/write-po.c:1462
-#, 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:667
-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
-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:717
-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:94
-#, fuzzy, c-format
-msgid "error while writing to %s subprocess"
+#: src/write-po.c:945
+#, c-format
+msgid "error while writing \"%s\" file"
 msgstr "chyba p�i z�pisu do souboru \"%s\""
 
-#: src/write-resources.c:131
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .resources format doesn't support contexts\n"
-msgstr ""
-
-#: src/write-resources.c:150
-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
-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
-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:341 src/x-javascript.c:795 src/x-python.c:931
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated string"
-msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
-
-# src/xget-lex.c:914
-#: src/x-awk.c:592
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated regular expression"
-msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
-
-#: src/x-c.c:1051
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr ""
+# src/xget-lex.c:150
+#: src/xget-lex.c:148
+msgid "standard input"
+msgstr "standardn� vstup"
 
 # src/xget-lex.c:892
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/xget-lex.c:876
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: upozorn�n�: neukon�en� znakov� konstanta"
 
 # src/xget-lex.c:914
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/xget-lex.c:898
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
-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:374
-#, 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:1390 src/x-python.c:1138
-#, fuzzy, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: upozorn�n�: neukon�en� znakov� konstanta"
-
-# src/xget-lex.c:892
-#: src/x-csharp.c:1512 src/x-java.c:875
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: upozorn�n�: neukon�en� znakov� konstanta"
-
-#: src/x-csharp.c:2020 src/x-java.c:1369
-#, c-format
-msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr ""
-
-#: src/x-csharp.c:2054 src/x-java.c:1403
-#, c-format
-msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr ""
-
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
-#, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr ""
-
-#: src/x-glade.c:606
-#, fuzzy, c-format
-msgid ""
-"Language \"glade\" is not supported. %s relies on expat.\n"
-"This version was built without expat.\n"
-msgstr ""
-"Znakov� sada \"%s\" nen� podporov�na. %s spol�h� na iconv().\n"
-"Tato verze byla kompilov�na bez iconv().\n"
-
-# src/xget-lex.c:914
-#: src/x-java.c:494
-#, fuzzy, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
-
-#: src/x-javascript.c:230
-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:954
-#, fuzzy, c-format
-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:1055
-#, fuzzy, c-format
-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:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
-
-#: 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 ""
-
-# lib/getopt.c:736
-#: src/x-perl.c:1217
-#, fuzzy, c-format
-msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s: nezn�m� p�ep�na� -- %c\n"
-
-#: src/x-perl.c: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:278
-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/x-python.c:324
-#, 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:341
-#, 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:354
-#, 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:364
-#, 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:397
-#, 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:722
-#, c-format
-msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr ""
-
-#: src/x-rst.c:108
-#, c-format
-msgid "%s:%d: invalid string definition"
-msgstr ""
-
-#: src/x-rst.c:172
-#, c-format
-msgid "%s:%d: missing number after #"
-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/xget-lex.c:914
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
 # src/xgettext.c:386
-#: src/xgettext.c:648
-#, c-format
+#: src/xgettext.c:373
 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:653
-#, c-format
+#: src/xgettext.c:378
 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:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr "upozorn�n�: p��pona `%2$s' souboru `%1$s' nen� zn�ma; zkus�m C"
-
-#: src/xgettext.c:859
-#, c-format
-msgid "Extract translatable strings from given input files.\n"
-msgstr ""
-
-#: src/xgettext.c:882
-#, c-format
-msgid ""
-"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
-"po)\n"
-msgstr ""
-
-#: src/xgettext.c:884
-#, c-format
-msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr ""
-
-#: src/xgettext.c:886
-#, c-format
-msgid ""
-"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr ""
-
-# src/msgfmt.c:273 src/xgettext.c:410
-#: src/xgettext.c:891
-#, fuzzy, c-format
-msgid "Choice of input file language:\n"
-msgstr "vstupn� soubor nen� zad�n"
-
-#: 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 ""
-
-#: src/xgettext.c:900
-#, c-format
-msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr ""
-
-#: src/xgettext.c:902
-#, c-format
-msgid ""
-"By default the language is guessed depending on the input file name "
-"extension.\n"
-msgstr ""
-
-#: src/xgettext.c:907
-#, c-format
-msgid ""
-"      --from-code=NAME        encoding of input files\n"
-"                                (except for Python, Tcl, Glade)\n"
-msgstr ""
-
-#: src/xgettext.c:910
-#, c-format
-msgid "By default the input files are assumed to be in ASCII.\n"
-msgstr ""
-
-#: src/xgettext.c:915
-#, c-format
-msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr ""
-
-#: src/xgettext.c:917
-#, c-format
-msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
-msgstr ""
-
-#: src/xgettext.c:919
-#, 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:925
-#, c-format
-msgid "Language specific options:\n"
-msgstr ""
-
-#: src/xgettext.c:927
-#, c-format
-msgid "  -a, --extract-all           extract all strings\n"
-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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: src/xgettext.c:950
-#, c-format
-msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr ""
-
-#: src/xgettext.c:952
-#, c-format
-msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr ""
-
-#: src/xgettext.c:954
-#, c-format
-msgid "      --qt                    recognize Qt format strings\n"
-msgstr ""
-
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
-#, c-format
-msgid "                                (only language C++)\n"
-msgstr ""
-
-#: src/xgettext.c:958
-#, c-format
-msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr ""
-
-#: src/xgettext.c:962
-#, c-format
-msgid "      --boost                 recognize Boost format strings\n"
-msgstr ""
-
-#: src/xgettext.c:966
-#, c-format
-msgid ""
-"      --debug                 more detailed formatstring recognition result\n"
-msgstr ""
-
-#: src/xgettext.c:991
-#, c-format
-msgid "      --properties-output     write out a Java .properties file\n"
-msgstr ""
-
-#: src/xgettext.c:1006
-#, c-format
-msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr ""
-
-#: src/xgettext.c:1008
-#, c-format
-msgid ""
-"      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr ""
-
-#: src/xgettext.c:1010
-#, c-format
-msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr ""
-
-#: src/xgettext.c:1012
-#, c-format
-msgid "      --package-version=VERSION  set package version in output\n"
-msgstr ""
-
-#: src/xgettext.c:1014
-#, c-format
-msgid ""
-"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr ""
-
-#: src/xgettext.c:1016
-#, c-format
-msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
-"msgstr\n"
-"                                values\n"
-msgstr ""
-
-#: src/xgettext.c:1019
-#, c-format
-msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
-"msgstr\n"
-"                                values\n"
-msgstr ""
-
-#: src/xgettext.c:1840
-#, 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:1965
-msgid "standard input"
-msgstr "standardn� vstup"
-
-#: src/xgettext.c:2071
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2075
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr ""
-
-#: src/xgettext.c:2080
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
-#, fuzzy, c-format
-msgid "%s%s: warning: "
-msgstr "%s: upozorn�n�: "
-
-#: 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 ""
-
-#: src/xgettext.c:2190
-#, c-format
-msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: "
-"%s\n"
-msgstr ""
-
-#: src/xgettext.c:2221
+#: src/xgettext.c:484
 #, 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 "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:2283
+# src/xgettext.c:537
+#: src/xgettext.c:520
+#, c-format, no-wrap
 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 ""
+"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:2979
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr ""
+# src/xgettext.c:555
+#: src/xgettext.c:540
+#, 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:3006
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr ""
+# src/xgettext.c:569
+#: src/xgettext.c:552
+#, 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/xgettext.c:3031
+# src/xget-lex.c:914
+#: src/xgettext.c:914
 #, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr ""
+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"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:924
 #, c-format
-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"
+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"
 
 # src/xgettext.c:1342
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:1420
+#, c-format
+msgid "language `%s' unknown"
 msgstr "jazyk `%s' nen� zn�m"
-
-#: libgettextpo/gettext-po.c:84
-msgid "<unnamed>"
-msgstr ""
-
-# lib/getopt.c:733
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: nezn�m� p�ep�na� -- %c\n"
-
-# src/gettextp.c:134 src/msgcmp.c:144 src/msgfmt.c:257 src/msgmerge.c:251
-# src/msgunfmt.c:175 src/xgettext.c:394
-#~ msgid ""
-#~ "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
-#~ 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
-#~ 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
-#~ 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
-#~ 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
-#~ 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"
-
-#~ 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
-#~ 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
-#~ msgid "field `%s' still has initial default value"
-#~ msgstr "polo�ka `%s' m� st�le po��te�n� implicitn� hodnotu"
-
-# src/msgmerge.c:303
-#~ 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
-#~ 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
-#~ 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
-#~ msgid "seek \"%s\" offset %ld failed"
-#~ msgstr "posun v souboru \"%s\" na pozici %ld selhal"
-
-# src/gettextp.c:233
-#~ 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
-#~ 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"
-
-#~ msgid "%s\n"
-#~ msgstr "%s\n"
-
-# src/xgettext.c:537
-#~ 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
-#~ 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
-#~ 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
-#~ 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 "%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 eacbdfbf9..398202900 100644
--- a/gettext-tools/po/da.po
+++ b/gettext-tools/po/da.po
@@ -9,11 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2011-01-10 23:48+0100\n"
 "Last-Translator: Keld Simonsen <keld@keldix.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -30,25 +29,26 @@ msgid "ambiguous argument %s for %s"
 msgstr "flertydigt argument %s for %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Gyldige argumenter er:"
 
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "kan ikke finde et midlertidigt katalog, pr�v at s�tte $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "kan ikke oprette et midlertidigt katalog ved brug af skabelon '%s'"
 
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "kan ikke fjerne midlertidig fil %s"
 
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "kan ikke fjerne midlertidigt katalog %s"
@@ -57,34 +57,33 @@ msgstr "kan ikke fjerne midlertidigt katalog %s"
 msgid "write error"
 msgstr "skrivefejl"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:194
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
 msgstr "fejl ved l�se-�bning af '%s'"
 
-#: gnulib-lib/copy-file.c:198
-#, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+#: gnulib-lib/copy-file.c:74
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "Kan ikke �bne sikkerhedskopi-fil '%s' for skrivning"
 
-#: gnulib-lib/copy-file.c:202
-#, fuzzy, c-format
-msgid "error reading %s"
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
+#, c-format
+msgid "error reading \"%s\""
 msgstr "fejl ved l�sning af '%s'"
 
-#: gnulib-lib/copy-file.c:206
-#, fuzzy, c-format
-msgid "error writing %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\""
 msgstr "fejl ved skrivning til filen '%s'"
 
-#: gnulib-lib/copy-file.c:210
-#, fuzzy, c-format
-msgid "error after reading %s"
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
+#, c-format
+msgid "error after reading \"%s\""
 msgstr "fejl efter l�sning af '%s'"
 
 #: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
@@ -105,69 +104,69 @@ msgstr "C#-overs�tter ikke fundet, fors�g at installere pnet"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# virtuel maskine ikke fundet, fors�g at installere pnet"
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Ukendt systemfejl"
 
-#: 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:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s-underproces mislykkedes"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: tilvalget '%s' kan betyde flere ting\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: tilvalget '--%s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: tilvalget '%c%s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: tilvalget '--%s' kr�ver et argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ukendt tilvalg '--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ukendt tilvalg '%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldigt tilvalg -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: tilvalget kr�ver et argument -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: tilvalget '-W %s' er flertydigt\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: tilvalget '-W %s' tillader ikke et argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: tilvalget '-W %s' kr�ver et argument\n"
@@ -183,15 +182,15 @@ msgstr "ugyldigt source_version argument til compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "ugyldigt target_version argument til compile_java_clas"
 
-#: 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:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "kunne ikke oprette '%s'"
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c: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
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fejl ved skrivning til filen '%s'"
@@ -204,8 +203,7 @@ 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:905 src/msginit.c:980
 #: src/msginit.c:1140
@@ -213,90 +211,52 @@ msgstr ""
 msgid "%s subprocess I/O error"
 msgstr "I/O-fejl i %s-underproces"
 
-#: 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: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
 #, c-format
 msgid "memory exhausted"
 msgstr "ikke mere ledig hukommelse"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, fuzzy, c-format
-msgid "creation of threads failed"
-msgstr "overs�ttelse af C#-klasse mislykkedes"
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, 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:417
-#, fuzzy, c-format
-msgid "read from %s subprocess failed"
-msgstr "skrivning til %s-underproces mislykkedes"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, fuzzy, c-format
-msgid "communication with %s subprocess failed"
-msgstr "skrivning til %s-underproces mislykkedes"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, fuzzy, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s-underproces fejlede med slutstatus %d"
+msgid "cannot create pipe"
+msgstr "kan ikke oprette datakanal"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "'"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-msgid "setting permissions for %s"
-msgstr ""
-
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "kan ikke oprette datakanal"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle mislykkedes"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "kan ikke genskabe filnummer %d: dup2 mislykkedes"
@@ -312,43 +272,31 @@ msgstr "%s underproces"
 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:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "fejl ved l�se-�bning af '%s'"
-
-#: src/format.c:151
+#: src/format.c:148
 #, 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"
+msgstr "'%s' er ikke en gyldig %s-formatstreng, til forskel fra '%s'. �rsag: %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-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%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-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "formateringsdirektiv for argument %u findes ikke i '%s'"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-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-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "formatangivelser i '%s' og '%s' for argument %u er ikke ens"
@@ -358,30 +306,22 @@ 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.c:36
+#: src/format-c.c:181
 #, 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
+#: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr "I direktiv nummer %u f�lges symbolet efter '<' ikke af '>'."
 
-#: src/format-c.c:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, 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:901 src/format-csharp.c:206 src/format-python.c:515
 #, 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"
@@ -397,17 +337,13 @@ 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 '}'."
+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
 #, 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
 #, c-format
@@ -415,9 +351,7 @@ 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 "
-"'{'."
+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
@@ -437,18 +371,13 @@ 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
@@ -470,66 +399,38 @@ msgstr "'%s' bruger %%m men '%s' g�r ikke det"
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'%s' bruger ikke %%m men '%s' bruger %%m"
 
-#: src/format-gfc-internal.c:383
-#, fuzzy, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "'%s' bruger %%m men '%s' g�r ikke det"
-
-#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "'%s' bruger ikke %%m men '%s' bruger %%m"
-
 #: src/format-invalid.h:22
 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
@@ -538,9 +439,7 @@ 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
@@ -550,18 +449,13 @@ 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
@@ -570,19 +464,13 @@ 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
@@ -591,34 +479,21 @@ 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."
+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:2372 src/format-scheme.c:2398
 #, 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, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -648,11 +523,8 @@ msgstr "I direktiv nummer %u angives b�de modificererne @ og :."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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
 #, c-format
@@ -675,27 +547,17 @@ 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'."
+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.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."
+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
@@ -704,85 +566,40 @@ 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"
+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"
+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'"
+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"
+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-python-brace.c:137
-#, fuzzy, c-format
-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
-#, fuzzy, c-format
-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
-#, fuzzy, c-format
-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
-#, fuzzy, c-format
-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
-#, fuzzy, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "I direktiv nummer %u er argument %d negativt."
-
 #: 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."
@@ -790,24 +607,19 @@ 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."
+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: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
+#: 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"
@@ -820,19 +632,19 @@ msgstr ""
 "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: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
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet af %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c: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/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
@@ -842,13 +654,13 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "For mange argumenter"
 
-#: 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
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Pr�v '%s --help' for yderligere oplysninger.\n"
 
 #: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
@@ -874,8 +686,7 @@ msgstr "  -s, --short                 kort v�rtsnavn\n"
 #: src/hostname.c:222
 #, 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"
@@ -886,29 +697,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresser for v�rtsnavnet\n"
 
-#: 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:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativt uddata:\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
+#: 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                  vis denne hj�lp og afslut\n"
 
-#: 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
+#: 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               vis versionsinformation og afslut\n"
@@ -917,11 +728,11 @@ msgstr "  -V, --version               vis versionsinformation og afslut\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapport�r fejl p� engelsk til <bug-gnu-gettext@gnu.org>.\n"
 
@@ -930,27 +741,30 @@ msgstr "Rapport�r fejl p� engelsk til <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "kunne ikke hente v�rtsnavn"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "H�jst �n inddatalinje tilladt"
 
-#: src/msgattrib.c: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:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s udelukker hinanden"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Brug: %s [TILVALG] [INDDATAFIL]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -959,64 +773,61 @@ 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:372 src/msgmerge.c:502 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
+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:375 src/msgmerge.c:505
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Placering for indfil:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INFIL                       PO-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:511 src/msguniq.c:349
-#: src/xgettext.c:875
+#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
-msgid ""
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+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/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "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:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "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:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FIL       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:527
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1025,266 +836,213 @@ 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:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Meddelelsevalg:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, 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
+#: src/msgattrib.c:440
 #, 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
+#: src/msgattrib.c:442
 #, 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
+#: src/msgattrib.c:444
 #, 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
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           fjern for�ldede #~ meddelelser\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         behold for�ldede #~ meddelelsen\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Attributmanipulation:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             mark�r alle meddelelser som 'fuzzy'\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, 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
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          mark�r alle meddelelser som for�ldede\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr ""
-"      --clear-obsolete        fjern for�ldelsesmarkering fra alle "
-"meddelelser\n"
-
-#: src/msgattrib.c:475
-#, fuzzy, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              behold tidligere 'msgid' for oversatte "
-"meddelelser\n"
+msgstr "      --clear-obsolete        fjern for�ldelsesmarkering fra alle meddelelser\n"
 
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, 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 ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --no-fuzzy              fjern meddelelser markerede som 'fuzzy'\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, 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
+#: src/msgattrib.c:465
 #, c-format
-msgid ""
-"      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
-msgstr ""
-"      --ignore-file=FIL.po    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
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 samme som --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, 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:391 src/msgmerge.c:560
-#: src/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "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:393 src/msguniq.c:371
+#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
-msgid ""
-"  -P, --properties-input      input file is in Java .properties syntax\n"
+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:395 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
-msgid ""
-"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
-"syntax\n"
-msgstr ""
-"      --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:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Resultatdetaljer:\n"
 
-#: src/msgattrib.c: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:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
 "      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
+"                              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:408
-#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr "      --style=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:578 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
-msgid ""
-"  -e, --no-escape             do not use C escapes in output (default)\n"
+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:580 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
-msgid ""
-"  -E, --escape                use C escapes in output, no extended chars\n"
+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:582
-#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
+#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              skriv PO-fil 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:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                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:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr ""
-"      --no-location           skriv 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:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
-msgid ""
-"  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr ""
-"  -n, --add-location          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:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
-msgid ""
-"      --strict                write out strict Uniforum conforming .po file\n"
+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:410
-#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     skriv en 'Java .properties'-fil\n"
 
-#: src/msgattrib.c: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:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
-msgid ""
-"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr ""
-"      --stringtable-output    skriv en NeXTstep/GNUstep '.strings'-fil\n"
+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:414
-#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ANTAL           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:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1293,32 +1051,32 @@ 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:601 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           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:603 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          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:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Brug: %s [TILVALG] [INDDATAFIL]...\n"
 
-#: src/msgcat.c:372
-#, fuzzy, c-format, no-wrap
+#: src/msgcat.c:371
+#, 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"
@@ -1326,9 +1084,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, 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"
+"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 ""
 "Sammenl�gger og fletter de angivne PO-filer.\n"
 "Find beskeder som er f�lles for to eller flere af de angivne PO-filer.\n"
@@ -1339,23 +1097,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:832
 #, 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:834
 #, 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:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, 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"
@@ -1364,7 +1122,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"
@@ -1373,7 +1131,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"
@@ -1382,30 +1140,26 @@ 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:562
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
-msgid ""
-"  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr ""
-"  -P, --properties-input      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:564
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
-msgstr ""
-"      --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:332 src/msguniq.c:377
 #, 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:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1414,28 +1168,27 @@ 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:570
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
-msgid ""
-"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+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:359
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "ingen filer angivet som inddata"
 
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "der kr�ves netop to inddatafiler"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Brug: %s [TILVALG] gammel.po ny.pot\n"
@@ -1469,19 +1222,17 @@ msgstr "  def.po                      overs�ttelser\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     referencer til kildetekst\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Bearbejdningsvarianter:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
-msgid ""
-"  -m, --multi-domain          apply ref.pot to each of the domains in def."
-"po\n"
+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:555
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     brug ikke upr�cis sammenligning\n"
@@ -1506,17 +1257,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:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "denne tekst bruges, men er ikke erkl�ret..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...men denne tekst ligner"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "denne tekst er brugt, men ikke erkl�ret i %s"
@@ -1526,27 +1277,27 @@ 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:1437
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "fandt %d fatal fejl"
 msgstr[1] "fandt %d fatale fejl"
 
-#: src/msgcomm.c: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
-#, 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 extracted comments will be preserved, but only from the first\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 ""
@@ -1558,7 +1309,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"
@@ -1567,70 +1318,65 @@ msgstr ""
 "  ->, --more-than=ANTAL       skriv meddelelser med mere end ANTAL\n"
 "                              definitioner. Standardv�rdi: 1\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
-#, fuzzy, c-format
-msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\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           udskriv ikke hovedet med 'msgid \"\"'\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Konverterer et beskedskatalog til en anden tegnkodning.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Konverteringsm�l:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 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:584
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, 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:586
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr ""
-"      --no-location           skriv 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:588
-#, fuzzy, c-format
-msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr ""
-"      --add-location          bevar linjer med '#: filnavn:"
-"linje' (normaltilstand)\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          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:590
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                strikt Uniforum-format p� resultatet\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "ingen inddatafil angivet"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "der kr�ves pr�cist �n inddatafil"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Brug: %s [FLAG] INDFIL\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1642,7 +1388,7 @@ msgstr ""
 "engelske PO-fil eller en PO-skabelonsfil (normalt lavet med xgettext).\n"
 "Uoversatte poster gives en overs�ttelse som er identisk med msgid.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INFIL                       PO- eller POT-indfil\n"
@@ -1682,7 +1428,7 @@ 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 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INFIL           PO-indfil\n"
@@ -1692,27 +1438,32 @@ msgstr "  -i, --input=INFIL           PO-indfil\n"
 msgid "write to stdout failed"
 msgstr "skrivning til standard ud mislykkedes"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "skrivning til %s-underproces mislykkedes"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "filternavn mangler"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "mindst et sed-skript skal angives"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Brug: %s [FLAG] FILTER [FILTERFLAG]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Udf�rer et filter p� alle overs�ttelser i et beskedskatalog.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1721,155 +1472,122 @@ 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:421
 #, 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:423
 #, 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:425
 #, 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:428
 #, 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:446 src/msggrep.c:595
 #, 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:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                lav indrykningsst�l i resultatet\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, 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/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argumentet til %s b�r v�re et enkelt skilletegn"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, 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:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, fuzzy, c-format
-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:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s kr�ver at '-d katalog' angives"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s kr�ver en '-l lokale'-angivelse"
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s kr�ver en '-l lokale'-angivelse"
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s kr�ver en '-l lokale'-angivelse"
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-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:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s er kun gyldig med %s eller %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s er kun gyldig med %s, %s eller %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:616
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d oversat tekst"
 msgstr[1] "%d oversatte tekster"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d uafklaret overs�ttelse"
 msgstr[1] ", %d uafklarede overs�ttelser"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d uoversat tekst"
 msgstr[1] ", %d uoversatte tekster"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Brug: %s [FLAG] filnavn.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
-msgstr ""
-"Gener�r bin�rt tekstkatalog fra overs�ttelsebeskrivelse i kildetekst.\n"
+msgstr "Gener�r bin�rt tekstkatalog fra overs�ttelsebeskrivelse i kildetekst.\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: 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"
@@ -1879,116 +1597,81 @@ msgstr ""
 "korte tilvalg.\n"
 "Tilvarende g�lder for valgfri argumenter.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filnavn.po ...              indfiler\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "K�rselstilstand:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, 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:677
 #, 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:679
 #, 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:681
 #, 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:683
 #, 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:685
 #, 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
-#, fuzzy, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --qt                    Qt-tilstand: gener�r en Qt .qm-fil\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, 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:694 src/xgettext.c:849
 #, 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:697
 #, 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:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESSOURCE    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:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
-msgid ""
-"  -l, --locale=LOCALE         locale name, either language or "
-"language_COUNTRY\n"
-msgstr ""
-"  -l, --locale=LOCALE         localenavn, enten sprog eller sprog_LAND\n"
-
-#: src/msgfmt.c:829
-#, fuzzy, c-format
-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 "  -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:831
+#: src/msgfmt.c:703
 #, 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:705
 #, 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,20 +1679,17 @@ msgstr ""
 "adskilt med en understreg. Flaget -d er obligatorisk. Klassen skrives\n"
 "i det opgivne katalog.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:711
 #, 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:717 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:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2018,18 +1698,17 @@ 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:723
 #, 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:727 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:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2038,221 +1717,147 @@ msgstr ""
 "Flagene -l og -d er obligatoriske. .msg filen bliver skrevet i det\n"
 "angivne katalog.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-"  -d KATALOG                  startkatalog for .msg-meddelelsekataloger\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-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
-#, 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:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Tolkning af indfil:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, 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:746
 #, 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:748
 #, 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:750
 #, 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:753
 #, 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:755
 #, 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:758
 #, 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:763
 #, 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:765
 #, 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:913
-#, 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:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            udskriv statistik om overs�ttelserne\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 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:890
 #, 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:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "advarsel: tegns�tskonvertering vil ikke virke\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "advarsel: PO-filhoved er uafklaret\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "advarsel: �ldre versioner af msgfmt vil give en fejl for dette\n"
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "dom�net '%s' kan ikke bruges som filnavn"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "dom�net '%s' er ikke brugbart som filnavn. Vil bruge pr�fiks istedet"
 
-#: src/msgfmt.c:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:948
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "'domain %s'-kommando ignoreres"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:1008
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "tom 'msgstr'-kommando ignoreret"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:1009
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "'fuzzy' 'msgstr'-tekst ignoreret"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
-msgstr ""
-"%s: advarsel: kildetekstfilen indeholder uafklarede overs�ttelser (fuzzy)"
-
-#: src/msgfmt.c:1318
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
+msgstr "%s: advarsel: kildetekstfilen indeholder uafklarede overs�ttelser (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: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/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fejl ved l�sning af '%s'"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
-msgid ""
-"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
-"specified"
-msgstr ""
-"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
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2261,7 +1866,7 @@ msgstr ""
 "Udtr�kker alle beskeder i et beskedskatalog som matcher et vist\n"
 "m�nster eller h�rer til en given kildetekstfil.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2337,20 +1942,19 @@ msgstr ""
 "  -v, --invert-match          udskriv kun de beskeder som ikke matcher\n"
 "                              noget udv�lgelseskriterium.\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, 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"
 
-#: src/msggrep.c:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           sort�r resultatet\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          sort�r resultatet efter filposition\n"
@@ -2398,8 +2002,7 @@ msgstr "  -i, --input=INDFIL          POT-indfil\n"
 #: src/msginit.c:379
 #, 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"
@@ -2416,8 +2019,7 @@ 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:400
@@ -2427,8 +2029,7 @@ msgstr "  -l, --locale=LL_CC          s�t m�llocale\n"
 
 #: src/msginit.c:402
 #, 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:468
@@ -2461,10 +2062,8 @@ msgstr "%s-underproces fejlede med slutstatus %d"
 
 #: src/msginit.c:1118
 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"
@@ -2490,19 +2089,14 @@ 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"
+#, c-format
+msgid "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "indfilen '%s' mangler en indgang i hovedet med angivelse af tegns�t"
 
 #: src/msgl-cat.c:207
-#, fuzzy, c-format
-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"
+#, c-format
+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
 #, c-format
@@ -2510,8 +2104,8 @@ 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:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "advarsel: "
@@ -2528,8 +2122,7 @@ msgstr ""
 #: src/msgl-cat.c:449
 #, 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 ""
@@ -2548,8 +2141,7 @@ 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
@@ -2623,9 +2215,7 @@ 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"
+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
@@ -2633,107 +2223,108 @@ msgstr "flertalsudtryk kan give aritmetiske fejl, m�ske division med nul"
 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:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "tekstkatalog har overs�ttelser med flertalsform"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 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:378
 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:414
 msgid "invalid nplurals value"
 msgstr "ugyldig nplurals-v�rdi"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "ugyldigt flertalsudtryk"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "men nogen tekster har kun �n flertalsform"
 msgstr[1] "men nogen tekster har kun %lu flertalsformer"
 
-#: src/msgl-check.c:490
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "men 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:508
+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
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "'msgid' og 'msgid_plural'-teksterne begynder ikke begge med '\\n'"
 
-#: src/msgl-check.c:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:610
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' og `msgstr[%u]'-teksterne begynder ikke begge med '\\n'"
 
-#: src/msgl-check.c:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "'msgid' og 'msgstr' teksterne begynder ikke begge med '\\n'"
 
-#: src/msgl-check.c:652
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:643
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "'msgid' og 'msgid_plural'-teksterne slutter ikke begge med '\\n'"
 
-#: src/msgl-check.c:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:651
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "'msgid' og 'msgstr[%u]'-teksterne slutter ikke begge med '\\n'"
 
-#: src/msgl-check.c:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "'msgid' og 'msgstr' teksterne slutter ikke begge med '\\n'"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "flertalsbehandling er en GNU gettext-udvidelse"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr mangler m�rket '%c' for tastaturgenvej"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr har for mange m�rker '%c' for tastaturgenveje"
 
-#: src/msgl-check.c:804
-#, fuzzy, c-format
-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:820
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
+#: src/msgl-check.c:776
+#, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "feltet '%s' mangler i hovedet\n"
 
+#: src/msgl-check.c:784
+#, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "feltet '%s' i hovedet b�r starte ved linjens begyndelse\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr "nogle felter i hovedet har stadig den oprindelige standardv�rdi\n"
+
+#: src/msgl-check.c:826
+#, c-format
+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-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
@@ -2742,52 +2333,39 @@ 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
 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:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
-msgid ""
-"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
-"not support this conversion."
-msgstr ""
-"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
 #, 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:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
-msgid ""
-"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
-"built without iconv()."
-msgstr ""
-"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:392 src/msgmerge.c:398
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s er kun gyldig med %s"
 
-#: src/msgmerge.c:453
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "sikkerhedskopitype"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2811,19 +2389,17 @@ msgstr ""
 "overensstemmelse, vil 'l�s s�gning' (fuzzy matching) blive brugt til at give\n"
 "bedre resultater.\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:502
 #, 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:509
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     referencer til ny kildetekst\n"
 
-#: src/msgmerge.c:513
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2832,41 +2408,39 @@ msgstr ""
 "  -C, --compendium=FIL        yderligere kataloger med overs�ttelser,\n"
 "                              kan angives flere gange\n"
 
-#: src/msgmerge.c:519
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 "  -U, --update                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:531
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Placering af udfil i opdateringstilstand:\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Resultatet skrives tilbage til def.po.\n"
 
-#: src/msgmerge.c:535
+#: src/msgmerge.c:530
 #, 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:537
+#: src/msgmerge.c:532
 #, 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:539
+#: src/msgmerge.c:534
 #, 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"
@@ -2877,55 +2451,45 @@ 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:546
-#, fuzzy, c-format
+#: src/msgmerge.c:541
+#, 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 ""
-"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:557
+#: src/msgmerge.c:552
 #, 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:614 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       vis ikke forl�bsindikatorer\n"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "denne tekst burde definere flertalsformer"
 
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "denne tekst burde ikke definere flertalsformer"
 
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2030
 #, c-format
-msgid ""
-"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
-"obsolete %ld.\n"
-msgstr ""
-"%sL�ste %ld gamle + %ld reference, flettede %ld, uafklarede %ld, mangler "
-"%ld, for�ldede %ld.\n"
+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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
 #, c-format
 msgid " done.\n"
 msgstr " afsluttet.\n"
@@ -2947,35 +2511,23 @@ 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
@@ -2990,8 +2542,7 @@ 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"
@@ -3035,7 +2586,7 @@ msgstr "  -i, --indent                lav indrykningsst�l i resultatet\n"
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                strikt Uniforum-format p� resultatet\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3057,18 +2608,15 @@ msgstr ""
 "overs�ttelse. Filpositioner samles sammen.\n"
 "N�r flaget --unique angives fjernes alle gentagede.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              skriv kun gentagede beskeder\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, 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
@@ -3084,7 +2632,7 @@ msgstr ""
 "Tegns�t '%s' er ikke et flytbart kodningsnavn.\n"
 "Tekstkonvertering til brugers tegns�t virker muligvis ikke.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3093,7 +2641,7 @@ msgstr ""
 "Tegns�t '%s' er ikke underst�ttet. %s bygger p� iconv(),\n"
 "og iconv() underst�tter ikke '%s'.\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3101,15 +2649,15 @@ msgstr ""
 "Installering af GNU libiconv og geninstallering af GNU gettext\n"
 "vil l�se dette problem.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Forts�tter alligevel, forvent fortolkningsfejl."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Forts�tter alligevel."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3118,7 +2666,7 @@ msgstr ""
 "Tegns�t '%s' er ikke underst�ttet. %s bygger p� iconv(),\n"
 "Denne version er bygget uden iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3131,27 +2679,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "inkonsistent brug af #~"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:240
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "'msgstr[]'-afsnit mangler"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:249
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "'msgstr_plural'-afsnit mangler"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "'msgstr'-afsnit mangler"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, 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:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "flertalsform har forkert indeks"
@@ -3161,7 +2709,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:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "Ugyldig multibytesekvens"
@@ -3205,16 +2753,16 @@ msgstr "tekststreng var ikke afsluttet ved linjeskift"
 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:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne fil m� ikke indeholde 'domain'-kommandoer"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "tekst erkl�ret mere end en gang"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "dette er placeringen af den f�rste erkl�ring"
 
@@ -3289,12 +2837,12 @@ 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:338
 #, 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:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "fejl ved konvertering fra '%s' indkodning til '%s' indkodning"
@@ -3318,79 +2866,48 @@ 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
-#, c-format
-msgid "error reading \"%s\""
-msgstr "fejl ved l�sning af '%s'"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "fejl ved skrivning af standard-uddata"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "fejl efter l�sning af '%s'"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Henter %s..."
 
-#: src/urlget.c:308
+#: src/urlget.c:307
 #, c-format
 msgid " timed out.\n"
 msgstr " tiden udl�b.\n"
 
-#: src/urlget.c:445
+#: src/urlget.c:443
 #, 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."
+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."
+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."
+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."
+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."
+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
 #, c-format
@@ -3416,19 +2933,17 @@ msgstr "overs�ttelse af C?-klasse mislykkedes, pr�v gerne --verbose"
 msgid "compilation of C# class failed"
 msgstr "overs�ttelse af C#-klasse mislykkedes"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ikke et gyldigt Java-klassenavn: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr ""
-"overs�ttelse af Java-klasse mislykkedes, pr�v gerne --verbose eller s�t "
-"$JAVAC"
+msgstr "overs�ttelse af Java-klasse mislykkedes, pr�v gerne --verbose eller s�t $JAVAC"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, 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"
@@ -3438,13 +2953,12 @@ msgstr "overs�ttelse af Java-klasse mislykkedes, pr�v gerne at s�tte $JAVAC"
 msgid "error while opening \"%s\" for writing"
 msgstr "fejl opst�et ved skrive-�bning af '%s'"
 
-#: src/write-po.c:875
-#, fuzzy, c-format
-msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+#: src/write-po.c:802
+#, c-format
+msgid "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "overs�ttelige tekster m� ikke indeholde `\\%c'-escapesekvensen"
 
-#: src/write-po.c:1326 src/write-po.c:1450
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3457,7 +2971,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:1338 src/write-po.c:1462
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3480,8 +2994,7 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3536,7 +3049,7 @@ 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:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: advarsel: streng ikke afsluttet"
@@ -3546,22 +3059,17 @@ msgstr "%s:%d: advarsel: streng ikke afsluttet"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: advarsel: regul�rt udtryk ikke afsluttet"
 
-#: src/x-c.c:1051
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: advarsel: ugyldigt UCS-tegn"
-
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: advarsel:  tegnkonstant ikke afsluttet korrekt"
 
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr "Angiv venligst indkodning af kildetekst via --from-code."
 
@@ -3601,7 +3109,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-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv-fejl"
@@ -3615,7 +3123,7 @@ 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
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: advarsel: ugyldigt UCS-tegn"
@@ -3635,22 +3143,12 @@ msgstr "%s:%d: advarsel: ')' blev fundet hvor '}' forventedes"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: advarsel: '}' blev fundet hvor ')' forventedes"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: 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:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3664,71 +3162,6 @@ msgstr ""
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: advarsel: ensom surrogat U+%04X"
 
-#: src/x-javascript.c:230
-#, fuzzy
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "Angiv venligst indkodning af kildetekst via --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"
-msgstr ""
-"%s:%d: Ugyldig multibyte-sekvens.\n"
-"Angiv venligst korrekt indkodning af kildetekst via --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"
-msgstr ""
-"%s:%d: Lang ufuldst�ndug multibyte-sekvens.\n"
-"Angiv venligst korrekt indkodning af kildetekst via --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"
-msgstr ""
-"%s:%d: Ufuldst�ndug multibyte-sekvens ved slutning p� fil.\n"
-"Angiv venligst korrekt indkodning af kildetekst via --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"
-msgstr ""
-"%s:%d: Ufuldst�ndug multibyte-sekvens ved slutning p� linje.\n"
-"Angiv venligst korrekt indkodning af kildetekst via --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"
-msgstr ""
-"%s:%d: Ugyldig multibyte-sekvens.\n"
-"Angiv venligst indkodning af kildetekst via --from-code.\n"
-
-#: src/x-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: advarsel: ugyldigt UCS-tegn"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: advarsel: streng ikke afsluttet"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3764,7 +3197,7 @@ msgstr "%s:%d: ugyldig interpolation ('\\L') for 8bit-tegnet '%c'"
 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: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"
@@ -3772,7 +3205,7 @@ 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
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3783,7 +3216,7 @@ msgstr ""
 "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
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3794,7 +3227,7 @@ msgstr ""
 "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
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3805,7 +3238,7 @@ msgstr ""
 "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
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3816,7 +3249,7 @@ msgstr ""
 "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
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3827,7 +3260,7 @@ msgstr ""
 "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:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Ukendt kodning '%s'. Forts�tter med ASCII i stedet."
@@ -3849,102 +3282,75 @@ 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"
+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-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
-msgstr ""
-"--join-existing kan ikke benyttes n�r uddata sendes til standard-uddata"
+msgstr "--join-existing kan ikke benyttes n�r uddata sendes til standard-uddata"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext kan ikke arbejde uden nogen n�gleord at kigge efter"
 
-#: src/xgettext.c:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr ""
-"advarsel: ukendt type for fil `%s' med endelse `%s'; C benyttes i stedet"
+#: src/xgettext.c:769
+#, c-format
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
+msgstr "advarsel: ukendt type for fil `%s' med endelse `%s'; C benyttes i stedet"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Udtr�k overs�ttelige strenge fra givne indfiler.\n"
 
-#: src/xgettext.c:882
+#: 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=NAVN  brug NAVN.po som udfil (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=NAVN  brug NAVN.po som udfil (i st.f. messages.po) \n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FIL            skriv resultatet til FIL\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, 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    udfiler placeres i kataloget KATALOG\n"
 
-#: src/xgettext.c:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Valg af sprog for indfil\n"
 
-#: src/xgettext.c:893
-#, fuzzy, c-format
+#: src/xgettext.c:854
+#, 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, Glade)\n"
 msgstr ""
 "  -L, --language=NAVN         genkend det angivne sprog\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:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   kort skrivem�de for --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, 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 "Som standard antages sproget ud fra endelsen p� inddatafilen.\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3953,244 +3359,203 @@ msgstr ""
 "      --from-code=NAVN        kodning af inddatafiler\n"
 "                                (undtagen for Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, 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:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr ""
-"  -j, --join-existing         sammenflet meddelelser med eksisterende fil\n"
+msgstr "  -j, --join-existing         sammenflet meddelelser med eksisterende fil\n"
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=FIL.po   linjer fra FIL tages ikke ud\n"
 
-#: src/xgettext.c:919
+#: src/xgettext.c:879
 #, 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 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"
+"  -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
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Sprogspecifikke valg:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           uddrag alle strenge\n"
 
-#: src/xgettext.c:929
-#, fuzzy, c-format
+#: src/xgettext.c:889 src/xgettext.c:896
+#, 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"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 "                                (kun sprogene 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:937
-#, fuzzy, c-format
+#: src/xgettext.c:893
+#, 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"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\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"
+"  -kORD, --keyword[=ORD]      s�g efter ORD som et ekstra n�gleord\n"
+"  -k, --keyword               brug ikke standardn�gleord\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, 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:FLAG      ekstra FLAG for strenge inde i argument\n"
 "                              nummer NR for n�gleord ORD\n"
 
-#: src/xgettext.c:945
-#, fuzzy, c-format
+#: src/xgettext.c:903
+#, 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"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 "                                (kun sprogene 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:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr ""
-"  -T, --trigraphs             behandl ISO C tretegnssekvenser i indfiler\n"
+msgstr "  -T, --trigraphs             behandl ISO C tretegnssekvenser i indfiler\n"
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (kun sprogene C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    genkend Qt-formatstrenge\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (kun sproget C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   genkend KDE 4-formatstrenge\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 genkend Boost-formatstrenge\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
-msgid ""
-"      --debug                 more detailed formatstring recognition result\n"
-msgstr ""
-"      --debug                 mere detaljeret genkendelse af formatstrenge\n"
+msgid "      --debug                 more detailed formatstring recognition result\n"
+msgstr "      --debug                 mere detaljeret genkendelse af formatstrenge\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     skriv en 'Java .properties'-fil\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, 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:1008
+#: src/xgettext.c:965
 #, 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          udelad FSF-copyrighttekst i resultatet\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:967
 #, 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:1012
+#: src/xgettext.c:969
 #, 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:1014
+#: src/xgettext.c:971
 #, 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 "      --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:1016
+#: src/xgettext.c:973
 #, 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[STRENG], --msgstr-prefix[=STRENG]  indled oversatte strenge med STRENG "
-"eller \"\"\n"
+msgstr "  -m[STRENG], --msgstr-prefix[=STRENG]  indled oversatte strenge med STRENG eller \"\"\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:976
 #, 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[STRENG], --msgstr-suffix[=STRENG]  afslut oversatte strenge med STRENG "
-"eller \"\"\n"
+msgstr "  -M[STRENG], --msgstr-suffix[=STRENG]  afslut oversatte strenge med STRENG eller \"\"\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1782
 #, 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 "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:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standard-inddata"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Ikke-ASCII-tegn ved %s%s."
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Ikke-ASCII-kommentar ved eller f�r %s%s."
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 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
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: advarsel: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
-msgid ""
-"Although being used in a format string position, the %s is not a valid %s "
-"format string. Reason: %s\n"
-msgstr ""
-"%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
+#: src/xgettext.c:2104
 #, 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
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4198,13 +3563,12 @@ msgid ""
 "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"
+"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
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4214,32 +3578,30 @@ msgstr ""
 "gettext(\"\") returnerer hovedet med metainformation,\n"
 "ikke den tomme streng.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "flertydig argumentangivelse for n�gleord '%.*s'"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "advarsel: kontekst mangles for n�gleordet '%.*s'"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr ""
-"advarsel: kontekst mangles for flertalsargumentet til n�gleordet '%.*s'"
+msgstr "advarsel: kontekst mangles for flertalsargumentet til n�gleordet '%.*s'"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "kontekst passer ikke mellem entals- og flertalsformen"
 
-#: src/xgettext.c:3419
-#, fuzzy
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\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 ""
@@ -4248,17 +3610,11 @@ msgstr ""
 "variablen MSGID_BUGS_ADDRESS d�r; ellers angiv\n"
 "tilvalget --msgid-bugs-address p� kommandolinjen.\n"
 
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3226
+#, c-format
+msgid "language `%s' unknown"
 msgstr "ukendt sprog '%s'"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<uden navn>"
-
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "feltet '%s' i hovedet b�r starte ved linjens begyndelse\n"
-
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr "nogle felter i hovedet har stadig den oprindelige standardv�rdi\n"
diff --git a/gettext-tools/po/de.po b/gettext-tools/po/de.po
index 2f418e8d3..70b88238f 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2014-05-10 13:37+0900\n"
 "PO-Revision-Date: 2014-05-10 18:01+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -278,8 +278,7 @@ msgstr "Fehler beim Schreiben von Datei »%s«"
 #: gnulib-lib/javacomp.c:2343
 #, 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
@@ -296,7 +295,7 @@ msgstr "Subprozess %s mit Ein-/Ausgabefehler"
 
 #: 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
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "Speicher aufgebraucht"
@@ -307,7 +306,7 @@ msgid "creation of threads failed"
 msgstr "Erstellung der Threads fehlgeschlagen"
 
 #: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "Schreiben zum Subprozess %s fehlgeschlagen"
@@ -382,8 +381,7 @@ msgstr "_open_osfhandle fehlgeschlagen"
 #: gnulib-lib/w32spawn.h:84
 #, 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
@@ -406,17 +404,14 @@ msgstr "Öffnen der Datei »%s« zum Lesen fehlgeschlagen"
 #: src/format.c:151
 #, 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"
+msgstr "im Gegensatz zu »%3$s« ist »%1$s« kein gültiges %2$s Format-Element. Der Grund ist: %4$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-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 "eine Formatspezifikation für Argument %u, wie in »%s«, fehlt in »%s«"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
@@ -435,8 +430,7 @@ msgstr "eine Formatspezifikation für Argument »%u« fehlt in »%s«"
 #: 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:449
 #, c-format
@@ -445,13 +439,8 @@ msgstr "Die %u. Formatanweisung beginnt mit |, aber endet nicht mit |."
 
 #: 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:39
 #, c-format
@@ -461,17 +450,14 @@ msgstr "In der %u. Formatanweisung folgt dem Wort nach »<« kein »>«."
 #: 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: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
 #, 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:88 src/format-java.c:205
 #, c-format
@@ -484,16 +470,12 @@ 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:130 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."
+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:139
 #, 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"
 "»}«."
@@ -501,22 +483,16 @@ msgstr ""
 #: src/format-csharp.c:140
 #, 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:161 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."
+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:162
 #, 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
@@ -526,26 +502,17 @@ 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
@@ -582,71 +549,43 @@ 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: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:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
@@ -655,20 +594,13 @@ msgstr "In der %u. Formatanweisung folgt dem »%s« kein Komma."
 
 #: 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: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:572
 #, c-format
@@ -677,17 +609,12 @@ msgstr "In der %u. Formatanweisung beinhaltet eine Auswahl keine Zahl."
 
 #: 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: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:756
@@ -697,35 +624,21 @@ msgstr "eine Formatspezifikation für Argument {%u} fehlt in »%s«"
 
 #: 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-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 ""
-"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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -756,23 +669,17 @@ msgstr "In der %u. Formatanweisung sind die beiden Modifier @ und : angegeben."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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:3326 src/format-scheme.c:3263
 #, 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:3432 src/format-scheme.c:3355
 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:3474 src/format-scheme.c:3397
 #, c-format
@@ -782,17 +689,12 @@ msgstr "die Formatspezifikationen in »%s« und »%s« sind nicht gleichbedeuten
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, 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«"
+msgstr "die Formatspezifikationen in »%s« sind keine Untermenge von denen in »%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 ""
-"In der %u. Formatanweisung ist die Größenspezifikation mit der "
-"Konvertierungsspezifikation »%c« nicht kompatibel."
+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-perl-brace.c:199 src/format-python.c:471
 #: src/format-python-brace.c:434 src/format-python-brace.c:447
@@ -802,140 +704,92 @@ 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: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."
+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 "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«."
+msgstr "Die Zeichenkette bezieht sich in nicht kompatibler Weise auf das bezeichnete Argument »%s«."
 
 # CHECKIT
 #: src/format-python.c:430
 #, 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 "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.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 ""
-"die Formatspezifikationen in »%s« erwarten ein Tupel, die in »%s« jedoch "
-"ein\n"
+"die Formatspezifikationen in »%s« erwarten ein Tupel, die in »%s« jedoch ein\n"
 "Mapping"
 
 #: 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 "eine Formatspezifikation für Argument »%s«, wie in »%s«, fehlt in »%s«"
 
 #: src/format-python.c:494
 #, 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 "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-python-brace.c:137
 #, 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."
+msgstr "In der %u. Formatanweisung darf »%c« nicht mit einem Feldnamen beginnen."
 
 #: src/format-python-brace.c:150
 #, 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."
+msgstr "In der %u. Formatanweisung darf »%c« nicht mit einem getattr-Argument beginnen."
 
 #: src/format-python-brace.c:165
 #, 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."
+msgstr "In der %u. Formatanweisung darf »%c« nicht mit einem getitem-Argument beginnen."
 
 #: src/format-python-brace.c:185
 #, 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 "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-brace.c:270
 #, 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."
+msgstr "In der %u. Formatanweisung gibt es eine nicht terminierte Formatanweisung."
 
 #: 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: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: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."
+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: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."
+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: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."
+msgstr "Die Zeichenkette bezieht sich auf eine Shell-Variable mit einem leeren Namen."
 
 #: 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 ""
-"In der %u. Formatanweisung ist das Zeichen »%c« keine Ziffer zwischen 1 und "
-"9."
+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."
 
 #: 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 ""
-"Das Zeichen, das die %u. Formatanweisung terminiert, ist keine Ziffer "
-"zwischen 1 und 9."
+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: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
@@ -1010,8 +864,7 @@ msgstr "  -s, --short           kurzer Rechnername\n"
 #: src/hostname.c:222
 #, 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"
@@ -1104,8 +957,7 @@ msgstr ""
 #: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 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"
@@ -1128,10 +980,8 @@ msgstr "  EINGABEDATEI                PO-Eingabedatei\n"
 #: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
 #: src/xgettext.c:875
 #, 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:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
 #: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
@@ -1154,8 +1004,7 @@ msgstr "Angaben zu Ausgabedateien:\n"
 #: src/msggrep.c:540 src/msgmerge.c:525 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: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
@@ -1165,8 +1014,7 @@ 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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
@@ -1176,17 +1024,13 @@ msgstr "Auswahl der Meldungen:\n"
 
 #: 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: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:456
 #, c-format
@@ -1221,9 +1065,7 @@ msgstr "      --set-fuzzy             alle Meldungen auf »fuzzy« setzen\n"
 #: 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:471
 #, c-format
@@ -1241,58 +1083,44 @@ 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: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: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: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: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: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: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: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
@@ -1305,8 +1133,7 @@ msgstr "Syntax der Eingabedatei:\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:393 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"
@@ -1314,9 +1141,7 @@ 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
 #, 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"
@@ -1336,30 +1161,24 @@ msgstr "Details zur Ausgabe:\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"
+"                              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: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
 #, 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: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
 #, 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"
@@ -1368,8 +1187,7 @@ msgstr ""
 #: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
 #: src/msguniq.c:391 src/xgettext.c:979
 #, 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"
@@ -1379,8 +1197,7 @@ msgstr ""
 #: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
 #: src/xgettext.c:983
@@ -1392,27 +1209,19 @@ msgstr "  -i, --indent                Ausgabe eingerückt darstellen\n"
 #: src/xgettext.c:985
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
 #: src/xgettext.c:987
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
 #: src/xgettext.c:989
 #, 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: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
@@ -1427,8 +1236,7 @@ msgstr ""
 #: 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
 #, 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"
@@ -1438,9 +1246,7 @@ msgstr ""
 #: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
 #, 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: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
@@ -1466,8 +1272,7 @@ msgstr "  -s, --sort-output           sortierte Ausgabe erstellen\n"
 #: src/xgettext.c:1002
 #, 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:322 src/msgcomm.c:327
 #, c-format
@@ -1511,8 +1316,7 @@ msgstr "  EINGABEDATEI...             Eingabedateien\n"
 #: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
 #: src/xgettext.c:877
@@ -1550,11 +1354,9 @@ msgstr ""
 #: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
 #: src/msgmerge.c:562
 #, 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:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
@@ -1564,8 +1366,7 @@ 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:428 src/msgconv.c:337 src/msguniq.c:378
@@ -1585,10 +1386,8 @@ msgstr ""
 
 #: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:359
@@ -1647,11 +1446,8 @@ msgstr "Optionen, die Verarbeitungen modifizieren:\n"
 
 #: src/msgcmp.c:241 src/msgmerge.c:553
 #, 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:243 src/msgmerge.c:555
 #, c-format
@@ -1698,7 +1494,7 @@ msgstr "diese Meldung kommt vor, ist aber in %s nicht definiert"
 msgid "warning: this message is not used"
 msgstr "Warnung: diese Meldung kommt nicht vor"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1743,11 +1539,8 @@ msgstr ""
 
 #: src/msgcomm.c:452 src/xgettext.c:1004
 #, 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:311
 #, c-format
@@ -1777,15 +1570,12 @@ msgstr "  -i, --indent                Ausgabe eingerückt darstellen\n"
 #: src/msgmerge.c:586
 #, 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:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
 #: src/msgmerge.c:588
 #, 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"
@@ -1794,9 +1584,7 @@ msgstr ""
 #: src/msgmerge.c:590
 #, 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:258 src/msgfmt.c:433 src/xgettext.c:661
 #, c-format
@@ -1895,9 +1683,7 @@ msgstr "Aufruf: %s [OPTION] FILTER [FILTER-OPTION]\n"
 #: src/msgfilter.c:411
 #, 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:435
 #, c-format
@@ -1906,8 +1692,7 @@ msgid ""
 "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:440
@@ -1917,16 +1702,13 @@ msgstr "Nützliche FILTER-OPTIONen, wenn »sed« der FILTER ist:\n"
 
 #: src/msgfilter.c:442
 #, 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:444
 #, 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"
@@ -1934,15 +1716,12 @@ msgstr ""
 
 #: src/msgfilter.c:447
 #, 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:465 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"
@@ -1954,11 +1733,8 @@ msgstr "      --indent                Ausgabe eingerückt darstellen\n"
 
 #: src/msgfilter.c:473
 #, 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/msgfmt.c:345
 #, c-format
@@ -1978,8 +1754,7 @@ msgstr "Ulrich Drepper"
 #: src/msgfmt.c:439
 #, 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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
@@ -2054,8 +1829,7 @@ msgstr "Aufruf: %s [OPTION] Datei.po ...\n"
 #: src/msgfmt.c:778
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
-msgstr ""
-"Binären Katalog mit Meldungen aus der textuellen Übersetzung erstellen.\n"
+msgstr "Binären Katalog mit Meldungen aus der textuellen Übersetzung erstellen.\n"
 
 #: src/msgfmt.c:783 src/xgettext.c:864
 #, c-format, no-wrap
@@ -2078,72 +1852,52 @@ msgstr "Art der Verarbeitung:\n"
 
 #: src/msgfmt.c:799
 #, 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:801
 #, 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:803
 #, 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:805
 #, 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:807
 #, 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:809
 #, 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:811
 #, 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:818
 #, 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:820 src/xgettext.c:888
 #, 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:823
 #, c-format
@@ -2158,47 +1912,33 @@ msgstr "  -r, --resource=RESSOURCE    Name der Ressource\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
 #, 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:829
 #, 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:831
 #, 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:833
 #, 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:839
@@ -2208,12 +1948,9 @@ msgstr "Angaben zu Ausgabedateien im C#-Modus:\n"
 
 #: src/msgfmt.c:845 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:847
@@ -2223,8 +1960,7 @@ msgid ""
 "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:851
@@ -2235,9 +1971,7 @@ msgstr "Angaben zu Ausgabedateien im Tcl-Modus:\n"
 #: src/msgfmt.c:855 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:857
 #, c-format
@@ -2256,9 +1990,7 @@ msgstr "Optionen für Desktopeintrag-Modus:\n"
 #: src/msgfmt.c:867
 #, 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:869
 #, c-format
@@ -2279,14 +2011,11 @@ msgstr ""
 #: src/msgfmt.c:874
 #, 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:886 src/xgettext.c:905
 #, c-format
@@ -2297,27 +2026,20 @@ msgstr "Überprüfung der Eingabedatei:\n"
 #, 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:891
 #, 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:893
 #, 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:895
 #, c-format
@@ -2325,25 +2047,20 @@ 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:898
 #, 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:900
 #, 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"
@@ -2353,14 +2070,11 @@ msgstr ""
 #: src/msgfmt.c:903
 #, 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:908
 #, 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"
@@ -2368,34 +2082,26 @@ msgstr ""
 #: src/msgfmt.c:910
 #, 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:913
 #, 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:922
 #, 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:924 src/msgmerge.c:612 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:1037
 #, c-format
@@ -2417,8 +2123,7 @@ msgstr "Warnung: Kopfteil der PO-Datei ist ungenau (fuzzy)\n"
 #: src/msgfmt.c:1052
 #, 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"
+msgstr "Warnung: ältere Versionen von »msgfmt« werden hierbei einen Fehler melden\n"
 
 #: src/msgfmt.c:1076
 #, c-format
@@ -2428,8 +2133,7 @@ msgstr "Bereichsname »%s« ist nicht als Dateiname geeignet"
 #: src/msgfmt.c:1081
 #, 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:1095
 #, c-format
@@ -2451,12 +2155,12 @@ msgstr "ungenauer »msgstr«-Eintrag wird ignoriert"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: Warnung: Quelldatei enthält ungenaue Übersetzungen"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1306
 #, c-format
 msgid "%s does not exist"
 msgstr "%s existiert nicht"
 
-#: src/msgfmt.c:1328
+#: src/msgfmt.c:1316
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s existiert, aber kann nicht gelesen werden"
@@ -2475,12 +2179,8 @@ msgstr "Fehler beim Lesen von »%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 ""
-"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:521
 #, c-format, no-wrap
@@ -2578,8 +2278,7 @@ 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                C-Escape-Sequenzen und keine erweiterten\n"
 "                               Zeichen in Ausgabe verwenden\n"
@@ -2592,8 +2291,7 @@ msgstr "      --sort-output           sortierte Ausgabe erstellen\n"
 #: 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:297
 msgid ""
@@ -2603,8 +2301,7 @@ msgid ""
 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:321
 #, c-format
@@ -2640,20 +2337,17 @@ msgstr "  -i, --input=EINGABEDATEI    POT-Eingabedatei\n"
 #: src/msginit.c:379
 #, 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:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
-msgstr ""
-"  -o, --output-file=DATEI      Ausgabe in die angegebene DATEI schreiben\n"
+msgstr "  -o, --output-file=DATEI      Ausgabe in die angegebene DATEI schreiben\n"
 
 #: src/msginit.c:387
 #, c-format
@@ -2663,8 +2357,7 @@ 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:400
 #, c-format
@@ -2673,10 +2366,8 @@ msgstr "  -l, --locale=LL_CC          Lokale für die Ausgabe setzen\n"
 
 #: src/msginit.c:402
 #, c-format
-msgid ""
-"      --no-translator         assume the PO file is automatically generated\n"
-msgstr ""
-"      --no-translator         automatische Erstellung der PO-Datei annehmen\n"
+msgid "      --no-translator         assume the PO file is automatically generated\n"
+msgstr "      --no-translator         automatische Erstellung der PO-Datei annehmen\n"
 
 #: src/msginit.c:468
 msgid ""
@@ -2708,16 +2399,12 @@ msgstr "Subprozess %s mit dem Exit-Code %d fehlgeschlagen"
 
 #: src/msginit.c:1118
 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.
@@ -2740,16 +2427,12 @@ msgstr "zwei unterschiedliche Zeichensätze »%s« und »%s« in Eingabedatei"
 
 #: 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: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"
@@ -2778,15 +2461,13 @@ msgstr ""
 #: src/msgl-cat.c:449
 #, 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:488
@@ -2874,12 +2555,9 @@ msgid "plural expression can produce integer overflow"
 msgstr "Pluralausdruck kann einen Ganzzahl-Überlauf ergeben"
 
 #: src/msgl-check.c:197
-msgid ""
-"plural expression can produce arithmetic exceptions, possibly division by "
-"zero"
+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:266
@@ -2927,9 +2605,7 @@ msgstr[0] "aber einige Meldungen haben eine Pluralform"
 msgstr[1] "aber einige Meldungen haben %lu Pluralformen"
 
 #: src/msgl-check.c:514
-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 mit Meldungen weist Übersetzungen mit Pluralformen auf, aber dem\n"
 "Kopfeintrag fehlt die Zeile:\n"
@@ -2970,20 +2646,17 @@ msgstr "Die Plural-Behandlung ist eine Erweiterung von GNU gettext"
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "bei »msgstr« fehlt die Markierung »%c« für den Tastatur-Schnellzugriff"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, 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:804
+#: src/msgl-check.c:801
 #, 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:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "Im Kopfeintrag fehlt das Feld »%s«\n"
@@ -3002,34 +2675,25 @@ msgstr ""
 
 #: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
-msgstr ""
-"bei der Eingabedatei fehlt der Kopfeintrag mit der Angabe des Zeichensatzes"
+msgstr "bei der Eingabedatei fehlt der Kopfeintrag mit der Angabe des Zeichensatzes"
 
 #: 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
 #, 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:335
 #, 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:341 src/recode-sr-latin.c:302 src/x-python.c:672
 #: src/xgettext.c:727
 #, 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."
@@ -3110,8 +2774,7 @@ msgstr "Das Ergebnis wird nach Def.po zurückgeschrieben.\n"
 #: src/msgmerge.c:535
 #, 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:537
 #, c-format
@@ -3123,30 +2786,26 @@ msgstr ""
 #: src/msgmerge.c:539
 #, 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:546
 #, 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"
@@ -3154,11 +2813,9 @@ msgstr ""
 
 #: src/msgmerge.c:557
 #, 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:614 src/urlget.c:192
@@ -3178,9 +2835,7 @@ msgstr "diese Meldung sollte keine Pluralformen definieren"
 
 #: src/msgmerge.c:2035
 #, 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"
@@ -3210,12 +2865,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 ""
-"  -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:442
@@ -3225,20 +2877,15 @@ msgstr "      --csharp                C#-Modus: Eingabe ist eine .dll-Datei\n"
 
 #: 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: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:451
 #, c-format
@@ -3253,14 +2900,11 @@ msgstr "Angaben zu Eingabedateien im Java-Modus:\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 ""
-"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:467
@@ -3300,9 +2944,7 @@ msgstr "  -i, --indent                Ausgabe eingerückt darstellen\n"
 #: 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:331
 #, c-format, no-wrap
@@ -3334,12 +2976,9 @@ msgstr "  -d, --repeated              nur doppelte Einträge ausgeben\n"
 
 #: 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:56 libgettextpo/gettext-po.c:102
@@ -3571,8 +3210,7 @@ msgstr "Eingabe ist in der Kodierung »%s« nicht gültig"
 #: src/recode-sr-latin.c:367
 #, 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:159
 #, c-format
@@ -3624,47 +3262,24 @@ msgid " failed.\n"
 msgstr " fehlgeschlagen.\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 ""
-"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."
+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:129
-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."
+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:162
-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."
+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: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 ""
-"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."
+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:202
-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."
+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:231 src/write-catalog.c:275
 #, c-format
@@ -3683,8 +3298,7 @@ msgstr "Fehler beim Anlegen des Verzeichnisses »%s«"
 #: src/write-csharp.c:766
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
-msgstr ""
-"Kompilierung der C#-Klasse ist fehlgeschlagen; bitte versuchen Sie --verbose"
+msgstr "Kompilierung der C#-Klasse ist fehlgeschlagen; bitte versuchen Sie --verbose"
 
 #: src/write-csharp.c:768
 #, c-format
@@ -3707,8 +3321,7 @@ msgstr ""
 #, 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:799 src/write-qt.c:736 src/write-tcl.c:212
@@ -3718,12 +3331,10 @@ msgstr "Fehler beim Öffnen von »%s« zum Schreiben"
 
 #: src/write-po.c:875
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1326 src/write-po.c:1455
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3737,7 +3348,7 @@ msgstr ""
 "ausweichen, der stattdessen nur aus ASCII-kodierten Zeichen besteht.\n"
 "%s\n"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1338 src/write-po.c:1467
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3746,8 +3357,7 @@ 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"
@@ -3762,13 +3372,11 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"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"
@@ -3779,12 +3387,9 @@ 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:94
 #, c-format
@@ -4019,8 +3624,7 @@ 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"
+msgstr "%s:%d: »%s« zum Terminieren der Zeichenkette ist vor EOF nicht vorhanden"
 
 #: src/x-perl.c:1043
 #, c-format
@@ -4057,10 +3661,8 @@ 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 ""
-"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"
+"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:324
 #, c-format
@@ -4070,10 +3672,8 @@ msgid ""
 "comment 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 in http://www.python.org/peps/pep-0263.html spezifiziert "
-"ist.\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:341
 #, c-format
@@ -4083,10 +3683,8 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\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"
+"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:354
 #, c-format
@@ -4096,10 +3694,8 @@ msgid ""
 "comment as specified in http://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"
+"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:364
 #, c-format
@@ -4109,10 +3705,8 @@ msgid ""
 "comment as specified in http://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"
+"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:397
 #, c-format
@@ -4122,10 +3716,8 @@ msgid ""
 "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"
+"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:722
 #, c-format
@@ -4149,12 +3741,8 @@ msgstr "%s:%d: ungültiger Ausdruck einer Zeichenkette"
 
 #: 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: Warnung: die Syntax $\"...\" ist aus Sicherheitsgründen als veraltet "
-"zu betrachten; verwenden Sie stattdessen use eval_gettext"
+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:413
 #, c-format
@@ -4164,9 +3752,7 @@ msgstr "%s:%d: Warnung: Literal des regulären Ausdrucks zu früh terminiert"
 #: src/xgettext.c:545
 #, 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"
+msgstr "»%s« ist kein gültiger Name für eine Zeichenkodierung. ASCII wird ersatzweise verwendet.\n"
 
 #: src/xgettext.c:648
 #, c-format
@@ -4178,41 +3764,32 @@ msgstr ""
 #: src/xgettext.c:653
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
-msgstr ""
-"ohne Angabe zu berücksichtigender Schlüsselwörter schlägt xgettext fehl"
+msgstr "ohne Angabe zu berücksichtigender Schlüsselwörter schlägt xgettext fehl"
 
 #: src/xgettext.c:808
 #, 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"
+msgstr "Warnung: Typ der Datei »%s« mit Suffix »%s« ist unbekannt; C wird versucht"
 
 #: src/xgettext.c:859
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
-msgstr ""
-"Aus den Eingabedateien die zu übersetzenden Meldungen herausschreiben.\n"
+msgstr "Aus den Eingabedateien die zu übersetzenden Meldungen herausschreiben.\n"
 
 #: 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=NAME   Ausgabe in NAME.po (anstatt in messages.po)\n"
+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:884
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr ""
-"  -o, --output=DATEI          Ausgabe in die angegebene DATEI schreiben\n"
+msgstr "  -o, --output=DATEI          Ausgabe in die angegebene DATEI schreiben\n"
 
 #: src/xgettext.c:886
 #, 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"
+msgid "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
+msgstr "  -p, --output-dir=VERZ       Ausgabedateien in Verzeichnis VERZ ablegen\n"
 
 #: src/xgettext.c:891
 #, c-format
@@ -4223,20 +3800,16 @@ msgstr "Wahl der Sprache für die Eingabedatei:\n"
 #, 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"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                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"
 
@@ -4247,12 +3820,9 @@ msgstr "  -C, --c++                   Abkürzung für --language=C++\n"
 
 #: src/xgettext.c:902
 #, 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:907
@@ -4272,29 +3842,24 @@ msgstr "Die Vorgabe ist, dass für Eingabedateien ASCII angenommen wird.\n"
 #: src/xgettext.c:915
 #, 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:917
 #, 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:919
 #, 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"
@@ -4314,8 +3879,7 @@ msgstr "  -a, --extract-all          alle Zeichenketten extrahieren\n"
 #, 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 ""
@@ -4329,35 +3893,29 @@ msgstr ""
 #, 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:942
 #, 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:945
 #, 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 ""
@@ -4403,8 +3961,7 @@ msgstr "      --boost                 Zeichenketten im Boost-Format erkennen\n"
 
 #: src/xgettext.c:966
 #, 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"
@@ -4412,19 +3969,16 @@ msgstr ""
 #: src/xgettext.c:991
 #, 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:1006
 #, 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:1008
 #, 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"
@@ -4441,43 +3995,33 @@ msgstr "      --package-version=VERSION  Paketversion in Ausgabe setzen\n"
 
 #: src/xgettext.c:1014
 #, 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:1016
 #, 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:1019
 #, 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:1840
 #, 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:1965
 msgid "standard input"
@@ -4505,21 +4049,13 @@ msgstr "%s%s: Warnung: "
 
 #: 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 ""
-"Obwohl es an der Position eines Formatelements verwendet wird, ist %s kein "
-"gültiges %s Formatelement. Der Grund: %s\n"
+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"
 
 #: src/xgettext.c:2190
 #, 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 "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"
 
 #: src/xgettext.c:2221
 #, c-format
@@ -4558,8 +4094,7 @@ msgstr "Warnung: fehlender Kontext für das Schlüsselwort »%.*s«"
 #: src/xgettext.c:3031
 #, 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«"
+msgstr "Warnung: fehlender Kontext für das Plural-Argument des Schlüsselwortes »%.*s«"
 
 #: src/xgettext.c:3052
 #, c-format
@@ -4591,9 +4126,7 @@ msgstr "<unbenannt>"
 #~ 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"
@@ -4614,5 +4147,4 @@ msgstr "<unbenannt>"
 #~ msgstr "%s:%lu: Warnung: nicht terminierte Zeichenkette"
 
 #~ msgid "%s:%d: fatal: plural message seen before singular message\n"
-#~ msgstr ""
-#~ "%s:%d: fatal Fehler: Die Plural-Meldung steht vor der Singular-Meldung\n"
+#~ msgstr "%s:%d: fatal Fehler: Die Plural-Meldung steht vor der Singular-Meldung\n"
diff --git a/gettext-tools/po/el.po b/gettext-tools/po/el.po
index 878899820..57015b557 100644
--- a/gettext-tools/po/el.po
+++ b/gettext-tools/po/el.po
@@ -6,11 +6,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.34\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 1998-05-17 13:12+0200\n"
 "Last-Translator: Simos KSenitellis <simos@teiath.gr>\n"
 "Language-Team: Greek <simos@teiath.gr>\n"
-"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,29 +26,30 @@ msgid "ambiguous argument %s for %s"
 msgstr ""
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr ""
 
 #
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:333
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "�������� ���������� ��� �������� \"%s\""
 
 #
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:347
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "�������� ���������� ��� �������� \"%s\""
 
 #
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "�������� ����������� ������� ������ \"%s\""
 
 #
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:458
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "�������� ���������� ��� �������� \"%s\""
@@ -58,50 +58,49 @@ msgstr "�������� ���������� ��� �������� \"%s\""
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
-#, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
 #
-#: gnulib-lib/copy-file.c:194
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
+#: 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
+#, c-format
+msgid "error while opening \"%s\" for reading"
 msgstr "������ ��� ������� ��� \"%s\" ��� ��������"
 
 #
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:73
 #, 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:202
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, fuzzy, c-format
-msgid "error reading %s"
+msgid "error reading \"%s\""
 msgstr "������ ���� �������� ��� \"%s\""
 
 #
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, fuzzy, c-format
-msgid "error writing %s"
+msgid "error writing \"%s\""
 msgstr "������ ���� ������� ��� ������� \"%s\""
 
 #
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, 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
+#: 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
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:571
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
@@ -112,84 +111,85 @@ msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 
 #
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:125
 msgid "Unknown system error"
 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: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
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
 #
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: � ������� `%s' ����� �����������\n"
 
 #
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c: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:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: � ������� `%c%s' ��� ��������� ���������\n"
 
 #
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c: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:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%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:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%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:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: �� �������� ������� -- %c\n"
+
+#
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr "%s: �� ������ ������� -- %c\n"
 
 #
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
+#: gnulib-lib/getopt.c: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: � ������� ������� ��������� -- %c\n"
 
 #
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c: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:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\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/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: � ������� `%s' ������� ���������\n"
-
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -201,21 +201,21 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c: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:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
 #
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c: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: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
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "������ ���� ������� ��� ������� \"%s\""
 
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -225,155 +225,107 @@ 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:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
 #
-#: 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: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
 #, fuzzy, c-format
 msgid "memory exhausted"
 msgstr "H ����� �����������"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
+#
+#: 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\""
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-acl.c:46
+#: gnulib-lib/w32spawn.h:47
 #, c-format
-msgid "setting permissions for %s"
+msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr ""
 
-#
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "�������� ����������� ������� ������ \"%s\""
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#
-#: gnulib-lib/w32spawn.h:84
-#, fuzzy, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "�������� ����������� ������� ������ \"%s\""
-
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, 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
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "������ ��� ������� ��� \"%s\" ��� ��������"
-
-#: src/format.c:151
+#: src/format.c:143
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 
 #
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
-#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#: 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
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "�� ������������� ��� �� ��������� %u ��� ����� �����"
 
 #
-#: 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-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
+#: 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
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 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-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: 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
 #, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' for argument %u are not the same"
+msgid ""
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "�� ������������� ��� �� ��������� %u ��� ����� �����"
 
 #: src/format-boost.c:449
@@ -381,29 +333,27 @@ msgstr "�� ������������� ��� �� ��������� %u ��� ����� �����"
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, 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
+#: src/format-c.c:588
 #, 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
+#: src/format-c.c:814
 #, 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: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:901 src/format-csharp.c:206 src/format-python.c:501
 #, fuzzy, c-format
-msgid "number of format specifications in '%s' and '%s' does not match"
+msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr ""
 "� ������� ��� �������� �� ������������� ��� `msgid' ��� `msgstr' �� ���������"
 
@@ -444,58 +394,48 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:255
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:292
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:334
+#: src/format-gcc-internal.c:332
 #, 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
+#: src/format-gcc-internal.c:396
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:406
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:463
+#: src/format-gcc-internal.c:459
 #, 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
+#: src/format-gcc-internal.c:671
 #, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
+msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gfc-internal.c:386
+#: src/format-gcc-internal.c:674
 #, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
+msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -588,20 +528,21 @@ msgstr ""
 #: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
 msgstr "�� ������������� ��� �� ��������� %u ��� ����� �����"
 
 #
-#: src/format-java.c:756
+#: src/format-java.c:755
 #, fuzzy, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "�� ������������� ��� �� ��������� %u ��� ����� �����"
 
 #
-#: src/format-java.c:776
+#: src/format-java.c:775
 #, fuzzy, c-format
 msgid ""
-"format specifications in '%s' and '%s' for argument {%u} are not the same"
+"format specifications in 'msgid' 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
@@ -615,11 +556,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most "
-"%u parameter."
+"In the directive number %u, too many parameters are given; expected at most %"
+"u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most "
-"%u parameters."
+"In the directive number %u, too many parameters are given; expected at most %"
+"u parameters."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -668,14 +609,14 @@ msgstr ""
 #
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' are not equivalent"
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr ""
 "� ������� ��� �������� �� ������������� ��� `msgid' ��� `msgstr' �� ���������"
 
 #
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in '%s'"
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "�� ������������� ��� �� ��������� %u ��� ����� �����"
 
 #: src/format-perl.c:433
@@ -686,85 +627,60 @@ msgid ""
 msgstr ""
 
 #
-#: 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.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.c:115
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:354
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
 #
-#: src/format-python.c:430
+#: src/format-python.c:419
 #, fuzzy, c-format
 msgid ""
-"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
 msgstr ""
 "� ������� ��� �������� �� ������������� ��� `msgid' ��� `msgstr' �� ���������"
 
 #
-#: src/format-python.c:437
+#: src/format-python.c:426
 #, fuzzy, c-format
 msgid ""
-"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+"mapping"
 msgstr ""
 "� ������� ��� �������� �� ������������� ��� `msgid' ��� `msgstr' �� ���������"
 
 #
-#: src/format-python.c:460 src/format-sh.c:297
+#: src/format-python.c:449 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
 msgstr "�� ������������� ��� �� ��������� %u ��� ����� �����"
 
 #
-#: src/format-python.c:494
+#: src/format-python.c:479
 #, fuzzy, c-format
 msgid ""
-"format specifications in '%s' and '%s' for argument '%s' are not the same"
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "�� ������������� ��� �� ��������� %u ��� ����� �����"
 
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr ""
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr ""
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr ""
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-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' 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
@@ -801,11 +717,11 @@ msgid ""
 "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
+#: 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"
@@ -815,40 +731,40 @@ msgid ""
 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
+#: 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: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: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
 msgid "Bruno Haible"
 msgstr ""
 
 #
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "���� ����� ��������"
 
 #
-#: 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
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: 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:362 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
@@ -881,29 +797,29 @@ msgstr ""
 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: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
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: 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
+#: 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"
 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
+#: 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"
 msgstr ""
@@ -913,11 +829,11 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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
+#: 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"
@@ -928,325 +844,297 @@ msgid "could not get host name"
 msgstr ""
 
 #
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: 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
 #, fuzzy, 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: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: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
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "�� %s ��� %s ����� �������� ������������"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:400
 #, 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: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/msguniq.c:342
+#: 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
 #, c-format
 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: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
 msgid "Input file location:\n"
 msgstr "��� ������ ������ �������"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 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: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
 #, 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:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: 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
 #, 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: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
 #, 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: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
 #, 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/msgunfmt.c:493 src/msguniq.c:358
+#: 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
 #, 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:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:447
 #, 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
+#: src/msgattrib.c:449
 #, 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
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:457
 #, c-format
 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/msguniq.c:369
+#: 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
 #, 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: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
 #, 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:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: 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
 #, c-format
 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: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
 #, 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
-#, 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: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
-#, 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: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
 #, c-format
 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: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
 #, c-format
 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: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
 #, 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:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, 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:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, 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:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 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:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 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: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
 #, 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: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
 #, c-format
 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: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
 #, 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: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
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1264,33 +1152,33 @@ msgstr ""
 "  -S, --strict             ����� ������ �� ������� Uniforum\n"
 "  -V, --version            �������� ����������� ������� ��� ������\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:601 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: 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
 #, 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: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
 #, 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:313 src/msgcomm.c:314
 #, 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:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
 #
-#: src/msgcat.c:372
+#: src/msgcat.c:359
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1299,9 +1187,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, 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"
+"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                  �������� ����������� ������� ������������\n"
 "                                   ��� ������\n"
@@ -1320,100 +1208,108 @@ msgstr ""
 "����� ������ PO ��� �� ���� ������. �� ������ ������� ��� ��� �� ������ PO\n"
 "�� �����������.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, 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:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, 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:398
 #, 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:401 src/msgcomm.c:392
 #, 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:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
+#: src/msgmerge.c:530
 #, c-format
 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:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
+#: src/msgmerge.c:532
 #, 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:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:417 src/msguniq.c:367
 #, 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:420
 #, c-format
 msgid ""
-"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+"      --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"
 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:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
 #
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "��� ������������ ������ �������"
 
 #
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "����������� ������� ��� ������ �������"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
 #
-#: src/msgcmp.c:218
+#: src/msgcmp.c:207
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1439,93 +1335,88 @@ msgstr ""
 "����� �����������. ���� ��� ��� ����������� ������� ������o����,\n"
 "������� �������� ��������� ��� �������� ������������.\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:243 src/msgmerge.c:555
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgcmp.c:245
+#: src/msgcmp.c:232
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:247
+#: src/msgcmp.c:234
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
 #
-#: src/msgcmp.c:324
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "�������������: ���� �� ������ ��� ��������������"
 
-#: src/msgcmp.c:330
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
 #
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "���� �� ������ ��������������, ���� ��� ��������..."
 
 #
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...���� ����� � ������� ����� ���������"
 
 #
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "���� �� ������ ��������������, ���� ��� �������� ��� %s"
 
 #
-#: src/msgcmp.c:546
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "�������������: ���� �� ������ ��� ��������������"
 
 #
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, fuzzy, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "�������� %d ������ ��������"
 
 #
-#: src/msgcomm.c:316
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "������ �� �������� ����������� ��� ������"
 
 #
-#: src/msgcomm.c:364
+#: src/msgcomm.c:351
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1533,7 +1424,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 extracted comments will be preserved, but only from the first\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 ""
@@ -1554,76 +1445,76 @@ msgstr ""
 "����� ������ PO ��� �� ���� ������. �� ������ ������� ��� ��� �� ������ PO\n"
 "�� �����������.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:389
 #, 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:433 src/xgettext.c:899
 #, 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:311
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:335
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:339
+#: src/msgconv.c:322
 #, 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:584
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, 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:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
+#: src/msgmerge.c:546
 #, 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:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
+#: src/msgmerge.c:548
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\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:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
+#: src/msgmerge.c:550
 #, 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:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "��� ������ ������ �������"
 
 #
-#: src/msgen.c:263
+#: src/msgen.c:233
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "����������� ������� ��� ������ �������"
 
-#: src/msgen.c:304
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:309
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1632,23 +1523,23 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:321
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
 #
-#: src/msgexec.c:196
+#: src/msgexec.c:194
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "������������ ��������"
 
-#: src/msgexec.c:257
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:262
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1658,64 +1549,69 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:271
+#: src/msgexec.c:254
 #, 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:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:345
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
+#: src/msgexec.c:355 src/msgfilter.c:664
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
 #
-#: src/msgfilter.c:298
+#: src/msgfilter.c:296
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "������������ ��������"
 
 #
-#: src/msgfilter.c:318
+#: src/msgfilter.c:320
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "������ �� �������� ����������� ��� ������"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:423
 #, 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:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1723,227 +1619,210 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfmt.c:345
+#: src/msgfilter.c:587
 #, c-format
-msgid "the argument to %s should be a single punctuation character"
+msgid "Not yet implemented."
 msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfilter.c:616
 #, c-format
-msgid "invalid endianness: %s"
+msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
-msgid "Ulrich Drepper"
+#: src/msgfilter.c:644
+#, c-format
+msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: src/msgfmt.c:439
+#: src/msgfilter.c:695
 #, c-format
-msgid "no input file should be given if %s and %s are specified"
+msgid "read from %s subprocess failed"
 msgstr ""
 
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
-#: src/msgunfmt.c:353
+#: src/msgfilter.c:711
 #, c-format
-msgid "%s requires a \"-d directory\" specification"
+msgid "%s subprocess terminated with exit code %d"
 msgstr ""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:302
 #, c-format
-msgid "%s requires a \"-l locale\" specification"
+msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:538
+#: src/msgfmt.c:349
 #, c-format
-msgid "%s requires a \"--template template\" specification"
+msgid "invalid endianness: %s"
 msgstr ""
 
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
+#. 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"
 msgstr ""
 
-#
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "�� %s ��� %s ����� �������� ������������"
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
+#, c-format
+msgid "%s requires a \"-d directory\" specification"
+msgstr ""
 
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
-msgid "%s is only valid with %s or %s"
+msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
-msgid "%s is only valid with %s, %s or %s"
+msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#. TRANSLATORS: The prefix before a statistics message.  The argument
-#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:740
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
-msgid "%s: "
+msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
 #
-#: src/msgfmt.c:744
+#: src/msgfmt.c:599
 #, fuzzy, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d ������������ ��������"
 
 #
-#: src/msgfmt.c:749
+#: src/msgfmt.c:604
 #, fuzzy, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d �������������� �����������"
 
 #
-#: src/msgfmt.c:754
+#: src/msgfmt.c:609
 #, fuzzy, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d �� ������������ ��������"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: 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:790
+#: src/msgfmt.c:645
 #, 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:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:676
 #, 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:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, 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:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1953,78 +1832,48 @@ msgid ""
 msgstr ""
 
 #
-#: src/msgfmt.c:839
+#: src/msgfmt.c:690
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "��� ������ ������ �������"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:698
 #, 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:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:708
 #, 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
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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
-#, 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:886 src/xgettext.c:905
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2032,33 +1881,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:729
 #, 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:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2066,76 +1915,67 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:910
-#, 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:913
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:753
 #, 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:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
 #
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:869
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: �������������: �� ������ ������� �������� �������������� �����������"
 
 #
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:872
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "%s: �������������: �� ������ ������� �������� �������������� �����������"
 
 #
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:882
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: �������������: �� ������ ������� �������� �������������� �����������"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
 #
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "�� ����� ��� �� ������� \"%s\" ��� ����� ��������� ��� ����� �������"
 
 #
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
@@ -2143,68 +1983,57 @@ msgstr ""
 "����� ����� ����������"
 
 #
-#: src/msgfmt.c:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:927
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "� ������ `domain %s' ���������"
 
 #
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:987
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "� ���� ������� `msgstr' ���������"
 
 #
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:988
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "� ������������� ������� `msgstr' ���������"
 
 #
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr ""
 "%s: �������������: �� ������ ������� �������� �������������� �����������"
 
-#: src/msgfmt.c:1318
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
-#, 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: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
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "������ ���� �������� ��� \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:484
 #, 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:521
+#: src/msggrep.c:504
 #, 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
+#: src/msggrep.c:530
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2244,30 +2073,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:623
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:625
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:297
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:321
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2275,24 +2104,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:347
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:355
 #, 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:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:379
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2300,54 +2129,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:385
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:387
+#: src/msginit.c:375
 #, 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:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:402
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:468
+#: src/msginit.c:450
 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:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:489
+#: src/msginit.c:471
 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: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
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1118
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2359,54 +2188,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:1534
+#: src/msginit.c:1465
 #, 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:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, 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:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:202
 #, 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:207
+#: src/msgl-cat.c:206
 #, 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:391 src/msgl-iconv.c:375
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, 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: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
 #, c-format
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:443
+#: src/msgl-cat.c:440
 #, 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:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2415,7 +2244,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:488
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2424,7 +2253,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:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2433,12 +2262,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:100
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:105
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2446,7 +2275,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:114
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2455,7 +2284,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:128
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2463,66 +2292,66 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:130
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:141
+#: src/msgl-check.c:103
 #, 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:147
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:266
+#: src/msgl-check.c:189
 #, 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:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
 #
-#: src/msgl-check.c:420
+#: src/msgl-check.c:338
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "�� �������� ����� ���������� ��������"
 
 #
-#: src/msgl-check.c:442
+#: src/msgl-check.c:360
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "�� �������� ����� ���������� ��������"
 
 #
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "�� �������� ����� ���������� ��������"
 
 #
-#: src/msgl-check.c:474
+#: src/msgl-check.c:392
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
@@ -2530,130 +2359,140 @@ msgstr[0] "���� �� ������ ��������������, ���� ��� �������� ��� %s"
 msgstr[1] "���� �� ������ ��������������, ���� ��� �������� ��� %s"
 
 #
-#: src/msgl-check.c:490
+#: src/msgl-check.c:408
 #, 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:514
+#: src/msgl-check.c:432
 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:526
 #, 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:619
+#: src/msgl-check.c:534
 #, 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:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:549
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "�� �������� `msgid' ��� `msgstr' ��� �������� ��� �� ��� �� '\\n'"
 
 #
-#: src/msgl-check.c:652
+#: src/msgl-check.c:567
 #, 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:660
+#: src/msgl-check.c:575
 #, 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:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:590
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "�� �������� `msgid' ��� `msgstr' ��� ���������� ��� �� ��� �� '\\n'"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
 #
-#: src/msgl-check.c:804
+#: src/msgl-check.c:695
+#, fuzzy, c-format
+msgid "headerfield `%s' missing in header\n"
+msgstr "�� ����� `%s' ���� ���������� ��� �� ��������"
+
+#
+#: src/msgl-check.c:703
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' should start at beginning of line\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:820
+#: src/msgl-check.c:730
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "�� ����� `%s' ���� ���������� ��� �� ��������"
+msgid "field `%s' still has initial default value\n"
+msgstr "�� ����� `%s' ���� ����� ��� ������ �� ������� ����"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
 #
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "������ ��� ������� ��� \"%s\" ��� ��������"
 
-#: src/msgl-iconv.c:290
+#: src/msgl-iconv.c:268
 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:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, 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:335
+#: src/msgl-iconv.c:320
 #, c-format
 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:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:361 src/msgmerge.c:367
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:453
+#: src/msgmerge.c:421
 msgid "backup type"
 msgstr ""
 
 #
-#: src/msgmerge.c:490
+#: src/msgmerge.c:458
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2679,51 +2518,51 @@ msgstr ""
 "�� ������������ ��������� ���� �������� ����� ����� ��� �� ��������\n"
 "������ ������ ������.\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:475
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:509
+#: src/msgmerge.c:477
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:513
+#: src/msgmerge.c:481
 #, 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:487
 #, 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:499
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:501
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:535
+#: src/msgmerge.c:503
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:537
+#: src/msgmerge.c:505
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:539
+#: src/msgmerge.c:507
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2735,39 +2574,44 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:514
 #, 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:557
+#: src/msgmerge.c:523
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgmerge.c:525
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:574
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
 #
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1340
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "���� �� ������ ��������������, ���� ��� �������� ��� %s"
 
 #
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1363
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "���� �� ������ ��������������, ���� ��� �������� ��� %s"
 
 #
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:1701
 #, fuzzy, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2777,64 +2621,62 @@ msgstr ""
 "����� ���������� %d, �������������� %d.\n"
 
 #
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
-#, c-format
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " �����.\n"
 
 #
-#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "�� %s ��� %s ����� �������� ������������"
 
-#: src/msgunfmt.c:427
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:442
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:446
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:462
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2843,41 +2685,41 @@ msgid ""
 msgstr ""
 
 #
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:455
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "��� ������ ������ �������"
 
-#: src/msgunfmt.c:475
+#: src/msgunfmt.c:463
 #, 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:479
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:485
+#: src/msgunfmt.c:473
 #, 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
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:513
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:331
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2890,19 +2732,19 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:364
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:366
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr ""
@@ -2916,28 +2758,28 @@ msgid ""
 msgstr ""
 "%s: �������������: �� ������ ������� �������� �������������� �����������"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, 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:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2945,7 +2787,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 #, fuzzy
 msgid ""
 "Charset missing in header.\n"
@@ -2959,103 +2801,103 @@ msgid "inconsistent use of #~"
 msgstr ""
 
 #
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+msgid "missing `msgstr[]' section"
 msgstr "������ ������� `msgstr'"
 
 #
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+msgid "missing `msgid_plural' section"
 msgstr "������ ������� `msgstr'"
 
 #
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "������ ������� `msgstr'"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr ""
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr ""
 
 #
-#: src/po-lex.c:90 src/po-lex.c:109
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 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:941
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, fuzzy, c-format
 msgid "invalid multibyte sequence"
 msgstr "�� �������� ����� ���������� ��������"
 
 #
-#: src/po-lex.c:465
+#: src/po-lex.c:466
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "�� �������� ����� ���������� ��������"
 
 #
-#: src/po-lex.c:475
+#: src/po-lex.c:476
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "�� �������� ����� ���������� ��������"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr ""
 
 #
-#: src/po-lex.c:744
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "������� ������ \"%s\""
 
 #
-#: src/po-lex.c:854
+#: src/po-lex.c:855
 #, fuzzy, c-format
 msgid "invalid control sequence"
 msgstr "�� �������� ����� ���������� ��������"
 
 #
-#: src/po-lex.c:981
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "����� ������� (EOF) ��� �������������"
 
 #
-#: src/po-lex.c:987
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "�����-������� (eol) ��� �������������"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
 #
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "���� �� ������ ��� ������ �� �������� ������� ��� �� �������"
 
 #
-#: src/read-catalog.c:363
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "����������������� ������� ���������"
 
 #
-#: src/read-catalog.c:365
+#: src/read-catalog.c:374
 msgid "this is the location of the first definition"
 msgstr "���� ����� � ���� ��� ������ �������"
 
@@ -3145,29 +2987,29 @@ msgid ""
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
 #
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "������ ��� ������� ��� \"%s\" ��� ��������"
 
 #
-#: src/urlget.c:159
+#: src/urlget.c:146
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "���� ����� ��������"
 
-#: src/urlget.c:176
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:181
+#: src/urlget.c:168
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3175,38 +3017,11 @@ msgid ""
 msgstr ""
 
 #
-#: src/urlget.c:228
-#, fuzzy, c-format
-msgid "error reading \"%s\""
-msgstr "������ ���� �������� ��� \"%s\""
-
-#
-#: src/urlget.c:234
+#: src/urlget.c:219
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "������ ���� ������� ��� ������� \"%s\""
 
-#
-#: src/urlget.c:238
-#, fuzzy, c-format
-msgid "error after reading \"%s\""
-msgstr "������ ���� �������� ��� \"%s\""
-
-#: src/urlget.c:264
-#, c-format
-msgid "Retrieving %s..."
-msgstr ""
-
-#: src/urlget.c:308
-#, c-format
-msgid " timed out.\n"
-msgstr ""
-
-#: src/urlget.c:445
-#, c-format
-msgid " failed.\n"
-msgstr ""
-
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3239,43 +3054,43 @@ msgid ""
 msgstr ""
 
 #
-#: src/write-catalog.c:231 src/write-catalog.c:275
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, 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:281
 msgid "standard output"
 msgstr "�������� ������"
 
 #
-#: src/write-csharp.c:703
+#: src/write-csharp.c:688
 #, fuzzy, c-format
 msgid "failed to create directory \"%s\""
 msgstr "�������� ������� ��� �������� \"%s\""
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:753
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:1091
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1210
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1213
+#: src/write-java.c:1063
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3287,15 +3102,15 @@ msgid "error while opening \"%s\" for writing"
 msgstr "������ ���� �� ������� ��� ������� \"%s\" ��� �������"
 
 #
-#: src/write-po.c:875
-#, fuzzy, c-format
+#: src/write-po.c:766
+#, c-format
 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:1326 src/write-po.c:1450
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3304,7 +3119,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3321,8 +3136,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-"
+"1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3340,13 +3155,13 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "������ ���� ������� ��� ������� \"%s\""
 
-#: src/write-resources.c:131
+#: src/write-resources.c:130
 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:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3365,73 +3180,70 @@ msgid ""
 msgstr ""
 
 #
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:342 src/x-python.c:1059
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: �������������: �� ������������ �������������"
 
 #
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: �������������: �� ������������ �������������"
 
 #
-#: src/x-c.c:1051
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: �������������: �� ������������ ������� ����������"
-
-#
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: �������������: �� ������������ ������� ����������"
 
 #
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: �������������: �� ������������ �������������"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
-msgid "Please specify the source encoding through --from-code."
+#: 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"
 msgstr ""
 
-#: src/x-csharp.c:269
+#: src/x-csharp.c:268
 #, 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
+#: src/x-csharp.c:284
 #, 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
+#: src/x-csharp.c:296
 #, 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
+#: src/x-csharp.c:305
 #, 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:374
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:338
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3439,43 +3251,33 @@ msgid ""
 msgstr ""
 
 #
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: 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:1512 src/x-java.c:875
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, fuzzy, 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:2013 src/x-java.c:1366
 #, 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:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:606
+#: src/x-glade.c:645
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3483,111 +3285,56 @@ msgid ""
 msgstr ""
 
 #
-#: src/x-java.c:494
+#: src/x-java.c:492
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: �������������: �� ������������ �������������"
 
-#: src/x-javascript.c:230
-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:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: �������������: �� ������������ �������������"
-
-#
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: �������������: �� ������������ ������� ����������"
-
-#
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: �������������: �� ������������ �������������"
-
-#: src/x-perl.c:308
+#: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1043
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1163
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1183
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
 #
-#: src/x-perl.c:1217
+#: src/x-perl.c:1212
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: �� ������ ������� -- %c\n"
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1247
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:278
+#: src/x-python.c:233
+#, 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:324
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3595,7 +3342,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:341
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3603,7 +3350,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3611,7 +3358,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:364
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3619,7 +3366,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:397
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3627,28 +3374,28 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:722
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:108
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:172
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
 #
-#: src/x-rst.c:207
+#: src/x-rst.c:208
 #, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: �������������: �� ������������ �������������"
 
-#: src/x-sh.c:1074
+#: src/x-sh.c:1075
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3656,66 +3403,55 @@ msgid ""
 msgstr ""
 
 #
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: �������������: �� ������������ �������������"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#
-#: src/xgettext.c:648
+#: src/xgettext.c:567
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "�� --join-existing �� ������ �� �������������� ���� � ������ �������� ���� "
 "�������� �����"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
 #
-#: src/xgettext.c:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+#: src/xgettext.c:715
+#, c-format
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "�������������: �� ������ `%s' �� �������� `%s' ����� ������� �� ���������� C"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:882
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:884
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
 #
-#: src/xgettext.c:891
+#: src/xgettext.c:798
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "��� ������ ������ �������"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3724,85 +3460,77 @@ msgid ""
 "                                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"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:900
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:902
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:919
+#: src/xgettext.c:825
 #, 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"
+"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
+"                              preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:925
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:927
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:929
+#: src/xgettext.c:833 src/xgettext.c:840
 #, 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"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:937
+#: src/xgettext.c:837
 #, 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"
+"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
+"                              WORD means not to use default keywords)\n"
 msgstr ""
 
-#: src/xgettext.c:942
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3810,147 +3538,129 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:945
+#: src/xgettext.c:847
 #, 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"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:950
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:952
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:954
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:958
+#: src/xgettext.c:859
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:962
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:991
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:905
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:907
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:911
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
-"msgstr\n"
-"                                values\n"
+"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
+"entries\n"
 msgstr ""
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:913
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
-"msgstr\n"
-"                                values\n"
+"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
+"entries\n"
 msgstr ""
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1686
 #, 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:1965
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "�������� �������"
 
-#: src/xgettext.c:2071
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2075
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr ""
-
-#: src/xgettext.c:2080
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:1968
 #, 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:2190
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: "
-"%s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: %"
+"s\n"
 msgstr ""
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3959,45 +3669,45 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: 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"
 msgstr ""
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\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:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3035
+#, c-format
+msgid "language `%s' unknown"
 msgstr "� ������ `%s' ����� �������"
 
 #: libgettextpo/gettext-po.c:84
@@ -4005,20 +3715,6 @@ msgid "<unnamed>"
 msgstr ""
 
 #
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: �� �������� ������� -- %c\n"
-
-#
-#, fuzzy
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "�� ����� ��������� `%s' �� ������ �� ������ ���� ���� ��� �������"
-
-#
-#, fuzzy
-#~ 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 "
@@ -4184,8 +3880,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 0c4c1a82c..4e020b269 100644
--- a/gettext-tools/po/es.po
+++ b/gettext-tools/po/es.po
@@ -1,18 +1,17 @@
 # Mensajes en español para GNU gettext.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2013 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2013, 2014 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
+# Antonio Ceballos <aceballos@gmail.com>, 2013, 2014
+# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.18.3\n"
+"Project-Id-Version: GNU gettext-tools 0.19-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
-"PO-Revision-Date: 2013-12-06 23:55+0200\n"
+"POT-Creation-Date: 2014-05-10 13:37+0900\n"
+"PO-Revision-Date: 2014-06-08 17:45+0200\n"
 "Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\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"
@@ -201,15 +200,12 @@ msgstr "hubo un error al escribir el fichero \"%s\""
 #: gnulib-lib/javacomp.c:2343
 #, 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
@@ -219,7 +215,7 @@ msgstr "error de E/S en el 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:1326
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "Memoria agotada"
@@ -230,7 +226,7 @@ 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:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "fallo en la escritura la subproceso %s"
@@ -326,19 +322,15 @@ msgstr "error al abrir el fichero \"%s\" para lectura"
 #: src/format.c:151
 #, 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-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-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: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
@@ -356,9 +348,7 @@ msgstr "una especificación de formato para el argumento %u no existe en '%s'"
 #: 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:449
 #, c-format
@@ -367,27 +357,18 @@ msgstr "La instrucción número %u comienza con | pero no ternina con |."
 
 #: 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: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: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:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
 #: src/format-javascript.c:215 src/format-python.c:515
@@ -399,8 +380,7 @@ msgstr "el número de especificaciones de formato en `%s' y '%s' no coincide"
 #: src/format-csharp.c:88 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:109
 #, c-format
@@ -408,33 +388,22 @@ 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:130 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. "
+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:139
 #, 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:140
 #, 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:161 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."
+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:162
 #, c-format
@@ -449,38 +418,27 @@ 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
@@ -507,71 +465,43 @@ 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: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:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
@@ -580,20 +510,13 @@ msgstr "En la instrucción número %u, \"%s\" no está seguido de una coma."
 
 #: 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: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:572
 #, c-format
@@ -602,20 +525,13 @@ msgstr "En la instrucción número %u, una opción contiene un valor no numéric
 
 #: 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: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:756
 #, c-format
@@ -624,36 +540,21 @@ msgstr "una especificación de formato para el argumento {%u} no 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 ""
-"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-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 ""
-"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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -683,12 +584,8 @@ msgstr "En la instrucción número %u, deben darse los modificadores @ y :."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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:3326 src/format-scheme.c:3263
 #, c-format
@@ -707,18 +604,12 @@ msgstr "las especificaciones de formato en `%s' y '%s' no son equivalentes"
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in '%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.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-perl-brace.c:199 src/format-python.c:471
 #: src/format-python-brace.c:434 src/format-python-brace.c:447
@@ -728,50 +619,33 @@ msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "una especificación de formato para el argumento '%s' no existe en '%s'"
 
 #: src/format-python.c: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."
+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: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: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: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: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: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-python-brace.c:137
 #, c-format
@@ -781,22 +655,17 @@ msgstr "En la instrucción número %u, '%c' no puede iniciar un nombre de campo.
 #: src/format-python-brace.c:150
 #, 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:165
 #, 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:185
 #, 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:270
 #, c-format
@@ -805,33 +674,20 @@ msgstr "En la instrucción número %u, hay una instrucción de formato inacabada
 
 #: 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: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: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."
+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: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."
+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:85
 msgid "The string refers to a shell variable with an empty name."
@@ -839,19 +695,13 @@ msgstr "La cadena se refiere a una variable de entorno con un nombre vacío."
 
 #: 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: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."
 
 #: 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
@@ -924,19 +774,16 @@ msgstr "  -s, --short                 nombre de corto de la máquina\n"
 #: src/hostname.c:222
 #, 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:225
 #, 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: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
@@ -1016,11 +863,8 @@ msgstr ""
 #: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 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:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
@@ -1041,20 +885,16 @@ msgstr "  FICHEROENTRADA              fichero PO de entrada\n"
 #: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
 #: src/xgettext.c:875
 #, 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:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
 #: 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: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
@@ -1069,8 +909,7 @@ msgstr "Localización del fichero de salida:\n"
 #: src/msggrep.c:540 src/msgmerge.c:525 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: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
@@ -1090,33 +929,23 @@ msgstr "Selección de mensaje:\n"
 
 #: 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: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: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: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:460
 #, c-format
@@ -1136,27 +965,22 @@ msgstr "Manipulación de atributos:\n"
 #: 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: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: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: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:475
 #, c-format
@@ -1164,42 +988,28 @@ 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: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:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --no-fuzzy              elimina los mensajes difusos marcados como "
-"'fuzzy'\n"
+#, 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"
 
 #: 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: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:486
 #, c-format
@@ -1208,10 +1018,8 @@ msgstr "      --fuzzy                 sinónimo de --only-fuzzy --clear-fuzzy\n"
 
 #: 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: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
@@ -1224,21 +1032,14 @@ msgstr "Sintáxis del fichero de entrada:\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:393 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: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
 #, 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: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
@@ -1255,81 +1056,62 @@ msgstr "Detalles de salida:\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"
+"                              WHEN may be 'always', 'never', 'auto', or 'html'.\n"
 msgstr ""
-"      --color                 utilizar siempre colores y otros atributos de "
-"texto\n"
-"      --color=CUANDO          utilizar colores y otros atributos de texto si "
-"se cumple CUANDO.\n"
+"      --color                 utilizar siempre colores y otros atributos de texto\n"
+"      --color=CUANDO          utilizar colores y otros atributos de texto si se cumple CUANDO.\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:408
 #: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
-"      --stule=FICHEROESTILO   especifica fichero de reglas de estilo CSS "
-"para --color\n"
+msgstr "      --stule=FICHEROESTILO   especifica fichero de reglas de estilo CSS para --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:578 src/msgunfmt.c:505 src/msguniq.c:389
 #: src/xgettext.c:977
 #, 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: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
 #, 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: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
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
 #: src/xgettext.c:983
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
 #: src/xgettext.c:985
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
 #: src/xgettext.c:987
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
 #: src/xgettext.c:989
 #, 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: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
@@ -1342,11 +1124,8 @@ msgstr "  -p, --properties-output     escribe un fichero .properties de Java\n"
 #: 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
 #, 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: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
@@ -1363,10 +1142,8 @@ 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: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
@@ -1380,8 +1157,7 @@ msgstr "  -s, --sort-output           genera una salida ordenada\n"
 #: src/xgettext.c:1002
 #, 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:322 src/msgcomm.c:327
 #, c-format
@@ -1425,9 +1201,7 @@ msgstr "  FICHEROENTRADA ...          ficheros de entrada\n"
 #: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
 #: src/xgettext.c:877
@@ -1441,10 +1215,8 @@ 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:411
 #, c-format
@@ -1452,8 +1224,7 @@ 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:414 src/msgcomm.c:405
@@ -1468,11 +1239,8 @@ msgstr ""
 #: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
 #: src/msgmerge.c:562
 #, 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:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
 #: src/msgmerge.c:564
@@ -1495,15 +1263,13 @@ msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      -use-first              utiliza la primera traducción disponible para\n"
+"      --use-first             utiliza la primera traducción disponible para\n"
 "                              cada mensaje, no mezcla varias traducciones\n"
 
 #: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:359
@@ -1621,9 +1387,7 @@ msgstr "Modificadores de operación:\n"
 
 #: src/msgcmp.c:241 src/msgmerge.c:553
 #, 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"
@@ -1636,8 +1400,7 @@ msgstr "  -N, --no-fuzzy-matching     no utiliza la coincidencia difusa\n"
 #: src/msgcmp.c:245
 #, 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:247
 #, c-format
@@ -1697,7 +1460,7 @@ 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:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1738,25 +1501,19 @@ 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:452 src/xgettext.c:1004
 #, 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: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:335
 #, c-format
@@ -1766,8 +1523,7 @@ msgstr "Objetivo de conversión:\n"
 #: 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:363 src/msgen.c:359 src/msgmerge.c:584
 #, c-format
@@ -1778,17 +1534,13 @@ msgstr "  -i, --indent                estilo de salida con sangrías\n"
 #: src/msgmerge.c:586
 #, 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:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
 #: src/msgmerge.c:588
-#, fuzzy, c-format
-msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr ""
-"      --add-location          genera líneas '#: fichero:línea' (por "
-"omisión)\n"
+#, 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"
 
 #: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
 #: src/msgmerge.c:590
@@ -1893,8 +1645,7 @@ msgstr "Modo de empleo: %s [OPCIÓN] FILTRO [OPCIONES-DEL-FILTRO]\n"
 #: src/msgfilter.c:411
 #, 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:435
 #, c-format
@@ -1912,8 +1663,7 @@ msgstr "Algunas OPCIONES-DEL-FILTRO cuando el FILTRO es 'sed':\n"
 
 #: src/msgfilter.c:442
 #, 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"
@@ -1921,8 +1671,7 @@ msgstr ""
 #: src/msgfilter.c:444
 #, 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"
@@ -1930,16 +1679,14 @@ msgstr ""
 
 #: src/msgfilter.c:447
 #, 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:465 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"
@@ -1947,16 +1694,13 @@ msgstr ""
 #: src/msgfilter.c:471 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:473
 #, 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/msgfmt.c:345
@@ -1975,11 +1719,9 @@ msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
 #: src/msgfmt.c:439
-#, fuzzy, c-format
+#, c-format
 msgid "no input file should be given if %s and %s are specified"
-msgstr ""
-"Si no se especifica un fichero de entrada o si es -, se lee la entrada "
-"estándar.\n"
+msgstr "no debería especificarse fichero de entrada si se especifican %s y %s"
 
 #: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
@@ -1994,19 +1736,19 @@ msgid "%s requires a \"-l locale\" specification"
 msgstr "%s requiere que se especifique un \"-l locale\""
 
 #: src/msgfmt.c:538
-#, fuzzy, c-format
+#, c-format
 msgid "%s requires a \"--template template\" specification"
-msgstr "%s requiere que se especifique un \"-l locale\""
+msgstr "%s requiere que se especifique un \"--template plantilla\""
 
 #: src/msgfmt.c:545
-#, fuzzy, c-format
+#, c-format
 msgid "%s requires a \"-o file\" specification"
-msgstr "%s requiere que se especifique un \"-l locale\""
+msgstr "%s requiere que se especifique un \"-o fichero\""
 
 #: src/msgfmt.c:551
-#, fuzzy, c-format
+#, c-format
 msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s y %s son mutuamente excluyentes"
+msgstr "%s y %s son mutuamente excluyentes en %s"
 
 #: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
@@ -2054,9 +1796,7 @@ msgstr "Modo de empleo: %s [OPCIÓN] fichero.po ...\n"
 #: src/msgfmt.c:778
 #, 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:783 src/xgettext.c:864
 #, c-format, no-wrap
@@ -2079,18 +1819,12 @@ msgstr "Modo de operación:\n"
 
 #: src/msgfmt.c:799
 #, 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:801
 #, 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"
@@ -2098,24 +1832,17 @@ msgstr ""
 #: src/msgfmt.c:803
 #, 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:805
 #, 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:807
 #, 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:809
 #, c-format
@@ -2123,10 +1850,9 @@ msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Modo Qt: genera un fichero .qm de Qt\n"
 
 #: src/msgfmt.c:811
-#, fuzzy, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --qt                    Modo Qt: genera un fichero .qm de Qt\n"
+#, c-format
+msgid "      --desktop               Desktop Entry mode: generate a .desktop file\n"
+msgstr "      --desktop               Modo entrada de escritorio: genera un fichero .desktop\n"
 
 #: src/msgfmt.c:818
 #, c-format
@@ -2151,33 +1877,23 @@ msgstr "  -r, --resource=RECURSO      nombre del recurso\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
 #, 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:829
-#, fuzzy, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --tcl                   Modo Tcl: la entrada es un fichero .msg tcl/"
-"msgcat\n"
+#, 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"
 
 #: src/msgfmt.c:831
 #, 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:833
 #, 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 ""
@@ -2192,12 +1908,8 @@ msgstr "Localización del fichero de salida en modo C#:\n"
 
 #: src/msgfmt.c:845 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:847
 #, c-format
@@ -2206,8 +1918,7 @@ msgid ""
 "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:851
 #, c-format
@@ -2233,19 +1944,17 @@ msgstr ""
 #: src/msgfmt.c:861
 #, c-format
 msgid "Desktop Entry mode options:\n"
-msgstr ""
+msgstr "Opciones del modo de entrada de escritorio:\n"
 
 #: src/msgfmt.c:867
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
+msgstr "  --template=PLANTILLA        un fichero .desktop utilizado como plantilla\n"
 
 #: src/msgfmt.c:869
-#, fuzzy, c-format
+#, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-"  -d DIRECTORIO               directorio base de los catálogos de\n"
-"                              mensajes .msg\n"
+msgstr "  -d DIRECTORIO               directorio base de los ficheros .po\n"
 
 #: src/msgfmt.c:871 src/xgettext.c:934
 #, c-format
@@ -2253,17 +1962,17 @@ 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 usar las palabras clave por omisión\n"
 
 #: src/msgfmt.c:874
 #, 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"
 
 #: src/msgfmt.c:886 src/xgettext.c:905
 #, c-format
@@ -2274,26 +1983,21 @@ msgstr "Interpretación del fichero de entrada:\n"
 #, 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:891
 #, 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:893
 #, 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"
@@ -2304,25 +2008,20 @@ 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:898
 #, 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:900
 #, 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"
@@ -2331,13 +2030,11 @@ msgstr ""
 #: src/msgfmt.c:903
 #, 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:908
 #, 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"
@@ -2345,30 +2042,21 @@ msgstr ""
 #: src/msgfmt.c:910
 #, 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:913
 #, 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:922
 #, 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:924 src/msgmerge.c:612 src/msgunfmt.c:533
 #, c-format
@@ -2393,8 +2081,7 @@ msgstr "atención: el encabezado del fichero PO está difuso\n"
 #: src/msgfmt.c:1052
 #, 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"
+msgstr "atención: las versiones anteriores de msgfmt producirán un error en esto\n"
 
 #: src/msgfmt.c:1076
 #, c-format
@@ -2434,15 +2121,15 @@ msgstr "se descarta la línea difusa 'msgstr'"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1306
 #, c-format
 msgid "%s does not exist"
-msgstr ""
+msgstr "%s no existe"
 
-#: src/msgfmt.c:1328
+#: src/msgfmt.c:1316
 #, c-format
 msgid "%s exists but cannot read"
-msgstr ""
+msgstr "%s existe pero no se puede leer"
 
 #: 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
@@ -2458,12 +2145,8 @@ msgstr "error al leer \"%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 ""
-"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:521
 #, c-format, no-wrap
@@ -2561,11 +2244,9 @@ 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                utiliza escapes C en la salida, sin "
-"caracteres\n"
+"      --escape                utiliza escapes C en la salida, sin caracteres\n"
 "                              extendidos\n"
 
 #: src/msggrep.c:623
@@ -2576,8 +2257,7 @@ msgstr "      --sort-output           genera una salida ordenada\n"
 #: 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:297
 msgid ""
@@ -2585,8 +2265,7 @@ msgid ""
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  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"
 
@@ -2623,8 +2302,7 @@ msgstr "  -i, --input=FICHEROENTRADA  fichero de entrada POT\n"
 #: src/msginit.c:379
 #, 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"
@@ -2633,8 +2311,7 @@ msgstr ""
 #: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
-msgstr ""
-"  -o, --output-file=FICHERO   escribe la salida al fichero PO especificado\n"
+msgstr "  -o, --output-file=FICHERO   escribe la salida al fichero PO especificado\n"
 
 #: src/msginit.c:387
 #, c-format
@@ -2653,8 +2330,7 @@ msgstr "  -l, --locale=LL_CC          configura el locale de destino\n"
 
 #: src/msginit.c:402
 #, 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"
@@ -2665,8 +2341,7 @@ msgid ""
 "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:476 src/msginit.c:481
 #, c-format
@@ -2679,8 +2354,7 @@ msgid ""
 "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/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
@@ -2691,10 +2365,8 @@ msgstr "fallo en el subproceso %s con código de salida %d"
 
 #: src/msginit.c:1118
 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"
@@ -2713,40 +2385,27 @@ msgstr "Traducciones al español para el paquete %s"
 #: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
-msgstr ""
-"el conjunto de caracteres actual \"%s\" no es un nombre de codificación "
-"portátil"
+msgstr "el conjunto de caracteres actual \"%s\" no es un nombre de codificación portátil"
 
 #: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
-msgstr ""
-"hay dos distintos conjuntos de caracteres \"%s\" y \"%s\" en el fichero de "
-"entrada"
+msgstr "hay dos distintos conjuntos de caracteres \"%s\" y \"%s\" en el fichero de entrada"
 
 #: 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: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:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
-msgstr ""
-"el conjunto de caracteres destino \"%s\" no es un nombre de codificación "
-"portátil."
+msgstr "el conjunto de caracteres destino \"%s\" no es un nombre de codificación portátil."
 
 #: 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
@@ -2767,8 +2426,7 @@ msgstr ""
 #: src/msgl-cat.c:449
 #, 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 ""
@@ -2787,8 +2445,7 @@ 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:93
 #, c-format
@@ -2839,8 +2496,7 @@ msgid ""
 "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"
 
@@ -2851,9 +2507,7 @@ msgstr "la expresión plural puede producir resultados negativos"
 #: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr ""
-"nplurals = %lu pero las expresiones plurales pueden producir valores tan "
-"grades como %lu"
+msgstr "nplurals = %lu pero las expresiones plurales pueden producir valores tan grades como %lu"
 
 #: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
@@ -2864,12 +2518,8 @@ msgid "plural expression can produce integer overflow"
 msgstr "la expresión plural puede producir desbordamiento de número entero"
 
 #: src/msgl-check.c:197
-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"
+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:266
 #, c-format
@@ -2916,12 +2566,8 @@ msgstr[0] "pero algunos mensajes tienen una forma plural"
 msgstr[1] "pero algunos mensajes tienen %lu formas plurales"
 
 #: 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 ""
-"el catálogo de mensajes tiene traducciones con formas plurales, pero no "
-"tiene un encabezado con \"Plural-Forms: nplurals=ENTERO; plural=EXPRESIÓN;\""
+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
@@ -3012,17 +2658,17 @@ msgstr "el manejo del plural es una extensión del gettext de GNU"
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr no tiene la marca del acelerador de teclado '%c'"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, 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:804
+#: src/msgl-check.c:801
 #, 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:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "el campo '%s' no está presente en la cabecera\n"
@@ -3035,43 +2681,28 @@ msgstr "%s: la entrada no es válida con la codificación \"%s\""
 #: 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:290
 msgid "input file doesn't contain a header entry with a charset specification"
-msgstr ""
-"El fichero de entrada no contiene una línea de encabezado que especifique el "
-"conjunto de caracteres"
+msgstr "El fichero de entrada no contiene una línea de encabezado que especifique el conjunto de caracteres"
 
 #: 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
 #, 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:335
 #, 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:341 src/recode-sr-latin.c:302 src/x-python.c:672
 #: src/xgettext.c:727
 #, 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:392 src/msgmerge.c:398
 #, c-format
@@ -3108,9 +2739,7 @@ msgstr ""
 #: src/msgmerge.c:507
 #, 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:509
 #, c-format
@@ -3123,8 +2752,7 @@ 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:519
@@ -3159,8 +2787,7 @@ msgstr "      --suffix=SUFIJO         sobreescribe el sufijo de respaldo\n"
 #: src/msgmerge.c:539
 #, 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"
@@ -3172,16 +2799,14 @@ 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:546
 #, 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"
@@ -3189,11 +2814,8 @@ msgstr ""
 
 #: src/msgmerge.c:557
 #, 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:614 src/urlget.c:192
 #, c-format
@@ -3212,9 +2834,7 @@ msgstr "este mensaje no debería definir las formas plurales"
 
 #: src/msgmerge.c:2035
 #, 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"
@@ -3239,15 +2859,11 @@ msgstr "Modo de empleo: %s [OPCIÓN] [FICHERO]...\n"
 #: 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: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"
@@ -3255,26 +2871,17 @@ msgstr ""
 #: 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: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: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:451
 #, c-format
@@ -3289,8 +2896,7 @@ msgstr "Localización del fichero de entrada en modo 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 ""
 "El nombre de la clase se determina añadiendo el nombre local al nombre del\n"
@@ -3309,8 +2915,7 @@ msgid ""
 "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:479
 #, c-format
@@ -3329,8 +2934,7 @@ msgstr ""
 #: 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:513
 #, c-format
@@ -3367,12 +2971,8 @@ msgstr "  -d, --repeated              muestra únicamente los duplicados\n"
 
 #: 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:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
@@ -3386,8 +2986,7 @@ 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
@@ -3429,8 +3028,7 @@ 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:93
 #, c-format
@@ -3631,8 +3229,7 @@ msgstr "atención: error de sintaxis; se espera un ';' después de la cadena"
 
 #: 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:116
 #, c-format
@@ -3721,46 +3318,24 @@ msgid " failed.\n"
 msgstr " ha fallado.\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 ""
-"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."
+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:129
-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."
+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:162
-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."
+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: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 ""
-"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."
+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:202
-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"
+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:231 src/write-catalog.c:275
 #, c-format
@@ -3794,8 +3369,7 @@ msgstr "no es un nombre de clase Java válido: %s"
 #: src/write-java.c:1210
 #, 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:1213
 #, c-format
@@ -3809,13 +3383,10 @@ msgstr "error al abrir el fichero \"%s\" para escritura"
 
 #: src/write-po.c:875
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1326 src/write-po.c:1455
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3828,7 +3399,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:1338 src/write-po.c:1462
+#: src/write-po.c:1338 src/write-po.c:1467
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3851,13 +3422,11 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"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"
 
@@ -3882,8 +3451,7 @@ 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:150
@@ -3899,8 +3467,7 @@ 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:176
@@ -3922,9 +3489,9 @@ msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: atención: expresión regular no finalizada"
 
 #: src/x-c.c:1051
-#, fuzzy, c-format
+#, c-format
 msgid "warning: invalid Unicode character"
-msgstr "%s:%d: atención: carácter Unicode inválido"
+msgstr "atención: carácter Unicode inválido"
 
 #: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
 #, c-format
@@ -4050,8 +3617,7 @@ msgid ""
 "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:291
 #, c-format
@@ -4060,8 +3626,7 @@ msgid ""
 "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:303
 #, c-format
@@ -4070,8 +3635,7 @@ msgid ""
 "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:312
 #, c-format
@@ -4080,8 +3644,7 @@ msgid ""
 "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:344
 #, c-format
@@ -4098,21 +3661,19 @@ msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: atención: literal RegExp finalizada demasiado pronto"
 
 #: src/x-javascript.c:1055
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: atención: carácter Unicode inválido"
+msgstr "%s:%d: atención: %s no está permitido"
 
 #: src/x-javascript.c:1069
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: atención: cadena no finalizada"
+msgstr "%s:%d: atención: marca XML no finalizada"
 
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr ""
-"%s:%d: no se puede encontrar el terminador de cadena \"%s\" en ningún lugar "
-"antes del fin del fichero"
+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
 #, c-format
@@ -4149,8 +3710,7 @@ 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 ""
-"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:324
@@ -4161,8 +3721,7 @@ msgid ""
 "comment as specified in http://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:341
@@ -4173,8 +3732,7 @@ msgid ""
 "comment as specified in http://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:354
@@ -4185,8 +3743,7 @@ msgid ""
 "comment as specified in http://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:364
@@ -4197,8 +3754,7 @@ msgid ""
 "comment as specified in http://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:397
@@ -4209,8 +3765,7 @@ msgid ""
 "as specified in http://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:722
@@ -4235,23 +3790,18 @@ msgstr "%s:%d: expresión de cadena inválida"
 
 #: 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: 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:413
 #, 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"
 
 #: src/xgettext.c:545
 #, c-format
 msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
+msgstr "'%s' no es un nombre de codificación válido.  Se utilizará ASCII en su lugar.\n"
 
 #: src/xgettext.c:648
 #, c-format
@@ -4275,14 +3825,11 @@ msgstr ""
 #: src/xgettext.c:859
 #, 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:882
 #, 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"
@@ -4290,13 +3837,11 @@ msgstr ""
 #: src/xgettext.c:884
 #, 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:886
 #, 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"
@@ -4308,25 +3853,21 @@ msgid "Choice of input file language:\n"
 msgstr "Selección del lenguaje del fichero de entrada:\n"
 
 #: src/xgettext.c:893
-#, fuzzy, c-format
+#, 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"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 msgstr ""
-"   -L, --language=NOMBRE      reconoce el lenguaje especificado\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, "
-"Lisp,\n"
+"  -L, --language=NOMBRE       reconoce el lenguaje especificado\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)\n"
+"                                JavaScript, Vala, Desktop)\n"
 
 #: src/xgettext.c:900
 #, c-format
@@ -4335,12 +3876,8 @@ msgstr "  -C, --c++                   abreviatura de --language=C++\n"
 
 #: src/xgettext.c:902
 #, 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:907
 #, c-format
@@ -4354,36 +3891,29 @@ msgstr ""
 #: src/xgettext.c:910
 #, 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:915
 #, 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:917
 #, 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:919
 #, 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:925
 #, c-format
@@ -4399,60 +3929,48 @@ msgstr "  -a, --extract-all           extrae todas las cadenas\n"
 #, 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:937
-#, fuzzy, c-format
+#, 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)\n"
+"                                Lua, JavaScript, Vala, Desktop)\n"
 
 #: src/xgettext.c:942
 #, 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:945
 #, 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"
 
@@ -4466,8 +3984,7 @@ msgstr ""
 #: src/xgettext.c:952
 #, 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:954
 #, c-format
@@ -4491,11 +4008,9 @@ msgstr "      --boost                 reconoce los formatos de cadena Boost\n"
 
 #: src/xgettext.c:966
 #, 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:991
@@ -4506,13 +4021,11 @@ msgstr "      --properties-output     escribe un fichero .properties de Java\n"
 #: src/xgettext.c:1006
 #, 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:1008
 #, 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"
@@ -4520,19 +4033,16 @@ msgstr ""
 #: src/xgettext.c:1010
 #, 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:1012
 #, 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:1014
 #, 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"
@@ -4540,33 +4050,25 @@ msgstr ""
 #: src/xgettext.c:1016
 #, 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:1019
 #, 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:1840
 #, 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"
+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:1965
 msgid "standard input"
@@ -4594,21 +4096,13 @@ msgstr "%s%s: atención: "
 
 #: 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 ""
-"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"
+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:2190
 #, 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"
+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:2221
 #, c-format
@@ -4618,8 +4112,7 @@ msgid ""
 "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"
+"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"
@@ -4647,9 +4140,7 @@ msgstr "atención: no está presente el contexto para la palabra clave '%.*s'"
 #: src/xgettext.c:3031
 #, 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'"
+msgstr "atención: no está presente el contexto para el argumento plural de la palabra clave '%.*s'"
 
 #: src/xgettext.c:3052
 #, c-format
diff --git a/gettext-tools/po/et.po b/gettext-tools/po/et.po
index b58b7f638..56e0be1c2 100644
--- a/gettext-tools/po/et.po
+++ b/gettext-tools/po/et.po
@@ -5,11 +5,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\n"
 "PO-Revision-Date: 2001-04-30 16:25+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
-"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,25 +25,26 @@ msgid "ambiguous argument %s for %s"
 msgstr ""
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:333
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "ei suuda luua v�ljundfaili \"%s\""
 
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:347
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "ei suuda luua v�ljundfaili \"%s\""
 
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "ei suuda luua v�ljundfaili \"%s\""
 
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:458
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "ei suuda luua v�ljundfaili \"%s\""
@@ -53,45 +53,44 @@ msgstr "ei suuda luua v�ljundfaili \"%s\""
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: 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
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:194
-#, 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:198
+#: gnulib-lib/copy-file.c:73
 #, 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:202
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, fuzzy, c-format
-msgid "error reading %s"
+msgid "error reading \"%s\""
 msgstr "viga \"%s\" lugemisel"
 
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, fuzzy, c-format
-msgid "error writing %s"
+msgid "error writing \"%s\""
 msgstr "viga faili \"%s\" kirjutamisel"
 
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, 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:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
+#: 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
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:571
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
@@ -101,73 +100,74 @@ msgstr ""
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:125
 msgid "Unknown system error"
 msgstr "Tundmatu s�steemne viga"
 
-#: 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: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
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: v�ti `%s' on mitmet�henduslik\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c: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:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: v�tmel `%c%s' ei tohi olla argumente\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c: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: v�tme `%s' j�rel peab olema argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: gnulib-lib/getopt.c: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:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%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:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\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"
 msgstr "%s: vigane v�ti -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%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: v�tme j�rel peab olema argument -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c: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:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\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/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: v�tme `%s' j�rel peab olema argument\n"
-
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -179,20 +179,20 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c: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:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c: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: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
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "viga faili \"%s\" kirjutamisel"
 
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -202,148 +202,102 @@ 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:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
-#: 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: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
 #, c-format
 msgid "memory exhausted"
 msgstr "m�lu sai otsa"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
+#: 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\""
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-acl.c:46
+#: gnulib-lib/w32spawn.h:47
 #, c-format
-msgid "setting permissions for %s"
+msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr ""
 
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "ei suuda luua v�ljundfaili \"%s\""
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:84
-#, fuzzy, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "ei suuda luua v�ljundfaili \"%s\""
-
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, 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
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "viga faili \"%s\" avamisel (lugemiseks)"
-
-#: src/format.c:151
+#: src/format.c:143
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
-#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#: 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
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: 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-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
+#: 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
 #, 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: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-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: 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
 #, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' for argument %u are not the same"
+msgid ""
+"format specifications in 'msgid' and '%s' for argument %u are not the same"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
 #: src/format-boost.c:449
@@ -351,28 +305,26 @@ 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:36
+#: src/format-c.c:181
 #, 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
+#: src/format-c.c:588
 #, 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
+#: src/format-c.c:814
 #, 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: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:901 src/format-csharp.c:206 src/format-python.c:501
 #, fuzzy, c-format
-msgid "number of format specifications in '%s' and '%s' does not match"
+msgid "number of format specifications in 'msgid' and '%s' does not match"
 msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -412,58 +364,48 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:255
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:292
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:334
+#: src/format-gcc-internal.c:332
 #, 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
+#: src/format-gcc-internal.c:396
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:406
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:463
+#: src/format-gcc-internal.c:459
 #, 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
+#: src/format-gcc-internal.c:671
 #, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
+msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gfc-internal.c:386
+#: src/format-gcc-internal.c:674
 #, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
+msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -555,18 +497,19 @@ msgstr ""
 #: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-java.c:756
+#: src/format-java.c:755
 #, 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:776
+#: src/format-java.c:775
 #, fuzzy, c-format
 msgid ""
-"format specifications in '%s' and '%s' for argument {%u} are not the same"
+"format specifications in 'msgid' 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
@@ -580,11 +523,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most "
-"%u parameter."
+"In the directive number %u, too many parameters are given; expected at most %"
+"u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most "
-"%u parameters."
+"In the directive number %u, too many parameters are given; expected at most %"
+"u parameters."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -632,12 +575,12 @@ msgstr ""
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' are not equivalent"
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in '%s'"
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
 #: src/format-perl.c:433
@@ -647,79 +590,54 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: 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.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.c:115
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:354
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:430
+#: src/format-python.c:419
 #, fuzzy, c-format
 msgid ""
-"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
 msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
 
-#: src/format-python.c:437
+#: src/format-python.c:426
 #, fuzzy, c-format
 msgid ""
-"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+"mapping"
 msgstr "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
 
-#: src/format-python.c:460 src/format-sh.c:297
+#: src/format-python.c:449 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-python.c:494
+#: src/format-python.c:479
 #, fuzzy, c-format
 msgid ""
-"format specifications in '%s' and '%s' for argument '%s' are not the same"
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr ""
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr ""
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr ""
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-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' 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
@@ -756,11 +674,11 @@ msgid ""
 "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
+#: 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"
@@ -769,38 +687,38 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 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
+#: 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: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: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
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "liiga palju argumente"
 
-#: 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
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: 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:362 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
@@ -833,29 +751,29 @@ msgstr ""
 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: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
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: 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
+#: 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"
 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
+#: 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"
 msgstr ""
@@ -864,11 +782,11 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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
+#: 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"
@@ -878,322 +796,294 @@ msgstr "Vigadest teata aadressile <bug-gnu-utils@gnu.org>.\n"
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: 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
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "vaja l�heb t�pselt kahte sisendfaili"
 
-#: 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: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
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ja %s on vastastikku v�listavad"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:400
 #, 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: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/msguniq.c:342
+#: 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
 #, c-format
 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: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
 msgid "Input file location:\n"
 msgstr "sisendfail on m��ramata"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 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: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
 #, 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:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: 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
 #, 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: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
 #, 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: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
 #, 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/msgunfmt.c:493 src/msguniq.c:358
+#: 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
 #, 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:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:447
 #, 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
+#: src/msgattrib.c:449
 #, 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
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:457
 #, c-format
 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/msguniq.c:369
+#: 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
 #, 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: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
 #, 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:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: 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
 #, c-format
 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: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
 #, 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
-#, 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: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
-#, 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: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
 #, c-format
 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: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
 #, c-format
 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: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
 #, 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:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, 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:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, 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:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 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:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 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: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
 #, 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: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
 #, c-format
 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: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
 #, 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: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
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1214,31 +1104,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: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: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
 #, 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: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
 #, 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:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "lubamatu valikukriteeriumi kirjeldus (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:372
+#: src/msgcat.c:359
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1247,9 +1137,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, 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"
+"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               v�ljastab versiooniinfo ja l�petab programmi t��\n"
 "  -w, --width=NUMBER          m��rab v�ljastatava lehek�lje laiuse\n"
@@ -1266,97 +1156,105 @@ 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:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, 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:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, 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:398
 #, 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:401 src/msgcomm.c:392
 #, 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:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
+#: src/msgmerge.c:530
 #, c-format
 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:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
+#: src/msgmerge.c:532
 #, 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:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:417 src/msguniq.c:367
 #, 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:420
 #, c-format
 msgid ""
-"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+"      --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"
 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:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "sisendfailid on m��ramata"
 
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "vaja l�heb t�pselt kahte sisendfaili"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:218
+#: src/msgcmp.c:207
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1382,86 +1280,81 @@ msgstr ""
 "teated on t�lgitud. Kui t�pseid vasteid ei suudeta leida, kasutatakse parema\n"
 "diagnoosi huvides m��ratlust 'kahtlane'.\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:243 src/msgmerge.c:555
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgcmp.c:245
+#: src/msgcmp.c:232
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:247
+#: src/msgcmp.c:234
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:324
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "hoiatus: see teade on kasutamata"
 
-#: src/msgcmp.c:330
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "see teade on kasutusel, kuid kirjeldamata..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...kuid see kirjeldus on sarnane"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgcmp.c:546
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "hoiatus: see teade on kasutamata"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "leitud %d t�sine viga"
 msgstr[1] "leitud %d t�sist viga"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "v�hemalt kaks faili peab olema ette antud"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:351
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1469,7 +1362,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 extracted comments will be preserved, but only from the first\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 ""
@@ -1488,74 +1381,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:402
+#: src/msgcomm.c:389
 #, 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:433 src/xgettext.c:899
 #, 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:311
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:335
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:339
+#: src/msgconv.c:322
 #, 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:584
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, 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:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
+#: src/msgmerge.c:546
 #, 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:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
+#: src/msgmerge.c:548
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\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:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
+#: src/msgmerge.c:550
 #, 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:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "sisendfail on m��ramata"
 
-#: src/msgen.c:263
+#: src/msgen.c:233
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "vaja l�heb t�pselt kahte sisendfaili"
 
-#: src/msgen.c:304
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:309
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1564,22 +1457,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:321
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:196
+#: src/msgexec.c:194
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "argumendid on puudu"
 
-#: src/msgexec.c:257
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:262
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1589,62 +1482,67 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:271
+#: src/msgexec.c:254
 #, 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:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:345
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:355 src/msgfilter.c:664
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:296
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "argumendid on puudu"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:320
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "v�hemalt kaks faili peab olema ette antud"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:423
 #, 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:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1652,226 +1550,210 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfmt.c:345
+#: src/msgfilter.c:587
 #, c-format
-msgid "the argument to %s should be a single punctuation character"
+msgid "Not yet implemented."
 msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfilter.c:616
 #, c-format
-msgid "invalid endianness: %s"
+msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
-msgid "Ulrich Drepper"
+#: src/msgfilter.c:644
+#, c-format
+msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: src/msgfmt.c:439
+#: src/msgfilter.c:695
 #, c-format
-msgid "no input file should be given if %s and %s are specified"
+msgid "read from %s subprocess failed"
 msgstr ""
 
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
-#: src/msgunfmt.c:353
+#: src/msgfilter.c:711
 #, c-format
-msgid "%s requires a \"-d directory\" specification"
+msgid "%s subprocess terminated with exit code %d"
 msgstr ""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:302
 #, c-format
-msgid "%s requires a \"-l locale\" specification"
+msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:538
+#: src/msgfmt.c:349
 #, c-format
-msgid "%s requires a \"--template template\" specification"
+msgid "invalid endianness: %s"
 msgstr ""
 
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
+#. 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"
 msgstr ""
 
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s ja %s on vastastikku v�listavad"
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
+#, c-format
+msgid "%s requires a \"-d directory\" specification"
+msgstr ""
 
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
-msgid "%s is only valid with %s or %s"
+msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
-msgid "%s is only valid with %s, %s or %s"
+msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#. TRANSLATORS: The prefix before a statistics message.  The argument
-#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:740
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
-msgid "%s: "
+msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:599
 #, 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:749
+#: src/msgfmt.c:604
 #, 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:754
+#: src/msgfmt.c:609
 #, 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:774
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: 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:790
+#: src/msgfmt.c:645
 #, 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:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:676
 #, 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:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, 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:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1880,78 +1762,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:690
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "sisendfail on m��ramata"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:698
 #, 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:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:708
 #, 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
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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
-#, 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:886 src/xgettext.c:905
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1959,33 +1811,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:729
 #, 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:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1993,135 +1845,115 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:910
-#, 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:913
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:753
 #, 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:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:869
 #, 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:1040
+#: src/msgfmt.c:872
 #, 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:1050
+#: 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:1052
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domeeni nimi \"%s\" ei ole kasutatav failinimena"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:913
 #, 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:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:927
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "ignoreerin `domain %s' direktiivi"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:987
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "ignoreerin t�hja `msgstr' kirjet"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:988
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "ignoreerin kahtlast `msgstr' kirjet"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: hoiatus: l�htefail sisaldab kahtlast t�lget"
 
-#: src/msgfmt.c:1318
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
-#, 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: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
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "viga \"%s\" lugemisel"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:484
 #, 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:521
+#: src/msggrep.c:504
 #, 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
+#: src/msggrep.c:530
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2161,30 +1993,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:623
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:625
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:297
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:321
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2192,24 +2024,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:347
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:355
 #, 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:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:379
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2217,54 +2049,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:385
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:387
+#: src/msginit.c:375
 #, 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:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:402
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:468
+#: src/msginit.c:450
 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:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:489
+#: src/msginit.c:471
 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: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
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1118
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2276,54 +2108,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:1534
+#: src/msginit.c:1465
 #, 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:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, 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:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:202
 #, 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:207
+#: src/msgl-cat.c:206
 #, 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:391 src/msgl-iconv.c:375
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, 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: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
 msgid "warning: "
 msgstr "%s: hoiatus: "
 
-#: src/msgl-cat.c:443
+#: src/msgl-cat.c:440
 #, 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:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2332,7 +2164,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:488
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2341,7 +2173,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:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2350,12 +2182,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:100
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:105
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2363,7 +2195,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:114
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2372,7 +2204,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:128
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2380,151 +2212,157 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:130
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:141
+#: src/msgl-check.c:103
 #, 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:147
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:266
+#: src/msgl-check.c:189
 #, 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:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:338
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "vigane juhtjada"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:360
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "vigane juhtjada"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "vigane juhtjada"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:392
 #, 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:490
+#: src/msgl-check.c:408
 #, 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:514
+#: src/msgl-check.c:432
 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
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:526
+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:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:534
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' ja `msgstr[%u]' kirjed ei alga sarnaselt m�rgiga '\\n'"
 
-#: src/msgl-check.c:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:549
+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:652
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:567
+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:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:575
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' ja `msgstr[%u]' kirjed ei l�ppe sarnaselt m�rgiga '\\n'"
 
-#: src/msgl-check.c:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:590
+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:687
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:804
+#: src/msgl-check.c:695
+#, fuzzy, c-format
+msgid "headerfield `%s' missing in header\n"
+msgstr "p�ise kirjest on puudu v�li `%s'"
+
+#: src/msgl-check.c:703
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "p�ise kirjes peab v�li `%s' algama rea algusest"
+
+#: src/msgl-check.c:717
+#, 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:820
+#: src/msgl-check.c:730
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "p�ise kirjest on puudu v�li `%s'"
+msgid "field `%s' still has initial default value\n"
+msgstr "v�li `%s' sisaldab ikka veel algset v��rtust"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "viga faili \"%s\" avamisel (lugemiseks)"
 
-#: src/msgl-iconv.c:290
+#: src/msgl-iconv.c:268
 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: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
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2533,15 +2371,15 @@ msgstr ""
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt ja iconv() ei toeta \"%s\".\n"
 
-#: src/msgl-iconv.c:335
+#: src/msgl-iconv.c:320
 #, c-format
 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:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2550,16 +2388,16 @@ msgstr ""
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
 
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:361 src/msgmerge.c:367
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:453
+#: src/msgmerge.c:421
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:458
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2586,51 +2424,51 @@ msgstr ""
 "kahtlased. Kui v�ljundfaili ei ole kirjeldatud, saadetakse tulemus\n"
 "standardv�ljunisse.\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:475
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:509
+#: src/msgmerge.c:477
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:513
+#: src/msgmerge.c:481
 #, 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:487
 #, 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:499
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:501
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:535
+#: src/msgmerge.c:503
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:537
+#: src/msgmerge.c:505
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:539
+#: src/msgmerge.c:507
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2642,101 +2480,104 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:514
 #, 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:557
+#: src/msgmerge.c:523
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgmerge.c:525
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:574
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1340
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1363
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
 
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:1701
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
-#, c-format
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " valmis.\n"
 
-#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s ja %s on vastastikku v�listavad"
 
-#: src/msgunfmt.c:427
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:442
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:446
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:462
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2744,41 +2585,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:455
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "sisendfail on m��ramata"
 
-#: src/msgunfmt.c:475
+#: src/msgunfmt.c:463
 #, 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:479
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:485
+#: src/msgunfmt.c:473
 #, 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
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:513
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:331
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2791,19 +2632,19 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:364
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:366
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<stdin>"
@@ -2817,7 +2658,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:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2826,7 +2667,7 @@ msgstr ""
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt ja iconv() ei toeta \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2835,15 +2676,15 @@ msgstr ""
 "GNU libiconv tarkvara ja peale seda teha uus paigaldus tarkvarapakile\n"
 "GNU gettext\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "J�tkan siiski, vaatamate parsimisvigadele."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "J�tkan siiski."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2852,7 +2693,7 @@ msgstr ""
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2865,90 +2706,90 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "vastuoluline #~ kasutamine"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:240
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "puudub `msgstr[]' sektsioon"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:249
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "puudub `msgid_plural' sektsioon"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "puudub `msgstr' sektsioon"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "esimene mitmuse vormi indeks erineb nullist"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "mitmuse vorm omab vale indeksit"
 
-#: src/po-lex.c:90 src/po-lex.c:109
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "liiga palju vigu, katkestan t��"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "vigane multibait jada"
 
-#: src/po-lex.c:465
+#: src/po-lex.c:466
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "vigane multibait jada"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:476
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "vigane multibait jada"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:744
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "tundmatu v�tmes�na: \"%s\""
 
-#: src/po-lex.c:854
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr "vigane juhtjada"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "Ootamatu faili l�pp (fail l�ppeb poole stringi pealt)"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "reavahetus asub stringi sees"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "see fail ei tohi sisaldada domeeni direktiive"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "teade on kirjeldatud kaks korda"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:374
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...see on esimese kirjelduse asukoht"
@@ -3028,63 +2869,38 @@ msgid ""
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "viga faili \"%s\" avamisel (lugemiseks)"
 
-#: src/urlget.c:159
+#: src/urlget.c:146
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "liiga palju argumente"
 
-#: src/urlget.c:176
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:181
+#: src/urlget.c:168
 #, 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
-#, fuzzy, c-format
-msgid "error reading \"%s\""
-msgstr "viga \"%s\" lugemisel"
-
-#: src/urlget.c:234
+#: src/urlget.c:219
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "viga faili \"%s\" kirjutamisel"
 
-#: src/urlget.c:238
-#, fuzzy, c-format
-msgid "error after reading \"%s\""
-msgstr "viga \"%s\" lugemisel"
-
-#: src/urlget.c:264
-#, c-format
-msgid "Retrieving %s..."
-msgstr ""
-
-#: src/urlget.c:308
-#, c-format
-msgid " timed out.\n"
-msgstr ""
-
-#: src/urlget.c:445
-#, c-format
-msgid " failed.\n"
-msgstr ""
-
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3116,41 +2932,41 @@ msgid ""
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:231 src/write-catalog.c:275
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "ei suuda luua v�ljundfaili \"%s\""
 
-#: src/write-catalog.c:239 src/write-catalog.c:283
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "standardv�ljund"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:753
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:1091
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1210
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1213
+#: src/write-java.c:1063
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3160,13 +2976,13 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "viga faili \"%s\" avamisel (kirjutamiseks)"
 
-#: src/write-po.c:875
-#, fuzzy, c-format
+#: src/write-po.c:766
+#, c-format
 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:1326 src/write-po.c:1450
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3175,7 +2991,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3192,8 +3008,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-"
+"1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3210,13 +3026,13 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "viga faili \"%s\" kirjutamisel"
 
-#: src/write-resources.c:131
+#: src/write-resources.c:130
 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:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3234,111 +3050,99 @@ msgid ""
 "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:342 src/x-python.c:1059
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: hoiatus: l�petamata string"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: hoiatus: l�petamata string"
 
-#: src/x-c.c:1051
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: l�petamata s�mbolkonstant"
-
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: l�petamata s�mbolkonstant"
 
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: hoiatus: l�petamata string"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
-msgid "Please specify the source encoding through --from-code."
+#: 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"
 msgstr ""
 
-#: src/x-csharp.c:269
+#: src/x-csharp.c:268
 #, 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
+#: src/x-csharp.c:284
 #, 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
+#: src/x-csharp.c:296
 #, 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
+#: src/x-csharp.c:305
 #, 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:374
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:338
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: 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:1512 src/x-java.c:875
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: hoiatus: l�petamata string"
 
-#: src/x-csharp.c:2020 src/x-java.c:1369
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, 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:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:606
+#: src/x-glade.c:645
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3347,107 +3151,55 @@ msgstr ""
 "Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
 "iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
 
-#: src/x-java.c:494
+#: 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-javascript.c:230
-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:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: hoiatus: l�petamata string"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: l�petamata s�mbolkonstant"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: hoiatus: l�petamata string"
-
-#: src/x-perl.c:308
+#: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1043
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1163
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1183
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1217
+#: src/x-perl.c:1212
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: vigane v�ti -- %c\n"
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1247
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:278
+#: src/x-python.c:233
+#, 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:324
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3455,7 +3207,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:341
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3463,7 +3215,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3471,7 +3223,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:364
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3479,7 +3231,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:397
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3487,89 +3239,79 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:722
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:108
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:172
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:207
+#: src/x-rst.c:208
 #, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: hoiatus: l�petamata string"
 
-#: src/x-sh.c:1074
+#: 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/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: hoiatus: l�petamata string"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: 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:653
+#: 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:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+#: src/xgettext.c:715
+#, c-format
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "hoiatus: faili `%s' laiend `%s' on tundmatu; proovin C vormingut"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:882
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:884
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:891
+#: src/xgettext.c:798
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "sisendfail on m��ramata"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3578,85 +3320,77 @@ msgid ""
 "                                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"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:900
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:902
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:919
+#: src/xgettext.c:825
 #, 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"
+"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
+"                              preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:925
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:927
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:929
+#: src/xgettext.c:833 src/xgettext.c:840
 #, 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"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:937
+#: src/xgettext.c:837
 #, 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"
+"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
+"                              WORD means not to use default keywords)\n"
 msgstr ""
 
-#: src/xgettext.c:942
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3664,146 +3398,128 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:945
+#: src/xgettext.c:847
 #, 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"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:950
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:952
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:954
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:958
+#: src/xgettext.c:859
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:962
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:991
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:905
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:907
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:911
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
-"msgstr\n"
-"                                values\n"
+"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
+"entries\n"
 msgstr ""
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:913
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
-"msgstr\n"
-"                                values\n"
+"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
+"entries\n"
 msgstr ""
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1686
 #, 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:1965
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "standardsisend"
 
-#: src/xgettext.c:2071
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2075
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr ""
-
-#: src/xgettext.c:2080
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: hoiatus: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:1968
 #, 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:2190
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: "
-"%s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: %"
+"s\n"
 msgstr ""
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3812,61 +3528,50 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: 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"
 msgstr ""
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\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:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3035
+#, c-format
+msgid "language `%s' unknown"
 msgstr "tundmatu keel `%s'"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr ""
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: lubamatu v�ti -- %c\n"
-
-#, fuzzy
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "p�ise kirjes peab v�li `%s' algama rea algusest"
-
-#, fuzzy
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "v�li `%s' sisaldab ikka veel algset v��rtust"
-
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
 #~ "This is free software; see the source for copying conditions.  There is "
diff --git a/gettext-tools/po/eu.po b/gettext-tools/po/eu.po
index 9b16e401b..f0fd1a2b2 100644
--- a/gettext-tools/po/eu.po
+++ b/gettext-tools/po/eu.po
@@ -7,945 +7,758 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2006-10-23 23:07+0200\n"
 "PO-Revision-Date: 2007-08-31 11:36+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
-"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "%s argumentu baliogabea %s-rentzat"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:136
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "%s argumentu anbiguoa %s-rentzat"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:155
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Argumentu erabilgarria:"
 
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:322
 #, 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:346
+#: gnulib-lib/clean-temp.c:336
 #, 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:442
+#: gnulib-lib/clean-temp.c:432
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "ezin da aldiroko %s fitxategia ezabatu"
 
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:447
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "ezin da aldiroko %s direktorioa ezabatu"
 
-#: gnulib-lib/closeout.c:66
+#: gnulib-lib/closeout.c:67
 msgid "write error"
 msgstr "idazketa errorea"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: 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
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:194
-#, 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:198
-#, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+#: gnulib-lib/copy-file.c:67
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "ezin da \"%s\" babeskopia fitxategia idazketarako ireki"
 
-#: gnulib-lib/copy-file.c:202
-#, fuzzy, c-format
-msgid "error reading %s"
+#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#, c-format
+msgid "error reading \"%s\""
 msgstr "errorea \"%s\" irakurtzean"
 
-#: gnulib-lib/copy-file.c:206
-#, fuzzy, c-format
-msgid "error writing %s"
+#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#, c-format
+msgid "error writing \"%s\""
 msgstr "errorea \"%s\" idaztean"
 
-#: gnulib-lib/copy-file.c:210
-#, fuzzy, c-format
-msgid "error after reading %s"
+#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#, c-format
+msgid "error after reading \"%s\""
 msgstr "errorea \"%s\" irakurri ondoren"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c: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: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
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() -ek huts egin du"
 
-#: gnulib-lib/csharpcomp.c:571
+#: gnulib-lib/csharpcomp.c:539
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "Ez da C# konpiladorerik aurkitu, saiatu pnet instalatuaz"
 
-#: gnulib-lib/csharpexec.c:343
+#: gnulib-lib/csharpexec.c:344
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Ez da C# makina birtualik aurkitu, saiatu pnet instalatuaz"
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:125
 msgid "Unknown system error"
 msgstr "Sistema errore ezezaguna"
 
-#: 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: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
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s azpirpozesuak huts egin du"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: `%s' aukera anbiguoa da\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: 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:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' aukerak ez du argumenturik onartzen\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
+#: gnulib-lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: `--%s' aukerak argumentu bat behar du\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: `--%s' aukera ezezaguna\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
+#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: `%c%s' aukera ezezaguna\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
+#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: legezkanpoko aukera -- %c\n"
+
+#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr "%s: aukera baliogabea -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
+#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
+#: gnulib-lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: -- %c aukerak argumentu bat behar du\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: `-W %s' aukera anbiguoa da\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' aukerak ez du argumenturik onartzen\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: `--%s' aukerak argumentu bat behar du\n"
-
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
+#: gnulib-lib/javacomp.c:153
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "source_version argumentu baliogabea compile_java_class-rentzat"
 
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "target_version argumentu baliogabea compile_java_class-rentzat"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c: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:473 src/write-csharp.c:721 src/write-java.c:996
+#: src/write-java.c:1008
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Huts \"%s\" sortzerakoan"
 
-#: 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: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
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "errorea \"%s\" fitxategia idazterakoan"
 
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:1795
 #, 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:417
+#: gnulib-lib/javaexec.c:418
 #, 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:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
+#: src/msginit.c:1073
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s azpiprozesu S/I errorea"
 
-#: 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: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
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria askieza"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "huts %s azpiprozesuan idaztean"
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "Huts %s azpiprozesua irakurtzerakoan"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "%s azpiprozuarekiko komunikazioak huts egin du"
-
-#: gnulib-lib/pipe-filter-ii.c:449
+#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
+#: gnulib-lib/pipe.c:262
 #, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s azpiprozesua %d irteera kodeaz amaitu da"
+msgid "cannot create pipe"
+msgstr "ezin da tutua sortu"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:245
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:246
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-acl.c:46
+#: gnulib-lib/w32spawn.h:48
 #, c-format
-msgid "setting permissions for %s"
-msgstr ""
+msgid "DuplicateHandle failed with error code 0x%08x"
+msgstr "DuplicateHandle-ek 0x%08x errore kodeaz huts egin du"
 
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "ezin da tutua sortu"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:53
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle -ek huts egin du"
 
-#: gnulib-lib/w32spawn.h:84
-#, fuzzy, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "ezin da \"%s\" irteera fitxategia sortu"
-
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
+#: gnulib-lib/wait-process.c:367
 #, c-format
 msgid "%s subprocess"
 msgstr "%s azpiprozesua"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s azpiprozesua %d seinale konponezina jaso du"
 
-#: 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/format.c:149
 #, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "errorea \"%s\" irakurketarako irekitzerakoan"
-
-#: src/format.c:151
-#, fuzzy, c-format
-msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+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"
 
-#: 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-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: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
+#, c-format
+msgid "a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+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-lua.c:235
-#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
-#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
+#: 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
 #, 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: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-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr ""
-"'msgid' eta '%s' formatu ezarpenak ez dira berdina %u argumentuarentzat"
+#: 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-boost.c:449
+#: src/format-boost.c:427
 #, 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:36
+#: src/format-c.c:177
 #, 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:39
+#: src/format-c.c:565
 #, 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:42 src/format-gfc-internal.c:289
+#: src/format-c.c:779
 #, 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: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
-msgid "number of format specifications in '%s' and '%s' does not match"
+#: 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"
 msgstr "'msgid' eta '%s' -ren formatu espezifikazio zenbakiak ez dira berdinak"
 
-#: src/format-csharp.c:88 src/format-java.c:205
+#: src/format-csharp.c:86 src/format-java.c:203
 #, 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:109
+#: 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:130 src/format-java.c:191
-msgid ""
-"The string ends in the middle of a directive: found '{' without matching '}'."
+#: src/format-csharp.c:125 src/format-java.c:190
+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:139
+#: src/format-csharp.c:133
 #, 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:140
+#: src/format-csharp.c:134
 #, 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:161 src/format-java.c:346
-msgid ""
-"The string starts in the middle of a directive: found '}' without matching "
-"'{'."
+#: src/format-csharp.c:152 src/format-java.c:333
+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:162
+#: src/format-csharp.c:153
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:255
+#: src/format-gcc-internal.c:245
 #, 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:292
+#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
 #, 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:334
+#: src/format-gcc-internal.c:314
 #, 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."
-
-#: src/format-gcc-internal.c:398
-#, fuzzy, c-format
-msgid ""
-"In the directive number %u, a precision specification is not allowed before "
-"'%c'."
-msgstr "%u zenbakidun direktiban, zehatapena ez da onartze '%c' ondoren"
+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:406
+#: src/format-gcc-internal.c:376
 #, 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:463
+#: src/format-gcc-internal.c:424
 #, 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:677
-#, fuzzy, c-format
-msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "'msgid'-ek %%m erabiltzen du baina '%s'-ek ez"
-
-#: src/format-gcc-internal.c:680
-#, fuzzy, c-format
-msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "'msgid'-ek ez du %%m erabiltzen baina '%s'-ek %%m erabiltzen du"
-
-#: src/format-gfc-internal.c:383
-#, fuzzy, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
+#: src/format-gcc-internal.c:630
+#, c-format
+msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr "'msgid'-ek %%m erabiltzen du baina '%s'-ek ez"
 
-#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
+#: src/format-gcc-internal.c:633
+#, c-format
+msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr "'msgid'-ek ez du %%m erabiltzen baina '%s'-ek %%m erabiltzen du"
 
-#: src/format-invalid.h:22
+#: src/format-invalid.h:23
 msgid "The string ends in the middle of a directive."
 msgstr "Katea direktibaren erdian amaitzen da."
 
-#: src/format-invalid.h:25
-msgid ""
-"The string refers to arguments both through absolute argument numbers and "
-"through unnumbered argument specifications."
+#: src/format-invalid.h:26
+msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
 msgstr ""
 
-#: src/format-invalid.h:28
+#: src/format-invalid.h:29
 #, 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:30
+#: src/format-invalid.h:31
 #, 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:32
+#: src/format-invalid.h:33
 #, 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:36
+#: src/format-invalid.h:37
 #, 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:37
+#: src/format-invalid.h:38
 #, 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:40
+#: src/format-invalid.h:41
 #, 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:240
+#: src/format-java.c:237
 #, 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:251 src/format-java.c:285 src/format-java.c:314
+#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
 #, 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:274
+#: src/format-java.c:269
 #, 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:323
+#: src/format-java.c:314
 #, 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:572
+#: src/format-java.c:558
 #, 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:583
+#: src/format-java.c:569
 #, 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:745
+#: src/format-java.c:729
 #, fuzzy, 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 'msgid'"
 msgstr "a formateatu - u in s t in"
 
-#: src/format-java.c:756
+#: src/format-java.c:739
 #, 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:776
+#: src/format-java.c:759
 #, fuzzy, c-format
-msgid ""
-"format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgid "format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "formateatu in eta s - u"
 
-#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
-#: src/format-scheme.c:2375
+#: src/format-lisp.c:2352 src/format-lisp.c:2364 src/format-scheme.c:2378
+#: src/format-scheme.c:2390
 #, 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:2372 src/format-scheme.c:2398
+#: src/format-lisp.c:2387 src/format-scheme.c:2413
 #, 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:2496 src/format-scheme.c:2499
+#: src/format-lisp.c:2502 src/format-scheme.c:2505
 #, 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:2736 src/format-scheme.c:2754
+#: src/format-lisp.c:2700 src/format-scheme.c:2715
 #, fuzzy, c-format
 msgid "In the directive number %u, the argument %d is negative."
 msgstr "Handiagotu u l da."
 
-#: src/format-lisp.c:2805
+#: src/format-lisp.c:2762
 #, fuzzy
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "katea in - a."
 
-#: 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: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
 #, fuzzy, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "k k."
 
-#: src/format-lisp.c:2863 src/format-scheme.c:2860
+#: src/format-lisp.c:2808 src/format-scheme.c:2806
 #, fuzzy, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr "Handiagotu u eta."
 
-#: src/format-lisp.c:2976 src/format-scheme.c:2973
+#: src/format-lisp.c:2906 src/format-scheme.c:2904
 #, 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:3326 src/format-scheme.c:3263
+#: src/format-lisp.c:3214 src/format-scheme.c:3163
 #, 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:3432 src/format-scheme.c:3355
+#: src/format-lisp.c:3300 src/format-scheme.c:3238
 #, fuzzy
 msgid "The string refers to some argument in incompatible ways."
 msgstr "katea nori in."
 
-#: src/format-lisp.c:3474 src/format-scheme.c:3397
+#: src/format-lisp.c:3342 src/format-scheme.c:3280
 #, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' are not equivalent"
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "formateatu in eta s"
 
-#: src/format-lisp.c:3490 src/format-scheme.c:3413
+#: src/format-lisp.c:3358 src/format-scheme.c:3296
 #, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in '%s'"
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "formateatu in s a - in"
 
-#: src/format-perl.c:433
+#: src/format-perl.c:426
 #, fuzzy, 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 "Handiagotu u tamaina da honekin k."
 
-#: 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:194 src/format-python.c:443 src/format-sh.c:295
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "a formateatu - s t in s"
 
-#: src/format-python.c:115
+#: src/format-python.c:113
 #, 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:354
+#: src/format-python.c:327
 #, fuzzy, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "katea nori s in."
 
-#: src/format-python.c:430
+#: src/format-python.c:403
 #, fuzzy, c-format
-msgid ""
-"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgid "format specifications in 'msgid' expect a mapping, those in '%s' expect a tuple"
 msgstr "formateatu in a in s a"
 
-#: src/format-python.c:437
+#: src/format-python.c:410
 #, fuzzy, c-format
-msgid ""
-"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgid "format specifications in 'msgid' expect a tuple, those in '%s' expect a mapping"
 msgstr "formateatu in a in s a"
 
-#: src/format-python.c:460 src/format-sh.c:297
+#: src/format-python.c:433 src/format-sh.c:285
 #, fuzzy, 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 'msgid'"
 msgstr "a formateatu - s in s t in"
 
-#: src/format-python.c:494
+#: src/format-python.c:463
 #, fuzzy, c-format
-msgid ""
-"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgid "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "formateatu in eta s - s"
 
-#: src/format-python-brace.c:137
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "Handiagotu u k da Bielorrusiarra a."
-
-#: src/format-python-brace.c:150
-#, fuzzy, c-format
-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:165
+#: src/format-qt.c:78
 #, 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:185
-#, fuzzy, c-format
-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-brace.c:270
-#, fuzzy, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "Handiagotu u l da."
-
-#: 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 ""
+msgid "Multiple references to %%%c."
+msgstr "Anizkoitza nori k."
 
-#: src/format-sh.c:79
+#: src/format-sh.c:80
 #, 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:81
+#: src/format-sh.c:82
 #, 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:83
+#: src/format-sh.c:84
 #, 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:85
+#: src/format-sh.c:86
 #, fuzzy
 msgid "The string refers to a shell variable with an empty name."
 msgstr "katea nori a honekin hutsik."
 
-#: src/format-ycp.c:90
+#: src/format-ycp.c:83
 #, 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:91
+#: src/format-ycp.c:84
 #, fuzzy, 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 da a eta."
 
-#: 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
+#: 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"
-"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"
+"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: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
+#: 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"
 
 #. 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: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
 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:275 src/recode-sr-latin.c:131
 #, c-format
 msgid "too many arguments"
 msgstr "argumentu gehiegi"
 
-#: 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
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: 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:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Erabilera: %s [AUKERA]\n"
 
-#: src/hostname.c:215
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Makinaren ostalari izena inprimatu.\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Irteera formatua:\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 ostalari izen laburra\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          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:225
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            ostalari izenaren helbidea\n"
 
-#: 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: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
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informazio irteera:\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
+#: 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: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
+#: 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"
 
-#. 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
+#: 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/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
 #, c-format
 msgid "could not get host name"
 msgstr "ezind a ostalari izena eskuratu"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: 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
 #, c-format
 msgid "at most one input file allowed"
 msgstr "behintzat sarrera fitxategi bat onartu da"
 
-#: 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: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
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s eta %s ez dira bateragarriak"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Erabilera: %s [AUKERA] [SARFITXATEGIA]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:401
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -954,361 +767,280 @@ msgstr ""
 "Itzulpen katalogko kateak beraien atributuen arabera iragazi,\n"
 "eta beren atributuak eraldatu.\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:372 src/msgmerge.c:502 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: 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
 #, 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: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: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
 #, c-format
 msgid "Input file location:\n"
 msgstr "Sarrera fitxategi kokapena:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  SARRERA_FITXATEGIA        sarrera PO fitxatergia\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:511 src/msguniq.c:349
-#: src/xgettext.c:875
+#: 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
 #, 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:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: 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
 #, 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: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: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
 #, c-format
 msgid "Output file location:\n"
 msgstr "Irteera fitxategi kokapena:\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:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: 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
 #, 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: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/msgunfmt.c:493 src/msguniq.c:358
+#: 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
 #, 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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
 #, c-format
 msgid "Message selection:\n"
 msgstr "Mezu hautapena:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:427
 #, 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:454
+#: src/msgattrib.c:429
 #, 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:456
+#: src/msgattrib.c:431
 #, 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:458
+#: src/msgattrib.c:433
 #, 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:460
+#: src/msgattrib.c:435
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:437
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         mantendu zaharkituriko #~ mezuak\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:440
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Atributu manipulazioa:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             ezarri kate guztiak zalantza bezala\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           zalantza bandera kendu kate guztiei\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          ezarri mezu guztiak zaharkituak bezala\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:448
 #, 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              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              mantendu aurreko msgid-ak itzulitako mezuetan\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:450
 #, c-format
-msgid ""
-"      --clear-previous        remove the \"previous msgid\" from all "
-"messages\n"
-msgstr ""
-"      --clear-previous        ezabatu \"previous msgid\" mezu guztietatik\n"
-
-#: src/msgattrib.c:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --no-fuzzy              ezabatu zalantza bezala markaturiko kateak\n"
+msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
+msgstr "      --clear-previous        ezabatu \"previous msgid\" mezu guztietatik\n"
 
-#: src/msgattrib.c:482
+#: src/msgattrib.c:452
 #, 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:484
+#: src/msgattrib.c:454
 #, 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:486
+#: src/msgattrib.c:456
 #, 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:488
+#: src/msgattrib.c:458
 #, 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: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/msguniq.c:369
+#: 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
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sarrera fitxategi sintaxia:\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:393 src/msguniq.c:371
+#: 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
 #, 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: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: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
 #, 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: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: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
 #, c-format
 msgid "Output details:\n"
 msgstr "Irteera xehetasunak:\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:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
-#, 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: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: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
 #, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
+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: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: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
 #, 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 "  -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: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
-#, 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: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: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
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
+#: src/xgettext.c:854
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
+#: src/xgettext.c:856
 #, 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:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
+#: src/xgettext.c:858
 #, 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:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
+#: src/xgettext.c:860
 #, 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: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
 #, 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: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
 #, 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: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
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ZENBAKIA        irteera orri zabalera ezarri\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:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: 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
 #, 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: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
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           ordenatutako irteera sortu\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:603 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: 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
 #, 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:322 src/msgcomm.c:327
+#: src/msgcat.c:296 src/msgcomm.c:315
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "ezinezko hatapen kriterio bat ezarri da (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Erabilera: %s [AUKERA] [SARRERA_FITX]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:342
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1317,61 +1049,56 @@ 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, 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"
+"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 ""
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               sarrera fitxategiak\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
+#: src/xgettext.c:764
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Sarrera fitxategia - bada, sarrera estandarra irakurriko da.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:378 src/msgcomm.c:387
 #, 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:381
 #, 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:384 src/msgcomm.c:393
 #, 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:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgmerge.c:530
 #, 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:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgmerge.c:532
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1380,45 +1107,39 @@ msgstr ""
 "      --stringtable-input     sarrera fitxategiak NeXTstep/GNUstep .strings\n"
 "                              sintaxian daude\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=IZENA         irteeraren kodeketa\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:400 src/msguniq.c:368
 #, 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
-#, 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:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:179 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "ez da sarrera fitxategirik eman"
 
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:184 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "zehazki 2 sarrera fitxategi behar dira"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:203 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Erabilera: %s [AUKERA] def.po ref.pot\n"
 
-#: src/msgcmp.c:218
+#: src/msgcmp.c:208
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1429,87 +1150,79 @@ msgid ""
 "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 msgstr ""
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:222
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      itzulpenak\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:224
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     iturburura erreferentziak\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:229 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Operazio aldagaiak:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:231 src/msgmerge.c:521
 #, 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:243 src/msgmerge.c:555
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     ez erabili zalantza parekatzea\n"
-
-#: src/msgcmp.c:245
+#: src/msgcmp.c:233
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             konutan izan zalantzan dauden sarrerak\n"
 
-#: src/msgcmp.c:247
+#: src/msgcmp.c:235
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      kontutan izan itzuli gabeko mezuak\n"
 
-#: src/msgcmp.c:324
+#: src/msgcmp.c:306
 #, c-format
 msgid "this message is untranslated"
 msgstr "mezu hau itzuli gabe dago"
 
-#: src/msgcmp.c:330
+#: src/msgcmp.c:312
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "mezu hau itzultzaile batek gainbegiratu behar du"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:328 src/msgmerge.c:1214
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "mezu hau erabilia baina definitu gabe daago..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:331 src/msgmerge.c:1217
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...baina definizio hau oso antzekoa da"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:336 src/msgmerge.c:1245
 #, 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:546
+#: src/msgcmp.c:440
 #, c-format
 msgid "warning: this message is not used"
 msgstr "oharra: mezu hau ez da erabiltzen"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:447 src/msgfmt.c:543
 #, 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:316
+#: src/msgcomm.c:304
 #, c-format
 msgid "at least two files must be specified"
 msgstr "behintza bi fitxategi ezarri behar dira"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:352
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1517,83 +1230,77 @@ 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 extracted comments will be preserved, but only from the first\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 ""
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:390
 #, 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
-#, fuzzy, c-format
-msgid ""
-"      --omit-header           don't write header with 'msgid \"\"' entry\n"
+#: src/msgcomm.c:434 src/xgettext.c:875
+#, c-format
+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:311
+#: src/msgconv.c:295
 #, 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:335
+#: src/msgconv.c:319
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Bihurtze helburua:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:323
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Lehenetsiriko kodeketa uneko lokalaren kodeketa da.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                kokadun irteera estiloa\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           kendu '#: filename:line' lerroak\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
-#, fuzzy, c-format
-msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr ""
-"      --add-location          mantendu '#: filename:line' lerroak "
-"(lehenetsia)\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:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                Uniforum zehatz irteera estiloa\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
 #, c-format
 msgid "no input file given"
 msgstr "ez da sarrera fitxategirik eman"
 
-#: src/msgen.c:263
+#: src/msgen.c:234
 #, c-format
 msgid "exactly one input file required"
 msgstr "zehazki sarrera fitxategi bat behar da"
 
-#: src/msgen.c:304
+#: src/msgen.c:275
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Erabilera: %s [AUKERA] SAR_FITXATEGIA\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:280
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1602,22 +1309,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:321
+#: src/msgen.c:292
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INPUTFILE                   sarrera PO edo POT fitxategia\n"
 
-#: src/msgexec.c:196
+#: src/msgexec.c:195
 #, c-format
 msgid "missing command name"
 msgstr "komando izena falta da"
 
-#: src/msgexec.c:257
+#: src/msgexec.c:241
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Erabilera: %s [AUKERA] KOMANDOA [KOMANDO-AUKERA]\n"
 
-#: src/msgexec.c:262
+#: src/msgexec.c:246
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1627,192 +1334,185 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:271
+#: src/msgexec.c:255
 #, 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:265 src/msgfilter.c:413
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       sarrera PO fitxategia\n"
 
-#: src/msgexec.c:345
+#: src/msgexec.c:325
 #, c-format
 msgid "write to stdout failed"
 msgstr "huts irteera estandarrean idaztean"
 
-#: src/msgfilter.c:298
+#: 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
 #, c-format
 msgid "missing filter name"
 msgstr "iragazki izena falta da"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:325
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:400
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Erabilera: %s [AUKERA] IRAGAZKIA [IRAGAZKI-AUKERA]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:404
 #, 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:435
+#: src/msgfilter.c:428
 #, 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:433
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:435
 #, 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:437
 #, 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:440
 #, 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: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"
+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:471 src/msggrep.c:606
+#: src/msgfilter.c:458 src/msggrep.c:584
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:460
 #, 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           utzi goiburua eraldatu gabe, ez berau iragazi\n"
+
+#: src/msgfilter.c:588
+#, c-format
+msgid "Not yet implemented."
+msgstr "Oraindik ez da onartzen."
+
+#: src/msgfilter.c:617
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
-"      --keep-header           utzi goiburua eraldatu gabe, ez berau iragazi\n"
 
-#: src/msgfmt.c:345
+#: src/msgfilter.c:645
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "%s azpiprozuarekiko komunikazioak huts egin du"
+
+#: src/msgfilter.c:696
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "Huts %s azpiprozesua irakurtzerakoan"
+
+#: src/msgfilter.c:712
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "%s azpiprozesua %d irteera kodeaz amaitu da"
+
+#: src/msgfmt.c:305
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:352
 #, 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:372 src/msgunfmt.c:257 src/xgettext.c:522
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, fuzzy, c-format
-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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
-#: src/msgunfmt.c:353
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
+#: src/msgunfmt.c:342
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s-ek \"-d directory\" ezarpen bat behar du"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s-ek \"-l locale\" ezarpen bat behar du"
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s-ek \"-l locale\" ezarpen bat behar du"
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s-ek \"-l locale\" ezarpen bat behar du"
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s eta %s ez dira bateragarriak"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s bakarrik %s edo %s-rekin da erabilgarria"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s bakarrik %s, %s edo %s-rekin da erabilgarria"
 
-#. 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
-#, c-format
-msgid "%s: "
-msgstr ""
-
-#: src/msgfmt.c:744
+#: src/msgfmt.c:601
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "itzulitako kate %d"
 msgstr[1] "%d itzulitako kate"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:606
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", zalantzan kate %d"
 msgstr[1] ", %d kate zalantzan"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:611
 #, 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:774
+#: src/msgfmt.c:631
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Erabilera: %s [AUKERA] fitxategizena.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:635
 #, 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:783 src/xgettext.c:864
+#: 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"
@@ -1821,374 +1521,264 @@ msgstr ""
 "Aukera luzeentzat beharrezko argumentuak beharrezkoak dira aukera laburrentzat ere.\n"
 "Antzekoa aukerako argumentuentzat.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:647
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  fitxategizena.po ...             sarrera fitxategiak\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Funtzionamendu modua:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:656
 #, 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:801
+#: src/msgfmt.c:658
 #, 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:803
+#: src/msgfmt.c:660
 #, 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:805
+#: src/msgfmt.c:662
 #, 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:664
 #, 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:809
+#: src/msgfmt.c:666
 #, 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:811
-#, fuzzy, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --qt                    Qt modua: Qt .qm fitxategi bat sortu\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:673
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                Uniforum zehatz modua gaitu\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:675 src/xgettext.c:775
 #, 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:823
+#: src/msgfmt.c:678
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Irteera fitxategi kokapena java moduan:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
 #, 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:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
+#: src/msgunfmt.c:460 src/msgunfmt.c:470
 #, 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"
-
-#: src/msgfmt.c:829
-#, fuzzy, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --tcl                   Tcl modeua: sarrera tcl/msgcat .msg fitxategi "
-"bat da\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:831
+#: src/msgfmt.c:684
 #, 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:833
+#: src/msgfmt.c:686
 #, 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:839
+#: src/msgfmt.c:692
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Irteera fitxategi kokalekua C# moduan:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:698 src/msgunfmt.c:462
 #, 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:700
 #, 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:704
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Irteera fitxategi kokapena Tcl moduan:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:708 src/msgunfmt.c:472
 #, 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:857
+#: src/msgfmt.c:710
 #, 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:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-"  -d DIRECTORY                msg mezu katalogoen oinarri direktorioa\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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
-#, 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:886 src/xgettext.c:905
+#: src/msgfmt.c:722 src/xgettext.c:791
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Sarrera fitxategi interpretazioa:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:724
 #, 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:727
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:729
 #, 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:731
 #, 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:734
 #, 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:736
 #, 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:739
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             zalantzazko kateak erabili irteeran\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:744
 #, 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:746
 #, 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 ""
+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:913
-#, 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"
-
-#: src/msgfmt.c:922
+#: src/msgfmt.c:755
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            itzulpenaren estatistikak inprimatu\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               handitu argibide maila\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:867
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "oharra: PO fitxategi goiburua falta edo baliogabea da\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:870
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "oharra: karaktere joko bihurketak ez du funtzionatuko\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:880
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "oharra: PO fitxategi burua nahasirik\n"
 
-#: src/msgfmt.c:1052
+#: 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:1076
+#: src/msgfmt.c:906
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "\"%s\" domeinu izena ez da fixtategi izen bezala erabili"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:911
 #, 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:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:925
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "`domain %s' direktiba alde batetara utziko da"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:985
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "hutsik dagoen `msgstr' sarrera alde batetara utziko da"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:986
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "zalantzan dagoen `msgstr' sarrera alde batetara utziko da"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1035
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: oharra: jatorri fitxategiak zalantzazko itzulpenak ditu"
 
-#: src/msgfmt.c:1318
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
-#, 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: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
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "errorea \"%s\" irakurtzean"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:485
 #, 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:521
+#: src/msggrep.c:505
 #, 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
+#: src/msggrep.c:531
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2228,25 +1818,22 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:580
 #, 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:623
+#: src/msggrep.c:601
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           ordenatutako irteera sortu\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:603
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          fitxategi kokapenez ordenatu\n"
 
-#: src/msginit.c:297
+#: src/msginit.c:288
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2256,7 +1843,7 @@ msgstr ""
 "ezarri LANG ingurune aldagaia, ABOUT-NLS fitxategian azaltzen\n"
 "den moduan.  HAu beharrezkoa da itzulpenak probatu ahal izateko.\n"
 
-#: src/msginit.c:321
+#: src/msginit.c:312
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2267,12 +1854,12 @@ msgstr ""
 "Mesedez ezarri locale-a --locale aukeraren bidez edo irteera\n"
 ".po fitxategia --output-file fitxategiaren bidez.\n"
 
-#: src/msginit.c:347
+#: src/msginit.c:338
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s-ek sortua .\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:358
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2281,50 +1868,43 @@ msgstr ""
 "PO fitxategi berri bat sortu, meta informazioa erabiltzailearen inguruneko balioez\n"
 "abiarazten.\n"
 
-#: src/msginit.c:377
+#: src/msginit.c:368
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=SAR_FITXATEGIA       sarrera POT fitxategia\n"
 
-#: src/msginit.c:379
+#: src/msginit.c:370
 #, 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:385
+#: src/msginit.c:376
 #, 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:387
+#: src/msginit.c:378
 #, 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:391
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          helburu locale-a ezarri\n"
 
-#: src/msginit.c:402
+#: src/msginit.c:393
 #, 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:468
+#: src/msginit.c:449
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2332,12 +1912,12 @@ msgstr ""
 ".pot fitxategi bat baino gehiago topatu da.\n"
 "Mesedez ezarri sarrera .pot fitxategia --input aukeraren bidez.\n"
 
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:457 src/msginit.c:462
 #, c-format
 msgid "error reading current directory"
 msgstr "errorea uneko direkotrioa irakurtzerakoan"
 
-#: src/msginit.c:489
+#: src/msginit.c:470
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2345,94 +1925,84 @@ msgstr ""
 "Ez da uneko direkotrioan .pot fitxategirik aurkitu.\n"
 "Mesedez ezarri sarrera .pot fitxategia --input aukeraren bidez.\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: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
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s azpiprozesuak %d irteera kodeaz huts egin du"
 
-#: src/msginit.c:1118
+#: src/msginit.c:1051
 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:1534
+#: src/msginit.c:1438
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s paketearen Ingelesezko itzulpena"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
+#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
 #, 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:188 src/msgl-iconv.c:259
+#: src/msgl-cat.c:190 src/msgl-iconv.c:238
 #, 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:203
-#, fuzzy, c-format
-msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+#: src/msgl-cat.c:205
+#, c-format
+msgid "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "`%s' sarrera fitxategiak ez du karaktere joko ezarpena duen goibururik"
 
-#: src/msgl-cat.c:207
+#: src/msgl-cat.c:209
 #, 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:391 src/msgl-iconv.c:375
+#: src/msgl-cat.c:392 src/msgl-iconv.c:343
 #, fuzzy, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "s da a."
 
-#: 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:94
+#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
+#: src/xgettext.c:2778
 #, c-format
 msgid "warning: "
 msgstr "oharra: "
 
-#: 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 ""
-"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: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 ""
-"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"
 
-#: src/msgl-cat.c:488
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2441,7 +2011,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:95
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2454,12 +2024,12 @@ msgstr ""
 "'%s'-ren irteera okerra izan.\n"
 "Aukera posibleak:\n"
 
-#: src/msgl-charset.c:100
+#: src/msgl-charset.c:102
 #, 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:105
+#: src/msgl-charset.c:107
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2470,7 +2040,7 @@ msgstr ""
 "  orduan '%s' ezarri,\n"
 "  gero %s 'msgconv' erabiliaz atzera bihurtu.\n"
 
-#: src/msgl-charset.c:114
+#: src/msgl-charset.c:116
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2483,7 +2053,7 @@ msgstr ""
 "  orduan '%s' ezarri,\n"
 "  gero 'msgconv' erabiliaz %s-ra atzera bihurtu.\n"
 
-#: src/msgl-charset.c:128
+#: src/msgl-charset.c:130
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2494,138 +2064,133 @@ msgstr ""
 "'%s'-ren irteera okerra izan daiteke.\n"
 "Aukera bat LC_ALL=C ezartzea da.\n"
 
-#: src/msgl-check.c:130
+#: src/msgl-check.c:92
 msgid "plural expression can produce negative values"
 msgstr "espresio pluralek balio negatiboak sortu ditzakete"
 
-#: src/msgl-check.c:141
+#: src/msgl-check.c:102
 #, 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:187
+#: src/msgl-check.c:143
 msgid "plural expression can produce division by zero"
 msgstr "espresio pluralek 0-z zatiketak srotu ditzakete"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:148
 msgid "plural expression can produce integer overflow"
 msgstr "espresio pluralek zenbaki oso gainezkatze bat sortu dezakete"
 
-#: src/msgl-check.c:197
-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: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:266
+#: src/msgl-check.c:185
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Hurrengoa erabiliaz saiatu, %s-rentzat baliagarria:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:268 src/msgl-check.c:292
 msgid "message catalog has plural form translations"
 msgstr "mezu katalogoak plural moduko itzulpenak ditu"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:270
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "baina goiburuak ez du \"plural=ESPRESIOA\" atributurik"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:294
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "baina goiburuak ez du \"nplurals=ZENBAKI_OSO\" atributurik"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:330
 msgid "invalid nplurals value"
 msgstr "nplurals balio baliogabea"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:352
 msgid "invalid plural expression"
 msgstr "plural espresio baliogabea"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:382 src/msgl-check.c:398
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:384
 #, 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:490
+#: src/msgl-check.c:400
 #, 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:514
-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: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:611
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:502
+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:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:510
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' and `msgstr[%u]' sarrerak ez dira biak honela hasten: '\\n'"
 
-#: src/msgl-check.c:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:525
+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:652
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:543
+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:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:551
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' and `msgstr[%u]' sarrerak ez dira biak honela amaitzen: '\\n'"
 
-#: src/msgl-check.c:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:566
+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:687
+#: src/msgl-check.c:578
 msgid "plural handling is a GNU gettext extension"
 msgstr "plural kudeaketa GNU gettext hedapen bat da"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:620
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:630
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:804
-#, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
+#: src/msgl-check.c:670
+#, c-format
+msgid "headerfield `%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: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:820
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "`%s' goiburu eremua falta da goiburuan\n"
+#: src/msgl-check.c:705
+#, c-format
+msgid "field `%s' still has initial default value\n"
+msgstr "`%s' eremuak oraindik hasierako balioa du\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2637,48 +2202,37 @@ 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:290
+#: src/msgl-iconv.c:262
 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: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:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
+#: src/x-python.c:618 src/xgettext.c:618
 #, 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:335
+#: src/msgl-iconv.c:314
 #, 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:320 src/recode-sr-latin.c:298 src/x-python.c:625
+#: src/xgettext.c:625
 #, 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:392 src/msgmerge.c:398
+#: src/msgmerge.c:361 src/msgmerge.c:367
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s %s-rekin bakarrik da baliozkoa"
 
-#: src/msgmerge.c:453
+#: src/msgmerge.c:421
 msgid "backup type"
 msgstr "babeskopia mota"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:458
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2692,58 +2246,56 @@ msgid ""
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:475
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:509
+#: src/msgmerge.c:477
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:513
+#: src/msgmerge.c:481
 #, 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:487
 #, 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:531
+#: src/msgmerge.c:499
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Irteera fitxategi kokapena eguneraketa moduan:\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:501
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Emaiztak berriz def.po fitxategian idatziko dira.\n"
 
-#: src/msgmerge.c:535
+#: src/msgmerge.c:503
 #, 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:537
+#: src/msgmerge.c:505
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=AURRIZKI      gainidatzi babeskopia aurrizki arrunta\n"
 
-#: src/msgmerge.c:539
+#: src/msgmerge.c:507
 #, 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"
@@ -2751,147 +2303,134 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:514
 #, 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:523
 #, c-format
-msgid ""
-"      --previous              keep previous msgids of translated messages\n"
-msgstr ""
-"      --previous              mantendu aurreko msgid-ak itzulitako mezuetan\n"
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr "  -N, --no-fuzzy-matching     ez erabili zalantza parekatzea\n"
 
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:525
+#, c-format
+msgid "      --previous              keep previous msgids of translated messages\n"
+msgstr "      --previous              mantendu aurreko msgid-ak itzulitako mezuetan\n"
+
+#: src/msgmerge.c:574
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       kendu aurrerapen erakusleak\n"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1318
 #, c-format
 msgid "this message should define plural forms"
 msgstr "mezu honek plural moduak ezarri behar ditu"
 
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1341
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "uneko"
 
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:1679
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
-#, c-format
+#: src/msgmerge.c:1687
 msgid " done.\n"
 msgstr " eginda.\n"
 
-#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
+#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s eta fitxategi izen zehatzak batak bestea oztopatzen dute"
 
-#: src/msgunfmt.c:427
+#: src/msgunfmt.c:416
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Erabilera: %s [AUKERA] [FITXATEGIA]...\n"
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:420
 #, 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:440
+#: src/msgunfmt.c:429
 #, 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:442
+#: src/msgunfmt.c:431
 #, 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:444
+#: src/msgunfmt.c:433
 #, 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
+#: src/msgunfmt.c:435
 #, 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:451
+#: src/msgunfmt.c:440
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FITXATEGIA...               sarrera .mo fixtaegiak\n"
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:445
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Sarrera fitxategi kokapena Java moduan:\n"
 
-#: src/msgunfmt.c:462
+#: src/msgunfmt.c:451
 #, 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:467
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Sarrera fitxategi kokapen C# moduan\n"
 
-#: src/msgunfmt.c:475
+#: src/msgunfmt.c:464
 #, 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:479
+#: src/msgunfmt.c:468
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Sarrera fitxategi kokalekua Tcl moduan\n"
 
-#: src/msgunfmt.c:485
+#: src/msgunfmt.c:474
 #, 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
+#: src/msgunfmt.c:494
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                idatzi koskadun estiloko irteera\n"
 
-#: src/msgunfmt.c:513
+#: src/msgunfmt.c:496
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                idatzi uniforum zehatz estiloan\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:319
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2904,27 +2443,22 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:364
+#: src/msguniq.c:352
 #, 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:366
+#: src/msguniq.c:354
 #, 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:102
-#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
+#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
 msgid "<stdin>"
 msgstr "<irteera-estandarra>"
 
-#: src/po-charset.c:489
+#: src/po-charset.c:490
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -2939,8 +2473,7 @@ 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
@@ -2976,143 +2509,143 @@ msgstr ""
 "Karaktere jokoa falta da goiburuan\n"
 "Erabiltzailearen karaktere jokora mezu bihurketak ez du funtzionatuko.\n"
 
-#: src/po-gram-gen.y:93
+#: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "#~ -ren erabilera okerra"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:241
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "`msgstr[]' atala falta da"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:250
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "`msgid_plural' atala falta da"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:258
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "`msgstr' atala falta da"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "lehen plural moduak zero ez den indize bat du"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "plural moduak okerreko indize bat du"
 
-#: src/po-lex.c:90 src/po-lex.c:109
+#: src/po-lex.c:93 src/po-lex.c:112
 #, c-format
 msgid "too many errors, aborting"
 msgstr "errore gehiegi, uzten"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "multibyte sekuentzia baliogabea"
 
-#: src/po-lex.c:465
+#: src/po-lex.c:468
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "byte-anitzeko sekuentzia amaitugabea fitxategi amaieran"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:478
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "byte-anitzeko sekuentzia amaitugabea lerro amaieran"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:490
 msgid "iconv failure"
 msgstr "iconv hutsa"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:747
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "\"%s\" hitz-gakoa ezezaguna da"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:857
 #, c-format
 msgid "invalid control sequence"
 msgstr "kontrol sekuentzia baliogabea"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:984
 #, c-format
 msgid "end-of-file within string"
 msgstr "fitxategi-amaiera katerik gabe"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:990
 #, c-format
 msgid "end-of-line within string"
 msgstr "lerro-amaiera katerik gabe"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1011
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "kontestu bereizlea <EOT> katerik gabe"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:328 src/xgettext.c:907
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "fitxategi honek ez lituzke domeinu direktibak izan beharko"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:373
 msgid "duplicate message definition"
 msgstr "bikoizturiko mezu definizioa"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:375
 msgid "this is the location of the first definition"
 msgstr "hau da lehen definizioaren kokalekua"
 
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
+#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "\"%s\" fixtategia hondaturik dago"
 
-#: src/read-mo.c:129
+#: src/read-mo.c:125
 #, fuzzy, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "s hau duena a katea"
 
-#: src/read-mo.c:165 src/read-mo.c:274
+#: src/read-mo.c:161 src/read-mo.c:270
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "\"%s\" fitxategia ez da GNU .mo formatukoa"
 
-#: src/read-mo.c:178
+#: src/read-mo.c:174
 #, 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:227
+#: src/read-properties.c:223
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "warning: \\uxxxx sintasi baliogabe Unicode karaktereentzat"
 
-#: src/read-stringtable.c:802
+#: src/read-stringtable.c:804
 msgid "warning: unterminated string"
 msgstr "oharra: amaitugabeko katea"
 
-#: src/read-stringtable.c:810
+#: src/read-stringtable.c:812
 msgid "warning: syntax error"
 msgstr "oharra: sintasi errorea"
 
-#: src/read-stringtable.c:871 src/read-stringtable.c:893
+#: src/read-stringtable.c:873 src/read-stringtable.c:895
 msgid "warning: unterminated key/value pair"
 msgstr "oharra: amaitugabeko kate/balio parea"
 
-#: src/read-stringtable.c:939
+#: src/read-stringtable.c:941
 msgid "warning: syntax error, expected ';' after string"
 msgstr "oharra: sintasi errorea, ';' espero zen katearen ondoren"
 
-#: src/read-stringtable.c:948
+#: src/read-stringtable.c:950
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "oharra: sintasi errorea, '=' edo ';' espero zen katearen ondoren"
 
-#: src/recode-sr-latin.c:116
+#: src/recode-sr-latin.c:117
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "%s-ek eta %s-ek idatzia.\n"
@@ -3121,16 +2654,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:120
+#: src/recode-sr-latin.c:121
 msgid "Danilo Segan"
 msgstr "Danilo Segan"
 
-#: src/recode-sr-latin.c:153
+#: src/recode-sr-latin.c:154
 #, 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:156
+#: src/recode-sr-latin.c:157
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3139,27 +2672,27 @@ msgstr ""
 "Sarrera testua sarrera estandarretik irakurtzen da. Bihurturiko testua\n"
 "irteera estandarrera aterako da\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:332
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "sarrera ez da baliozkoa \"%s\" kodeketan"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:349
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "errorea \"%s\" kodeketatik  \"%s\" kodeketara formatua bihurtzean"
 
-#: src/urlget.c:159
+#: src/urlget.c:147
 #, c-format
 msgid "expected two arguments"
 msgstr "bi argumentu espero ziren"
 
-#: src/urlget.c:176
+#: src/urlget.c:164
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Erabilera: %s [AUKERA] URL FITXATEGIA\n"
 
-#: src/urlget.c:181
+#: src/urlget.c:169
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3168,128 +2701,92 @@ msgstr ""
 "URL batetako edukiak eskuratu eta atera.  URL-a ezin bada ebatzi,\n"
 "lokalki eskuragarri dagoen FITXATEGIA erabiliko da.\n"
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "errorea \"%s\" irakurtzean"
-
-#: src/urlget.c:234
+#: src/urlget.c:216
 #, c-format
 msgid "error writing stdout"
 msgstr "errorea irteera estandarrean idazterakoan"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "errorea \"%s\" irakurri ondoren"
-
-#: src/urlget.c:264
-#, c-format
-msgid "Retrieving %s..."
-msgstr ""
-
-#: src/urlget.c:308
-#, c-format
-msgid " timed out.\n"
-msgstr ""
-
-#: src/urlget.c:445
-#, c-format
-msgid " failed.\n"
-msgstr ""
-
-#: src/write-catalog.c:126
+#: src/write-catalog.c:102
 #, 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:129
+#: src/write-catalog.c:105
 #, 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:162
+#: src/write-catalog.c:138
 #, 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:197
+#: src/write-catalog.c:173
 #, 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:202
-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: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:231 src/write-catalog.c:275
+#: src/write-catalog.c:195
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "ezin da \"%s\" irteera fitxategia sortu"
 
-#: src/write-catalog.c:239 src/write-catalog.c:283
+#: src/write-catalog.c:204
+#, no-c-format
 msgid "standard output"
 msgstr "irteera estandarra"
 
-#: src/write-csharp.c:703
+#: 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
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "Huts \"%s\" direktorioa sortzerakoan"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:747
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "C# klase konpilazioak huts egin du, saiatu --verbose erabiliaz"
 
-#: src/write-csharp.c:768
-#, fuzzy, c-format
-msgid "compilation of C# class failed"
-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-java.c:1091
+#: src/write-java.c:945
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ez da baliozko java klase izena: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1029
 #, 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-java.c:1213
-#, fuzzy, c-format
-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-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
+#: 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-po.c:875
-#, fuzzy, c-format
-msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+#: src/write-po.c:567
+#, c-format
+msgid "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "internazionalizatutako kateek ezin dute `\\%c' ihes sekuentzia eduki"
 
-#: src/write-po.c:1326 src/write-po.c:1450
+#: src/write-po.c:848 src/write-po.c:961
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3303,7 +2800,7 @@ msgstr ""
 " garbia erabiltzean pensta ezazu.\n"
 "%s\n"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:860 src/write-po.c:973
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3317,7 +2814,7 @@ msgstr ""
 " garbia erabiltzean pensta ezazu.\n"
 "%s\n"
 
-#: src/write-qt.c:667
+#: src/write-qt.c:671
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3325,16 +2822,15 @@ msgstr ""
 "mezu katalogoak forma plural itzulpenak ditu\n"
 "baina Qt mezu katalogo formatuak ez du plural kudeaketa onartzen\n"
 
-#: src/write-qt.c:693
+#: src/write-qt.c:697
 #, 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:717
+#: src/write-qt.c:721
 #, fuzzy
 msgid ""
 "message catalog has msgid strings containing characters outside ISO-8859-1\n"
@@ -3342,40 +2838,40 @@ msgid ""
 "strings, not in the untranslated strings\n"
 msgstr "karakterera Qt formateatu Unicode in in n"
 
-#: src/write-resources.c:94
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "errorea %s azpirpozesuan idazterakoan"
 
-#: src/write-resources.c:131
+#: src/write-resources.c:132
 #, 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:150
+#: src/write-resources.c:151
 #, 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:157
+#: src/write-tcl.c:158
 #, 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:176
+#: src/write-tcl.c:177
 #, 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-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1059
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "s l katea"
@@ -3385,102 +2881,89 @@ msgstr "s l katea"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "s l"
 
-#: src/x-c.c:1051
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: oharra: Unicode karaktere baliogabea"
-
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "s l"
 
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1177
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "s l katea"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
-#, fuzzy
-msgid "Please specify the source encoding through --from-code."
+#: 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"
 msgstr "ASCII katea s s Nork n"
 
-#: src/x-csharp.c:269
+#: src/x-csharp.c:263
 #, 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:285
+#: src/x-csharp.c:279
 #, 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:297
+#: src/x-csharp.c:291
 #, 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:306
+#: src/x-csharp.c:300
 #, 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:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:309 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv hutsa"
 
-#: src/x-csharp.c:338
+#: src/x-csharp.c:332
 #, 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:1390 src/x-python.c:1138
+#: 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:1512 src/x-java.c:875
+#: src/x-csharp.c:1504 src/x-java.c:825
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "s l katea"
 
-#: src/x-csharp.c:2020 src/x-java.c:1369
+#: src/x-csharp.c:2008 src/x-java.c:1319
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: oharra: ')' aurkitu da '}' espero zen lekuan"
 
-#: src/x-csharp.c:2054 src/x-java.c:1403
+#: src/x-csharp.c:2042 src/x-java.c:1353
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: oharra: '}' aurkitu da ')'espero zen lekuan"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: 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:606
+#: src/x-glade.c:463
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3489,110 +2972,50 @@ msgstr ""
 "\"glade\" hizkuntza ez da onartzen. %s expat-en oinarritua.\n"
 "Bertsio hau expta gabe eraiki da.\n"
 
-#: src/x-java.c:494
-#, fuzzy, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "s l katea"
-
-#: src/x-javascript.c:230
-#, fuzzy
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "ASCII katea s s Nork 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"
-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:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "s l katea"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: oharra: Unicode karaktere baliogabea"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "s l katea"
-
-#: src/x-perl.c:308
+#: 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"
+msgstr "%s:%d: ez da kate amaiera aurkitzen \"%s\" fixtategi amaiera aurreko inon"
 
-#: src/x-perl.c:1043
+#: 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:1163
+#: 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:1183
+#: 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:1217
+#: 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:1230
+#: 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:1247
+#: 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:278
-#, fuzzy
+#: src/x-python.c:234
+#, 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:324
+#: src/x-python.c:282
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3600,7 +3023,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l Baliogabea Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3608,7 +3031,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l osatu gabea Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3616,7 +3039,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l Osatugabea - Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3624,7 +3047,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l Osatugabea - Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3632,128 +3055,97 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "s l Baliogabea Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:722
+#: 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:108
+#: src/x-rst.c:107
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: kate definizio baliogabea"
 
-#: src/x-rst.c:172
+#: src/x-rst.c:171
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: zenbaki bat faltda da # ondoren"
 
-#: src/x-rst.c:207
+#: src/x-rst.c:206
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: kate espresio baliogabea"
 
 #: 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: oharra: $\"...\" sintasia zaharkiturik dago segurtasun "
-"arrazoiegatik ; eval_gettext erabili horren ordez"
-
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "s l katea"
+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"
 
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:547
 #, 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"
+msgstr "--join-existing ezin da erabili irteera irteera estandarrean idazten denean"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:552
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+#: src/xgettext.c:695
+#, c-format
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "oharra: `%s' fitxategi hedaopena `%s' ezezaguna da, C probatuko da"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:746
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Irauli kate itzulgarriak emandako sarrera fitxategietatik.\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:769
 #, 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:884
+#: src/xgettext.c:771
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           idatzi irteera ezarritako fitxategian\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:773
 #, 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:891
+#: src/xgettext.c:778
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Sarrera fitxategiaren hizkuntza hautapena:\n"
 
-#: src/xgettext.c:893
-#, fuzzy, c-format
+#: src/xgettext.c:780
+#, 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, Glade)\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:900
+#: src/xgettext.c:786
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++-ren laburopena\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:788
 #, 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:907
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3762,238 +3154,159 @@ msgstr ""
 "      --from-code=NAME        sarrera fixtategien kodeket\n"
 "                                (Python, Tcl, Glade-en ezezik)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:796
 #, 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:915
+#: src/xgettext.c:801
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:803
 #, 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:919
+#: src/xgettext.c:805
 #, 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"
+"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
+"                              preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:925
+#: src/xgettext.c:809
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Hizkuntzaren aukera bereziak:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:811
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           kate guztiak atera\n"
 
-#: src/xgettext.c:929
-#, fuzzy, c-format
+#: src/xgettext.c:813 src/xgettext.c:820
+#, 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"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\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:937
-#, fuzzy, c-format
+#: src/xgettext.c:817
+#, 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"
+"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
+"                              WORD means not to use default keywords)\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:942
+#: src/xgettext.c:824
 #, 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:945
-#, fuzzy, c-format
+#: src/xgettext.c:827
+#, 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"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\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:950
+#: src/xgettext.c:831
 #, 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:952
+#: src/xgettext.c:833
 #, 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:954
+#: src/xgettext.c:835
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt formatuko kateak antzeman\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:837 src/xgettext.c:841
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (C++ hizkuntz bakarrik)\n"
 
-#: src/xgettext.c:958
-#, fuzzy, c-format
-msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --qt                    Qt formatuko kateak antzeman\n"
-
-#: src/xgettext.c:962
+#: src/xgettext.c:839
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost formatuko kateak antzeman\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:843
 #, 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:991
+#: src/xgettext.c:862
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     idatzi Java .properties fitxategi bat\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:877
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=KATEA  copyright jabea ezarri irteeran\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:879
 #, 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:1010
+#: src/xgettext.c:881
 #, c-format
-msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr ""
+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:1012
-#, fuzzy, c-format
-msgid "      --package-version=VERSION  set package version in output\n"
-msgstr "      --copyright-holder=KATEA  copyright jabea ezarri irteeran\n"
-
-#: src/xgettext.c:1014
+#: src/xgettext.c:883
 #, 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"
-
-#: src/xgettext.c:1016
-#, fuzzy, c-format
-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"
+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:1019
-#, fuzzy, c-format
-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:885
+#, 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"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1649
 #, 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:1965
+#: src/xgettext.c:1750
 msgid "standard input"
 msgstr "sarrera estandarra"
 
-#: src/xgettext.c:2071
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2075
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr ""
-
-#: src/xgettext.c:2080
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: 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:2189
+#: src/xgettext.c:1933
 #, c-format
-msgid ""
-"Although being used in a format string position, the %s is not a valid %s "
-"format string. Reason: %s\n"
+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:2190
+#: src/xgettext.c:1934
 #, c-format
-msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: "
-"%s\n"
+msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:1965
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4002,7 +3315,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2023
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4012,32 +3325,30 @@ msgstr ""
 "gettext(\"\")-ek meta informazioa duen goiburua\n"
 "itzultzen du, ez date hutsa.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2626
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "oharra: argumentu ezarpen zalanatzagarria '%.*s' hitz-gakoarentzat"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2653
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "oharra: kontestua falta da '%.*s' hitz-gakoarentzat"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2678
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr ""
-"oharra: kontestua falta da '%.*s' hitz-gakoaren plural arumentuarentzat"
+msgstr "oharra: kontestua falta da '%.*s' hitz-gakoaren plural arumentuarentzat"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2699
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "kontestu parekatze okerra formatu singular eta pluralaren artean"
 
-#: src/xgettext.c:3419
-#, fuzzy
+#: src/xgettext.c:2779
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\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 ""
@@ -4046,57 +3357,11 @@ msgstr ""
 "MSGID_BUGS_ADDRESS aldagaia hor; bestela mesedez ezarri\n"
 "--msgid-bugs-address aukera komando lerroan.\n"
 
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:2978
+#, c-format
+msgid "language `%s' unknown"
 msgstr "`%s' hizkuntza ezezaguna"
 
-#: libgettextpo/gettext-po.c:84
+#: libgettextpo/gettext-po.c:85
 msgid "<unnamed>"
 msgstr "<izengabea>"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: legezkanpoko aukera -- %c\n"
-
-#~ msgid "DuplicateHandle failed with error code 0x%08x"
-#~ msgstr "DuplicateHandle-ek 0x%08x errore kodeaz huts egin du"
-
-#, fuzzy
-#~ msgid "Multiple references to %%%c."
-#~ msgstr "Anizkoitza nori k."
-
-#~ 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"
-
-#~ msgid "Not yet implemented."
-#~ msgstr "Oraindik ez da onartzen."
-
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "`%s' goiburu eremua lerro hasieran hasi behar da\n"
-
-#~ 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"
diff --git a/gettext-tools/po/fi.po b/gettext-tools/po/fi.po
index 802e786e4..67dc0d348 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.18.3\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2013-06-25 17:48+0900\n"
 "PO-Revision-Date: 2013-06-29 12:09+0300\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -36,14 +36,12 @@ msgstr "Kelvolliset argumentit ovat:"
 #: gnulib-lib/clean-temp.c:332
 #, 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:346
 #, 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:442
 #, c-format
@@ -185,15 +183,15 @@ msgstr "virheellinen source_version-argumentti kohteelle compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "virheellinen target_version-argumentti kohteelle compile_java_class"
 
-#: 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:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "tiedoston ”%s” luominen epäonnistui"
 
 #: 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
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "virhe kirjoitettaessa tiedostoa ”%s”"
@@ -201,14 +199,12 @@ msgstr "virhe kirjoitettaessa tiedostoa ”%s”"
 #: gnulib-lib/javacomp.c:2343
 #, 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:905 src/msginit.c:980
 #: src/msginit.c:1140
@@ -216,9 +212,9 @@ msgstr ""
 msgid "%s subprocess I/O error"
 msgstr "%s aliprosessisiirräntävirhe"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
+#: 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:548 libgettextpo/gettext-po.c:1326
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "muisti loppui"
@@ -230,7 +226,7 @@ msgid "creation of threads failed"
 msgstr "säikeiden luominen epäonnistui"
 
 #: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "kirjoittaminen aliprosessiin %s epäonnistui"
@@ -317,8 +313,8 @@ msgid "%s subprocess got fatal signal %d"
 msgstr "%s aliprosessi vastaanotti fataalin signaalin %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/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
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "virhe avattaessa tiedostoa ”%s” lukemista varten"
@@ -333,11 +329,8 @@ msgstr "’%s’ ei ole kelvollinen %s-muotomerkkijono, toisin kuin ’%s’. Sy
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
-msgstr ""
-"muotomäärittelyä argumentille %u sellaisena kuin merkkijonossa ’%s’, ei ole "
-"olemassa merkkijonossa ’%s’"
+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-librep.c:323 src/format-lua.c:235
@@ -355,9 +348,7 @@ msgstr "muotomäärittelyä argumentille %u ei ole merkkijonossa ’%s’"
 #: 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:449
 #, c-format
@@ -367,35 +358,25 @@ msgstr "Direktiivinumero %u alkaa merkillä | mutta ei pääty merkkeihin |."
 #  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: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: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: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: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
 #, 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:88 src/format-java.c:205
 #, c-format
@@ -408,37 +389,27 @@ 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:130 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 "
-"’}’."
+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:139
 #, 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:140
 #, 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:161 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 ’{’."
+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:162
 #, 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
@@ -452,20 +423,13 @@ 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
@@ -502,68 +466,43 @@ 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: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:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
@@ -572,19 +511,13 @@ msgstr "Direktiivissä numero %u pilkku ei seuraa merkkijonoa ”%s”."
 
 #: 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: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:572
 #, c-format
@@ -593,20 +526,13 @@ msgstr "Direktiivissä numero %u valinta ei sisällä numeroa."
 
 #: 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: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:756
 #, c-format
@@ -615,36 +541,21 @@ msgstr "muotomäärittelyä argumentille {%u} ei ole merkkijonossa ’%s’"
 
 #: 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-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 ""
-"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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -674,157 +585,110 @@ msgstr "Direktiivissä numero %u annettiin sekä @- että :-määritteet."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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:3326 src/format-scheme.c:3263
 #, 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:3432 src/format-scheme.c:3355
 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:3474 src/format-scheme.c:3397
 #, 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:3490 src/format-scheme.c:3413
 #, 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"
+msgstr "muotomäärittelyt merkkijonossa ’%s’ eivät ole merkkijonon ’%s’ muotomäärittelyiden osajoukko"
 
 #: 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."
+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-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
 #: 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: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."
+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 "The string refers to the argument named '%s' in incompatible ways."
-msgstr ""
-"Merkkijono viittaa argumenttiin nimeltään ’%s’ yhteensopimattomilla tavoilla."
+msgstr "Merkkijono viittaa argumenttiin nimeltään ’%s’ yhteensopimattomilla tavoilla."
 
 #: src/format-python.c:430
 #, 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 "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.c:437
 #, 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 "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.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 ""
-"muotomäärittelyä argumentille ’%s’, kuten merkkijonossa ’%s’:ssä, ei löydy "
-"merkkijonosta ’%s’"
+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.c:494
 #, 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 "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-python-brace.c:137
+#: src/format-python-brace.c:136
 #, 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ä."
 
-#: src/format-python-brace.c:150
+#: src/format-python-brace.c:149
 #, 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."
+msgstr "Direktiivissä numero %u merkki ’%c’ ei voi aloittaa getattr-argumenttia."
 
-#: src/format-python-brace.c:165
+#: src/format-python-brace.c:164
 #, 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."
+msgstr "Direktiivissä numero %u merkki ’%c’ ei voi aloittaa getitem-argumenttia."
 
-#: src/format-python-brace.c:185
+#: src/format-python-brace.c:184
 #, 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 "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-brace.c:270
+#: src/format-python-brace.c:210
 #, 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."
 
 #: 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: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: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ä."
+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: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ä."
+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:85
 msgid "The string refers to a shell variable with an empty name."
@@ -832,24 +696,20 @@ msgstr "Merkkijono viittaa komentoikkunamuuttujaan, jolla on tyhjä nimi."
 
 #: 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: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 "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: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
+#: 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"
@@ -862,19 +722,19 @@ msgstr ""
 "Tämä on vapaa ohjelmisto ja sen muuttaminen ja levittäminen edelleen on sallittua.\n"
 "Ohjelmalle EI ANNETA TAKUUTA lain sallimissa rajoissa.\n"
 
-#: src/hostname.c:184 src/msgattrib.c: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
+#: 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 "Kirjoittanut %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/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
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
@@ -884,11 +744,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "liian monta argumenttia"
 
-#: 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
+#: 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
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Komento ’%s --help’ antaa lisää tietoja.\n"
@@ -916,12 +776,10 @@ msgstr "  -s, --short                 lyhyt tietokonenimi\n"
 #: src/hostname.c:222
 #, 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:225
@@ -929,29 +787,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            osoitteet tietokoneelle\n"
 
-#: 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: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
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Selittävä tuloste:\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
+#: 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äytä tämä ohje ja poistu\n"
 
-#: 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
+#: 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               tulosta ohjelman versiotiedot ja poistu\n"
@@ -960,44 +818,45 @@ msgstr "  -V, --version               tulosta ohjelman versiotiedot ja poistu\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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
+#: 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 ""
-"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"
 
 #: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
 msgstr "ei saatu tietokonenimeä"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: 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
 #, c-format
 msgid "at most one input file allowed"
 msgstr "enintään yksi syötetiedosto on sallittu"
 
-#: 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: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
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "valitsimet %s ja %s ovat toisensa poissulkevia"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:414 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:419
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1006,139 +865,128 @@ msgstr ""
 "Suodattaa käännösluettelon viestit niiden attribuuttien mukaan,\n"
 "ja manipuloi attribuutteja.\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:372 src/msgmerge.c:502 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: 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
 #, 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: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: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
 #, c-format
 msgid "Input file location:\n"
 msgstr "Syötetiedostosijainti:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  SYÖTETIEDOSTO               syötteen PO-tiedosto\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:511 src/msguniq.c:349
-#: src/xgettext.c:875
+#: 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
 #, 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:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: 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
 #, 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: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: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
 #, c-format
 msgid "Output file location:\n"
 msgstr "Tulostetiedostosijainti:\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:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: 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
 #, 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: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/msgunfmt.c:493 src/msguniq.c:358
+#: 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
 #, 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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Viestivalinta:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:445
 #, 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:454
+#: src/msgattrib.c:447
 #, 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:456
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              poista ’fuzzy’-merkityt vajaat viestit\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            pidä ’fuzzy’-merkityt vajaat viestit\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           poista vanhentuneet #~ -viestit\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         pidä vanhentuneet #~ -viestit\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Attribuuttimanipulointi:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             aseta kaikki viestit vajaiksi\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           aseta kaikki viestit epävajaiksi\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          aseta kaikki viestit vanhentuneiksi\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        aseta kaikki sanomat ei-vanhentuneiksi\n"
 
-#: src/msgattrib.c:475
+#: src/msgattrib.c:468
 #, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
@@ -1147,234 +995,182 @@ msgstr ""
 "      --previous              kun asetetaan vajaiksi, säilytä käännettyjen\n"
 "                              viestien aikaisemmat msgid-merkkijonot\n"
 
-#: src/msgattrib.c:478
+#: src/msgattrib.c:471
 #, c-format
-msgid ""
-"      --clear-previous        remove the \"previous msgid\" from all "
-"messages\n"
-msgstr ""
-"      --clear-previous        poista \"previous msgid\" kaikista viesteistä\n"
-
-#: src/msgattrib.c:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --no-fuzzy              poista ’fuzzy’-merkityt vajaat viestit\n"
+msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
+msgstr "      --clear-previous        poista \"previous msgid\" kaikista viesteistä\n"
 
-#: src/msgattrib.c:482
+#: src/msgattrib.c:473
 #, 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:484
+#: src/msgattrib.c:475
 #, 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:486
+#: src/msgattrib.c:477
 #, 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:488
+#: src/msgattrib.c:479
 #, 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: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/msguniq.c:369
+#: 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
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syötetiedoston syntaksi:\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:393 src/msguniq.c:371
+#: 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
 #, 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: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: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
 #, 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: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: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
 #, c-format
 msgid "Output details:\n"
 msgstr "Tulosteen yksityiskohdat:\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:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: 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
 #, 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: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: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
 #, 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: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: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
 #, 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: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: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
 #, 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: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: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
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:960
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:962
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:964
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:966
 #, 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: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: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
 #, 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: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: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
 #, 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: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: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
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMERO          aseta tulostesivun leveys\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:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: 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
 #, 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: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: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
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           tuota lajiteltu tuloste\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:603 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: 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
 #, 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:322 src/msgcomm.c:327
+#: 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:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, 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:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1397,66 +1193,58 @@ msgstr ""
 "--use-first on määritelty. Silloin ne otetaan ensimmäisestä PO-tiedostosta,\n"
 "joka on määritellyt ne.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  SYÖTETIEDOSTO ...           syötetiedostot\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:850
 #, 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: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:319 src/msgfmt.c:674
+#: src/xgettext.c:854
 #, 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: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=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: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=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: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                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:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:739
+#: src/msgmerge.c:557
 #, 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:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1465,45 +1253,42 @@ msgstr ""
 "      --stringtable-input     syötetiedostot ovat NeXTstep/GNUstep .strings\n"
 "                              -syntaksissa\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NIMI          koodaus tulosteelle\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      --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:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
-msgid ""
-"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+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:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "syötetiedostoja ei annettu"
 
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, 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:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Käyttö: %s [VALITSIN] def.po ref.pot\n"
@@ -1536,21 +1321,17 @@ msgstr "  def.po                      käännökset\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     viitteet lähteisiin\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Toimintomääreet:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
-msgid ""
-"  -m, --multi-domain          apply ref.pot to each of the domains in def."
-"po\n"
-msgstr ""
-"  -m, --multi-domain          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:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     älä käytä vajaustäsmäystä\n"
@@ -1575,40 +1356,39 @@ msgstr "tämä viesti on kääntämättä"
 msgid "this message needs to be reviewed by the translator"
 msgstr "kääntäjän on katselmoitava tämä viesti"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, 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:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...mutta tämä määrittely on samanlainen"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, 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:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "varoitus: tätä viestiä ei käytetä"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:545
 #, 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:316
+#: 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: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"
@@ -1629,81 +1409,74 @@ 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: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=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:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, 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:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Muuntaa käännösluettelon eri merkkikoodaukseen.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Muunnoskohde:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Oletuskoodaus on nykyisen paikallisasetuksen koodaus.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                sisennetty tulostetyyli\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           vaienna ’#: filename:line’ -rivit\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
-#, fuzzy, c-format
-msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr ""
-"      --add-location          säilytä ’#: filename:line’ -rivit (oletus)\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          säilytä ’#: filename:line’ -rivit (oletus)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                tiukka Uniforum-tulostetyyli\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "syötetiedostoa ei annettu"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "tarvitaan täsmälleen yksi syötetiedosto"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Käyttö: %s [VALITSIN] SYÖTETIEDOSTO\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1716,7 +1489,7 @@ 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:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  SYÖTETIEDOSTO               syötteen PO- tai POT-tiedosto\n"
@@ -1755,7 +1528,7 @@ msgstr ""
 "Erityinen sisäinen komento nimeltä ’0’ tulostaa käännöksen ja nollatavun.\n"
 "”msgexec 0”:n tuloste kelpaa syötteeksi ”xargs -0”:lle.\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=SYÖTETIEDOSTO   syöte-PO-tiedosto\n"
@@ -1765,184 +1538,149 @@ msgstr "  -i, --input=SYÖTETIEDOSTO   syöte-PO-tiedosto\n"
 msgid "write to stdout failed"
 msgstr "kirjoittaminen vakiotulosteeseen epäonnistui"
 
-#: src/msgfilter.c:298
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "puuttuva suodatinnimi"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, 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:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Käyttö: %s [VALITSIN] SUODATIN [SUODATTIMEN VALITSIN]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, 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:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
-"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:440
+#: src/msgfilter.c:421
 #, 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:442
+#: src/msgfilter.c:423
 #, 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:444
+#: src/msgfilter.c:425
 #, 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:447
+#: src/msgfilter.c:428
 #, 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:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
-msgid ""
-"      --no-escape             do not use C escapes in output (default)\n"
-msgstr ""
-"      --no-escape             ä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:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                sisennetty tulostetyyli\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, 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/msgfmt.c:345
+#: src/msgfmt.c:304
 #, 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:392
+#: src/msgfmt.c:351
 #, 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:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, fuzzy, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr "Jos syötetiedostoa ei ole annettu tai se on -, luetaan vakiosyöte.\n"
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "valitsin %s vaatii ”-d directory”-määrittelyn"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "valitsin %s vaatii ”-l locale”-määrittelyn"
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "valitsin %s vaatii ”-l locale”-määrittelyn"
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "valitsin %s vaatii ”-l locale”-määrittelyn"
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "valitsimet %s ja %s ovat toisensa poissulkevia"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 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:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "valitsin %s on kelvollinen vain valitsimen %s, %s tai %s kanssa"
 
 #. 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:620
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:624
 #, 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:749
+#: src/msgfmt.c:629
 #, 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:754
+#: src/msgfmt.c:634
 #, 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:774
+#: src/msgfmt.c:654
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Käyttö: %s [VALITSIN] tiedosto.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:658
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
-msgstr ""
-"Tuota binäärimuotoisia viestiluetteloita tekstimuotoisesta "
-"käännöskuvauksesta.\n"
+msgstr "Tuota binäärimuotoisia viestiluetteloita tekstimuotoisesta käännöskuvauksesta.\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: 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"
@@ -1951,114 +1689,81 @@ msgstr ""
 "Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n"
 "Valinnaiset argumentit vastaavasti.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:670
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  tiedosto.po ...             syötetiedostot\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Toimintatila:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:679
 #, 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:801
+#: src/msgfmt.c:681
 #, 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:803
+#: src/msgfmt.c:683
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C#-tila: tuota .NET .dll -tiedosto\n"
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:685
 #, 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:807
+#: src/msgfmt.c:687
 #, 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:809
+#: src/msgfmt.c:689
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt-tila: tuota Qt .qm -tiedosto\n"
 
-#: src/msgfmt.c:811
-#, fuzzy, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --qt                    Qt-tila: tuota Qt .qm -tiedosto\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:696
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                ota käyttöön tiukka Uniforum-tila\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, 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:823
+#: src/msgfmt.c:701
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Tulostetiedostosijainti Java-tilassa:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:703 src/msgfmt.c:717 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: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:705 src/msgfmt.c:719 src/msgfmt.c:729 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"
-
-#: src/msgfmt.c:829
-#, fuzzy, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --tcl                   Tcl-tila: syöte on tcl/msgcat .msg -tiedosto\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:831
+#: src/msgfmt.c:707
 #, 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:833
+#: src/msgfmt.c:709
 #, 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 ""
@@ -2066,41 +1771,36 @@ msgstr ""
 "erottamalla ne alaviivalla.  Valitsin -d on pakollinen.  Luokka on\n"
 "kirjoitettu määriteltyyn hakemistoon.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:715
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Tulostetiedostosijainti C#-tilassa:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:721 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:847
+#: src/msgfmt.c:723
 #, 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:851
+#: src/msgfmt.c:727
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tulostetiedostosijainti Tcl-tilassa:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:731 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:857
+#: src/msgfmt.c:733
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2109,224 +1809,156 @@ msgstr ""
 "Valitsimet -l ja -d ovat pakollisia.  Tiedosto .msg kirjoitetaan\n"
 "määriteltyyn hakemistoon.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d HAKEMISTO                perushakemisto .msg-viestiluetteloille\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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      etsi WORD-argumentti lisäavainsanana\n"
-"  -k, --keyword               älä käytä oletusavainsanoja\n"
-
-#: src/msgfmt.c:874
-#, 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:886 src/xgettext.c:905
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Syötetiedoston tulkinta:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:747
 #, 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:891
+#: src/msgfmt.c:750
 #, 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:893
+#: src/msgfmt.c:752
 #, 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:895
+#: src/msgfmt.c:754
 #, 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:898
+#: src/msgfmt.c:757
 #, 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:900
+#: src/msgfmt.c:759
 #, 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:903
+#: src/msgfmt.c:762
 #, 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:908
+#: src/msgfmt.c:767
 #, 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:910
+#: src/msgfmt.c:769
 #, 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:913
+#: src/msgfmt.c:772
 #, 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:922
+#: src/msgfmt.c:781
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            tulosta tilastot käännöksistä\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:783 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               kasvata laveustasoa\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:897
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "varoitus: PO-tiedoston otsake puuttuu tai on virheellinen\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:900
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "varoitus: merkistömuunnos ei tule toimimaan\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:910
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "varoitus: PO-tiedoston otsake on merkitty vajaaksi\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:912
 #, 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:1076
+#: src/msgfmt.c:936
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nimiavaruusnimi ”%s” ei ole sopiva tiedostonimenä"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:941
 #, 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:1095
+#: src/msgfmt.c:955
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "’nimiavaruus %s’-direktiivi ohitetaan"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1015
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "tyhjä ’msgstr’-merkkijono jätetty huomioimatta"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1016
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "vajaa ’msgstr’-merkkijono jätetty huomioimatta"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1065
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: varoitus: lähdetiedosto sisältää vajaan käännöksen"
 
-#: src/msgfmt.c:1318
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
-#, 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-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:176
+#: 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
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "virhe luettaessa tiedostoa ”%s”"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
-msgid ""
-"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
-"specified"
-msgstr ""
-"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:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2336,7 +1968,7 @@ msgstr ""
 "tai kuuluvat johonkin annetuista lähdetiedostoista.\n"
 
 #  Pistekommentti viittaan kommenttiriviin, joka alkaa merkeillä "#. "
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2412,25 +2044,20 @@ msgstr ""
 "  -v, --invert-match          tulosta vain viestit, jotka eivät täsmää mihinkään\n"
 "                              valintakriteeriin\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, 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:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           tuota lajiteltu tuloste\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr ""
-"      --sort-by-file          lajitttele tuloste tiedoston sijainnin "
-"perusteella\n"
+msgstr "      --sort-by-file          lajitttele tuloste tiedoston sijainnin perusteella\n"
 
 #: src/msginit.c:297
 msgid ""
@@ -2473,19 +2100,16 @@ msgstr "  -i, --input=SYÖTETIEDOSTO   syötteen POT-tiedosto\n"
 #: src/msginit.c:379
 #, 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:385
 #, 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:387
 #, c-format
@@ -2493,10 +2117,8 @@ 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:400
 #, c-format
@@ -2505,10 +2127,8 @@ msgstr "  -l, --locale=LL_CC          aseta kohdepaikallisasetus\n"
 
 #: src/msginit.c:402
 #, 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:468
 msgid ""
@@ -2540,16 +2160,12 @@ msgstr "%s aliprosessi epäonnistui poistumiskoodilla %d"
 
 #: src/msginit.c:1118
 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.
@@ -2572,18 +2188,13 @@ msgstr "kaksi erilaista merkistöä ”%s” ja ”%s” syötetiedostossa"
 
 #: 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: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:391 src/msgl-iconv.c:375
 #, c-format
@@ -2592,7 +2203,7 @@ msgstr "kohdemerkistö %s” ei ole siirrettävä koodausnimi."
 
 #: 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/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "varoitus: "
@@ -2609,13 +2220,11 @@ msgstr ""
 #: src/msgl-cat.c:449
 #, 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"
 
@@ -2658,11 +2267,9 @@ msgid ""
 "  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:114
 #, c-format
@@ -2675,8 +2282,7 @@ 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:128
 #, c-format
@@ -2707,12 +2313,8 @@ msgid "plural expression can produce integer overflow"
 msgstr "monikkolauseke voi aiheuttaa kokonaisluvun ylivuodon"
 
 #: src/msgl-check.c:197
-msgid ""
-"plural expression can produce arithmetic exceptions, possibly division by "
-"zero"
-msgstr ""
-"monikkolauseke voi aiheuttaa aritmeettisia poikkeuksia, mahdollisesti jaon "
-"nollalla"
+msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+msgstr "monikkolauseke voi aiheuttaa aritmeettisia poikkeuksia, mahdollisesti jaon nollalla"
 
 #: src/msgl-check.c:266
 #, c-format
@@ -2759,12 +2361,8 @@ msgstr[0] "mutta joillakin viesteillä on yksi monikkomuoto"
 msgstr[1] "mutta joillakin viesteillä on %lu monikkomuotoa"
 
 #: 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 ""
-"viestiluettelossa on monikkomuotoisia käännöksiä, mutta siitä puuttuu "
-"otsakerivi \"Plural-Forms: nplurals=KOKONAISLUKU; plural=LAUSEKE;\""
+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:611
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
@@ -2801,17 +2399,17 @@ msgstr "monikkomuotojen käsittely on GNU gettext -laajennos"
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr-merkkijonosta puuttuu pikanäppäinmerkki ’%c’"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, 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:804
+#: src/msgl-check.c:801
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "otsakekenttä ’%s’ on edelleen oletusarvossaan\n"
 
-#: src/msgl-check.c:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "otsakekenttä ’%s’ puuttuu otsakkeessa\n"
@@ -2831,44 +2429,32 @@ 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:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/x-python.c:665 src/xgettext.c:708
 #, 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:335
 #, 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:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/xgettext.c:715
 #, 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:392 src/msgmerge.c:398
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "valitsin %s on kelvollinen vain valitsimen %s kanssa"
 
-#: src/msgmerge.c:453
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "varmuuskopiotyyppi"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2891,19 +2477,17 @@ 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:507
+#: src/msgmerge.c:502
 #, 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:509
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     viittaa uusiin lähdekoodeihin\n"
 
-#: src/msgmerge.c:513
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2912,42 +2496,39 @@ msgstr ""
 "  -C, --compendium=TIEDOSTO   viestikäännösten lisäkirjasto,\n"
 "                              saatetaan määritellä useammin kuin kerran\n"
 
-#: src/msgmerge.c:519
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 "  -U, --update                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:531
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Tulostetiedostosijainti päivitystilassa:\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Tulos kirjoitetaan takaisin tiedostoon def.po.\n"
 
-#: src/msgmerge.c:535
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        tee tiedoston def.po varmuuskopio\n"
 
-#: src/msgmerge.c:537
+#: src/msgmerge.c:532
 #, 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:539
+#: src/msgmerge.c:534
 #, 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"
@@ -2956,58 +2537,48 @@ 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:546
+#: src/msgmerge.c:541
 #, 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:557
+#: src/msgmerge.c:552
 #, 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:614 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       vaienna edistymisindikaattorit\n"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "tämän viestin pitäisi määritellä monikkomuodot"
 
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1627
 #, 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:2035
+#: src/msgmerge.c:2030
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -3016,8 +2587,7 @@ msgstr " valmis.\n"
 #: 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:427
 #, c-format
@@ -3027,17 +2597,12 @@ msgstr "Käyttö: %s [VALITSIN] [TIEDOSTO]...\n"
 #: 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: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:442
 #, c-format
@@ -3046,19 +2611,13 @@ msgstr "      --csharp                C#-tila: syöte on .NET .dll -tiedosto\n"
 
 #: 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: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:451
 #, c-format
@@ -3073,8 +2632,7 @@ msgstr "Syötetiedostosijainti Java-tilassa:\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 ""
 "Luokkanimi määritellään liittämällä paikallisasetuksen nimi resurssinimeen,\n"
@@ -3118,7 +2676,7 @@ msgstr "  -i, --indent                kirjoita sisennettyä tulostetyyliä\n"
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                kirjoita tiukkaa uniforum-tyyliä\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3140,19 +2698,15 @@ msgstr ""
 "käännöksestä.  Tiedostosijainnit kumuloituvat. Kun käytetään valitsinta\n"
 "--unique, kaksoiskappaleet hylätään.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              tulosta vain kaksoiskappaleet\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, 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:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
@@ -3215,27 +2769,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "epäjohdonmukainen #~ -käyttö"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "puuttuva ’msgid_plural[]’-rivi"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "puuttuva ’msgid_plural’-rivi"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "puuttuva ’msgstr’-rivi"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "ensimmäisellä monikkomuodolla on nollasta poikkeava indeksi"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "monikkomuodolla on väärä indeksi"
@@ -3245,7 +2799,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:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:740 src/write-po.c:869
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "virheellinen monitavusekvenssi"
@@ -3289,16 +2843,16 @@ msgstr "rivinvaihto merkkijonon sisällä"
 msgid "context separator <EOT> within string"
 msgstr "kontekstierotin <EOT> merkkijonon sisällä"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "tämä tiedosto ei ehkä sisällä nimiavaruusdirektiivejä"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "kaksinkertainen viestimäärittely"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "ensimmäinen määrittely täällä"
 
@@ -3320,9 +2874,7 @@ msgstr "tiedosto ”%s” ei ole GNU:n .mo-muodossa"
 #: src/read-mo.c:178
 #, 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:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
@@ -3436,46 +2988,24 @@ msgid " failed.\n"
 msgstr " epäonnistui.\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 ""
-"Useiden käännösnimiavaruuksien tulostaminen yhteen tiedostoon määritellyssä "
-"tulostemuodossa epäonnistui. Yritä käyttää sen sijaan PO-tiedostosyntaksia."
+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:129
-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."
+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:162
-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ä."
+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: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 ""
-"viestiluettelossa on monikkkomuotokäännöksiä, mutta tulostemuoto ei tue "
-"niitä. Yritä tuottaa Java-luokka käyttäen komentoa \"msgfmt --java\", eikä "
-"ominaisuustiedostoa."
+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:202
-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ä."
+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:231 src/write-catalog.c:275
 #, c-format
@@ -3503,21 +3033,19 @@ msgstr "epäonnistunut C#-luokan kääntäminen, yritä valitsinta --verbose"
 msgid "compilation of C# class failed"
 msgstr "epäonnistunut C#-luokan kääntäminen"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, 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:1210
+#: src/write-java.c:1165
 #, 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:1213
+#: src/write-java.c:1168
 #, 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"
@@ -3527,14 +3055,12 @@ msgstr "epäonnistunut Java-luokan kääntäminen, yritä asettaa muuttuja $JAVA
 msgid "error while opening \"%s\" for writing"
 msgstr "virhe avattaessa tiedostoa ”%s” kirjoittamista varten"
 
-#: src/write-po.c:875
+#: src/write-po.c:803
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1254 src/write-po.c:1383
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3548,7 +3074,7 @@ msgstr ""
 "msgctxt-merkkijonon käyttämistä.\n"
 "%s\n"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1266 src/write-po.c:1395
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3572,15 +3098,12 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"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:717
@@ -3589,10 +3112,8 @@ 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:94
@@ -3632,7 +3153,7 @@ msgstr ""
 "viestiluettelossa on monikkomuotoisia käännöksiä\n"
 "mutta Tcl-viestiluettelomuoto ei tule monikkokäsittelyä\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-javascript.c:988 src/x-python.c:1128
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: varoitus: päättämätön merkkijono"
@@ -3642,22 +3163,17 @@ msgstr "%s:%d: varoitus: päättämätön merkkijono"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: varoitus: päättämätön säännöllinen lauseke"
 
-#: src/x-c.c:1051
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: varoitus: virheellinen Unicode-merkki"
-
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:762
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: varoitus: päättämätön merkkivakio"
 
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1247 src/x-vala.c:832
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: varoitus: päättämätön merkkijonoliteraali"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr "Määritä lähdekoodaus valitsimen --from-code avulla."
 
@@ -3711,7 +3227,7 @@ msgstr ""
 "%s:%d: Virheellinen monitavusekvenssi.\n"
 "Määritä lähdekoodikoodaus valitsimen --from-code avulla.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: varoitus: virheellinen Unicode-merkki"
@@ -3731,22 +3247,22 @@ msgstr "%s:%d: varoitus: ’)’ löytyi kun ’}’ odotettiin"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: varoitus: ’}’ löytyi kun ’)’ odotettiin"
 
-#: src/x-glade.c:295
+#: src/x-glade.c:561
 #, c-format
 msgid "Missing context for the string extracted from '%s' element"
 msgstr "Puuttuva asiayhteys merkkijonolle, joka poimittiin elementistä ’%s’"
 
-#: src/x-glade.c:417
+#: src/x-glade.c:686
 #, 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"
 
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3809,27 +3325,15 @@ msgstr ""
 "%s:%d: Virheellinen monitavusekvenssi.\n"
 "Määritä lähdekoodikoodaus valitsimen --from-code avulla\n"
 
-#: src/x-javascript.c:954
+#: src/x-javascript.c:1147
 #, 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:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: varoitus: virheellinen Unicode-merkki"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: varoitus: päättämätön merkkijono"
-
 #: src/x-perl.c:308
 #, 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
 #, c-format
@@ -3946,112 +3450,82 @@ msgstr "%s:%d: virheellinen merkkijonolauseke"
 
 #: 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: varoitus: syntaksi $\"...\" on vanhentunut turvallisuussyistä; käytä "
-"sen sijaan funktiota eval_gettext"
+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:413
+#: src/x-vala.c:558
 #, 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:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
+msgstr "%s:%d: varoitus: säännöllisen lausekkeen merkkijonoliteraali päättyi liian aikaisin"
 
-#: src/xgettext.c:648
+#: src/xgettext.c:636
 #, 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"
+msgstr "valitsimen --join-existing käyttäminen epäonnistui kun tuloste kirjoitetaan vakiotulosteeseen"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ei voi työskennellä ilman etsittäviä avainsanoja"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:785
 #, 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"
+msgstr "varoitus: tiedoston ’%s’ tarkennin ’%s’ on tuntematon; yritetään tarkenninta C"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:836
 #, 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:882
+#: 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=NIMI   käytä tiedostoa NIMI.po tulostukseen (eikä "
-"tiedostoa messages.po)\n"
+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:884
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr ""
-"  -o, --output=TIEDOSTO       kirjoita tuloste määriteltyyn tiedostoon\n"
+msgstr "  -o, --output=TIEDOSTO       kirjoita tuloste määriteltyyn tiedostoon\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:863
 #, 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"
+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:891
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Syötetiedoston kielen valinta:\n"
 
-#: src/xgettext.c:893
-#, fuzzy, c-format
+#: src/xgettext.c:870
+#, 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"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 "  -L, --language=NIMI         tunnista määritelty kieli\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)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr ""
-"  -C, --c++                   pikavalitsin valitsimelle --language=C++\n"
+msgstr "  -C, --c++                   pikavalitsin valitsimelle --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:879
 #, 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"
+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:907
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4060,254 +3534,211 @@ msgstr ""
 "      --from-code=NIMI        syötetiedostojen koodaus\n"
 "                                (paitsi kielille Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:887
 #, 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:915
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr ""
-"  -j, --join-existing         liitä viesti oleamssaolevaan tiedostoon\n"
+msgstr "  -j, --join-existing         liitä viesti oleamssaolevaan tiedostoon\n"
 
-#: src/xgettext.c:917
+#: 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  rivejä tiedostossa FILE.po ei ole poimittu\n"
+msgstr "  -x, --exclude-file=FILE.po  rivejä tiedostossa FILE.po ei ole poimittu\n"
 
-#: src/xgettext.c:919
+#: src/xgettext.c:896
 #, 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   sijoita TAG-alkuiset kommenttilohkot ja\n"
 "                                edeltävät avainsanarivit tulostetiedostoon\n"
-"  -c, --add-comments          sijoita kaikkia kommenttilohkoja edeltävät "
-"avainsana-\n"
+"  -c, --add-comments          sijoita kaikkia kommenttilohkoja edeltävät avainsana-\n"
 "                                rivit tulostetiedostoon\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Kielikohtaiset valitsimet:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           pura kaikki merkkijonot\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:906 src/xgettext.c:914
 #, 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 ""
 "                                (vain kielet 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:937
-#, fuzzy, c-format
+#: src/xgettext.c:911
+#, 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"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\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"
+"  -kWORD, --keyword=WORD      etsi WORD-argumentti lisäavainsanana\n"
+"  -k, --keyword               älä käytä oletusavainsanoja\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:919
 #, 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    lisälippu merkkijonoille avainsanan WORD "
-"argumentti-\n"
+"      --flag=WORD:ARG:FLAG    lisälippu merkkijonoille avainsanan WORD argumentti-\n"
 "                              numeron ARG sisällä\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:922
 #, 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 ""
 "                                (vain kielille 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:950
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr ""
-"  -T, --trigraphs             ymmärrä ANSI C kolmimerkkejä syötettä varten\n"
+msgstr "  -T, --trigraphs             ymmärrä ANSI C kolmimerkkejä syötettä varten\n"
 
-#: src/xgettext.c:952
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (vain kielet C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    tunnista Qt-muotoiset merkkijonot\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (vain C++-kieli)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   tunnista KDE 4 -muotoiset merkkijonot\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 tunnista Boost-muotoiset merkkijonot\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:943
 #, c-format
-msgid ""
-"      --debug                 more detailed formatstring recognition result\n"
-msgstr ""
-"      --debug                 yksityiskohtaisempi "
-"muotomerkkijonotunnistustulos\n"
+msgid "      --debug                 more detailed formatstring recognition result\n"
+msgstr "      --debug                 yksityiskohtaisempi muotomerkkijonotunnistustulos\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     luo Java .properties -tiedoston\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr ""
-"      --copyright-holder=STRING  aseta copyright-omistajan tulosteessa\n"
+msgstr "      --copyright-holder=STRING  aseta copyright-omistajan tulosteessa\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:985
 #, 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 "      --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:1010
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  aseta pakkausnimi tulosteessa\n"
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  aseta pakkausversio tulosteessa\n"
 
-#: src/xgettext.c:1014
+#: 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  aseta ilmoitusosoite msgid-"
-"vikailmoituksia varten\n"
+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:1016
+#: src/xgettext.c:993
 #, 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]  käytä merkkijonoa STRING tai ”” "
-"etuliitteenä msgstr-\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  käytä merkkijonoa STRING tai ”” etuliitteenä msgstr-\n"
 "                                merkkijonon arvoille\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:996
 #, 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]  käytä merkkijonoa STRING tai ”” "
-"loppuliitteenä msgstr-\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  käytä merkkijonoa STRING tai ”” loppuliitteenä msgstr-\n"
 "                                merkkijonon arvoille\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1817
 #, 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"
+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:1965
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "vakiosyöte"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Ei-ASCII-merkki osoitteessa %s%s."
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Ei-ASCII-kommentti osoitteessa tai ennen osoitetta %s%s."
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Ei-ASCII-merkkijono osoitteessa %s%s."
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: varoitus: "
 
-#: src/xgettext.c:2189
+#: 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 ""
-"Vaikka käytetty muotomerkkijonopaikassa, 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:2190
+#: src/xgettext.c:2139
 #, 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 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:2221
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4315,13 +3746,12 @@ msgid ""
 "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"
+"’%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:2283
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4331,27 +3761,27 @@ msgstr ""
 "gettext(\"\") palauttaa otsakkeen metatiedolla,\n"
 "ei tyhjää merkkijonoa.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "argumenttimäärittely avainsanalle ’%.*s’ ei ole yksiselitteinen"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "varoitus: puuttuva konteksti avainsanalle ’%.*s’"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "varoitus: puuttuva konteksti avainsanan ’%.*s’ monikkoargumentille"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "kontekstitäsmäämättömyys yksikkö- ja monikkomuotojen välillä"
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4363,7 +3793,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS-muuttuja; muussa tapauksessa\n"
 "määritä komentorivivalitsin --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3267
 #, c-format
 msgid "language '%s' unknown"
 msgstr "kieli ’%s’ on tuntematon"
@@ -4396,19 +3826,13 @@ 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"
@@ -4421,10 +3845,8 @@ 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"
@@ -4457,29 +3879,22 @@ 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"
@@ -4487,12 +3902,10 @@ 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"
@@ -4505,35 +3918,28 @@ 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"
 
@@ -4553,18 +3959,13 @@ 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"
@@ -4572,19 +3973,14 @@ 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"
@@ -4612,16 +4008,12 @@ 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"
@@ -4633,8 +4025,7 @@ 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 ""
@@ -4645,8 +4036,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"
 #~ "      --statistics            tulostaa tilastot käännöksistä\n"
 #~ "  -v, --verbose               kasvata laveustasoa\n"
@@ -4659,8 +4049,7 @@ 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"
@@ -4672,7 +4061,6 @@ 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 cb5ef646b..9296805c1 100644
--- a/gettext-tools/po/fr.po
+++ b/gettext-tools/po/fr.po
@@ -10,11 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2010-05-09 13:18+0200\n"
 "PO-Revision-Date: 2010-07-23 01:47+0100\n"
 "Last-Translator: Christophe Combelles <ccomb@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,28 +30,26 @@ msgid "ambiguous argument %s for %s"
 msgstr "Argument ambigu %s pour %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Les arguments valides sont :"
 
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr ""
-"Impossible de trouver un répertoire temporaire. Essayez de définir la "
-"variable $TMPDIR"
+msgstr "Impossible de trouver un répertoire temporaire. Essayez de définir la variable $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
-msgstr ""
-"Impossible de créer un répertoire temporaire en utilisant le modèle « %s »"
+msgstr "Impossible de créer un répertoire temporaire en utilisant le modèle « %s »"
 
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "Impossible de supprimer le fichier temporaire « %s »"
 
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "Impossible de supprimer le dossier temporaire « %s »"
@@ -61,34 +58,33 @@ 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:217
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:194
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
 msgstr "Erreur lors de l'ouverture de « %s » en lecture "
 
-#: gnulib-lib/copy-file.c:198
-#, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+#: gnulib-lib/copy-file.c:74
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "Erreur d'ouverture du fichier d'archive « %s » en écriture"
 
-#: gnulib-lib/copy-file.c:202
-#, fuzzy, c-format
-msgid "error reading %s"
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
+#, c-format
+msgid "error reading \"%s\""
 msgstr "Erreur de lecture de « %s »"
 
-#: gnulib-lib/copy-file.c:206
-#, fuzzy, c-format
-msgid "error writing %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\""
 msgstr "Erreur d'écriture de « %s »"
 
-#: gnulib-lib/copy-file.c:210
-#, fuzzy, c-format
-msgid "error after reading %s"
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
+#, c-format
+msgid "error after reading \"%s\""
 msgstr "Erreur après la lecture de « %s »"
 
 #: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
@@ -109,69 +105,69 @@ msgstr "Le compilateur C# est introuvable. Essayez d'installer « pnet »"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "La machine virtuelle C# est introuvable. Essayez d'installer « pnet »"
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Erreur système non identifiée"
 
-#: 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:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Échec du sous-processus %s"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s : l'option « %s » est ambiguë\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s : l'option « --%s » ne tolère pas d'argument\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s : l'option « %c%s » ne tolère pas d'argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s : l'option « --%s » requiert un argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s : l'option « --%s » n'est pas connue\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s : l'option « %c%s » n'est pas connue\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s : option non valable -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s : l'option exige un argument -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s : l'option « -W %s » est ambiguë\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s : l'option « -W %s » ne tolère pas d'argument\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s : l'option « -W %s » requiert un argument\n"
@@ -187,15 +183,15 @@ msgstr "argument source_version invalide pour compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "argument target_version invalide pour compile_java_class"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c: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:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Échec lors de la création de « %s »"
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c: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
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "Erreur pendant l'écriture du fichier « %s »"
@@ -203,16 +199,12 @@ msgstr "Erreur pendant l'écriture du fichier « %s »"
 #: gnulib-lib/javacomp.c:2343
 #, 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
@@ -220,92 +212,52 @@ msgstr ""
 msgid "%s subprocess I/O error"
 msgstr "Erreur d'E/S du sous-processus %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: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
 #, c-format
 msgid "memory exhausted"
 msgstr "Mémoire épuisée"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, fuzzy, c-format
-msgid "creation of threads failed"
-msgstr "Échec de compilation de la classe C#"
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "write to %s subprocess failed"
-msgstr "Échec d'écriture sur le sous-processus %s"
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "Échec de lecture depuis le sous-processus %s"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, 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"
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "Échec de communication avec le sous-processus %s"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "Sous-processus %s terminé avec le code de sortie %d"
+msgid "cannot create pipe"
+msgstr "Création du tube impossible"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-msgid "setting permissions for %s"
-msgstr ""
-
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "Création du tube impossible"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "Échec de la fonction « _open_osfhandle »"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "Impossible de restorer le descripteur de fichier %d : dup2 a échoué"
@@ -321,136 +273,92 @@ msgstr "sous-processus %s"
 msgid "%s subprocess got fatal signal %d"
 msgstr "Le sous-processus %s a reçu le signal fatal %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
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "Erreur lors de l'ouverture de « %s » en lecture "
-
-#: src/format.c:151
+#: src/format.c:148
 #, 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-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-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%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: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-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "Le format de l'argument « %u » n'a pas été spécifié dans « %s »"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-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-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, c-format
 msgid "format specifications in '%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: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.c:36
+#: src/format-c.c:181
 #, 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:39
+#: src/format-c.c:588
 #, 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:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, 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: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:901 src/format-csharp.c:206 src/format-python.c:515
 #, 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:88 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:109
 #, 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:130 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."
+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:139
 #, 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:140
 #, 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:161 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."
+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:162
 #, 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
@@ -460,26 +368,17 @@ 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
@@ -489,8 +388,7 @@ 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
@@ -502,87 +400,48 @@ msgstr "« %s » utilise %%m mais « %s » ne l'utilise pas"
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "« %s » n'utilise pas %%m mais « %s » utilise %%m"
 
-#: src/format-gfc-internal.c:383
-#, fuzzy, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "« %s » utilise %%m mais « %s » ne l'utilise pas"
-
-#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "« %s » n'utilise pas %%m mais « %s » utilise %%m"
-
 #: src/format-invalid.h:22
 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: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:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
@@ -591,20 +450,13 @@ msgstr "Dans la directive numéro %u, « %s » n'est pas suivi par une virgule
 
 #: 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: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:572
 #, c-format
@@ -613,20 +465,13 @@ msgstr "Dans la directive numéro %u, l'un des choix ne contient aucun numéro"
 
 #: 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: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:756
 #, c-format
@@ -635,36 +480,21 @@ msgstr "Le format de l'argument {%u} dans la chaîne « %s » n'est pas spéci
 
 #: 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-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 ""
-"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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -690,24 +520,17 @@ msgstr "« ~%c » a été trouvé sans « ~%c » correspondant."
 #: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, 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:2976 src/format-scheme.c:2973
 #, 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:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr ""
-"Dans la directive numéro %u, « ~; » est utilisé à une place incorrecte."
+msgstr "Dans la directive numéro %u, « ~; » est utilisé à une place incorrecte."
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
@@ -716,39 +539,26 @@ msgstr "La chaîne fait référence à un argument de manière incompatible."
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, c-format
 msgid "format specifications in '%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:3490 src/format-scheme.c:3413
 #, 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.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-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.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "Le format de l'argument « %s » dans « %s » n'est pas spécifié."
 
 #: src/format-python.c: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
@@ -757,96 +567,40 @@ 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: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"
-
-#: src/format-python-brace.c:137
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "Dans la directive numéro %u, « %c » n'est pas suivi par un chiffre."
-
-#: src/format-python-brace.c:150
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr ""
-"Dans la directive numéro %u, le symbole « { » n'est pas suivi par un numéro "
-"d'argument."
-
-#: src/format-python-brace.c:165
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "Dans la directive numéro %u, « %c » n'est pas suivi par un chiffre."
-
-#: src/format-python-brace.c:185
-#, fuzzy, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-"Dans la directive numéro %u, une précision n'est pas permise avant « %c »."
-
-#: src/format-python-brace.c:270
-#, fuzzy, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "Dans la directive numéro %u, l'argument %d est négatif."
+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: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: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: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é."
+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: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."
+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:85
 msgid "The string refers to a shell variable with an empty name."
@@ -854,27 +608,19 @@ msgstr "La chaîne fait référence à une variable de shell avec un nom vide."
 
 #: 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: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."
-
-#: 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
+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."
+
+#: 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"
@@ -887,19 +633,19 @@ msgstr ""
 "Ceci est un logiciel libre : vous pouvez le modifier et le redistribuer.\n"
 "Il n'y a PAS DE GARANTIE, dans la mesure de ce que permet la loi.\n"
 
-#: src/hostname.c:184 src/msgattrib.c: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
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Écrit par %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c: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/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
@@ -909,13 +655,13 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "Trop d'arguments"
 
-#: 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
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
+#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
+#, c-format
+msgid "Try `%s --help' for more information.\n"
 msgstr "Pour plus d'information, essayez « %s --help ».\n"
 
 #: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
@@ -941,12 +687,10 @@ msgstr "  -s, --short                 nom de machine court\n"
 #: src/hostname.c:222
 #, 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:225
@@ -954,29 +698,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            adresses IP du nom de machine\n"
 
-#: src/hostname.c:228 src/msgattrib.c: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:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Sortie informative :\n"
 
-#: src/hostname.c:230 src/msgattrib.c: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
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  afficher ce message d'aide, puis terminer\n"
 
-#: src/hostname.c:232 src/msgattrib.c: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
+#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
+#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               afficher le numéro de version de ce programme, puis terminer\n"
@@ -985,11 +729,11 @@ msgstr "  -V, --version               afficher le numéro de version de ce progr
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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
+#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
+#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Signalez tout bogue à <bug-gnu-gettext@gnu.org>.\n"
 
@@ -998,27 +742,30 @@ msgstr "Signalez tout bogue à <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "Impossible d'obtenir le nom de machine"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "Un seul fichier est permis en entrée"
 
-#: src/msgattrib.c: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:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s et %s s'excluent mutuellement"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Usage : %s [OPTION] [FICHIER_ENTRÉE]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1027,68 +774,61 @@ 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: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/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
+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: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:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Emplacement du fichier d'entrée :\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FICHIER ...                 fichier PO d'entrée\n"
 
-#: src/msgattrib.c: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:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
-msgid ""
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr ""
-"  -D, --directory=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:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
-msgstr ""
-"  Si le nom du fichier d'entrée est « - » ou s'il n'est pas fourni, les "
-"données sont lues depuis l'entrée standard.\n"
+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: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:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Emplacement du fichier de sortie :\n"
 
-#: src/msgattrib.c: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:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FICHIER   écrire la sortie dans le FICHIER\n"
 
-#: src/msgattrib.c: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/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1097,322 +837,246 @@ 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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Sélection des messages :\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, 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:454
+#: src/msgattrib.c:440
 #, 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:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              retirer les messages marqués « fuzzy »\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr ""
-"      --only-fuzzy            conserver seulement les messages marqués "
-"« fuzzy »\n"
+msgstr "      --only-fuzzy            conserver seulement les messages marqués « fuzzy »\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           retirer les messages obsolètes « #~ »\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, 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:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulation d'attribut :\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr ""
-"      --set-fuzzy             placer tous les messages dans l'état "
-"« fuzzy »\n"
+msgstr "      --set-fuzzy             placer tous les messages dans l'état « fuzzy »\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr ""
-"      --clear-fuzzy           retirer l'état « fuzzy » de tous les messages\n"
+msgstr "      --clear-fuzzy           retirer l'état « fuzzy » de tous les messages\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
-msgstr ""
-"      --set-obsolete          marquer tous les messages comme obsolètes\n"
+msgstr "      --set-obsolete          marquer tous les messages comme obsolètes\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr ""
-"      --clear-obsolete        marquer tous les messages comme non-obsolètes\n"
+msgstr "      --clear-obsolete        marquer tous les messages comme non-obsolètes\n"
 
-#: src/msgattrib.c:475
-#, fuzzy, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              conserver les précédentes chaînes « msgid » "
-"des messages traduits\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, 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"
-
-#: src/msgattrib.c:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --no-fuzzy              retirer les messages marqués « fuzzy »\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:482
+#: src/msgattrib.c:463
 #, 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:484
+#: src/msgattrib.c:465
 #, 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:486
+#: src/msgattrib.c:467
 #, 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:488
+#: src/msgattrib.c:469
 #, 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: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/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Syntaxe du fichier d'entrée :\n"
 
-#: src/msgattrib.c: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:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
-msgid ""
-"  -P, --properties-input      input file is in Java .properties syntax\n"
+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: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:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
-msgid ""
-"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
-"syntax\n"
+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: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:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Détails des données de sortie :\n"
 
-#: src/msgattrib.c: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:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
 "      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
+"                              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: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:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
-"      --style=FICHIERSTYLE    spécifie le fichier de règles de style CSS "
-"pour --color\n"
+msgstr "      --style=FICHIERSTYLE    spécifie le fichier de règles de style CSS pour --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:578 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
-msgid ""
-"  -e, --no-escape             do not use C escapes in output (default)\n"
-msgstr ""
-"  -e, --no-escape             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: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:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
-msgid ""
-"  -E, --escape                use C escapes in output, no extended chars\n"
-msgstr ""
-"  -E, --escape                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: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:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
-msgstr ""
-"      --force-po              créer un fichier .po même s'il est vide\n"
+msgstr "      --force-po              créer un fichier .po même s'il est vide\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
-msgstr ""
-"  -i, --indent                créer le fichier .po avec un style indenté\n"
+msgstr "  -i, --indent                créer le fichier .po avec un style indenté\n"
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr ""
-"      --no-location           ne pas créer les commentaires de numérotation "
-"du type « #: fichier:ligne»\n"
+msgstr "      --no-location           ne pas créer les commentaires de numérotation du type « #: fichier:ligne»\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
-msgid ""
-"  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr ""
-"  -n, --add-location          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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
-msgid ""
-"      --strict                write out strict Uniforum conforming .po file\n"
-msgstr ""
-"      --strict                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: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:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
-msgstr ""
-"  -p, --properties-output     créer un fichier « .properties » de type Java\n"
+msgstr "  -p, --properties-output     créer un fichier « .properties » de type 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:412
-#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
-msgid ""
-"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr ""
-"      --stringtable-output    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: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:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NOMBRE          spécifier la largeur de page\n"
 
-#: src/msgattrib.c: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:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
-"      --no-wrap               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: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:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           trier les données de sortie\n"
 
-#: src/msgattrib.c: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:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
-msgstr ""
-"  -F, --sort-by-file          trier les données de sortie selon "
-"l'emplacement des fichiers\n"
+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:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Usage : %s [OPTION] [FICHIER_ENTRÉE]...\n"
 
-#: src/msgcat.c:372
-#, fuzzy, c-format, no-wrap
+#: src/msgcat.c:371
+#, 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"
@@ -1420,9 +1084,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, 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"
+"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 ""
 "msgcat permet de concaténer et de fusionner des fichiers .po spécifiés\n"
 "et de trouver les messages communs à plusieurs d'entre eux.\n"
@@ -1433,27 +1097,23 @@ msgstr ""
 "ils seront pris dans le premier fichier .po où ils ont été définis.\n"
 "Les indications de position de tous les fichiers .po seront accumulées.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FICHIER ...                 fichiers d'entrée\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
-msgstr ""
-"  -f, --files-from=FICHIER    obtenir la liste des fichiers d'entrée à "
-"partir du FICHIER\n"
+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:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
-msgstr ""
-"  Si le nom du fichier d'entrée est « - », les données sont lues depuis "
-"l'entrée standard.\n"
+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"
@@ -1462,7 +1122,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"
@@ -1471,26 +1131,23 @@ 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:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
-msgid ""
-"  -P, --properties-input      input files are in Java .properties syntax\n"
+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:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1499,45 +1156,41 @@ 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:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=ENCODAGE      encodage de sortie\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      --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:345 src/msgmerge.c:570
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
-msgid ""
-"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr ""
-"      --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:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "Fichiers d'entrée non spécifiés"
 
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "Deux fichiers sont requis en entrée"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Usage : %s [OPTION] def.po ref.pot\n"
@@ -1571,32 +1224,25 @@ msgstr "  def.po                      traductions\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     références aux sources\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificateurs d'opération:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
-msgid ""
-"  -m, --multi-domain          apply ref.pot to each of the domains in def."
-"po\n"
-msgstr ""
-"  -m, --multi-domain          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:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-"  -N, --no-fuzzy-matching     ne pas utiliser la correspondance floue\n"
+msgstr "  -N, --no-fuzzy-matching     ne pas utiliser la correspondance floue\n"
 
 #: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr ""
-"      --use-fuzzy             utiliser les traductions approximatives "
-"(fuzzy)\n"
+msgstr "      --use-fuzzy             utiliser les traductions approximatives (fuzzy)\n"
 
 #: src/msgcmp.c:247
 #, c-format
@@ -1613,17 +1259,17 @@ msgstr "ce message n'est pas traduit"
 msgid "this message needs to be reviewed by the translator"
 msgstr "ce message doit être révisé par le traducteur"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "Ce message est utilisé mais non défini..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...mais cette définition est semblable"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "Ce message est utilisé mais non défini dans « %s »"
@@ -1633,27 +1279,27 @@ msgstr "Ce message est utilisé mais non défini dans « %s »"
 msgid "warning: this message is not used"
 msgstr "AVERTISSEMENT : ce message n'est pas utilisé"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "%d erreur fatale trouvée"
 msgstr[1] "%d erreurs fatales trouvées"
 
-#: src/msgcomm.c: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
-#, 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 extracted comments will be preserved, but only from the first\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 ""
@@ -1665,88 +1311,74 @@ 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:1004
-#, fuzzy, 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"
+#: src/msgcomm.c:451 src/xgettext.c:961
+#, 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"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
-msgstr ""
-"msgconv permet de modifier l'encodage utilisé dans un catalogue de "
-"traduction.\n"
+msgstr "msgconv permet de modifier l'encodage utilisé dans un catalogue de traduction.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Cible de conversion :\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
-msgstr ""
-"L'encodage par défaut est l'encodage de « locale » actuellement utilisé.\n"
+msgstr "L'encodage par défaut est l'encodage de « locale » actuellement utilisé.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                indenter les données de sortie\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr ""
-"      --no-location           supprimer les commentaires du type « #: "
-"fichier:ligne »\n"
+msgstr "      --no-location           supprimer les commentaires du type « #: fichier:ligne »\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
-#, fuzzy, c-format
-msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr ""
-"      --add-location          conserver les commentaires du type « #: "
-"fichier:ligne » (par défaut)\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          conserver les commentaires du type « #: fichier:ligne » (par défaut)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
-msgstr ""
-"      --strict                créer une sortie strictement conforme à "
-"l'Uniforum\n"
+msgstr "      --strict                créer une sortie strictement conforme à l'Uniforum\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "Aucun fichier d'entrée n'a été fourni"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "Un (et un seul) fichier d'entrée doit être fourni"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Usage : %s [OPTION] FICHIER_ENTRÉE\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1760,7 +1392,7 @@ msgstr ""
 "Le texte original anglais du champ « msgid » est alors utilisé\n"
 "comme traduction pour les messages non traduits.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  FICHIER ...                 fichiers d'entrée .po ou .pot\n"
@@ -1799,7 +1431,7 @@ 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:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=FICHIER         fichier .po d'entrée\n"
@@ -1809,187 +1441,152 @@ msgstr "  -i, --input=FICHIER         fichier .po d'entrée\n"
 msgid "write to stdout failed"
 msgstr "Échec d'écriture sur la sortie standard"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "Échec d'écriture sur le sous-processus %s"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "Il manque le nom du filtre"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "Un script « sed » doit au moins être spécifié"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Usage : %s [OPTION] FILTRE [OPTION_DU_FILTRE]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr ""
-"msgfilter permet d'appliquer un filtre à toutes les traductions d'un "
-"catalogue.\n"
+msgstr "msgfilter permet d'appliquer un filtre à toutes les traductions d'un catalogue.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 "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:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Options de filtrage utiles lorsque le FILTRE est « sed » :\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
-msgid ""
-"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr ""
-"  -e, --expression=SCRIPT     ajouter le SCRIPT aux commandes à exécuter\n"
+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:444
+#: src/msgfilter.c:425
 #, 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:447
+#: src/msgfilter.c:428
 #, 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:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
-msgid ""
-"      --no-escape             do not use C escapes in output (default)\n"
-msgstr ""
-"      --no-escape             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:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                indenter la sortie\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, 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/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "L'argument de %s devrait être un simple caractère de ponctuation"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "ordre des octets invalide (endianness) : %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, fuzzy, c-format
-msgid "no input file should be given if %s and %s are specified"
-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/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s a besoin de l'option « -d DOSSIER »"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s a besoin de l'option « -l locale »"
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s a besoin de l'option « -l locale »"
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s a besoin de l'option « -l locale »"
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s et %s s'excluent mutuellement"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s n'est valide qu'avec %s ou %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s n'est valide qu'avec %s, %s ou %s"
 
 #. 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:616
 #, c-format
 msgid "%s: "
 msgstr "%s : "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d message traduit"
 msgstr[1] "%d messages traduits"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traduction approximative"
 msgstr[1] ", %d traductions approximatives"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d message non traduit"
 msgstr[1] ", %d messages non traduits"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Usage : %s [OPTION] fichier.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
-msgstr ""
-"msgfmt permet de créer un catalogue binaire de messages à partir de la "
-"description textuelle des traductions.\n"
+msgstr "msgfmt permet de créer un catalogue binaire de messages à partir de la description textuelle des traductions.\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: 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"
@@ -1998,153 +1595,99 @@ msgstr ""
 "Les arguments obligatoires pour les formes longues des options sont également\n"
 "obligatoires pour les formes courtes correspondantes. (idem options factultatives)\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  fichier.po ...              fichiers d'entrée\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mode d'exécution :\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, 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 "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
+msgstr "  -j, --java                  mode JAVA : produire une classe Java « ResourceBundle »\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:677
 #, 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 "      --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:803
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr ""
-"      --csharp                mode C# : générer un fichier « .dll » de type ."
-"NET\n"
+msgstr "      --csharp                mode C# : générer un fichier « .dll » de type .NET\n"
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, c-format
-msgid ""
-"      --csharp-resources      C# resources mode: generate a .NET .resources "
-"file\n"
-msgstr ""
-"      --csharp-resources      mode C# : produire un fichier « .resources » "
-"de type .NET\n"
+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:807
+#: src/msgfmt.c:683
 #, c-format
-msgid ""
-"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr ""
-"      --tcl                   mode TCL : produire un fichier « .msg » de "
-"type tcl/msgcat\n"
+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:809
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
-msgstr ""
-"      --tcl                   mode QT : produire un fichier « .qm » de type "
-"Qt\n"
+msgstr "      --tcl                   mode QT : produire un fichier « .qm » de type Qt\n"
 
-#: src/msgfmt.c:811
-#, fuzzy, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-"      --tcl                   mode QT : produire un fichier « .qm » de type "
-"Qt\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, 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:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
-msgstr ""
-"  Si le nom du fichier de sortie est « - », la sortie est envoyée vers la "
-"sortie standard\n"
+msgstr "  Si le nom du fichier de sortie est « - », la sortie est envoyée vers la sortie standard\n"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Emplacement du fichier de sortie en mode Java :\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESSOURCE    nom de la ressource\n"
 
-#: src/msgfmt.c: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:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
-msgid ""
-"  -l, --locale=LOCALE         locale name, either language or "
-"language_COUNTRY\n"
-msgstr ""
-"  -l, --locale=LOCALE         nom de la « locale » (par exemple « fr » ou "
-"« fr_FR »)\n"
-
-#: src/msgfmt.c:829
-#, fuzzy, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --tcl                mode Tcl :  l'entrée est un fichier « .msg » de "
-"type tcl/msgcat\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:831
+#: src/msgfmt.c:703
 #, 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:833
+#: src/msgfmt.c:705
 #, 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:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Emplacement du fichier de sortie en mode C# :\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 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:847
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2154,19 +1697,17 @@ 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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Emplacement du fichier de sortie en mode Tcl :\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
-msgstr ""
-"  -d DOSSIER                  répertoire de base des catalogues de messages "
-"de type « .msg »\n"
+msgstr "  -d DOSSIER                  répertoire de base des catalogues de messages de type « .msg »\n"
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2175,234 +1716,145 @@ msgstr ""
 "  Les options « -l » et « -d » sont obligatoires.\n"
 "  Le fichier .msg est créé dans le répertoire spécifié.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-"  -d DOSSIER                  répertoire de base des catalogues de messages "
-"de type « .msg »\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-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:874
-#, 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:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interprétation du fichier d'entrée :\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, 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:891
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr ""
-"      --check-format          vérifier les chaînes de formatage dépendantes "
-"du langage\n"
+msgstr "      --check-format          vérifier les chaînes de formatage dépendantes du langage\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, 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:895
+#: src/msgfmt.c:750
 #, 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:898
+#: src/msgfmt.c:753
 #, 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:900
+#: src/msgfmt.c:755
 #, 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:903
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
-msgstr ""
-"  -f, --use-fuzzy             utiliser les traductions approximatives "
-"(fuzzy) dans la sortie\n"
+msgstr "  -f, --use-fuzzy             utiliser les traductions approximatives (fuzzy) dans la sortie\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:763
 #, 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:910
+#: src/msgfmt.c:765
 #, 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 ""
+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:913
-#, 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"
-
-#: src/msgfmt.c:922
+#: src/msgfmt.c:774
 #, 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:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               afficher plus d'informations\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "AVERTISSEMENT : l'en-tête du fichier .po est absent ou invalide\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "AVERTISSEMENT : la conversion d'encodage ne fonctionnera pas\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "AVERTISSEMENT : l'en-tête du fichier .po est approximatif (fuzzy)\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr ""
-"AVERTISSEMENT : les versions plus anciennes de « msgfmt » génèreront une "
-"erreur à cet endroit\n"
+msgstr "AVERTISSEMENT : les versions plus anciennes de « msgfmt » génèreront une erreur à cet endroit\n"
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "Le nom de domaine « %s » n'est pas un nom de fichier approprié"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr ""
-"Le nom de domaine « %s » n'est pas un nom de fichier approprié : un préfixe "
-"sera utilisé"
+msgstr "Le nom de domaine « %s » n'est pas un nom de fichier approprié : un préfixe sera utilisé"
 
-#: src/msgfmt.c:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:948
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "La directive « domain %s » a été ignorée"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:1008
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "Une chaîne vide « msgstr » a été ignorée"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:1009
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "Une chaîne « msgstr » approximative (fuzzy) a été ignorée"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
-msgstr ""
-"%s : AVERTISSEMENT : le fichier source contient des traductions "
-"approximatives"
-
-#: src/msgfmt.c:1318
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
-#, c-format
-msgid "%s exists but cannot read"
-msgstr ""
+msgstr "%s : AVERTISSEMENT : le fichier source contient des traductions approximatives"
 
 #: 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/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "Erreur lors de la lecture de « %s »"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
-msgid ""
-"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
-"specified"
-msgstr ""
-"L'option « %c » ne peut être utilisée avant que « J », « K », « T », « C » "
-"ou « X » n'ait été spécifié"
+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:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2411,7 +1863,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:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2486,25 +1938,20 @@ 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:602
+#: src/msggrep.c:597
 #, 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:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           trier les données en sortie\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr ""
-"      --sort-by-file          trier la sortie selon l'emplacement des "
-"fichiers\n"
+msgstr "      --sort-by-file          trier la sortie selon l'emplacement des fichiers\n"
 
 #: src/msginit.c:297
 msgid ""
@@ -2514,8 +1961,7 @@ msgid ""
 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:321
 #, c-format
@@ -2550,19 +1996,14 @@ msgstr " -i, --input=FICHIER_ENTRÉE   fichier .pot d'entrée\n"
 #: src/msginit.c:379
 #, 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:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
-msgstr ""
-"  -o, --output-file=FICHIER   écrire les données en sortie dans le FICHIER "
-"spécifié\n"
+msgstr "  -o, --output-file=FICHIER   écrire les données en sortie dans le FICHIER spécifié\n"
 
 #: src/msginit.c:387
 #, c-format
@@ -2570,10 +2011,8 @@ 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:400
@@ -2583,11 +2022,8 @@ msgstr "  -l, --locale=LL_CC          définir la langue cible\n"
 
 #: src/msginit.c:402
 #, 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:468
 msgid ""
@@ -2595,8 +2031,7 @@ msgid ""
 "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:476 src/msginit.c:481
 #, c-format
@@ -2609,8 +2044,7 @@ msgid ""
 "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/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
@@ -2621,10 +2055,8 @@ msgstr "Échec du sous-processus %s avec le code de sortie %d"
 
 #: src/msginit.c:1118
 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"
@@ -2643,42 +2075,31 @@ msgstr "Traductions françaises du paquet %s"
 #: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
-msgstr ""
-"Le jeu de caractères actuel « %s » n'est pas un nom d'encodage portable"
+msgstr "Le jeu de caractères actuel « %s » n'est pas un nom d'encodage portable"
 
 #: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
-msgstr ""
-"Le fichier d'entrée contient deux jeux de caractères différents « %s » et "
-"« %s »"
+msgstr "Le fichier d'entrée contient deux jeux de caractères différents « %s » et « %s »"
 
 #: src/msgl-cat.c:203
-#, fuzzy, 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 »"
+#, 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 »"
 
 #: 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 ""
-"Aucun jeu de caractères n'est spécifié pour le domaine « %s » dans l'en-tête "
-"du fichier d'entrée « %s »"
+#, 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 »"
 
 #: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
-msgstr ""
-"Le jeu de caractères cible « %s » n'est pas un nom d'encodage portable."
+msgstr "Le jeu de caractères cible « %s » n'est pas un nom d'encodage portable."
 
 #: src/msgl-cat.c: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-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "AVERTISSEMENT : "
@@ -2689,20 +2110,17 @@ 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:449
 #, 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"
 
@@ -2716,8 +2134,7 @@ 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:93
@@ -2736,9 +2153,7 @@ msgstr ""
 #: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr ""
-"- assigner à la variable d'environnement LC_ALL un nom de langue ayant "
-"l'encodage %s.\n"
+msgstr "- assigner à la variable d'environnement LC_ALL un nom de langue ayant l'encodage %s.\n"
 
 #: src/msgl-charset.c:105
 #, c-format
@@ -2759,8 +2174,7 @@ 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"
@@ -2772,8 +2186,7 @@ msgid ""
 "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"
 
@@ -2784,9 +2197,7 @@ msgstr "L'expression au pluriel peut produire des valeurs négatives."
 #: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr ""
-"nplurals = %lu mais l'expression au pluriel peut produire des valeurs aussi "
-"grande que %lu"
+msgstr "nplurals = %lu mais l'expression au pluriel peut produire des valeurs aussi grande que %lu"
 
 #: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
@@ -2797,135 +2208,116 @@ msgid "plural expression can produce integer overflow"
 msgstr "L'expression au pluriel peut induire un débordement d'entier"
 
 #: src/msgl-check.c:197
-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:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Essayez d'utiliser ce qui suit, valable pour %s :"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
-msgstr ""
-"Le catalogue de messages contient des traductions d'expressions au pluriel"
+msgstr "Le catalogue de messages contient des traductions d'expressions au pluriel"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "mais l'attribut « plural=EXPRESSION » est absent de l'en-tête"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "mais l'attribut « nplurals=ENTIER » est absent de l'en-tête"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "Valeur « nplurals » invalide"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "Expression au pluriel invalide"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "mais certains messages n'ont qu'une forme de pluriel"
 msgstr[1] "mais certains messages n'ont que %lu formes de pluriel"
 
-#: src/msgl-check.c:490
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "mais certains messages ont une forme de pluriel"
 msgstr[1] "mais certains messages ont %lu formes de pluriel"
 
-#: src/msgl-check.c:514
-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:508
+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:611
-#, fuzzy
-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 »"
+#: src/msgl-check.c:602
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+msgstr "Les chaînes « msgid » et « msgid_plural » ne débutent pas toutes les deux par « \\n »"
 
-#: src/msgl-check.c:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
-msgstr ""
-"Les chaînes « msgid » et « msgstr[%u] » ne débutent pas toutes les deux par "
-"« \\n »"
+#: src/msgl-check.c:610
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+msgstr "Les chaînes « msgid » et « msgstr[%u] » ne débutent pas toutes les deux par « \\n »"
 
-#: src/msgl-check.c:634
-#, fuzzy
-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 »"
+#: src/msgl-check.c:625
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+msgstr "Les chaînes « msgid » et « msgstr » ne débutent pas toutes les deux par « \\n »"
 
-#: src/msgl-check.c:652
-#, fuzzy
-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 »"
+#: src/msgl-check.c:643
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr "Les chaînes « msgid » et « msgid_plural » ne se terminent pas toutes les deux par « \\n »"
 
-#: src/msgl-check.c:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
-msgstr ""
-"Les chaînes « msgid » et « msgstr[%u] » ne se terminent pas toutes les deux "
-"par « \\n »"
+#: src/msgl-check.c:651
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+msgstr "Les chaînes « msgid » et « msgstr[%u] » ne se terminent pas toutes les deux par « \\n »"
 
-#: src/msgl-check.c:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
-msgstr ""
-"Les chaînes « msgid » et « msgstr » ne se terminent pas toutes les deux par "
-"« \\n »"
+#: src/msgl-check.c:666
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+msgstr "Les chaînes « msgid » et « msgstr » ne se terminent pas toutes les deux par « \\n »"
 
-#: src/msgl-check.c:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
-msgstr ""
-"La gestion des formes du pluriel est une extension de la version GNU de "
-"gettext"
+msgstr "La gestion des formes du pluriel est une extension de la version GNU de gettext"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "« msgstr » n'a pas de marqueur de raccourci clavier « %c »"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "« msgstr » a trop de marqueurs de raccourcis clavier « %c »"
 
-#: src/msgl-check.c:804
-#, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "Le champ d'en-tête « %s » a encore sa valeur initiale par défaut\n"
-
-#: src/msgl-check.c:820
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
+#: src/msgl-check.c:776
+#, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "Le champ « %s » est absent de l'en-tête\n"
 
+#: src/msgl-check.c:784
+#, c-format
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "Le champ d'en-tête « %s » devrait être au début de la ligne\n"
+
+#: src/msgl-check.c:809
+msgid "some header fields still have the initial default value\n"
+msgstr "Certains champs d'en-tête ont encore leur valeur initiale par défaut\n"
+
+#: src/msgl-check.c:826
+#, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "Le champ d'en-tête « %s » a encore sa valeur initiale par défaut\n"
+
 #: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
@@ -2934,54 +2326,39 @@ 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
 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:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
-msgid ""
-"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
-"not support this conversion."
-msgstr ""
-"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
 #, 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:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
-msgid ""
-"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
-"built without iconv()."
-msgstr ""
-"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:392 src/msgmerge.c:398
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s est valable seulement avec %s"
 
-#: src/msgmerge.c:453
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "Type de sauvegarde"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -3007,126 +2384,109 @@ 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:507
+#: src/msgmerge.c:502
 #, 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:509
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     messages sources actuels à traduire\n"
 
-#: src/msgmerge.c:513
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=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:519
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 "  -U, --update                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:531
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Emplacement du fichier de sortie en mode mise à jour :\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "  Le résultat est réécrit dans le fichier def.po.\n"
 
-#: src/msgmerge.c:535
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTRÔLE       créer une sauvegarde de def.po\n"
 
-#: src/msgmerge.c:537
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr ""
-"      --suffix=SUFFIXE        choisir un suffixe différent de sauvegarde\n"
+msgstr "      --suffix=SUFFIXE        choisir un suffixe différent de sauvegarde\n"
 
-#: src/msgmerge.c:539
+#: src/msgmerge.c:534
 #, 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:546
-#, fuzzy, c-format
+#: src/msgmerge.c:541
+#, 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:557
+#: src/msgmerge.c:552
 #, c-format
-msgid ""
-"      --previous              keep previous msgids of translated messages\n"
-msgstr ""
-"      --previous              conserver les précédentes chaînes « msgid » "
-"des messages traduits\n"
+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:614 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       supprimer le témoin de progression\n"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "Ce message devrait définir des formes au pluriel"
 
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "Ce message ne devrait pas définir de forme au pluriel"
 
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2030
 #, c-format
-msgid ""
-"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
-"obsolete %ld.\n"
-msgstr ""
-"%s lues %ld anciennes + %ld références, %ld fusionnées, %ld approximatives, "
-"%ld manquantes, %ld périmées.\n"
+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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
 #, c-format
 msgid " done.\n"
 msgstr " terminé.\n"
@@ -3144,42 +2504,27 @@ msgstr "Usage : %s [OPTION] [FICHIER]...\n"
 #: 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: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: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: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: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:451
 #, c-format
@@ -3194,15 +2539,12 @@ msgstr "Emplacement du fichier d'entrée en 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 ""
-"  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:467
 #, c-format
@@ -3216,8 +2558,7 @@ msgid ""
 "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:479
@@ -3242,11 +2583,9 @@ msgstr "  -i, --indent                indenter la sortie\n"
 #: 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:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3267,16 +2606,14 @@ 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:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              afficher seulement les doublons\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, 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"
@@ -3293,10 +2630,9 @@ 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
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3305,7 +2641,7 @@ msgstr ""
 "Le jeu de caractères « %s » n'est pas supporté. %s utilise iconv(),\n"
 "et iconv() ne supporte pas « %s ».\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3313,17 +2649,15 @@ msgstr ""
 "L'installation de GNU libiconv suivi de la réinstallation de GNU gettext\n"
 "devrait corriger ce problème.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 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
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "On continue quand même."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3332,41 +2666,40 @@ msgstr ""
 "Le jeu de caractères « %s » n'est pas supporté. %s utilise iconv(),\n"
 "Cette version a été compilée sans iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "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:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "Utilisation incohérente de #~"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:240
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "Section « msgstr[] » absente"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:249
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "Section « msgstr_plural » absente"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "Section « msgstr » absente"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, 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:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "La forme du pluriel a un indice erroné"
@@ -3376,7 +2709,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:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "Séquence d'octets multiples invalide"
@@ -3420,16 +2753,16 @@ msgstr "Fin de ligne au milieu d'une chaîne"
 msgid "context separator <EOT> within string"
 msgstr "séparateur de contexte <EOT> à l'intérieur d'une chaîne"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "Ce fichier peut ne pas contenir de directive de domaine"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "Double définition de message"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "voici l'endroit de la première occurence"
 
@@ -3451,8 +2784,7 @@ msgstr "Le fichier « %s » n'est pas au format GNU « .mo »"
 #: src/read-mo.c:178
 #, 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:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
@@ -3476,8 +2808,7 @@ msgstr "AVERTISSEMENT : erreur de syntaxe : il manque « ; » après la chaî
 
 #: 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:116
 #, c-format
@@ -3506,16 +2837,15 @@ 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:339
+#: src/recode-sr-latin.c:338
 #, 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:367
+#: src/recode-sr-latin.c:366
 #, 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:159
 #, c-format
@@ -3536,75 +2866,44 @@ 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:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "Erreur de lecture de « %s »"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "Erreur d'écriture sur la sortie standard"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "Erreur après la lecture de « %s »"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Récupération de %s..."
 
-#: src/urlget.c:308
+#: src/urlget.c:307
 #, c-format
 msgid " timed out.\n"
 msgstr " délai expiré.\n"
 
-#: src/urlget.c:445
+#: src/urlget.c:443
 #, c-format
 msgid " failed.\n"
 msgstr " échoué.\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 ""
-"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"
+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:129
-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é."
+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:162
-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."
+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: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 ""
-"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 »."
+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:202
-msgid ""
-"message catalog has plural form translations, but the output format does not "
-"support them."
+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."
@@ -3633,19 +2932,17 @@ msgstr "Échec de compilation de la classe C#. Essayez l'option « --verbose �
 msgid "compilation of C# class failed"
 msgstr "Échec de compilation de la classe C#"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "« %s » n'est pas un nom de classe Java valide"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr ""
-"Échec de compilation de la classe Java. Essayez l'option « --verbose » ou "
-"définissez $JAVAC"
+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:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "Échec de compilation de la classe Java. Essayez de définir $JAVAC"
@@ -3655,14 +2952,12 @@ msgstr "Échec de compilation de la classe Java. Essayez de définir $JAVAC"
 msgid "error while opening \"%s\" for writing"
 msgstr "Erreur lors de l'ouverture de « %s » en écriture"
 
-#: src/write-po.c:875
-#, fuzzy, c-format
-msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
-msgstr ""
-"un message à traduire ne doit pas contenir de séquence d'échappement « \\%c »"
+#: src/write-po.c:802
+#, c-format
+msgid "internationalized messages should not contain the `\\%c' escape sequence"
+msgstr "un message à traduire ne doit pas contenir de séquence d'échappement « \\%c »"
 
-#: src/write-po.c:1326 src/write-po.c:1450
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3675,7 +2970,7 @@ msgstr ""
 "différent du vôtre. Vous devriez utiliser un msgctxt en pur ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3684,10 +2979,8 @@ 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:667
@@ -3700,15 +2993,12 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"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:717
@@ -3717,10 +3007,8 @@ 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:94
@@ -3758,10 +3046,9 @@ msgid ""
 "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:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d : AVERTISSEMENT : chaîne non terminée"
@@ -3771,25 +3058,19 @@ msgstr "%s:%d : AVERTISSEMENT : chaîne non terminée"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d : AVERTISSEMENT : expression rationnelle non terminée"
 
-#: src/x-c.c:1051
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d : AVERTISSEMENT : caractère Unicode invalide"
-
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d : AVERTISSEMENT : constante caractère sans terminaison"
 
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d : AVERTISSEMENT : chaîne sans terminaison"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 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:269
 #, c-format
@@ -3827,7 +3108,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-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d : Échec de « iconv »"
@@ -3841,7 +3122,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:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d : AVERTISSEMENT : caractère Unicode invalide"
@@ -3861,22 +3142,12 @@ msgstr "%s:%d : AVERTISSEMENT : caractère « ) » trouvé à la place de «
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d : AVERTISSEMENT : caractère « } » trouvé à la place de « ) »"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: 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:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3890,78 +3161,10 @@ msgstr ""
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d : AVERTISSEMENT : substitut isolé U+%04X"
 
-#: src/x-javascript.c:230
-#, fuzzy
-msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-"Veuillez spécifier l'encodage de la source avec l'option « --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"
-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:291
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Long incomplete multibyte sequence.\n"
-"Please specify the correct source encoding through --from-code\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 ».\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:%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: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:%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:344
-#, fuzzy, c-format
-msgid ""
-"%s:%d: Invalid multibyte sequence.\n"
-"Please specify the source encoding through --from-code\n"
-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:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d : AVERTISSEMENT : chaîne sans terminaison"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d : AVERTISSEMENT : caractère Unicode invalide"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d : AVERTISSEMENT : chaîne non terminée"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr ""
-"%s:%d : impossible de trouver la terminaison de chaîne « %s » avant la fin "
-"du fichier"
+msgstr "%s:%d : impossible de trouver la terminaison de chaîne « %s » avant la fin du fichier"
 
 #: src/x-perl.c:1043
 #, c-format
@@ -3971,14 +3174,12 @@ msgstr "%s:%d : accolade fermante manquante sur \\x{NOMBRE_HEXA}"
 #: src/x-perl.c:1163
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr ""
-"%s:%d : interpolation invalide (« \\l ») de caractères de 8 bits « %c »"
+msgstr "%s:%d : interpolation invalide (« \\l ») de caractères de 8 bits « %c »"
 
 #: src/x-perl.c:1183
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr ""
-"%s:%d : interpolation invalide (« \\u ») de caractères de 8 bits « %c »"
+msgstr "%s:%d : interpolation invalide (« \\u ») de caractères de 8 bits « %c »"
 
 #: src/x-perl.c:1217
 #, c-format
@@ -3988,25 +3189,22 @@ msgstr "%s:%d : interpolation invalide de variable à « %c »"
 #: src/x-perl.c:1230
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr ""
-"%s:%d : interpolation invalide (« \\L ») de caractères de 8 bits « %c »"
+msgstr "%s:%d : interpolation invalide (« \\L ») de caractères de 8 bits « %c »"
 
 #: src/x-perl.c:1247
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
-msgstr ""
-"%s:%d : interpolation invalide (« \\U ») de caractères de 8 bits « %c »"
+msgstr "%s:%d : interpolation invalide (« \\U ») de caractères de 8 bits « %c »"
 
-#: src/x-python.c:278
+#: 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 ""
-"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
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4014,11 +3212,10 @@ msgid ""
 "comment as specified in http://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
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -4026,11 +3223,10 @@ msgid ""
 "comment as specified in http://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
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -4038,11 +3234,10 @@ msgid ""
 "comment as specified in http://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
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -4050,11 +3245,10 @@ msgid ""
 "comment as specified in http://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
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -4062,11 +3256,10 @@ msgid ""
 "as specified in http://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:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Encodage « %s » inconnu. Traitement effectué en ASCII."
@@ -4088,88 +3281,57 @@ msgstr "%s:%d : expression chaîne invalide"
 
 #: 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 : AVERTISSEMENT : la syntaxe « $\"...\" » ne doit pas être utilisée "
-"pour des raisons de sécurité. Utilisez plutôt « eval_gettext »"
-
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d : AVERTISSEMENT : chaîne sans terminaison"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
+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/xgettext.c:648
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
-msgstr ""
-"L'option « --join-existing » ne peut pas être utilisée pour l'écriture sur "
-"la sortie standard"
+msgstr "L'option « --join-existing » ne peut pas être utilisée pour l'écriture sur la sortie standard"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ne peut pas fonctionner sans mot clé à rechercher"
 
-#: src/xgettext.c:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr ""
-"AVERTISSEMENT : pour le fichier « %s », l'extension « %s » est inconnue. On "
-"suppose que c'est du C"
+#: src/xgettext.c:769
+#, c-format
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
+msgstr "AVERTISSEMENT : pour le fichier « %s », l'extension « %s » est inconnue. On suppose que c'est du C"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
-msgstr ""
-"xgettext analyse des fichiers de code source et permet d'en extraire les "
-"chaînes qui peuvent être traduites dans d'autres langues.\n"
+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:882
+#: 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=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:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr ""
-"  -o, --output=FICHIER        écrire la sortie dans le FICHIER spécifié\n"
+msgstr "  -o, --output=FICHIER        écrire la sortie dans le FICHIER spécifié\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, 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:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Choix du langage du fichier d'entrée :\n"
 
-#: src/xgettext.c:893
-#, fuzzy, c-format
+#: src/xgettext.c:854
+#, 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, Glade)\n"
 msgstr ""
 "  -L, --language=NOM          reconnaître le langage spécifié\n"
 "                              (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
@@ -4177,20 +3339,17 @@ msgstr ""
 "                              JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                              GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   identique à « --language=C++ »\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, 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:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4199,263 +3358,207 @@ msgstr ""
 "      --from-code=NOM         encodage des fichiers d'entrée\n"
 "                              (sauf pour Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "  Par défaut les fichiers d'entrée sont supposés être en ASCII.\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr ""
-"  -j, --join-existing            joindre les messages au fichier existant\n"
+msgstr "  -j, --join-existing            joindre les messages au fichier existant\n"
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
-msgstr ""
-"  -x, --exclude-file=FICHIER.po  les entrées du FICHIER.po ne sont pas "
-"extraites\n"
+msgstr "  -x, --exclude-file=FICHIER.po  les entrées du FICHIER.po ne sont pas extraites\n"
 
-#: src/xgettext.c:919
+#: src/xgettext.c:879
 #, 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:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Options spécifiques au langage:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extraire toutes les chaînes\n"
 
-#: src/xgettext.c:929
-#, fuzzy, c-format
+#: src/xgettext.c:889 src/xgettext.c:896
+#, 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"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
-"                              (seulement les langages C, C++, ObjectiveC, "
-"Shell,\n"
-"                              Python, Lisp, EmacsLisp, librep, Scheme, Java, "
-"C#, awk,\n"
+"                              (seulement les langages C, C++, ObjectiveC, Shell,\n"
+"                              Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, awk,\n"
 "                              awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:937
-#, fuzzy, c-format
+#: src/xgettext.c:893
+#, 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"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                              (seulement les langages C, C++, ObjectiveC, "
-"Shell,\n"
-"                              Python, Lisp, EmacsLisp, librep, Scheme, Java, "
-"C#, awk,\n"
-"                              awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"  -kMOT, --keyword=MOT      chercher MOT comme mot clé additionnel\n"
+"  -k, --keyword               ne pas utiliser les mots clés par défaut\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, 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:945
-#, fuzzy, c-format
+#: src/xgettext.c:903
+#, 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"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\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"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr ""
-"  -T, --trigraphs             comprendre les trigrammes ANSI C pour "
-"l'entrée\n"
+msgstr "  -T, --trigraphs             comprendre les trigrammes ANSI C pour l'entrée\n"
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, 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:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    reconnaître les chaînes au format Qt\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                              (seulement le langage C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr ""
-"      --kde                   reconnaître les chaînes au format KDE 4\n"
+msgstr "      --kde                   reconnaître les chaînes au format KDE 4\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, 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:966
+#: src/xgettext.c:923
 #, 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:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
-msgstr ""
-"      --properties-output     produire un fichier « .properties » de type "
-"Java\n"
+msgstr "      --properties-output     produire un fichier « .properties » de type Java\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=AUTEUR  définit l'auteur dans la sortie\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, 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:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PAQUET   donne le nom de paquet dans la sortie\n"
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
-msgstr ""
-"      --package-version=VERSION  donne la version du paquet dans la sortie\n"
+msgstr "      --package-version=VERSION  donne la version du paquet dans la sortie\n"
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, 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:1016
+#: src/xgettext.c:973
 #, 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:1019
+#: src/xgettext.c:976
 #, 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:1840
+#: src/xgettext.c:1782
 #, 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"
+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:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "entrée standard"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Caractère non-ASCII à %s%s."
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Commentaire non-ASCII à (ou avant) %s%s."
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Chaîne non-ASCII à %s%s."
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s : AVERTISSEMENT : "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
-msgid ""
-"Although being used in a format string position, the %s is not a valid %s "
-"format string. Reason: %s\n"
-msgstr ""
-"Malgré sa position, %s n'est pas une chaîne de format %s valide. La raison "
-"est :%s\n"
+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:2190
+#: src/xgettext.c:2104
 #, 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"
+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:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4463,13 +3566,12 @@ msgid ""
 "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"
+"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:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4479,34 +3581,30 @@ msgstr ""
 "GNU gettext : gettext(\"\") retourne l'en-tête\n"
 "avec les informations de contexte, pas une chaîne vide.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "Argument ambigu pour le mot clé « %.*s »"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "AVERTISSEMENT : contexte absent pour le mot clé « %.*s »"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr ""
-"AVERTISSEMENT : contexte absent pour l'argument de pluriel du mot clé « %.*s "
-"»"
+msgstr "AVERTISSEMENT : contexte absent pour l'argument de pluriel du mot clé « %.*s »"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
-msgstr ""
-"incohérence de contexte entre la forme du singulier et celle du pluriel"
+msgstr "incohérence de contexte entre la forme du singulier et celle du pluriel"
 
-#: src/xgettext.c:3419
-#, fuzzy
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\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 ""
@@ -4515,32 +3613,36 @@ 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:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3226
+#, c-format
+msgid "language `%s' unknown"
 msgstr "langage « %s » inconnu"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<sans nom>"
 
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "Le champ d'en-tête « %s » devrait être au début de la ligne\n"
-
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr ""
-#~ "Certains champs d'en-tête ont encore leur valeur initiale par défaut\n"
-
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s : l'option « --%c » n'est pas permise\n"
 
 #~ msgid "DuplicateHandle failed with error code 0x%08x"
-#~ msgstr ""
-#~ "Échec de la fonction « DuplicateHandle » avec le code d'erreur 0x%08x"
+#~ msgstr "Échec de la fonction « DuplicateHandle » avec le code d'erreur 0x%08x"
 
 #~ msgid "Not yet implemented."
 #~ msgstr "Pas encore implanté"
 
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "Impossible d'établir des entrées/sorties non bloquantes pour le sous-processus %s"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "Échec de communication avec le sous-processus %s"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "Échec de lecture depuis le sous-processus %s"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "Sous-processus %s terminé avec le code de sortie %d"
+
 #~ msgid "field `%s' still has initial default value\n"
 #~ msgstr "Le champ « %s » a encore sa valeur initiale par défaut\n"
 
@@ -4549,14 +3651,11 @@ msgstr "<sans nom>"
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is "
-#~ "NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
-#~ "PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright © %s Free Software Foundation, Inc.\n"
-#~ "Ce programme est un logiciel libre.  Consultez le code source pour "
-#~ "obtenir des détails sur\n"
+#~ "Ce programme est un logiciel libre.  Consultez le code source pour obtenir des détails sur\n"
 #~ "les permissions de copie.  Il est distribué SANS AUCUNE GARANTIE\n"
 #~ "de QUALITÉ MARCHANDE ni d'ADÉQUATION À UN BUT PARTICULIER.\n"
 
@@ -4571,8 +3670,7 @@ msgstr "<sans nom>"
 #~ "message catalog has context dependent translations\n"
 #~ "but the Java ResourceBundle format doesn't support contexts\n"
 #~ msgstr ""
-#~ "le catalogue de messages contient des traductions dépendantes du "
-#~ "contexte\n"
+#~ "le catalogue de messages contient des traductions dépendantes du contexte\n"
 #~ "mais le format ResourceBundle de type Java ne les supporte pas.\n"
 
 #~ msgid "conversion failure"
@@ -4594,18 +3692,13 @@ msgstr "<sans nom>"
 #~ msgstr "Quelle est votre adresse de courriel ?"
 
 #~ msgid "Please choose the number, or enter your email address."
-#~ msgstr ""
-#~ "Veuillez choisir un numéro, ou tapez directement votre adresse de "
-#~ "courriel."
+#~ msgstr "Veuillez choisir un numéro, ou tapez directement votre adresse de courriel."
 
 #~ msgid "Invalid email address: invalid character."
 #~ msgstr "Adresse de courriel invalide : caractère invalide."
 
-#~ msgid ""
-#~ "Invalid email address: need a fully qualified host name or domain name."
-#~ msgstr ""
-#~ "Adresse de courriel invalide : vous devez fournir un nom de machine ou un "
-#~ "nom de domaine pleinement qualifié."
+#~ msgid "Invalid email address: need a fully qualified host name or domain name."
+#~ msgstr "Adresse de courriel invalide : vous devez fournir un nom de machine ou un nom de domaine pleinement qualifié."
 
 #~ msgid "Invalid email address: missing @"
 #~ msgstr "Adresse de courriel invalide : « @ » manquant"
@@ -4614,9 +3707,7 @@ msgstr "<sans nom>"
 #~ msgstr "Ceci est-il votre adresse de courriel ?"
 
 #~ msgid "Please confirm by pressing Return, or enter your email address."
-#~ msgstr ""
-#~ "Veuillez confirmer en appuyant sur la touche ENTRÉE, sinon tapez votre "
-#~ "adresse de courriel"
+#~ msgstr "Veuillez confirmer en appuyant sur la touche ENTRÉE, sinon tapez votre adresse de courriel"
 
 #~ msgid "Couldn't find out about your email address."
 #~ msgstr "Impossible de découvrir votre adresse de courriel."
@@ -4650,44 +3741,30 @@ msgstr "<sans nom>"
 #~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 #~ "                            to MSGID from TEXTDOMAIN\n"
 #~ msgstr ""
-#~ "  -d, --domain=DOMAINE   trouver la traduction de MSGID, dans le DOMAINE "
-#~ "donné\n"
-#~ "  -e                     reconnaître et remplacer les séquences "
-#~ "d'échappement\n"
-#~ "  -E                     (ignoré, gardé pour des questions de "
-#~ "compatibilité)\n"
+#~ "  -d, --domain=DOMAINE   trouver la traduction de MSGID, dans le DOMAINE donné\n"
+#~ "  -e                     reconnaître et remplacer les séquences d'échappement\n"
+#~ "  -E                     (ignoré, gardé pour des questions de compatibilité)\n"
 #~ "  -h, --help             fournir ce message d'aide, puis terminer\n"
 #~ "  -n                     inhiber la production d'une fin de ligne\n"
 #~ "  -V, --version          identifier le programme, puis terminer\n"
-#~ "  [DOMAINE] MSGID        trouver la traduction de MSGID, dans le DOMAINE "
-#~ "donné\n"
+#~ "  [DOMAINE] MSGID        trouver la traduction de MSGID, dans le DOMAINE donné\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 ""
-#~ "Si le DOMAINE n'est pas fourni, le domaine est obtenu de la variable "
-#~ "TEXTDOMAIN\n"
-#~ "dans l'environnement.  Si le catalogue de messages n'est pas trouvé à "
-#~ "l'endroit\n"
-#~ "habituel, la variable d'environnement TEXTDOMAINDIR peut indiquer un "
-#~ "autre\n"
+#~ "Si le DOMAINE n'est pas fourni, le domaine est obtenu de la variable TEXTDOMAIN\n"
+#~ "dans l'environnement.  Si le catalogue de messages n'est pas trouvé à l'endroit\n"
+#~ "habituel, la variable d'environnement TEXTDOMAINDIR peut indiquer un autre\n"
 #~ "répertoire.\n"
-#~ "Avec l'option « -s », ce programme se comporte comme la commande "
-#~ "« echo »; mais\n"
-#~ "plutôt que de copier simplement ses arguments sur « stdout », ceux "
-#~ "qui sont\n"
+#~ "Avec l'option « -s », ce programme se comporte comme la commande « echo »; mais\n"
+#~ "plutôt que de copier simplement ses arguments sur « stdout », ceux qui sont\n"
 #~ "disponibles dans le catalogue choisi sont traduits.\n"
 #~ "\n"
 #~ "Répertoire standard de recherche: %s\n"
@@ -4695,36 +3772,28 @@ msgstr "<sans nom>"
 #~ 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 ""
 #~ "Localisation du fichier d'entrée:\n"
 #~ "  FICHIER-D-ENTRÉE            fichier PO d'entrée\n"
-#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des "
-#~ "fichiers d'entrée\n"
-#~ "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée "
-#~ "standard.\n"
+#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des fichiers d'entrée\n"
+#~ "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée standard.\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 ""
 #~ "Localisation du fichier de sortie:\n"
-#~ "  -o, --output-file=FICHIER   écrire la sortie dans le FICHIER "
-#~ "spécifié\n"
-#~ "Les résultats sont écrits sur la sortie standard si aucun fichier n'est "
-#~ "spécifié.\n"
+#~ "  -o, --output-file=FICHIER   écrire la sortie dans le FICHIER spécifié\n"
+#~ "Les résultats sont écrits sur la sortie standard si aucun fichier n'est spécifié.\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"
@@ -4733,12 +3802,9 @@ msgstr "<sans nom>"
 #~ "Sélection de messages:\n"
 #~ "      --translated            conserver les messages traduits, \n"
 #~ "                               enlever ceux qui ne sont pas traduits\n"
-#~ "      --untranslated          conserver les non traduits, enlever ceux "
-#~ "traduits\n"
-#~ "      --no-fuzzy              enlever les messages marqués "
-#~ "« fuzzy »\n"
-#~ "      --only-fuzzy            conserver les messages marqués "
-#~ "« fuzzy »\n"
+#~ "      --untranslated          conserver les non traduits, enlever ceux traduits\n"
+#~ "      --no-fuzzy              enlever les messages marqués « fuzzy »\n"
+#~ "      --only-fuzzy            conserver les messages marqués « fuzzy »\n"
 #~ "      --no-obsolete           enlever les messages obsolètes #~\n"
 #~ "      --only-obsolete         conserver les messages obsolètes #~\n"
 
@@ -4749,20 +3815,15 @@ msgstr "<sans nom>"
 #~ "      --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 ""
 #~ "Manipulation des attributs:\n"
-#~ "      --set-fuzzy             marquer tous les messages comme "
-#~ "« fuzzy »\n"
-#~ "      --clear-fuzzy           marquer tous les messages comme non-"
-#~ "« fuzzy »\n"
+#~ "      --set-fuzzy             marquer tous les messages comme « fuzzy »\n"
+#~ "      --clear-fuzzy           marquer tous les messages comme non-« fuzzy »\n"
 #~ "      --set-obsolete          marquer tous les messages comme obsolètes\n"
-#~ "      --clear-obsolete        marquer tous les messages comme non-"
-#~ "obsolètes\n"
+#~ "      --clear-obsolete        marquer tous les messages comme non-obsolètes\n"
 #~ "      --fuzzy                 identique à --only-fuzzy --clear-fuzzy\n"
-#~ "      --obsolete              identique à --only-obsolete --clear-"
-#~ "obsolete\n"
+#~ "      --obsolete              identique à --only-obsolete --clear-obsolete\n"
 
 #~ msgid ""
 #~ "Output details:\n"
@@ -4771,69 +3832,54 @@ msgstr "<sans nom>"
 #~ "      --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 ""
 #~ "Détails de sortie:\n"
-#~ "  -e, --no-escape             éviter les échappement C en sortie "
-#~ "(implicite)\n"
-#~ "  -E, --escape                échappements C en sortie, éviter les 8-"
-#~ "bits\n"
+#~ "  -e, --no-escape             éviter les échappement C en sortie (implicite)\n"
+#~ "  -E, --escape                échappements C en sortie, éviter les 8-bits\n"
 #~ "      --force-po              produire un fichier PO, même vide\n"
 #~ "  -i, --indent                sortie en style indenté\n"
-#~ "      --no-location           ne pas produire les lignes « #: fichier:"
-#~ "ligne »\n"
-#~ "  -n, --add-location          générer les lignes de format « #: "
-#~ "fichier:ligne » (par défaut)\n"
-#~ "      --strict                générer un fichier .po avec conformité "
-#~ "stricte Uniforum\n"
+#~ "      --no-location           ne pas produire les lignes « #: fichier:ligne »\n"
+#~ "  -n, --add-location          générer les lignes de format « #: fichier:ligne » (par défaut)\n"
+#~ "      --strict                générer un fichier .po avec conformité stricte Uniforum\n"
 #~ "  -w, --width=COLONNES        limiter le nombre de COLONNES en sortie\n"
 #~ "  -s, --sort-output           générer une sortie triée\n"
-#~ "  -F, --sort-by-file          trier la sortie selon la localisation des "
-#~ "fichiers\n"
+#~ "  -F, --sort-by-file          trier la sortie selon la localisation des fichiers\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 ""
 #~ "Localisation des fichiers d'entrée:\n"
 #~ "  FICHIERS-D-ENTRÉE ...          fichiers d'entrée\n"
-#~ "  -f, --files-from=FICHIER       obtenir la liste des fichiers d'entrée "
-#~ "à partir du FICHIER\n"
-#~ "  -D, --directory=RÉPERTOIRE     ajouter le RÉPERTOIRE pour rechercher la "
-#~ "liste des fichiers d'entrée\n"
+#~ "  -f, --files-from=FICHIER       obtenir la liste des fichiers d'entrée à partir du FICHIER\n"
+#~ "  -D, --directory=RÉPERTOIRE     ajouter le RÉPERTOIRE pour rechercher la liste des fichiers d'entrée\n"
 #~ "Si le fichier d'entrée est -, lire de l'entrée standard.\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 ""
 #~ "Localisation du fichier de sortie:\n"
 #~ "  -o, --output-file=FICHIER      produire la sortie dans le FICHIER\n"
-#~ "Les résultats sont écrits sur la sortie standard si aucun fichier "
-#~ "n'est\n"
+#~ "Les résultats sont écrits sur la sortie standard si aucun fichier n'est\n"
 #~ "spécifié ou si -.\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"
@@ -4841,64 +3887,44 @@ msgstr "<sans nom>"
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
 #~ "Sélection de messages:\n"
-#~ "  -<, --less-than=N              montrer les messages définis moins de N "
-#~ "fois\n"
+#~ "  -<, --less-than=N              montrer les messages définis moins de N fois\n"
 #~ "                                 (sans limite par défaut)\n"
-#~ "  ->, --more-than=N              montrer les messages définis plus de N "
-#~ "fois\n"
-#~ "                                 (sans limite par défaut i.e. = à "
-#~ "zéro)\n"
-#~ "  -u, --unique                   identique à « -< 2 ou --less-"
-#~ "than=2 »\n"
+#~ "  ->, --more-than=N              montrer les messages définis plus de N fois\n"
+#~ "                                 (sans limite par défaut i.e. = à zéro)\n"
+#~ "  -u, --unique                   identique à « -< 2 ou --less-than=2 »\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 ""
 #~ "Détails de sortie:\n"
 #~ "  -t, --to-code=NOM           NOM de l'encodage de sortie\n"
-#~ "      --use-first             utiliser la première traduction disponible "
-#~ "pour chaque\n"
-#~ "                              message, ne pas faire la fusion de "
-#~ "plusieurs traductions\n"
-#~ "  -e, --no-escape             éviter les échappement C en sortie "
-#~ "(implicite)\n"
-#~ "  -E, --escape                échappements C en sortie, éviter les 8-"
-#~ "bits\n"
+#~ "      --use-first             utiliser la première traduction disponible pour chaque\n"
+#~ "                              message, ne pas faire la fusion de plusieurs traductions\n"
+#~ "  -e, --no-escape             éviter les échappement C en sortie (implicite)\n"
+#~ "  -E, --escape                échappements C en sortie, éviter les 8-bits\n"
 #~ "      --force-po              produire un fichier PO, même vide\n"
 #~ "  -i, --indent                sortie en style indenté\n"
-#~ "      --no-location           ne pas produire les lignes « #: fichier:"
-#~ "ligne »\n"
-#~ "  -n, --add-location          générer les lignes de format « #: "
-#~ "fichier:ligne » (par défaut)\n"
-#~ "      --strict                générer un fichier .po avec conformité "
-#~ "stricte Uniforum\n"
+#~ "      --no-location           ne pas produire les lignes « #: fichier:ligne »\n"
+#~ "  -n, --add-location          générer les lignes de format « #: fichier:ligne » (par défaut)\n"
+#~ "      --strict                générer un fichier .po avec conformité stricte Uniforum\n"
 #~ "  -w, --width=COLONNES        limiter le nombre de COLONNES en sortie\n"
 #~ "  -s, --sort-output           générer une sortie triée\n"
-#~ "  -F, --sort-by-file          trier la sortie selon la localisation des "
-#~ "fichiers\n"
+#~ "  -F, --sort-by-file          trier la sortie selon la localisation des fichiers\n"
 
 #~ msgid ""
 #~ "Informative output:\n"
@@ -4913,20 +3939,17 @@ msgstr "<sans nom>"
 #~ "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 ""
 #~ "Localisation des fichiers d'entrée:\n"
 #~ "  def.po                      traductions\n"
 #~ "  ref.pot                     références aux sources\n"
-#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour rechercher la "
-#~ "liste des fichiers d'entrée\n"
+#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour rechercher la liste des fichiers d'entrée\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"
@@ -4934,58 +3957,40 @@ msgstr "<sans nom>"
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
 #~ "Sélection des messages:\n"
-#~ "  -<, --less-than=N              montrer les messages définis moins de N "
-#~ "fois\n"
+#~ "  -<, --less-than=N              montrer les messages définis moins de N fois\n"
 #~ "                                 (sans limite par défaut)\n"
-#~ "  ->, --more-than=N              montrer les messages définis plus de N "
-#~ "fois\n"
-#~ "                                 (sans limite par défaut i.e. = à "
-#~ "zéro)\n"
-#~ "  -u, --unique                   identique à « -< 2 ou --less-"
-#~ "than=2 »\n"
+#~ "  ->, --more-than=N              montrer les messages définis plus de N fois\n"
+#~ "                                 (sans limite par défaut i.e. = à zéro)\n"
+#~ "  -u, --unique                   identique à « -< 2 ou --less-than=2 »\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 ""
 #~ "Détails de sortie:\n"
-#~ "  -e, --no-escape             éviter les échappement C en sortie "
-#~ "(implicite)\n"
-#~ "  -E, --escape                échappements C en sortie, éviter les 8-"
-#~ "bits\n"
+#~ "  -e, --no-escape             éviter les échappement C en sortie (implicite)\n"
+#~ "  -E, --escape                échappements C en sortie, éviter les 8-bits\n"
 #~ "      --force-po              produire un fichier PO, même vide\n"
 #~ "  -i, --indent                sortie en style indenté\n"
-#~ "      --no-location           ne pas produire les lignes « #: fichier:"
-#~ "ligne »\n"
-#~ "  -n, --add-location          générer les lignes de format « #: "
-#~ "fichier:ligne » (par défaut)\n"
-#~ "      --strict                générer un fichier .po avec conformité "
-#~ "stricte Uniforum\n"
+#~ "      --no-location           ne pas produire les lignes « #: fichier:ligne »\n"
+#~ "  -n, --add-location          générer les lignes de format « #: fichier:ligne » (par défaut)\n"
+#~ "      --strict                générer un fichier .po avec conformité stricte Uniforum\n"
 #~ "  -w, --width=COLONNES        limiter le nombre de COLONNES en sortie\n"
 #~ "  -s, --sort-output           générer une sortie triée\n"
-#~ "  -F, --sort-by-file          trier la sortie selon la localisation des "
-#~ "fichiers\n"
-#~ "      --omit-header           omettre les en-têtes pour « msgid "
-#~ "\"\" »\n"
+#~ "  -F, --sort-by-file          trier la sortie selon la localisation des fichiers\n"
+#~ "      --omit-header           omettre les en-têtes pour « msgid \"\" »\n"
 
 #~ msgid ""
 #~ "Output details:\n"
@@ -4994,73 +3999,57 @@ msgstr "<sans nom>"
 #~ "      --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 ""
 #~ "Détails de sortie:\n"
-#~ "  -e, --no-escape             éviter les échappement C en sortie "
-#~ "(implicite)\n"
-#~ "  -E, --escape                échappements C en sortie, éviter les 8-"
-#~ "bits\n"
+#~ "  -e, --no-escape             éviter les échappement C en sortie (implicite)\n"
+#~ "  -E, --escape                échappements C en sortie, éviter les 8-bits\n"
 #~ "      --force-po              produire un fichier PO, même vide\n"
 #~ "  -i, --indent                sortie en style indenté\n"
-#~ "      --no-location           ne pas produire les ligne « #: fichier:"
-#~ "ligne »\n"
-#~ "      --add-location          produire les « #: fichier:ligne "
-#~ "» (implicite)\n"
-#~ "      --strict                produire un fichier PO strictement "
-#~ "Uniforum\n"
+#~ "      --no-location           ne pas produire les ligne « #: fichier:ligne »\n"
+#~ "      --add-location          produire les « #: fichier:ligne » (implicite)\n"
+#~ "      --strict                produire un fichier PO strictement Uniforum\n"
 #~ "  -w, --width=COLONNES        limiter le nombre de COLONNES en sortie\n"
 #~ "  -s, --sort-output           générer une sortie triée\n"
-#~ "  -F, --sort-by-file          trier la sortie selon la localisation des "
-#~ "fichiers\n"
+#~ "  -F, --sort-by-file          trier la sortie selon la localisation des fichiers\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 ""
 #~ "Localisation du fichier d'entrée:\n"
 #~ "  FICHIER-D-ENTRÉE ...          fichier d'entrée PO ou POT\n"
-#~ "  -D, --directory=RÉPERTOIRE    ajouter le RÉPERTOIRE pour rechercher la "
-#~ "liste des fichiers d'entrée\n"
+#~ "  -D, --directory=RÉPERTOIRE    ajouter le RÉPERTOIRE pour rechercher la liste des fichiers d'entrée\n"
 #~ "Si le fichier d'entrée est -, lire de l'entrée standard.\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 ""
 #~ "Localisation du fichier d'entrée:\n"
 #~ "  FICHIER-D-ENTRÉE            fichier PO d'entrée\n"
-#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des "
-#~ "fichier d'entrée\n"
-#~ "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée "
-#~ "standard.\n"
+#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des fichier d'entrée\n"
+#~ "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée standard.\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 ""
 #~ "Options utiles de FILTRE lorsque le filtre est « sed »:\n"
-#~ "  -e, --expression=SCRIPT     ajouter le SCRIPT aux commandes à "
-#~ "exécuter\n"
+#~ "  -e, --expression=SCRIPT     ajouter le SCRIPT aux commandes à exécuter\n"
 #~ "  -f, --file=FICHIER-SCRIPT   ajouter le contenu du FICHIER-SCRIPT\n"
 #~ "                                aux commandes à exécuter\n"
 #~ "  -n, --quiet, --silent       supprimer l'affichage automatique d'espace\n"
@@ -5071,72 +4060,52 @@ msgstr "<sans nom>"
 #~ "  -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 ""
 #~ "Détails de sortie:\n"
-#~ "      --no-escape             éviter les échappement C en sortie "
-#~ "(implicite)\n"
-#~ "  -E, --escape                échappements C en sortie, éviter les 8-"
-#~ "bits\n"
+#~ "      --no-escape             éviter les échappement C en sortie (implicite)\n"
+#~ "  -E, --escape                échappements C en sortie, éviter les 8-bits\n"
 #~ "      --force-po              produire un fichier PO, même vide\n"
 #~ "      --indent                sortie en style indenté\n"
-#~ "      --keep-header           conserver l'en-tête sans la modifier, ne "
-#~ "pas la filtrer\n"
-#~ "      --no-location           ne pas produire les « #: FICHIER:"
-#~ "LIGNE »\n"
-#~ "      --add-location          produire les « #: FICHIER:LIGNE "
-#~ "» (implicite)\n"
-#~ "      --strict                produire un fichier PO strictement "
-#~ "Uniforum\n"
+#~ "      --keep-header           conserver l'en-tête sans la modifier, ne pas la filtrer\n"
+#~ "      --no-location           ne pas produire les « #: FICHIER:LIGNE »\n"
+#~ "      --add-location          produire les « #: FICHIER:LIGNE » (implicite)\n"
+#~ "      --strict                produire un fichier PO strictement Uniforum\n"
 #~ "  -w, --width=COLONNES        limiter le nombre de COLONNES en sortie\n"
-#~ "      --no-wrap               ne pas briser les lignes de longs messages "
-#~ "plus longues que\n"
-#~ "                              que la largeur des pages de sortie en "
-#~ "plusieurs lignes\n"
+#~ "      --no-wrap               ne pas briser les lignes de longs messages plus longues que\n"
+#~ "                              que la largeur des pages de sortie en plusieurs lignes\n"
 #~ "  -s, --sort-output           générer une sortie triée\n"
-#~ "  -F, --sort-by-file          trier la sortie selon la localisation des "
-#~ "fichiers\n"
+#~ "  -F, --sort-by-file          trier la sortie selon la localisation des fichiers\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 ""
 #~ "Localisation du fichier d'entrée:\n"
 #~ "  nom-du-fichier.po ...       fichier PO d'entrée\n"
-#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des "
-#~ "fichiers d'entrée\n"
-#~ "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée "
-#~ "standard.\n"
+#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des fichiers d'entrée\n"
+#~ "Si aucun fichier d'entrée n'est fourni ou si -, lire de l'entrée standard.\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 ""
 #~ "Mode d'exécution:\n"
-#~ "  -j, --java                  mode Java: générer une classe "
-#~ "ResourceBundle en Java\n"
-#~ "      --java2                 identique à --java et assume Java2 (i.e. "
-#~ "JDK 1.2 ou plus)\n"
-#~ "      --tcl                   mode Tcl: générer un fichier .msg  tcl/"
-#~ "msgcat\n"
+#~ "  -j, --java                  mode Java: générer une classe ResourceBundle en Java\n"
+#~ "      --java2                 identique à --java et assume Java2 (i.e. JDK 1.2 ou plus)\n"
+#~ "      --tcl                   mode Tcl: générer un fichier .msg  tcl/msgcat\n"
 
 #~ msgid ""
 #~ "Output file location:\n"
@@ -5145,63 +4114,45 @@ msgstr "<sans nom>"
 #~ "If output file is -, output is written to standard output.\n"
 #~ msgstr ""
 #~ "Localisation du fichier de sortie:\n"
-#~ "  -o, --output-file=FICHIER   écrire la sortie dans le FICHIER "
-#~ "spécifié\n"
-#~ "      --strict                permettre le mode de conformité strict au "
-#~ "mode Uniforum\n"
-#~ "Si le fichier de sortie est -, la sortie est produite sur la sortie "
-#~ "standard.\n"
+#~ "  -o, --output-file=FICHIER   écrire la sortie dans le FICHIER spécifié\n"
+#~ "      --strict                permettre le mode de conformité strict au mode Uniforum\n"
+#~ "Si le fichier de sortie est -, la sortie est produite sur la sortie standard.\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"
 #~ msgstr ""
 #~ "Localisation du fichier de sortie en mode Tcl:\n"
-#~ "  -l, --locale=LOCALE       nom de la locale, soit langage ou "
-#~ "language_COUNTRY\n"
-#~ "  -d RÉPERTOIRE             répertoire de base des catalogues de "
-#~ "messages .msg\n"
+#~ "  -l, --locale=LOCALE       nom de la locale, soit langage ou language_COUNTRY\n"
+#~ "  -d RÉPERTOIRE             répertoire de base des catalogues de messages .msg\n"
 #~ "Les options -l et -d sont obligatoires. Le fichier .msg est écrit dans\n"
 #~ "le répertoire spécifié.\n"
 
 #~ 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 ""
 #~ "Interprétation du fichier d'entrée:\n"
-#~ "  -c, --check                 faire toutes les vérifications "
-#~ "équivalentes à \n"
-#~ "                                --check-format, --check-header, --check-"
-#~ "domain\n"
-#~ "      --check-format          vérifier la dépendance du format des "
-#~ "chaîne au langage\n"
-#~ "      --check-header          vérifier la présence et le contenu des en-"
-#~ "têtes\n"
-#~ "      --check-domain          vérifier la présence de conflit entre les "
-#~ "directives du domaine\n"
+#~ "  -c, --check                 faire toutes les vérifications équivalentes à \n"
+#~ "                                --check-format, --check-header, --check-domain\n"
+#~ "      --check-format          vérifier la dépendance du format des chaîne au langage\n"
+#~ "      --check-header          vérifier la présence et le contenu des en-têtes\n"
+#~ "      --check-domain          vérifier la présence de conflit entre les directives du domaine\n"
 #~ "                                et l'option --output-file\n"
-#~ "  -C, --check-compatibility   vérifier que GNU msgfmt se comporte comme "
-#~ "X/Open msgfmt\n"
-#~ "  -f, --use-fuzzy             utiliser les entrées floues pour la "
-#~ "sortie\n"
+#~ "  -C, --check-compatibility   vérifier que GNU msgfmt se comporte comme X/Open msgfmt\n"
+#~ "  -f, --use-fuzzy             utiliser les entrées floues pour la sortie\n"
 
 #~ msgid ""
 #~ "Informative output:\n"
@@ -5214,8 +4165,7 @@ msgstr "<sans nom>"
 #~ "  -h, --help                  fournir ce message d'aide, puis terminer\n"
 #~ "  -V, --version               identifier le programme, puis terminer\n"
 #~ "      --statistics            afficher les statistiques de traductions\n"
-#~ "  -v, --verbose               diagnostiquer toute anomalie dans chaque "
-#~ "FICHIER\n"
+#~ "  -v, --verbose               diagnostiquer toute anomalie dans chaque FICHIER\n"
 
 #~ msgid ""
 #~ "Output details:\n"
@@ -5224,52 +4174,39 @@ msgstr "<sans nom>"
 #~ "      --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 ""
 #~ "Détails de sortie:\n"
-#~ "      --no-escape             éviter les échappement C en sortie "
-#~ "(implicite)\n"
-#~ "      --escape                échappements C en sortie, éviter les 8-"
-#~ "bits\n"
+#~ "      --no-escape             éviter les échappement C en sortie (implicite)\n"
+#~ "      --escape                échappements C en sortie, éviter les 8-bits\n"
 #~ "      --force-po              produire un fichier PO, même vide\n"
 #~ "      --indent                sortie en style indenté\n"
-#~ "      --no-location           ne pas produire les « #: fichier:"
-#~ "ligne »\n"
-#~ "      --add-location          produire les « #: fichier:ligne "
-#~ "» (implicite)\n"
-#~ "      --strict                produire un fichier PO strictement "
-#~ "Uniforum\n"
+#~ "      --no-location           ne pas produire les « #: fichier:ligne »\n"
+#~ "      --add-location          produire les « #: fichier:ligne » (implicite)\n"
+#~ "      --strict                produire un fichier PO strictement Uniforum\n"
 #~ "  -w, --width=COLONNES        limiter le nombre de COLONNES en sortie\n"
 #~ "      --sort-output           générer une sortie triée\n"
-#~ "      --sort-by-file          trier la sortie selon la localisation des "
-#~ "fichiers\n"
+#~ "      --sort-by-file          trier la sortie selon la localisation des fichiers\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 ""
 #~ "Localisation du fichier d'entrée:\n"
-#~ "  def.po                      traductions se référant aux vieux "
-#~ "sources\n"
+#~ "  def.po                      traductions se référant aux vieux sources\n"
 #~ "  ref.pot                     références aux nouveaux sources\n"
-#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des "
-#~ "fichiers d'entrée\n"
-#~ "  -C, --compendium=FICHIER    librairie additionnelle de messages "
-#~ "traduits,\n"
+#~ "  -D, --directory=RÉPERTOIRE  ajouter le RÉPERTOIRE pour la recherche des fichiers d'entrée\n"
+#~ "  -C, --compendium=FICHIER    librairie additionnelle de messages traduits,\n"
 #~ "                              peut-être spécifié plus d'une fois\n"
 
 #~ msgid ""
@@ -5282,25 +4219,20 @@ msgstr "<sans nom>"
 #~ "Sortie informative:\n"
 #~ "  -h, --help                  fournir ce message d'aide, puis terminer\n"
 #~ "  -V, --version               identifier le programme, puis terminer\n"
-#~ "  -v, --verbose               diagnostiquer toute anomalie dans chaque "
-#~ "FICHIER\n"
+#~ "  -v, --verbose               diagnostiquer toute anomalie dans chaque FICHIER\n"
 #~ "  -q, --quiet, --silent       supprimer les indicateurs de progression\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"
 #~ msgstr ""
 #~ "Localisation du fichier d'entrée en mode Tcl:\n"
-#~ "  -l, --locale=LOCALE       nom de la locale, soit langage ou "
-#~ "language_COUNTRY\n"
-#~ "  -d RÉPERTOIRE             répertoire de base des catalogues de "
-#~ "messages .msg\n"
-#~ "Les options -l et -d sont obligatoires. Le fichier .msg est localisé "
-#~ "dans\n"
+#~ "  -l, --locale=LOCALE       nom de la locale, soit langage ou language_COUNTRY\n"
+#~ "  -d RÉPERTOIRE             répertoire de base des catalogues de messages .msg\n"
+#~ "Les options -l et -d sont obligatoires. Le fichier .msg est localisé dans\n"
 #~ "le répertoire spécifié.\n"
 
 #~ msgid ""
@@ -5316,20 +4248,15 @@ msgstr "<sans nom>"
 #~ "  -s, --sort-output        generate sorted output\n"
 #~ msgstr ""
 #~ "Détails de sortie:\n"
-#~ "  -e, --no-escape             éviter les échappement C en sortie "
-#~ "(implicite)\n"
-#~ "  -E, --escape                échappements C en sortie, éviter les 8-"
-#~ "bits\n"
+#~ "  -e, --no-escape             éviter les échappement C en sortie (implicite)\n"
+#~ "  -E, --escape                échappements C en sortie, éviter les 8-bits\n"
 #~ "      --force-po              produire un fichier PO, même vide\n"
 #~ "  -i, --indent                sortie en style indenté\n"
-#~ "      --strict                produire un fichier .po strictement "
-#~ "Uniforum\n"
+#~ "      --strict                produire un fichier .po strictement Uniforum\n"
 #~ "  -w, --width=COLONNES        limiter le nombre de COLONNES en sortie\n"
 #~ "  -s, --sort-output           générer une sortie triée\n"
-#~ "      --no-wrap               ne pas briser les lignes de longs messages "
-#~ "plus longues que\n"
-#~ "                              que la largeur des pages de sortie en "
-#~ "plusieurs lignes\n"
+#~ "      --no-wrap               ne pas briser les lignes de longs messages plus longues que\n"
+#~ "                              que la largeur des pages de sortie en plusieurs lignes\n"
 
 #~ msgid ""
 #~ "Informative output:\n"
@@ -5340,15 +4267,13 @@ msgstr "<sans nom>"
 #~ "Sortie informative:\n"
 #~ "  -h, --help                  fournir ce message d'aide, puis terminer\n"
 #~ "  -V, --version               identifier le programme, puis terminer\n"
-#~ "  -v, --verbose               diagnostiquer toute anomalie dans chaque "
-#~ "FICHIER\n"
+#~ "  -v, --verbose               diagnostiquer toute anomalie dans chaque FICHIER\n"
 
 #~ msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
 #~ msgstr "Usage: %s [OPTION] [DOMAINE] MSGID MSGID-PLURIEL VALEUR\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 ""
 #~ "Afficher en langue native la traduction d'un message textuel dont\n"
@@ -5361,170 +4286,114 @@ msgstr "<sans nom>"
 #~ "  -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=DOMAINE   trouver la traduction de MSGID, dans le DOMAINE "
-#~ "donné\n"
-#~ "  -e                     reconnaître et remplacer les séquences "
-#~ "d'échappement\n"
-#~ "  -E                     (ignoré, gardé pour des questions de "
-#~ "compatibilité)\n"
+#~ "  -d, --domain=DOMAINE   trouver la traduction de MSGID, dans le DOMAINE donné\n"
+#~ "  -e                     reconnaître et remplacer les séquences d'échappement\n"
+#~ "  -E                     (ignoré, gardé pour des questions de compatibilité)\n"
 #~ "  -h, --help             fournir ce message d'aide, puis terminer\n"
 #~ "  -n                     inhiber la production d'une fin de ligne\n"
 #~ "  -V, --version          identifier le programme, puis terminer\n"
-#~ "  [DOMAINE] MSGID        trouver la traduction de MSGID, dans le DOMAINE "
-#~ "donné\n"
-#~ "  MSGID MSGID-PLURAL     traduire le champ MSGID (singulier) / MSGID-"
-#~ "PLURAL (pluriel)\n"
-#~ "  VALEUR                 choisir la forme singulier/pluriel selon la "
-#~ "VALEUR\n"
+#~ "  [DOMAINE] MSGID        trouver la traduction de MSGID, dans le DOMAINE donné\n"
+#~ "  MSGID MSGID-PLURAL     traduire le champ MSGID (singulier) / MSGID-PLURAL (pluriel)\n"
+#~ "  VALEUR                 choisir la forme singulier/pluriel selon la VALEUR\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 ""
-#~ "Si le DOMAINE n'est pas founi, le domaine est obtenu de la variable "
-#~ "TEXTDOMAIN\n"
-#~ "dans l'environnement.  En l'absence du catalogue de messages à "
-#~ "l'endroit\n"
-#~ "habituel, la variable d'environnement TEXTDOMAINDIR peut indiquer un "
-#~ "autre\n"
+#~ "Si le DOMAINE n'est pas founi, le domaine est obtenu de la variable TEXTDOMAIN\n"
+#~ "dans l'environnement.  En l'absence du catalogue de messages à l'endroit\n"
+#~ "habituel, la variable d'environnement TEXTDOMAINDIR peut indiquer un autre\n"
 #~ "répertoire.\n"
 #~ "Répertoire standard de recherche: %s\n"
 
 #~ 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 ""
 #~ "Localisation du fichier de sortie:\n"
-#~ "  -d, --default-domain=NOM       utiliser NOM.po pour la sortie (au lieu "
-#~ "de messages.po)\n"
-#~ "  -o, --output=FICHIER           écrire la sortie dans le FICHIER "
-#~ "spécifié\n"
-#~ "  -p, --output-dir=RÉPERTOIRE    placer les fichiers de sortie dans le "
-#~ "RÉPERTOIRE\n"
+#~ "  -d, --default-domain=NOM       utiliser NOM.po pour la sortie (au lieu de messages.po)\n"
+#~ "  -o, --output=FICHIER           écrire la sortie dans le FICHIER spécifié\n"
+#~ "  -p, --output-dir=RÉPERTOIRE    placer les fichiers de sortie dans le RÉPERTOIRE\n"
 #~ "Si la sortie est -, la sortie est écrite sur la sortie standard.\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 ""
 #~ "Options spécifiques au language=C/C++:\n"
 #~ "  -a, --extract-all              extraire toutes les chaînes\n"
-#~ "  -k, --keyword[=MOTS]           mots clés additionnels à rechercher "
-#~ "(sans\n"
-#~ "                                 MOTS indique de ne pas utiliser les mots "
-#~ "clés par défaut)\n"
-#~ "  -T, --trigraphs                traiter les trigraphes ANSI C à "
-#~ "l'entrée\n"
-#~ "      --debug                    fournir plus de détails sur la "
-#~ "reconnaissance\n"
+#~ "  -k, --keyword[=MOTS]           mots clés additionnels à rechercher (sans\n"
+#~ "                                 MOTS indique de ne pas utiliser les mots clés par défaut)\n"
+#~ "  -T, --trigraphs                traiter les trigraphes ANSI C à l'entrée\n"
+#~ "      --debug                    fournir plus de détails sur la reconnaissance\n"
 #~ "                                 des chaînes de format\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 ""
 #~ "Détails de sortie:\n"
-#~ "  -e, --no-escape                éviter les échappement C en sortie "
-#~ "(implicite)\n"
-#~ "  -E, --escape                   échappements C en sortie, éviter les 8-"
-#~ "bits\n"
+#~ "  -e, --no-escape                éviter les échappement C en sortie (implicite)\n"
+#~ "  -E, --escape                   échappements C en sortie, éviter les 8-bits\n"
 #~ "      --force-po                 produire un fichier PO, même vide\n"
 #~ "  -i, --indent                   sortie en style indenté\n"
-#~ "      --no-location              ne pas produire les « #: FICHIER:LIGNE "
-#~ "»\n"
-#~ "  -n, --add-location             générer les lignes de format '#: "
-#~ "fichier:ligne' (par défaut)\n"
-#~ "      --strict                   générer un fichier .po avec "
-#~ "conformité stricte Uniforum\n"
+#~ "      --no-location              ne pas produire les « #: FICHIER:LIGNE »\n"
+#~ "  -n, --add-location             générer les lignes de format '#: fichier:ligne' (par défaut)\n"
+#~ "      --strict                   générer un fichier .po avec conformité stricte Uniforum\n"
 #~ "  -w, --width=COLONNES           limiter le nombre de COLONNES en sortie\n"
-#~ "      --no-wrap                  ne pas briser les lignes de longs "
-#~ "messages plus longues que\n"
-#~ "                                 que la largeur des pages de sortie, en "
-#~ "plusieurs lignes\n"
+#~ "      --no-wrap                  ne pas briser les lignes de longs messages plus longues que\n"
+#~ "                                 que la largeur des pages de sortie, en plusieurs lignes\n"
 #~ "  -s, --sort-output              générer une sortie triée\n"
-#~ "  -F, --sort-by-file             trier la sortie selon la localisation "
-#~ "des fichiers\n"
-#~ "      --omit-header              omettre les en-têtes pour « msgid "
-#~ "\"\" »\n"
-#~ "      --copyright-holder=CHAÎNE  identifier le champ des droits d'auteur "
-#~ "dans la sortie\n"
-#~ "      --foreign-user             inhiber la production d'un copyright "
-#~ "FSF\n"
-#~ "  -m, --msgstr-prefix[=CHAÎNE]   préfixer les msgstr's par CHAÎNE, sinon "
-#~ "\\\"\\\"\n"
-#~ "  -M, --msgstr-suffix[=CHAÎNE]   suffixer les msgstr's par CHAÎNE, sinon "
-#~ "\\« \\ »\n"
+#~ "  -F, --sort-by-file             trier la sortie selon la localisation des fichiers\n"
+#~ "      --omit-header              omettre les en-têtes pour « msgid \"\" »\n"
+#~ "      --copyright-holder=CHAÎNE  identifier le champ des droits d'auteur dans la sortie\n"
+#~ "      --foreign-user             inhiber la production d'un copyright FSF\n"
+#~ "  -m, --msgstr-prefix[=CHAÎNE]   préfixer les msgstr's par CHAÎNE, sinon \\\"\\\"\n"
+#~ "  -M, --msgstr-suffix[=CHAÎNE]   suffixer les msgstr's par CHAÎNE, sinon \\« \\ »\n"
 
 #~ msgid "file \"%s\" contains a not NUL terminated sysdep segment"
-#~ msgstr ""
-#~ "fichier \"%s\" contient un segement sysdep qui n'est pas terminé par un "
-#~ "NUL"
+#~ msgstr "fichier \"%s\" contient un segement sysdep qui n'est pas terminé par un NUL"
 
 #~ msgid "seek \"%s\" offset %ld failed"
 #~ msgstr "le repositionnement de « %s » à l'endroit %ld a échoué"
 
 #~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
-#~ msgstr ""
-#~ "les spécifications de format pour l'argument {%u} n'existent pas dans "
-#~ "« msgstr »"
+#~ msgstr "les spécifications de format pour l'argument {%u} n'existent pas dans « msgstr »"
 
 #~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-#~ msgstr ""
-#~ "les spécifications de format de l'argument «%s» n'existent pas "
-#~ "« msgstr »"
+#~ msgstr "les spécifications de format de l'argument «%s» n'existent pas « msgstr »"
 
 #~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
-#~ msgstr ""
-#~ "les spécifications de format de l'argument %u n'existent pas dans "
-#~ "« msgstr »"
+#~ msgstr "les spécifications de format de l'argument %u n'existent pas dans « msgstr »"
 
 #~ msgid "this message has no definition in the \"%s\" domain"
 #~ msgstr "ce message n'a pas de définition dans le domaine « %s »"
@@ -5535,14 +4404,10 @@ msgstr "<sans nom>"
 #~ 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"
@@ -5552,58 +4417,37 @@ msgstr "<sans nom>"
 #~ "Les arguments obligatoires pour la forme longue des options sont aussi\n"
 #~ "obligatoires pour les formes courtes qui leur correspondent.\n"
 #~ "\n"
-#~ "  -d, --default-domain=DOMAINE   sortir sur DOMAINE.po (non pas messages."
-#~ "po)\n"
-#~ "  -D, --directory=RÉPERT         fouiller RÉPERT aussi pour trouver les "
-#~ "fichiers\n"
-#~ "  -e, --no-escape                éviter les échappement C en sortie "
-#~ "(implicite)\n"
-#~ "  -E, --escape                   échappements C en sortie, éviter les 8-"
-#~ "bits\n"
-#~ "  -f, --files-from=FICHIER       lire la liste des fichiers d'entrée de "
-#~ "FICHIER\n"
+#~ "  -d, --default-domain=DOMAINE   sortir sur DOMAINE.po (non pas messages.po)\n"
+#~ "  -D, --directory=RÉPERT         fouiller RÉPERT aussi pour trouver les fichiers\n"
+#~ "  -e, --no-escape                éviter les échappement C en sortie (implicite)\n"
+#~ "  -E, --escape                   échappements C en sortie, éviter les 8-bits\n"
+#~ "  -f, --files-from=FICHIER       lire la liste des fichiers d'entrée de FICHIER\n"
 #~ "      --force-po                 produire un fichier PO, même vide\n"
-#~ "  -F, --sort-by-file             trier selon la position dans chaque "
-#~ "fichier\n"
-#~ "  -h, --help                     fournir ce message d'aide, puis "
-#~ "terminer\n"
+#~ "  -F, --sort-by-file             trier selon la position dans chaque fichier\n"
+#~ "  -h, --help                     fournir ce message d'aide, puis terminer\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                   utiliser un style indenté pour le "
-#~ "fichier PO\n"
-#~ "      --no-location              inhiber la production des « #: FICHIER:"
-#~ "LIGNE »\n"
-#~ "  -n, --add-location             produire les « #: FICHIER:LIGNE "
-#~ "» (implicite)\n"
-#~ "      --omit-header              omettre les en-têtes pour « msgid "
-#~ "\"\" »\n"
-#~ "  -o, --output=FICHIER           produire la sortie sur le FICHIER "
-#~ "indiqué\n"
-#~ "  -p, --output-dir=RÉPERTOIRE    sortir le fichier produit dans tel "
-#~ "RÉPERTOIRE\n"
-#~ "  -s, --sort-output              trier la sortie et éliminer les "
-#~ "duplicats\n"
-#~ "      --strict                   produire un fichier PO strictement "
-#~ "Uniforum\n"
-#~ "  -T, --trigraphs                reconnaître les trigraphes ANSI C en "
-#~ "entrée\n"
+#~ "  -i, --indent                   utiliser un style indenté pour le fichier PO\n"
+#~ "      --no-location              inhiber la production des « #: FICHIER:LIGNE »\n"
+#~ "  -n, --add-location             produire les « #: FICHIER:LIGNE » (implicite)\n"
+#~ "      --omit-header              omettre les en-têtes pour « msgid \"\" »\n"
+#~ "  -o, --output=FICHIER           produire la sortie sur le FICHIER indiqué\n"
+#~ "  -p, --output-dir=RÉPERTOIRE    sortir le fichier produit dans tel RÉPERTOIRE\n"
+#~ "  -s, --sort-output              trier la sortie et éliminer les duplicats\n"
+#~ "      --strict                   produire un fichier PO strictement Uniforum\n"
+#~ "  -T, --trigraphs                reconnaître les trigraphes ANSI C en entrée\n"
 #~ "  -u, --unique                   même chose que « -< 2 »\n"
 
 #~ msgid ""
@@ -5611,16 +4455,12 @@ msgstr "<sans nom>"
 #~ "Generate binary message catalog from textual translation description.\n"
 #~ "\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
-#~ "%d)\n"
-#~ "  -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"
@@ -5633,34 +4473,25 @@ msgstr "<sans nom>"
 #~ "output is written to standard output.\n"
 #~ msgstr ""
 #~ "Usage: %s [OPTION] FICHIER.po ...\n"
-#~ "Compiler un fichier source décrivant une série de traductions de "
-#~ "messages.\n"
+#~ "Compiler un fichier source décrivant une série de traductions de messages.\n"
 #~ "\n"
 #~ "Les arguments obligatoires pour la forme longue des options sont aussi\n"
 #~ "obligatoires pour les formes courtes qui leur correspondent.\n"
 #~ "\n"
-#~ "  -a, --alignment=OCTETS     aligner chaînes sur tant d'OCTETS (%d "
-#~ "présumé)\n"
-#~ "  -c, --check                vérifier ce qui dépend du langage de "
-#~ "programmation\n"
-#~ "  -D, --directory=RÉPERT     fouiller RÉPERT aussi pour trouver les "
-#~ "fichiers\n"
-#~ "  -f, --use-fuzzy            aussi transmettre les traductions "
-#~ "approximées\n"
+#~ "  -a, --alignment=OCTETS     aligner chaînes sur tant d'OCTETS (%d présumé)\n"
+#~ "  -c, --check                vérifier ce qui dépend du langage de programmation\n"
+#~ "  -D, --directory=RÉPERT     fouiller RÉPERT aussi pour trouver les fichiers\n"
+#~ "  -f, --use-fuzzy            aussi transmettre les traductions approximées\n"
 #~ "  -h, --help                 fournir ce message d'aide, puis terminer\n"
-#~ "      --no-hash              exclure la table de dispersion du binaire "
-#~ "produit\n"
+#~ "      --no-hash              exclure la table de dispersion du binaire produit\n"
 #~ "  -o, --output-file=SORTIE   choisir le fichier de sortie\n"
-#~ "      --statistics           donner quelques statistiques sur les "
-#~ "traductions\n"
+#~ "      --statistics           donner quelques statistiques sur les traductions\n"
 #~ "      --strict               se conformer à Uniforum strictement\n"
-#~ "  -v, --verbose              diagnostiquer toute anomalie dans chaque "
-#~ "FICHIER\n"
+#~ "  -v, --verbose              diagnostiquer toute anomalie dans chaque FICHIER\n"
 #~ "  -V, --version              identifier le programme, puis terminer\n"
 #~ "\n"
 #~ "La répétition de l'option « -v » augment le niveau de verbosité.\n"
-#~ "Si FICHIER vaut « - », lit l'entrée standard.  Si SORTIE vaut « -"
-#~ " »,\n"
+#~ "Si FICHIER vaut « - », lit l'entrée standard.  Si SORTIE vaut « - »,\n"
 #~ "écrit sur la sortie standard.\n"
 
 #~ msgid "while creating hash table"
@@ -5670,8 +4501,7 @@ msgstr "<sans nom>"
 #~ "%s: warning: PO file header missing, fuzzy, or invalid\n"
 #~ "%*s  warning: charset conversion will not work"
 #~ msgstr ""
-#~ "%s: AVERTISSEMENT: en-tête du fichier PO manquante, approximative ou "
-#~ "invalide\n"
+#~ "%s: AVERTISSEMENT: en-tête du fichier PO manquante, approximative ou invalide\n"
 #~ "%*s  AVERTISSEMENT: la conversion du charset ne fonctionnera pas"
 
 #~ msgid ""
@@ -5684,12 +4514,9 @@ msgstr "<sans nom>"
 #~ "\n"
 #~ "Convertir un fichier .mo, binaire, en fichier .po à la manière\n"
 #~ "d'Uniforum.  Les fichiers grand-boutiens et petit-boutiens sont tous\n"
-#~ "deux traités.  Si le fichier d'entrée vaut « - », lit l'entrée "
-#~ "standard.\n"
-#~ "Sans fichier d'entrée ou lorsque « - », lit l'entrée standard.  "
-#~ "Sauf\n"
-#~ "indication contraire, les résultats sont produits sur la sortie "
-#~ "standard.\n"
+#~ "deux traités.  Si le fichier d'entrée vaut « - », lit l'entrée standard.\n"
+#~ "Sans fichier d'entrée ou lorsque « - », lit l'entrée standard.  Sauf\n"
+#~ "indication contraire, les résultats sont produits sur la sortie standard.\n"
 
 #~ msgid ""
 #~ "Usage: %s [OPTION] INPUTFILE ...\n"
@@ -5700,20 +4527,14 @@ msgstr "<sans nom>"
 #~ "  -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 ""
 #~ "Usage: %s [OPTION] FICHIER ...\n"
@@ -5723,79 +4544,49 @@ msgstr "<sans nom>"
 #~ "obligatoires pour les formes courtes qui leur correspondent.\n"
 #~ "\n"
 #~ "  -a, --extract-all              extraire toutes les chaînes\n"
-#~ "  -c, --add-comments[=CLÉ]       sauver le commentaire précédent "
-#~ "possédant CLÉ,\n"
-#~ "                                 ou celui qui précède immédiatement le "
-#~ "mot-clef\n"
+#~ "  -c, --add-comments[=CLÉ]       sauver le commentaire précédent possédant CLÉ,\n"
+#~ "                                 ou celui qui précède immédiatement le mot-clef\n"
 #~ "  -C, --c++                      voir « --language=C++ »\n"
-#~ "      --debug                    détailler l'analyse des chaînes de "
-#~ "format\n"
-#~ "  -d, --default-domain=DOMAINE   sortir sur DOMAINE.po (non pas messages."
-#~ "po)\n"
-#~ "  -D, --directory=RÉPERT         fouiller RÉPERT aussi pour trouver les "
-#~ "fichiers\n"
-#~ "  -e, --no-escape                pas d'échappements C en sortie "
-#~ "(implicite)\n"
-#~ "  -E, --escape                   échappements C en sortie, éviter les 8-"
-#~ "bits\n"
-#~ "  -f, --files-from=FICHIER       lire la liste des fichiers d'entrée de "
-#~ "FICHIER\n"
+#~ "      --debug                    détailler l'analyse des chaînes de format\n"
+#~ "  -d, --default-domain=DOMAINE   sortir sur DOMAINE.po (non pas messages.po)\n"
+#~ "  -D, --directory=RÉPERT         fouiller RÉPERT aussi pour trouver les fichiers\n"
+#~ "  -e, --no-escape                pas d'échappements C en sortie (implicite)\n"
+#~ "  -E, --escape                   échappements C en sortie, éviter les 8-bits\n"
+#~ "  -f, --files-from=FICHIER       lire la liste des fichiers d'entrée de FICHIER\n"
 #~ "      --force-po                 produire un fichier PO, même vide\n"
-#~ "      --foreign-user             inhiber la production d'un copyright "
-#~ "FSF\n"
-#~ "  -F, --sort-by-file             trier selon la position dans chaque "
-#~ "fichier\n"
+#~ "      --foreign-user             inhiber la production d'un copyright FSF\n"
+#~ "  -F, --sort-by-file             trier selon la position dans chaque fichier\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                     fournir ce message d'aide, puis "
-#~ "terminer\n"
-#~ "  -i, --indent                   produire le fichier .po dans un style "
-#~ "indenté\n"
-#~ "  -j, --join-existing            ajouter les messages au fichier "
-#~ "existant\n"
-#~ "  -k, --keyword[=MOT]            mot-clef supplémentaire, défauts si "
-#~ "MOT absent\n"
-#~ "  -l, --string-limit=LONGUEUR    indiquer si LONGUEUR (%u) octets "
-#~ "dépassés\n"
-#~ "  -L, --language=NOM             analyser le langage indiqué (C, C++, "
-#~ "PO),\n"
-#~ "                                 sinon, le deviner de l'extension du "
-#~ "fichier\n"
-#~ "  -m, --msgstr-prefix[=CHAÎNE]   préfixer les msgstr's par CHAÎNE, sinon "
-#~ "\"\"\n"
-#~ "  -M, --msgstr-suffix[=CHAÎNE]   suffixer les msgstr's par CHAÎNE, sinon "
-#~ "\"\"\n"
-#~ "      --no-location              ne pas produire les « #: FICHIER:LIGNE "
-#~ "»\n"
+#~ "  -h, --help                     fournir ce message d'aide, puis terminer\n"
+#~ "  -i, --indent                   produire le fichier .po dans un style indenté\n"
+#~ "  -j, --join-existing            ajouter les messages au fichier existant\n"
+#~ "  -k, --keyword[=MOT]            mot-clef supplémentaire, défauts si MOT absent\n"
+#~ "  -l, --string-limit=LONGUEUR    indiquer si LONGUEUR (%u) octets dépassés\n"
+#~ "  -L, --language=NOM             analyser le langage indiqué (C, C++, PO),\n"
+#~ "                                 sinon, le deviner de l'extension du fichier\n"
+#~ "  -m, --msgstr-prefix[=CHAÎNE]   préfixer les msgstr's par CHAÎNE, sinon \"\"\n"
+#~ "  -M, --msgstr-suffix[=CHAÎNE]   suffixer les msgstr's par CHAÎNE, sinon \"\"\n"
+#~ "      --no-location              ne pas produire les « #: FICHIER:LIGNE »\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"
@@ -5803,20 +4594,13 @@ msgstr "<sans nom>"
 #~ "\n"
 #~ "If INPUTFILE is -, standard input is read.\n"
 #~ msgstr ""
-#~ "  -n, --add-location             produire les « #: FICHIER:LIGNE "
-#~ "» (implicite)\n"
-#~ "      --omit-header              omettre les en-têtes pour « msgid "
-#~ "\"\" »\n"
-#~ "  -o, --output=FICHIER           produire la sortie sur le FICHIER "
-#~ "indiqué\n"
-#~ "  -p, --output-dir=RÉPERTOIRE    sortir le fichier produit dans tel "
-#~ "RÉPERTOIRE\n"
-#~ "  -s, --sort-output              trier la sortie et éliminer les "
-#~ "duplicats\n"
-#~ "      --strict                   produire un fichier PO strictement "
-#~ "Uniforum\n"
-#~ "  -T, --trigraphs                reconnaître les trigraphes ANSI C en "
-#~ "entrée\n"
+#~ "  -n, --add-location             produire les « #: FICHIER:LIGNE » (implicite)\n"
+#~ "      --omit-header              omettre les en-têtes pour « msgid \"\" »\n"
+#~ "  -o, --output=FICHIER           produire la sortie sur le FICHIER indiqué\n"
+#~ "  -p, --output-dir=RÉPERTOIRE    sortir le fichier produit dans tel RÉPERTOIRE\n"
+#~ "  -s, --sort-output              trier la sortie et éliminer les duplicats\n"
+#~ "      --strict                   produire un fichier PO strictement Uniforum\n"
+#~ "  -T, --trigraphs                reconnaître les trigraphes ANSI C en entrée\n"
 #~ "  -V, --version                  identifier le programme, puis terminer\n"
 #~ "  -w, --width=COLONNES           limiter le nombre de COLONNES en sortie\n"
 #~ "  -x, --exclude-file=FICHIER     ne pas extraire d'entrées de FICHIER\n"
@@ -5824,13 +4608,10 @@ msgstr "<sans nom>"
 #~ "Si le FICHIER est « - », lit l'entrée standard.\n"
 
 #~ msgid "%s:%d: warning: keyword nested in keyword arg"
-#~ msgstr ""
-#~ "%s:%d: AVERTISSEMENT: mot clé imbriqué dans un argument de mots clés"
+#~ msgstr "%s:%d: AVERTISSEMENT: mot clé imbriqué dans un argument de mots clés"
 
 #~ msgid "%s:%d: warning: keyword between outer keyword and its arg"
-#~ msgstr ""
-#~ "%s:%d: AVERTISSEMENT: mot clé entre un mot clé extérieur et son "
-#~ "argument"
+#~ msgstr "%s:%d: AVERTISSEMENT: mot clé entre un mot clé extérieur et son argument"
 
 #~ msgid "%s: warning: no header entry found"
 #~ msgstr "%s: attention: l'en-tête n'a pas été trouvé"
diff --git a/gettext-tools/po/gl.po b/gettext-tools/po/gl.po
index 485c11243..2c5e220ad 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-06-01 11:19+0900\n"
+"POT-Creation-Date: 2014-05-10 13:37+0900\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"
@@ -40,8 +40,7 @@ msgstr "Os argumentos válidos son:"
 #: gnulib-lib/clean-temp.c:332
 #, 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
 #, c-format
@@ -75,8 +74,7 @@ msgstr "produciuse un erro ao abrir «%s» para lectura"
 #: gnulib-lib/copy-file.c:198
 #, 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
 #, c-format
@@ -205,15 +203,12 @@ msgstr "produciuse un erro ao escribir o ficheiro «%s»"
 #: gnulib-lib/javacomp.c:2343
 #, 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
@@ -223,7 +218,7 @@ 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:1326
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria esgotada"
@@ -234,7 +229,7 @@ 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:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "produciuse un erro ao escribir ao subproceso %s"
@@ -337,11 +332,8 @@ msgstr ""
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%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
@@ -359,9 +351,7 @@ msgstr "unha especificación de formato para o argumento %u non existe en «%s»
 #: 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
@@ -370,9 +360,7 @@ 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
@@ -403,14 +391,12 @@ 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 '}'."
+msgid "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
 #: src/format-csharp.c:139
 #, 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
@@ -419,9 +405,7 @@ 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 "
-"'{'."
+msgid "The string starts in the middle of a directive: found '}' without matching '{'."
 msgstr ""
 
 #: src/format-csharp.c:162
@@ -441,16 +425,12 @@ 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
@@ -488,43 +468,32 @@ 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
@@ -534,9 +503,7 @@ 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
@@ -546,15 +513,12 @@ 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
@@ -564,49 +528,34 @@ 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-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."
+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
 #, 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] ""
 
@@ -638,9 +587,7 @@ msgstr ""
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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
@@ -660,14 +607,11 @@ msgstr "as especificacións de formato en «%s» e «%s» non son equivalentes"
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr ""
-"as especificacións de formato en «%s» non son un subconxunto das de «%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'."
+msgid "In the directive number %u, the size specifier is incompatible with the conversion specifier '%c'."
 msgstr ""
 
 #: src/format-perl-brace.c:199 src/format-python.c:471
@@ -675,13 +619,10 @@ msgstr ""
 #: 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."
+msgid "The string refers to arguments both through argument names and through unnamed argument specifications."
 msgstr ""
 
 #: src/format-python.c:354
@@ -691,31 +632,23 @@ 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'"
-msgstr ""
-"unha especificación de formato para o argumento «%s», como en «%s», non "
-"existe en «%s»"
+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.c:494
 #, 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 "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-python-brace.c:137
 #, c-format
@@ -734,8 +667,7 @@ msgstr ""
 
 #: src/format-python-brace.c:185
 #, 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 ""
 
 #: src/format-python-brace.c:270
@@ -745,9 +677,7 @@ 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
@@ -755,15 +685,11 @@ 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
@@ -772,16 +698,12 @@ 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."
+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
@@ -851,8 +773,7 @@ msgstr ""
 #: src/hostname.c:222
 #, 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 ""
 
@@ -937,8 +858,7 @@ msgstr ""
 #: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 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
@@ -959,8 +879,7 @@ msgstr ""
 #: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
 #: src/xgettext.c:875
 #, 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
@@ -1000,14 +919,12 @@ 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
@@ -1064,27 +981,22 @@ 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
@@ -1094,8 +1006,7 @@ 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
@@ -1109,16 +1020,13 @@ 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
 #, 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
 #, 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
@@ -1136,8 +1044,7 @@ msgstr ""
 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
@@ -1151,16 +1058,14 @@ msgstr ""
 #: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
 #: src/xgettext.c:977
 #, 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
 #, 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
@@ -1185,15 +1090,13 @@ msgstr ""
 #: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
 #: src/xgettext.c:987
 #, 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
 #, 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
@@ -1207,8 +1110,7 @@ msgstr ""
 #: 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
 #, 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
@@ -1313,8 +1215,7 @@ msgstr ""
 #: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
 #: src/msgmerge.c:562
 #, 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
@@ -1339,8 +1240,7 @@ msgstr ""
 
 #: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
 #, 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.
@@ -1398,9 +1298,7 @@ msgstr "Modificadores de operación:\n"
 
 #: src/msgcmp.c:241 src/msgmerge.c:553
 #, 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
@@ -1448,7 +1346,7 @@ 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:1437
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1490,8 +1388,7 @@ msgstr ""
 
 #: src/msgcomm.c:452 src/xgettext.c:1004
 #, 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
@@ -1523,8 +1420,7 @@ msgstr ""
 #: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
 #: src/msgmerge.c:588
 #, 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
@@ -1633,28 +1529,24 @@ msgstr ""
 
 #: src/msgfilter.c:442
 #, 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
 #, 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
 #, 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
 #, 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
@@ -1664,8 +1556,7 @@ msgstr ""
 
 #: src/msgfilter.c:473
 #, 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
@@ -1782,16 +1673,12 @@ msgstr "Modo de operación:\n"
 
 #: src/msgfmt.c:799
 #, 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
 #, 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
@@ -1801,15 +1688,12 @@ msgstr ""
 
 #: src/msgfmt.c:805
 #, 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
 #, 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
@@ -1819,8 +1703,7 @@ msgstr ""
 
 #: src/msgfmt.c:811
 #, 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
@@ -1846,29 +1729,23 @@ 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
 #, 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
 #, 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
 #, 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
 #, 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 ""
@@ -1880,9 +1757,7 @@ msgstr ""
 
 #: src/msgfmt.c:845 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
@@ -1934,8 +1809,7 @@ msgstr ""
 #: src/msgfmt.c:874
 #, 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 ""
 
@@ -1948,8 +1822,7 @@ msgstr ""
 #, 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
@@ -1959,9 +1832,7 @@ msgstr ""
 
 #: src/msgfmt.c:893
 #, 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
@@ -1973,16 +1844,13 @@ msgstr ""
 
 #: src/msgfmt.c:898
 #, 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
 #, 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 ""
 
@@ -1993,23 +1861,19 @@ msgstr ""
 
 #: src/msgfmt.c:908
 #, 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
 #, 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
 #, 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
@@ -2074,12 +1938,12 @@ msgstr "ignorouse a entrada «msgstr» dubidosa"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: aviso: o ficheiro fonte contén traducións dubidosas"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1306
 #, c-format
 msgid "%s does not exist"
 msgstr ""
 
-#: src/msgfmt.c:1328
+#: src/msgfmt.c:1316
 #, c-format
 msgid "%s exists but cannot read"
 msgstr ""
@@ -2098,9 +1962,7 @@ 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
@@ -2152,8 +2014,7 @@ 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
@@ -2201,8 +2062,7 @@ msgstr ""
 #: src/msginit.c:379
 #, 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 ""
 
@@ -2225,8 +2085,7 @@ msgstr ""
 
 #: src/msginit.c:402
 #, 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
@@ -2255,10 +2114,8 @@ msgstr ""
 
 #: src/msginit.c:1118
 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 ""
 
@@ -2282,15 +2139,12 @@ 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
@@ -2315,8 +2169,7 @@ msgstr ""
 #: src/msgl-cat.c:449
 #, 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 ""
@@ -2387,9 +2240,7 @@ msgid "plural expression can produce integer overflow"
 msgstr ""
 
 #: src/msgl-check.c:197
-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:266
@@ -2437,15 +2288,12 @@ 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;\""
+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
 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
 #, c-format
@@ -2458,8 +2306,7 @@ msgstr "as entradas «msgid» e «msgstr» non comezan ámbalas dúas con «\\n�
 
 #: src/msgl-check.c:652
 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
 #, c-format
@@ -2479,17 +2326,17 @@ msgstr ""
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:804
+#: src/msgl-check.c:801
 #, 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:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "falta o campo «%s» na cabeceira\n"
@@ -2502,9 +2349,7 @@ 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
 msgid "input file doesn't contain a header entry with a charset specification"
@@ -2513,29 +2358,19 @@ 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
 #, 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
 #, 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
 #, 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
 #, c-format
@@ -2617,8 +2452,7 @@ msgstr ""
 #: src/msgmerge.c:539
 #, 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"
@@ -2629,15 +2463,13 @@ msgstr ""
 #: src/msgmerge.c:546
 #, 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
 #, 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
@@ -2657,12 +2489,8 @@ msgstr "esta mensaxe non debe definir formas plurais"
 
 #: src/msgmerge.c:2035
 #, 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
@@ -2687,9 +2515,7 @@ 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
@@ -2699,15 +2525,12 @@ 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
@@ -2723,8 +2546,7 @@ 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 ""
 
@@ -2782,9 +2604,7 @@ 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
@@ -2799,8 +2619,7 @@ 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
@@ -3013,8 +2832,7 @@ msgstr ""
 #: src/recode-sr-latin.c:367
 #, 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
 #, c-format
@@ -3064,34 +2882,23 @@ 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."
+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."
+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."
+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."
+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."
+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
@@ -3140,12 +2947,10 @@ msgstr "produciuse un erro ao abrir «%s» para escribir"
 
 #: src/write-po.c:875
 #, 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:1450
+#: src/write-po.c:1326 src/write-po.c:1455
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3154,7 +2959,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1338 src/write-po.c:1467
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3171,8 +2976,7 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3488,9 +3292,7 @@ msgstr ""
 
 #: src/x-sh.c:1074
 #, c-format
-msgid ""
-"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
-"use eval_gettext instead"
+msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
 msgstr ""
 
 #: src/x-vala.c:413
@@ -3516,8 +3318,7 @@ msgstr "xgettext non funciona sen palabras clave polas que buscar"
 #: src/xgettext.c:808
 #, 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"
+msgstr "aviso: o ficheiro «%s» coa extensión «%s» é descoñecido; tentarase con C"
 
 #: src/xgettext.c:859
 #, c-format
@@ -3526,9 +3327,7 @@ msgstr ""
 
 #: src/xgettext.c:882
 #, 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:884
@@ -3538,8 +3337,7 @@ msgstr ""
 
 #: src/xgettext.c:886
 #, 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:891
@@ -3551,11 +3349,9 @@ msgstr ""
 #, 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"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 msgstr ""
@@ -3567,9 +3363,7 @@ msgstr ""
 
 #: src/xgettext.c:902
 #, 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:907
@@ -3599,8 +3393,7 @@ msgstr ""
 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 ""
 
@@ -3618,8 +3411,7 @@ msgstr ""
 #, 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 ""
@@ -3628,8 +3420,7 @@ msgstr ""
 #, 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 ""
@@ -3637,8 +3428,7 @@ msgstr ""
 #: src/xgettext.c:942
 #, 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 ""
 
@@ -3646,8 +3436,7 @@ msgstr ""
 #, 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 ""
@@ -3684,8 +3473,7 @@ msgstr ""
 
 #: src/xgettext.c:966
 #, c-format
-msgid ""
-"      --debug                 more detailed formatstring recognition result\n"
+msgid "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
 #: src/xgettext.c:991
@@ -3700,8 +3488,7 @@ msgstr ""
 
 #: src/xgettext.c:1008
 #, 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:1010
@@ -3716,31 +3503,26 @@ msgstr ""
 
 #: src/xgettext.c:1014
 #, 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:1016
 #, 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:1019
 #, 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:1840
 #, 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:1965
@@ -3769,16 +3551,12 @@ msgstr "%s%s: aviso: "
 
 #: 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"
+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:2190
 #, c-format
-msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: "
-"%s\n"
+msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
 msgstr ""
 
 #: src/xgettext.c:2221
@@ -3838,22 +3616,18 @@ msgstr ""
 #~ 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"
 
@@ -3870,8 +3644,7 @@ 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"
@@ -3881,23 +3654,17 @@ 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"
@@ -3914,77 +3681,57 @@ 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 ""
@@ -3992,16 +3739,12 @@ 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"
@@ -4016,21 +3759,16 @@ 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"
@@ -4039,8 +3777,7 @@ 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"
@@ -4050,8 +3787,7 @@ 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"
@@ -4060,11 +3796,9 @@ 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"
@@ -4072,8 +3806,7 @@ 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"
@@ -4082,26 +3815,20 @@ 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"
@@ -4115,27 +3842,22 @@ 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"
 
@@ -4149,8 +3871,7 @@ 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"
@@ -4164,38 +3885,29 @@ 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"
@@ -4212,32 +3924,24 @@ 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"
@@ -4246,73 +3950,51 @@ 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"
@@ -4320,21 +4002,18 @@ 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"
 
@@ -4342,5 +4021,4 @@ 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 9188905a6..b6cc61938 100644
--- a/gettext-tools/po/id.po
+++ b/gettext-tools/po/id.po
@@ -8,11 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2010-05-09 13:18+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"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,27 +28,26 @@ msgid "ambiguous argument %s for %s"
 msgstr "argumen %s ambigu untuk %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Argumen yang valid adalah:"
 
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr ""
-"tidak dapat menemukan direktori sementara, coba set konfigurasi $TMPDIR"
+msgstr "tidak dapat menemukan direktori sementara, coba set konfigurasi $TMPDIR"
 
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
-msgstr ""
-"tidak dapat membuat sebuah direktori sementara menggunakan template \"%s\""
+msgstr "tidak dapat membuat sebuah direktori sementara menggunakan template \"%s\""
 
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "tidak dapat menghapus berkas sementara %s"
 
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "tidak dapat menghapus direktori sementara %s"
@@ -58,34 +56,33 @@ msgstr "tidak dapat menghapus direktori sementara %s"
 msgid "write error"
 msgstr "tulis error"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:194
-#, 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:198
-#, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+#: gnulib-lib/copy-file.c:74
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "tidak dapat membuka berkas backup \"%s\" untuk ditulis"
 
-#: gnulib-lib/copy-file.c:202
-#, fuzzy, c-format
-msgid "error reading %s"
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
+#, c-format
+msgid "error reading \"%s\""
 msgstr "error ketika membaca \"%s\""
 
-#: gnulib-lib/copy-file.c:206
-#, fuzzy, c-format
-msgid "error writing %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\""
 msgstr "error ketika menulis \"%s\""
 
-#: gnulib-lib/copy-file.c:210
-#, fuzzy, c-format
-msgid "error after reading %s"
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
+#, c-format
+msgid "error after reading \"%s\""
 msgstr "error setelah membaca \"%s\""
 
 #: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
@@ -106,69 +103,69 @@ msgstr "C# kompiler tidak ditemukan, coba pasang pnet"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# mesin maya tidak ditemukan, coba pasang pnet"
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 msgstr "Sistem error tidak diketahui"
 
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/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:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s subproses gagal"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: pilihan '%s' rancu\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: pilihan '--%s' tidak membolehkan argumen\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: pilihan '%c%s' tidak membolehkan argumen\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: pilihan '--%s' membutuhkan sebuah argumen\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: pilihan tidak diketahui '--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: pilihan tidak diketahui '%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: pilihan tidak valid -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: pilihan membutuhkan sebuah argumen -- '%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: pilihan '-W %s' rancu\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: pilihan '-W %s' tidak membolehkan sebuah argumen\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: pilihan '-W %s' membutuhkan sebuah argumen\n"
@@ -184,15 +181,15 @@ msgstr "argumen source_version tidak valid untuk compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "argumen target_version tidak valid untuk compile_java_class"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c: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:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "gagal untuk membuat \"%s\""
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c: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
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error ketika menulis berkas \"%s\""
@@ -213,90 +210,52 @@ msgstr "Mesin maya java tidak ditemukan, coba pasang gij atau set $JAVA"
 msgid "%s subprocess I/O error"
 msgstr "%s subproses I/O error"
 
-#: 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: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
 #, c-format
 msgid "memory exhausted"
 msgstr "kehabisan memori"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, fuzzy, c-format
-msgid "creation of threads failed"
-msgstr "kompilasi dari kelas C# gagal"
-
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "write to %s subprocess failed"
-msgstr "tulis ke %s subproses gagal"
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "baca dari %s subproses gagal"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, 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:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "komunikasi dengan %s subproses gagal"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s subproses berakhir dengan kode keluar %d"
+msgid "cannot create pipe"
+msgstr "tidak dapat membuat pipe"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-msgid "setting permissions for %s"
-msgstr ""
-
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "tidak dapat membuat pipe"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle gagal"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "tidak dapat mengembalikan deskripsi berkas %d: dup2 gagal"
@@ -312,44 +271,31 @@ msgstr "%s subproses"
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s subproses mendapatkan sinyal fatal %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
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "error ketika membuka \"%s\" untuk dibaca"
-
-#: src/format.c:151
+#: src/format.c:148
 #, 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"
+msgstr "'%s' bukan sebuah format string %s yang sah, tidak seperti '%s'. Karena: %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-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%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-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "sebuah spesifikasi format untuk argumen %u tidak ada dalam '%s'"
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-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-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "spesifikasi format dalam '%s' dan '%s' untuk argumen %u tidak sama"
@@ -359,31 +305,22 @@ 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:36
+#: src/format-c.c:181
 #, 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:39
+#: src/format-c.c:588
 #, 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:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, 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: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:901 src/format-csharp.c:206 src/format-python.c:515
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "jumlah spesifikasi format dalam '%s' dan '%s' tidak cocok"
@@ -391,8 +328,7 @@ msgstr "jumlah spesifikasi format dalam '%s' dan '%s' tidak cocok"
 #: src/format-csharp.c:88 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
 #, c-format
@@ -400,33 +336,22 @@ 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 '}'."
+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
 #, 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
 #, 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 '{'."
+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
 #, c-format
@@ -445,20 +370,13 @@ 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
@@ -480,83 +398,48 @@ 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 %%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 %%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
@@ -565,19 +448,13 @@ 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
@@ -586,20 +463,13 @@ 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
@@ -608,34 +478,21 @@ 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."
+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:2372 src/format-scheme.c:2398
 #, 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, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -665,23 +522,17 @@ msgstr "Dalam direktif nomor %u, baik @ dan pemodifikasi : diberikan."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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
 #, 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
 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
 #, c-format
@@ -695,122 +546,59 @@ 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'."
+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-python-brace.c:434 src/format-python-brace.c:447
-#: src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "spesifikasi format untuk argumen '%s' tidak ada dalam '%s'"
 
 #: 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-python-brace.c:137
-#, fuzzy, c-format
-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:150
-#, fuzzy, c-format
-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:165
-#, fuzzy, c-format
-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:185
-#, fuzzy, c-format
-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:270
-#, fuzzy, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "Dalam direktif nomor %u, argumen %d negatif."
-
 #: 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."
@@ -818,26 +606,19 @@ 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: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
+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"
@@ -850,19 +631,19 @@ msgstr ""
 "Ini adalah piranti lunak bebas: anda bebas untuk mengubah dan meredistribusikannya.\n"
 "TIDAK ADA GARANSI, sampai batas yang diijinkan oleh hukum yang berlaku.\n"
 
-#: src/hostname.c:184 src/msgattrib.c: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
+#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
+#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
+#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
+#: src/xgettext.c:590
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Ditulis oleh %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c: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/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
@@ -872,13 +653,13 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "terlalu banyak argumen"
 
-#: 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
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: 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
@@ -904,12 +685,10 @@ msgstr "  -s, --short                 nama pendek host\n"
 #: src/hostname.c:222
 #, 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
@@ -917,29 +696,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            alamat untuk hostname\n"
 
-#: src/hostname.c:228 src/msgattrib.c: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:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Keluaran informatif:\n"
 
-#: src/hostname.c:230 src/msgattrib.c: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
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  tampilkan bantuan ini dan keluar\n"
 
-#: src/hostname.c:232 src/msgattrib.c: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
+#: 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"
@@ -948,11 +727,11 @@ msgstr "  -V, --version               keluarkan informasi versi dan keluar\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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
+#: 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"
 
@@ -961,27 +740,30 @@ msgstr "Laporkan bugs ke <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "tidak dapat mendapatkan nama host"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "di paling tidak satu berkas masukan diijinkan"
 
-#: src/msgattrib.c: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:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s dan %s adalah mutually exclusive"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Penggunaan: %s [PILIHAN] [BERKAS MASUKAN]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -990,68 +772,59 @@ msgstr ""
 "Saring pesan dari sebuah katalog terjemahan menurut atributnya,\n"
 "dan manipulasi atribut.\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:372 src/msgmerge.c:502 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr ""
-"Argumen wajib untuk 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: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:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "Lokasi berkas masukan:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  BERKAS MASUKAN              berkas masukan PO\n"
 
-#: src/msgattrib.c: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:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
-msgid ""
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr ""
-"  -D, --directory=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:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
-msgstr ""
-"Jika tidak ada berkas masukan yang diberikan atau jika ini adalah -, standar "
-"masukan yang dibaca.\n"
+msgstr "Jika tidak ada berkas masukan yang diberikan atau jika ini adalah -, standar masukan yang dibaca.\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:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "Lokasi berkas keluaran:\n"
 
-#: src/msgattrib.c: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:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
-msgstr ""
-"  -o, --output-file=BERKAS    tulis keluaran ke berkas yang "
-"dispesifikasikan\n"
+msgstr "  -o, --output-file=BERKAS    tulis keluaran ke berkas yang dispesifikasikan\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:527
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1060,305 +833,242 @@ msgstr ""
 "Hasil ditulis ke standar keluaran jika tidak ada berkas keluaran yang\n"
 "dispesifikasikan atau jika ini adalah -.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Pemilihan pesan:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, 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:454
+#: src/msgattrib.c:440
 #, 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:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              hapus pesan ditandai 'fuzzy'\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            simpan pesan ditandai 'fuzzy'\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           hapus pesan sudah ditinggalkan #~\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         simpan pesan sudah ditinggalkan #~\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulasi atribut:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             set seluruh pesan 'fuzzy'\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "     --clear-fuzzy            set seluruh pesan non-'fuzzy'\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          set seluruh pesan sudah ditinggalkan\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        set seluruh pesan tidak ditinggalkan\n"
 
-#: src/msgattrib.c:475
-#, fuzzy, c-format
-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
+#: src/msgattrib.c:461
 #, c-format
-msgid ""
-"      --clear-previous        remove the \"previous msgid\" from all "
-"messages\n"
-msgstr ""
-"      --clear-previous        hapus \"previous msgid\" dari seluruh pesan\n"
-
-#: src/msgattrib.c:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --no-fuzzy              hapus pesan ditandai 'fuzzy'\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:482
+#: src/msgattrib.c:463
 #, 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:484
+#: src/msgattrib.c:465
 #, 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:486
+#: src/msgattrib.c:467
 #, 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:488
+#: src/msgattrib.c:469
 #, 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: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/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintaks berkas masukan:\n"
 
-#: src/msgattrib.c: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:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
-msgid ""
-"  -P, --properties-input      input file is in Java .properties syntax\n"
-msgstr ""
-"  -P, --properties-input      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: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:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
-msgid ""
-"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
-"syntax\n"
-msgstr ""
-"      --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: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:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "Detil keluaran:\n"
 
-#: src/msgattrib.c: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:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
 "      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
+"                              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: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:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
-"      --style=BERKAS GAYA     spesifikasikan aturan gaya CSS berkas untuk --"
-"color\n"
+msgstr "      --style=BERKAS GAYA     spesifikasikan aturan gaya CSS berkas untuk --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:578 src/msgunfmt.c:505 src/msguniq.c:389
-#: src/xgettext.c:977
+#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
-msgid ""
-"  -e, --no-escape             do not use C escapes in output (default)\n"
-msgstr ""
-"  -e, --no-escape             jangan gunakan C escape dalam keluaran (baku)\n"
+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: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:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
-msgid ""
-"  -E, --escape                use C escapes in output, no extended chars\n"
-msgstr ""
-"  -E, --escape                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: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:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              tulis berkas PO walaupun itu kosong\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
-msgstr ""
-"  -i, --indent                tulis berkas .po menggunakan gaya teridentasi\n"
+msgstr "  -i, --indent                tulis berkas .po menggunakan gaya teridentasi\n"
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr ""
-"      --no-location           jangan tulis '#: nama berkas:baris' baris\n"
+msgstr "      --no-location           jangan tulis '#: nama berkas:baris' baris\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
-msgid ""
-"  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr ""
-"  -n, --add-location          hasilkan '#: nama berkas:baris' baris (baku)\n"
+msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr "  -n, --add-location          hasilkan '#: nama berkas:baris' baris (baku)\n"
 
-#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
-msgid ""
-"      --strict                write out strict Uniforum conforming .po file\n"
-msgstr ""
-"      --strict                tulis strict Uniforum konform berkas .po\n"
+msgid "      --strict                write out strict Uniforum conforming .po file\n"
+msgstr "      --strict                tulis strict Uniforum konform berkas .po\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:410
-#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     tulis sebuah berkas .properties Java\n"
 
-#: src/msgattrib.c: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:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
-msgid ""
-"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
-msgstr ""
-"      --stringtable-output    tulis sebuah .string berkas NeXTstep/GNUstep\n"
+msgid "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+msgstr "      --stringtable-output    tulis sebuah .string berkas 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:414
-#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ANGKA           set keluaran lebar halaman\n"
 
-#: src/msgattrib.c: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:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
-"      --no-wrap               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: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:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           hasilkan keluaran terurut\n"
 
-#: src/msgattrib.c: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:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
-msgstr ""
-"  -F, --sort-by-file          urutkan keluaran berdasarkan lokasi berkas\n"
+msgstr "  -F, --sort-by-file          urutkan keluaran berdasarkan lokasi berkas\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 ""
-"kriteria pemilihan yang dispesifikasikan tidak memungkinkan (%d < n < %d)"
+msgstr "kriteria pemilihan yang dispesifikasikan tidak memungkinkan (%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:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Penggunaan: %s [PILIHAN] [BERKAS MASUKAN]...\n"
 
-#: src/msgcat.c:372
-#, fuzzy, c-format, no-wrap
+#: src/msgcat.c:371
+#, 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"
@@ -1366,9 +1076,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, 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"
+"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 ""
 "Potong dan gabungkan berkas PO yang dispesifikasikan.\n"
 "Temukan pesan yang umum di antara dua/lebih berkas PO yang dispesifikasikan.\n"
@@ -1379,35 +1089,32 @@ 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:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  BERKAS MASUKAN ...          berkas masukan\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
-msgstr ""
-"  -f, --files-from=BERKAS     dapatkan daftar dari berkas masukan dari "
-"BERKAS\n"
+msgstr "  -f, --files-from=BERKAS     dapatkan daftar dari berkas masukan dari BERKAS\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:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Jika berkas masukan adalah -, standar masukan dibaca.\n"
 
-#: src/msgcat.c: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=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:411
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1416,7 +1123,7 @@ msgstr ""
 "  ->, --more-than=ANGKA       tampilkan pesan dengan lebih besar dari \n"
 "                              definisi ini, baku ke 0 jika tidak diset\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"
@@ -1425,64 +1132,55 @@ msgstr ""
 "  -u, --unique                kependekan untuk --less-than=2, diminta\n"
 "                              hanya pesan unik untuk ditampilkan\n"
 
-#: 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:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
-msgid ""
-"  -P, --properties-input      input files are in Java .properties syntax\n"
-msgstr ""
-"  -P, --properties-input      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:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
-msgstr ""
-"      --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:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAMA          pengkodean untuk keluaran\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      --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:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
-msgid ""
-"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr ""
-"      --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:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter MIller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "tidak ada berkas masukan yang diberikan"
 
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "dibutuhkan tepat 2 berkas input"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Penggunaan: %s [PILIHAN] def.po ref.pot\n"
@@ -1514,21 +1212,17 @@ msgstr "  def.po                      terjemahan\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     referensi ke sumber\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Operasi pemodifikasi:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
-msgid ""
-"  -m, --multi-domain          apply ref.pot to each of the domains in def."
-"po\n"
-msgstr ""
-"  -m, --multi-domain          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:555
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     jangan gunakan fuzzy matching\n"
@@ -1541,8 +1235,7 @@ msgstr "      --use-fuzzy             pertimbangkan masukan fuzzy\n"
 #: src/msgcmp.c:247
 #, 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
@@ -1554,17 +1247,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:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "pesan ini digunakan tapi tidak didefinisikan..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...tetapi definisi ini serupa"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s"
@@ -1574,27 +1267,27 @@ 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:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "ditemukan %d kesalahan fatal"
 msgstr[1] "ditemukan %d kesalahan fatal"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "paling tidak dua berkas harus dispesifikasikan"
 
-#: src/msgcomm.c:364
-#, 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 extracted comments will be preserved, but only from the first\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 ""
@@ -1606,7 +1299,7 @@ msgstr ""
 "komentar ekstraksi akan dijaga, tetapi hanya dari berkas PO pertama yang\n"
 "mendefinisikan mereka. Posisi berkas dari seluruh berkas PO akan diakumulasikan.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:401
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1615,71 +1308,65 @@ msgstr ""
 "  ->, --more-than=ANGKA       tampilkan pesan dengan lebih dari definisi\n"
 "                              ini, baku ke 1 jika tidak diset\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
-#, fuzzy, 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: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/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
-msgstr ""
-"Konversikan sebuah katalog terjemahan ke pengkodean karakter yang berbeda.\n"
+msgstr "Konversikan sebuah katalog terjemahan ke pengkodean karakter yang berbeda.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Target konversi:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Pengkodean baku adalah pengkodean lokal sekarang.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                gaya keluaran terindentasi\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           tekan '#: nama berkas:baris' baris\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
-#, fuzzy, c-format
-msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr ""
-"      --add-location          simpan '#: nama berkas: baris' baris (baku)\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:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                gaya keluaran Uniforum strict\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "tidak ada berkas masukan yang diberikan"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "tepatnya sebuah berkas masukan dibutuhkan"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Penggunaan: %s [PILIHAN] BERKAS MASUKAN\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1692,7 +1379,7 @@ msgstr ""
 "(secara umum dibuat oleh xgettext). Masukan yang tidak diterjemahkan diberikan\n"
 "sebuah terjemahan yang identik dengan msgid.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  BERKAS MASUKAN              berkas masukan PO atau POT\n"
@@ -1731,7 +1418,7 @@ msgstr ""
 "Sebuah perintah bawaan dipanggil '0' mengeluarkan terjemahan, diikuti oleh sebuah\n"
 "null byte. Keluaran dari \"msgexec 0\" cocok sebagai sebuah masukan untuk \"xargs -0\".\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=BERKAS MASUKAN  masukan berkas PO\n"
@@ -1741,186 +1428,154 @@ msgstr "  -i, --input=BERKAS MASUKAN  masukan berkas PO\n"
 msgid "write to stdout failed"
 msgstr "penulisan ke stdout gagal"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "tulis ke %s subproses gagal"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "hilang nama penyaring"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "paling tidak sebuah script sed harus dispesifikasikan"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Penggunaan: %s [PILIHAN] PENYARING [PILIHAN-PENYARING]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr ""
-"Mengaplikasikan sebuah penyaring ke seluruh terjemahan dari sebuah katalog "
-"terjemahan.\n"
+msgstr "Mengaplikasikan sebuah penyaring ke seluruh terjemahan dari sebuah katalog terjemahan.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
-"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:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Sangat berguna FILTER-OPTIONs ketika PENYARING adalah 'sed':\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, c-format
-msgid ""
-"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr ""
-"  -e, --expression=SCRIPT     tambahkan SCRIPT ke perintah yang dijalankan\n"
+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:444
+#: src/msgfilter.c:425
 #, 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:447
+#: src/msgfilter.c:428
 #, c-format
-msgid ""
-"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr ""
-"  -n, --quiet, --silent       tekan pencetakan otomatis dari ruang pola\n"
+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:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
-msgid ""
-"      --no-escape             do not use C escapes in output (default)\n"
-msgstr ""
-"      --no-escape             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:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "     --indent                 gaya keluaran terindentasi\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, 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/msgfmt.c:345
+#: src/msgfmt.c:304
 #, 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:392
+#: src/msgfmt.c:351
 #, 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:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, fuzzy, c-format
-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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s membutuhkan sebuah spesifikasi \"-d direktori\""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s membutuhkan sebuah spesifikasi \"-l lokal\""
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s membutuhkan sebuah spesifikasi \"-l lokal\""
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s membutuhkan sebuah spesifikasi \"-l lokal\""
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s dan %s adalah mutually exclusive"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s hanya valid dengan %s atau %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s hanya valid dengan %s, %s atau %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:616
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d pesan diterjemahkan"
 msgstr[1] "%d pesan diterjemahkan"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d terjemahan fuzzy"
 msgstr[1] ", %d terjemahan fuzzy"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, 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:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Penggunaan: %s [PILIHAN] nama-berkas.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, 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:783 src/xgettext.c:864
+#: 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"
@@ -1929,139 +1584,99 @@ msgstr ""
 "Argumen wajib ke pilihan panjang juga wajib untuk pilihan pendek juga.\n"
 "Sama untuk opsional argumen.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  nama-berkas.po ...           berkas masukan\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mode operasi:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, 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:801
+#: src/msgfmt.c:677
 #, 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:803
+#: src/msgfmt.c:679
 #, 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:805
+#: src/msgfmt.c:681
 #, 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:807
+#: src/msgfmt.c:683
 #, 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:809
+#: src/msgfmt.c:685
 #, 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:811
-#, fuzzy, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --qt                    mode Qt: hasilkan sebuah berkas Qt .qm\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                aktifkan mode strict Uniforum\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Jika keluaran berkas adalah -, keluaran ditulis ke standar keluaran.\n"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Lokasi berkas keluaran dalam mode Java:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     nama resource\n"
 
-#: src/msgfmt.c: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:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
-msgid ""
-"  -l, --locale=LOCALE         locale name, either language or "
-"language_COUNTRY\n"
-msgstr ""
-"  -l, --locale=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:829
-#, fuzzy, c-format
-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:831
+#: src/msgfmt.c:703
 #, 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:833
+#: src/msgfmt.c:705
 #, 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:839
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Lokasi keluaran berkas dalam mode C#:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 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:847
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2070,245 +1685,162 @@ 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:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Lokasi keluaran berkas dalam mode Tcl:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 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:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
-msgstr ""
-"Pilihan -l dan -d wajib. Berkas .msg ditulis dalam direktori yang "
-"dispesifikasikan.\n"
-
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-"  -d DIREKTORI                basis direktori dari katalog pesan .msg\n"
+msgstr "Pilihan -l dan -d wajib. Berkas .msg ditulis dalam direktori yang dispesifikasikan.\n"
 
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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:874
-#, 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:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretasi masukan berkas:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, 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:891
+#: src/msgfmt.c:746
 #, 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:893
+#: src/msgfmt.c:748
 #, 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:895
+#: src/msgfmt.c:750
 #, 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:898
+#: src/msgfmt.c:753
 #, 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:900
+#: src/msgfmt.c:755
 #, 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:903
+#: src/msgfmt.c:758
 #, 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:908
-#, 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:910
+#: src/msgfmt.c:763
 #, 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 ""
+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:913
+#: src/msgfmt.c:765
 #, 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:922
+#: src/msgfmt.c:774
 #, 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:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               naikan tingkat keramaian\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "peringatan: header berkas PO hilang atau tidak valid\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "peringatan: konversi set karakter tidak akan bekerja\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "peringatan: header berkas PO fuzzy\n"
 
-#: src/msgfmt.c:1052
+#: 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"
+msgstr "peringatan: versi lebih lama dari msgfmt akan memberikan sebuah error disini\n"
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nama domain \"%s\" tidak sesuai dengan nama berkas"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, 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:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:948
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "direktif `domain %s' diabaikan"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:1008
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "masukan `msgstr' kosong diabaikan"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:1009
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "masukan fuzzy `msgstr' diabaikan"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: peringatan: berkas sumber mengandung terjemahan fuzzy"
 
-#: src/msgfmt.c:1318
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
-#, 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/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "kesalahan ketika membaca \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
-msgid ""
-"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
-"specified"
-msgstr ""
-"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:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2317,7 +1849,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:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2392,24 +1924,20 @@ msgstr ""
 "  -v, --invert-match          keluarkan hanya pesan yang tidak cocok dengan\n"
 "                              kriteria pemilihan apapun\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, 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:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           hasilkan keluaran terurut\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr ""
-"      --sort-by-file          urutkan keluaran berdasarkan lokasi berkas\n"
+msgstr "      --sort-by-file          urutkan keluaran berdasarkan lokasi berkas\n"
 
 #: src/msginit.c:297
 msgid ""
@@ -2454,20 +1982,16 @@ msgstr "  -i, --input=BERKAS MASUKAN  berkas masukan POT\n"
 #: src/msginit.c:379
 #, 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
 #, 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
 #, c-format
@@ -2486,11 +2010,8 @@ msgstr "  -l, --locale=LL_CC          set target lokal\n"
 
 #: src/msginit.c:402
 #, 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
 msgid ""
@@ -2522,16 +2043,13 @@ msgstr "%s subproses gagal dengan kode keluar %d"
 
 #: src/msginit.c:1118
 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 ...",
@@ -2544,8 +2062,7 @@ msgstr "Terjemahan bahasa inggris untuk paket %s"
 #: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
-msgstr ""
-"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
 #, c-format
@@ -2553,21 +2070,14 @@ 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
-#, fuzzy, 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"
+#, 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"
 
 #: 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 ""
-"domain \"%s\" dalam berkas masukan `%s' tidak berisi sebuah masukan header "
-"dengan sebuah spesifikasi set karakter"
+#, 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"
 
 #: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
@@ -2575,8 +2085,8 @@ 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:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "peringatan: "
@@ -2587,20 +2097,17 @@ 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
 #, 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"
 
@@ -2678,9 +2185,7 @@ msgstr "ekspresi plural dapan menghasilkan nilai minus"
 #: src/msgl-check.c:141
 #, 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
 msgid "plural expression can produce division by zero"
@@ -2691,121 +2196,116 @@ 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"
+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
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Coba gunakan berikut, valid untuk %s:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "katalog pesan memiliki bentuk terjemahan plural"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "tetapi masukan header kurang sebuah atribut \"plural=EKSPRESI\""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "tetapi masukan header kurang sebuah atribut \"plurals=BILANGAN BULAT\""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "nilai nplurals tidak valid"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "ekspresi plural tidak valid"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "tetapi beberapa pesan hanya memiliki bentuk %lu plural"
 msgstr[1] "tetapi beberapa pesan hanya memiliki bentuk %lu plural"
 
-#: src/msgl-check.c:490
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "tetapi beberapa pesan memiliki bentuk %lu plural"
 msgstr[1] "tetapi beberapa pesan memiliki bentuk %lu plural"
 
-#: 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 ""
-"katalog pesan memiliki bentuk terjemahan plural, tetapi kurang sebuah "
-"masukan header dengan \"Plural-Forms: nplurals=BILANG BULAT; plural=EKSPRESI;"
-"\""
+#: 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:611
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+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:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:610
+#, c-format
+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:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:625
+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:652
-#, fuzzy
-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: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:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:651
+#, c-format
+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:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:666
+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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "penanganan plural adalah sebuah ekstensi GNU gettext"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr kuran tanda akselerasi keyboard '%c'"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr memiliki terlalu banyak tanda akselerasi keyboard '%c'"
 
-#: src/msgl-check.c:804
-#, fuzzy, c-format
-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:820
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
+#: src/msgl-check.c:776
+#, c-format
+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: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:826
+#, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "beberapa field header `%s' masih memiliki nilai baku awal\n"
+
 #: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
@@ -2818,49 +2318,35 @@ msgstr "%s: error ketika mengubah dari pengkodean \"%s\" ke pengkodean \"%s\""
 
 #: src/msgl-iconv.c:290
 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:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
-msgid ""
-"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
-"not support this conversion."
-msgstr ""
-"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
 #, 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:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
-msgid ""
-"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
-"built without iconv()."
-msgstr ""
-"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:392 src/msgmerge.c:398
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s hanya valid dengan %s"
 
-#: src/msgmerge.c:453
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "tipe backup"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2882,18 +2368,17 @@ msgstr ""
 "digunakan fuzzy matching untuk memberi hasil yang lebih baik. Hasilnya ditulis\n"
 "ke stdout kecuali diberikan sebuah output berkas.\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:502
 #, 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:509
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     referensi ke sumber baru\n"
 
-#: src/msgmerge.c:513
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2902,7 +2387,7 @@ msgstr ""
 "  -C, --compendium=BERKAS     perpustakaan tambahan dari pesan terjemahan,\n"
 "                              mungkin dispesifikasikan lebih dari sekali.\n"
 
-#: src/msgmerge.c:519
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2911,31 +2396,30 @@ msgstr ""
 "  -U, --update                perbarui def.po,\n"
 "                              jangan lakukan apapun jika def.po telah baru\n"
 
-#: src/msgmerge.c:531
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Lokasi berkas keluaran dalam mode perbarui:\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Hasil ditulis kembali ke def.po.\n"
 
-#: src/msgmerge.c:535
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=KONTROL        buat sebuah backup dari def.po\n"
 
-#: src/msgmerge.c:537
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=AKHIRAN        override akhiran backup biasa\n"
 
-#: src/msgmerge.c:539
+#: src/msgmerge.c:534
 #, 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"
@@ -2944,57 +2428,45 @@ 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:546
-#, fuzzy, c-format
+#: src/msgmerge.c:541
+#, 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 ""
-"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:557
+#: src/msgmerge.c:552
 #, 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:614 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       tekan indikator perkembangan\n"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "pesan ini seharusnya mendefinisikan bentuk plural"
 
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "pesan ini seharusnya tidak mendefinisikan bentuk plural"
 
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2030
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
 #, c-format
 msgid " done.\n"
 msgstr " selesai.\n"
@@ -3016,36 +2488,23 @@ 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
@@ -3060,13 +2519,11 @@ 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
@@ -3079,8 +2536,7 @@ 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
@@ -3107,7 +2563,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:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3128,18 +2584,15 @@ msgstr ""
 ", mereka akan diambil dari terjemahan pertama. Posisi berkas akan dijaga.\n"
 "Ketika menggunakan pilihan --unique, duplikasi diabaikan.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              tampilkan hanya duplikasi\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, 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
@@ -3155,7 +2608,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:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3164,7 +2617,7 @@ msgstr ""
 "Set karakter \"%s\" tidak didukung. %s tergantung pada iconv(),\n"
 "dan iconv() tidak mendukung \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3172,15 +2625,15 @@ msgstr ""
 "Memasang GNU libiconv dan memasang ulang GNU gettext mungkin akan\n"
 "menyelesaikan masalah ini.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Tetap lanjutkan saja, diduga parse errors."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Tetap lanjutkan saja."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3189,7 +2642,7 @@ msgstr ""
 "Set karakter \"%s\" tidak didukung. %s tergantung pada iconv().\n"
 "Konversi ini dibuat tanpa iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -3202,27 +2655,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "penggunaan tidak konsisten dari #~"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:240
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "bagian `msgstr[]' hilang"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:249
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "bagian `msgid_plural' hilang"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "bagian `msgstr' hilang"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "bentuk plural pertama memiliki indeks bukan nol"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "bentuk plural memiliki indeks salah"
@@ -3232,7 +2685,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:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "urutan multibyte tidak valid"
@@ -3276,16 +2729,16 @@ msgstr "akhir-dari-baris dalam string"
 msgid "context separator <EOT> within string"
 msgstr "konteks pemisah <EOT> dalam string"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "berkas ini tidak boleh mengandung direktif domain"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "duplikasi definisi pesan"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "ini adalah lokasi dari definisi pertama"
 
@@ -3360,12 +2813,12 @@ msgstr ""
 "Teks masukan dibaca dari standar masukan. Teks terkonversi dikeluarkan ke\n"
 "standar keluaran.\n"
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "masukan tidak berada dalam pengkodean \"%s\" yang valid"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "error ketika mengubah dari pengkodean \"%s\" ke pengkodean \"%s\""
@@ -3389,78 +2842,45 @@ 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:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "error ketika membaca \"%s\""
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "error menulis stdout"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "error setelah membaca \"%s\""
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
 msgstr "Mengambil %s..."
 
-#: src/urlget.c:308
+#: src/urlget.c:307
 #, c-format
 msgid " timed out.\n"
 msgstr " waktu habis.\n"
 
-#: src/urlget.c:445
+#: src/urlget.c:443
 #, 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."
+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."
+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."
+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."
+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."
+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
 #, c-format
@@ -3486,17 +2906,17 @@ msgstr "kompilasi dari kelas C# gagal, mohon coba --verbose"
 msgid "compilation of C# class failed"
 msgstr "kompilasi dari kelas C# gagal"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "bukan sebuah nama kelas Java yang valid: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr "kompilasi dari kelas Java gagal, mohon coba --verbose atau set $JAVAC"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "kompilasi dari kelas Java gagal, mohon coba set $JAVAC"
@@ -3506,13 +2926,12 @@ msgstr "kompilasi dari kelas Java gagal, mohon coba set $JAVAC"
 msgid "error while opening \"%s\" for writing"
 msgstr "error ketika membuka \"%s\" untuk ditulis"
 
-#: src/write-po.c:875
-#, fuzzy, c-format
-msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+#: src/write-po.c:802
+#, c-format
+msgid "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "Pesan internasionalisasi tidak boleh mengandung escape sequence `\\%c'"
 
-#: src/write-po.c:1326 src/write-po.c:1450
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3521,12 +2940,11 @@ 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:1338 src/write-po.c:1462
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3535,8 +2953,7 @@ 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"
 
@@ -3550,8 +2967,7 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3606,7 +3022,7 @@ 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-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: peringatan: string tidak terselesaikan"
@@ -3616,22 +3032,17 @@ msgstr "%s:%d: peringatan: string tidak terselesaikan"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: peringatan: ekspresi biasa tidak terselesaikan"
 
-#: src/x-c.c:1051
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: peringatan: karakter Unicode tidak valid"
-
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: peringatan: karakter konstan yang unterminated"
 
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1247
 #, 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:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr "Mohon spesifikasikan sumber pengkodean melalui --from-code."
 
@@ -3671,7 +3082,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-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv gagal"
@@ -3685,7 +3096,7 @@ 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:1138
+#: 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"
@@ -3705,22 +3116,12 @@ msgstr "%s:%d: peringatan: ')' ditemukan dimana '}' diduga"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: peringatan: '}' ditemukan dimana ')' diduga"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: 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:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3734,76 +3135,10 @@ msgstr ""
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: peringatan: surrogate U+%04X sendiri"
 
-#: src/x-javascript.c:230
-#, fuzzy
-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"
-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"
-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"
-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"
-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"
-msgstr ""
-"%s:%d: Urutan multibyte tidak valid.\n"
-"Mohon spesifikasikan sumber pengkodean melalui --from-code.\n"
-
-#: src/x-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: peringatan: string literal yang unterminated"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: peringatan: karakter Unicode tidak valid"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: peringatan: string tidak terselesaikan"
-
 #: 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"
+msgstr "%s:%d: tidak dapat menemukan pengakhir string \"%s\" dimanapun sebelum EOF"
 
 #: src/x-perl.c:1043
 #, c-format
@@ -3835,16 +3170,15 @@ msgstr "%s:%d: interpolasi tidak valid (\"\\L\") dari karakter 8bit \"%c\""
 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:278
+#: 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 ""
-"Mohon spesifikasikan sumber pengkodean melalui --from-code atau melalui "
-"sebuah komentar\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:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3852,12 +3186,10 @@ msgid ""
 "comment as specified in http://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"
+"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:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3865,12 +3197,10 @@ msgid ""
 "comment as specified in http://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"
+"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:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3878,12 +3208,10 @@ msgid ""
 "comment as specified in http://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"
+"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:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3891,12 +3219,10 @@ msgid ""
 "comment as specified in http://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"
+"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:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3904,11 +3230,10 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 "%s:%d: Urutan multibyte tidak valid.\n"
-"Mohon spesifikasikan sumber pengkodean melalui --from-code atau melalui "
-"sebuah komentar\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:722
+#: 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."
@@ -3930,107 +3255,75 @@ 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/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: peringatan: string literal yang unterminated"
+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:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: 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:653
+#: 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:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+#: 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:859
+#: 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"
+msgstr "Ekstrak string yang dapat diterjemahkan dari masukan berkas yang diberikan.\n"
 
-#: src/xgettext.c:882
+#: 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"
+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:884
+#: 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"
+msgstr "  -o, --output=BERKAS         tulis keluaran ke berkas yang dispesifikasikan\n"
 
-#: src/xgettext.c:886
+#: 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"
+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:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Pilihan dari masukan bahasa berkas:\n"
 
-#: src/xgettext.c:893
-#, fuzzy, c-format
+#: src/xgettext.c:854
+#, 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, Glade)\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:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   kependekan untuk --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, 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:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4039,251 +3332,207 @@ msgstr ""
 "      --from-code=NAMA        pengkodean dari berkas masukan\n"
 "                                (kecuali untuk Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Secara baku berkas masukan diasumsikan berada dalam ASCII.\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr ""
-"  -j, --join-existing         gabungkan pesan dengan berkas yang sudah ada\n"
+msgstr "  -j, --join-existing         gabungkan pesan dengan berkas yang sudah ada\n"
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
-msgstr ""
-"  -x, --exclude-file=BERKAS.po masukan dari BERKAS.po tidak diekstraksi\n"
+msgstr "  -x, --exclude-file=BERKAS.po masukan dari BERKAS.po tidak diekstraksi\n"
 
-#: src/xgettext.c:919
+#: src/xgettext.c:879
 #, 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:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Pilihan spesifik untuk bahasa:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           ekstrak seluruh string\n"
 
-#: src/xgettext.c:929
-#, fuzzy, c-format
+#: src/xgettext.c:889 src/xgettext.c:896
+#, 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"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\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:937
-#, fuzzy, c-format
+#: src/xgettext.c:893
+#, 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"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (hanya bahasa C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"  -kKATA, --keyword=KATA      cari untuk KATA sebagai kata kunci tambahan\n"
+"  -k, --keyword               jangan gunakan untuk kata kunci baku\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, 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:945
-#, fuzzy, c-format
+#: src/xgettext.c:903
+#, 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"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\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:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             pahami ANSI C trigraphs untuk masukan\n"
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (hanya bahasa C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    kenali format string Qt\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (hanya bahasa C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   kenali format string KDE 4\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 kenali format string Boost\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, 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:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
-msgstr ""
-"      --properties-output     tulis keluar sebuah berkas .properties Java\n"
+msgstr "      --properties-output     tulis keluar sebuah berkas .properties Java\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr ""
-"      --copyright-holder=STRING  set pemegang hak cipta dalam keluaran\n"
+msgstr "      --copyright-holder=STRING  set pemegang hak cipta dalam keluaran\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, 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:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PAKET    set nama paket dalam keluaran\n"
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSI    set versi paket dalam keluaran\n"
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, 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:1016
+#: src/xgettext.c:973
 #, 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:1019
+#: src/xgettext.c:976
 #, 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:1840
+#: src/xgettext.c:1782
 #, 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:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Karakter bukan-ASCII di %s%s."
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Komentar bukan-ASCII di atau sebelum %s%s."
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "String bukan-ASCII di %s%s."
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: peringatan: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
-msgid ""
-"Although being used in a format string position, the %s is not a valid %s "
-"format string. Reason: %s\n"
-msgstr ""
-"Walaupun telah digunakan dalam sebuah posisi format string, %s bukan sebuah "
-"format string %s valid. Karena: %s\n"
+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"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:2104
 #, 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 "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"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4291,14 +3540,12 @@ msgid ""
 "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"
+"'%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"
+"Mohon pertimbangkan menggunakan sebuah format string dengan argumen bernama,\n"
 "dan sebuah pemetaan daripada sebuah tuple untuk argumen.\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4308,31 +3555,30 @@ msgstr ""
 "gettext(\"\") mengembalikan masukan header dengan\n"
 "informasi meta, bukan string kosong.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "spesifikasi argumen ambigu untuk kata kunci '%.*s'"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "peringatan: hilang konteks untuk kata kunci '%.*s'"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "peringatan: hilang konteks untuk argumen plural dari kata kunci '%.*s'"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "konteks tidak cocok diantara bentuk singular dan plural"
 
-#: src/xgettext.c:3419
-#, fuzzy
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\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 ""
@@ -4341,21 +3587,15 @@ msgstr ""
 "variabel MSGID_BUGS_ADDRESS disana; jika tidak mohon spesifikasikan\n"
 "sebuah pilihan baris perintah --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3226
+#, c-format
+msgid "language `%s' unknown"
 msgstr "bahasa `%s' tidak dikenal"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<tidak bernama>"
 
-#~ 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"
-
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: pilihan tidak legal -- %c\n"
 
@@ -4365,20 +3605,29 @@ 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 ""
@@ -4394,8 +3643,7 @@ 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"
@@ -4405,17 +3653,12 @@ 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 ""
@@ -4424,10 +3667,8 @@ 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"
 
@@ -4440,29 +3681,21 @@ 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"
@@ -4471,17 +3704,12 @@ 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"
@@ -4492,10 +3720,8 @@ 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"
@@ -4505,16 +3731,12 @@ 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"
@@ -4529,13 +3751,10 @@ 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"
@@ -4559,8 +3778,7 @@ 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"
@@ -4568,21 +3786,17 @@ 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"
@@ -4602,8 +3816,7 @@ 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"
@@ -4611,8 +3824,7 @@ 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"
@@ -4646,20 +3858,14 @@ 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"
@@ -4667,73 +3873,53 @@ 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 397a374c9..3f608cd27 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.18.3\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2013-06-25 17:48+0900\n"
 "PO-Revision-Date: 2013-07-01 12:47+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -35,8 +35,7 @@ msgstr "Sono argomenti validi:"
 #: gnulib-lib/clean-temp.c:332
 #, 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:346
 #, c-format
@@ -183,15 +182,15 @@ msgstr "argomento source_version di compile_java_class non valido"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "argomento target_version di compile_java_class non valido"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c: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:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "creazione di \"%s\" non riuscita"
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c: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
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "errore durante la scrittura del file \"%s\""
@@ -199,15 +198,12 @@ msgstr "errore durante la scrittura del file \"%s\""
 #: gnulib-lib/javacomp.c:2343
 #, 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:905 src/msginit.c:980
 #: src/msginit.c:1140
@@ -215,9 +211,9 @@ msgstr ""
 msgid "%s subprocess I/O error"
 msgstr "errore di I/O nel sottoprocesso %s"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
+#: 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:548 libgettextpo/gettext-po.c:1326
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria esaurita"
@@ -228,7 +224,7 @@ msgid "creation of threads failed"
 msgstr "creazione di thread non riuscita"
 
 #: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "scrittura sul sottoprocesso %s non riuscita"
@@ -315,8 +311,8 @@ msgid "%s subprocess got fatal signal %d"
 msgstr "il sottoprocesso %s ha ricevuto il segnale fatale %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/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
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "errore durante l'apertura di \"%s\" in lettura"
@@ -324,20 +320,15 @@ msgstr "errore durante l'apertura di \"%s\" in lettura"
 #: src/format.c:151
 #, 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"
+msgstr "\"%s\" non è una stringa di formato %s valida, diversamente da \"%s\". Motivo: %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-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\""
+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-librep.c:323 src/format-lua.c:235
@@ -355,9 +346,7 @@ msgstr "una specifica di formato per l'argomento %u non esiste in \"%s\""
 #: 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:449
 #, c-format
@@ -366,26 +355,18 @@ msgstr "La direttiva numero %u comincia con \"|\" ma non termina con \"|\"."
 
 #: 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."
+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: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: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:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
 #: src/format-javascript.c:215 src/format-python.c:515
@@ -397,8 +378,7 @@ msgstr "il numero di specifiche di formato in \"%s\" e \"%s\" non corrisponde"
 #: src/format-csharp.c:88 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:109
 #, c-format
@@ -406,33 +386,22 @@ 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:130 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."
+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:139
 #, 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:140
 #, 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:161 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."
+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:162
 #, c-format
@@ -447,31 +416,22 @@ 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
@@ -503,70 +463,43 @@ 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: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:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
@@ -575,20 +508,13 @@ msgstr "Nella direttiva numero %u, \"%s\" non è seguito da una virgola."
 
 #: 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: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:572
 #, c-format
@@ -597,20 +523,13 @@ msgstr "Nella direttiva numero %u, una scelta non contiene alcun numero."
 
 #: 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: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:756
 #, c-format
@@ -619,36 +538,21 @@ msgstr "una specifica di formato per l'argomento {%u}, non esiste in \"%s\""
 
 #: 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-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 ""
-"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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -674,18 +578,12 @@ msgstr "Trovato \"~%c\" senza il corrispondente \"~%c\"."
 #: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, 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:2976 src/format-scheme.c:2973
 #, 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:3326 src/format-scheme.c:3263
 #, c-format
@@ -704,134 +602,91 @@ msgstr "le specifiche di formato in \"%s\" e \"%s\" non sono equivalenti"
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr ""
-"le specifiche di formato in \"%s\" non sono un sottoinsieme di quelle in \"%s"
-"\""
+msgstr "le specifiche di formato in \"%s\" non sono un sottoinsieme di quelle in \"%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 ""
-"Nella direttiva %u, lo specificatore di dimensione è incompatibile con lo "
-"specificatore di conversione \"%c\"."
+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-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
 #: 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: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."
+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 "The string refers to the argument named '%s' in incompatible ways."
-msgstr ""
-"La stringa fa riferimento all'argomento chiamato \"%s\" in modi "
-"incompatibili."
+msgstr "La stringa fa riferimento all'argomento chiamato \"%s\" in modi incompatibili."
 
 #: src/format-python.c:430
 #, 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 "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.c:437
 #, 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 "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"
 
 #: 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 specifica di formato per l'argomento \"%s\", come in \"%s\", non esiste "
-"in \"%s\""
+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.c:494
 #, 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 "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-python-brace.c:137
+#: src/format-python-brace.c:136
 #, 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."
+msgstr "Nella direttiva numero %u, \"%c\" non può iniziare il nome di un campo."
 
-#: src/format-python-brace.c:150
+#: src/format-python-brace.c:149
 #, 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."
+msgstr "Nella direttiva numero %u, \"%c\" non è seguito da un argomento di getattr."
 
-#: src/format-python-brace.c:165
+#: src/format-python-brace.c:164
 #, 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."
+msgstr "Nella direttiva numero %u, \"%c\" non può iniziare un parametro di gettitem."
 
 # FIXME: nesting?
-#: src/format-python-brace.c:185
+#: src/format-python-brace.c:184
 #, 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 "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-brace.c:270
+#: src/format-python-brace.c:210
 #, 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."
 
 #: 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: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: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."
+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: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."
+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:85
 msgid "The string refers to a shell variable with an empty name."
@@ -839,25 +694,19 @@ msgstr "La stringa fa riferimento a una variabile della shell senza nome."
 
 #: 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 ""
-"Nella direttiva numero %u, il carattere \"%c\" non è una cifra tra 1 e 9."
+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:91
 #, 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."
+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: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
+#: 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"
@@ -871,19 +720,19 @@ msgstr ""
 "Questo è software libero: siete liberi di cambiarlo e redistribuirlo.\n"
 "NON c'è alcuna garanzia, fino agli estremi permessi dalla legge.\n"
 
-#: src/hostname.c:184 src/msgattrib.c: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
+#: 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 "Scritto da %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/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
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
@@ -893,11 +742,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "troppi argomenti"
 
-#: 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
+#: 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
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Usare \"%s --help\" per maggiori informazioni.\n"
@@ -925,12 +774,10 @@ msgstr "  -s, --short                 nome corto dell'host\n"
 #: src/hostname.c:222
 #, 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:225
@@ -938,29 +785,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            indirizzi per il nome dell'host\n"
 
-#: src/hostname.c:228 src/msgattrib.c: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: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
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Output informativo:\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
+#: 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                  mostra questo aiuto ed esce\n"
 
-#: 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
+#: 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               mostra le informazioni sulla versione ed esce\n"
@@ -969,11 +816,11 @@ msgstr "  -V, --version               mostra le informazioni sulla versione ed e
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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
+#: 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 "Segnalare i bug a <bug-gnu-gettext@gnu.org>.\n"
 
@@ -982,27 +829,30 @@ msgstr "Segnalare i bug a <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "impossibile ottenere il nome dell'host"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: 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
 #, c-format
 msgid "at most one input file allowed"
 msgstr "è permesso al massimo un file di input"
 
-#: 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: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
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s sono mutuamente esclusive"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:414 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Uso: %s [OPZIONE] [FILEINPUT]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:419
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1011,67 +861,61 @@ msgstr ""
 "Filtra i messaggi di un catalogo di traduzioni in base ai loro attributi,\n"
 "e manipola gli attributi.\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:372 src/msgmerge.c:502 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: 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
 #, 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: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: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
 #, c-format
 msgid "Input file location:\n"
 msgstr "Posizione del file di input:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FILEINPUT                   file PO di input\n"
 
-#: src/msgattrib.c: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: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
 #, 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:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: 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
 #, 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: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: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
 #, c-format
 msgid "Output file location:\n"
 msgstr "Posizione del file di output:\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:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: 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
 #, 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: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/msgunfmt.c:493 src/msguniq.c:358
+#: 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
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -1080,308 +924,260 @@ msgstr ""
 "I risultati vengono scritti su standard output quando nessun file di output\n"
 "è specificato o è -.\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selezione dei messaggi:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:445
 #, 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:454
+#: src/msgattrib.c:447
 #, 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:456
+#: src/msgattrib.c:449
 #, 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:458
+#: src/msgattrib.c:451
 #, 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:460
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           rimuove i messaggi  #~ obsoleti\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         mantiene i messaggi #~ obsoleti\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipolazione degli attributi:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             rende \"fuzzy\" tutti i messaggi\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           rende non \"fuzzy\" tutti i messaggi\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          rende obsoleti tutti i messaggi\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        rende non obsoleti tutti i messaggi\n"
 
-#: src/msgattrib.c:475
+#: src/msgattrib.c:468
 #, 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:478
+#: src/msgattrib.c:471
 #, 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:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --no-fuzzy              rimuove i messaggi marcati come \"fuzzy\"\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:473
 #, 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:484
+#: src/msgattrib.c:475
 #, 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:486
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 sinonimo di --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:479
 #, 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: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/msguniq.c:369
+#: 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
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintassi del file di input:\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:393 src/msguniq.c:371
+#: 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
 #, 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: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: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
 #, 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: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: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
 #, c-format
 msgid "Output details:\n"
 msgstr "Dettagli di output:\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:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: 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
 #, 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: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: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
 #, 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: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: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
 #, 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: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: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
 #, 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: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: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
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:960
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:962
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:964
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:966
 #, 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: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: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
 #, 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: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: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
 #, 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: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: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
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMERO          imposta la larghezza della pagina\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:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: 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
 #, 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: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: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
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genera un output ordinato\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:603 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: 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
 #, 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:322 src/msgcomm.c:327
+#: 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:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Uso: %s [OPZIONE] [FILEINPUT]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1404,24 +1200,23 @@ 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:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FILEINPUT ...               file di input\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:850
 #, 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: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:319 src/msgfmt.c:674
+#: src/xgettext.c:854
 #, 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: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"
@@ -1430,52 +1225,46 @@ msgstr ""
 "  -<, --less-than=NUMERO      stampa i messaggi with con meno di NUMERO\n"
 "                              definizioni, è predefinito a 1\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=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: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                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:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:739
+#: src/msgmerge.c:557
 #, 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:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
+#: src/msgmerge.c:559
 #, 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:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NOME          codifica dell'output\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1484,29 +1273,27 @@ msgstr ""
 "      --use-first             usa la prima traduzione disponibile per ogni\n"
 "                              messaggio, non unisce diverse traduzioni\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
-msgid ""
-"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
-msgstr ""
-"      --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:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "non sono specificati file d'ingresso"
 
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "sono richiesti esattamente 2 file d'ingresso"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Uso: %s [OPZIONE] def.po ref.pot\n"
@@ -1540,21 +1327,17 @@ msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     riferimenti alle fonti\n"
 
 # FIXME
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificatori di operazione:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
-msgid ""
-"  -m, --multi-domain          apply ref.pot to each of the domains in def."
-"po\n"
-msgstr ""
-"  -m, --multi-domain          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:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     non usa le corrispondenze fuzzy\n"
@@ -1579,17 +1362,17 @@ msgstr "questo messaggio non è tradotto"
 msgid "this message needs to be reviewed by the translator"
 msgstr "questo messaggio deve essere controllato dal traduttore"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "questo messaggio è usato ma non definito..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ma questa definizione è simile"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "questo messaggio è usato ma non è definito in %s"
@@ -1599,19 +1382,19 @@ msgstr "questo messaggio è usato ma non è definito in %s"
 msgid "warning: this message is not used"
 msgstr "attenzione: questo messaggio non è usato"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:545
 #, 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:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "devono essere specificati almeno due file"
 
-#: 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"
@@ -1631,83 +1414,76 @@ 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: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=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:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, 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:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Converte un catalogo di traduzioni in una diversa codifica.\n"
 
 # FIXME
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Obiettivo di conversione:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "La codifica predefinita è la codifica della locale corrente.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                stile di output indentato\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           sopprime le righe \"#: nomefile:riga\"\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
-#, fuzzy, c-format
-msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr ""
-"      --add-location          preserva le righe \"#: nomefile:riga"
-"\" (predefinito)\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          preserva le righe \"#: nomefile:riga\" (predefinito)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                stile di output Uniforum strict\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "non è specificato nessun file d'ingresso"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "è richiesto esattamente un file d'ingresso"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Uso: %s [OPZIONE] FILEINPUT\n"
 
 # FIXME
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1720,7 +1496,7 @@ msgstr ""
 "xgettext). Alle voci non tradotte è fornita una traduzione identica\n"
 "al msgid.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  FILEINPUT                   file PO o POT di input\n"
@@ -1759,7 +1535,7 @@ 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:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=FILEINPUT       file PO di input\n"
@@ -1769,28 +1545,27 @@ msgstr "  -i, --input=FILEINPUT       file PO di input\n"
 msgid "write to stdout failed"
 msgstr "scrittura su standard output non riuscita"
 
-#: src/msgfilter.c:298
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "nome di filtro mancante"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "deve essere specificato almeno uno script sed"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Uso: %s [OPZIONE] FILTRO [OPZIONE-FILTRO]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr ""
-"Applica un filtro a tutte le traduzioni di un catalogo di traduzioni.\n"
+msgstr "Applica un filtro a tutte le traduzioni di un catalogo di traduzioni.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1799,157 +1574,124 @@ 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:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "OPZIONI-FILTRO utili quando FILTRO è \"sed\":\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, 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:444
+#: src/msgfilter.c:425
 #, 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:447
+#: src/msgfilter.c:428
 #, 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:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
-msgid ""
-"      --no-escape             do not use C escapes in output (default)\n"
-msgstr ""
-"      --no-escape             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:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                stile di output indentato\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
-msgid ""
-"      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr ""
-"      --keep-header           non modifica l'intestazione, non la filtra\n"
+msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr "      --keep-header           non modifica l'intestazione, non la filtra\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "l'argomento di %s deve essere un singolo carattere di punteggiatura"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "endianness non valida: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, fuzzy, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr ""
-"Se nessun file di input è indicato o è -, viene letto lo standard input.\n"
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s richiede una specificazione \"-d directory\""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s richiede una specificazione \"-l locale\""
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s richiede una specificazione \"-l locale\""
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s richiede una specificazione \"-l locale\""
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s e %s sono mutuamente esclusive"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s è valido solo con %s o %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s è valido solo con %s, %s o %s"
 
 #. 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:620
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:624
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d messaggio tradotto"
 msgstr[1] "%d messaggi tradotti"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:629
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d traduzione fuzzy"
 msgstr[1] ", %d traduzioni fuzzy"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:634
 #, 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:774
+#: src/msgfmt.c:654
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Uso: %s [OPZIONE] nomefile.po ...\n"
 
 # FIXME
-#: src/msgfmt.c:778
+#: src/msgfmt.c:658
 #, 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"
+msgstr "Genera un catalogo binario di messaggi dalla descrizione di traduzioni testuali.\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: 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"
@@ -1958,120 +1700,85 @@ msgstr ""
 "Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle corte.\n"
 "Similmente per gli argomenti opzionali.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:670
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             file di input\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Modo di operazione:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:679
 #, 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:801
+#: src/msgfmt.c:681
 #, 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:803
+#: src/msgfmt.c:683
 #, 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:805
+#: src/msgfmt.c:685
 #, 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:807
+#: src/msgfmt.c:687
 #, 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:809
+#: src/msgfmt.c:689
 #, 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:811
-#, fuzzy, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --qt                    modo Qt: genera un file Qt .qm\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:696
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                abilita il modo Uniforum strict\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, 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:823
+#: src/msgfmt.c:701
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Posizione del file di output in modo Java:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:703 src/msgfmt.c:717 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: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:705 src/msgfmt.c:719 src/msgfmt.c:729 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"
-
-#: src/msgfmt.c:829
-#, fuzzy, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --tcl                   modo Tcl: l'input è un file tcl/msgcat .msg\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"
 
 # FIXME
-#: src/msgfmt.c:831
+#: src/msgfmt.c:707
 #, 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:833
+#: src/msgfmt.c:709
 #, 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 ""
@@ -2079,22 +1786,19 @@ msgstr ""
 "della risorsa, separata da una sottolineatura. L'opzione -d è obbligatoria.\n"
 "La classe viene scritta nella directory specificata.\n"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:715
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Posizione del file di output in modo C#:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:721 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:847
+#: src/msgfmt.c:723
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2103,18 +1807,17 @@ 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:851
+#: src/msgfmt.c:727
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Posizione del file di output in modo Tcl:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:731 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:857
+#: src/msgfmt.c:733
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -2123,228 +1826,166 @@ msgstr ""
 "Le opzioni -l e -d sono obbligatorie. Il file .msg viene scritto nella\n"
 "directory indicata.\n"
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-"  -d DIRECTORY                directory base dei cataloghi di messaggi .msg\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-msgstr ""
-"  -kPAROLA, --keyword=PAROLA  cerca PAROLA come parola chiave aggiuntiva\n"
-"  -k, --keyword               non usa le parole chiave predefinite\n"
-
-#: src/msgfmt.c:874
-#, 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:886 src/xgettext.c:905
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretazione del file di input:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:747
 #, 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:891
+#: src/msgfmt.c:750
 #, 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:893
+#: src/msgfmt.c:752
 #, 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:895
+#: src/msgfmt.c:754
 #, 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:898
+#: src/msgfmt.c:757
 #, 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:900
+#: src/msgfmt.c:759
 #, 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:903
+#: src/msgfmt.c:762
 #, 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:908
+#: src/msgfmt.c:767
 #, 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:910
+#: src/msgfmt.c:769
 #, 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:913
+#: src/msgfmt.c:772
 #, 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:922
+#: src/msgfmt.c:781
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            stampa statistiche sulle traduzioni\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:783 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               aumenta il livello di prolissità\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:897
 #, 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:1040
+#: src/msgfmt.c:900
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "attenzione: la conversione del set di caratteri non riuscirà\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:910
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "attenzione: intestazione fuzzy del file PO\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:912
 #, 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"
+msgstr "attenzione: versioni più vecchie di msgfmt generano un errore in questo caso\n"
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:936
 #, 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:1081
+#: src/msgfmt.c:941
 #, 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:1095
+#: src/msgfmt.c:955
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "direttiva di dominio \"%s\" ignorata"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1015
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "ignorata la voce \"msgstr\" vuota"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1016
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "ignorata la voce \"msgstr\" fuzzy"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1065
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: attenzione: il file sorgente contiene traduzioni fuzzy"
 
-#: src/msgfmt.c:1318
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
-#, 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-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:176
+#: 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
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "errore durante la lettura di \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
-msgid ""
-"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
-"specified"
-msgstr ""
-"l'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:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2353,7 +1994,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:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2429,27 +2070,23 @@ msgstr ""
 "  -v, --invert-match          emette solo i messaggi che non corrispondono ad\n"
 "                              alcun criterio di selezione\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, 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:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           genera un output ordinato\n"
 
 # FIXME
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr ""
-"      --sort-by-file          ordina l'output in base alla posizione nel "
-"file\n"
+msgstr "      --sort-by-file          ordina l'output in base alla posizione nel file\n"
 
 #: src/msginit.c:297
 msgid ""
@@ -2494,12 +2131,10 @@ msgstr "  -i, --input=FILEINPUT       file POT di input\n"
 #: src/msginit.c:379
 #, 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:385
@@ -2524,11 +2159,8 @@ msgstr "  -l, --locale=LL_CC          imposta la locale obiettivo\n"
 
 #: src/msginit.c:402
 #, 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:468
 msgid ""
@@ -2561,14 +2193,11 @@ msgstr "sottoprocesso %s non riuscito con codice d'uscita %d"
 # FIXME
 #: src/msginit.c:1118
 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"
 
@@ -2584,8 +2213,7 @@ msgstr "Traduzioni italiane per il pacchetto %s."
 #: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
-msgstr ""
-"il set di caratteri corrente \"%s\" non è un nome di codifica portabile"
+msgstr "il set di caratteri corrente \"%s\" non è un nome di codifica portabile"
 
 #: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
@@ -2594,30 +2222,22 @@ msgstr "due diversi set di caratteri \"%s\" e \"%s\" nel file di input"
 
 #: 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: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:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
-msgstr ""
-"il set di caratteri obiettivo \"%s\" non è un nome di codifica portabile"
+msgstr "il set di caratteri obiettivo \"%s\" non è un nome di codifica portabile"
 
 #: 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/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "attenzione: "
@@ -2634,8 +2254,7 @@ msgstr ""
 #: src/msgl-cat.c:449
 #, 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 ""
@@ -2705,8 +2324,7 @@ msgid ""
 "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"
 
@@ -2717,8 +2335,7 @@ msgstr "l'espressione plurale può produrre valori negativi"
 #: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr ""
-"nplurals = %lu, ma l'espressione plurale può produrre valori fino a %lu"
+msgstr "nplurals = %lu, ma l'espressione plurale può produrre valori fino a %lu"
 
 #: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
@@ -2730,12 +2347,8 @@ msgid "plural expression can produce integer overflow"
 msgstr "l'espressione plurale può produrre un overflow dell'intero"
 
 #: src/msgl-check.c:197
-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"
+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:266
 #, c-format
@@ -2782,18 +2395,12 @@ msgstr[0] "ma alcuni messaggi hanno una forma plurale"
 msgstr[1] "ma alcuni messaggi hanno %lu forme plurali"
 
 #: 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 ""
-"il catalogo di messaggi contiene traduzioni di forme plurali, ma "
-"l'intestazione non contiene \"Plural-Forms: nplurals=INTERO; "
-"plural=ESPRESSIONE;\""
+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:611
 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:619
 #, c-format
@@ -2806,8 +2413,7 @@ msgstr "le voci \"msgid\" e \"msgstr\" non cominciano entrambe con \"\\n\""
 
 #: src/msgl-check.c:652
 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:660
 #, c-format
@@ -2827,19 +2433,17 @@ msgstr "la gestione del plurale è un'estensione di GNU gettext"
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "in msgstr manca il carattere \"%c\" per l'acceleratore da tastiera"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, 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:804
+#: src/msgl-check.c:801
 #, 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:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "campo \"%s\" mancante nell'intestazione\n"
@@ -2852,56 +2456,42 @@ msgstr "%s: input non valido nella codifica \"%s\""
 #: 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:290
 msgid "input file doesn't contain a header entry with a charset specification"
-msgstr ""
-"il file di input non contiene un'intestazione con una specificazione del set "
-"di caratteri"
+msgstr "il file di input non contiene un'intestazione con una specificazione del set di caratteri"
 
 #: 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/x-python.c:665 src/xgettext.c:708
 #, 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:335
 #, 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:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/xgettext.c:715
 #, 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:392 src/msgmerge.c:398
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s è valido solamente con %s"
 
-#: src/msgmerge.c:453
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "tipo di backup"
 
 # FIXME UPSTREAM
-#: src/msgmerge.c:490
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2926,29 +2516,26 @@ msgstr ""
 "Quando è impossibile trovare una corrispondenza esatta, una corrispondenza\n"
 "approssimativa (fuzzy) è usata per ottenere i migliori risultati.\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr ""
-"  def.po                      traduzioni che si riferiscono alle vecchie "
-"fonti\n"
+msgstr "  def.po                      traduzioni che si riferiscono alle vecchie fonti\n"
 
-#: src/msgmerge.c:509
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     riferimenti alle nuove fonti\n"
 
-#: src/msgmerge.c:513
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=FILE       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:519
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2957,32 +2544,31 @@ msgstr ""
 "  -U, --update                aggiorna il file def.po,\n"
 "                              non fa niente se def.po è già aggiornato\n"
 
-#: src/msgmerge.c:531
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Posizione del file di output in modalità di aggiornamento:\n"
 
 # FIXME
-#: src/msgmerge.c:533
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Il risultato è riscritto in def.po.\n"
 
-#: src/msgmerge.c:535
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROLLO      fa il backup di def.po\n"
 
-#: src/msgmerge.c:537
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFFISSO       cambia il solito suffisso dei backup\n"
 
-#: src/msgmerge.c:539
+#: src/msgmerge.c:534
 #, 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"
@@ -2990,56 +2576,47 @@ 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:546
+#: src/msgmerge.c:541
 #, 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:557
+#: src/msgmerge.c:552
 #, 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:614 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       sopprime gli indicatori di avanzamento\n"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "questo messaggio dovrebbe definire forme plurali"
 
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "questo messaggio non dovrebbe definire forme plurali"
 
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2030
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -3058,17 +2635,13 @@ msgstr "Uso: %s [OPZIONE] [FILE]...\n"
 #: 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: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:442
@@ -3078,19 +2651,13 @@ msgstr "      --csharp                modo C#: l'input è un file .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      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: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:451
 #, c-format
@@ -3105,8 +2672,7 @@ msgstr "Posizione del file di input in modo 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 ""
 "Il nome della classe è determinato aggiungendo il nome della locale al nome\n"
@@ -3152,7 +2718,7 @@ msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                scrive in stile Uniforum strict\n"
 
 # FIXME UPSTREAM
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3175,19 +2741,15 @@ msgstr ""
 "traduzione. Le posizioni dei file vengono accumulate. Quando si usa l'opzione\n"
 "--unique, i duplicati vengono scartati.\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              stampa solo i duplicati\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, 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:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
@@ -3201,8 +2763,7 @@ 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
@@ -3218,8 +2779,7 @@ 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
@@ -3245,35 +2805,34 @@ 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:93
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "uso improprio di #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "manca la sezione \"msgstr[]\""
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "manca la sezione \"msgid_plural\""
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "manca la sezione \"msgstr\""
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "la prima forma plurale ha indice diverso da zero"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "la forma plurale ha indice non corretto"
@@ -3283,7 +2842,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:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:740 src/write-po.c:869
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "sequenza multibyte non valida"
@@ -3327,16 +2886,16 @@ msgstr "end-of-line all'interno di una stringa"
 msgid "context separator <EOT> within string"
 msgstr "separatore di contesto <EOT> all'interno di una stringa"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "questo file potrebbe non contenere direttive di dominio"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "definizione del messaggio duplicata"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "questa è la posizione della prima definizione"
 
@@ -3418,8 +2977,7 @@ msgstr "l'input non è valido in codifica \"%s\""
 #: src/recode-sr-latin.c:367
 #, 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:159
 #, c-format
@@ -3471,47 +3029,28 @@ msgid " failed.\n"
 msgstr " non riuscito\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 ""
-"Impossibile scrivere più domini di traduzione in un singolo file con il "
-"formato di output indicato. Usare la sintassi del file PO invece."
+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:129
-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."
+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:162
-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."
+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: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."
+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:202
-msgid ""
-"message catalog has plural form translations, but the output format does not "
-"support them."
+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:231 src/write-catalog.c:275
@@ -3538,38 +3077,32 @@ msgstr "compilazione della classe C# non riuscita, provare --verbose"
 msgid "compilation of C# class failed"
 msgstr "compilazione della classe C# non riuscita"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "nome di classe Java non valido: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr ""
-"compilazione della classe Java non riuscita, provare --verbose o impostare "
-"$JAVAC"
+msgstr "compilazione della classe Java non riuscita, provare --verbose o impostare $JAVAC"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr ""
-"compilazione della classe Java non riuscita, provare a impostare $JAVAC"
+msgstr "compilazione della classe Java non riuscita, provare a impostare $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 "errore durante l'apertura di \"%s\" in scrittura"
 
-#: src/write-po.c:875
+#: src/write-po.c:803
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1254 src/write-po.c:1383
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3582,7 +3115,7 @@ msgstr ""
 "diversa dalla propria. Considerare l'uso di un msgctxt in puro ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1266 src/write-po.c:1395
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3600,21 +3133,17 @@ 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:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"il catalogo dei messaggi contiene stringhe msgctxt con caratteri non in "
-"ISO-8859-1,\n"
-"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:717
@@ -3623,10 +3152,8 @@ msgid ""
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"il catalogo dei messaggi contiene stringhe msgid con caratteri non in "
-"ISO-8859-1,\n"
-"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:94
@@ -3647,8 +3174,7 @@ 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:157
@@ -3664,11 +3190,10 @@ 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:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-javascript.c:988 src/x-python.c:1128
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: attenzione: stringa non terminata"
@@ -3678,22 +3203,17 @@ msgstr "%s:%d: attenzione: stringa non terminata"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: attenzione: espressione regolare non terminata"
 
-#: src/x-c.c:1051
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: attenzione: carattere Unicode non valido"
-
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:762
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: attenzione: costante carattere non terminata"
 
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1247 src/x-vala.c:832
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: attenzione: costante stringa non terminata"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr "Specificare la codifica del sorgente usando --from-code."
 
@@ -3747,7 +3267,7 @@ msgstr ""
 "%s:%d: sequenza multibyte non valida.\n"
 "Indicare la codifica del sorgente usando --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: attenzione: carattere Unicode non valido"
@@ -3767,22 +3287,22 @@ msgstr "%s:%d: attenzione: trovata \")\" dove era prevista \"}\""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: attenzione: trovata \"}\" dove era prevista \")\""
 
-#: src/x-glade.c:295
+#: src/x-glade.c:561
 #, c-format
 msgid "Missing context for the string extracted from '%s' element"
 msgstr "Contesto mancante per la stringa estratta dall'elemento \"%s\""
 
-#: src/x-glade.c:417
+#: src/x-glade.c:686
 #, 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"
 
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3846,26 +3366,15 @@ msgstr ""
 "%s:%d: sequenza multibyte non valida.\n"
 "Indicare la codifica del sorgente usando --from-code\n"
 
-#: src/x-javascript.c:954
+#: src/x-javascript.c:1147
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: attenzione: costante RegExp terminata troppo presto"
 
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: attenzione: carattere Unicode non valido"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: attenzione: stringa non terminata"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr ""
-"%s:%d: impossibile trovare il terminatore di stringa \"%s\" prima di EOF"
+msgstr "%s:%d: impossibile trovare il terminatore di stringa \"%s\" prima di EOF"
 
 #: src/x-perl.c:1043
 #, c-format
@@ -3913,8 +3422,7 @@ msgid ""
 "comment as specified in http://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:341
@@ -3925,8 +3433,7 @@ msgid ""
 "comment as specified in http://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:354
@@ -3937,8 +3444,7 @@ msgid ""
 "comment as specified in http://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:364
@@ -3949,8 +3455,7 @@ msgid ""
 "comment as specified in http://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:397
@@ -3986,109 +3491,84 @@ msgstr "%s:%d: espressione stringa non valida"
 
 #: 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: attenzione: la sintassi $\"...\" è deprecata per motivi di "
-"sicurezza; usare eval_gettext al suo posto"
+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:413
+#: src/x-vala.c:558
 #, c-format
 msgid "%s:%d: warning: regular expression literal terminated too early"
 msgstr "%s:%d: attenzione: espressione regolare terminata troppo presto"
 
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:636
 #, 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"
+msgstr "--join-existing non può essere usato quando l'output è scritto su standard output"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext non può operare senza parole chiavi da ricercare"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:785
 #, 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"
+msgstr "attenzione: il file \"%s\" ha estensione \"%s\" sconosciuta: si prova con C"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:836
 #, 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:882
+#: 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=NOME   usa NOME.po per l'output (invece di 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 per l'output (invece di messages.po)\n"
 
-#: src/xgettext.c:884
+#: src/xgettext.c:861
 #, 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:886
+#: src/xgettext.c:863
 #, 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        i file di output saranno posizionati nella\n"
 "                              directory DIR\n"
 
-#: src/xgettext.c:891
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Scelta del linguaggio del file di input:\n"
 
-#: src/xgettext.c:893
-#, fuzzy, c-format
+#: src/xgettext.c:870
+#, 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"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 "  -L, --language=NOME         riconosce i linguaggi specificati\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)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   abbreviazione di --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:879
 #, 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"
+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:907
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4097,264 +3577,221 @@ msgstr ""
 "      --from-code=NOME        codifica dei file di input\n"
 "                                (ad eccezione di Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:887
 #, 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:915
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr ""
-"  -j, --join-existing         unisce i messaggi con il file esistente\n"
+msgstr "  -j, --join-existing         unisce i messaggi con il file esistente\n"
 
-#: src/xgettext.c:917
+#: 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  non estrae le voci in FILE.po\n"
 
-#: src/xgettext.c:919
+#: src/xgettext.c:896
 #, 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   mette il blocco di commenti che contiene TAG "
-"e\n"
+"  -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"
+"  -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:925
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opzioni di linguaggio specifiche:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           estrae tutte le stringhe\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:906 src/xgettext.c:914
 #, 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 linguaggi 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:937
-#, fuzzy, c-format
+#: src/xgettext.c:911
+#, 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"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\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"
+"  -kPAROLA, --keyword=PAROLA  cerca PAROLA come parola chiave aggiuntiva\n"
+"  -k, --keyword               non usa le parole chiave predefinite\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:919
 #, 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=PAROLA:ARG:FLAG  flag aggiuntiva per le stringhe "
-"nell'argomento\n"
+"      --flag=PAROLA:ARG:FLAG  flag aggiuntiva per le stringhe nell'argomento\n"
 "                              numero ARG della parola chiave PAROLA\n"
 
-#: src/xgettext.c:945
+#: src/xgettext.c:922
 #, 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 linguaggi 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:950
+#: src/xgettext.c:927
 #, 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:952
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (solo linguaggi C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    riconosce le stringhe di formato Qt\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (solo linguaggio C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   riconosce le stringhe di formato KDE 4\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 riconosce le stringhe di formato Boost\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:943
 #, c-format
-msgid ""
-"      --debug                 more detailed formatstring recognition result\n"
+msgid "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
-"      --debug                 mostra in modo più dettagliato il risultato "
-"del\n"
+"      --debug                 mostra in modo più dettagliato il risultato del\n"
 "                              riconoscimento della stringa di formato\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     scrive un file .properties Java\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr ""
-"      --copyright-holder=STRINGA imposta il titolare del copyright in "
-"output\n"
+msgstr "      --copyright-holder=STRINGA imposta il titolare del copyright in output\n"
 
 # FIXME UPSTREAM
-#: src/xgettext.c:1008
+#: src/xgettext.c:985
 #, 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          omette dall'output il copyright della FSF per\n"
 "                              gli utenti non GNU\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr ""
-"      --package-name=NOME     imposta il nome del pacchetto in output\n"
+msgstr "      --package-name=NOME     imposta il nome del pacchetto in output\n"
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
-msgstr ""
-"      --package-version=VERSIONE imposta la versione del pacchetto in "
-"output\n"
+msgstr "      --package-version=VERSIONE imposta la versione del pacchetto in output\n"
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:991
 #, 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@INDIRIZZO  imposta l'indirizzo a cui "
-"segnalare\n"
+"      --msgid-bugs-address=EMAIL@INDIRIZZO  imposta l'indirizzo a cui segnalare\n"
 "                              errori nelle voci msgid\n"
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:993
 #, 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[STRINGA], --msgstr-prefix[=STRINGA]  usa STRINGA o \"\" come prefisso "
-"nelle\n"
+"  -m[STRINGA], --msgstr-prefix[=STRINGA]  usa STRINGA o \"\" come prefisso nelle\n"
 "                                voci msgstr\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:996
 #, 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[STRINGA], --msgstr-suffix[=STRINGA]  usa STRINGA o \"\" come suffisso "
-"nelle\n"
+"  -M[STRINGA], --msgstr-suffix[=STRINGA]  usa STRINGA o \"\" come suffisso nelle\n"
 "                                voci msgstr\n"
 
 # FIXME UPSTREAM
-#: src/xgettext.c:1840
+#: src/xgettext.c:1817
 #, 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 "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:1965
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Carattere non ASCII in %s%s."
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Commento non ASCII in o prima di %s%s."
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Stringa non ASCII in %s%s."
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: attenzione: "
 
-#: src/xgettext.c:2189
+#: 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 ""
-"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:2190
+#: src/xgettext.c:2139
 #, 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:2221
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4362,13 +3799,12 @@ msgid ""
 "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"
+"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:2283
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4378,29 +3814,27 @@ msgstr ""
 "gettext(\"\") restituisce l'intestazione con\n"
 "le metainformazioni, non la stringa vuota.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "specificazione di argomento ambigua per la parola chiave \"%.*s\""
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "attenzione: contesto mancante per la parola chiave \"%.*s\""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr ""
-"attenzione: contesto mancante per l'argomento plurale della parola chiave "
-"\"%.*s\""
+msgstr "attenzione: contesto mancante per l'argomento plurale della parola chiave \"%.*s\""
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2942
 #, 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:3419
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4412,7 +3846,7 @@ msgstr ""
 "variabile MSGID_BUGS_ADDRESS; altrimenti specificare \n"
 "l'opzione --msgid-bugs-address da riga di comando.\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3267
 #, c-format
 msgid "language '%s' unknown"
 msgstr "linguaggio \"%s\" sconosciuto"
diff --git a/gettext-tools/po/ja.po b/gettext-tools/po/ja.po
index 22784589b..2107e84af 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2014-05-10 13:37+0900\n"
 "PO-Revision-Date: 2014-05-11 13:39+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -197,16 +197,12 @@ msgstr "\"%s\" �ե������񤭹�����˥��顼��ȯ�����ޤ���"
 #: gnulib-lib/javacomp.c:2343
 #, 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
@@ -216,7 +212,7 @@ 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
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "�����Ȥ��̤����ޤ���"
@@ -227,7 +223,7 @@ msgid "creation of threads failed"
 msgstr "����åɤ������˼���"
 
 #: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "%s �ؽ񤭽Ф����֥ץ����������Ԥ��ޤ���"
@@ -330,8 +326,7 @@ msgstr "'%s' �������� %s ������ʸ����ǤϤʤ�, '%s' �Ȥϰ㤤�ޤ�. ��ͳ: %s"
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%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
@@ -359,12 +354,8 @@ msgstr "̿���ֹ� %u ��, | �ǻϤޤäƤ��ޤ��� | �ǽ���äƤ��ޤ���."
 
 #: 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
@@ -394,14 +385,12 @@ 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 '}'."
+msgid "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr "ʸ�����̿�������ǽ���äƤ��ޤ�: '{' �� '}' �����פ��Ƥ��ޤ���."
 
 #: src/format-csharp.c:139
 #, 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
@@ -410,9 +399,7 @@ 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 "
-"'{'."
+msgid "The string starts in the middle of a directive: found '}' without matching '{'."
 msgstr "ʸ�����̿������椫��ϤޤäƤ��ޤ�: '}' �� '{' �����פ��Ƥ��ޤ���."
 
 #: src/format-csharp.c:162
@@ -432,16 +419,12 @@ 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
@@ -479,45 +462,32 @@ 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
@@ -527,9 +497,7 @@ 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."
+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
@@ -539,18 +507,13 @@ 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\" ����"
-"�� 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:572
 #, c-format
@@ -559,17 +522,12 @@ 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
@@ -579,31 +537,20 @@ msgstr "���� {%u} ���Ф�������λ��꤬ '%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 "'%s' �� '%s' �Ǥΰ��� {%u} ���Ф�������λ��꤬Ʊ���ǤϤ���ޤ���"
 
 #: 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 ""
-"̿���ֹ� %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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -633,9 +580,7 @@ msgstr "̿���ֹ� %u �Ǥ�, @ �� : ��ξ���ν����Ҥ����ꤵ��Ƥ��ޤ�."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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:3326 src/format-scheme.c:3263
@@ -659,9 +604,7 @@ 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'."
+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
@@ -672,11 +615,8 @@ msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "���� '%s' ���Ф���������꤬ '%s' ��¸�ߤ��ޤ���"
 
 #: 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
@@ -685,26 +625,22 @@ 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: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-python-brace.c:137
@@ -724,8 +660,7 @@ 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."
+msgid "In the directive number %u, no more nesting is allowed in a format specifier."
 msgstr "̿���ֹ� %u �Ǥ�, �ե����ޥåȼ��̻ҤǤ���ʾ�Υͥ��ȤϤǤ��ޤ���."
 
 #: src/format-python-brace.c:270
@@ -735,31 +670,20 @@ 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' �ե饰�� 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: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 ""
-"ʸ�����ʣ���ʥ������̤�ʸˡ��Ȥä��������ѿ��򻲾Ȥ��Ƥ��ޤ�. ����ʸˡ��"
-"�����Ǥϥ������ƥ������ͳ�Ǽ�������Ƥ��ޤ���."
+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."
@@ -767,16 +691,12 @@ 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."
+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:355 src/msgcat.c:294 src/msgcmp.c:172
@@ -854,12 +774,10 @@ msgstr "  -s, --short                 û���ۥ���̾\n"
 #: src/hostname.c:222
 #, 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:225
@@ -943,8 +861,7 @@ msgstr "°���˽��ä��������������Υ�å����������̤�, °���򤦤ޤ����ޤ�.\n"
 #: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 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:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
@@ -965,17 +882,14 @@ msgstr "  INPUTFILE                   ���� PO �ե�����\n"
 #: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
 #: src/xgettext.c:875
 #, 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:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
 #: 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
@@ -999,9 +913,7 @@ msgstr "  -o, --output-file=FILE      ���ꤷ���ե�����˽���\n"
 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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
 #, c-format
@@ -1010,18 +922,13 @@ 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
@@ -1066,8 +973,7 @@ msgstr "      --set-obsolete          ���ƤΥ�å������� '�Ѥ줿' ���֤�����\n"
 #: 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:475
 #, c-format
@@ -1080,28 +986,22 @@ 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                 'fuzzy' ������ msgstr ���������\n"
 
 #: 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: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:486
@@ -1111,10 +1011,8 @@ msgstr "      --fuzzy                 --only-fuzzy --clear-fuzzy ��Ʊ��\n"
 
 #: 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
@@ -1127,19 +1025,14 @@ 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:393 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: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
 #, 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
@@ -1156,37 +1049,31 @@ msgstr "���Ϥξܺ�:\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"
+"                              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: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
 #, 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: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
 #, 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: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
 #, 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"
@@ -1208,24 +1095,19 @@ msgstr "  -i, --indent                ������������ .po �ե���������\n"
 #: src/xgettext.c:985
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr ""
-"      --no-location           '#: �ե�����̾:���ֹ�' �ιԤ�񤭽Ф��ʤ�\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
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
 #: src/xgettext.c:989
 #, 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: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
@@ -1238,10 +1120,8 @@ msgstr "  -p, --properties-output     Java .properties �ե���������\n"
 #: 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
 #, 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: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
@@ -1257,9 +1137,7 @@ msgstr "  -w, --width=NUMBER          ���ϥڡ�������������\n"
 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: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
@@ -1353,8 +1231,7 @@ msgstr ""
 #: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
 #: src/msgmerge.c:562
 #, 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:254 src/msgcomm.c:413 src/msgfmt.c:882
@@ -1363,9 +1240,7 @@ msgstr "  -P, --properties-input      ���ϥե������ Java .properties ��ʸˡ\n"
 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:337 src/msguniq.c:378
 #, c-format
@@ -1383,8 +1258,7 @@ msgstr ""
 
 #: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
 #, 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.
@@ -1442,11 +1316,8 @@ msgstr "������:\n"
 
 #: src/msgcmp.c:241 src/msgmerge.c:553
 #, 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:555
 #, c-format
@@ -1493,7 +1364,7 @@ msgstr "���Υ�å������ϻȤ��ޤ��� %s �Ǥ��������Ƥ��ޤ���"
 msgid "warning: this message is not used"
 msgstr "�ٹ�: ���Υ�å������ϻȤ��ޤ���"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1535,10 +1406,8 @@ msgstr ""
 
 #: src/msgcomm.c:452 src/xgettext.c:1004
 #, 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
@@ -1569,8 +1438,7 @@ msgstr "      --no-location           '#: filename:line' �ιԤ���Ϥ��ʤ�\n"
 #: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
 #: src/msgmerge.c:588
 #, 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:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
@@ -1681,8 +1549,7 @@ 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:440
@@ -1692,31 +1559,25 @@ msgstr "FILTER �� 'sed' ��������� FILTER-OPTION:\n"
 
 #: src/msgfilter.c:442
 #, 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:444
 #, 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:447
 #, 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:465 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:471 src/msggrep.c:606
 #, c-format
@@ -1725,8 +1586,7 @@ msgstr "      --indent                �������������\n"
 
 #: src/msgfilter.c:473
 #, 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:345
@@ -1842,19 +1702,13 @@ msgstr "���⡼��:\n"
 
 #: src/msgfmt.c:799
 #, 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
 #, 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
 #, c-format
@@ -1863,19 +1717,13 @@ msgstr "      --csharp                C# �⡼��: .NET .dll �ե����������\n"
 
 #: src/msgfmt.c:805
 #, 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# resources �⡼��: .NET .resources �ե����������\n"
 
 #: src/msgfmt.c:807
 #, c-format
-msgid ""
-"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr ""
-"      --tcl                   Tcl �⡼��: tcl/msgcat .msg �ե����������\n"
+msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr "      --tcl                   Tcl �⡼��: tcl/msgcat .msg �ե����������\n"
 
 #: src/msgfmt.c:809
 #, c-format
@@ -1884,10 +1732,8 @@ msgstr "      --qt                    Qt �⡼��: Qt .qm �ե����������\n"
 
 #: src/msgfmt.c:811
 #, 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:818
 #, c-format
@@ -1912,40 +1758,28 @@ msgstr "  -r, --resource=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
 #, 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:829
 #, 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:831
 #, 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:833
 #, 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:839
@@ -1955,12 +1789,8 @@ msgstr "C# �⡼�ɤˤ�������ϥե�����ξ��:\n"
 
 #: src/msgfmt.c:845 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:847
 #, c-format
@@ -1979,8 +1809,7 @@ msgstr "Tcl �⡼�ɤˤ�������ϥե�����ξ��:\n"
 #: src/msgfmt.c:855 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:857
 #, c-format
@@ -2018,8 +1847,7 @@ msgstr ""
 #: src/msgfmt.c:874
 #, 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"
@@ -2034,24 +1862,19 @@ msgstr "���ϥե�����β��:\n"
 #, 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:891
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr ""
-"      --check-format          ����˰�¸�����ե����ޥå�ʸ���������å�\n"
+msgstr "      --check-format          ����˰�¸�����ե����ޥå�ʸ���������å�\n"
 
 #: src/msgfmt.c:893
 #, 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:895
@@ -2065,20 +1888,15 @@ msgstr ""
 
 #: src/msgfmt.c:898
 #, 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:900
 #, 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:903
 #, c-format
@@ -2087,30 +1905,22 @@ msgstr "  -f, --use-fuzzy             fuzzy (�����ޤ�) ���ܤ���Ϥ˻Ȥ�\n"
 
 #: src/msgfmt.c:908
 #, 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:910
 #, 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:913
 #, 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
 #, c-format
@@ -2150,8 +1960,7 @@ msgstr "�ɥᥤ��̾ \"%s\" �ϥե�����̾�Ȥ���Ŭ�ڤǤϤ���ޤ���"
 #: src/msgfmt.c:1081
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr ""
-"�ɥᥤ��̾ \"%s\" �ϥե�����̾�Ȥ���Ŭ�ڤǤϤ���ޤ���. ��Ƭ����Ȥ��ޤ�"
+msgstr "�ɥᥤ��̾ \"%s\" �ϥե�����̾�Ȥ���Ŭ�ڤǤϤ���ޤ���. ��Ƭ����Ȥ��ޤ�"
 
 #: src/msgfmt.c:1095
 #, c-format
@@ -2173,12 +1982,12 @@ msgstr "�����ޤ� (fuzzy) �� 'msgstr' ����ȥ��̵�뤵��ޤ�"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: �ٹ�: �������ե�����ˤ����ޤ� (fuzzy) ������������ޤ�"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1306
 #, c-format
 msgid "%s does not exist"
 msgstr "%s ��¸�ߤ��ޤ���"
 
-#: src/msgfmt.c:1328
+#: src/msgfmt.c:1316
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s ��¸�ߤ��ޤ����ɤ߹���ޤ���"
@@ -2197,12 +2006,8 @@ 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
@@ -2290,8 +2095,7 @@ 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                ���Ϥ� C ����Υ��������פ�Ȥ�,\n"
 "                              ��ĥʸ����ޤ�ʤ�\n"
@@ -2346,8 +2150,7 @@ msgstr "  -i, --input=INPUTFILE       ���Ϥ��� POT �ե�����\n"
 #: src/msginit.c:379
 #, 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"
@@ -2364,8 +2167,7 @@ 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
@@ -2375,8 +2177,7 @@ msgstr "  -l, --locale=LL_CC          �оݤȤʤ�������������\n"
 
 #: src/msginit.c:402
 #, 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
@@ -2409,16 +2210,13 @@ msgstr "%s ���֥ץ���������, ��λ������ %d"
 
 #: src/msginit.c:1118
 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.
@@ -2441,24 +2239,18 @@ msgstr "2�Ĥΰۤʤä�ʸ�����å� \"%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 ""
-"���ϥե����� '%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:391 src/msgl-iconv.c:375
 #, 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
@@ -2479,16 +2271,13 @@ msgstr ""
 #: src/msgl-cat.c:449
 #, 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:488
 #, c-format
@@ -2500,8 +2289,7 @@ msgid ""
 msgstr ""
 "�ե����� %s �� %s ���󥳡��ǥ��󥰤��� %s ���󥳡��ǥ��󥰤ؤ��Ѵ���\n"
 "�����Ĥ��� msgid �� msgctxt ���ѹ����ޤ�.\n"
-"���Ƥ� msgid �� msgctxt ����� ASCII ���Ѵ����뤫, ����餬�ǽ餫��, �Ĥ�"
-"��\n"
+"���Ƥ� msgid �� msgctxt ����� ASCII ���Ѵ����뤫, ����餬�ǽ餫��, �Ĥޤ�\n"
 "�����������ɥե���������, UTF-8 �ǥ��󥳡��ɤ���Ƥ��뤳�Ȥ��ݾڤ��뤫\n"
 "�ɤ��餫�Ǥ�.\n"
 
@@ -2565,8 +2353,7 @@ msgstr "ʣ��ɽ��������ͤ����������ǽ��������ޤ�"
 #: src/msgl-check.c:141
 #, 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
 msgid "plural expression can produce division by zero"
@@ -2577,9 +2364,7 @@ msgid "plural expression can produce integer overflow"
 msgstr "ʣ��ɽ�����������դ�򵯤�����ǽ��������ޤ�"
 
 #: src/msgl-check.c:197
-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:266
@@ -2625,17 +2410,12 @@ msgid_plural "but some messages have %lu plural forms"
 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;\""
-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:611
 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
 #, c-format
@@ -2648,8 +2428,7 @@ msgstr "'msgid' �� 'msgstr' �Υ���ȥ꤬�ɤ���� '\\n' �ǻϤޤäƤ��ޤ���"
 
 #: src/msgl-check.c:652
 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
 #, c-format
@@ -2669,18 +2448,17 @@ msgstr "ʣ����������� GNU gettext �γ�ĥ�Ǥ�"
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr �ˤϥ����ܡ��ɥ�������졼���ε��� '%c' ������ޤ���"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr ""
-"msgstr �ˤϤ��ޤ��¿���Υ����ܡ��ɥ�������졼���ε��� '%c' ������ޤ�"
+msgstr "msgstr �ˤϤ��ޤ��¿���Υ����ܡ��ɥ�������졼���ε��� '%c' ������ޤ�"
 
-#: src/msgl-check.c:804
+#: src/msgl-check.c:801
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "�إå����� '%s' �����ɸ���ͤΤޤޤǤ�\n"
 
-#: src/msgl-check.c:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "�إå����� '%s' ���إå�����ˤ���ޤ���\n"
@@ -2693,9 +2471,7 @@ 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
 msgid "input file doesn't contain a header entry with a charset specification"
@@ -2704,31 +2480,19 @@ 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
 #, 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
 #, 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:302 src/x-python.c:672
 #: src/xgettext.c:727
 #, 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:392 src/msgmerge.c:398
 #, c-format
@@ -2812,28 +2576,24 @@ msgstr "      --suffix=SUFFIX         �̾�ΥХå����å�����������\n"
 #: src/msgmerge.c:539
 #, 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:546
 #, 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"
@@ -2841,10 +2601,8 @@ msgstr ""
 
 #: src/msgmerge.c:557
 #, 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:614 src/urlget.c:192
 #, c-format
@@ -2863,12 +2621,8 @@ msgstr "���Υ�å�������ʣ������������٤��ǤϤ���ޤ���"
 
 #: src/msgmerge.c:2035
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2893,12 +2647,8 @@ 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 ����"
-"��\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
@@ -2907,19 +2657,13 @@ 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# resources �⡼��: ���Ϥ� .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
@@ -2934,12 +2678,10 @@ 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"
+"���饹̾��, �꥽����̾�������˲��դ��С� \"_\" �򶴤�ǥ�������̾��ä��뤳��\n"
 "�Ƿ����ޤ�. ���饹�ξ��� CLASSPATH �ǻ��ꤵ��ޤ�.\n"
 
 #: src/msgunfmt.c:467
@@ -2966,9 +2708,7 @@ 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
@@ -3008,11 +2748,8 @@ msgstr "  -d, --repeated              ��ʣ���Ƥ����ΤΤߤ�ɽ��\n"
 
 #: 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
@@ -3241,9 +2978,7 @@ msgstr "���Ϥ� \"%s\" ���󥳡��ǥ��󥰤ˤ�����ͭ���ǤϤ���ޤ���"
 #: src/recode-sr-latin.c:367
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr ""
-"\"%s\" ���󥳡��ǥ��󥰤��� \"%s\" ���󥳡��ǥ��󥰤��Ѵ�����ݤ˥��顼��ȯ��"
-"���ޤ���"
+msgstr "\"%s\" ���󥳡��ǥ��󥰤��� \"%s\" ���󥳡��ǥ��󥰤��Ѵ�����ݤ˥��顼��ȯ�����ޤ���"
 
 #: src/urlget.c:159
 #, c-format
@@ -3295,46 +3030,24 @@ 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 �ե������ʸˡ��ȤäƤߤƤ�������."
+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 ""
-"ʣ���������ɥᥤ�����ꤵ�줿���Ϸ�����ñ��Υե�����˽��Ϥ��뤳�ȤϤǤ���"
-"����."
+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 ""
-"��å��������������ˤ�ʸ̮��¸������������ޤ���, ���Ϸ����Ϥ������������"
-"���ޤ���."
+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 ���饹������"
-"���ƤߤƤ�������."
+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:202
-msgid ""
-"message catalog has plural form translations, but the output format does not "
-"support them."
-msgstr ""
-"��å��������������ˤ�ʣ����������������ޤ���, ���Ϸ����Ϥ�����������Ƥ�"
-"�ޤ���."
+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
 #, c-format
@@ -3368,8 +3081,7 @@ msgstr "������ Java ���饹̾�ǤϤ���ޤ���: %s"
 #: src/write-java.c:1210
 #, 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
 #, c-format
@@ -3383,13 +3095,10 @@ msgstr "\"%s\" �˽񤭹��⤦�Ȥ��ƥ��顼��ȯ�����ޤ���"
 
 #: src/write-po.c:875
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1326 src/write-po.c:1455
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3403,7 +3112,7 @@ msgstr ""
 "��Ƥ���Ƥ�������.\n"
 "%s\n"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1338 src/write-po.c:1467
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3427,13 +3136,11 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"��å��������������ˤ� ISO-8859-1 �ʳ���ʸ����ޤ� msgctxt ʸ���󤬤���ޤ�"
-"��\n"
+"��å��������������ˤ� ISO-8859-1 �ʳ���ʸ����ޤ� msgctxt ʸ���󤬤���ޤ���\n"
 "Qt ��å�����������������������ʸ����ǤΤ� Unicode �������, ����ʸ����\n"
 "�Ǥϼ������Ƥ��ޤ���.\n"
 
@@ -3444,8 +3151,7 @@ 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:94
@@ -3717,8 +3423,7 @@ 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"
+"--from-code �ޤ��� http://www.python.org/peps/pep-0263.html �ˤ��륳���Ȥ�\n"
 "�Ȥä����ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
 #: src/x-python.c:324
@@ -3729,8 +3434,7 @@ msgid ""
 "comment as specified in http://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
@@ -3741,8 +3445,7 @@ msgid ""
 "comment as specified in http://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
@@ -3753,8 +3456,7 @@ msgid ""
 "comment as specified in http://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
@@ -3765,8 +3467,7 @@ msgid ""
 "comment as specified in http://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
@@ -3777,8 +3478,7 @@ msgid ""
 "as specified in http://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
@@ -3803,12 +3503,8 @@ 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 ��ȤäƤ�������"
+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:413
 #, c-format
@@ -3842,11 +3538,8 @@ msgstr "Ϳ����줿���ϥե����뤫��������ǽ��ʸ�������Ф��ޤ�.\n"
 
 #: 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=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:884
 #, c-format
@@ -3855,8 +3548,7 @@ msgstr "  -o, --output=FILE           ���ꤵ�줿�ե�����˽���\n"
 
 #: src/xgettext.c:886
 #, 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:891
@@ -3868,20 +3560,16 @@ msgstr "���ϥե�������������:\n"
 #, 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"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                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"
 
@@ -3892,9 +3580,7 @@ msgstr "  -C, --c++                   --language=C++ ��û�̷�\n"
 
 #: src/xgettext.c:902
 #, 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:907
@@ -3926,8 +3612,7 @@ msgstr "  -x, --exclude-file=FILE.po  FILE.po ����ι��ܤ���Ф���ʤ�\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"
+"  -c, --add-comments          place all comment blocks preceding keyword lines\n"
 "                                in output file\n"
 msgstr ""
 "  -cTAG, --add-comments=TAG   TAG ���饭����ɹԤޤǤΥ�������ʬ��\n"
@@ -3949,14 +3634,12 @@ msgstr "  -a, --extract-all           ���Ƥ�ʸ��������\n"
 #, 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"
 
@@ -3964,40 +3647,34 @@ msgstr ""
 #, 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:942
 #, 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:945
 #, 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"
 
@@ -4033,8 +3710,7 @@ msgstr "      --boost                 Boost ������ʸ�����ǧ��\n"
 
 #: src/xgettext.c:966
 #, c-format
-msgid ""
-"      --debug                 more detailed formatstring recognition result\n"
+msgid "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 ���ܺ٤ʥե����ޥå�ʸ�����ǧ�����\n"
 
 #: src/xgettext.c:991
@@ -4049,11 +3725,8 @@ msgstr "      --copyright-holder=STRING  �����ͭ�Ԥ���Ϥ�����\n"
 
 #: src/xgettext.c:1008
 #, 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:1010
 #, c-format
@@ -4067,40 +3740,31 @@ msgstr "      --package-version=VERSION  �ѥå������С���������Ϥ�����\n"
 
 #: src/xgettext.c:1014
 #, 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:1016
 #, 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:1019
 #, 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:1840
 #, c-format
-msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
-"%s"
-msgstr ""
-"--flag ������ <keyword>:<argnum>:[pass-]<flag> ʸˡ����äƤ��ޤ���: %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:1965
 msgid "standard input"
@@ -4128,21 +3792,13 @@ 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
@@ -4195,8 +3851,7 @@ 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:3638
diff --git a/gettext-tools/po/ko.po b/gettext-tools/po/ko.po
index f577ec5ac..f9898e2a6 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2014-05-10 13:37+0900\n"
 "PO-Revision-Date: 2014-05-11 06:21+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
@@ -199,14 +199,12 @@ msgstr "\"%s\" 파일을 쓰는 동안 오류 발생"
 #: gnulib-lib/javacomp.c:2343
 #, 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
@@ -216,7 +214,7 @@ 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
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "메모리가 바닥났습니다"
@@ -227,7 +225,7 @@ msgid "creation of threads failed"
 msgstr "스레드 만들기에 실패했습니다"
 
 #: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "%s 하위 프로세스에 쓰기가 실패했습니다"
@@ -324,16 +322,14 @@ msgstr "읽으려고 \"%s\"을(를) 여는 동안 오류 발생"
 #: src/format.c:151
 #, 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-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-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:520 src/format-boost.c:628 src/format-elisp.c:359
@@ -361,12 +357,8 @@ msgstr "지시자 %u번이 |로 시작하지만 |로 끝나지 않습니다."
 
 #: 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
@@ -396,15 +388,12 @@ 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 ""
-"문자열이 지시자 중간에서 끝납니다: 짝이 맞는 '}'가 없는 '{'를 발견했습니다."
+msgid "The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr "문자열이 지시자 중간에서 끝납니다: 짝이 맞는 '}'가 없는 '{'를 발견했습니다."
 
 #: src/format-csharp.c:139
 #, 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
@@ -413,11 +402,8 @@ 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 ""
-"지시자 중간에서 문자열이 시작합니다: 짝이 맞는 '}'가 없는 '{'를 발견했습니다."
+msgid "The string starts in the middle of a directive: found '}' without matching '{'."
+msgstr "지시자 중간에서 문자열이 시작합니다: 짝이 맞는 '}'가 없는 '{'를 발견했습니다."
 
 #: src/format-csharp.c:162
 #, c-format
@@ -436,16 +422,12 @@ 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
@@ -483,45 +465,32 @@ 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
@@ -531,11 +500,8 @@ 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
@@ -544,19 +510,13 @@ 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\"."
-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
@@ -565,17 +525,12 @@ 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 "'%2$s' 안에 있는, 인자 {%1$u}에 대한 서식 지정이 '%3$s'에 없습니다"
 
 #: src/format-java.c:756
@@ -585,30 +540,20 @@ msgstr "인자 {%u}에 대한 서식 지정이 '%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 "인자 {%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
 #, 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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -638,12 +583,8 @@ msgstr "지시자 %u번에서, @와 : 변경자가 모두 들어 있습니다."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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
 #, c-format
@@ -667,9 +608,7 @@ 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'."
+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
@@ -680,12 +619,8 @@ msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "인자 '%s'에 대한 서식 지정이 '%s'에 없습니다"
 
 #: 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
@@ -695,26 +630,22 @@ 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: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-python-brace.c:137
@@ -734,8 +665,7 @@ msgstr "지시자 %u번에서, getitem 인자가 '%c' 문자로 시작할 수 �
 
 #: src/format-python-brace.c:185
 #, 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:270
@@ -745,29 +675,19 @@ 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가 아닌 이름으로 쉘 변수를 참조합니다."
 
 #: 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."
+msgid "The string refers to a shell variable whose value may be different inside shell functions."
 msgstr "문자열이 쉘 함수 안에서 다를 수도 있는 쉘 변수를 참조합니다."
 
 #: src/format-sh.c:85
@@ -776,16 +696,12 @@ 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."
+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:355 src/msgcat.c:294 src/msgcmp.c:172
@@ -859,8 +775,7 @@ msgstr "  -s, --short           짧은 호스트이름\n"
 #: src/hostname.c:222
 #, 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"
@@ -947,8 +862,7 @@ msgstr "번역 메시지를 그 속성에 따라 걸러내고, 그 속성을 조
 #: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 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:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
@@ -969,10 +883,8 @@ msgstr "  <입력파일>                     입력 PO 파일\n"
 #: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
 #: src/xgettext.c:875
 #, 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/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
@@ -1013,19 +925,13 @@ 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
@@ -1060,8 +966,7 @@ msgstr "      --set-fuzzy             모든 메시지를 'fuzzy'로 만듭니�
 #: 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:471
 #, c-format
@@ -1071,8 +976,7 @@ msgstr "      --set-obsolete          모든 메시지를 없는 메시지로 �
 #: 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:475
 #, c-format
@@ -1085,45 +989,33 @@ 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                 '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=<파일>.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"
-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: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: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
@@ -1136,20 +1028,14 @@ 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:393 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: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
 #, 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
@@ -1166,40 +1052,32 @@ msgstr "출력 상세:\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"
+"                              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: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
 #, 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: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
 #, 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: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
 #, 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: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
@@ -1218,24 +1096,19 @@ msgstr "  -i, --indent                들여쓰기된 스타일로 .po 파일을
 #: src/xgettext.c:985
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr ""
-"      --no-location           '#: 파일_이름:줄번호' 줄을 쓰지 않습니다\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
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
 #: src/xgettext.c:989
 #, 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: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
@@ -1248,10 +1121,8 @@ msgstr "  -p, --properties-output     자바 .properties 파일을 씁니다\n"
 #: 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
 #, 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: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
@@ -1363,11 +1234,8 @@ msgstr ""
 #: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
 #: src/msgmerge.c:562
 #, 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:254 src/msgcomm.c:413 src/msgfmt.c:882
 #: src/msgmerge.c:564
@@ -1375,9 +1243,7 @@ msgstr ""
 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:337 src/msguniq.c:378
 #, c-format
@@ -1395,8 +1261,7 @@ msgstr ""
 
 #: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
 #, 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.
@@ -1453,12 +1318,8 @@ msgstr "동작 변경:\n"
 
 #: src/msgcmp.c:241 src/msgmerge.c:553
 #, 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:555
 #, c-format
@@ -1505,7 +1366,7 @@ msgstr "이 메시지는 사용되지만 %s에서 정의되지 않았습니다"
 msgid "warning: this message is not used"
 msgstr "경고: 이 메시지는 사용되지 않습니다"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1546,10 +1407,8 @@ msgstr ""
 
 #: src/msgcomm.c:452 src/xgettext.c:1004
 #, 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
@@ -1575,16 +1434,13 @@ msgstr "  -i, --indent                들여쓰기된 출력 형태\n"
 #: src/msgmerge.c:586
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr ""
-"      --no-location           ''#: 파일_이름:줄번호' 줄을 쓰지 않습니다\n"
+msgstr "      --no-location           ''#: 파일_이름:줄번호' 줄을 쓰지 않습니다\n"
 
 #: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
 #: src/msgmerge.c:588
 #, 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:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
 #: src/msgmerge.c:590
@@ -1704,16 +1560,13 @@ msgstr "<필터>가 'sed'일 때 유용한 <필터-옵션>들:\n"
 
 #: src/msgfilter.c:442
 #, 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:444
 #, 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"
@@ -1721,17 +1574,13 @@ msgstr ""
 
 #: src/msgfilter.c:447
 #, 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
 #, 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:471 src/msggrep.c:606
 #, c-format
@@ -1740,11 +1589,8 @@ msgstr "      --indent                들여 쓰기된 출력 스타일\n"
 
 #: src/msgfilter.c:473
 #, 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
 #, c-format
@@ -1859,21 +1705,13 @@ msgstr "동작 모드:\n"
 
 #: src/msgfmt.c:799
 #, c-format
-msgid ""
-"  -j, --java                  Java mode: generate a Java ResourceBundle "
-"class\n"
-msgstr ""
-"  -j, --java                  자바 모드: 자바 ResourceBundle 클래스를 만듭니"
-"다\n"
+msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
+msgstr "  -j, --java                  자바 모드: 자바 ResourceBundle 클래스를 만듭니다\n"
 
 #: src/msgfmt.c:801
 #, 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
 #, c-format
@@ -1882,19 +1720,13 @@ msgstr "      --csharp                C# 모드: .NET .dll 파일을 만듭니�
 
 #: src/msgfmt.c:805
 #, c-format
-msgid ""
-"      --csharp-resources      C# resources mode: generate a .NET .resources "
-"file\n"
-msgstr ""
-"      --csharp-resources      C# 리소스 모드: .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:807
 #, c-format
-msgid ""
-"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr ""
-"      --tcl                   Tcl 모드: tcl/msgcat .msg 파일을 만듭니다\n"
+msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr "      --tcl                   Tcl 모드: tcl/msgcat .msg 파일을 만듭니다\n"
 
 #: src/msgfmt.c:809
 #, c-format
@@ -1903,10 +1735,8 @@ msgstr "      --qt                    Qt 모드: Qt .qm 파일을 만듭니다\n
 
 #: src/msgfmt.c:811
 #, 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:818
 #, c-format
@@ -1931,29 +1761,23 @@ 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
 #, 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:829
 #, 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:831
 #, 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:833
 #, 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 ""
@@ -1968,9 +1792,7 @@ msgstr "C# 모드에서 출력 파일 위치:\n"
 
 #: src/msgfmt.c:845 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:847
@@ -1978,9 +1800,7 @@ msgstr "  -d <디렉터리>               로캘 의존  .dll 파일의 베이�
 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:851
 #, c-format
@@ -2029,12 +1849,9 @@ msgstr ""
 #: src/msgfmt.c:874
 #, 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"
 
 #: src/msgfmt.c:886 src/xgettext.c:905
 #, c-format
@@ -2045,12 +1862,10 @@ msgstr "입력 파일 해석:\n"
 #, 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:891
 #, c-format
@@ -2059,11 +1874,8 @@ msgstr "      --check-format          언어에 따라 포맷 문자열을 검�
 
 #: src/msgfmt.c:893
 #, 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
 #, c-format
@@ -2076,17 +1888,13 @@ msgstr ""
 
 #: src/msgfmt.c:898
 #, 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:900
 #, 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"
@@ -2099,29 +1907,22 @@ msgstr "  -f, --use-fuzzy             출력에 퍼지 항목을 사용합니다
 
 #: src/msgfmt.c:908
 #, 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
 #, 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:913
 #, 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
 #, c-format
@@ -2185,12 +1986,12 @@ msgstr "퍼지 'msgstr' 항목은 무시됨"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: 경고: 소스 파일에 퍼지 번역문이 들어 있습니다"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1306
 #, c-format
 msgid "%s does not exist"
 msgstr "%s 파일이 없습니다"
 
-#: src/msgfmt.c:1328
+#: src/msgfmt.c:1316
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s 파일이 있지만 읽을 수 없습니다"
@@ -2209,11 +2010,8 @@ 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
@@ -2300,10 +2098,8 @@ msgstr ""
 
 #: 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:623
 #, c-format
@@ -2356,8 +2152,7 @@ msgstr "  -i, --input=<입력파일>       입력 POT 파일\n"
 #: src/msginit.c:379
 #, 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"
@@ -2384,10 +2179,8 @@ msgstr "  -l, --locale=LL_CC          목표 로캘을 지정합니다\n"
 
 #: src/msginit.c:402
 #, 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:468
 msgid ""
@@ -2419,10 +2212,8 @@ msgstr "%s 하위 프로세스가 종료 코드 %d 번으로 실패했습니다"
 
 #: src/msginit.c:1118
 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"
@@ -2449,18 +2240,13 @@ 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 ""
-"입력 파일 '%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:391 src/msgl-iconv.c:375
 #, c-format
@@ -2486,8 +2272,7 @@ msgstr ""
 #: src/msgl-cat.c:449
 #, 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 ""
@@ -2503,8 +2288,7 @@ 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"
 
@@ -2579,12 +2363,8 @@ 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 ""
-"복수 표현식이 연산 예외를 발생시킬 수 있습니다. 0으로 나누는 연산을 할 수 있"
-"습니다"
+msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+msgstr "복수 표현식이 연산 예외를 발생시킬 수 있습니다. 0으로 나누는 연산을 할 수 있습니다"
 
 #: src/msgl-check.c:266
 #, c-format
@@ -2629,12 +2409,8 @@ msgid_plural "but some messages have %lu plural forms"
 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;\""
-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:611
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
@@ -2671,17 +2447,17 @@ msgstr "복수 처리는 GNU gettext 확장 기능입니다"
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr에 키보드 단축키 '%c'에 대한 표시가 없습니다"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr에 키보드 단축키 '%c' 표시가 너무 많습니다"
 
-#: src/msgl-check.c:804
+#: src/msgl-check.c:801
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "'%s' 헤더 필드가 아직도 초기의 기본값을 가지고 있습니다\n"
 
-#: src/msgl-check.c:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "헤더에 헤더 필드 '%s'이(가) 빠졌음\n"
@@ -2703,31 +2479,19 @@ 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
 #, 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
 #, 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:302 src/x-python.c:672
 #: src/xgettext.c:727
 #, 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:392 src/msgmerge.c:398
 #, c-format
@@ -2787,8 +2551,7 @@ msgid ""
 "                              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:531
 #, c-format
@@ -2808,14 +2571,12 @@ msgstr "      --backup=<컨트롤>       def.po의 백업을 만듭니다\n"
 #: src/msgmerge.c:537
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr ""
-"      --suffix=<접미어>       일반적인 백업 접미어 대신 <접미어>를 씁니다\n"
+msgstr "      --suffix=<접미어>       일반적인 백업 접미어 대신 <접미어>를 씁니다\n"
 
 #: src/msgmerge.c:539
 #, 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"
@@ -2826,26 +2587,20 @@ msgstr ""
 "선택할 수 있습니다. 다음의 값을 쓸 수 있습니다:\n"
 "  none, off       백업을 만들지 않습니다(--backup 옵션이 있어도)\n"
 "  nummbered, t    번호를 붙인 백업을 만듭니다\n"
-"  existing, nil   번호를 붙인 백업이 있으면 번호를 붙여서, 그렇지 않으면 간단"
-"히\n"
+"  existing, nil   번호를 붙인 백업이 있으면 번호를 붙여서, 그렇지 않으면 간단히\n"
 "  simple, never   간단한 백업만을 만듭니다\n"
 
 #: src/msgmerge.c:546
 #, 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:557
 #, 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:614 src/urlget.c:192
 #, c-format
@@ -2864,12 +2619,8 @@ msgstr "이 메시지는 복수형을 지정해서는 안 됩니다"
 
 #: src/msgmerge.c:2035
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2894,12 +2645,8 @@ msgstr "이진 메시지 목록을 Uniforum 스타일 .po 파일로 변환합니
 
 #: 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:442
 #, c-format
@@ -2908,19 +2655,13 @@ msgstr "      --csharp                C# 모드: 입력은 .NET .dll 파일입�
 
 #: 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: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
@@ -2935,8 +2676,7 @@ msgstr "자바 모드에서 입력 파일 위치:\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"
@@ -3008,12 +2748,8 @@ 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
@@ -3292,44 +3028,24 @@ 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 파일 문법을 시도해 보십시오."
+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 ""
-"여러 개의 번역 도메인을 출력 형식에 따라 한 개의 파일로 출력할 수 없습니다."
+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 ""
-"메시지 목록에 컨텍스트 의존 번역이 들어 있지만, 출력 형식이 컨텍스트를 지원하"
-"지 않습니다."
+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 ""
-"메시지 목록에 복수형 번역이 들어 있지만, 출력 형식이 복수형을 지원하지 않습니"
-"다. properties 파일 대신에 \"msgfmt --java\"로 자바 클래스를 만들어 보십시오."
+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:202
-msgid ""
-"message catalog has plural form translations, but the output format does not "
-"support them."
-msgstr ""
-"메시지 목록에 복수형 번역이 들어 있지만, 출력 형식이 복수형을 지원하지 않습니"
-"다."
+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
 #, c-format
@@ -3363,9 +3079,7 @@ msgstr "올바른 자바 클래스 이름이 아닙니다: %s"
 #: src/write-java.c:1210
 #, 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
 #, c-format
@@ -3379,11 +3093,10 @@ msgstr "쓰려고 \"%s\"을(를) 여는 동안 오류 발생"
 
 #: src/write-po.c:875
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1326 src/write-po.c:1455
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3396,7 +3109,7 @@ msgstr ""
 "발생할 수 있습니다. 순수한 ASCII msgctxt만을 사용하도록 하십시오.\n"
 "%s\n"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1338 src/write-po.c:1467
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3413,21 +3126,16 @@ 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:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"메시지 목록에 ISO-8859-1이 아닌 msgctxt 문자열이 들어 있습니다. Qt 메시지 목"
-"록\n"
-"형식에서는 번역된 문자열만 유니코드를 지원하고, 컨텍스트 문자열에서는 지원하"
-"지\n"
+"메시지 목록에 ISO-8859-1이 아닌 msgctxt 문자열이 들어 있습니다. Qt 메시지 목록\n"
+"형식에서는 번역된 문자열만 유니코드를 지원하고, 컨텍스트 문자열에서는 지원하지\n"
 "않습니다.\n"
 
 #: src/write-qt.c:717
@@ -3436,10 +3144,8 @@ 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:94
@@ -3676,8 +3382,7 @@ 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\"이(가) 파일이 끝나기 전에 나오지 않았습니다."
+msgstr "%s:%d: 문자열을 끝내는 \"%s\"이(가) 파일이 끝나기 전에 나오지 않았습니다."
 
 #: src/x-perl.c:1043
 #, c-format
@@ -3713,9 +3418,7 @@ msgstr "%s:%d: 8비트 문자 \"%c\"의 인터폴레이션(\"\\U\")이 잘못되
 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"
+msgstr "소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
 
 #: src/x-python.c:324
 #, c-format
@@ -3725,8 +3428,7 @@ msgid ""
 "comment as specified in http://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:341
 #, c-format
@@ -3736,8 +3438,7 @@ msgid ""
 "comment as specified in http://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:354
 #, c-format
@@ -3747,8 +3448,7 @@ msgid ""
 "comment as specified in http://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:364
 #, c-format
@@ -3758,8 +3458,7 @@ msgid ""
 "comment as specified in http://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:397
 #, c-format
@@ -3769,14 +3468,12 @@ msgid ""
 "as specified in http://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
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr ""
-"\"%s\" 인코딩은 어떤 인코딩인지 알 수 없습니다. 대신 ASCII로 진행합니다."
+msgstr "\"%s\" 인코딩은 어떤 인코딩인지 알 수 없습니다. 대신 ASCII로 진행합니다."
 
 #: src/x-rst.c:108
 #, c-format
@@ -3795,12 +3492,8 @@ 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를 사용하십시오"
+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:413
 #, c-format
@@ -3834,12 +3527,8 @@ msgstr "주어진 입력 파일에서 번역 가능한 문자열을 뽑아냅니
 
 #: 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=<이름>    출력에(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:884
 #, c-format
@@ -3848,10 +3537,8 @@ msgstr "  -o, --output=<파일>            지정된 파일에 출력합니다\n
 
 #: src/xgettext.c:886
 #, 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:891
 #, c-format
@@ -3862,20 +3549,16 @@ msgstr "입력 파일의 언어 선택:\n"
 #, 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"
+"                                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"
+"                                (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"
 
@@ -3886,11 +3569,8 @@ msgstr "  -C, --c++                   --language=C++를 짧게 쓴 것입니다\
 
 #: src/xgettext.c:902
 #, 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:907
 #, c-format
@@ -3914,8 +3594,7 @@ msgstr "  -j, --join-existing            현존하는 파일과 메시지를 합
 #: src/xgettext.c:917
 #, 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:919
@@ -3923,8 +3602,7 @@ msgstr ""
 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"
@@ -3946,15 +3624,12 @@ msgstr "  -a, --extract-all              모든 문자열을 뽑아 냅니다\n"
 #, 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"
 
@@ -3962,23 +3637,19 @@ msgstr ""
 #, 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:942
 #, 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"
@@ -3988,30 +3659,24 @@ msgstr ""
 #, 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:950
 #, 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:952
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr ""
-"                                (다음 언어만 지원: C, C++, ObjectiveC)\n"
+msgstr "                                (다음 언어만 지원: C, C++, ObjectiveC)\n"
 
 #: src/xgettext.c:954
 #, c-format
@@ -4035,8 +3700,7 @@ msgstr "      --boost                 Boost 형식 문자열을 알아냅니다\
 
 #: src/xgettext.c:966
 #, c-format
-msgid ""
-"      --debug                 more detailed formatstring recognition result\n"
+msgid "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                    더 자세한 형식문자열 인식 결과\n"
 
 #: src/xgettext.c:991
@@ -4051,11 +3715,8 @@ msgstr "      --copyright-holder=<문자열> 출력할 저작권 소유자를 �
 
 #: src/xgettext.c:1008
 #, 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:1010
 #, c-format
@@ -4069,39 +3730,30 @@ msgstr "      --package-version=<버전>   출력에서 패키지 버전을 지�
 
 #: src/xgettext.c:1014
 #, 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:1016
 #, 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:1019
 #, 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:1840
 #, 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:1965
@@ -4130,20 +3782,13 @@ 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
diff --git a/gettext-tools/po/nb.po b/gettext-tools/po/nb.po
index aa5e0b49e..c4d6db54d 100644
--- a/gettext-tools/po/nb.po
+++ b/gettext-tools/po/nb.po
@@ -6,11 +6,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\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"
-"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,25 +26,26 @@ msgid "ambiguous argument %s for %s"
 msgstr ""
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr ""
 
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:333
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "kan ikke opprette utfilen �%s�"
 
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:347
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "kan ikke opprette utfilen �%s�"
 
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:443
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "kan ikke opprette utfilen �%s�"
 
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:458
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "kan ikke opprette utfilen �%s�"
@@ -54,45 +54,44 @@ msgstr "kan ikke opprette utfilen �%s�"
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: 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
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:194
-#, fuzzy, c-format
-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:198
+#: gnulib-lib/copy-file.c:73
 #, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "feil under �pning av �%s� for skriving"
 
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
 #, fuzzy, c-format
-msgid "error reading %s"
+msgid "error reading \"%s\""
 msgstr "feil under lesing av �%s�"
 
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
+#: gnulib-lib/copy-file.c:130
 #, fuzzy, c-format
-msgid "error writing %s"
+msgid "error writing \"%s\""
 msgstr "feil under skriving av filen �%s�"
 
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
 #, fuzzy, c-format
-msgid "error after reading %s"
+msgid "error after reading \"%s\""
 msgstr "feil under lesing av �%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
+#: 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
 #, c-format
 msgid "fdopen() failed"
 msgstr ""
 
-#: gnulib-lib/csharpcomp.c:571
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr ""
@@ -102,73 +101,74 @@ msgstr ""
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:125
 msgid "Unknown system error"
 msgstr "Ukjent systemfeil"
 
-#: 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: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
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c: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:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\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:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: flagget �%c%s� tillater ikke argumenter\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c: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:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\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:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%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:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
+#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ulovlig flagg -- %c\n"
+
+#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr "%s: ugyldig flagg -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
+#: gnulib-lib/getopt.c: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: flagg krever et argument -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c: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:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\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/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: flagget �%s� krever et argument\n"
-
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -180,20 +180,20 @@ msgstr ""
 msgid "invalid target_version argument to compile_java_class"
 msgstr ""
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c: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:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c: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: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
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "feil under skriving av filen �%s�"
 
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2341
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -203,148 +203,102 @@ 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:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
-#: 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: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
 #, c-format
 msgid "memory exhausted"
 msgstr "minnet oppbrukt"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
+#: 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�"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr ""
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-acl.c:46
+#: gnulib-lib/w32spawn.h:47
 #, c-format
-msgid "setting permissions for %s"
+msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr ""
 
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "kan ikke opprette utfilen �%s�"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/w32spawn.h:84
-#, fuzzy, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "kan ikke opprette utfilen �%s�"
-
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, 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
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "feil under �pning av �%s� for lesing"
-
-#: src/format.c:151
+#: src/format.c:143
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
 msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
-#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#: 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
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
-#: 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-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
+#: 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
 #, 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: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-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: 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
 #, fuzzy, c-format
-msgid "format specifications in '%s' 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"
 
 #: src/format-boost.c:449
@@ -352,28 +306,26 @@ 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:36
+#: src/format-c.c:181
 #, 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
+#: src/format-c.c:588
 #, 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
+#: src/format-c.c:814
 #, 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: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:901 src/format-csharp.c:206 src/format-python.c:501
 #, fuzzy, c-format
-msgid "number of format specifications in '%s' and '%s' does not match"
+msgid "number of format specifications in 'msgid' 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
@@ -413,58 +365,48 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:255
+#: src/format-gcc-internal.c:253
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:292
+#: src/format-gcc-internal.c:290
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:334
+#: src/format-gcc-internal.c:332
 #, 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
+#: src/format-gcc-internal.c:396
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:406
+#: src/format-gcc-internal.c:404
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:463
+#: src/format-gcc-internal.c:459
 #, 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
+#: src/format-gcc-internal.c:671
 #, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
+msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gfc-internal.c:386
+#: src/format-gcc-internal.c:674
 #, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
+msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -556,18 +498,19 @@ msgstr ""
 #: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in "
+"'msgid'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
-#: src/format-java.c:756
+#: src/format-java.c:755
 #, 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:776
+#: src/format-java.c:775
 #, fuzzy, c-format
 msgid ""
-"format specifications in '%s' and '%s' for argument {%u} are not the same"
+"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -581,11 +524,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most "
-"%u parameter."
+"In the directive number %u, too many parameters are given; expected at most %"
+"u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most "
-"%u parameters."
+"In the directive number %u, too many parameters are given; expected at most %"
+"u parameters."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -633,12 +576,12 @@ msgstr ""
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' are not equivalent"
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "antallet format-spesifiseringer i �msgid� og �msgstr� stemmer ikke"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in '%s'"
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #: src/format-perl.c:433
@@ -648,79 +591,54 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: 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.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.c:115
+#: src/format-python.c:112
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:354
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:430
+#: src/format-python.c:419
 #, fuzzy, c-format
 msgid ""
-"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
+"tuple"
 msgstr "antallet format-spesifiseringer i �msgid� og �msgstr� stemmer ikke"
 
-#: src/format-python.c:437
+#: src/format-python.c:426
 #, fuzzy, c-format
 msgid ""
-"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
+"mapping"
 msgstr "antallet format-spesifiseringer i �msgid� og �msgstr� stemmer ikke"
 
-#: src/format-python.c:460 src/format-sh.c:297
+#: src/format-python.c:449 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
+"a format specification for argument '%s', as in '%s', doesn't exist in "
+"'msgid'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
-#: src/format-python.c:494
+#: src/format-python.c:479
 #, fuzzy, c-format
 msgid ""
-"format specifications in '%s' and '%s' for argument '%s' are not the same"
+"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr ""
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr ""
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr ""
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-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' 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
@@ -757,11 +675,11 @@ msgid ""
 "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
+#: 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"
@@ -770,38 +688,38 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 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
+#: 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: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: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
 msgid "Bruno Haible"
 msgstr ""
 
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "for mange argumenter"
 
-#: 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
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: 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:362 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
@@ -834,29 +752,29 @@ msgstr ""
 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: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
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: 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
+#: 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"
 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
+#: 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"
 msgstr ""
@@ -865,11 +783,11 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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
+#: 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"
@@ -879,322 +797,294 @@ msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: 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
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "trenger n�yaktig to innfiler"
 
-#: 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: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
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s utelukker hverandre"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:400
 #, 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: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/msguniq.c:342
+#: 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
 #, c-format
 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: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
 msgid "Input file location:\n"
 msgstr "ingen innfil angitt"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 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: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
 #, 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:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: 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
 #, 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: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
 #, 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: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
 #, 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/msgunfmt.c:493 src/msguniq.c:358
+#: 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
 #, 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:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:447
 #, 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
+#: src/msgattrib.c:449
 #, 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
+#: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:484
+#: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:486
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:457
 #, c-format
 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/msguniq.c:369
+#: 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
 #, 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: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
 #, 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:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: 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
 #, c-format
 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: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
 #, 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
-#, 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: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
-#, 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: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
 #, c-format
 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: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
 #, c-format
 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: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
 #, 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:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, 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:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, 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:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, c-format
 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:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, c-format
 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: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
 #, 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: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
 #, c-format
 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: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
 #, 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: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
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1213,31 +1103,31 @@ msgstr ""
 "  -V, --version            skriv ut programversjon og avslutt\n"
 "  -w, --width=ANTALL       sett sidebredden i utdata\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:601 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: 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
 #, 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: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
 #, 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:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "umulig utvalgskriterie angitt (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:372
+#: src/msgcat.c:359
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1246,9 +1136,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, 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"
+"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"
@@ -1267,97 +1157,105 @@ msgstr ""
 "PO-filen som definerer dem.  Filposisjonene fra alle PO-filene vil\n"
 "bli bevart.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, 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:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, 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:398
 #, 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:401 src/msgcomm.c:392
 #, 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:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
+#: src/msgmerge.c:530
 #, c-format
 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:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
+#: src/msgmerge.c:532
 #, 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:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:417 src/msguniq.c:367
 #, 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:420
 #, c-format
 msgid ""
-"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+"      --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"
 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:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "ingen innfiler angitt"
 
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "trenger n�yaktig to innfiler"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:218
+#: src/msgcmp.c:207
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1380,86 +1278,81 @@ msgstr ""
 "alle meldingene i programmet ditt.  N�r en eksakt overensstemmelse ikke\n"
 "finnes, blir �fuzzy�-sammenligning brukt for � f� en bedre diagnostikk.\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:243 src/msgmerge.c:555
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgcmp.c:245
+#: src/msgcmp.c:232
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:247
+#: src/msgcmp.c:234
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:324
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "advarsel: denne meldingen er ikke brukt"
 
-#: src/msgcmp.c:330
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "denne meldingen er brukt, men ikke definert..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "... men denne definisjonen ligner"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, 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:546
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "advarsel: denne meldingen er ikke brukt"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "fant %d fatale feil"
 msgstr[1] "fant %d fatale feil"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr "minst to filer m� angis"
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:351
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1467,7 +1360,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 extracted comments will be preserved, but only from the first\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 ""
@@ -1488,74 +1381,74 @@ msgstr ""
 "PO-filen som definerer dem.  Filposisjonene fra alle PO-filene vil\n"
 "bli bevart.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:389
 #, 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:433 src/xgettext.c:899
 #, 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:311
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:335
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:339
+#: src/msgconv.c:322
 #, 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:584
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, 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:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
+#: src/msgmerge.c:546
 #, 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:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
+#: src/msgmerge.c:548
 #, c-format
 msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\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:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
+#: src/msgmerge.c:550
 #, 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:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "ingen innfil angitt"
 
-#: src/msgen.c:263
+#: src/msgen.c:233
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "trenger n�yaktig to innfiler"
 
-#: src/msgen.c:304
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:309
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1564,22 +1457,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:321
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:196
+#: src/msgexec.c:194
 #, fuzzy, c-format
 msgid "missing command name"
 msgstr "mangler argumenter"
 
-#: src/msgexec.c:257
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:262
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1589,62 +1482,67 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:271
+#: src/msgexec.c:254
 #, 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:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:345
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:355 src/msgfilter.c:664
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:296
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "mangler argumenter"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:320
 #, fuzzy, c-format
 msgid "at least one sed script must be specified"
 msgstr "minst to filer m� angis"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:423
 #, 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:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:430
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:444
+#: src/msgfilter.c:432
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1652,226 +1550,210 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:447
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:447 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:471 src/msggrep.c:606
+#: src/msgfilter.c:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:455
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfmt.c:345
+#: src/msgfilter.c:587
 #, c-format
-msgid "the argument to %s should be a single punctuation character"
+msgid "Not yet implemented."
 msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfilter.c:616
 #, c-format
-msgid "invalid endianness: %s"
+msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
-msgid "Ulrich Drepper"
+#: src/msgfilter.c:644
+#, c-format
+msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: src/msgfmt.c:439
+#: src/msgfilter.c:695
 #, c-format
-msgid "no input file should be given if %s and %s are specified"
+msgid "read from %s subprocess failed"
 msgstr ""
 
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
-#: src/msgunfmt.c:353
+#: src/msgfilter.c:711
 #, c-format
-msgid "%s requires a \"-d directory\" specification"
+msgid "%s subprocess terminated with exit code %d"
 msgstr ""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:302
 #, c-format
-msgid "%s requires a \"-l locale\" specification"
+msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:538
+#: src/msgfmt.c:349
 #, c-format
-msgid "%s requires a \"--template template\" specification"
+msgid "invalid endianness: %s"
 msgstr ""
 
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
+#. 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"
 msgstr ""
 
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s og %s utelukker hverandre"
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
+#, c-format
+msgid "%s requires a \"-d directory\" specification"
+msgstr ""
 
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
-msgid "%s is only valid with %s or %s"
+msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
-msgid "%s is only valid with %s, %s or %s"
+msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#. TRANSLATORS: The prefix before a statistics message.  The argument
-#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:740
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
-msgid "%s: "
+msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d oversatt melding"
 msgstr[1] "%d oversatte meldinger"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d antatt oversettelse"
 msgstr[1] ", %d antatte oversettelser"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d uoversatt melding"
 msgstr[1] ", %d uoversatte meldinger"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: 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:790
+#: src/msgfmt.c:645
 #, 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:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:654
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:803
+#: src/msgfmt.c:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:660
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:809
+#: src/msgfmt.c:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:676
 #, 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:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, 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:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:829
-#, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:682
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1880,78 +1762,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:690
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "ingen innfil angitt"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:847
+#: src/msgfmt.c:698
 #, 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:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:708
 #, 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
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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
-#, 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:886 src/xgettext.c:905
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:722
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1959,33 +1811,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:727
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:729
 #, 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:732
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1993,135 +1845,115 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:742
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:910
-#, 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:913
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:922
+#: src/msgfmt.c:753
 #, 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:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:869
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: advarsel: PO-filheader mangler, fuzzy, eller ugyldig\n"
 "%*s  advarsel: tegnsettkonvertering vil ikke virke"
 
-#: src/msgfmt.c:1040
+#: 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"
 
-#: src/msgfmt.c:1050
+#: 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:1052
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domenenavnet �%s� passer ikke som filnavn"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:913
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domenenavnet �%s� passer ikke som filnavn: bruker prefiks"
 
-#: src/msgfmt.c:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:927
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "n�kkelord �domain %s� ignorert"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:987
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "tom �msgstr�-linje ignorert"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:988
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "antatt �msgstr�-linje ignorert"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1037
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: advarselL: kildefil har antatte oversettelser"
 
-#: src/msgfmt.c:1318
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
-#, 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: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
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under lesing av �%s�"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:484
 #, 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:521
+#: src/msggrep.c:504
 #, 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
+#: src/msggrep.c:530
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2161,30 +1993,30 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msggrep.c:623
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:625
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:297
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:321
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2192,24 +2024,24 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:347
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:355
 #, 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:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:379
+#: src/msginit.c:367
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2217,54 +2049,54 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:385
+#: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:387
+#: src/msginit.c:375
 #, 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:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:402
+#: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 
-#: src/msginit.c:468
+#: src/msginit.c:450
 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:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:489
+#: src/msginit.c:471
 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: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
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1118
+#: src/msginit.c:1060
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2276,54 +2108,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:1534
+#: src/msginit.c:1465
 #, 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:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, 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:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:202
 #, 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:207
+#: src/msgl-cat.c:206
 #, 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:391 src/msgl-iconv.c:375
+#: src/msgl-cat.c:388 src/msgl-iconv.c:360
 #, 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: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
 msgid "warning: "
 msgstr "%s: advarsel: "
 
-#: src/msgl-cat.c:443
+#: src/msgl-cat.c:440
 #, 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:446
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2332,7 +2164,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:488
+#: src/msgl-cat.c:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2341,7 +2173,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:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2350,12 +2182,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:100
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:105
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2363,7 +2195,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:114
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2372,7 +2204,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:128
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2380,151 +2212,158 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:130
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:141
+#: src/msgl-check.c:103
 #, 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:147
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:152
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:197
+#: src/msgl-check.c:157
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:266
+#: src/msgl-check.c:189
 #, 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:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:338
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "ulovlig kontrollsekvens"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:360
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "ulovlig kontrollsekvens"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "ulovlig kontrollsekvens"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:392
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "denne meldingen er brukt, men ikke definert i %s"
 msgstr[1] "denne meldingen er brukt, men ikke definert i %s"
 
-#: src/msgl-check.c:490
+#: src/msgl-check.c:408
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "denne meldingen er brukt, men ikke definert i %s"
 msgstr[1] "denne meldingen er brukt, men ikke definert i %s"
 
-#: src/msgl-check.c:514
+#: src/msgl-check.c:432
 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
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: 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:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:534
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "�msgid�- og �msgstr[%u]�-innslagene begynner ikke med `\\n'"
 
-#: src/msgl-check.c:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\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:652
+#: src/msgl-check.c:567
 #, 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[%u]�-innslagene slutter ikke med `\\n'"
 
-#: src/msgl-check.c:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:575
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "�msgid�- og �msgstr[%u]�-innslagene slutter ikke med `\\n'"
 
-#: src/msgl-check.c:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\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:687
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:804
+#: 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:703
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "filhodefelt �%s� skulle ha startet ved begynnelsen av linjen"
+
+#: src/msgl-check.c:717
+#, fuzzy
+msgid "some header fields still have the initial default value\n"
 msgstr "noen filhodefelt har fremdeles sin initielle verdi"
 
-#: src/msgl-check.c:820
+#: src/msgl-check.c:730
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "filhodefelt �%s� mangler i filhode"
+msgid "field `%s' still has initial default value\n"
+msgstr "feltet �%s� har fremdeles sin forvalgte verdi"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "feil under �pning av �%s� for lesing"
 
-#: src/msgl-iconv.c:290
+#: src/msgl-iconv.c:268
 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: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
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2533,15 +2372,15 @@ msgstr ""
 "Tegnsettet \"%s\" er ikke st�ttet. %s er avhengig av iconv(),\n"
 "og iconv() st�tter ikke \"%s\".\n"
 
-#: src/msgl-iconv.c:335
+#: src/msgl-iconv.c:320
 #, c-format
 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:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2550,16 +2389,16 @@ msgstr ""
 "Tegnsettet \"%s\" er ikke st�ttet. %s er avhengig av iconv().\n"
 "Denne versjonen ble blygget uten iconv().\n"
 
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:361 src/msgmerge.c:367
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:453
+#: src/msgmerge.c:421
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:458
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2584,51 +2423,51 @@ msgstr ""
 "resultater.  Resultatet blir skrevet til standard ut, med mindre en utfil\n"
 "er spesifisert.\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:475
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:509
+#: src/msgmerge.c:477
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:513
+#: src/msgmerge.c:481
 #, 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:487
 #, 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:499
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:501
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:535
+#: src/msgmerge.c:503
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:537
+#: src/msgmerge.c:505
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:539
+#: src/msgmerge.c:507
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2640,36 +2479,41 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:514
 #, 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:557
+#: src/msgmerge.c:523
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgmerge.c:525
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:574
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1340
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "denne meldingen er brukt, men ikke definert i %s"
 
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1363
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "denne meldingen er brukt, men ikke definert i %s"
 
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:1701
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2678,63 +2522,61 @@ msgstr ""
 "%sLeste %ld gamle + %ld referanser, flettet %ld, antok %ld, mangler %ld, "
 "foreldete %ld.\n"
 
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
-#, c-format
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr " ferdig.\n"
 
-#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s og %s utelukker hverandre"
 
-#: src/msgunfmt.c:427
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:428
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgunfmt.c:442
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:432
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgunfmt.c:446
+#: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:451
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:462
+#: src/msgunfmt.c:450
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2742,41 +2584,41 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:467
+#: src/msgunfmt.c:455
 #, fuzzy, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "ingen innfil angitt"
 
-#: src/msgunfmt.c:475
+#: src/msgunfmt.c:463
 #, 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:479
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:485
+#: src/msgunfmt.c:473
 #, 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
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:513
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:331
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2789,19 +2631,19 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:364
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:366
+#: src/msguniq.c:353
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<stdin>"
@@ -2815,7 +2657,7 @@ msgstr ""
 "Tegnsettet \"%s\" er ikke et portabelt innkodingsnavn.\n"
 "Meldingskonvertering til brukerens tegnsett kan ikke virke.\n"
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -2824,7 +2666,7 @@ msgstr ""
 "Tegnsettet \"%s\" er ikke st�ttet. %s er avhengig av iconv(),\n"
 "og iconv() st�tter ikke \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -2832,15 +2674,15 @@ msgstr ""
 "Installasjon av GNU libiconv og deretter reinstallasjon av GNU gettext\n"
 "vil rette dette problemet.\n"
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "Fortsetter likevel, forvent parsefeil."
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "Fortsetter likevel."
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -2849,7 +2691,7 @@ msgstr ""
 "Tegnsettet \"%s\" er ikke st�ttet. %s er avhengig av iconv().\n"
 "Denne versjonen ble blygget uten iconv().\n"
 
-#: src/po-charset.c:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2862,90 +2704,90 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "inkonsistent bruk av #~"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:240
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "mangler �msgstr[]�-seksjon"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:249
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "mangler �msgid_plural�-seksjon"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "mangler �msgstr�-seksjon"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "f�rste flertallsform har en ikke-null indeks"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "flertallsform har feil indeks"
 
-#: src/po-lex.c:90 src/po-lex.c:109
+#: src/po-lex.c:91 src/po-lex.c:110
 #, c-format
 msgid "too many errors, aborting"
 msgstr "for mange feil, avbryter"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ulovlig multibytesekvens"
 
-#: src/po-lex.c:465
+#: src/po-lex.c:466
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "ulovlig multibytesekvens"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:476
 #, fuzzy, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "ulovlig multibytesekvens"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:744
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "n�kkelord �%s� ukjent"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr "ulovlig kontrollsekvens"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr "slutt-p�-fil inne i streng"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr "slutt-p�-linje inne i streng"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne filen kan ikke inneholde domene-direktiver"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr "duplisert definisjon av melding"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:374
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "... dette er lokasjonen til den f�rste definisjonen"
@@ -3025,63 +2867,38 @@ msgid ""
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "feil under �pning av �%s� for lesing"
 
-#: src/urlget.c:159
+#: src/urlget.c:146
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "for mange argumenter"
 
-#: src/urlget.c:176
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:181
+#: src/urlget.c:168
 #, 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
-#, fuzzy, c-format
-msgid "error reading \"%s\""
-msgstr "feil under lesing av �%s�"
-
-#: src/urlget.c:234
+#: src/urlget.c:219
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "feil under skriving av filen �%s�"
 
-#: src/urlget.c:238
-#, fuzzy, c-format
-msgid "error after reading \"%s\""
-msgstr "feil under lesing av �%s�"
-
-#: src/urlget.c:264
-#, c-format
-msgid "Retrieving %s..."
-msgstr ""
-
-#: src/urlget.c:308
-#, c-format
-msgid " timed out.\n"
-msgstr ""
-
-#: src/urlget.c:445
-#, c-format
-msgid " failed.\n"
-msgstr ""
-
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3113,41 +2930,41 @@ msgid ""
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:231 src/write-catalog.c:275
+#: src/write-catalog.c:229 src/write-catalog.c:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan ikke opprette utfilen �%s�"
 
-#: src/write-catalog.c:239 src/write-catalog.c:283
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr "standard ut"
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr ""
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:753
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:1091
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1210
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1213
+#: src/write-java.c:1063
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3157,14 +2974,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "feil under �pning av �%s� for skriving"
 
-#: src/write-po.c:875
-#, fuzzy, c-format
+#: src/write-po.c:766
+#, 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�"
 
-#: src/write-po.c:1326 src/write-po.c:1450
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3173,7 +2990,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3190,8 +3007,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-"
+"1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3208,13 +3025,13 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "feil under skriving av filen �%s�"
 
-#: src/write-resources.c:131
+#: src/write-resources.c:130
 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:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3232,111 +3049,99 @@ msgid ""
 "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:342 src/x-python.c:1059
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-c.c:1051
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
-
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
 
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
-msgid "Please specify the source encoding through --from-code."
+#: 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"
 msgstr ""
 
-#: src/x-csharp.c:269
+#: src/x-csharp.c:268
 #, 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
+#: src/x-csharp.c:284
 #, 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
+#: src/x-csharp.c:296
 #, 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
+#: src/x-csharp.c:305
 #, 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:374
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:338
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: 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:1512 src/x-java.c:875
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-csharp.c:2020 src/x-java.c:1369
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, 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:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:606
+#: src/x-glade.c:645
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3345,107 +3150,55 @@ msgstr ""
 "Tegnsettet \"%s\" er ikke st�ttet. %s er avhengig av iconv().\n"
 "Denne versjonen ble blygget uten iconv().\n"
 
-#: src/x-java.c:494
+#: src/x-java.c:492
 #, fuzzy, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-javascript.c:230
-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:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: advarsel: uavsluttet strengliteral"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: advarsel: uavsluttet strengliteral"
-
-#: src/x-perl.c:308
+#: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1043
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1163
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1183
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1217
+#: 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:1230
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1247
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:278
+#: src/x-python.c:233
+#, 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:324
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3453,7 +3206,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:341
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3461,7 +3214,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3469,7 +3222,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:364
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3477,7 +3230,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:397
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3485,88 +3238,78 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:722
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:108
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:172
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:207
+#: src/x-rst.c:208
 #, fuzzy, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-sh.c:1074
+#: 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/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: advarsel: uavsluttet strengliteral"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:567
 #, 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:653
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext kan ikke arbeide uten � finne n�kkelord"
 
-#: src/xgettext.c:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try 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:859
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:882
+#: src/xgettext.c:789
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:884
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:891
+#: src/xgettext.c:798
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "ingen innfil angitt"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:800
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3575,85 +3318,77 @@ msgid ""
 "                                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"
+"                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:900
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:902
+#: src/xgettext.c:808
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:919
+#: src/xgettext.c:825
 #, 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"
+"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
+"                              preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:925
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:927
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:929
+#: src/xgettext.c:833 src/xgettext.c:840
 #, 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"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:937
+#: src/xgettext.c:837
 #, 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"
+"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
+"                              WORD means not to use default keywords)\n"
 msgstr ""
 
-#: src/xgettext.c:942
+#: src/xgettext.c:844
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3661,146 +3396,128 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:945
+#: src/xgettext.c:847
 #, 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"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:950
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:952
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:954
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:958
+#: src/xgettext.c:859
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:962
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:991
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:903
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:905
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:907
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:909
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:911
 #, c-format
 msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
-"msgstr\n"
-"                                values\n"
+"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
+"entries\n"
 msgstr ""
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:913
 #, c-format
 msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
-"msgstr\n"
-"                                values\n"
+"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
+"entries\n"
 msgstr ""
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1686
 #, 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:1965
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr "standard inn"
 
-#: src/xgettext.c:2071
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2075
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr ""
-
-#: src/xgettext.c:2080
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: 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:2189
+#: src/xgettext.c:1968
 #, 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:2190
+#: src/xgettext.c:1969
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: "
-"%s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: %"
+"s\n"
 msgstr ""
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3809,61 +3526,50 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: 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"
 msgstr ""
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\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:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3035
+#, c-format
+msgid "language `%s' unknown"
 msgstr "spr�ket �%s� er ukjent"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr ""
 
-#~ 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"
-
 # Hva skal MERCHANTABILITY og FITNESS FOR PARTICULAR PURPOSE oversettes med?
 # Er denne oversettelsen grei nok?
 #~ msgid ""
@@ -4157,8 +3863,7 @@ msgstr ""
 #~ "milj�variabelen TEXTDOMAIN.  Dersom meldingskatalogen ikke finnes i den\n"
 #~ "vanlige katalogen, kan en annen katalog spesifiseres ved hjelp av\n"
 #~ "milj�variabelen TEXTDOMAIN.\n"
-#~ "N�r flagget -s blir brukt, oppf�rer programmet seg som kommandoen "
-#~ "�echo�.\n"
+#~ "N�r flagget -s blir brukt, oppf�rer programmet seg som kommandoen �echo�.\n"
 #~ "Programmet kopierer imidlertid ikke sine argumenter til standard ut.  I\n"
 #~ "stedet blir funne meldinger i den valgte katalogen oversatt.\n"
 #~ "Standard s�kekatalog er: %s\n"
diff --git a/gettext-tools/po/nl.po b/gettext-tools/po/nl.po
index c5bae95fa..713b972b1 100644
--- a/gettext-tools/po/nl.po
+++ b/gettext-tools/po/nl.po
@@ -10,8 +10,8 @@ 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-06-01 11:19+0900\n"
-"PO-Revision-Date: 2014-05-11 13:12+0200\n"
+"POT-Creation-Date: 2014-05-10 13:37+0900\n"
+"PO-Revision-Date: 2014-06-06 11:36+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
@@ -216,7 +216,7 @@ msgstr "In-/uitvoerfout in subproces %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
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "onvoldoende geheugen beschikbaar"
@@ -227,7 +227,7 @@ msgid "creation of threads failed"
 msgstr "aanmaken van threads is mislukt"
 
 #: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "schrijven naar subproces %s is mislukt"
@@ -330,8 +330,7 @@ msgstr "'%s' is geen geldige opmaakreeks voor %s, anders dan '%s'.  Reden: %s"
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+msgid "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "opmaakcode voor argument %u, als in '%s', komt niet voor in '%s'"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
@@ -359,25 +358,18 @@ msgstr "Directief nummer %u begint met | maar eindigt niet op |."
 
 #: 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: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: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:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
 #: src/format-javascript.c:215 src/format-python.c:515
@@ -397,32 +389,22 @@ 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:130 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 "
-"'}'."
+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:139
 #, 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:140
 #, 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:161 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 "
-"'{'."
+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:162
 #, c-format
@@ -437,27 +419,17 @@ 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
@@ -467,8 +439,7 @@ 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
@@ -495,67 +466,43 @@ 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: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:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
@@ -564,19 +511,13 @@ msgstr "In directief nummer %u wordt \"%s\" niet gevolgd door een komma."
 
 #: 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: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:572
 #, c-format
@@ -585,17 +526,12 @@ msgstr "In directief nummer %u bevat een keuze geen getal."
 
 #: 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: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 "opmaakcode voor argument {%u}, als in '%s', komt niet voor in '%s'"
 
 #: src/format-java.c:756
@@ -605,34 +541,21 @@ msgstr "opmaakcode voor argument {%u} komt niet voor in '%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 "opmaakcodes in '%s' en '%s' voor argument {%u} zijn niet hetzelfde"
 
 #: 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 ""
-"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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -662,12 +585,8 @@ msgstr "In directief nummer %u zijn zowel de @- en de :-aanpastekens gegeven."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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:3326 src/format-scheme.c:3263
 #, c-format
@@ -676,8 +595,7 @@ msgstr "In directief nummer %u is '~;' gebruikt op een onjuiste positie."
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 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:3474 src/format-scheme.c:3397
 #, c-format
@@ -691,12 +609,8 @@ msgstr "de opmaakcodes in '%s' zijn geen subset van die in '%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 ""
-"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-perl-brace.c:199 src/format-python.c:471
 #: src/format-python-brace.c:434 src/format-python-brace.c:447
@@ -706,44 +620,32 @@ msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "opmaakcode voor argument '%s' komt niet voor in '%s'"
 
 #: 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."
+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: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: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: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: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: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-python-brace.c:137
@@ -763,10 +665,8 @@ msgstr "In directief nummer %u kan '%c' geen 'getitem'-argument beginnen."
 
 #: src/format-python-brace.c:185
 #, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-"In directiefnummer %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:270
 #, c-format
@@ -775,47 +675,34 @@ msgstr "In directief nummer %u is er een onafgemaakte opmaakcode."
 
 #: 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:79
 msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr ""
+msgstr "De tekenreeks verwijst naar een shell-variabele met een niet-ASCII-naam."
 
 #: 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 "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: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 "De tekenreeks verwijst naar een shell-variabele waarvan de waarde binnen shell-functies kan wijzigen."
 
 #: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
-msgstr ""
+msgstr "De tekenreeks verwijst naar een shell-variabele met een lege naam."
 
 #: 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: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."
 
 #: 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
@@ -889,8 +776,7 @@ msgstr "  -s, --short                 korte hostnaam\n"
 #: src/hostname.c:222
 #, 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"
 
@@ -971,16 +857,16 @@ msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
+"Filtert de berichten van een vertalingenbestand aan de hand van hun\n"
+"eigenschappen, en manipuleert die eigenschappen.\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:372 src/msgmerge.c:502 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: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
@@ -1000,15 +886,14 @@ msgstr "  INVOERBESTAND               in te lezen PO-bestand\n"
 #: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
 #: src/xgettext.c:875
 #, c-format
-msgid ""
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
-msgstr ""
+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:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
 #: 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 ""
+msgstr "Zonder invoerbestand, of als deze '-' is, wordt standaardinvoer gelezen.\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
@@ -1023,7 +908,7 @@ msgstr "Locatie van uitvoerbestand:\n"
 #: src/msggrep.c:540 src/msgmerge.c:525 src/msgunfmt.c:491 src/msguniq.c:356
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
-msgstr ""
+msgstr "  -o, --output-file=BESTAND   de uitvoer naar gegeven bestand schrijven\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:527
@@ -1033,6 +918,8 @@ 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"
+"gegeven is of als deze '-' is.\n"
 
 #: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
 #, c-format
@@ -1041,60 +928,58 @@ msgstr "Berichtenselectie:\n"
 
 #: src/msgattrib.c:452
 #, c-format
-msgid ""
-"      --translated            keep translated, remove untranslated messages\n"
-msgstr ""
+msgid "      --translated            keep translated, remove untranslated messages\n"
+msgstr "      --translated            vertaalde berichten behouden, onvertaalde weglaten\n"
 
 #: src/msgattrib.c:454
 #, c-format
-msgid ""
-"      --untranslated          keep untranslated, remove translated messages\n"
-msgstr ""
+msgid "      --untranslated          keep untranslated, remove translated messages\n"
+msgstr "      --untranslated          onvertaalde berichten behouden, vertaalde weglaten\n"
 
 #: src/msgattrib.c:456
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr ""
+msgstr "      --no-fuzzy              de met 'fuzzy' gemarkeerde berichten weglaten\n"
 
 #: src/msgattrib.c:458
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr ""
+msgstr "      --only-fuzzy            alleen met 'fuzzy' gemarkeerde berichten behouden\n"
 
 #: src/msgattrib.c:460
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
-msgstr ""
+msgstr "      --no-obsolete           verouderder berichten (#~) weglaten\n"
 
 #: src/msgattrib.c:462
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
-msgstr ""
+msgstr "      --only-obsolete         alleen verouderde berichten (#~) behouden\n"
 
 #: src/msgattrib.c:465
 #, c-format
 msgid "Attribute manipulation:\n"
-msgstr ""
+msgstr "Manipulatie van eigenschappen:\n"
 
 #: src/msgattrib.c:467
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr ""
+msgstr "      --set-fuzzy             alle berichten met 'fuzzy' markeren\n"
 
 #: src/msgattrib.c:469
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr ""
+msgstr "      --clear-fuzzy           bij alle berichten eventuele 'fuzzy' weghalen\n"
 
 #: src/msgattrib.c:471
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
-msgstr ""
+msgstr "      --set-obsolete          alle berichten als verouderd (#~) markeren\n"
 
 #: src/msgattrib.c:473
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr ""
+msgstr "      --clear-obsolete        bij alle berichten '#~' weghalen\n"
 
 #: src/msgattrib.c:475
 #, c-format
@@ -1102,42 +987,40 @@ 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"
+"                                bij de msgstr hoorde behouden\n"
 
 #: src/msgattrib.c:478
 #, c-format
-msgid ""
-"      --clear-previous        remove the \"previous msgid\" from all "
-"messages\n"
-msgstr ""
+msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
+msgstr "      --clear-previous        eventuele originele msgids weglaten\n"
 
 #: src/msgattrib.c:480
 #, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
+msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr "      --empty                 bij weglaten van 'fuzzy' ook de msgstr leegmaken\n"
 
 #: src/msgattrib.c:482
 #, c-format
-msgid ""
-"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
-msgstr ""
+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: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:486
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr ""
+msgstr "      --fuzzy                 hetzelfde als '--only-fuzzy --clear-fuzzy'\n"
 
 #: src/msgattrib.c:488
 #, c-format
-msgid ""
-"      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
-msgstr ""
+msgid "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
+msgstr "      --obsolete              hetzelfde als '--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
@@ -1145,21 +1028,18 @@ msgstr ""
 #: src/msguniq.c:369
 #, c-format
 msgid "Input file syntax:\n"
-msgstr ""
+msgstr "Syntax van invoerbestand:\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:393 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
 #, 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
@@ -1177,8 +1057,7 @@ msgstr "Uitvoerdetails:\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"
+"                              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
@@ -1192,16 +1071,14 @@ msgstr ""
 #: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
 #: src/xgettext.c:977
 #, 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
 #, 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
@@ -1226,15 +1103,13 @@ msgstr ""
 #: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
 #: src/xgettext.c:987
 #, 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
 #, 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
@@ -1248,8 +1123,7 @@ msgstr ""
 #: 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
 #, 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
@@ -1346,8 +1220,7 @@ msgstr ""
 #: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
 #: src/msgmerge.c:562
 #, 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
@@ -1372,8 +1245,7 @@ msgstr ""
 
 #: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
 #, 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.
@@ -1431,9 +1303,7 @@ msgstr ""
 
 #: src/msgcmp.c:241 src/msgmerge.c:553
 #, 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
@@ -1481,7 +1351,7 @@ msgstr "dit bericht wordt gebruikt maar is niet gedefinieerd in %s"
 msgid "warning: this message is not used"
 msgstr "waarschuwing: dit bericht wordt niet gebruikt"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1515,8 +1385,7 @@ msgstr ""
 
 #: src/msgcomm.c:452 src/xgettext.c:1004
 #, 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
@@ -1548,8 +1417,7 @@ msgstr ""
 #: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
 #: src/msgmerge.c:588
 #, 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
@@ -1642,7 +1510,7 @@ msgstr "Gebruik:  %s [OPTIE...] FILTER [FILTEROPTIE...]\n"
 #: src/msgfilter.c:411
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr "Een filter toepassen op alle vertalingen in een PO-bestand.\n"
+msgstr "Past een filter toe op alle vertalingen in een PO-bestand.\n"
 
 #: src/msgfilter.c:435
 #, c-format
@@ -1650,7 +1518,7 @@ 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 ""
-"Het FILTER kan elk programma zijn dat een bericht leest van standaardinvoer\n"
+"Het FILTER kan elk programma zijn dat een bericht van standaardinvoer leest\n"
 "en een gewijzigd bericht naar standaarduitvoer schrijft.\n"
 
 #: src/msgfilter.c:440
@@ -1660,28 +1528,24 @@ msgstr "Nuttige FILTEROPTIEs als het FILTER 'sed' is:\n"
 
 #: src/msgfilter.c:442
 #, 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
 #, 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
 #, 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
 #, 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
@@ -1691,19 +1555,18 @@ msgstr ""
 
 #: src/msgfilter.c:473
 #, 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
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
-msgstr ""
+msgstr "het argument van %s dient één enkel interpunctieteken te zijn"
 
 #: src/msgfmt.c:392
 #, c-format
 msgid "invalid endianness: %s"
-msgstr ""
+msgstr "ongeldige endian-waarde: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
@@ -1745,19 +1608,19 @@ msgstr "%s en %s sluiten elkaar uit in %s"
 #: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
-msgstr ""
+msgstr "%s is alleen geldig samen met %s of %s"
 
 #: src/msgfmt.c:571 src/msgfmt.c:577
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
-msgstr ""
+msgstr "%s is alleen geldig samen met %s, %s of %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
 #, c-format
 msgid "%s: "
-msgstr ""
+msgstr "%s: "
 
 #: src/msgfmt.c:744
 #, c-format
@@ -1788,7 +1651,7 @@ msgstr "Gebruik:  %s [OPTIE] bestandsnaam.po...\n"
 #: src/msgfmt.c:778
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
-msgstr "Uit een vertalingenbestand een binaire berichtencatalogus genereren.\n"
+msgstr "Genereert een binaire berichtencatalogus uit een vertalingenbestand.\n"
 
 #: src/msgfmt.c:783 src/xgettext.c:864
 #, c-format, no-wrap
@@ -1811,16 +1674,12 @@ msgstr "Werkingsmodus:\n"
 
 #: src/msgfmt.c:799
 #, 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
 #, 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
@@ -1830,15 +1689,12 @@ msgstr ""
 
 #: src/msgfmt.c:805
 #, 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
 #, 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
@@ -1848,8 +1704,7 @@ msgstr ""
 
 #: src/msgfmt.c:811
 #, 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
@@ -1860,7 +1715,7 @@ msgstr ""
 #: src/msgfmt.c:820 src/xgettext.c:888
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
-msgstr ""
+msgstr "Als het uitvoerbestand '-' is, dan wordt naar standaarduitvoer geschreven.\n"
 
 #: src/msgfmt.c:823
 #, c-format
@@ -1875,29 +1730,23 @@ 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
 #, 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
 #, 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
 #, 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
 #, 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 ""
@@ -1909,9 +1758,7 @@ msgstr "Locatie van uitvoerbestand in C#-modus:\n"
 
 #: src/msgfmt.c:845 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
@@ -1963,8 +1810,7 @@ msgstr ""
 #: src/msgfmt.c:874
 #, 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 ""
 
@@ -1977,8 +1823,7 @@ msgstr ""
 #, 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
@@ -1988,9 +1833,7 @@ msgstr ""
 
 #: src/msgfmt.c:893
 #, 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
@@ -2002,16 +1845,13 @@ msgstr ""
 
 #: src/msgfmt.c:898
 #, 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
 #, 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 ""
 
@@ -2022,23 +1862,19 @@ msgstr ""
 
 #: src/msgfmt.c:908
 #, 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
 #, 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
 #, 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
@@ -2079,9 +1915,7 @@ msgstr "domeinnaam '%s' is niet bruikbaar als bestandsnaam"
 #: src/msgfmt.c:1081
 #, 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:1095
 #, c-format
@@ -2103,12 +1937,12 @@ msgstr "fuzzy 'msgstr'-item is genegeerd"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: waarschuwing: bronbestand bevat fuzzy vertaling"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1306
 #, c-format
 msgid "%s does not exist"
 msgstr "%s bestaat niet"
 
-#: src/msgfmt.c:1328
+#: src/msgfmt.c:1316
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s bestaat maar kan deze niet lezen"
@@ -2127,9 +1961,7 @@ msgstr "fout tijdens lezen van '%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 ""
 "optie '%c' kan niet gebruikt worden voordat\n"
 "'J' of 'K' of 'T' of 'C' of 'X' gegeven is"
@@ -2183,8 +2015,7 @@ 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
@@ -2232,8 +2063,7 @@ msgstr ""
 #: src/msginit.c:379
 #, 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 ""
 
@@ -2256,8 +2086,7 @@ msgstr ""
 
 #: src/msginit.c:402
 #, 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
@@ -2286,10 +2115,8 @@ msgstr "subproces %s is mislukt met afsluitwaarde %d"
 
 #: src/msginit.c:1118
 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 ""
 
@@ -2313,18 +2140,13 @@ 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 "invoerbestand '%s' bevat geen kopregel met een tekensetspecificatie"
 
 #: 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:391 src/msgl-iconv.c:375
 #, c-format
@@ -2348,8 +2170,7 @@ msgstr ""
 #: src/msgl-cat.c:449
 #, 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 ""
@@ -2423,9 +2244,7 @@ msgid "plural expression can produce integer overflow"
 msgstr ""
 
 #: src/msgl-check.c:197
-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:266
@@ -2473,9 +2292,7 @@ msgstr[0] "maar sommige berichten hebben één meervoudsvorm"
 msgstr[1] "maar sommige berichten hebben %lu meervoudsvormen"
 
 #: src/msgl-check.c:514
-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 ""
 
 #: src/msgl-check.c:611
@@ -2513,17 +2330,17 @@ msgstr "meervoudsvormen zijn een uitbreiding van GNU gettext"
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "sneltoetsmarkering '%c' ontbreekt in 'msgstr'"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "'msgstr' bevat te veel '%c'-sneltoetsmarkeringen"
 
-#: src/msgl-check.c:804
+#: src/msgl-check.c:801
 #, 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:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "kopveld '%s' ontbreekt in PO-kopregels\n"
@@ -2545,24 +2362,18 @@ msgstr "invoerbestand bevat geen kopregel met een tekensetspecificatie"
 #: 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
 #, 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
 #, 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
 #, 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:392 src/msgmerge.c:398
@@ -2606,8 +2417,7 @@ msgstr "  bestaande.po                bestaand bestand met oude vertalingen\n"
 #: src/msgmerge.c:509
 #, 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:513
 #, c-format
@@ -2646,8 +2456,7 @@ msgstr ""
 #: src/msgmerge.c:539
 #, 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"
@@ -2658,15 +2467,13 @@ msgstr ""
 #: src/msgmerge.c:546
 #, 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
 #, 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
@@ -2686,12 +2493,8 @@ msgstr "dit bericht dient geen meervouden te definiëren"
 
 #: src/msgmerge.c:2035
 #, 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 vervanderd, %ld ontbreken, %ld verouderd.\n"
 
 #: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2716,9 +2519,7 @@ 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
@@ -2728,15 +2529,12 @@ 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
@@ -2752,8 +2550,7 @@ msgstr "Locatie van invoerbestand in Java-modus:\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 ""
 
@@ -2811,9 +2608,7 @@ 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
@@ -2970,8 +2765,7 @@ msgstr "bestand '%s' is afgekapt"
 #: src/read-mo.c:129
 #, 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:165 src/read-mo.c:274
 #, c-format
@@ -2981,9 +2775,7 @@ msgstr "bestand '%s' is geen GNU .mo-bestand"
 #: src/read-mo.c:178
 #, 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:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
@@ -3092,34 +2884,23 @@ msgid " failed.\n"
 msgstr " is mislukt.\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."
+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."
+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."
+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."
+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."
+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
@@ -3168,12 +2949,10 @@ msgstr "fout bij openen van '%s' voor schrijven"
 
 #: src/write-po.c:875
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1326 src/write-po.c:1455
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3182,7 +2961,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1338 src/write-po.c:1467
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3199,8 +2978,7 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3514,9 +3292,7 @@ msgstr "%s:%d: ongeldige tekenreeksexpressie"
 
 #: src/x-sh.c:1074
 #, c-format
-msgid ""
-"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
-"use eval_gettext instead"
+msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
 msgstr ""
 
 #: src/x-vala.c:413
@@ -3532,9 +3308,7 @@ msgstr ""
 #: src/xgettext.c:648
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
-msgstr ""
-"'--join-existing' kan niet gebruikt worden wanneer uitvoer naar "
-"standaarduitvoer wordt geschreven"
+msgstr "'--join-existing' kan niet gebruikt worden wanneer naar standaarduitvoer geschreven wordt"
 
 #: src/xgettext.c:653
 #, c-format
@@ -3544,9 +3318,7 @@ msgstr ""
 #: src/xgettext.c:808
 #, 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:859
 #, c-format
@@ -3555,9 +3327,7 @@ msgstr "Extraheert vertaalbare berichten uit de gegeven invoerbestanden.\n"
 
 #: src/xgettext.c:882
 #, 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:884
@@ -3567,8 +3337,7 @@ msgstr ""
 
 #: src/xgettext.c:886
 #, 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:891
@@ -3580,11 +3349,9 @@ msgstr ""
 #, 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"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 msgstr ""
@@ -3596,9 +3363,7 @@ msgstr ""
 
 #: src/xgettext.c:902
 #, 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:907
@@ -3628,8 +3393,7 @@ msgstr ""
 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 ""
 
@@ -3647,8 +3411,7 @@ msgstr ""
 #, 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 ""
@@ -3657,8 +3420,7 @@ msgstr ""
 #, 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 ""
@@ -3666,8 +3428,7 @@ msgstr ""
 #: src/xgettext.c:942
 #, 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 ""
 
@@ -3675,8 +3436,7 @@ msgstr ""
 #, 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 ""
@@ -3713,8 +3473,7 @@ msgstr ""
 
 #: src/xgettext.c:966
 #, c-format
-msgid ""
-"      --debug                 more detailed formatstring recognition result\n"
+msgid "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
 #: src/xgettext.c:991
@@ -3729,8 +3488,7 @@ msgstr ""
 
 #: src/xgettext.c:1008
 #, 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:1010
@@ -3745,31 +3503,26 @@ msgstr ""
 
 #: src/xgettext.c:1014
 #, 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:1016
 #, 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:1019
 #, 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:1840
 #, 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:1965
@@ -3798,16 +3551,12 @@ msgstr "%s%s: waarschuwing: "
 
 #: 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"
+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:2190
 #, c-format
-msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: "
-"%s\n"
+msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
 msgstr ""
 
 #: src/xgettext.c:2221
diff --git a/gettext-tools/po/nn.po b/gettext-tools/po/nn.po
index db5cb8131..cff104d03 100644
--- a/gettext-tools/po/nn.po
+++ b/gettext-tools/po/nn.po
@@ -8,11 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2007-11-02 03:23+0100\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"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -30,25 +29,26 @@ msgid "ambiguous argument %s for %s"
 msgstr "Fleirtydig argument %s for %s"
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Gyldige argument er:"
 
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:333
 #, 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:346
+#: gnulib-lib/clean-temp.c:347
 #, 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:442
+#: gnulib-lib/clean-temp.c:443
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "Klarer ikkje fjerna mellombelsfila «%s»"
 
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:458
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "Klarer ikkje fjerna mellombelsmappa «%s»"
@@ -57,45 +57,44 @@ msgstr "Klarer ikkje fjerna mellombelsmappa «%s»"
 msgid "write error"
 msgstr "Skrivefeil"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: 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
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:194
-#, 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:198
-#, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+#: gnulib-lib/copy-file.c:73
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "Klarer ikkje opna reservekopien «%s» for skriving"
 
-#: gnulib-lib/copy-file.c:202
-#, fuzzy, c-format
-msgid "error reading %s"
+#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#, c-format
+msgid "error reading \"%s\""
 msgstr "Feil ved lesing av «%s»"
 
-#: gnulib-lib/copy-file.c:206
-#, fuzzy, c-format
-msgid "error writing %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\""
 msgstr "Feil ved skriving til «%s»"
 
-#: gnulib-lib/copy-file.c:210
-#, fuzzy, c-format
-msgid "error after reading %s"
+#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#, c-format
+msgid "error after reading \"%s\""
 msgstr "Feil etter lesing av «%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
+#: 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
 #, c-format
 msgid "fdopen() failed"
 msgstr "«fdopen()» mislukkast"
 
-#: gnulib-lib/csharpcomp.c:571
+#: gnulib-lib/csharpcomp.c:570
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "Fann ikkje C#-kompilatoren. Prøv å installera «pnet»."
@@ -105,73 +104,74 @@ msgstr "Fann ikkje C#-kompilatoren. Prøv å installera «pnet»."
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "Fann ikkje virtuell maskin for C#. Prøv å installera «pnet»."
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:125
 msgid "Unknown system error"
 msgstr "Ukjend systemfeil"
 
-#: 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: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
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Underprosessen %s var mislukka"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: Flagget «%s» er fleirtydig\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: 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:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: Flagget «%c%s» tek ikkje argument\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c: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» treng eit argument\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: gnulib-lib/getopt.c: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:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\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:805 gnulib-lib/getopt.c:808
+#: 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
 #, 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:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
+#: gnulib-lib/getopt.c: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: Flagget treng eit argument -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c: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:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\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/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: Flagget «%s» treng eit argument\n"
-
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
@@ -183,217 +183,149 @@ msgstr "Ugyldig «source_version»-argument til «compile_java_class»"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "Ugyldig «target_version»-argument til «compile_java_class»"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c: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:503 src/write-csharp.c:724 src/write-java.c:1026
+#: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "Klarte ikkje oppretta «%s»"
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c: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: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
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "Feil under skriving av fila «%s»"
 
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2341
 #, 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:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
+#: src/msginit.c:1082
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "Inn/ut-feil i underprosessen %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: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
 #, c-format
 msgid "memory exhausted"
 msgstr "Tomt for minne"
 
-#: gnulib-lib/pipe-filter-ii.c:192
+#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, 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
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
+msgid "cannot create pipe"
+msgstr "Klarer ikkje oppretta røyr"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:228
 msgid "`"
 msgstr "'"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:229
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-msgid "setting permissions for %s"
-msgstr ""
-
-#: 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/w32spawn.h:47
 #, c-format
-msgid "cannot create pipe"
-msgstr "Klarer ikkje oppretta røyr"
+msgid "DuplicateHandle failed with error code 0x%08x"
+msgstr "Feil i «DuplicateHandle», med feilkoden 0x%08x"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:52
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "«_open_osfhandle» mislukkast"
 
-#: gnulib-lib/w32spawn.h:84
-#, fuzzy, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "kan ikkje opprette utfila \"%s\""
-
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
+#: gnulib-lib/wait-process.c:366
 #, c-format
 msgid "%s subprocess"
 msgstr "%s-underprosess"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "Underprosessen %s fekk det alvorlege signalet %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/format.c:143
 #, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "Feil ved opning av fila «%s» for lesing"
-
-#: src/format.c:151
-#, fuzzy, c-format
-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"
+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"
 
 #: 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-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 ""
-"Ein formatspesifikasjon for argumentet %u, som i «%s», finst ikkje i "
-"«msgid»"
+#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
+#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
+#, c-format
+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»"
 
-#: 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-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
+#: 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
 #, 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: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-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr ""
-"Formatspesifikasjonane i «msgid» og «%s» for argumentet %u er ikkje like"
+#: 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-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:36
+#: src/format-c.c:181
 #, 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:39
+#: src/format-c.c:588
 #, 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:42 src/format-gfc-internal.c:289
+#: src/format-c.c:814
 #, 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: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
-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-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-csharp.c:88 src/format-java.c:205
 #, c-format
@@ -406,19 +338,13 @@ 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 «}"
-"»."
+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
 #, 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
 #, c-format
@@ -426,72 +352,52 @@ 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 "
-"«{»."
+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
 #, 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:255
+#: src/format-gcc-internal.c:253
 #, 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:292
+#: src/format-gcc-internal.c:290
 #, 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:334
+#: src/format-gcc-internal.c:332
 #, 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:398
+#: src/format-gcc-internal.c:396
 #, 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:406
+#: src/format-gcc-internal.c:404
 #, 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:463
+#: src/format-gcc-internal.c:459
 #, 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:677
-#, fuzzy, c-format
-msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "«msgid» brukar %%m, men «%s» gjer det ikkje"
-
-#: src/format-gcc-internal.c:680
-#, fuzzy, c-format
-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 "'%s' uses %%C but '%s' doesn't"
+#: src/format-gcc-internal.c:671
+#, c-format
+msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr "«msgid» brukar %%m, men «%s» gjer det ikkje"
 
-#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
+#: src/format-gcc-internal.c:674
+#, c-format
+msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr "«msgid» brukar ikkje %%m, men «%s» brukar %%m"
 
 #: src/format-invalid.h:22
@@ -499,53 +405,33 @@ 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
@@ -554,12 +440,8 @@ 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
@@ -568,18 +450,13 @@ 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
@@ -588,58 +465,36 @@ 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
-#, fuzzy, c-format
-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»"
+#, 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»"
 
-#: src/format-java.c:756
+#: src/format-java.c:755
 #, 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:776
-#, fuzzy, c-format
-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-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-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 ""
-"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
 #, 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
 #, c-format
@@ -665,17 +520,12 @@ msgstr "Fann «~%c» utan passande «~%c»."
 #: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, 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
 #, 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
 #, c-format
@@ -687,103 +537,57 @@ 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
-#, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' are not equivalent"
+#, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "Formatspesifikasjonane i «msgid» og «%s» er ikkje like"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in '%s'"
+#, c-format
+msgid "format specifications in '%s' are not a subset of those in 'msgid'"
 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»."
+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: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.c:459 src/format-sh.c:307
 #, 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: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: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-python.c:354
+#: src/format-python.c:343
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:430
+#: src/format-python.c:419
 #, fuzzy, c-format
-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"
+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"
 
-#: src/format-python.c:437
-#, fuzzy, c-format
-msgid ""
-"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+#: src/format-python.c:426
+#, c-format
+msgid "format specifications in 'msgid' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
-"antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje "
-"overeins"
 
-#: src/format-python.c:460 src/format-sh.c:297
+#: src/format-python.c:449 src/format-sh.c:297
 #, fuzzy, 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 'msgid'"
 msgstr "format-spesifiseringane for argument %u er ulike"
 
-#: src/format-python.c:494
+#: src/format-python.c:479
 #, fuzzy, c-format
-msgid ""
-"format specifications in '%s' 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-spesifiseringane for argument %u er ulike"
 
-#: src/format-python-brace.c:137
-#, fuzzy, c-format
-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:150
-#, fuzzy, c-format
-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:165
-#, fuzzy, c-format
-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:185
-#, fuzzy, c-format
-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:270
-#, fuzzy, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "I direktivnummer %u er argumentet «%d» negativt."
-
 #: 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 "'msgid' 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
@@ -791,15 +595,11 @@ 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
@@ -808,23 +608,19 @@ 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."
+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
+#: 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"
@@ -837,38 +633,38 @@ msgstr ""
 "Dette er fri programvare. Du kan fritt endra og distribuera henne vidare.\n"
 "Det er INGEN GARANTI for dette produktet utover det som står i lova.\n"
 
-#: src/hostname.c:184 src/msgattrib.c: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
+#: 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: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: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
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "For mange argument"
 
-#: 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
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: 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:362 src/recode-sr-latin.c:148
+#: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Bruk: %s [VAL]\n"
@@ -891,8 +687,7 @@ msgstr ""
 #: src/hostname.c:222
 #, 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 ""
 
@@ -901,29 +696,29 @@ msgstr ""
 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: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
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: 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
+#: 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"
 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
+#: 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"
 msgstr ""
@@ -932,11 +727,11 @@ msgstr ""
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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
+#: 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"
 msgstr ""
 
@@ -945,353 +740,308 @@ msgstr ""
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: 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
 #, 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: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: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
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s utelukker kvarandre"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:400
 #, 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: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/msguniq.c:342
+#: 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
 #, 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: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
 msgid "Input file location:\n"
 msgstr "inga innfil spesifisert"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 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: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
 #, 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/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: 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
 #, 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: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
 #, 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: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
 #, 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/msgunfmt.c:493 src/msguniq.c:358
+#: 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
 #, 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:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:426
 #, c-format
-msgid ""
-"      --translated            keep translated, remove untranslated messages\n"
+msgid "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:428
 #, c-format
-msgid ""
-"      --untranslated          keep untranslated, remove translated messages\n"
+msgid "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:447
 #, 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
+#: src/msgattrib.c:449
 #, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
 msgstr ""
 
-#: src/msgattrib.c:482
+#: src/msgattrib.c:451
 #, 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
+#: src/msgattrib.c:453
 #, 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
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:457
 #, 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/msguniq.c:369
+#: 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
 #, 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: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
 #, 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: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
 #, 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: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
 #, 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: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
 #, 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"
+msgid "  -e, --no-escape             do not use C escapes in output (default)\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: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
 #, c-format
-msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
+msgid "  -E, --escape                use C escapes in output, no extended chars\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
-#, c-format
-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
-#, c-format
-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: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
 #, 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:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:878
 #, 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:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:880
 #, 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:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:882
 #, 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:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:884
 #, 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: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
 #, 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: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
 #, 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: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
 #, 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: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
 #, 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: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
 #, 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: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
 #, 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:313 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:372
+#: src/msgcat.c:359
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1300,102 +1050,108 @@ 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, 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"
+"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 ""
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
 #, 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:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
+#: src/xgettext.c:784
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:395 src/msgcomm.c:386
 #, 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:398
 #, 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:401 src/msgcomm.c:392
 #, 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:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
+#: src/msgmerge.c:530
 #, 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:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
+#: src/msgmerge.c:532
 #, 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:415 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:417 src/msguniq.c:367
 #, 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:420
 #, c-format
 msgid ""
-"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+"      --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"
 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:167 src/msgcomm.c:274 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:178 src/msgmerge.c:339
 #, fuzzy, c-format
 msgid "no input files given"
 msgstr "inga innfil spesifisert"
 
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:183 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "treng nøyaktig to innfiler"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:202 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:218
+#: src/msgcmp.c:207
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1417,86 +1173,79 @@ msgstr ""
 "oversett alle meldingar i programmet.  Der samsvar ikkje kan finnast, vert\n"
 "«fuzzy» samanlikning brukt for å få betre diagnostikk.\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:221
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:223
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:228 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:230 src/msgmerge.c:521
 #, 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
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgcmp.c:245
+#: src/msgcmp.c:232
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:247
+#: src/msgcmp.c:234
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:324
+#: src/msgcmp.c:309
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "advarsel: denne meldinga er ikkje brukt"
 
-#: src/msgcmp.c:330
+#: src/msgcmp.c:315
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:331 src/msgmerge.c:1234
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "denne meldinga er brukt, men ikkje definert..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:334 src/msgmerge.c:1237
 #, c-format
 msgid "...but this definition is similar"
 msgstr "... men denne definisjonen liknar"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:339 src/msgmerge.c:1267
 #, 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:546
+#: src/msgcmp.c:443
 #, c-format
 msgid "warning: this message is not used"
 msgstr "advarsel: denne meldinga er ikkje brukt"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:450 src/msgfmt.c:541
 #, 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:316
+#: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
 msgstr ""
 
-#: src/msgcomm.c:364
+#: src/msgcomm.c:351
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1504,79 +1253,77 @@ 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 extracted comments will be preserved, but only from the first\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 ""
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:389
 #, 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:433 src/xgettext.c:899
 #, 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
+#: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:335
+#: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
 msgstr ""
 
-#: src/msgconv.c:339
+#: src/msgconv.c:322
 #, 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:584
+#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
 #, 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:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
+#: src/msgmerge.c:546
 #, 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:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
+#: src/msgmerge.c:548
 #, c-format
-msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgid "      --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:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
+#: src/msgmerge.c:550
 #, 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:228 src/msgfmt.c:381 src/xgettext.c:580
 #, c-format
 msgid "no input file given"
 msgstr "inga innfil spesifisert"
 
-#: src/msgen.c:263
+#: src/msgen.c:233
 #, fuzzy, c-format
 msgid "exactly one input file required"
 msgstr "treng nøyaktig to innfiler"
 
-#: src/msgen.c:304
+#: src/msgen.c:274
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:309
+#: src/msgen.c:279
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1585,22 +1332,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:321
+#: src/msgen.c:291
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:196
+#: src/msgexec.c:194
 #, c-format
 msgid "missing command name"
 msgstr ""
 
-#: src/msgexec.c:257
+#: src/msgexec.c:240
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:262
+#: src/msgexec.c:245
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1610,533 +1357,444 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:271
+#: src/msgexec.c:254
 #, 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:264 src/msgfilter.c:408
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:345
+#: src/msgexec.c:328
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:355 src/msgfilter.c:664
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: src/msgfilter.c:296
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "manglar argument"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:320
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:395
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:399
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:423
 #, 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:428
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:430
 #, 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:432
 #, 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:435
 #, 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:447 src/msggrep.c:577
 #, 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:453 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:455
 #, 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:587
 #, c-format
-msgid "the argument to %s should be a single punctuation character"
+msgid "Not yet implemented."
 msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfilter.c:616
 #, c-format
-msgid "invalid endianness: %s"
+msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
-msgid "Ulrich Drepper"
+#: src/msgfilter.c:644
+#, c-format
+msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: src/msgfmt.c:439
+#: src/msgfilter.c:695
 #, c-format
-msgid "no input file should be given if %s and %s are specified"
+msgid "read from %s subprocess failed"
 msgstr ""
 
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
-#: src/msgunfmt.c:353
+#: src/msgfilter.c:711
 #, c-format
-msgid "%s requires a \"-d directory\" specification"
+msgid "%s subprocess terminated with exit code %d"
 msgstr ""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:302
 #, c-format
-msgid "%s requires a \"-l locale\" specification"
+msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:538
+#: src/msgfmt.c:349
 #, c-format
-msgid "%s requires a \"--template template\" specification"
+msgid "invalid endianness: %s"
 msgstr ""
 
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
+#. 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"
 msgstr ""
 
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s og %s utelukker kvarandre"
+#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgunfmt.c:341
+#, c-format
+msgid "%s requires a \"-d directory\" specification"
+msgstr ""
 
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
-msgid "%s is only valid with %s or %s"
+msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
-msgid "%s is only valid with %s, %s or %s"
+msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#. TRANSLATORS: The prefix before a statistics message.  The argument
-#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:740
+#: src/msgfmt.c:482 src/msgfmt.c:488
 #, c-format
-msgid "%s: "
+msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:599
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:604
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:609
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:629
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:633
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: 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:790
+#: src/msgfmt.c:645
 #, 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:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:654
 #, 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:656
 #, 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:658
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:660
 #, 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:662
 #, 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:664
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:671
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:673 src/xgettext.c:795
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:676
 #, 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:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, 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
-#, c-format
-msgid ""
-"  -l, --locale=LOCALE         locale name, either language or "
-"language_COUNTRY\n"
-msgstr ""
-
-#: src/msgfmt.c:829
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
+msgid "  -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:831
+#: src/msgfmt.c:682
 #, 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:684
 #, 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:690
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:696 src/msgunfmt.c:461
 #, 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:698
 #, 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:702
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:706 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:708
 #, 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
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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
-#, 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:886 src/xgettext.c:905
+#: src/msgfmt.c:720 src/xgettext.c:811
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:722
 #, 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:725
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:727
 #, 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:729
 #, 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:732
 #, 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:734
 #, 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:737
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:908
-#, c-format
-msgid ""
-"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr ""
-
-#: src/msgfmt.c:910
+#: src/msgfmt.c:742
 #, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
+msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:744
 #, 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:753
 #, 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:755 src/msgmerge.c:572 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:869
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:872
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:882
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:884
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:908
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domenenamnet \"%s\" passar ikkje som filnavn"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:913
 #, 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:1095
+#: src/msgfmt.c:927
 #, c-format
-msgid "'domain %s' directive ignored"
+msgid "`domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:987
 #, c-format
-msgid "empty 'msgstr' entry ignored"
+msgid "empty `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:988
 #, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+msgid "fuzzy `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1037
 #, fuzzy, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "ADVARSEL: kildefila har «fuzzy» oversetjingar"
 
-#: src/msgfmt.c:1318
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
-#, 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: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
 #, fuzzy, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:484
 #, 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
+#: src/msggrep.c:504
 #, 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
+#: src/msggrep.c:530
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2176,30 +1834,29 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:579
 #, 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
+#: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:625
+#: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msginit.c:297
+#: src/msginit.c:285
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:321
+#: src/msginit.c:309
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2207,147 +1864,139 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:347
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:367
+#: src/msginit.c:355
 #, 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:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr ""
 
-#: src/msginit.c:379
+#: src/msginit.c:367
 #, 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:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr ""
 
-#: src/msginit.c:387
+#: src/msginit.c:375
 #, 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:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr ""
 
-#: src/msginit.c:402
+#: src/msginit.c:390
 #, 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:450
 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:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:489
+#: src/msginit.c:471
 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: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
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1118
+#: src/msginit.c:1060
 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:1465
 #, 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:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
 #, 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:187 src/msgl-iconv.c:237
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:202
 #, 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
+#: src/msgl-cat.c:206
 #, 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:388 src/msgl-iconv.c:360
 #, 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: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
 #, c-format
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:443
+#: src/msgl-cat.c:440
 #, 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:446
 #, 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:485
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2356,7 +2005,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:94
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2365,12 +2014,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:100
+#: src/msgl-charset.c:101
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:105
+#: src/msgl-charset.c:106
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2378,7 +2027,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:114
+#: src/msgl-charset.c:115
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2387,7 +2036,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:128
+#: src/msgl-charset.c:129
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2395,180 +2044,180 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:130
+#: src/msgl-check.c:93
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:141
+#: src/msgl-check.c:103
 #, 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:147
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:152
 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:157
+msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
 msgstr ""
 
-#: src/msgl-check.c:266
+#: src/msgl-check.c:189
 #, 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:276 src/msgl-check.c:300
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:278
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:302
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:338
 msgid "invalid nplurals value"
 msgstr ""
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:360
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:390 src/msgl-check.c:406
 #, c-format
 msgid "nplurals = %lu"
 msgstr ""
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:392
 #, 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:490
+#: src/msgl-check.c:408
 #, 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:432
+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:526
 #, 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:619
+#: src/msgl-check.c:534
 #, 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:634
+#: src/msgl-check.c:549
 #, 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:652
+#: src/msgl-check.c:567
 #, 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:660
+#: src/msgl-check.c:575
 #, 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:675
+#: src/msgl-check.c:590
 #, 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:687
+#: src/msgl-check.c:602
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:645
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:655
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:804
+#: src/msgl-check.c:695
+#, fuzzy, c-format
+msgid "headerfield `%s' missing in header\n"
+msgstr "filhovud-feltet «%s» manglar i filhovud"
+
+#: src/msgl-check.c:703
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field `%s' should start at beginning of line\n"
+msgstr "filhovud-feltet «%s» skulle ha starta på byrjinga av linja"
+
+#: 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:820
+#: src/msgl-check.c:730
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "filhovud-feltet «%s» manglar i filhovud"
+msgid "field `%s' still has initial default value\n"
+msgstr "feltet «%s» har framleis sin forvalgte verdi"
 
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:64
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:69
+#: src/msgl-iconv.c:68
 #, 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:290
+#: src/msgl-iconv.c:268
 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:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:617 src/xgettext.c:638
 #, 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:320
 #, 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:326 src/recode-sr-latin.c:301 src/x-python.c:624
+#: src/xgettext.c:645
 #, 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:392 src/msgmerge.c:398
+#: src/msgmerge.c:361 src/msgmerge.c:367
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:453
+#: src/msgmerge.c:421
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:458
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2593,55 +2242,54 @@ msgstr ""
 "resultat.  Resultatet vert skrive til standard ut, med mindre ei utfil er\n"
 "spesifisert.\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:475
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:509
+#: src/msgmerge.c:477
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:513
+#: src/msgmerge.c:481
 #, 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:487
 #, 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:499
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:501
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:535
+#: src/msgmerge.c:503
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:537
+#: src/msgmerge.c:505
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:539
+#: src/msgmerge.c:507
 #, 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"
@@ -2649,143 +2297,136 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:514
 #, 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:523
 #, c-format
-msgid ""
-"      --previous              keep previous msgids of translated messages\n"
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgmerge.c:525
+#, c-format
+msgid "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:574
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1340
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1363
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:1701
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
-#, c-format
+#: src/msgmerge.c:1709
 msgid " done.\n"
 msgstr ""
 
-#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
+#: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s og %s utelukker kvarandre"
 
-#: src/msgunfmt.c:427
+#: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:440
+#: src/msgunfmt.c:428
 #, 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
+#: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr ""
 
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:432
 #, 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
+#: src/msgunfmt.c:434
 #, 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
+#: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr ""
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:462
+#: src/msgunfmt.c:450
 #, 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:467
+#: src/msgunfmt.c:455
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:475
+#: src/msgunfmt.c:463
 #, 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:479
+#: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgunfmt.c:485
+#: src/msgunfmt.c:473
 #, 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
+#: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr ""
 
-#: src/msgunfmt.c:513
+#: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:331
+#: src/msguniq.c:318
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2798,19 +2439,17 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:364
+#: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:366
+#: src/msguniq.c:353
 #, 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
+#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr ""
@@ -2822,35 +2461,35 @@ msgid ""
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, 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:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr ""
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr ""
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, 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:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2861,90 +2500,90 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr ""
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+msgid "missing `msgstr[]' section"
 msgstr "manglar «msgstr»-seksjon"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+msgid "missing `msgid_plural' section"
 msgstr "manglar «msgstr»-seksjon"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "manglar «msgstr»-seksjon"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr ""
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr ""
 
-#: src/po-lex.c:90 src/po-lex.c:109
+#: src/po-lex.c:91 src/po-lex.c:110
 #, fuzzy, c-format
 msgid "too many errors, aborting"
 msgstr "for mange feil, avsluttar"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr ""
 
-#: src/po-lex.c:465
+#: src/po-lex.c:466
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr ""
 
-#: src/po-lex.c:475
+#: src/po-lex.c:476
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr ""
 
-#: src/po-lex.c:487
+#: src/po-lex.c:488
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:744
+#: src/po-lex.c:745
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr ""
 
-#: src/po-lex.c:854
+#: src/po-lex.c:855
 #, c-format
 msgid "invalid control sequence"
 msgstr ""
 
-#: src/po-lex.c:981
+#: src/po-lex.c:982
 #, c-format
 msgid "end-of-file within string"
 msgstr ""
 
-#: src/po-lex.c:987
+#: src/po-lex.c:988
 #, c-format
 msgid "end-of-line within string"
 msgstr ""
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1009
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:327 src/xgettext.c:939
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne fila kan ikkje innehalde domene-nøkkelord"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:372
 msgid "duplicate message definition"
 msgstr ""
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:374
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "den første definisjonen finst her"
@@ -3018,129 +2657,93 @@ msgid ""
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/urlget.c:159
+#: src/urlget.c:146
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "manglar argument"
 
-#: src/urlget.c:176
+#: src/urlget.c:163
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:181
+#: src/urlget.c:168
 #, 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
-#, c-format
-msgid "error reading \"%s\""
-msgstr "Feil ved lesing av «%s»"
-
-#: src/urlget.c:234
+#: src/urlget.c:219
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "Feil etter lesing av «%s»"
-
-#: src/urlget.c:264
-#, c-format
-msgid "Retrieving %s..."
-msgstr ""
-
-#: src/urlget.c:308
-#, c-format
-msgid " timed out.\n"
-msgstr ""
-
-#: src/urlget.c:445
-#, c-format
-msgid " failed.\n"
-msgstr ""
-
 #: 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."
+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."
+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."
+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."
+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."
+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:273
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan ikkje opprette utfila \"%s\""
 
-#: src/write-catalog.c:239 src/write-catalog.c:283
+#: src/write-catalog.c:237 src/write-catalog.c:281
 msgid "standard output"
 msgstr ""
 
-#: src/write-csharp.c:703
+#: src/write-csharp.c:688
 #, fuzzy, c-format
 msgid "failed to create directory \"%s\""
 msgstr "kan ikkje skifte til filkatalog \"%s\""
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
-#: src/write-csharp.c:768
+#: src/write-csharp.c:753
 #, c-format
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:1091
+#: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr ""
 
-#: src/write-java.c:1210
+#: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1213
+#: src/write-java.c:1063
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3150,14 +2753,12 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/write-po.c:875
-#, fuzzy, 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: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:1326 src/write-po.c:1450
+#: src/write-po.c:1212 src/write-po.c:1341
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3166,7 +2767,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1224 src/write-po.c:1353
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3183,8 +2784,7 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3201,13 +2801,13 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/write-resources.c:131
+#: src/write-resources.c:130
 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:149
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3225,218 +2825,154 @@ msgid ""
 "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:342 src/x-python.c:1059
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "advarsel: denne meldinga er ikkje brukt"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:593
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr ""
 
-#: src/x-c.c:1051
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr ""
-
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr ""
 
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1218
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
-msgid "Please specify the source encoding through --from-code."
+#: 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"
 msgstr ""
 
-#: src/x-csharp.c:269
+#: src/x-csharp.c:268
 #, 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
+#: src/x-csharp.c:284
 #, 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
+#: src/x-csharp.c:296
 #, 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
+#: src/x-csharp.c:305
 #, 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:374
+#: src/x-csharp.c:314 src/x-python.c:331
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:338
+#: src/x-csharp.c:337
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1387 src/x-python.c:1266
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr ""
 
-#: src/x-csharp.c:1512 src/x-java.c:875
+#: src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr ""
 
-#: src/x-csharp.c:2020 src/x-java.c:1369
+#: src/x-csharp.c:2013 src/x-java.c:1366
 #, 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:2047 src/x-java.c:1400
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:611 src/x-glade.c:618
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:606
+#: src/x-glade.c:645
 #, 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/x-java.c:492
 #, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr ""
 
-#: src/x-javascript.c:230
-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:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "advarsel: denne meldinga er ikkje brukt"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "advarsel: denne meldinga er ikkje brukt"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "advarsel: denne meldinga er ikkje brukt"
-
-#: src/x-perl.c:308
+#: src/x-perl.c:307
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1043
+#: src/x-perl.c:1038
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1163
+#: src/x-perl.c:1158
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1183
+#: src/x-perl.c:1178
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1217
+#: src/x-perl.c:1212
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: ulovleg flagg -- %c\n"
 
-#: src/x-perl.c:1230
+#: src/x-perl.c:1225
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1247
+#: src/x-perl.c:1242
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:278
+#: src/x-python.c:233
+#, 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:324
+#: src/x-python.c:281
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3444,7 +2980,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:341
+#: src/x-python.c:298
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3452,7 +2988,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:311
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3460,7 +2996,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:364
+#: src/x-python.c:321
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3468,7 +3004,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:397
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3476,322 +3012,260 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:722
+#: src/x-python.c:674
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:108
+#: src/x-rst.c:109
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:172
+#: src/x-rst.c:173
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:207
+#: src/x-rst.c:208
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr ""
 
-#: src/x-sh.c:1074
+#: 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/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "advarsel: denne meldinga er ikkje brukt"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
+msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:648
+#: src/xgettext.c:567
 #, 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"
+msgstr "--join-existing kan ikkje brukast når utdata vert skrive til standard ut"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:572
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:808
+#: 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"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:766
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:882
+#: src/xgettext.c:789
 #, 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:884
+#: src/xgettext.c:791
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:793
 #, 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:891
+#: src/xgettext.c:798
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "inga innfil spesifisert"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:800
 #, 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, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:900
+#: src/xgettext.c:806
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:902
+#: src/xgettext.c:808
 #, 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:907
+#: src/xgettext.c:813
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:816
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:821
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:823
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:919
+#: src/xgettext.c:825
 #, 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"
+"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
+"                              preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:925
+#: src/xgettext.c:829
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:927
+#: src/xgettext.c:831
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:929
+#: src/xgettext.c:833 src/xgettext.c:840
 #, 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"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:937
+#: src/xgettext.c:837
 #, 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"
+"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
+"                              WORD means not to use default keywords)\n"
 msgstr ""
 
-#: src/xgettext.c:942
+#: src/xgettext.c:844
 #, 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:945
+#: src/xgettext.c:847
 #, 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"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:950
+#: src/xgettext.c:851
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:952
+#: src/xgettext.c:853
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:954
+#: src/xgettext.c:855
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:958
+#: src/xgettext.c:859
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:962
+#: src/xgettext.c:863
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:867
 #, c-format
-msgid ""
-"      --debug                 more detailed formatstring recognition result\n"
+msgid "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:991
+#: src/xgettext.c:886
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:901
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:903
 #, 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:1010
+#: src/xgettext.c:905
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:907
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:909
 #, 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:1016
+#: src/xgettext.c:911
 #, c-format
-msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
-"msgstr\n"
-"                                values\n"
+msgid "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr entries\n"
 msgstr ""
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:913
 #, c-format
-msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
-"msgstr\n"
-"                                values\n"
+msgid "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr entries\n"
 msgstr ""
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1686
 #, 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:1965
+#: src/xgettext.c:1785
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:2071
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2075
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr ""
-
-#: src/xgettext.c:2080
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:1968
 #, c-format
-msgid ""
-"Although being used in a format string position, the %s is not a valid %s "
-"format string. Reason: %s\n"
+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:2190
+#: src/xgettext.c:1969
 #, c-format
-msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: "
-"%s\n"
+msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2000
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3800,64 +3274,50 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: 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"
 msgstr ""
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2664
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2691
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2716
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2737
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:2828
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\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:3638
+#: src/xgettext.c:3035
 #, c-format
-msgid "language '%s' unknown"
+msgid "language `%s' unknown"
 msgstr ""
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr ""
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: Flagget «-- %c» er ulovleg\n"
-
-#~ msgid "DuplicateHandle failed with error code 0x%08x"
-#~ msgstr "Feil i «DuplicateHandle», med feilkoden 0x%08x"
-
-#, fuzzy
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "filhovud-feltet «%s» skulle ha starta på byrjinga av linja"
-
-#, fuzzy
-#~ 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"
@@ -3872,40 +3332,31 @@ 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"
@@ -3920,22 +3371,17 @@ 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"
@@ -3944,10 +3390,8 @@ 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"
 
@@ -3955,25 +3399,18 @@ 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"
@@ -3989,16 +3426,12 @@ 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"
@@ -4011,10 +3444,8 @@ 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"
@@ -4022,8 +3453,7 @@ 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"
@@ -4033,8 +3463,7 @@ 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"
@@ -4042,19 +3471,16 @@ 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"
@@ -4070,8 +3496,7 @@ 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"
@@ -4082,8 +3507,7 @@ 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"
 
@@ -4096,10 +3520,8 @@ 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"
@@ -4115,25 +3537,18 @@ 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"
@@ -4142,10 +3557,8 @@ 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"
 
@@ -4154,29 +3567,20 @@ 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"
@@ -4187,17 +3591,12 @@ 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"
@@ -4205,10 +3604,8 @@ 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 eaa5b6a96..cf8b5eb5c 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: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2010-05-09 13:18+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"
@@ -29,25 +29,26 @@ msgid "ambiguous argument %s for %s"
 msgstr ""
 
 #: gnulib-lib/argmatch.c:153
+#, c-format
 msgid "Valid arguments are:"
 msgstr "ਠੀਕ ਆਰਗੂਮੈਂਟ ਹਨ:"
 
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:335
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਲੱਭੀ ਜਾ ਸਕਦੀ, $TMPDIR ਸੈਟਅੱਪ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:349
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "ਟੈਪਲੇਟ \"%s\" ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
 
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:445
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "ਆਰਜ਼ੀ ਫਾਇਲ %s ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
 
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:460
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ %s ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
@@ -56,34 +57,33 @@ msgstr "ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ %s ਹਟਾਈ ਨਹੀਂ
 msgid "write error"
 msgstr "ਲਿਖਣ ਗਲਤੀ"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
+#: src/xgettext.c:1913
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:194
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
+msgid "error while opening \"%s\" for reading"
 msgstr "ਪੜ੍ਹਨ ਵਾਸਤੇ \"%s\" ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: gnulib-lib/copy-file.c:198
-#, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+#: gnulib-lib/copy-file.c:74
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "ਲਿਖਣ ਲਈ ਬੈਕਅੱਪ ਫਾਇਲ \"%s\" ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ"
 
-#: gnulib-lib/copy-file.c:202
-#, fuzzy, c-format
-msgid "error reading %s"
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
+#, c-format
+msgid "error reading \"%s\""
 msgstr "\"%s\" ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: gnulib-lib/copy-file.c:206
-#, fuzzy, c-format
-msgid "error writing %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\""
 msgstr "\"%s\" ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: gnulib-lib/copy-file.c:210
-#, fuzzy, c-format
-msgid "error after reading %s"
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
+#, c-format
+msgid "error after reading \"%s\""
 msgstr "\"%s\" ਪੜ੍ਹਨ ਦੇ ਬਾਅਦ ਗਲਤੀ"
 
 #: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
@@ -104,69 +104,69 @@ msgstr "C# ਕੰਪਾਇਲਰ ਨਹੀਂ ਲੱਭਿਆ, pnet ਇੰਸਟ
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:181
 msgid "Unknown system error"
 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:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
+#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s ਸਬ-ਪ੍ਰੋਸੈਸ ਫੇਲ੍ਹ ਹੋਇਆ"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: ਚੋਣ '%s' ਗਲਤ ਹੈ\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: ਚੋਣ '--%s' ਇੱਕ ਆਰਗੂਮੈਂਟ ਨਹੀਂ ਲੈਂਦੀ\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: ਚੋਣ '%c%s' ਇੱਕ ਆਰਗੂਮੈਂਟ ਨਹੀਂ ਲੈਂਦੀ\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: ਚੋਣ '--%s' ਲਈ ਇੱਕ ਆਰਗੂਮੈਂਟ ਚਾਹੀਦਾ\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ਅਣਜਾਣ ਚੋਣ '--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ਅਣਜਾਣ ਚੋਣ '%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
+#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ਗਲਤ ਚੋਣ -- '%c'\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
+#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
+#: gnulib-lib/getopt.c:1053
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: ਚੋਣ ਲਈ ਆਰਗੂਮੈਂਟ ਚਾਹੀਦਾ ਹੈ --'%c'\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
 #, 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
+#: 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:1013 gnulib-lib/getopt.c:1031
+#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr ""
@@ -182,15 +182,15 @@ msgstr ""
 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:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "\"%s\" ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c: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
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "ਫਾਇਲ \"%s\" ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ"
@@ -211,90 +211,52 @@ msgstr ""
 msgid "%s subprocess I/O error"
 msgstr "%s ਸਬ-ਪ੍ਰੋਸੈਸ I/O ਗਲਤੀ"
 
-#: 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: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
 #, c-format
 msgid "memory exhausted"
 msgstr "ਮੈਮੋਰੀ ਖਤਮ ਹੋਈ"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "%s ਸਬ-ਪਰੋਸੈਸ ਲਈ ਲਿਖਣ ਵਾਸਤੇ ਫੇਲ੍ਹ"
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, fuzzy, c-format
-msgid "read from %s subprocess failed"
-msgstr "%s ਸਬ-ਪਰੋਸੈਸ ਲਈ ਲਿਖਣ ਵਾਸਤੇ ਫੇਲ੍ਹ"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, fuzzy, c-format
-msgid "communication with %s subprocess failed"
-msgstr "%s ਸਬ-ਪਰੋਸੈਸ ਲਈ ਲਿਖਣ ਵਾਸਤੇ ਫੇਲ੍ਹ"
-
-#: gnulib-lib/pipe-filter-ii.c:449
+#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
+#: gnulib-lib/pipe.c:265
 #, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
+msgid "cannot create pipe"
+msgstr "ਪਾਈਪ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-acl.c:46
-#, c-format
-msgid "setting permissions for %s"
-msgstr ""
-
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "ਪਾਈਪ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
-
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle ਫੇਲ੍ਹ ਹੈ"
 
-#: gnulib-lib/w32spawn.h:84
+#: gnulib-lib/w32spawn.h:81
 #, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "fd %d ਰੀਸਟੋਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ: dup2 ਫੇਲ੍ਹ ਹੈ"
@@ -310,41 +272,31 @@ msgstr "%s ਸਬ-ਪ੍ਰੋਸੈਸ"
 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
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "ਪੜ੍ਹਨ ਵਾਸਤੇ \"%s\" ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%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-lua.c:235
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr ""
 
-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-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-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
+#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
@@ -354,26 +306,22 @@ msgstr ""
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
-#: src/format-c.c:36
+#: src/format-c.c:181
 #, 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
+#: src/format-c.c:588
 #, 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
+#: src/format-c.c:814
 #, 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: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:901 src/format-csharp.c:206 src/format-python.c:515
 #, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
@@ -389,14 +337,12 @@ 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 '}'."
+msgid "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
 #: src/format-csharp.c:139
 #, 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
@@ -405,9 +351,7 @@ 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 "
-"'{'."
+msgid "The string starts in the middle of a directive: found '}' without matching '{'."
 msgstr ""
 
 #: src/format-csharp.c:162
@@ -427,16 +371,12 @@ 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
@@ -459,58 +399,37 @@ 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 %%C but '%s' doesn't"
-msgstr "'%s' %%m ਵਰਤਦਾ ਹੈ, ਪਰ '%s' ਨਹੀਂ"
-
-#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
-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
@@ -520,9 +439,7 @@ 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
@@ -532,15 +449,12 @@ 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
@@ -550,15 +464,12 @@ 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
@@ -568,26 +479,19 @@ 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-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."
+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
 #, 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] ""
 
@@ -619,9 +523,7 @@ msgstr ""
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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
@@ -645,22 +547,16 @@ 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-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.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr ""
 
 #: src/format-python.c: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
@@ -670,59 +566,27 @@ 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"
-msgstr ""
-
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr ""
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr ""
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr ""
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-
-#: src/format-python-brace.c:270
-#, 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 ""
 
 #: 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
@@ -730,15 +594,11 @@ 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
@@ -747,23 +607,19 @@ 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."
+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
+#: 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"
@@ -776,19 +632,19 @@ msgstr ""
 "ਇਹ ਮੁਕਤ/ਮੁਫ਼ਤ ਸਾਫਟਵੇਅਰ ਹੈ: ਤੁਸੀਂ ਇਹ ਬਦਲਣ ਅਤੇ ਮੁੜ-ਵੰਡਣ ਲਈ ਮੁਕਤ ਹੋ।\n"
 "ਕੋਈ ਵੀ ਵਾਰੰਟੀ ਨਹੀਂ ਹੈ, ਕਾਨੂੰਨ ਰਾਹੀਂ ਵੱਧ ਵੱਧ ਮਨਜ਼ੂਰੀ ਮੁਤਾਬਕ।\n"
 
-#: 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
+#: 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: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/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "ਬਰੁਨੋ ਹਏਬਲੇ"
@@ -798,13 +654,13 @@ msgstr "ਬਰੁਨੋ ਹਏਬਲੇ"
 msgid "too many arguments"
 msgstr "ਬਹੁਤ ਸਾਰੇ ਆਰਗੂਮੈਂਟ"
 
-#: 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
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: 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
@@ -830,8 +686,7 @@ msgstr "  -s, --short                 ਛੋਟਾ ਹੋਸਟ ਨਾਂ\n"
 #: src/hostname.c:222
 #, 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 ""
 
@@ -840,29 +695,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            ਹੋਸਟ-ਨਾਂ ਲਈ ਐਡਰੈਸ\n"
 
-#: 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:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
+#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "ਜਾਣਕਾਰੀ ਸਮੇਤ ਆਉਟਪੁੱਟ:\n"
 
-#: src/hostname.c:230 src/msgattrib.c: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
+#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
+#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  ਇਹ ਮੱਦਦ ਵੇਖਾਉ ਅਤੇ ਬੰਦ ਕਰੋ\n"
 
-#: src/hostname.c:232 src/msgattrib.c: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
+#: 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"
@@ -871,11 +726,11 @@ msgstr "  -V, --version               ਆਉਟਪੁੱਟ ਵਰਜਨ ਜਾ�
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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
+#: 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"
 
@@ -884,353 +739,325 @@ msgstr "ਬੱਗ ਬਾਰੇ ਜਾਣਕਾਰੀ <bug-gnu-gettext@gnu.org> �
 msgid "could not get host name"
 msgstr "ਹੋਸਟ ਨਾਂ ਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਇੱਕ ਇੰਪੁੱਟ ਫਾਇਲ ਮਨਜ਼ੂਰ ਹੈ"
 
-#: src/msgattrib.c: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:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr ""
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "ਵਰਤੋਂ: %s [OPTION] [INPUTFILE]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c: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/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
+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:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
+#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
 #, c-format
 msgid "Input file location:\n"
 msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   ਇੰਪੁੱਟ PO ਫਾਇਲ\n"
 
-#: src/msgattrib.c: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:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
+#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:836
 #, c-format
-msgid ""
-"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+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/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c: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:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
+#: src/xgettext.c:841
 #, c-format
 msgid "Output file location:\n"
 msgstr "ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 
-#: src/msgattrib.c: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:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FILE      ਆਉਟਪੁੱਟ ਦਿੱਤੀ ਫਾਇਲ ਵਿੱਚ ਲਿਖੋ\n"
 
-#: src/msgattrib.c: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/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "ਸੁਨੇਹਾ ਚੋਣ:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
-msgid ""
-"      --translated            keep translated, remove untranslated messages\n"
+msgid "      --translated            keep translated, remove untranslated messages\n"
 msgstr "      --translated            ਕੀਤਾ ਅਨੁਵਾਦ ਰੱਖੋ, ਨਾ-ਅਨੁਵਾਦ ਸੁਨੇਹਿਆਂ ਨੂੰ ਹਟਾਓ\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
-msgid ""
-"      --untranslated          keep untranslated, remove translated messages\n"
+msgid "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr "      --untranslated          ਨਾ-ਅਨੁਵਾਦ ਰੱਖੋ, ਕੀਤਾ ਅਨੁਵਾਦ ਸੁਨੇਹੇ ਹਟਾਓ\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              ਅਸਪਸ਼ਟ ('fuzzy') ਨਿਸ਼ਾਨਬੱਧ ਕੀਤੇ ਸੁਨੇਹੇ ਹਟਾਓ\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           ਬਰਤਰਫ਼ #~ ਸੁਨੇਹੇ ਹਟਾਓ\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             ਸਭ ਸੁਨੇਹੇ ਅਸਪਸ਼ਟ ('fuzzy') ਬਣਾਓ\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:475
+#: src/msgattrib.c:461
 #, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
+msgid "      --clear-previous        remove the \"previous msgid\" from all messages\n"
 msgstr ""
 
-#: src/msgattrib.c:478
+#: src/msgattrib.c:463
 #, c-format
-msgid ""
-"      --clear-previous        remove the \"previous msgid\" from all "
-"messages\n"
+msgid "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --no-fuzzy              ਅਸਪਸ਼ਟ ('fuzzy') ਨਿਸ਼ਾਨਬੱਧ ਕੀਤੇ ਸੁਨੇਹੇ ਹਟਾਓ\n"
-
-#: src/msgattrib.c:482
-#, c-format
-msgid ""
-"      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
-msgstr ""
-
-#: src/msgattrib.c:484
+#: src/msgattrib.c:465
 #, 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
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, 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/msguniq.c:369
+#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
+#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਸੰਟੈਕਸ:\n"
 
-#: src/msgattrib.c: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:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
-msgid ""
-"  -P, --properties-input      input file is in Java .properties syntax\n"
+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:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
-msgid ""
-"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
-"syntax\n"
+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:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:926
 #, c-format
 msgid "Output details:\n"
 msgstr "ਆਉਟਪੁੱਟ ਵੇਰਵਾ:\n"
 
-#: src/msgattrib.c: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:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
 "      --color=WHEN            use colors and other text attributes if WHEN.\n"
-"                              WHEN may be 'always', 'never', 'auto', or "
-"'html'.\n"
+"                              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:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
-#: src/msgattrib.c: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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
+#: src/xgettext.c:934
 #, c-format
-msgid ""
-"  -e, --no-escape             do not use C escapes in output (default)\n"
+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:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
+#: src/msguniq.c:390 src/xgettext.c:936
 #, c-format
-msgid ""
-"  -E, --escape                use C escapes in output, no extended chars\n"
+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:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:940
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:942
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:944
 #, c-format
-msgid ""
-"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+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:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:946
 #, c-format
-msgid ""
-"      --strict                write out strict Uniforum conforming .po file\n"
+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:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c: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:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
 #, c-format
-msgid ""
-"      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
+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:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c: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:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c: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:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
+#: src/msguniq.c:411 src/xgettext.c:957
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c: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:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
+#: src/xgettext.c:959
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:322 src/msgcomm.c:327
+#: src/msgcat.c:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "ਵਰਤੋਂ: %s [OPTION] [INPUTFILE]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1239,97 +1066,95 @@ 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, 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"
+"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 ""
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               ਇੰਪੁੱਟ ਫਾਇਲਾਂ\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=FILE       ਫਾਇਲ (FILE) ਤੋਂ ਇੰਪੁੱਟ ਫਾਇਲਾਂ ਦੀ ਸੂਚੀ ਲਵੋ\n"
 
-#: src/msgcat.c: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:319 src/msgfmt.c:670
+#: src/xgettext.c:838
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c: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:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgmerge.c:557
 #, c-format
-msgid ""
-"  -P, --properties-input      input files are in Java .properties syntax\n"
+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:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
-msgid ""
-"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+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:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "ਪੀਟਰ ਮਿੱਲਰ"
 
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "ਕੋਈ ਇੰਪੁੱਟ ਫਾਇਲਾਂ ਨਹੀਂ ਦਿੱਤੀਆਂ ਗਈਆਂ"
 
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "ਠੀਕ 2 ਇੰਪੁੱਟ ਫਾਇਲਾਂ ਹੀ ਚਾਹੀਦੀਆਂ ਹਨ"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "ਵਰਤੋ: %s [OPTION] def.po ref.pot\n"
@@ -1355,19 +1180,17 @@ msgstr "  def.po                      ਅਨੁਵਾਦ\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     ਸਰੋਤ ਲਈ ਹਵਾਲਾ/ਰੈਫਰੈਂਸ\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "ਓਪਰੇਸ਼ਨ ਮਾਡੀਫਾਇਰ:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
-msgid ""
-"  -m, --multi-domain          apply ref.pot to each of the domains in def."
-"po\n"
+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:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr ""
@@ -1392,17 +1215,17 @@ msgstr "ਇਹ ਸੁਨੇਹੇ ਨਾ-ਅਨੁਵਾਦਿਤ ਹੈ"
 msgid "this message needs to be reviewed by the translator"
 msgstr "ਇਹ ਸੁਨੇਹੇ ਨੂੰ ਅਨੁਵਾਦਕ ਵਲੋਂ ਰੀਵਿਊ ਕਰਨ ਦੀ ਲੋੜ ਹੈ"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "ਇਹ ਸੁਨੇਹਾ ਵਰਤਿਆ ਗਿਆ ਹੈ, ਪਰ ਦਿੱਤਾ ਕੀਤੇ ਨਹੀਂ ਗਿਆ..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ਇਹ ਪ੍ਰੀਭਾਸ਼ਾ ਰਲਦੀ ਮਿਲਦੀ ਹੈ"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਵਰਤਿਆ ਤਾਂ ਗਿਆ ਹੈ, ਪਰ %s ਵਿੱਚ ਪਰਿਭਾਸ਼ਿਤ ਨਹੀਂ ਹੈ"
@@ -1412,19 +1235,19 @@ msgstr "ਇਹ ਸੁਨੇਹਾ ਵਰਤਿਆ ਤਾਂ ਗਿਆ ਹੈ, �
 msgid "warning: this message is not used"
 msgstr "ਸਾਵਧਾਨ: ਇਹ ਸੁਨੇਹਾ ਵਰਤਿਆ ਨਹੀਂ ਗਿਆ ਹੈ"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, 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"
@@ -1432,79 +1255,77 @@ 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 extracted comments will be preserved, but only from the first\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 ""
 
-#: 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:961
 #, 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
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "ਕਨਵਰਜ਼ਨ ਟਾਰਗੇਟ:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "ਡਿਫਾਲਟ ਇੰਕੋਡਿੰਗ ਮੌਜੂਦਾ ਲੋਕੇਲ ਦੀ ਇੰਕੋਡਿੰਗ ਹੈ।\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
+#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
+#: src/msgmerge.c:583
 #, c-format
-msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
+msgid "      --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:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "ਕੋਈ ਇੰਪੁੱਟ ਫਾਇਲ ਨਹੀਂ ਦਿੱਤੀ"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "ਠੀਕ ਇੱਕ ਇੰਪੁੱਟ ਫਾਇਲ ਚਾਹੀਦੀ ਹੈ"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "ਵਰਤੋਂ: %s [OPTION] INPUTFILE\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1513,7 +1334,7 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INPUTFILE                   ਇੰਪੁੱਟ PO ਜਾਂ POT ਫਾਇਲ\n"
@@ -1545,7 +1366,7 @@ msgid ""
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       ਇੰਪੁੱਟ PO ਫਾਇਲ\n"
@@ -1555,516 +1376,409 @@ msgstr "  -i, --input=INPUTFILE       ਇੰਪੁੱਟ PO ਫਾਇਲ\n"
 msgid "write to stdout failed"
 msgstr "stdout ਉੱਤੇ ਲਿਖਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
-#: src/msgfilter.c:298
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "%s ਸਬ-ਪਰੋਸੈਸ ਲਈ ਲਿਖਣ ਵਾਸਤੇ ਫੇਲ੍ਹ"
+
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "ਗੁੰਮ ਫਿਲਟਰ ਨਾਂ"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "ਵਰਤੋਂ: %s [OPTION] FILTER [FILTER-OPTION]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "ਅਨੁਵਾਦ ਕੈਟਾਲਾਗ ਲਈ ਸਭ ਅਨੁਵਾਦ ਉੱਤੇ ਇੱਕ ਫਿਲਟਰ ਲਾਗੂ ਕਰੋ।\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, 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:425
 #, 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:428
 #, 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:446 src/msggrep.c:595
 #, 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:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, 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/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "ਗਲਤ ਅੰਤ(endianness): %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:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "ਉਲਰਿਚ ਡਰਿੱਪਰ"
 
-#: src/msgfmt.c:439
-#, 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:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s ਲਈ ਇੱਕ \"-d directory\" ਦੇਣ ਦੀ ਲੋੜ ਹੈ"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s ਲਈ ਇੱਕ \"-l locale\" ਹਦਾਇਤ ਦੀ ਲੋੜ ਹੈ"
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s ਲਈ ਇੱਕ \"-l locale\" ਹਦਾਇਤ ਦੀ ਲੋੜ ਹੈ"
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s ਲਈ ਇੱਕ \"-l locale\" ਹਦਾਇਤ ਦੀ ਲੋੜ ਹੈ"
-
-#: src/msgfmt.c:551
-#, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr ""
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s ਕੇਵਲ %s ਜਾਂ %s ਲਈ ਹੀ ਢੁੱਕਵਾਂ ਹੈ"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:740
+#: src/msgfmt.c:616
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d ਅਨੁਵਾਦ ਕੀਤਾ ਸੁਨੇਹਾ"
 msgstr[1] "%d ਅਨੁਵਾਦ ਕੀਤੇ ਸੁਨੇਹੇ"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d ਅਸਪਸ਼ਟ ਅਨੁਵਾਦ"
 msgstr[1] ", %d ਅਸਪਸ਼ਟ ਅਨੁਵਾਦ"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d ਨਾ-ਅਨੁਵਾਦ ਸੁਨੇਹਾ"
 msgstr[1] ", %d ਨਾ-ਅਨੁਵਾਦ ਸੁਨੇਹੇ"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "ਵਰਤੋਂ: %s [OPTION] ਫਾਇਲ-ਨਾਂ.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "ਟੈਕਸਟ ਅਨੁਵਾਦ ਵੇਰਵੇ ਤੋਂ ਬਾਈਨਰੀ ਸੁਨੇਹਾ ਕੈਟਾਲਾਗ ਤਿਆਰ ਕਰੋ।\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: 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:790
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             ਇੰਪੁੱਟ ਫਾਇਲ ਨਾਂ\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
 #, c-format
 msgid "Operation mode:\n"
 msgstr "ਓਪਰੇਸ਼ਨ ਮੋਡ:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:675
 #, 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:677
 #, 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:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:681
 #, 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:683
 #, 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:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:694 src/xgettext.c:849
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "ਜਾਵਾ ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     ਸਰੋਤ ਨਾਂ\n"
 
-#: src/msgfmt.c: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:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
-msgid ""
-"  -l, --locale=LOCALE         locale name, either language or "
-"language_COUNTRY\n"
+msgid "  -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"
 msgstr "  -l, --locale=LOCALE         ਲੋਕੇਲ ਨਾਂ, ਜਾਂ ਭਾਸ਼ਾ ਨਾਂ ਜਾਂ ਭਾਸ਼ਾ_ਦੇਸ਼ \n"
 
-#: src/msgfmt.c:829
+#: src/msgfmt.c:703
 #, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:831
-#, 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                ਕਲਾਸ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਬੇਸ ਡਾਇਰੈਕਟਰੀ\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:705
 #, 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:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:717 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:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:851
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:727 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d DIRECTORY                ਕਲਾਸ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਬੇਸ ਡਾਇਰੈਕਟਰੀ\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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
-#, 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:886 src/xgettext.c:905
+#: src/msgfmt.c:741 src/xgettext.c:865
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਇੰਟਰਪਰੇਟੇਸ਼ਨ:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:743
 #, 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:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:748
 #, 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:750
 #, 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:753
 #, 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:755
 #, 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:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             ਆਉਟਪੁੱਟ ਵਿੱਚ ਅਸਪਸ਼ਟ (fuzzy) ਐਂਟਰੀਆਂ ਵਰਤੋਂ\n"
 
-#: src/msgfmt.c:908
-#, c-format
-msgid ""
-"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr ""
-
-#: src/msgfmt.c:910
+#: src/msgfmt.c:763
 #, c-format
-msgid ""
-"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
-"order\n"
-"                                (big or little, default depends on "
-"platform)\n"
+msgid "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:765
 #, 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:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            ਅਨੁਵਾਦ ਬਾਰੇ ਅੰਕੜੇ ਪੇਸ਼ ਕਰੋ\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "ਸਾਵਧਾਨ: PO ਫਾਇਲ ਹੈੱਡਰ ਗੁੰਮ ਹੈ ਜਾਂ ਗਲਤ ਹੈ\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "ਸਾਵਧਾਨ: charset ਬਦਲਣਾ ਕੰਮ ਨਹੀਂ ਕਰੇਗਾ\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "ਸਾਵਧਾਨ: PO ਫਾਇਲ ਹੈੱਡਰ ਅਸਪਸ਼ਟ ਹੈ\n"
 
-#: src/msgfmt.c:1052
+#: 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:1076
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "ਡੋਮੇਨ ਨਾਂ \"%s\" ਫਾਇਲ ਨਾਂ ਲਈ ਢੁੱਕਵਾਂ ਨਹੀਂ ਹੈ"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 
-#: src/msgfmt.c:1095
+#: src/msgfmt.c:948
 #, c-format
-msgid "'domain %s' directive ignored"
+msgid "`domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:1008
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "ਖਾਲੀ `msgstr' ਐਂਟਰੀ ਅਣ-ਡਿੱਠੀ ਕੀਤੀ ਜਾਵੇਗੀ"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:1009
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "ਅਸਪਸ਼ਟ `msgstr' ਐਂਟਰੀ ਅਣਡਿੱਠੀ ਕੀਤੀ ਜਾਵੇਗੀ"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: ਸਾਵਧਾਨ: ਸਰੋਤ ਫਾਇਲ ਵਿੱਚ ਅਸਪਸ਼ਟ ਅਨੁਵਾਦ ਹੋ ਸਕਦਾ ਹੈ"
 
-#: src/msgfmt.c:1318
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
-#, 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/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
-msgid ""
-"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
-"specified"
+msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
 msgstr ""
 
-#: src/msggrep.c:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2104,18 +1818,17 @@ msgid ""
 "                              selection criterion\n"
 msgstr ""
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, 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
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          ਆਉਟਪੁੱਟ ਨੂੰ ਫਾਇਲ ਟਿਕਾਣੇ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕਰੋ\n"
@@ -2160,8 +1873,7 @@ msgstr "  -i, --input=INPUTFILE       ਇੰਪੁੱਟ POT ਫਾਇਲ\n"
 #: src/msginit.c:379
 #, 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 ""
 
@@ -2184,8 +1896,7 @@ msgstr "  -l, --locale=LL_CC          ਟਾਰਗੇਟ ਲੋਕੇਲ ਸੈ�
 
 #: src/msginit.c:402
 #, 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
@@ -2218,10 +1929,8 @@ msgstr ""
 
 #: src/msginit.c:1118
 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 ""
 
@@ -2244,17 +1953,14 @@ msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਵਿੱਚ ਦੋ ਵੱਖ ਵੱਖ charsets \"%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 "ਇੰਪੁੱਟ ਫਾਇਲ charset ਹਦਾਇਤ ਨਾਲ ਹੈੱਡਰ ਐਂਟਰੀ ਨਹੀਂ ਰੱਖਦੀ ਹੈ"
+#, c-format
+msgid "input file `%s' doesn't contain a header entry with a charset specification"
+msgstr ""
 
 #: 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 "ਇੰਪੁੱਟ ਫਾਇਲ charset ਹਦਾਇਤ ਨਾਲ ਹੈੱਡਰ ਐਂਟਰੀ ਨਹੀਂ ਰੱਖਦੀ ਹੈ"
+#, c-format
+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
 #, c-format
@@ -2262,8 +1968,8 @@ 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-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3015
 #, c-format
 msgid "warning: "
 msgstr "ਸਾਵਧਾਨ: "
@@ -2280,8 +1986,7 @@ msgstr ""
 #: src/msgl-cat.c:449
 #, 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 ""
@@ -2356,9 +2061,7 @@ msgid "plural expression can produce integer overflow"
 msgstr ""
 
 #: src/msgl-check.c:197
-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:266
@@ -2366,105 +2069,108 @@ msgstr ""
 msgid "Try using the following, valid for %s:"
 msgstr "ਅੱਗੇ ਦਿੱਤੇ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੋਸਿਸ਼ ਕਰੋ, %s ਲਈ ਠੀਕ:"
 
-#: src/msgl-check.c:358 src/msgl-check.c:382
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "ਸੁਨੇਹਾ ਕੈਟਾਲਾਗ ਵਿੱਚ ਬਹੁਵਚਨ ਰੂਪ ਵਿੱਚ ਅਨੁਵਾਦ ਹੈ"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "ਪਰ ਹੈੱਡਰ ਐਂਟਰੀ ਵਿੱਚ \"plural=EXPRESSION\" ਗੁਣ ਨਹੀਂ ਹੈ"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "ਗਲਤ nplurals ਮੁੱਲ"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "ਗਲਤ ਬਹੁਵਚਨ ਸਮੀਕਰਨ"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "ਪਰ ਕੁਝ ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਕੇਵਲ ਇੱਕ ਬਹੁਵਚਨ ਰੂਪ ਹੈ"
 msgstr[1] "ਪਰ ਕੁਝ ਸੁਨੇਹਿਆਂ ਵਿੱਚ ਕੇਵਲ %lu ਬਹੁਵਚਨ ਰੂਪ ਹਨ"
 
-#: src/msgl-check.c:490
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgl-check.c:514
-msgid ""
-"message catalog has plural form translations, but lacks a header entry with "
-"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+#: src/msgl-check.c:508
+msgid "message catalog has plural form translations, but lacks a header entry with \"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:611
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:602
+msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "`msgid' and `msgid_plural' ਐਂਟਰੀਾਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼ੁਰੂ ਨਹੀਂ ਹੁੰਦੀਆਂ"
 
-#: src/msgl-check.c:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:610
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' and `msgstr[%u]' ਐਂਟਰੀਆਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼ੁਰੂ ਨਹੀਂ ਹੁੰਦੀਆਂ ਹਨ"
 
-#: src/msgl-check.c:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' 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:652
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
-msgstr "`msgid' and `msgid_plural' ਐਂਟਰੀਾਂ ਦੋਵੇਂ '\\n' ਨਾਲ ਸ਼ੁਰੂ ਨਹੀਂ ਹੁੰਦੀਆਂ"
+#: src/msgl-check.c:643
+msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgstr ""
 
-#: src/msgl-check.c:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
-msgstr "`msgid' and `msgstr[%u]' ਐਂਟਰੀਆਂ ਦੋਵੇਂ '\\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:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' 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:687
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "ਬਹੁਵਚਨ ਹੈਡਲਿੰਗ ਗਨੂ gettext ਇਕਸਟੈਨਸ਼ਨ ਹੈ"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr ਵਿੱਚ ਕੀਬੋਰਡ ਐਕਸਰਲੇਟਰ ਮਾਰਕ '%c' ਦੀ ਕਮੀ ਹੈ"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:804
-#, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "ਹੈੱਡਰ ਖੇਤਰ `%s' ਹਾਲੇ ਵੀ ਮੁੱਢਲਾ ਮੁੱਲ ਰੱਖਦਾ ਹੈ\n"
-
-#: src/msgl-check.c:820
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
+#: src/msgl-check.c:776
+#, c-format
+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:809
+msgid "some header fields still have the initial default value\n"
+msgstr "ਕੁਝ ਹੈੱਡਰ ਖੇਤਰ ਹਾਲੇ ਵੀ ਮੁੱਢਲੇ ਮੁੱਲ ਰੱਖਦੇ ਹਨ\n"
+
+#: src/msgl-check.c:826
+#, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "ਹੈੱਡਰ ਖੇਤਰ `%s' ਹਾਲੇ ਵੀ ਮੁੱਢਲਾ ਮੁੱਲ ਰੱਖਦਾ ਹੈ\n"
+
 #: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
@@ -2479,39 +2185,33 @@ msgstr ""
 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:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:692
 #, c-format
-msgid ""
-"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
-"not support this conversion."
+msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
 msgstr ""
 
 #: src/msgl-iconv.c:335
 #, 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:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:699
 #, c-format
-msgid ""
-"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
-"built without iconv()."
+msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s ਕੇਵਲ %s ਨਾਲ ਠੀਕ ਹੈ"
 
-#: src/msgmerge.c:453
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "ਬੈਕਅੱਪ ਕਿਸਮ"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2525,55 +2225,54 @@ msgid ""
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      ਪੁਰਾਣੇ ਸੋਰਤ ਲਈ ਰੈਫਰੈਂਸ ਅਨੁਵਾਦ\n"
 
-#: src/msgmerge.c:509
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     ਨਵੇਂ ਸਰੋਤ ਲਈ ਰੈਫਰੈਂਸ\n"
 
-#: src/msgmerge.c:513
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:519
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:531
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "ਆਉਟਪੁੱਟ ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:535
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:537
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:539
+#: src/msgmerge.c:534
 #, 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"
@@ -2581,44 +2280,40 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:541
 #, 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:552
 #, 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:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਬਹੁਵਚਨ ਰੂਪ ਦਰਸਾਉਂਦਾ ਹੈ"
 
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr ""
 
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2030
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
+#: src/msgmerge.c:2038 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
 #, c-format
 msgid " done.\n"
 msgstr " ਮੁਕੰਮਲ।\n"
@@ -2640,9 +2335,7 @@ 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
@@ -2652,15 +2345,12 @@ 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
@@ -2676,8 +2366,7 @@ 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 ""
 
@@ -2715,7 +2404,7 @@ msgstr ""
 msgid "      --strict                write strict uniforum style\n"
 msgstr ""
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2728,16 +2417,14 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr ""
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, 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
@@ -2752,35 +2439,35 @@ msgid ""
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 
-#: src/po-charset.c:557
+#: src/po-charset.c:556
 #, 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:564 src/po-charset.c:612
+#: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
 
-#: src/po-charset.c:578 src/po-charset.c:616
+#: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
 msgstr "ਪਾਰਸ ਗਲਤੀਆਂ ਨੂੰ ਛੱਡ ਕੇ, ਕਿਵੇਂ ਵੀ ਜਾਰੀ ਰੱਖੋ।"
 
-#: src/po-charset.c:580
+#: src/po-charset.c:579
 msgid "Continuing anyway."
 msgstr "ਕਿਵੇਂ ਵੀ ਜਾਰੀ ਰੱਖੋ।"
 
-#: src/po-charset.c:607
+#: src/po-charset.c:606
 #, 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:644
+#: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
@@ -2793,27 +2480,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "#~ ਦੀ ਅਨਿਯਮਤ ਵਰਤੋਂ"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:240
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "`msgstr[]' ਭਾਗ ਮੌਜੂਦ ਨਹੀਂ"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:249
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "ਨਾ-ਮੌਜੂਦ `msgid_plural' ਭਾਗ"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:257
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "ਨਾ-ਮੌਜੂਦ `msgstr' ਭਾਗ"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr ""
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "ਬਹੁਵਚਨ ਰੂਪ ਦਾ ਗਲਤ ਇੰਡੈਕਸ"
@@ -2823,7 +2510,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:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ਗਲਤ ਮਲਟੀਬਾਈਟ ਲੜੀ"
@@ -2867,16 +2554,16 @@ msgstr ""
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1003
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr ""
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "ਡੁਪਲੀਕੇਟ ਸੁਨੇਹਾ ਪ੍ਰੀਭਾਸ਼ਾ"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr ""
 
@@ -2949,12 +2636,12 @@ msgid ""
 "standard output.\n"
 msgstr ""
 
-#: src/recode-sr-latin.c:339
+#: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "ਇੰਪੁੱਟ \"%s\" ਇੰਕੋਡਿੰਗ ਵਿੱਚ ਠੀਕ ਨਹੀਂ ਹੈ"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "\"%s\" ਇੰਕੋਡਿੰਗ ਤੋਂ \"%s\" ਇੰਕੋਡਿੰਗ ਵਿੱਚ ਬਦਲਣ ਦੌਰਾਨ ਗਲਤੀ"
@@ -2976,65 +2663,44 @@ msgid ""
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "\"%s\" ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
-
 #: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "stdout ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "\"%s\" ਪੜ੍ਹਨ ਦੇ ਬਾਅਦ ਗਲਤੀ"
-
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
 msgstr "%s ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: src/urlget.c:308
+#: src/urlget.c:307
 #, c-format
 msgid " timed out.\n"
 msgstr " ਟਾਈਮ-ਆਉਟ।\n"
 
-#: src/urlget.c:445
+#: src/urlget.c:443
 #, 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."
+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."
+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."
+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."
+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."
+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
@@ -3061,17 +2727,17 @@ msgstr ""
 msgid "compilation of C# class failed"
 msgstr ""
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ਠੀਕ ਜਾਵਾ ਕਲਾਸ ਨਾਂ ਨਹੀਂ ਹੈ: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr ""
@@ -3081,13 +2747,12 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "ਲਿਖਣ ਵਾਸਤੇ \"%s\" ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: src/write-po.c:875
+#: src/write-po.c:802
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3096,7 +2761,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3113,8 +2778,7 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3155,7 +2819,7 @@ msgid ""
 "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:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
@@ -3165,22 +2829,17 @@ msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹ�
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr ""
 
-#: src/x-c.c:1051
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "ਸਾਵਧਾਨ: ਯੂਨੀਕੋਡ ਅੱਖਰ ਲਈ ਗਲਤ \\uxxxx ਸੰਟੈਕਸ"
-
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr ""
 
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2020
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3212,7 +2871,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-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv ਫੇਲ੍ਹ"
@@ -3224,7 +2883,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr ""
@@ -3244,22 +2903,12 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: 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:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3271,60 +2920,6 @@ msgstr ""
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr ""
 
-#: src/x-javascript.c:230
-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:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3360,13 +2955,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:278
+#: 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/x-python.c:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3374,7 +2969,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3382,7 +2977,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3390,7 +2985,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3398,7 +2993,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3406,7 +3001,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:722
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3428,300 +3023,259 @@ 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/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
+msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ਲੱਭਣ ਵਾਲੇ ਸ਼ਬਦ ਤੋਂ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰ ਸਕਦਾ"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:769
 #, 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 ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:820
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:882
+#: src/xgettext.c:843
 #, 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:884
+#: src/xgettext.c:845
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:847
 #, 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:891
+#: src/xgettext.c:852
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਲੈਗੂਇਜ਼ ਦੀ ਚੋਣ:\n"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:854
 #, 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, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:900
+#: src/xgettext.c:860
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:902
+#: src/xgettext.c:862
 #, 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:907
+#: src/xgettext.c:867
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:870
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:915
+#: src/xgettext.c:875
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:917
+#: src/xgettext.c:877
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:919
+#: src/xgettext.c:879
 #, 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:925
+#: src/xgettext.c:885
 #, c-format
 msgid "Language specific options:\n"
 msgstr "ਲੈਗੂਇਜ਼ ਖਾਸ ਚੋਣਾਂ:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:887
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           ਸਭ ਲਾਇਨਾਂ ਕੱਢੋ\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:889 src/xgettext.c:896
 #, 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"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:937
+#: src/xgettext.c:893
 #, 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"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:942
+#: src/xgettext.c:900
 #, 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:945
+#: src/xgettext.c:903
 #, 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"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:950
+#: src/xgettext.c:907
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:952
+#: src/xgettext.c:909
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:954
+#: src/xgettext.c:911
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (ਕੇਵਲ ਲੈਗੂਇਜ਼ C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:915
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:962
+#: src/xgettext.c:919
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:923
 #, c-format
-msgid ""
-"      --debug                 more detailed formatstring recognition result\n"
+msgid "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:991
+#: src/xgettext.c:948
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:963
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:965
 #, 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:1010
+#: src/xgettext.c:967
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  ਆਉਟਪੁੱਟ ਵਿੱਚ ਪੈਕੇਜ ਨਾਂ ਦਿਓ\n"
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:969
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  ਆਉਟਪੁੱਟ ਵਿੱਚ ਪੈਕੇਜ ਵਰਜਨ ਦਿਓ\n"
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:971
 #, c-format
-msgid ""
-"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr ""
-"      --msgid-bugs-address=EMAIL@ADDRESS  msgid ਬੱਗ ਦੀ ਜਾਣਕਾਰੀ ਐਡਰੈਸ ਉੱਤੇ ਦਿਓ\n"
+msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr "      --msgid-bugs-address=EMAIL@ADDRESS  msgid ਬੱਗ ਦੀ ਜਾਣਕਾਰੀ ਐਡਰੈਸ ਉੱਤੇ ਦਿਓ\n"
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:973
 #, 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:1019
+#: src/xgettext.c:976
 #, 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:1840
+#: src/xgettext.c:1782
 #, 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:1965
+#: src/xgettext.c:1881
 msgid "standard input"
 msgstr "ਸਟੈਂਡਰਡ ਇੰਪੁੱਟ"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1985
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "%s%s ਉੱਤੇ ਗੈਰ-ASCII ਅੱਖਰ ਹੈ।"
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1989
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "%s%s ਉੱਤੇ ਜਾਂ ਤੋਂ ਪਹਿਲਾਂ ਉੱਤੇ ਗੈਰ-ASCII ਟਿੱਪਣੀ ਹੈ।"
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1994
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "%s%s ਉੱਤੇ ਗੈਰ-ASCII ਲਾਇਨ"
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: ਸਾਵਧਾਨ: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2103
 #, c-format
-msgid ""
-"Although being used in a format string position, the %s is not a valid %s "
-"format string. Reason: %s\n"
+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:2190
+#: src/xgettext.c:2104
 #, c-format
-msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: "
-"%s\n"
+msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2135
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3730,7 +3284,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2197
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3740,45 +3294,39 @@ msgstr ""
 "gettext(\"\") ਖਾਲੀ ਲਾਈਨ ਮੋੜਨ ਦੀ ਬਜਾਏ\n"
 "ਹੈੱਡਰ ਐਂਟਰੀ ਨਾਲ ਮੇਟਾ ਜਾਣਕਾਰੀ ਮੋੜਦਾ ਹੈ।\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2834
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2861
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "ਸਾਵਧਾਨ: ਸ਼ਬਦ '%.*s' ਲਈ ਪ੍ਰਸੰਗ (context) ਮੌਜੂਦ ਨਹੀਂ"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2886
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2907
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3016
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\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:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:3226
+#, c-format
+msgid "language `%s' unknown"
 msgstr "ਲੈਗੂਇਜ਼ `%s' ਅਣਜਾਣ"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<ਬਿਨ-ਨਾਂ>"
-
-#~ 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"
diff --git a/gettext-tools/po/pl.po b/gettext-tools/po/pl.po
index 7f15e8ead..e470b7f34 100644
--- a/gettext-tools/po/pl.po
+++ b/gettext-tools/po/pl.po
@@ -2,23 +2,23 @@
 # Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, 2005, 2006, 2007, 2010, 2013, 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gettext package.
 # Piotr Pogorzelski <ppogorze@ippt.gov.pl>, 1995
-# Jakub Bogusz <qboosh@pld.org.pl>, 2002, 2003
+# Jakub Bogusz <qboosh@pld-linux.org>, 2002, 2003, remarks to some 18 messages in 2014
+# Piotr Drąg <piotrdrag@gmail.com>, remarks on grammar errors in 2014
 # Rafał Maszkowski <rzm@icm.edu.pl>, 1995-1999, 2001, 2003-2007, 2010, 2013, 2014
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.19-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"POT-Creation-Date: 2014-05-10 13:37+0900\n"
+"PO-Revision-Date: 2014-06-03 23:13+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=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"
+"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
 #, c-format
@@ -52,7 +52,7 @@ msgstr "nie można usunąć pliku tymczasowego %s"
 #: gnulib-lib/clean-temp.c:457
 #, c-format
 msgid "cannot remove temporary directory %s"
-msgstr "nie można usunąć katalogu tymczasowego przy %s"
+msgstr "nie można usunąć katalogu tymczasowego %s"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
@@ -200,15 +200,12 @@ msgstr "błąd podczas pisania do pliku \"%s\""
 #: gnulib-lib/javacomp.c:2343
 #, 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
@@ -218,7 +215,7 @@ msgstr "błąd wejścia/wyjścia podprocesu %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
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "pamięć wyczerpana"
@@ -229,7 +226,7 @@ msgid "creation of threads failed"
 msgstr "kompilacja wątków nie udała się"
 
 #: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "pisanie do podprocesu %s nie powiodło się"
@@ -334,10 +331,8 @@ msgstr ""
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%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: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
@@ -364,12 +359,8 @@ msgstr "Dyrektywa numer %u zaczyna się od |, ale nie kończy |."
 
 #: 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:39
 #, c-format
@@ -379,8 +370,7 @@ msgstr "W dyrektywie numer %u oznaczenie po „<” nie jest zakończone przez �
 #: 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:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
 #: src/format-javascript.c:215 src/format-python.c:515
@@ -400,16 +390,12 @@ 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:130 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 "
-"„}”."
+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:139
 #, 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:140
@@ -418,12 +404,8 @@ 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:161 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 "
-"„{”."
+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:162
 #, c-format
@@ -433,30 +415,22 @@ msgstr "Łańcuch zawiera samotny „}” po numerze dyrektywy %u."
 #: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
-msgstr "Błędny połączenie flag w dyrektywie numer %u."
+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
@@ -493,53 +467,33 @@ 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
@@ -548,11 +502,8 @@ msgstr "Łańcuch odwołuje się do argumentu numer %u na niekompatybilne sposob
 
 #: 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:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
@@ -561,18 +512,13 @@ msgstr "W dyrektywie numer %u po \"%s\" nie występuje przecinek."
 
 #: 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: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:572
 #, c-format
@@ -581,19 +527,13 @@ msgstr "W dyrektywie numer %u wybór nie zawiera liczby."
 
 #: 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: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:756
 #, c-format
@@ -602,35 +542,23 @@ msgstr "specyfikacja formatu dla argumentu {%u} nie istnieje w „%s”"
 
 #: 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-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 ""
-"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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -660,12 +588,8 @@ msgstr "W dyrektywie numer %u podano jednocześnie modyfikatory @ i :."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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:3326 src/format-scheme.c:3263
 #, c-format
@@ -688,12 +612,8 @@ msgstr "specyfikacje formatu w „%s” nie są podzbiorem tych z „%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 ""
-"W dyrektywie numer %u specyfikacja rozmiaru jest niezgodna ze specyfikacją "
-"conwersji „%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-perl-brace.c:199 src/format-python.c:471
 #: src/format-python-brace.c:434 src/format-python-brace.c:447
@@ -703,48 +623,33 @@ msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "specyfikacja formatu dla argumentu „%s” nie istnieje w „%s”"
 
 #: src/format-python.c: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: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-python-brace.c:137
 #, c-format
@@ -763,11 +668,8 @@ msgstr "W dyrektywie numer %u „%c” nie może być początkiem argumentu geti
 
 #: src/format-python-brace.c:185
 #, 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 byc 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:270
 #, c-format
@@ -776,34 +678,20 @@ msgstr "W dyrektywie numer %u jest niezakończona dyrektywa formatu."
 
 #: 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: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: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."
+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: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."
+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:85
 msgid "The string refers to a shell variable with an empty name."
@@ -811,16 +699,12 @@ msgstr "Zmienna powłoki, do której odwołuje się łańcuch znaków ma pustą
 
 #: 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: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."
 
 #: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
@@ -894,12 +778,10 @@ msgstr "  -s, --short                 krótka nazwa komputera\n"
 #: src/hostname.c:222
 #, 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:225
@@ -985,10 +867,8 @@ msgstr ""
 #: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 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 dla 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: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
@@ -1008,10 +888,8 @@ msgstr "  PLIK-WEJŚCIOWY              wczytanie pliku PO\n"
 #: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
 #: src/xgettext.c:875
 #, 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:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
 #: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
@@ -1044,8 +922,7 @@ 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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
@@ -1055,43 +932,37 @@ msgstr "Wybór komunikatów:\n"
 
 #: 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 nie\n"
-"                                przetłumaczonych\n"
+"      --translated            zachowanie przetłumaczonych, usunięcie\n"
+"                                nieprzetłumaczonych\n"
 
 #: 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"
+"      --untranslated          zachowanie nieprzetłumaczonych, usunięcie\n"
 "                                przetłumaczonych\n"
 
 #: 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: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: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: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:465
 #, c-format
@@ -1101,9 +972,7 @@ msgstr "Manipulowanie atrybutami:\n"
 #: 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:469
 #, c-format
@@ -1138,36 +1007,25 @@ msgstr ""
 
 #: 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: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: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: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 nie obecnych 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:486
 #, c-format
@@ -1176,10 +1034,8 @@ msgstr "      --fuzzy                 synonim dla --only-fuzzy --clear-fuzzy\n"
 
 #: 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: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
@@ -1192,17 +1048,13 @@ msgstr "Składnia pliku wejściowego:\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:393 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: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
 #, 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"
@@ -1222,15 +1074,12 @@ msgstr "Szczegóły dotyczące wyjścia:\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"
+"                              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:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
@@ -1238,43 +1087,34 @@ msgstr ""
 #: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
 #, 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: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
 #, 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: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
 #, 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: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
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
 #: src/xgettext.c:983
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
 #: src/xgettext.c:985
@@ -1285,19 +1125,14 @@ msgstr "      --no-location           nie zapisywanie linii „#: plik:linia”\
 #: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
 #: src/xgettext.c:987
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
 #: src/xgettext.c:989
 #, 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: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
@@ -1310,18 +1145,15 @@ msgstr "  -p, --properties-output     zapisanie pliku .properties Javy\n"
 #: 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
 #, 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: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
 #, 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: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
@@ -1331,8 +1163,7 @@ 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:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
@@ -1347,8 +1178,7 @@ msgstr "  -s, --sort-output           generowanie posortowanego wyjścia\n"
 #: src/xgettext.c:1002
 #, 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
 #, c-format
@@ -1390,8 +1220,7 @@ msgstr "  PLIK-WEJŚCIOWY ...          pliki wejściowe\n"
 #: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
 #, 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:325 src/msgfmt.c:794
 #: src/xgettext.c:877
@@ -1406,8 +1235,7 @@ msgid ""
 "                              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
 #, c-format
@@ -1430,11 +1258,8 @@ msgstr ""
 #: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
 #: src/msgmerge.c:562
 #, 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:254 src/msgcomm.c:413 src/msgfmt.c:882
 #: src/msgmerge.c:564
@@ -1457,13 +1282,12 @@ msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      --use-first             użycie pierwszego dostępnego tłumaczenia dla\n"
+"      --use-first             użycie pierwszego dostępnego tłumaczenia\n"
 "                                każdego komunikatu zamiast łączenia wielu\n"
 
 #: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
 #, 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.
@@ -1521,12 +1345,8 @@ msgstr "Modyfikatory operacji:\n"
 
 #: src/msgcmp.c:241 src/msgmerge.c:553
 #, 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:243 src/msgmerge.c:555
 #, c-format
@@ -1536,20 +1356,17 @@ msgstr "  -N, --no-fuzzy-matching     nie używanie dopasowywania rozmytego\n"
 #: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr ""
-"      --use-fuzzy             użycie na wyjściu niepewnych (fuzzy) "
-"komunikatów\n"
+msgstr "      --use-fuzzy             użycie na wyjściu niepewnych (fuzzy) komunikatów\n"
 
 #: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
-msgstr ""
-"      --use-untranslated      użycie nie przetłumaczonych komunikatów\n"
+msgstr "      --use-untranslated      użycie nieprzetłumaczonych komunikatów\n"
 
 #: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
-msgstr "uwaga: ten komunikat nie jest przetłumaczony"
+msgstr "ten komunikat jest nieprzetłumaczony"
 
 #: src/msgcmp.c:330
 #, c-format
@@ -1559,7 +1376,7 @@ msgstr "ten komunikat powinien być sprawdzony przez tłumacza"
 #: src/msgcmp.c:369 src/msgmerge.c:1505
 #, c-format
 msgid "this message is used but not defined..."
-msgstr "ten komunikat jest użyty, ale nie zdefiniowany..."
+msgstr "ten komunikat jest użyty, ale nie jest zdefiniowany..."
 
 #: src/msgcmp.c:372 src/msgmerge.c:1508
 #, c-format
@@ -1569,14 +1386,14 @@ msgstr "...ale ta definicja jest podobna"
 #: src/msgcmp.c:377 src/msgmerge.c:1536
 #, c-format
 msgid "this message is used but not defined in %s"
-msgstr "ten komunikat jest użyty, ale nie zdefiniowany w %s"
+msgstr "ten komunikat jest użyty, ale nie jest zdefiniowany w %s"
 
 #: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
-msgstr "uwaga: ten komunikat nie jest użyty"
+msgstr "uwaga: ten komunikat nie został użyty"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1620,11 +1437,8 @@ msgstr ""
 
 #: src/msgcomm.c:452 src/xgettext.c:1004
 #, 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:311
 #, c-format
@@ -1644,8 +1458,7 @@ msgstr "Domyślnym kodowaniem jest kodowanie dla aktualnej lokalizacji.\n"
 #: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
 #, 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:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
 #: src/msgmerge.c:586
@@ -1656,18 +1469,14 @@ msgstr "      --no-location           pominięcie linii „#: plik:linia”\n"
 #: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
 #: src/msgmerge.c:588
 #, 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:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
 #: src/msgmerge.c:590
 #, 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:258 src/msgfmt.c:433 src/xgettext.c:661
 #, c-format
@@ -1694,7 +1503,7 @@ msgid ""
 msgstr ""
 "Tworzy plik tłumaczeń angielskich. Plikiem wejściowym jest ostatnio\n"
 "tworzony angielski plik PO lub plik PO Template (zazwyczaj stworzony przez\n"
-"xgettext). Nie przetłumaczonym wpisom są przypisywane tłumaczenia identyczne\n"
+"xgettext). Nieprzetłumaczonym wpisom są przypisywane tłumaczenia identyczne\n"
 "z msgid.\n"
 
 #: src/msgen.c:321
@@ -1764,8 +1573,7 @@ msgstr "Składnia: %s [OPCJA] FILTR [OPCJA-FILTRA]\n"
 #: src/msgfilter.c:411
 #, 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:435
 #, c-format
@@ -1783,35 +1591,27 @@ msgstr "Przydatne OPCJE-FILTRA jeśli FILTREM jest „sed”:\n"
 
 #: src/msgfilter.c:442
 #, 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:444
 #, 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:447
 #, 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:465 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:471 src/msggrep.c:606
 #, c-format
@@ -1820,15 +1620,13 @@ msgstr "      --indent                zapisanie pliku w stylu z wcięciami\n"
 
 #: src/msgfilter.c:473
 #, 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/msgfmt.c:345
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
-msgstr "argument dla %s powinien być pojedynczym znakiem przestankowym"
+msgstr "argument %s powinien być pojedynczym znakiem przestankowym"
 
 #: src/msgfmt.c:392
 #, c-format
@@ -1909,9 +1707,9 @@ msgstr[2] ", %d tłumaczeń budzi wątpliwości"
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
-msgstr[0] ", %d nie przetłumaczony komunikat"
-msgstr[1] ", %d nie przetłumaczone komunikaty"
-msgstr[2] ", %d nie przetłumaczonych komunikatów"
+msgstr[0] ", %d nieprzetłumaczony komunikat"
+msgstr[1] ", %d nieprzetłumaczone komunikaty"
+msgstr[2] ", %d nieprzetłumaczonych komunikatów"
 
 #: src/msgfmt.c:774
 #, c-format
@@ -1921,8 +1719,7 @@ msgstr "Składnia: %s [OPCJA] nazwa-pliku.po ...\n"
 #: src/msgfmt.c:778
 #, 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:783 src/xgettext.c:864
 #, c-format, no-wrap
@@ -1930,7 +1727,7 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
-"Argumenty obowiązkowe dla długich opcji są obowiązkowe także dla krótkich.\n"
+"Argumenty obowiązkowe opcji długich są obowiązkowe także dla krótkich.\n"
 "Podobnie dla argumentów opcjonalnych.\n"
 
 #: src/msgfmt.c:790
@@ -1945,20 +1742,13 @@ msgstr "Tryb działania:\n"
 
 #: src/msgfmt.c:799
 #, c-format
-msgid ""
-"  -j, --java                  Java mode: generate a Java ResourceBundle "
-"class\n"
-msgstr ""
-"  -j, --java                  tryb Javy: generowanie klas Java "
-"ResourceBundle\n"
+msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
+msgstr "  -j, --java                  tryb Javy: generowanie klas Java ResourceBundle\n"
 
 #: src/msgfmt.c:801
 #, 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 "      --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:803
 #, c-format
@@ -1967,19 +1757,13 @@ msgstr "      --csharp                tryb C#: generowanie pliku .dll .NET\n"
 
 #: src/msgfmt.c:805
 #, 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 "      --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:807
 #, c-format
-msgid ""
-"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr ""
-"      --tcl                   tryb Tcl: generowanie pliku tcl/msgcat .msg\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:809
 #, c-format
@@ -1988,24 +1772,18 @@ msgstr "      --qt                    tryb Qt: generowanie pliku .qm\n"
 
 #: src/msgfmt.c:811
 #, 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:818
 #, 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:820 src/xgettext.c:888
 #, 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:823
 #, c-format
@@ -2020,37 +1798,28 @@ msgstr "  -r, --resource=ZASÓB        nazwa zasobu\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
 #, 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:829
 #, 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:831
 #, 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:833
 #, 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:839
@@ -2060,12 +1829,8 @@ msgstr "Położenie pliku wyjściowego w trybie C#:\n"
 
 #: src/msgfmt.c:845 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:847
 #, c-format
@@ -2073,8 +1838,7 @@ 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 locale.\n"
 
 #: src/msgfmt.c:851
@@ -2085,16 +1849,14 @@ msgstr "Położenie pliku wyjściowego w trybie Tcl:\n"
 #: src/msgfmt.c:855 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:857
 #, 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:861
 #, c-format
@@ -2123,14 +1885,11 @@ msgstr ""
 #: src/msgfmt.c:874
 #, 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:886 src/xgettext.c:905
 #, c-format
@@ -2141,12 +1900,10 @@ msgstr "Interpretacja pliku wejściowego:\n"
 #, 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:891
 #, c-format
@@ -2157,12 +1914,8 @@ msgstr ""
 
 #: src/msgfmt.c:893
 #, 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:895
 #, c-format
@@ -2175,71 +1928,54 @@ msgstr ""
 
 #: src/msgfmt.c:898
 #, 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:900
 #, 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:903
 #, 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:908
 #, 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:910
 #, 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:913
 #, 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:922
 #, 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:924 src/msgmerge.c:612 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:1037
 #, c-format
@@ -2269,8 +2005,7 @@ msgstr "nazwa domeny \"%s\" nie jest odpowiednią nazwa pliku"
 #: src/msgfmt.c:1081
 #, 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:1095
 #, c-format
@@ -2292,15 +2027,15 @@ msgstr "zignorowana niepewna (fuzzy) wartość „msgstr”"
 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:1318
+#: src/msgfmt.c:1306
 #, c-format
 msgid "%s does not exist"
 msgstr "%s nie istnieje"
 
-#: src/msgfmt.c:1328
+#: src/msgfmt.c:1316
 #, c-format
 msgid "%s exists but cannot read"
-msgstr "%s istnieje, ale nie może zostać przeczytane"
+msgstr "%s istnieje, ale nie może zostać przeczytany"
 
 #: 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
@@ -2316,11 +2051,8 @@ msgstr "błąd w czasie czytania \"%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 ""
-"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:521
 #, c-format, no-wrap
@@ -2376,10 +2108,10 @@ msgstr ""
 "  [-C WZORZEC-KOMENTARZA] [-X WZORZEC-WYDOB-KOMENTARZA]\n"
 "Komunikat jest wybierany jeśli pochodzi z jednego z podanych plików\n"
 "źródłowych lub pochodzi z jednej z podanych domen,\n"
-"lub, jeśli podano -J i kontekst (msgctxt) pasuje do WZORCA-KONTEKST\n"
+"lub, jeśli podano -J i kontekst (msgctxt) pasuje do WZORCA-KONTEKST,\n"
 "lub, jeśli podano -K i klucz (msgid lub msgid_plural), pasuje do WZORCA-MSGID,\n"
 "lub, jeśli podano -T i to tłumaczenie (msgstr) pasuje do WZORCA-MSGSTR,\n"
-"lub, jeśli podano -C i komentarz tłumacza pasuje do WZORCA-KOMENTARZA.\n"
+"lub, jeśli podano -C i komentarz tłumacza pasuje do WZORCA-KOMENTARZA,\n"
 "lub, jeśli podano -X i wydobyty komentarz pasuje do WZORCA-WYDOB-KOMENTARZA.\n"
 "\n"
 "Jeśli podano więcej niż jedno kryterium wyboru, zbiór wybranych komunikatów\n"
@@ -2393,7 +2125,7 @@ msgstr ""
 "\n"
 "  -N, --location=PLIK-ŹRÓDŁ   wybranie komunikatów wydobytych z PLIKU-ŹRÓDŁ\n"
 "  -M, --domain=DOMENA         wybranie komunikatów należących do DOMENY\n"
-"  -J, --msgctxt               początek wzorców msgctxt\n"
+"  -J, --msgctxt               początek wzorców dla msgctxt\n"
 "  -K, --msgid                 początek wzorców dla msgid\n"
 "  -T, --msgstr                początek wzorców dla msgstr\n"
 "  -C, --comment               początek wzorców dla komentarza tłumacza\n"
@@ -2408,11 +2140,8 @@ msgstr ""
 
 #: 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:623
 #, c-format
@@ -2422,8 +2151,7 @@ msgstr "      --sort-output           generowanie posortowanego wyjścia\n"
 #: 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"
+msgstr "      --sort-by-file          sortowanie wyjścia według położenia pliku\n"
 
 #: src/msginit.c:297
 msgid ""
@@ -2468,12 +2196,10 @@ msgstr "  -i, --input-PLIK-WEJŚCIOWY  plik wejściowy POT\n"
 #: src/msginit.c:379
 #, 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:385
@@ -2498,11 +2224,8 @@ msgstr "  -l, --locale=JJ_KK          ustawienie docelowej lokalizacji\n"
 
 #: src/msginit.c:402
 #, 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:468
 msgid ""
@@ -2534,15 +2257,12 @@ msgstr "podproces %s zawiódł z kodem wyjścia %d"
 
 #: src/msginit.c:1118
 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.
@@ -2565,19 +2285,13 @@ msgstr "dwa różne zestawy znaków \"%s\" oraz \"%s\" w pliku wejściowym"
 
 #: 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: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:391 src/msgl-iconv.c:375
 #, c-format
@@ -2603,8 +2317,7 @@ msgstr ""
 #: src/msgl-cat.c:449
 #, 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 ""
@@ -2623,7 +2336,7 @@ msgstr ""
 "Konwersja pliku %s z kodowania %s do kodowania %s\n"
 "zmienia niektóre identyfikatory msgid albo msgctxt.\n"
 "Zmień wszystkie identyfikatory msgid i msgctxt tak, żeby były wyłącznie\n"
-"w ASCII albo upewnij się, że są od początku, już w plikach źródłówych,\n"
+"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:93
@@ -2652,7 +2365,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 "- Przekonwertowanie katalogu tłumaczeń do %s przy użyciu „msgconv”,\n"
-"  a następnie wykonanie „%s”,\n"
+"  potem wykonanie „%s”,\n"
 "  a następnie przekonwertowanie z powrotem do %s przy użyciu „msgconv”.\n"
 
 #: src/msgl-charset.c:114
@@ -2665,7 +2378,7 @@ msgid ""
 msgstr ""
 "- Ustawienie LC_ALL na lokalizację z kodowaniem %s,\n"
 "  przekonwertowanie katalogu tłumaczeń do %s przy użyciu „msgconv”,\n"
-"  a następnie wykonanie „%s”,\n"
+"  potem wykonanie „%s”,\n"
 "  a następnie przekonwertowanie z powrotem do %s przy użyciu „msgconv”.\n"
 
 #: src/msgl-charset.c:128
@@ -2686,26 +2399,19 @@ msgstr "wyrażenie do wyliczania liczby mnogiej może zwrócić wartości ujemne
 #: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr ""
-"nplurals = %lu, ale wyrażenie do wyliczania liczby mnogiej może zwrócić "
-"wartości do %lu"
+msgstr "nplurals = %lu, ale wyrażenie do wyliczania liczby mnogiej może zwrócić wartości do %lu"
 
 #: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
-msgstr ""
-"wyrażenie do wyliczania liczby mnogiej może spowodować dzielenie przez zero"
+msgstr "wyrażenie do wyliczania liczby mnogiej może spowodować dzielenie przez zero"
 
 #: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr "wyrażenie do wyliczania liczby mnogiej może spowodować przepełnienie"
 
 #: src/msgl-check.c:197
-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:266
 #, c-format
@@ -2754,12 +2460,8 @@ msgstr[1] "ale niektóre komunikaty mają %lu formy mnogie"
 msgstr[2] "ale niektóre komunikaty mają %lu form mnogich"
 
 #: 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 ""
-"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:611
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
@@ -2796,17 +2498,17 @@ msgstr "obsługa form mnogich jest rozszerzeniem gettexta GNU"
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "w msgstr brakuje skrótu oznaczenia klawiszowego „%c”"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr zawiera zbyt dużo oznaczeń skrótów klawiszowych „%c”"
 
-#: src/msgl-check.c:804
+#: src/msgl-check.c:801
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "pole nagłówka „%s” nadal zawiera początkową wartość domyślną\n"
 
-#: src/msgl-check.c:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "w nagłówku brakuje pola „%s”\n"
@@ -2823,37 +2525,24 @@ msgstr "%s: błąd w czasie zamiany kodowania z \"%s\" na \"%s\""
 
 #: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
-msgstr ""
-"plik wejściowy nie zawiera wpisu nagłówka ze specyfikacją zestawu znaków"
+msgstr "plik wejściowy nie zawiera wpisu nagłówka ze specyfikacją zestawu znaków"
 
 #: 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
 #, 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
 #, 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:302 src/x-python.c:672
 #: src/xgettext.c:727
 #, 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:392 src/msgmerge.c:398
 #, c-format
@@ -2884,13 +2573,12 @@ msgstr ""
 "ostatnio utworzonym plikiem PO Template (zwykle tworzonym przez xgettext),\n"
 "tłumaczenia i komentarze w nim zawarte będą zignorowane, ale komentarze z\n"
 "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"
+"dokładnie, używane jest dopasowanie rozmyte dla lepszych wyników.\n"
 
 #: src/msgmerge.c:507
 #, 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:509
 #, c-format
@@ -2933,25 +2621,21 @@ msgstr "      --backup=KONTROLA       utworzenie kopii zapasowej def.po\n"
 #: src/msgmerge.c:537
 #, 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:539
 #, 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"
@@ -2959,8 +2643,7 @@ msgstr ""
 #: src/msgmerge.c:546
 #, 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"
@@ -2968,8 +2651,7 @@ msgstr ""
 
 #: src/msgmerge.c:557
 #, 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"
@@ -2991,12 +2673,8 @@ msgstr "ten komunikat nie powinien definiować form mnogich"
 
 #: src/msgmerge.c:2035
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -3017,18 +2695,12 @@ msgstr "Składnia: %s [OPCJA] [PLIK]...\n"
 #: 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: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:442
 #, c-format
@@ -3037,20 +2709,13 @@ msgstr "      --csharp                tryb C#: wynik jest plikiem .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      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: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:451
 #, c-format
@@ -3065,13 +2730,11 @@ msgstr "Położenie pliku wejściowego w trybie Javy:\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 ""
 "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:467
@@ -3098,8 +2761,7 @@ msgstr "Położenie pliku wejściowego w trybie Tcl:\n"
 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:511
 #, c-format
@@ -3109,8 +2771,7 @@ msgstr "  -i, --indent                zapisanie pliku w stylu z wcięciami\n"
 #: 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:331
 #, c-format, no-wrap
@@ -3141,11 +2802,8 @@ msgstr "  -d, --repeated              wypisanie tylko duplikatów\n"
 
 #: 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:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
@@ -3211,17 +2869,17 @@ msgstr "niekonsekwentne użycie #~"
 #: src/po-gram-gen.y:243
 #, c-format
 msgid "missing 'msgstr[]' section"
-msgstr "brak częsci „msgstr[]”"
+msgstr "brak części „msgstr[]”"
 
 #: src/po-gram-gen.y:252
 #, c-format
 msgid "missing 'msgid_plural' section"
-msgstr "brak częsci „msgstr_plural”"
+msgstr "brak części „msgstr_plural”"
 
 #: src/po-gram-gen.y:260
 #, c-format
 msgid "missing 'msgstr' section"
-msgstr "brak częsci „msgstr”"
+msgstr "brak części „msgstr”"
 
 #: src/po-gram-gen.y:399
 #, c-format
@@ -3313,7 +2971,7 @@ msgstr "plik \"%s\" nie jest w formacie .mo GNU"
 #: src/read-mo.c:178
 #, 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"
+msgstr "plik \"%s\" zawiera napis niezakończony znakiem NUL pod %s"
 
 #: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
@@ -3337,7 +2995,7 @@ msgstr "uwaga: błąd składniowy, oczekiwano „;” po napisie"
 
 #: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "uwaga: błąd skłądniowy, oczekiwano „=” albo „;” po napisie"
+msgstr "uwaga: błąd składniowy, oczekiwano „=” albo „;” po napisie"
 
 #: src/recode-sr-latin.c:116
 #, c-format
@@ -3350,7 +3008,7 @@ msgstr "Program napisany przez %s i %s.\n"
 #. This is a proper name. See the gettext manual, section Names.
 #: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
-msgstr "Danilo Segana"
+msgstr "Danilo Šegana"
 
 #: src/recode-sr-latin.c:153
 #, c-format, no-wrap
@@ -3426,45 +3084,24 @@ msgid " failed.\n"
 msgstr " niepowodzenie.\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 ""
-"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."
+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:129
-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."
+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:162
-msgid ""
-"message catalog has context dependent translations, but the output format "
-"does not support them."
-msgstr ""
-"katalog komunikatów ma formy mnogie, ale nie mogą być zapisane w podanym "
-"formacie wyjściowym."
+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: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 ""
-"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."
+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:202
-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."
+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:231 src/write-catalog.c:275
 #, c-format
@@ -3498,8 +3135,7 @@ msgstr "niepoprawna nazwa klasy Javy: %s"
 #: src/write-java.c:1210
 #, 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
 #, c-format
@@ -3513,11 +3149,10 @@ msgstr "błąd otwarcia \"%s\" do pisania"
 
 #: src/write-po.c:875
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1326 src/write-po.c:1455
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3530,7 +3165,7 @@ msgstr ""
 "innego niż ty. Rozważ używanie w nazwach msgctxt wyłącznie znaków ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1338 src/write-po.c:1467
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3553,8 +3188,7 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3583,7 +3217,7 @@ msgid ""
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 "katalog komunikatów ma tłumaczenia zależne od kontekstu,\n"
-"ale format C# .resources nie pozwala używać kontekstów\n"
+"ale format .resources języka C# nie pozwala używać kontekstów\n"
 
 #: src/write-resources.c:150
 msgid ""
@@ -3591,7 +3225,7 @@ msgid ""
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
 "katalog komunikatów ma formy mnogie,\n"
-"ale katalog komunikatów C# nie pozwala ich używać\n"
+"ale format .resources języka C# nie pozwala ich używać\n"
 
 #: src/write-tcl.c:157
 msgid ""
@@ -3599,7 +3233,7 @@ msgid ""
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
 "katalog komunikatów zawiera tłumaczenia zależne od kontekstu,\n"
-"ale format katalogu komunikatów Tcl-a nie pozwala zmieniać kontekstów\n"
+"ale format katalogu komunikatów Tcl-a nie pozwala używać kontekstów\n"
 
 #: src/write-tcl.c:176
 msgid ""
@@ -3644,7 +3278,7 @@ msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: Błędna sekwensja wielobajtowa.\n"
+"%s:%d: Błędna sekwencja wielobajtowa.\n"
 "Proszę podać poprawne kodowanie źródłowe przy pomocy --from-code .\n"
 
 #: src/x-csharp.c:285
@@ -3747,7 +3381,7 @@ msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code\n"
 msgstr ""
-"%s:%d: Błędna sekwensja wielobajtowa.\n"
+"%s:%d: Błędna sekwencja wielobajtowa.\n"
 "Proszę podać poprawne kodowanie źródłowe przy pomocy --from-code\n"
 
 #: src/x-javascript.c:291
@@ -3851,7 +3485,7 @@ msgid ""
 "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: Błędna sekwensja wielobajtowa.\n"
+"%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"
 
@@ -3863,8 +3497,7 @@ msgid ""
 "comment as specified in http://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
@@ -3875,8 +3508,7 @@ msgid ""
 "comment as specified in http://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
@@ -3887,8 +3519,7 @@ msgid ""
 "comment as specified in http://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
@@ -3899,8 +3530,7 @@ msgid ""
 "as specified in http://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
@@ -3925,12 +3555,8 @@ msgstr "%s:%d: błędne wyrażenie napisowe"
 
 #: 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: uwaga: składnia $\"...\" nie jest używana ze względu na "
-"bezpieczeństwo; użyj eval_gettext"
+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:413
 #, c-format
@@ -3960,16 +3586,12 @@ msgstr "uwaga: typ pliku „%s” z rozszerzeniem „%s” jest nieznany; sprób
 #: src/xgettext.c:859
 #, 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:882
 #, 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:884
 #, c-format
@@ -3978,10 +3600,8 @@ msgstr "  -o, --output=PLIK           zapisanie wyniku do podanego pliku\n"
 
 #: 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    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:891
 #, c-format
@@ -3992,20 +3612,16 @@ msgstr "Wybór języka pliku wejściowego:\n"
 #, 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"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                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"
 
@@ -4016,11 +3632,8 @@ msgstr "  -C, --c++                   skrót dla --language=C++\n"
 
 #: src/xgettext.c:902
 #, 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:907
 #, c-format
@@ -4039,8 +3652,7 @@ msgstr "Domyślnie zakłada się, że pliki wejściowe są w ASCII.\n"
 #: src/xgettext.c:915
 #, 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:917
 #, c-format
@@ -4052,19 +3664,14 @@ msgstr "  -x, --exclude-file=PLIK.po  pominięcie wpisów z PLIKU.po\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"
+"  -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:925
@@ -4081,14 +3688,12 @@ msgstr "  -a, --extract-all           wyciągnięcie wszystkich napisów\n"
 #, 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"
 
@@ -4096,48 +3701,41 @@ msgstr ""
 #, 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:942
 #, 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:945
 #, 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:950
 #, 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:952
 #, c-format
@@ -4166,8 +3764,7 @@ msgstr "      --boost                 rozpoznawanie napisów w formacie Boost\n"
 
 #: src/xgettext.c:966
 #, 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"
@@ -4180,15 +3777,13 @@ msgstr "      --properties-output     zapisanie pliku .properties Javy\n"
 #: src/xgettext.c:1006
 #, 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:1008
 #, 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 copyrightu FSF dla\n"
+"      --foreign-user          pominięcie na wyjściu informacji o prawach FSF dla\n"
 "                                zewnętrznych projektów\n"
 
 #: src/xgettext.c:1010
@@ -4203,16 +3798,13 @@ msgstr "      --package-version=WERSJA    podanie na wyjściu WERSJI pakietu\n"
 
 #: src/xgettext.c:1014
 #, 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:1016
 #, 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"
@@ -4221,21 +3813,16 @@ msgstr ""
 #: src/xgettext.c:1019
 #, 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:1840
 #, 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"
+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:1965
 msgid "standard input"
@@ -4263,21 +3850,13 @@ msgstr "%s%s: uwaga: "
 
 #: 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 ""
-"Chociaż %s jest użyte w formacie położenia napisu, %s nie jest prawidłowym "
-"formatem. Powód: %s\n"
+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:2190
 #, 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"
+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:2221
 #, c-format
@@ -4287,8 +3866,7 @@ msgid ""
 "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"
+"Ł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"
@@ -4321,7 +3899,7 @@ msgstr "uwaga: brak kontekstu dla mnogiego argumentu słowa kluczowego „%.*s�
 #: src/xgettext.c:3052
 #, c-format
 msgid "context mismatch between singular and plural form"
-msgstr "pomieszanie kontekstów między formą pojedyńczą i mnogą"
+msgstr "pomieszanie kontekstów między formą pojedynczą i mnogą"
 
 #: src/xgettext.c:3419
 msgid ""
diff --git a/gettext-tools/po/pt.po b/gettext-tools/po/pt.po
index 4c3a1cce6..dcf167314 100644
--- a/gettext-tools/po/pt.po
+++ b/gettext-tools/po/pt.po
@@ -5,1337 +5,209 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.10.23\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\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"
-"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: gnulib-lib/argmatch.c:133
-#, c-format
-msgid "invalid argument %s for %s"
-msgstr ""
-
-#: gnulib-lib/argmatch.c:134
-#, c-format
-msgid "ambiguous argument %s for %s"
-msgstr ""
-
-#: gnulib-lib/argmatch.c:153
-msgid "Valid arguments are:"
-msgstr ""
-
-#: gnulib-lib/clean-temp.c:332
-#, c-format
-msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr ""
-
-#: gnulib-lib/clean-temp.c:346
-#, fuzzy, c-format
-msgid "cannot create a temporary directory using template \"%s\""
-msgstr "imposs�vel criar o ficheiro de sa�da \"%s\""
-
-#: gnulib-lib/clean-temp.c:442
-#, fuzzy, c-format
-msgid "cannot remove temporary file %s"
-msgstr "imposs�vel criar o ficheiro de sa�da \"%s\""
-
-#: gnulib-lib/clean-temp.c:457
-#, 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:217
-#, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:194
-#, fuzzy, c-format
-msgid "error while opening %s for reading"
-msgstr "erro durante a abertura de \"%s\" para leitura"
-
-#: gnulib-lib/copy-file.c:198
-#, c-format
-msgid "cannot open backup file %s for writing"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:202
-#, fuzzy, c-format
-msgid "error reading %s"
-msgstr "erro durante a leitura de \"%s\""
-
-#: gnulib-lib/copy-file.c:206
-#, fuzzy, c-format
-msgid "error writing %s"
-msgstr "erro durante a escrita do ficheiro \"%s\""
-
-#: gnulib-lib/copy-file.c:210
-#, fuzzy, c-format
-msgid "error after reading %s"
-msgstr "erro durante a leitura de \"%s\""
-
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
-#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
-#: src/read-tcl.c:110 src/write-resources.c:77
-#, c-format
-msgid "fdopen() failed"
-msgstr ""
-
-#: gnulib-lib/csharpcomp.c:571
-#, c-format
-msgid "C# compiler not found, try installing pnet"
-msgstr ""
-
-#: gnulib-lib/csharpexec.c:343
-#, c-format
-msgid "C# virtual machine not found, try installing pnet"
-msgstr ""
-
-#: gnulib-lib/error.c:188
+#: lib/error.c:103
 msgid "Unknown system error"
 msgstr "Erro desconhecido do sistema"
 
-#: 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
+#: lib/getopt.c:680
 #, c-format
-msgid "%s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: a op��o `%s' � amb�gua\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: lib/getopt.c:704
+#, 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:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: lib/getopt.c:709
+#, 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:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: lib/getopt.c:726 lib/getopt.c:899
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: a op��o `%s' requere um argumento\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#. --option
+#: lib/getopt.c:755
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: op��o n�o reconhecida `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
+#. +option or -option
+#: lib/getopt.c:759
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: op��o n�o reconhecida `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:785
+#, c-format
+msgid "%s: illegal option -- %c\n"
 msgstr "%s: op��o ilegal -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
+#: lib/getopt.c:788
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: op��o ilegal -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:818 lib/getopt.c:948
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: op��o requere um argumento -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
+#: lib/getopt.c:865
 #, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: a op��o `%s' � amb�gua\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
+#: lib/getopt.c:883
 #, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: a op��o `--%s' n�o permite um argumento\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: a op��o `%s' requere um argumento\n"
-
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
-#, c-format
-msgid "invalid source_version argument to compile_java_class"
-msgstr ""
-
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
-#, 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
-#, c-format
-msgid "failed to create \"%s\""
-msgstr ""
-
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c: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
-#, c-format
-msgid "error while writing \"%s\" file"
-msgstr "erro durante a escrita do ficheiro \"%s\""
-
-#: gnulib-lib/javacomp.c:2343
-#, c-format
-msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr ""
-
-#: gnulib-lib/javaexec.c:417
-#, c-format
-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
-#, c-format
-msgid "%s subprocess I/O error"
-msgstr ""
-
-#: 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
-#, fuzzy, c-format
-msgid "memory exhausted"
+#: lib/xmalloc.c:82
+#, fuzzy
+msgid "Memory exhausted"
 msgstr "mem�ria exausta"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, 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
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
-#. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
-msgid "`"
-msgstr ""
-
-#: gnulib-lib/quotearg.c:313
-msgid "'"
-msgstr ""
-
-#: gnulib-lib/set-acl.c:46
-#, c-format
-msgid "setting permissions for %s"
-msgstr ""
-
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "imposs�vel criar o ficheiro de sa�da \"%s\""
-
-#: gnulib-lib/w32spawn.h:43
-#, c-format
-msgid "_open_osfhandle failed"
-msgstr ""
-
-#: gnulib-lib/w32spawn.h:84
-#, fuzzy, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "imposs�vel criar o ficheiro de sa�da \"%s\""
-
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
-#, c-format
-msgid "%s subprocess"
-msgstr ""
-
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
-#, 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
-#, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "erro durante a abertura de \"%s\" para leitura"
-
-#: src/format.c:151
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr ""
-
-#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c: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-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 "as especifica��es do argumento %u s�o diferentes"
-
-#: 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-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
-#, fuzzy, c-format
-msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "as especifica��es do argumento %u s�o diferentes"
-
-#: src/format-awk.c: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-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr "as especifica��es do argumento %u s�o diferentes"
-
-#: src/format-boost.c:449
-#, c-format
-msgid "The directive number %u starts with | but does not end with |."
-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/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
-msgid "number of format specifications in '%s' and '%s' does not match"
-msgstr "o n�mero de especifica��es em `msgid' e `msgstr' � diferente"
-
-#: src/format-csharp.c:88 src/format-java.c:205
-#, c-format
-msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr ""
-
-#: src/format-csharp.c:109
-#, 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 '}'."
-msgstr ""
-
-#: src/format-csharp.c:139
-#, c-format
-msgid ""
-"The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr ""
-
-#: src/format-csharp.c:140
-#, 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 "
-"'{'."
-msgstr ""
-
-#: src/format-csharp.c:162
-#, 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/format-java.c:745
-#, fuzzy, c-format
-msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "as especifica��es do argumento %u s�o diferentes"
-
-#: src/format-java.c:756
-#, fuzzy, c-format
-msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "as especifica��es do argumento %u s�o diferentes"
-
-#: src/format-java.c:776
-#, fuzzy, c-format
-msgid ""
-"format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "as especifica��es do argumento %u s�o diferentes"
-
-#: src/format-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 ""
-
-#: src/format-lisp.c:2372 src/format-scheme.c:2398
-#, c-format
-msgid ""
-"In the directive number %u, too many parameters are given; expected at most "
-"%u parameter."
-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
-#, 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
-#, c-format
-msgid "In the directive number %u, the argument %d is negative."
-msgstr ""
-
-#: src/format-lisp.c:2805
-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
-#, c-format
-msgid "Found '~%c' without matching '~%c'."
-msgstr ""
-
-#: src/format-lisp.c:2863 src/format-scheme.c:2860
-#, 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
-#, 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
-#, 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
-msgid "The string refers to some argument in incompatible ways."
-msgstr ""
-
-#: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "as especifica��es do argumento %u s�o diferentes"
-
-#: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr "as especifica��es do argumento %u s�o diferentes"
-
-#: 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-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
-#, fuzzy, c-format
-msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "as especifica��es do argumento %u s�o diferentes"
-
-#: src/format-python.c: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/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 "as especifica��es do argumento %u s�o diferentes"
-
-#: src/format-python.c:494
-#, fuzzy, c-format
-msgid ""
-"format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "as especifica��es do argumento %u s�o diferentes"
-
-#: src/format-python-brace.c:137
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr ""
-
-#: src/format-python-brace.c:150
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr ""
-
-#: src/format-python-brace.c:165
-#, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr ""
-
-#: src/format-python-brace.c:185
-#, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr ""
-
-#: src/format-python-brace.c:270
-#, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-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"
-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 ""
-
-#: 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
+#: 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
 #, 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"
+"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 ""
 
-#: 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
+#: 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
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
 
-#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c: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
-msgid "Bruno Haible"
-msgstr ""
+#: src/gettextp.c:154
+msgid "missing arguments"
+msgstr "argumentos insuficientes"
 
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
-#, c-format
+#: src/gettextp.c:164
 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
+#: 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"
+msgid "Try `%s --help' for more information.\n"
 msgstr "Tente `%s --help' para mais informa��o\n"
 
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
-#, c-format, no-wrap
-msgid "Usage: %s [OPTION]\n"
-msgstr ""
-
-#: src/hostname.c:215
-#, c-format
-msgid "Print the machine's hostname.\n"
-msgstr ""
-
-#: src/hostname.c:218
-#, c-format
-msgid "Output format:\n"
-msgstr ""
-
-#: src/hostname.c:220
-#, c-format
-msgid "  -s, --short                 short host name\n"
-msgstr ""
-
-#: src/hostname.c:222
-#, c-format
-msgid ""
-"  -f, --fqdn, --long          long host name, includes fully qualified "
-"domain\n"
-"                                name, and aliases\n"
-msgstr ""
-
-#: src/hostname.c:225
-#, 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
-#, c-format, no-wrap
-msgid "Informative output:\n"
-msgstr ""
-
-#: 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 ""
-
-#: 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
+#: src/gettextp.c:233
 #, 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/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 ""
-
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
-#, c-format
-msgid "could not get host name"
-msgstr ""
-
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: 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: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
-#, 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 ""
-
-#: 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: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/msguniq.c:342
-#, c-format
-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
-#, fuzzy, c-format
-msgid "Input file location:\n"
-msgstr "nenhum ficheiro de entrada fornecido"
-
-#: 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: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
-#, 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:285 src/msgfilter.c:424
-#: 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
-#, 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
-#, 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/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:406 src/msgcomm.c:397 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: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/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
-#, 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:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 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: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
-#, 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
-#, 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: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
-#, 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
-#, c-format
-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
-#, c-format
 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
-#, 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
-#, 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
-#, 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
-#, c-format
-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
-#, c-format
-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
-#, 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
-#, c-format
-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
-#, 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
-#, 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
-#, 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
-#, c-format
-msgid "  -F, --sort-by-file          sort output by file location\n"
-msgstr ""
-
-#: src/msgcat.c:322 src/msgcomm.c:327
-#, c-format
-msgid "impossible selection criteria specified (%d < n < %d)"
-msgstr ""
-
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
-#, c-format
-msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
-msgstr ""
-
-#: src/msgcat.c:372
+"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
 #, 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, 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:389 src/msgcomm.c:380 src/xgettext.c:871
-#, c-format
-msgid "  INPUTFILE ...               input files\n"
-msgstr ""
-
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
-#, 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
-#, c-format
-msgid "If input file is -, standard input is read.\n"
-msgstr ""
-
-#: src/msgcat.c:408 src/msgcomm.c:399
-#, 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
-#, 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
-#, c-format
-msgid ""
-"  -u, --unique                shorthand for --less-than=2, requests\n"
-"                              that only unique messages be printed\n"
+"\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"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
-#, c-format
-msgid ""
-"  -P, --properties-input      input files are in Java .properties syntax\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"
 msgstr ""
 
-#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/message.c:784
 #, c-format
 msgid ""
-"      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
-"                              syntax\n"
+"internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
+"as mensagens de internacionaliza��o n�o devem conter\n"
+"a sequ�ncia de escape `\\%c'"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/message.c:1115
 #, c-format
-msgid "  -t, --to-code=NAME          encoding for output\n"
-msgstr ""
+msgid "cannot create output file \"%s\""
+msgstr "imposs�vel criar o ficheiro de sa�da \"%s\""
 
-#: src/msgcat.c:430 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/message.c:1122
+#, no-c-format
+msgid "standard output"
+msgstr "canal de sa�da por defeito (stdout)"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/message.c:1182
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:359
-msgid "Peter Miller"
-msgstr ""
+msgid "error while writing \"%s\" file"
+msgstr "erro durante a escrita do ficheiro \"%s\""
 
-#: src/msgcmp.c:189 src/msgmerge.c:370
-#, c-format
+#: src/msgcmp.c:160 src/msgmerge.c:270
 msgid "no input files given"
 msgstr "ficheiros de entrada n�o fornecidos"
 
-#: src/msgcmp.c:194 src/msgmerge.c:375
-#, c-format
+#: src/msgcmp.c:165 src/msgmerge.c:275
 msgid "exactly 2 input files required"
 msgstr "s�o necess�rios exactamente 2 ficheiros"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
-#, c-format
-msgid "Usage: %s [OPTION] def.po ref.pot\n"
-msgstr ""
-
-#: src/msgcmp.c:218
-#, fuzzy, c-format, no-wrap
+#: src/msgcmp.c:186
+#, 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"
-"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"
+"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"
@@ -1354,1171 +226,361 @@ msgstr ""
 "� usado um emparelhamento aproximado para produzir melhores\n"
 "diagn�sticos.\n"
 
-#: src/msgcmp.c:232
-#, c-format
-msgid "  def.po                      translations\n"
-msgstr ""
-
-#: src/msgcmp.c:234
-#, c-format
-msgid "  ref.pot                     references to the sources\n"
-msgstr ""
-
-#: src/msgcmp.c:239 src/msgmerge.c:551
-#, c-format
-msgid "Operation modifiers:\n"
-msgstr ""
-
-#: src/msgcmp.c:241 src/msgmerge.c:553
-#, c-format
-msgid ""
-"  -m, --multi-domain          apply ref.pot to each of the domains in def."
-"po\n"
-msgstr ""
-
-#: src/msgcmp.c:243 src/msgmerge.c:555
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgcmp.c:245
-#, c-format
-msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr ""
-
-#: src/msgcmp.c:247
-#, c-format
-msgid "      --use-untranslated      consider untranslated entries\n"
-msgstr ""
-
-#: src/msgcmp.c:324
-#, fuzzy, c-format
-msgid "this message is untranslated"
-msgstr "aten��o: esta mensagem n�o � usada"
-
-#: src/msgcmp.c:330
-#, c-format
-msgid "this message needs to be reviewed by the translator"
-msgstr ""
-
-#: src/msgcmp.c:369 src/msgmerge.c:1505
-#, c-format
+#: src/msgcmp.c:259 src/msgmerge.c:714
 msgid "this message is used but not defined..."
 msgstr "esta mensagem � usada mas n�o definida..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1508
-#, c-format
+#: src/msgcmp.c:261 src/msgmerge.c:716
 msgid "...but this definition is similar"
 msgstr "...mas esta defini��o � semelhante"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:267 src/msgmerge.c:743
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "esta mensagem � usada mas n�o definida em %s"
 
-#: src/msgcmp.c:546
-#, c-format
+#: src/msgcmp.c:281
 msgid "warning: this message is not used"
 msgstr "aten��o: esta mensagem n�o � usada"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
-#, fuzzy, c-format
-msgid "found %d fatal error"
-msgid_plural "found %d fatal errors"
-msgstr[0] "encontrados %d erros fatais"
-msgstr[1] "encontrados %d erros fatais"
-
-#: src/msgcomm.c:316
-#, c-format
-msgid "at least two files must be specified"
-msgstr ""
-
-#: src/msgcomm.c:364
-#, 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 ""
-
-#: src/msgcomm.c:402
-#, 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
-#, 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:584
-#, 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
-#, 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
-#, c-format
-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
-#, c-format
-msgid "      --strict                strict Uniforum output style\n"
-msgstr ""
-
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
-#, c-format
-msgid "no input file given"
-msgstr "nenhum ficheiro de entrada fornecido"
-
-#: src/msgen.c:263
-#, fuzzy, c-format
-msgid "exactly one input file required"
-msgstr "s�o necess�rios exactamente 2 ficheiros"
-
-#: src/msgen.c:304
-#, c-format
-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:196
-#, c-format
-msgid "missing command name"
-msgstr ""
-
-#: src/msgexec.c:257
-#, c-format
-msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-msgstr ""
-
-#: src/msgexec.c:262
-#, 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:271
-#, c-format, no-wrap
-msgid ""
-"A special builtin command called '0' outputs the translation, followed by a\n"
-"null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
-msgstr ""
-
-#: src/msgexec.c:281 src/msgfilter.c:420
-#, c-format
-msgid "  -i, --input=INPUTFILE       input PO file\n"
-msgstr ""
-
-#: src/msgexec.c:345
-#, c-format
-msgid "write to stdout failed"
-msgstr ""
-
-#: src/msgfilter.c:298
-#, fuzzy, c-format
-msgid "missing filter name"
-msgstr "argumentos insuficientes"
-
-#: src/msgfilter.c:318
-#, c-format
-msgid "at least one sed script must be specified"
-msgstr ""
-
-#: src/msgfilter.c:407
-#, c-format
-msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr ""
-
-#: src/msgfilter.c:411
-#, c-format
-msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr ""
-
-#: src/msgfilter.c:435
-#, 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
-#, c-format
-msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
-msgstr ""
-
-#: src/msgfilter.c:442
-#, c-format
-msgid ""
-"  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr ""
-
-#: src/msgfilter.c:444
-#, c-format
-msgid ""
-"  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
-"commands\n"
-"                                to be executed\n"
-msgstr ""
-
-#: src/msgfilter.c:447
-#, c-format
-msgid ""
-"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr ""
-
-#: src/msgfilter.c:465 src/msggrep.c:600
-#, c-format
-msgid ""
-"      --no-escape             do not use C escapes in output (default)\n"
-msgstr ""
-
-#: src/msgfilter.c:471 src/msggrep.c:606
-#, c-format
-msgid "      --indent                indented output style\n"
-msgstr ""
-
-#: src/msgfilter.c:473
-#, c-format
-msgid ""
-"      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr ""
-
-#: src/msgfmt.c:345
-#, c-format
-msgid "the argument to %s should be a single punctuation character"
-msgstr ""
-
-#: src/msgfmt.c:392
-#, c-format
-msgid "invalid endianness: %s"
-msgstr ""
+#: 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"
 
-#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
-msgid "Ulrich Drepper"
-msgstr ""
+#: 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/msgfmt.c:439
+#: src/msgcmp.c:396 src/msgmerge.c:542
 #, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr ""
+msgid "this message has no definition in the \"%s\" domain"
+msgstr "esta mensagem n�o tem defini��o no dom�nio \"%s\""
 
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
-#: src/msgunfmt.c:353
-#, c-format
-msgid "%s requires a \"-d directory\" specification"
-msgstr ""
+#. 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/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgcomm.c:273 src/msgcomm.c:277 src/xgettext.c:378 src/xgettext.c:382
 #, c-format
-msgid "%s requires a \"-l locale\" specification"
-msgstr ""
-
-#: src/msgfmt.c:538
-#, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr ""
-
-#: src/msgfmt.c:545
-#, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr ""
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
+msgid "%s and %s are mutually exclusive"
 msgstr "%s e %s s�o mutuamente exclusivas"
 
-#: src/msgfmt.c:565 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
-#, c-format
-msgid "%s is only valid with %s, %s or %s"
-msgstr ""
-
-#. TRANSLATORS: The prefix before a statistics message.  The argument
-#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:740
-#, c-format
-msgid "%s: "
-msgstr ""
-
-#: src/msgfmt.c:744
-#, fuzzy, c-format
-msgid "%d translated message"
-msgid_plural "%d translated messages"
-msgstr[0] "%d mensagens traduzidas"
-msgstr[1] "%d mensagens traduzidas"
-
-#: src/msgfmt.c:749
-#, fuzzy, c-format
-msgid ", %d fuzzy translation"
-msgid_plural ", %d fuzzy translations"
-msgstr[0] ", %d tradu��es aproximadas"
-msgstr[1] ", %d tradu��es aproximadas"
-
-#: src/msgfmt.c:754
-#, fuzzy, c-format
-msgid ", %d untranslated message"
-msgid_plural ", %d untranslated messages"
-msgstr[0] ", %d mensagens n�o traduzidas"
-msgstr[1] ", %d mensagens n�o traduzidas"
-
-#: src/msgfmt.c:774
-#, c-format
-msgid "Usage: %s [OPTION] filename.po ...\n"
+#: src/msgcomm.c:341
+msgid "at least two files must be specified"
 msgstr ""
 
-#: src/msgfmt.c:778
+#: src/msgcomm.c:360
 #, c-format
-msgid "Generate binary message catalog from textual translation description.\n"
+msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgfmt.c:783 src/xgettext.c:864
-#, c-format, no-wrap
+#: src/msgcomm.c:400
+#, fuzzy, c-format, no-wrap
 msgid ""
+"Usage: %s [OPTION] INPUTFILE ...\n"
 "Mandatory arguments to long options are mandatory for short options too.\n"
-"Similarly for optional arguments.\n"
-msgstr ""
-
-#: src/msgfmt.c:790
-#, 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
-#, c-format
-msgid "Operation mode:\n"
-msgstr ""
-
-#: src/msgfmt.c:799
-#, c-format
-msgid ""
-"  -j, --java                  Java mode: generate a Java ResourceBundle "
-"class\n"
-msgstr ""
-
-#: src/msgfmt.c:801
-#, c-format
-msgid ""
-"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
-"higher)\n"
-msgstr ""
-
-#: src/msgfmt.c:803
-#, c-format
-msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr ""
-
-#: src/msgfmt.c:805
-#, c-format
-msgid ""
-"      --csharp-resources      C# resources mode: generate a .NET .resources "
-"file\n"
-msgstr ""
-
-#: src/msgfmt.c:807
-#, c-format
-msgid ""
-"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr ""
-
-#: src/msgfmt.c:809
-#, c-format
-msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
-msgstr ""
-
-#: src/msgfmt.c:811
-#, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr ""
-
-#: src/msgfmt.c:818
-#, c-format
-msgid "      --strict                enable strict Uniforum mode\n"
-msgstr ""
-
-#: src/msgfmt.c:820 src/xgettext.c:888
-#, c-format
-msgid "If output file is -, output is written to standard output.\n"
-msgstr ""
-
-#: src/msgfmt.c:823
-#, 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
-#, 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
-#, c-format
-msgid ""
-"  -l, --locale=LOCALE         locale name, either language or "
-"language_COUNTRY\n"
-msgstr ""
-
-#: src/msgfmt.c:829
-#, c-format
+"  -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
 msgid ""
-"      --source                produce a .java file, instead of a .class "
+"  -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"
+
+#: 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 ""
 
-#: src/msgfmt.c:831
-#, c-format
-msgid ""
-"  -d DIRECTORY                base directory of classes directory hierarchy\n"
-msgstr ""
-
-#: src/msgfmt.c:833
-#, 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:839
-#, c-format
-msgid "Output file location in C# mode:\n"
-msgstr ""
-
-#: src/msgfmt.c:845 src/msgunfmt.c:473
-#, c-format
-msgid ""
-"  -d DIRECTORY                base directory for locale dependent .dll "
-"files\n"
-msgstr ""
-
-#: src/msgfmt.c:847
-#, 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
-#, c-format
-msgid "Output file location in Tcl mode:\n"
-msgstr ""
-
-#: src/msgfmt.c:855 src/msgunfmt.c:483
-#, c-format
-msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
-msgstr ""
-
-#: src/msgfmt.c:857
-#, 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
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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
-#, 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:886 src/xgettext.c:905
-#, c-format
-msgid "Input file interpretation:\n"
-msgstr ""
-
-#: src/msgfmt.c:888
+#: 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
 #, c-format
-msgid ""
-"  -c, --check                 perform all the checks implied by\n"
-"                                --check-format, --check-header, --check-"
-"domain\n"
-msgstr ""
+msgid "error while opening \"%s\" for reading"
+msgstr "erro durante a abertura de \"%s\" para leitura"
 
-#: src/msgfmt.c:891
-#, c-format
-msgid "      --check-format          check language dependent format strings\n"
-msgstr ""
+#: 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:893
-#, c-format
-msgid ""
-"      --check-header          verify presence and contents of the header "
-"entry\n"
-msgstr ""
+#: src/msgfmt.c:273 src/xgettext.c:410
+msgid "no input file given"
+msgstr "nenhum ficheiro de entrada fornecido"
 
-#: src/msgfmt.c:895
+#: src/msgfmt.c:321
 #, c-format
-msgid ""
-"      --check-domain          check for conflicts between domain directives\n"
-"                                and the --output-file option\n"
-msgstr ""
+msgid "error while opening \"%s\" for writing"
+msgstr "erro durante a abertura de \"%s\" para escrita"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:343
 #, c-format
-msgid ""
-"  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
-"msgfmt\n"
-msgstr ""
+msgid "%d translated messages"
+msgstr "%d mensagens traduzidas"
 
-#: src/msgfmt.c:900
+#: src/msgfmt.c:345
 #, c-format
-msgid ""
-"      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
-"for\n"
-"                                menu items\n"
-msgstr ""
+msgid ", %d fuzzy translations"
+msgstr ", %d tradu��es aproximadas"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:347
 #, c-format
-msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
-msgstr ""
+msgid ", %d untranslated messages"
+msgstr ", %d mensagens n�o traduzidas"
 
-#: src/msgfmt.c:908
-#, c-format
+#: src/msgfmt.c:366
+#, fuzzy, 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"
-msgstr ""
-
-#: src/msgfmt.c:910
-#, 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:913
-#, c-format
-msgid ""
+"  -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"
 
-#: src/msgfmt.c:922
-#, c-format
-msgid "      --statistics            print statistics about translations\n"
-msgstr ""
-
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
-#, c-format
-msgid "  -v, --verbose               increase verbosity level\n"
-msgstr ""
-
-#: src/msgfmt.c:1037
-#, c-format
-msgid "warning: PO file header missing or invalid\n"
-msgstr ""
-
-#: src/msgfmt.c:1040
-#, c-format
-msgid "warning: charset conversion will not work\n"
-msgstr ""
-
-#: src/msgfmt.c:1050
-#, c-format
-msgid "warning: PO file header fuzzy\n"
-msgstr ""
+#: src/msgfmt.c:409
+msgid "while creating hash table"
+msgstr "durante a cria��o da tabela de dispers�o"
 
-#: src/msgfmt.c:1052
-#, c-format
-msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr ""
+#: src/msgfmt.c:451
+#, fuzzy, c-format
+msgid "%s: warning: no header entry found"
+msgstr "cuidado: nenhum elemento encontrado no cabe�alho"
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:473
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "nome de dom�nio \"%s\" n�o apropriado como nome de ficheiro"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:478
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "nome de dom�nio \"%s\" n�o apropriado como nome de ficheiro:\n"
 "prefixo usado"
 
-#: src/msgfmt.c:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#. We don't change the exit status here because this is really
+#. only an information.
+#: src/msgfmt.c:491
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "directiva `dom�nio %s' ignorada"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:519
+msgid "empty `msgstr' entry ignored"
 msgstr "elemento `msgstr' vazio ignorada"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:520
+#, fuzzy
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "elemento `msgstr' vazio ignorada"
 
-#: src/msgfmt.c:1205
-#, fuzzy, c-format
-msgid "%s: warning: source file contains fuzzy translation"
-msgstr "CUIDADO: o ficheiro fonte cont�m tradu��es aproximadas"
-
-#: src/msgfmt.c:1318
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
-#, 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
-#, c-format
-msgid "error while reading \"%s\""
-msgstr "erro durante a leitura de \"%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 ""
-
-#: 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:297
-msgid ""
-"You are in a language indifferent environment.  Please set\n"
-"your LANG environment variable, as described in the ABOUT-NLS\n"
-"file.  This is necessary so you can test your translations.\n"
-msgstr ""
-
-#: src/msginit.c:321
-#, 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:347
-#, c-format
-msgid "Created %s.\n"
-msgstr ""
-
-#: src/msginit.c:367
-#, c-format, no-wrap
-msgid ""
-"Creates a new PO file, initializing the meta information with values from the\n"
-"user's environment.\n"
-msgstr ""
-
-#: src/msginit.c:377
-#, c-format
-msgid "  -i, --input=INPUTFILE       input POT file\n"
-msgstr ""
-
-#: src/msginit.c:379
-#, 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:385
-#, c-format
-msgid "  -o, --output-file=FILE      write output to specified PO file\n"
-msgstr ""
-
-#: src/msginit.c:387
-#, c-format
-msgid ""
-"If no output file is given, it depends on the --locale option or the user's\n"
-"locale setting.  If it is -, the results are written to standard output.\n"
-msgstr ""
-
-#: src/msginit.c:400
-#, c-format
-msgid "  -l, --locale=LL_CC          set target locale\n"
-msgstr ""
-
-#: src/msginit.c:402
-#, c-format
-msgid ""
-"      --no-translator         assume the PO file is automatically generated\n"
-msgstr ""
-
-#: src/msginit.c:468
-msgid ""
-"Found more than one .pot file.\n"
-"Please specify the input .pot file through the --input option.\n"
-msgstr ""
-
-#: src/msginit.c:476 src/msginit.c:481
-#, c-format
-msgid "error reading current directory"
-msgstr ""
-
-#: src/msginit.c:489
-msgid ""
-"Found no .pot file in the current directory.\n"
-"Please specify the input .pot file through the --input option.\n"
-msgstr ""
-
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
-#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
-#: src/read-tcl.c:127 src/write-resources.c:104
-#, c-format
-msgid "%s subprocess failed with exit code %d"
-msgstr ""
-
-#: src/msginit.c:1118
-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:1534
-#, c-format
-msgid "English translations for %s package"
-msgstr ""
-
-#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
-#, c-format
-msgid "present charset \"%s\" is not a portable encoding name"
-msgstr ""
-
-#: src/msgl-cat.c:188 src/msgl-iconv.c:259
-#, 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:391 src/msgl-iconv.c:375
-#, 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
-#, c-format
-msgid "warning: "
-msgstr ""
-
-#: src/msgl-cat.c:443
-#, c-format
-msgid ""
-"Input files contain messages in different encodings, UTF-8 among others.\n"
-"Converting the output to UTF-8.\n"
-msgstr ""
-
-#: src/msgl-cat.c:449
-#, 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:488
-#, 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: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 ""
-
-#: src/msgl-charset.c:100
-#, c-format
-msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr ""
-
-#: 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 ""
-
-#: src/msgl-charset.c:114
+#: src/msgfmt.c:563
 #, 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: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 ""
-
-#: src/msgl-check.c:130
-msgid "plural expression can produce negative values"
-msgstr ""
-
-#: src/msgl-check.c:141
-#, c-format
-msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr ""
-
-#: src/msgl-check.c:187
-msgid "plural expression can produce division by zero"
-msgstr ""
-
-#: src/msgl-check.c:192
-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:266
-#, c-format
-msgid "Try using the following, valid for %s:"
-msgstr ""
-
-#: src/msgl-check.c:358 src/msgl-check.c:382
-msgid "message catalog has plural form translations"
-msgstr ""
-
-#: src/msgl-check.c:360
-msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr ""
-
-#: src/msgl-check.c:384
-msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr ""
-
-#: src/msgl-check.c:420
-msgid "invalid nplurals value"
-msgstr ""
-
-#: src/msgl-check.c:442
-msgid "invalid plural expression"
-msgstr ""
+msgid "headerfield `%s' missing in header"
+msgstr "o campo `%s' falta no cabe�alho"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgfmt.c:566
 #, c-format
-msgid "nplurals = %lu"
-msgstr ""
+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"
 
-#: src/msgl-check.c:474
-#, 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/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/msgl-check.c:490
+#: src/msgfmt.c:587
 #, 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;\""
-msgstr ""
+msgid "field `%s' still has initial default value"
+msgstr "o campo `%s' ainda tem o valor por defeito inicial"
 
-#: src/msgl-check.c:611
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
-msgstr "os campos `msgid' e `msgstr' n�o come�am ambos por '\\n'"
-
-#: src/msgl-check.c:619
+#: src/msgfmt.c:672
 #, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "os campos `msgid' e `msgstr' n�o come�am ambos por '\\n'"
+msgid "%s: warning: source file contains fuzzy translation"
+msgstr "CUIDADO: o ficheiro fonte cont�m tradu��es aproximadas"
 
-#: src/msgl-check.c:634
+#: src/msgfmt.c:874
 #, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "os campos `msgid' e `msgstr' n�o come�am ambos por '\\n'"
 
-#: src/msgl-check.c:652
+#: src/msgfmt.c:882
 #, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "os campos `msgid' e `msgstr' n�o terminam ambos por '\\n'"
 
-#: src/msgl-check.c:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
-msgstr "os campos `msgid' e `msgstr' n�o terminam ambos por '\\n'"
-
-#: src/msgl-check.c:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
-msgstr "os campos `msgid' e `msgstr' n�o terminam ambos por '\\n'"
-
-#: src/msgl-check.c:687
-msgid "plural handling is a GNU gettext extension"
-msgstr ""
-
-#: src/msgl-check.c:729
-#, c-format
-msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr ""
-
-#: src/msgl-check.c:740
-#, c-format
-msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr ""
-
-#: src/msgl-check.c:804
-#, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "alguns campos do cabe�alho ainda t�m o valor inicial por defeito"
-
-#: src/msgl-check.c:820
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "o campo `%s' falta no cabe�alho"
-
-#: 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 "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "erro durante a abertura de \"%s\" para leitura"
-
-#: src/msgl-iconv.c:290
-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
-#, c-format
-msgid ""
-"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
-"not support this conversion."
-msgstr ""
+#: 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"
 
-#: src/msgl-iconv.c:335
+#: src/msgfmt.c:913
 #, c-format
-msgid ""
-"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
-"msgids become equal."
-msgstr ""
+msgid "format specifications for argument %u are not the same"
+msgstr "as especifica��es do argumento %u s�o diferentes"
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
-#, c-format
+#: src/msgmerge.c:306
+#, fuzzy, c-format, no-wrap
 msgid ""
-"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
-"built without iconv()."
-msgstr ""
-
-#: src/msgmerge.c:392 src/msgmerge.c:398
-#, c-format
-msgid "%s is only valid with %s"
-msgstr ""
-
-#: src/msgmerge.c:453
-msgid "backup type"
+"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:490
-#, fuzzy, c-format, no-wrap
+#: src/msgmerge.c:324
+#, no-wrap
 msgid ""
+"\n"
 "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"
+"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.\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"
 msgstr ""
 "\n"
 "Combina 2 ficheiros .po do tipo Uniforum num s�. O ficheiro def.po\n"
@@ -2534,1693 +596,257 @@ msgstr ""
 "resultados ser�o escritos no canal de sa�da por defeito (stdout) a\n"
 "menos que seja especificado um ficheiro de sa�da.\n"
 
-#: src/msgmerge.c:507
-#, c-format
-msgid "  def.po                      translations referring to old sources\n"
-msgstr ""
-
-#: src/msgmerge.c:509
-#, c-format
-msgid "  ref.pot                     references to new sources\n"
-msgstr ""
-
-#: src/msgmerge.c:513
-#, c-format
-msgid ""
-"  -C, --compendium=FILE       additional library of message translations,\n"
-"                              may be specified more than once\n"
-msgstr ""
-
-#: src/msgmerge.c:519
-#, c-format
-msgid ""
-"  -U, --update                update def.po,\n"
-"                              do nothing if def.po already up to date\n"
-msgstr ""
-
-#: src/msgmerge.c:531
-#, c-format
-msgid "Output file location in update mode:\n"
-msgstr ""
-
-#: src/msgmerge.c:533
-#, c-format
-msgid "The result is written back to def.po.\n"
-msgstr ""
-
-#: src/msgmerge.c:535
-#, c-format
-msgid "      --backup=CONTROL        make a backup of def.po\n"
-msgstr ""
-
-#: src/msgmerge.c:537
-#, c-format
-msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr ""
-
-#: src/msgmerge.c:539
-#, 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:546
+#: src/msgmerge.c:772
 #, c-format
 msgid ""
-"The backup suffix is '~', unless set with --suffix or the "
-"SIMPLE_BACKUP_SUFFIX\n"
-"environment variable.\n"
-msgstr ""
-
-#: src/msgmerge.c:557
-#, c-format
-msgid ""
-"      --previous              keep previous msgids of translated messages\n"
-msgstr ""
-
-#: src/msgmerge.c:614 src/urlget.c:192
-#, c-format
-msgid "  -q, --quiet, --silent       suppress progress indicators\n"
-msgstr ""
-
-#: src/msgmerge.c:1609
-#, fuzzy, c-format
-msgid "this message should define plural forms"
-msgstr "esta mensagem � usada mas n�o definida em %s"
-
-#: src/msgmerge.c:1632
-#, fuzzy, c-format
-msgid "this message should not define plural forms"
-msgstr "esta mensagem � usada mas n�o definida em %s"
-
-#: src/msgmerge.c:2035
-#, fuzzy, c-format
-msgid ""
-"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
-"obsolete %ld.\n"
+"%sRead %d old + %d reference, merged %d, fuzzied %d, missing %d, obsolete "
+"%d.\n"
 msgstr ""
 "%sLidas %d antigas + %d refer�ncias, combinadas %d, aproximadas %d, faltam "
 "%d, obsoletas %d.\n"
 
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
-#, c-format
+#: src/msgmerge.c:778
 msgid " done.\n"
 msgstr "terminado.\n"
 
-#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
-#, fuzzy, c-format
-msgid "%s and explicit file names are mutually exclusive"
-msgstr "%s e %s s�o mutuamente exclusivas"
-
-#: src/msgunfmt.c: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 ""
-"  -j, --java                  Java mode: input is a Java ResourceBundle "
-"class\n"
-msgstr ""
-
-#: 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 ""
-"      --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"
-msgstr ""
-
-#: 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 ""
-"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:467
-#, c-format
-msgid "Input file location in C# mode:\n"
-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 ""
-
-#: 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 ""
-"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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: src/po-charset.c:557
-#, c-format
+#: src/msgunfmt.c:215
+#, fuzzy, c-format, no-wrap
 msgid ""
-"Charset \"%s\" is not supported. %s relies on iconv(),\n"
-"and iconv() does not support \"%s\".\n"
-msgstr ""
+"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/po-charset.c:564 src/po-charset.c:612
+#: src/msgunfmt.c:229
+#, no-wrap
 msgid ""
-"Installing GNU libiconv and then reinstalling GNU gettext\n"
-"would fix this problem.\n"
-msgstr ""
-
-#: src/po-charset.c:578 src/po-charset.c:616
-msgid "Continuing anyway, expect parse errors."
-msgstr ""
-
-#: src/po-charset.c:580
-msgid "Continuing anyway."
+"\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"
 
-#: src/po-charset.c:607
+#: src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
 #, 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:644
-msgid ""
-"Charset missing in header.\n"
-"Message conversion to user's charset will not work.\n"
-msgstr ""
+msgid "error while reading \"%s\""
+msgstr "erro durante a leitura de \"%s\""
 
-#: src/po-gram-gen.y:93
+#: src/msgunfmt.c:267 src/msgunfmt.c:331
 #, c-format
-msgid "inconsistent use of #~"
-msgstr ""
+msgid "file \"%s\" truncated"
+msgstr "ficheiro \"%s\"truncado"
 
-#: src/po-gram-gen.y:243
+#: src/msgunfmt.c:298
 #, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
-msgstr "falta a sec��o `msgstr'"
+msgid "seek \"%s\" offset %ld failed"
+msgstr "seek \"%s\" offset %ld falhou"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
-msgstr "falta a sec��o `msgstr'"
+#: src/msgunfmt.c:373
+#, c-format
+msgid "file \"%s\" is not in GNU .mo format"
+msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: ../../src/po-gram.y:83
+msgid "missing `msgstr' section"
 msgstr "falta a sec��o `msgstr'"
 
-#: src/po-gram-gen.y:399
-#, c-format
-msgid "first plural form has nonzero index"
-msgstr ""
-
-#: src/po-gram-gen.y:401
+#: src/po-lex.c:84
 #, c-format
-msgid "plural form has wrong index"
-msgstr ""
+msgid "found %d fatal errors"
+msgstr "encontrados %d erros fatais"
 
-#: src/po-lex.c:90 src/po-lex.c:109
-#, c-format
+#: src/po-lex.c:129 src/po-lex.c:168
 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
-#, c-format
-msgid "invalid multibyte sequence"
-msgstr ""
-
-#: src/po-lex.c:465
-#, c-format
-msgid "incomplete multibyte sequence at end of file"
-msgstr ""
-
-#: src/po-lex.c:475
-#, c-format
-msgid "incomplete multibyte sequence at end of line"
-msgstr ""
-
-#: src/po-lex.c:487
-msgid "iconv failure"
-msgstr ""
-
-#: src/po-lex.c:744
+#: src/po-lex.c:241
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "palavra chave \"%s\" desconhecida"
 
-#: src/po-lex.c:854
-#, fuzzy, c-format
-msgid "invalid control sequence"
+#: src/po-lex.c:332
+msgid "illegal control sequence"
 msgstr "sequ�ncia de controlo ilegal"
 
-#: src/po-lex.c:981
-#, c-format
-msgid "end-of-file within string"
-msgstr "fim-de-ficheiro dentro da cadeia"
-
-#: src/po-lex.c:987
-#, c-format
+#: src/po-lex.c:415
 msgid "end-of-line within string"
 msgstr "fim-de-linha dentro da cadeia"
 
-#: src/po-lex.c:1008
-#, c-format
-msgid "context separator <EOT> within string"
-msgstr ""
-
-#: src/read-catalog.c:318 src/xgettext.c:1046
-#, 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:363
-msgid "duplicate message definition"
-msgstr "defini��o de mensagem duplicada"
-
-#: src/read-catalog.c:365
-msgid "this is the location of the first definition"
-msgstr "este � o local da primeira defini��o"
-
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
-#, fuzzy, c-format
-msgid "file \"%s\" is truncated"
-msgstr "ficheiro \"%s\"truncado"
-
-#: src/read-mo.c:129
-#, fuzzy, c-format
-msgid "file \"%s\" contains a not NUL terminated string"
-msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
-
-#: src/read-mo.c:165 src/read-mo.c:274
-#, 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:178
-#, c-format
-msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr ""
-
-#: src/read-properties.c:227
-msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr ""
-
-#: src/read-stringtable.c:802
-msgid "warning: unterminated string"
-msgstr ""
-
-#: src/read-stringtable.c:810
-msgid "warning: syntax error"
-msgstr ""
-
-#: src/read-stringtable.c:871 src/read-stringtable.c:893
-msgid "warning: unterminated key/value pair"
-msgstr ""
-
-#: src/read-stringtable.c:939
-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:116
-#, c-format
-msgid "Written by %s and %s.\n"
-msgstr ""
-
-#. 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
-msgid "Danilo Segan"
-msgstr ""
-
-#: src/recode-sr-latin.c:153
-#, c-format, no-wrap
-msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr ""
-
-#: src/recode-sr-latin.c:156
-#, 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
-#, c-format
-msgid "input is not valid in \"%s\" encoding"
-msgstr ""
-
-#: src/recode-sr-latin.c:367
-#, fuzzy, c-format
-msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "erro durante a abertura de \"%s\" para leitura"
-
-#: src/urlget.c:159
-#, fuzzy, c-format
-msgid "expected two arguments"
-msgstr "demasiados argumentos"
-
-#: src/urlget.c:176
-#, c-format
-msgid "Usage: %s [OPTION] URL FILE\n"
-msgstr ""
-
-#: src/urlget.c:181
-#, c-format, no-wrap
-msgid ""
-"Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
-"the locally accessible FILE is used instead.\n"
-msgstr ""
-
-#: src/urlget.c:228
-#, fuzzy, c-format
-msgid "error reading \"%s\""
-msgstr "erro durante a leitura de \"%s\""
-
-#: src/urlget.c:234
-#, fuzzy, c-format
-msgid "error writing stdout"
-msgstr "erro durante a escrita do ficheiro \"%s\""
-
-#: src/urlget.c:238
-#, fuzzy, c-format
-msgid "error after reading \"%s\""
-msgstr "erro durante a leitura de \"%s\""
-
-#: src/urlget.c:264
-#, c-format
-msgid "Retrieving %s..."
-msgstr ""
-
-#: src/urlget.c:308
-#, c-format
-msgid " timed out.\n"
-msgstr ""
-
-#: src/urlget.c:445
-#, c-format
-msgid " failed.\n"
-msgstr ""
-
-#: 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 ""
-
-#: 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:162
-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 ""
-
-#: 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:231 src/write-catalog.c:275
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "imposs�vel criar o ficheiro de sa�da \"%s\""
-
-#: src/write-catalog.c:239 src/write-catalog.c:283
-msgid "standard output"
-msgstr "canal de sa�da por defeito (stdout)"
-
-#: src/write-csharp.c:703
-#, c-format
-msgid "failed to create directory \"%s\""
-msgstr ""
-
-#: src/write-csharp.c:766
-#, c-format
-msgid "compilation of C# class failed, please try --verbose"
-msgstr ""
-
-#: src/write-csharp.c:768
-#, c-format
-msgid "compilation of C# class failed"
-msgstr ""
-
-#: src/write-java.c:1091
-#, c-format
-msgid "not a valid Java class name: %s"
-msgstr ""
-
-#: src/write-java.c:1210
-#, c-format
-msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr ""
-
-#: src/write-java.c:1213
-#, 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 "erro durante a abertura de \"%s\" para escrita"
-
-#: src/write-po.c:875
-#, fuzzy, c-format
-msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
-msgstr ""
-"as mensagens de internacionaliza��o n�o devem conter\n"
-"a sequ�ncia de escape `\\%c'"
-
-#: src/write-po.c:1326 src/write-po.c:1450
-#, 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:1338 src/write-po.c:1462
-#, 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:667
-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
-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:717
-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
-msgid "error while writing to %s subprocess"
-msgstr "erro durante a escrita do ficheiro \"%s\""
-
-#: src/write-resources.c:131
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .resources format doesn't support contexts\n"
-msgstr ""
-
-#: src/write-resources.c:150
-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
-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
-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
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated string"
-msgstr "cuidado: nenhum elemento encontrado no cabe�alho"
-
-#: src/x-awk.c:592
-#, c-format
-msgid "%s:%d: warning: unterminated regular expression"
-msgstr ""
+#: src/po-lex.c:420
+msgid "end-of-file within string"
+msgstr "fim-de-ficheiro dentro da cadeia"
 
-#: src/x-c.c:1051
-#, c-format
-msgid "warning: invalid Unicode character"
-msgstr ""
+#: src/xget-lex.c:150
+msgid "standard input"
+msgstr "entrada standard"
 
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/xget-lex.c:892
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr ""
 
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/xget-lex.c:914
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
-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:374
-#, 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/x-csharp.c:1390 src/x-python.c:1138
-#, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr ""
-
-#: src/x-csharp.c:1512 src/x-java.c:875
-#, c-format
-msgid "%s:%d: warning: unterminated string constant"
-msgstr ""
-
-#: src/x-csharp.c:2020 src/x-java.c:1369
-#, c-format
-msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr ""
-
-#: src/x-csharp.c:2054 src/x-java.c:1403
-#, c-format
-msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr ""
-
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
-#, c-format
-msgid "%s:%lu:%lu: %s"
-msgstr ""
-
-#: src/x-glade.c:606
-#, 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
-#, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr ""
-
-#: src/x-javascript.c:230
-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:954
-#, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr ""
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "aten��o: esta mensagem n�o � usada"
-
-#: src/x-javascript.c:1069
-#, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-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
-#, fuzzy, c-format
-msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s: op��o ilegal -- %c\n"
-
-#: 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:278
-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/x-python.c:324
-#, 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:341
-#, 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:354
-#, 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:364
-#, 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:397
-#, 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:722
-#, c-format
-msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr ""
-
-#: src/x-rst.c:108
-#, c-format
-msgid "%s:%d: invalid string definition"
-msgstr ""
-
-#: src/x-rst.c:172
-#, c-format
-msgid "%s:%d: missing number after #"
-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/x-vala.c:413
-#, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr ""
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
-#, c-format
+#: src/xgettext.c:386
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing n�o pode ser usada quando a sa�da\n"
 "� escrita no stdout"
 
-#: src/xgettext.c:653
-#, c-format
-msgid "xgettext cannot work without keywords to look for"
-msgstr ""
-
-#: src/xgettext.c:808
+#: src/xgettext.c:501
 #, 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 ""
 "cuidado: o tipo do ficheiro `%s' com a extens�o `%s' � desconhecido;\n"
 "ser� tentado C"
 
-#: src/xgettext.c:859
-#, c-format
-msgid "Extract translatable strings from given input files.\n"
-msgstr ""
-
-#: src/xgettext.c:882
-#, c-format
-msgid ""
-"  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
-"po)\n"
-msgstr ""
-
-#: src/xgettext.c:884
-#, c-format
-msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr ""
-
-#: src/xgettext.c:886
-#, c-format
-msgid ""
-"  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
-msgstr ""
-
-#: src/xgettext.c:891
-#, fuzzy, c-format
-msgid "Choice of input file language:\n"
-msgstr "nenhum ficheiro de entrada fornecido"
-
-#: 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 ""
-
-#: src/xgettext.c:900
-#, c-format
-msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr ""
-
-#: src/xgettext.c:902
-#, c-format
-msgid ""
-"By default the language is guessed depending on the input file name "
-"extension.\n"
-msgstr ""
-
-#: src/xgettext.c:907
-#, c-format
-msgid ""
-"      --from-code=NAME        encoding of input files\n"
-"                                (except for Python, Tcl, Glade)\n"
-msgstr ""
-
-#: src/xgettext.c:910
-#, c-format
-msgid "By default the input files are assumed to be in ASCII.\n"
-msgstr ""
-
-#: src/xgettext.c:915
-#, c-format
-msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr ""
-
-#: src/xgettext.c:917
-#, c-format
-msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
-msgstr ""
-
-#: src/xgettext.c:919
-#, 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:925
-#, c-format
-msgid "Language specific options:\n"
-msgstr ""
-
-#: src/xgettext.c:927
-#, c-format
-msgid "  -a, --extract-all           extract all strings\n"
-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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: src/xgettext.c:950
-#, c-format
-msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
-msgstr ""
-
-#: src/xgettext.c:952
-#, c-format
-msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr ""
-
-#: src/xgettext.c:954
-#, c-format
-msgid "      --qt                    recognize Qt format strings\n"
-msgstr ""
-
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
-#, c-format
-msgid "                                (only language C++)\n"
-msgstr ""
-
-#: src/xgettext.c:958
-#, c-format
-msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr ""
-
-#: src/xgettext.c:962
-#, c-format
-msgid "      --boost                 recognize Boost format strings\n"
-msgstr ""
-
-#: src/xgettext.c:966
-#, c-format
-msgid ""
-"      --debug                 more detailed formatstring recognition result\n"
-msgstr ""
-
-#: src/xgettext.c:991
-#, c-format
-msgid "      --properties-output     write out a Java .properties file\n"
-msgstr ""
-
-#: src/xgettext.c:1006
-#, c-format
-msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr ""
-
-#: src/xgettext.c:1008
-#, c-format
-msgid ""
-"      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr ""
-
-#: src/xgettext.c:1010
-#, c-format
-msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr ""
-
-#: src/xgettext.c:1012
-#, c-format
-msgid "      --package-version=VERSION  set package version in output\n"
-msgstr ""
-
-#: src/xgettext.c:1014
-#, c-format
-msgid ""
-"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr ""
-
-#: src/xgettext.c:1016
-#, c-format
-msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
-"msgstr\n"
-"                                values\n"
-msgstr ""
-
-#: src/xgettext.c:1019
-#, c-format
-msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
-"msgstr\n"
-"                                values\n"
-msgstr ""
-
-#: src/xgettext.c:1840
-#, c-format
-msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
-"%s"
-msgstr ""
-
-#: src/xgettext.c:1965
-msgid "standard input"
-msgstr "entrada standard"
-
-#: src/xgettext.c:2071
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2075
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr ""
-
-#: src/xgettext.c:2080
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
-#, c-format
-msgid "%s%s: warning: "
-msgstr ""
-
-#: 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 ""
-
-#: src/xgettext.c:2190
-#, c-format
-msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: "
-"%s\n"
-msgstr ""
-
-#: 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 ""
-
-#: src/xgettext.c:2283
+#: src/xgettext.c:537
+#, fuzzy, c-format, no-wrap
 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:2979
-#, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr ""
-
-#: src/xgettext.c:3006
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr ""
-
-#: src/xgettext.c:3031
-#, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr ""
-
-#: src/xgettext.c:3052
-#, c-format
-msgid "context mismatch between singular and plural form"
-msgstr ""
-
-#: src/xgettext.c:3419
+"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
 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 ""
+"  -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"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:1344
 #, c-format
-msgid "language '%s' unknown"
-msgstr ""
-
-#: libgettextpo/gettext-po.c:84
-msgid "<unnamed>"
+msgid "language `%s' unknown"
 msgstr ""
 
-#~ 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 "this is the location of the first definition"
+#~ msgstr "este � o local da primeira defini��o"
 
 #~ 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 65ff1c279..52a5a21d9 100644
--- a/gettext-tools/po/pt_BR.po
+++ b/gettext-tools/po/pt_BR.po
@@ -10,11 +10,10 @@ 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-06-01 11:19+0900\n"
+"POT-Creation-Date: 2014-05-10 13:37+0900\n"
 "PO-Revision-Date: 2014-05-10 17:53-0300\n"
 "Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
-"net>\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"
@@ -39,8 +38,7 @@ msgstr "Argumentos válidos são:"
 #: gnulib-lib/clean-temp.c:332
 #, 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:346
 #, c-format
@@ -203,14 +201,12 @@ msgstr "erro ao gravar o arquivo \"%s\""
 #: gnulib-lib/javacomp.c:2343
 #, 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 "compilador de Java não encontrado, 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 "máquina virtual Java não encontrada, tente instalar gij ou definir $JAVA"
 
 #: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
 #: src/msginit.c:1140
@@ -220,7 +216,7 @@ msgstr "erro de E/S no subprocesso de %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
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "memória insuficiente"
@@ -231,7 +227,7 @@ msgid "creation of threads failed"
 msgstr "criação de fluxos falhou"
 
 #: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "escrita para subprocesso %s falhou"
@@ -327,20 +323,15 @@ msgstr "erro ao abrir \"%s\" para leitura"
 #: src/format.c:151
 #, 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-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-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: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
@@ -358,9 +349,7 @@ msgstr "uma especificação de formato para o argumento %u não existe em \"%s\"
 #: 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:449
 #, c-format
@@ -369,13 +358,8 @@ msgstr "A diretiva número %u inicia com |, mas não termina com |."
 
 #: 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:39
 #, c-format
@@ -385,8 +369,7 @@ msgstr "Na diretiva número %u, o token após \"<\" não está seguido por \">\"
 #: 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:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
 #: src/format-javascript.c:215 src/format-python.c:515
@@ -398,8 +381,7 @@ msgstr "número de especificações de formato em \"%s\" e \"%s\" não conferem"
 #: src/format-csharp.c:88 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:109
 #, c-format
@@ -407,33 +389,22 @@ 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:130 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."
+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:139
 #, 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:140
 #, 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:161 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."
+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:162
 #, c-format
@@ -452,21 +423,13 @@ 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
@@ -503,70 +466,43 @@ 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: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:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
@@ -575,20 +511,13 @@ msgstr "Na diretiva número %u, \"%s\" não está seguido por 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 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: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:572
 #, c-format
@@ -597,59 +526,36 @@ msgstr "Na diretiva de número %u, uma escolha contém nenhum 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 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: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: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: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-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 ""
-"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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -679,12 +585,8 @@ msgstr "Na diretiva de número %u, os modificadores @ e : foram passados."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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:3326 src/format-scheme.c:3263
 #, c-format
@@ -703,71 +605,48 @@ msgstr "especificações de formato em \"%s\" e \"%s\" não são equivalentes"
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in '%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.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-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
 #, 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-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."
+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: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: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: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: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: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-python-brace.c:137
 #, c-format
@@ -786,11 +665,8 @@ msgstr "Na diretiva número %u, \"%c\" não pode iniciar um argumento 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 ""
-"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:270
 #, c-format
@@ -799,32 +675,20 @@ msgstr "Na diretiva número %u, há uma diretiva de formato não terminado."
 
 #: 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: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: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."
+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: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."
+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:85
 msgid "The string refers to a shell variable with an empty name."
@@ -832,19 +696,13 @@ msgstr "A string faz referência a uma variável 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 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: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."
 
 #: 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
@@ -917,8 +775,7 @@ msgstr "  -s, --short                 nome de máquina curto\n"
 #: src/hostname.c:222
 #, 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"
@@ -1007,10 +864,8 @@ msgstr ""
 #: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 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: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
@@ -1030,8 +885,7 @@ msgstr "  ARQUIVO-ENTRADA             arquivo PO de entrada\n"
 #: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
 #: src/xgettext.c:875
 #, 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"
@@ -1040,9 +894,7 @@ msgstr ""
 #: 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: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
@@ -1057,8 +909,7 @@ msgstr "Localização do arquivo de saída:\n"
 #: src/msggrep.c:540 src/msgmerge.c:525 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: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
@@ -1068,8 +919,7 @@ 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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
@@ -1079,16 +929,14 @@ msgstr "Seleção de mensagem:\n"
 
 #: 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: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"
@@ -1096,14 +944,12 @@ msgstr ""
 #: 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: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:460
 #, c-format
@@ -1133,14 +979,12 @@ msgstr "      --clear-fuzzy           apaga \"fuzzy\" de todas as mensagens\n"
 #: 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: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:475
 #, c-format
@@ -1148,39 +992,29 @@ 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: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: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: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: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"
@@ -1193,10 +1027,8 @@ msgstr "      --fuzzy                 sinônimo de --only-fuzzy --clear-fuzzy\n"
 
 #: 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: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
@@ -1209,8 +1041,7 @@ msgstr "Sintaxe do arquivo de entrada:\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:393 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"
@@ -1218,9 +1049,7 @@ 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
 #, 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"
@@ -1240,15 +1069,11 @@ msgstr "Detalhes de entrada:\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 ""
-"      --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:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
@@ -1257,24 +1082,21 @@ msgstr ""
 #, 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: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
 #, 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: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
 #, 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"
@@ -1290,31 +1112,24 @@ msgstr "      --force-po              escreve um arquivo PO mesmo se vazio\n"
 #: src/xgettext.c:983
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
 #: src/xgettext.c:985
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
 #: src/xgettext.c:987
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
 #: src/xgettext.c:989
 #, 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"
@@ -1330,11 +1145,8 @@ msgstr "  -p, --properties-output     escreve em arquivo .properties de Java\n"
 #: 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
 #, 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: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
@@ -1351,10 +1163,8 @@ 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:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
@@ -1369,8 +1179,7 @@ msgstr "  -s, --sort-output           gera uma saída ordenada\n"
 #: src/xgettext.c:1002
 #, 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:322 src/msgcomm.c:327
 #, c-format
@@ -1413,8 +1222,7 @@ msgstr "  ARQUIVO-ENTRADA ...         arquivos de entrada\n"
 #: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
 #: src/xgettext.c:877
@@ -1452,8 +1260,7 @@ msgstr ""
 #: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
 #: src/msgmerge.c:562
 #, 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"
@@ -1484,8 +1291,7 @@ msgstr ""
 
 #: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
 #, 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"
@@ -1545,12 +1351,8 @@ msgstr "Modificadores de operação:\n"
 
 #: src/msgcmp.c:241 src/msgmerge.c:553
 #, 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:243 src/msgmerge.c:555
 #, c-format
@@ -1597,7 +1399,7 @@ msgstr "esta mensagem é utilizada mas não definida em %s"
 msgid "warning: this message is not used"
 msgstr "atenção: esta mensagem não é utilizada"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1636,24 +1438,18 @@ 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:452 src/xgettext.c:1004
 #, 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: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 uma codificação de caracteres diferente.\n"
 
 #: src/msgconv.c:335
 #, c-format
@@ -1674,18 +1470,14 @@ msgstr "  -i, --indent                estilo de saída com recuo\n"
 #: src/msgmerge.c:586
 #, 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:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
 #: src/msgmerge.c:588
 #, 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:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
@@ -1806,17 +1598,13 @@ msgstr "Lista de OPÇÃO-DE-FILTROs úteis para quando o FILTRO é \"sed\":\n"
 
 #: src/msgfilter.c:442
 #, 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:444
 #, 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"
@@ -1825,16 +1613,12 @@ msgstr ""
 
 #: src/msgfilter.c:447
 #, 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:465 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:471 src/msggrep.c:606
@@ -1844,8 +1628,7 @@ msgstr "      --indent                estilo de saída com recuo\n"
 
 #: src/msgfilter.c:473
 #, 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"
@@ -1868,8 +1651,7 @@ msgstr "Ulrich Drepper"
 #: src/msgfmt.c:439
 #, 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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
@@ -1944,9 +1726,7 @@ msgstr "Uso: %s [OPÇÕES] arquivo.po ...\n"
 #: src/msgfmt.c:778
 #, 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:783 src/xgettext.c:864
 #, c-format, no-wrap
@@ -1969,21 +1749,13 @@ msgstr "Modo de operação:\n"
 
 #: src/msgfmt.c:799
 #, 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:801
 #, 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:803
 #, c-format
@@ -1992,19 +1764,13 @@ msgstr "      --csharp                modo C#: gera um arquivo .dll de .NET\n"
 
 #: src/msgfmt.c:805
 #, 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:807
 #, 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:809
 #, c-format
@@ -2013,10 +1779,8 @@ msgstr "      --qt                    modo Qt: gera um arquivo .qm de Qt\n"
 
 #: src/msgfmt.c:811
 #, 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:818
 #, c-format
@@ -2041,27 +1805,21 @@ msgstr "  -r, --resource=RECURSO      nome do recurso\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
 #, 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:829
 #, 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:831
 #, 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"
@@ -2069,8 +1827,7 @@ msgstr ""
 #: src/msgfmt.c:833
 #, 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 ""
@@ -2085,9 +1842,7 @@ msgstr "Localização do arquivo de saída em modo C#:\n"
 
 #: src/msgfmt.c:845 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"
@@ -2109,8 +1864,7 @@ msgstr "Localização do arquivo de saída em modo Tcl:\n"
 #: src/msgfmt.c:855 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:857
 #, c-format
@@ -2129,8 +1883,7 @@ msgstr "Opções de modo Desktop Entry:\n"
 #: src/msgfmt.c:867
 #, c-format
 msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-"  --template=MODELEO          um arquivo .desktop usado como um modelo\n"
+msgstr "  --template=MODELEO          um arquivo .desktop usado como um modelo\n"
 
 #: src/msgfmt.c:869
 #, c-format
@@ -2151,8 +1904,7 @@ msgstr ""
 #: src/msgfmt.c:874
 #, 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"
@@ -2168,12 +1920,10 @@ msgstr "Interpretação do arquivo de entrada:\n"
 #, 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:891
 #, c-format
@@ -2184,9 +1934,7 @@ msgstr ""
 
 #: src/msgfmt.c:893
 #, 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"
@@ -2197,15 +1945,12 @@ 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:898
 #, 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"
@@ -2213,8 +1958,7 @@ msgstr ""
 #: src/msgfmt.c:900
 #, 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"
@@ -2228,32 +1972,25 @@ msgstr "  -f, --use-fuzzy             usa entradas aproximadas na saída\n"
 
 #: src/msgfmt.c:908
 #, 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:910
 #, 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:913
 #, 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:922
 #, c-format
@@ -2293,9 +2030,7 @@ msgstr "nome do domínio \"%s\" não é válido como nome de arquivo"
 #: src/msgfmt.c:1081
 #, 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:1095
 #, c-format
@@ -2317,12 +2052,12 @@ msgstr "mensagem \"msgstr\" aproximada (fuzzy) ignorada"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: aviso: arquivo fonte contém traduções aproximadas"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1306
 #, c-format
 msgid "%s does not exist"
 msgstr "%s não existe"
 
-#: src/msgfmt.c:1328
+#: src/msgfmt.c:1316
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s existe, mas não pode ler"
@@ -2341,12 +2076,8 @@ 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\" 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:521
 #, c-format, no-wrap
@@ -2441,8 +2172,7 @@ 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                usa escapes de C na saída, nenhum caractere\n"
 "                              estendido\n"
@@ -2455,8 +2185,7 @@ msgstr "      --sort-output           gera uma saída ordenada\n"
 #: 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:297
 msgid ""
@@ -2503,8 +2232,7 @@ msgstr ""
 #: src/msginit.c:379
 #, 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"
@@ -2514,9 +2242,7 @@ msgstr ""
 #: src/msginit.c:385
 #, 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:387
 #, c-format
@@ -2524,10 +2250,8 @@ 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:400
@@ -2537,11 +2261,8 @@ msgstr "  -l, --locale=LL_CC          define a localização alvo\n"
 
 #: src/msginit.c:402
 #, 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:468
 msgid ""
@@ -2573,10 +2294,8 @@ msgstr "subprocesso de %s falhou com código de saída %d"
 
 #: src/msginit.c:1118
 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"
@@ -2594,39 +2313,27 @@ msgstr "Traduções em português brasileiro para o pacote %s"
 #: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
-msgstr ""
-"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:188 src/msgl-iconv.c:259
 #, 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: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 "arquivo de entrada \"%s\" não contém uma entrada de cabeçalho com uma especificação de codificação 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 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:391 src/msgl-iconv.c:375
 #, 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: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
@@ -2641,20 +2348,17 @@ 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:449
 #, 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"
 
@@ -2668,8 +2372,7 @@ 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"
 
@@ -2734,9 +2437,7 @@ msgstr "expressões de plural podem produzir valores negativos"
 #: src/msgl-check.c:141
 #, 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:187
 msgid "plural expression can produce division by zero"
@@ -2747,12 +2448,8 @@ msgid "plural expression can produce integer overflow"
 msgstr "expressão de plural pode produzir sobrecarga de inteiro"
 
 #: src/msgl-check.c:197
-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"
+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:266
 #, c-format
@@ -2799,12 +2496,8 @@ msgstr[0] "mas algumas mensagens possuem uma forma de plural"
 msgstr[1] "mas algumas mensagens possuem %lu formas de plural"
 
 #: 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 ""
-"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;\""
+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:611
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
@@ -2841,17 +2534,17 @@ msgstr "manipulação de plural é uma extensão do GNU gettext"
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr não possui a marca de acelerador de teclado \"%c\""
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, 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:804
+#: src/msgl-check.c:801
 #, 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:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "campo de cabeçalho \"%s\" faltando no cabeçalho\n"
@@ -2868,38 +2561,24 @@ msgstr "%s: erro ao converter da codificação \"%s\" para \"%s\""
 
 #: src/msgl-iconv.c:290
 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 codificação de caracteres"
 
 #: 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
 #, 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:335
 #, 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:341 src/recode-sr-latin.c:302 src/x-python.c:672
 #: src/xgettext.c:727
 #, 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:392 src/msgmerge.c:398
 #, c-format
@@ -2949,8 +2628,7 @@ 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:519
@@ -2985,16 +2663,14 @@ msgstr "      --suffix=SUFIXO         sobrescreve o sufixo padrão do backup\n"
 #: src/msgmerge.c:539
 #, 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"
@@ -3004,8 +2680,7 @@ msgstr ""
 #: src/msgmerge.c:546
 #, 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"
@@ -3013,11 +2688,8 @@ msgstr ""
 
 #: src/msgmerge.c:557
 #, 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:614 src/urlget.c:192
 #, c-format
@@ -3036,12 +2708,8 @@ msgstr "esta mensagem não deveria definir formas de plural"
 
 #: src/msgmerge.c:2035
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -3062,14 +2730,11 @@ msgstr "Uso: %s [OPÇÃO] [ARQUIVO]...\n"
 #: 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: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"
@@ -3077,25 +2742,19 @@ msgstr ""
 #: 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: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: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:451
 #, c-format
@@ -3110,8 +2769,7 @@ msgstr "Localização do arquivo de entrada em modo 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 ""
 "O nome da classe é determinada pelo anexo do nome da localização ao\n"
@@ -3186,9 +2844,7 @@ msgstr "  -d, --repeated              exibe apenas duplicados\n"
 
 #: 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"
@@ -3472,47 +3128,24 @@ msgid " failed.\n"
 msgstr " falhou.\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 ""
-"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."
+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:129
-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."
+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:162
-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."
+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: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 ""
-"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."
+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:202
-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."
+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:231 src/write-catalog.c:275
 #, c-format
@@ -3546,9 +3179,7 @@ msgstr "não é um nome de classe Java válido: %s"
 #: src/write-java.c:1210
 #, 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:1213
 #, c-format
@@ -3562,12 +3193,10 @@ msgstr "erro ao abrir o arquivo \"%s\" para gravação"
 
 #: src/write-po.c:875
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1326 src/write-po.c:1455
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3580,7 +3209,7 @@ msgstr ""
 "caracteres diferente da sua. Considere usar um msgctxt ASCII puro.\n"
 "%s\n"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1338 src/write-po.c:1467
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3599,18 +3228,15 @@ 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:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"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"
 
@@ -3659,8 +3285,7 @@ msgid ""
 "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:341 src/x-javascript.c:795 src/x-python.c:931
 #, c-format
@@ -3857,9 +3482,7 @@ msgstr "%s:%d: aviso: marcação XML indeterminada"
 #: src/x-perl.c:308
 #, 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
 #, c-format
@@ -3981,12 +3604,8 @@ msgstr "%s:%d: expressão de string inválida"
 
 #: 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: aviso: a sintaxe $\"...\" está obsoleta por motivos de segurança; ao "
-"invés disso, use eval_gettext"
+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:413
 #, c-format
@@ -4001,8 +3620,7 @@ msgstr "\"%s\" não é um nome de codificação válida. Usando ASCII.\n"
 #: src/xgettext.c:648
 #, 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:653
 #, c-format
@@ -4022,23 +3640,17 @@ 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:882
 #, 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:884
 #, 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:886
 #, 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"
@@ -4053,23 +3665,17 @@ msgstr "Escolha da linguagem do arquivo de entrada:\n"
 #, 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"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                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:900
@@ -4079,9 +3685,7 @@ msgstr "  -C, --c++                   abreviação para --language=C++\n"
 
 #: src/xgettext.c:902
 #, 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"
@@ -4117,19 +3721,14 @@ msgstr ""
 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:925
 #, c-format
@@ -4145,15 +3744,12 @@ msgstr "  -a, --extract-all           extrai todas as strings\n"
 #, 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"
 
@@ -4161,43 +3757,35 @@ msgstr ""
 #, 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:942
 #, 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:945
 #, 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"
 
@@ -4205,14 +3793,12 @@ msgstr ""
 #: src/xgettext.c:950
 #, 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:952
 #, 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:954
 #, c-format
@@ -4236,8 +3822,7 @@ msgstr "      --boost                 reconhece strings no formato Boost\n"
 
 #: src/xgettext.c:966
 #, 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"
@@ -4245,8 +3830,7 @@ msgstr ""
 #: src/xgettext.c:991
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
-msgstr ""
-"      --properties-output     escreve em um arquivo .properties de Java\n"
+msgstr "      --properties-output     escreve em um arquivo .properties de Java\n"
 
 #: src/xgettext.c:1006
 #, c-format
@@ -4258,8 +3842,7 @@ msgstr ""
 
 #: src/xgettext.c:1008
 #, 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"
@@ -4278,8 +3861,7 @@ msgstr ""
 
 #: src/xgettext.c:1014
 #, 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"
@@ -4288,35 +3870,27 @@ msgstr ""
 #: src/xgettext.c:1016
 #, 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:1019
 #, 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:1840
 #, 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"
+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:1965
 msgid "standard input"
@@ -4344,21 +3918,13 @@ msgstr "%s%s: aviso: "
 
 #: 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 ""
-"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"
+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:2190
 #, 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"
+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:2221
 #, c-format
@@ -4368,8 +3934,7 @@ msgid ""
 "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"
+"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"
@@ -4398,8 +3963,7 @@ msgstr "aviso: faltando contexto para palavra-chave \"%.*s\""
 #: src/xgettext.c:3031
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr ""
-"aviso: faltando contexto para argumentos plurais de palavra-chave '%.*s'"
+msgstr "aviso: faltando contexto para argumentos plurais de palavra-chave '%.*s'"
 
 #: src/xgettext.c:3052
 #, c-format
@@ -4431,8 +3995,7 @@ msgstr "<sem nome>"
 #~ 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"
@@ -4443,16 +4006,12 @@ msgstr "<sem nome>"
 
 #~ 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"
@@ -4466,12 +4025,10 @@ msgstr "<sem nome>"
 #~ "      --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"
@@ -4479,18 +4036,15 @@ msgstr "<sem nome>"
 #~ "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"
 
@@ -4510,43 +4064,32 @@ msgstr "<sem nome>"
 #~ 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"
 
@@ -4558,21 +4101,17 @@ msgstr "<sem nome>"
 #~ "  -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
@@ -4608,16 +4147,12 @@ msgstr "<sem nome>"
 #~ "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"
@@ -4630,46 +4165,34 @@ msgstr "<sem nome>"
 #~ "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"
@@ -4677,29 +4200,24 @@ msgstr "<sem nome>"
 #~ "\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 7713aab18..7d07eb9ce 100644
--- a/gettext-tools/po/ro.po
+++ b/gettext-tools/po/ro.po
@@ -6,983 +6,579 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.13-pre1\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2003-11-18 17:10+0100\n"
 "PO-Revision-Date: 2003-11-23 11:43+0200\n"
 "Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib-lib/argmatch.c:133
-#, fuzzy, c-format
-msgid "invalid argument %s for %s"
+#: lib/argmatch.c:120
+#, c-format
+msgid "invalid argument `%s' for `%s'"
 msgstr "parametru invalid `%s' pentru `%s'"
 
-#: gnulib-lib/argmatch.c:134
-#, fuzzy, c-format
-msgid "ambiguous argument %s for %s"
+#: lib/argmatch.c:121
+#, c-format
+msgid "ambiguous argument `%s' for `%s'"
 msgstr "parametru ambiguu `%s' pentru `%s'"
 
-#: gnulib-lib/argmatch.c:153
+#: lib/argmatch.c:139
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Parametrii valizi sunt: "
 
-#: gnulib-lib/clean-temp.c:332
-#, 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:346
-#, 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:442
-#, fuzzy, c-format
-msgid "cannot remove temporary file %s"
-msgstr "nu se poate crea fi�ierul de ie�ire(output) \"%s\""
-
-#: gnulib-lib/clean-temp.c:457
-#, fuzzy, c-format
-msgid "cannot remove temporary directory %s"
-msgstr ""
-"nu se poate crea un director temporar folosind modelul(template) \"%s\""
-
-#: gnulib-lib/closeout.c:66
+#: lib/closeout.c:66
 msgid "write error"
 msgstr "eroare de scriere"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: 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
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:194
-#, 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"
 
-#: gnulib-lib/copy-file.c:198
-#, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+#: lib/copy-file.c:72
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "nu se poate deschide fi�ierul de backup \"%s\" pentru scriere"
 
-#: gnulib-lib/copy-file.c:202
-#, fuzzy, c-format
-msgid "error reading %s"
+#: lib/copy-file.c:80 src/urlget.c:212
+#, c-format
+msgid "error reading \"%s\""
 msgstr "eroare �n citirea lui \"%s\""
 
-#: gnulib-lib/copy-file.c:206
-#, fuzzy, c-format
-msgid "error writing %s"
+#: lib/copy-file.c:85 lib/copy-file.c:89
+#, c-format
+msgid "error writing \"%s\""
 msgstr "eroare �n scrierea lui \"%s\""
 
-#: gnulib-lib/copy-file.c:210
-#, fuzzy, c-format
-msgid "error after reading %s"
-msgstr "eroare dup� citirea lui \"%s\""
-
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c: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
+#: lib/copy-file.c:91 src/urlget.c:222
 #, c-format
-msgid "fdopen() failed"
-msgstr "fdopen() e�uat"
-
-#: gnulib-lib/csharpcomp.c:571
-#, fuzzy, c-format
-msgid "C# compiler not found, try installing pnet"
-msgstr ""
-"Nu a fost g�sit compilatorul Java, �ncerca�i s� instala�i gcj sau seta�i "
-"$JAVAC"
-
-#: gnulib-lib/csharpexec.c:343
-#, fuzzy, c-format
-msgid "C# virtual machine not found, try installing pnet"
-msgstr ""
-"Nu a fost g�sit� ma�ina virtual� Java, �ncerca�i s� instala�i gij sau s� "
-"seta�i $JAVA"
+msgid "error after reading \"%s\""
+msgstr "eroare dup� citirea lui \"%s\""
 
-#: gnulib-lib/error.c:188
+#: lib/error.c:137 lib/error.c:165
 msgid "Unknown system error"
 msgstr "Eroare de sistem necunoscut�"
 
-#: 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
+#: 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
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Subprocesul %s a e�uat"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: lib/getopt.c:689 lib/getopt.c:701
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: op�iunea `%s' este ambigu�\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: lib/getopt.c:734 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:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: lib/getopt.c:747 lib/getopt.c:752
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: op�iunea `%c%s' nu permite parametri\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: lib/getopt.c:788 lib/getopt.c:801 lib/getopt.c:1090 lib/getopt.c:1103
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: op�iunea `%s' necesit� un parametru\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: lib/getopt.c:839 lib/getopt.c:842
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: op�iune necunoscut� `--%s'\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
+#: lib/getopt.c:850 lib/getopt.c:853
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: op�iune necunoscut� `%c%s'\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: optiune invalid� -- %c\n"
-
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: op�iunea necesit� un parametru -- %c\n"
-
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: op�iunea `-W %s' este ambigu�\n"
-
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: op�iunea `-W %s' nu permite parametri\n"
-
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: op�iunea `%s' necesit� un parametru\n"
+#: lib/getopt.c:900 lib/getopt.c:903
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: op�iune ilegal� -- %c\n"
 
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: lib/getopt.c:909 lib/getopt.c:912
 #, c-format
-msgid "invalid source_version argument to compile_java_class"
-msgstr ""
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: optiune invalid� -- %c\n"
 
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: lib/getopt.c:959 lib/getopt.c:970 lib/getopt.c:1156 lib/getopt.c:1169
 #, c-format
-msgid "invalid target_version argument to compile_java_class"
-msgstr ""
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: op�iunea necesit� un parametru -- %c\n"
 
-#: 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
+#: lib/getopt.c:1022 lib/getopt.c:1033
 #, c-format
-msgid "failed to create \"%s\""
-msgstr "eroare �n crearea \"%s\""
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: op�iunea `-W %s' este ambigu�\n"
 
-#: 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
+#: lib/getopt.c:1057 lib/getopt.c:1069
 #, c-format
-msgid "error while writing \"%s\" file"
-msgstr "eroare �n scrierea fi�ierului \"%s\""
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: op�iunea `-W %s' nu permite parametri\n"
 
-#: gnulib-lib/javacomp.c:2343
+#: lib/javacomp.c:457
 #, 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"
+msgstr "Nu a fost g�sit compilatorul Java, �ncerca�i s� instala�i gcj sau seta�i $JAVAC"
 
-#: gnulib-lib/javaexec.c:417
+#: lib/javaexec.c:407
 #, 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"
+msgstr "Nu a fost g�sit� ma�ina virtual� Java, �ncerca�i s� instala�i gij sau s� seta�i $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
-#, c-format
-msgid "%s subprocess I/O error"
-msgstr "eroare I/O a subprocesului %s"
-
-#: gnulib-lib/obstack.c: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
+#: 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
 #, c-format
 msgid "memory exhausted"
 msgstr "memorie plin�"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "scrierea �n subprocesul %s e�uat�"
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "citirea din subprocesul %s a e�uat"
-
-#: gnulib-lib/pipe-filter-ii.c:298
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "nu se poate seta I/O neblocant pentru subprocesul %s"
-
-#: gnulib-lib/pipe-filter-ii.c:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "comunica�ia cu subprocesul %s a e�uat"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-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
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
-#. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
-msgid "`"
-msgstr ""
-
-#: gnulib-lib/quotearg.c:313
-msgid "'"
-msgstr ""
-
-#: gnulib-lib/set-acl.c:46
-#, c-format
-msgid "setting permissions for %s"
-msgstr ""
-
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: 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
 #, c-format
 msgid "cannot create pipe"
 msgstr "nu se poate crea leg�tura(pipe)"
 
-#: gnulib-lib/w32spawn.h:43
+#: lib/w32spawn.h:48
+#, c-format
+msgid "DuplicateHandle failed with error code 0x%08x"
+msgstr "DuplicateHandle a e�uat cu cod de eroare 0x%08x"
+
+#: lib/w32spawn.h:53
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle a e�uat"
 
-#: gnulib-lib/w32spawn.h:84
-#, fuzzy, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "nu se poate crea fi�ierul de ie�ire(output) \"%s\""
-
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: lib/wait-process.c:276 lib/wait-process.c:308 lib/wait-process.c:362
 #, c-format
 msgid "%s subprocess"
 msgstr "subprocesul %s"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: lib/wait-process.c:321 lib/wait-process.c:384
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "subprocesul %s a primit semnalul fatal %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/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
 #, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "eroare �n timpul deschiderii \"%s\" pentru citire"
-
-#: src/format.c:151
-#, fuzzy, c-format
-msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr ""
-"'%s' nu este un format valid de �ir %s, spre deosebire de 'msgid'. Motiv: %s"
-
-#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c: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-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 ""
-"o specifica�ie de formatare pentru parametrul %u, ca �n `%s', nu exist� �n "
-"'msgid'"
+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'"
 
-#: 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-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
+#: 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
 #, 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: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-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr ""
-"specifica�iile de formatare din 'msgid' �i '%s' pentru argumentul %u sunt "
-"diferite"
-
-#: src/format-boost.c:449
-#, fuzzy, c-format
-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-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-c.c:36
+#: src/format-c.c:177
 #, 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:39
+#: src/format-c.c:546
 #, 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:42 src/format-gfc-internal.c:289
+#: src/format-c.c:753
 #, 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."
-
-#: 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
-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"
+msgstr "�irul are referire la argumentul num�rul %u dar ignor� argumentul num�rul %u."
 
-#: src/format-csharp.c:88 src/format-java.c:205
+#: src/format-c.c:832 src/format-gcc-internal.c:269 src/format-python.c:516
 #, 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:109
-#, fuzzy, c-format
-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:130 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:139
-#, fuzzy, c-format
-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:140
-#, fuzzy, c-format
-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:161 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:162
-#, fuzzy, c-format
-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 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, 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 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, 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 precision specification is invalid."
-msgstr "�n directiva num�rul %u parametrul %d este negativ."
+msgid "number of format specifications in 'msgid' and '%s' does not match"
+msgstr "num�rul de specifica�ii de formatare din 'msgid' �i '%s' este diferit"
 
-#: src/format-gcc-internal.c:463
+#: src/format-gcc-internal.c:204
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
-msgstr ""
-"�n num�rul de directiv� %u, marcajele(flags) nu sunt admise �nainte de '%c'."
-
-#: src/format-gcc-internal.c: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 ""
+msgstr "�n num�rul de directiv� %u, marcajele(flags) nu sunt admise �nainte de '%c'."
 
-#: 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
+#: src/format-invalid.h:23
 msgid "The string ends in the middle of a directive."
 msgstr "�irul se termin� �n mijlocul directivei."
 
-#: 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: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:28
+#: src/format-invalid.h:29
 #, 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:30
+#: src/format-invalid.h:31
 #, 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:32
+#: src/format-invalid.h:33
 #, 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:36
+#: src/format-invalid.h:37
 #, 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:37
+#: src/format-invalid.h:38
 #, 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:40
+#: src/format-invalid.h:41
 #, 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:240
+#: 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
 #, 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, '{' 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:251 src/format-java.c:285 src/format-java.c:314
+#: 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�."
+
+#: src/format-java.c:245 src/format-java.c:275 src/format-java.c:298
 #, 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:274
+#: src/format-java.c:266
 #, 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:323
+#: src/format-java.c:305
 #, 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\"."
+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."
 
-#: src/format-java.c:572
+#: src/format-java.c:546
 #, 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:583
+#: src/format-java.c:557
 #, 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'."
+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 '%s'"
-msgstr ""
-"o specifica�ie de formatare pentru argumentul {%u}, ca �n '%s', nu exist� �n "
-"'msgid'"
+#: 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'"
 
-#: src/format-java.c:756
+#: src/format-java.c:730
 #, 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:776
-#, fuzzy, c-format
-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-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-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
-#: src/format-scheme.c:2375
+#: 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."
+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:2372 src/format-scheme.c:2398
-#, fuzzy, c-format
-msgid ""
-"In the directive number %u, too many parameters are given; expected at most "
-"%u parameter."
-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:2496 src/format-scheme.c:2499
+#: 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-lisp.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:2736 src/format-scheme.c:2754
+#: src/format-lisp.c:2699
 #, 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:2805
+#: src/format-lisp.c:2761
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "�irul se termin� �n mijlocul unei directive ~/../."
 
-#: 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:2791 src/format-lisp.c:3014 src/format-lisp.c:3120
+#: src/format-lisp.c:3169 src/format-lisp.c:3255
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "S-a g�sit '~%c' f�r� '~%c' corespunz�tor."
 
-#: src/format-lisp.c:2863 src/format-scheme.c:2860
+#: src/format-lisp.c:2807
 #, 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:2976 src/format-scheme.c:2973
+#: src/format-lisp.c:2905
 #, 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:3326 src/format-scheme.c:3263
+#: src/format-lisp.c:3203
 #, 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:3432 src/format-scheme.c:3355
+#: src/format-lisp.c:3289
 msgid "The string refers to some argument in incompatible ways."
 msgstr "�irul se refer� la anumite argumente �n moduri incompatibile."
 
-#: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' are not equivalent"
+#: src/format-lisp.c:3333
+#, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "specifica�iile de format din 'msgid' �i '%s' nu sunt echivalente"
 
-#: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr ""
-"specifica�iile de format din '%s' nu sunt subset al acelora din 'msgid'"
+#: 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:433
+#: 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'."
+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-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:198 src/format-python.c:462 src/format-sh.c:304
 #, 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."
+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:354
+#: src/format-python.c:329
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "�irul se refer� la argumentul numit '%s' �n moduri incompatibile."
 
-#: src/format-python.c:430
-#, fuzzy, c-format
-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 '%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 '%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 '%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-python-brace.c:137
-#, fuzzy, c-format
-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-brace.c:150
-#, fuzzy, c-format
-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: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:165
-#, fuzzy, c-format
-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.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:185
-#, fuzzy, c-format
-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.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:270
-#, fuzzy, c-format
-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:488
+#, 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"
 
-#: src/format-qt.c:152
+#: src/format-qt.c:80
 #, 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 ""
+msgid "Multiple references to %%%c."
+msgstr "Referin�e multiple la % % %c."
 
-#: src/format-sh.c:79
+#: src/format-sh.c:82
 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: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: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: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: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:85
+#: src/format-sh.c:88
 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:90
+#: src/format-ycp.c:85
 #, 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."
+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:91
+#: 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."
+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: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
+#: 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"
-"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"
+"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"
 
-#: 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
+#: 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
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Scris de %s.\n"
 
-#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c: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
-msgid "Bruno Haible"
-msgstr ""
-
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:197 src/msginit.c:280
 #, c-format
 msgid "too many arguments"
 msgstr "prea mul�i parametri"
 
-#: 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
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: 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:211 src/msginit.c:362 src/recode-sr-latin.c:148
-#, c-format, no-wrap
+#: src/hostname.c:214 src/msginit.c:360
+#, c-format
 msgid "Usage: %s [OPTION]\n"
 msgstr "Folosire: %s [OP�IUNE]\n"
 
-#: src/hostname.c:215
+#: src/hostname.c:218
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Afi�eaz� numele de host al ma�inii.\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:221
 #, c-format
 msgid "Output format:\n"
 msgstr "Format de ie�ire(output):\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:223
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short           nume de host scurtat\n"
 
-#: src/hostname.c:222
+#: src/hostname.c:225
 #, 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:225
+#: src/hostname.c:228
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      adresele pentru numele de host\n"
 
-#: src/hostname.c:228 src/msgattrib.c: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
-#, c-format, no-wrap
+#: 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
 msgid "Informative output:\n"
 msgstr "Ie�ire(output) informativ�:\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
+#: 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
+#, c-format
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  afi�eaz� acest ajutor �i iese\n"
 
-#: src/hostname.c:232 src/msgattrib.c: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
+#: 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
+#, c-format
 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/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
+#: 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/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:254 src/hostname.c:260 src/hostname.c:267
 #, c-format
 msgid "could not get host name"
 msgstr "nu s-a putut afla numele de host"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: 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
 #, c-format
 msgid "at most one input file allowed"
 msgstr "cel mult un fi�ier de intrare(input) este permis"
 
-#: 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: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
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s �i %s se exclud reciproc"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:376 src/msgconv.c:284 src/msggrep.c:436 src/msguniq.c:304
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Folosire: %s [OP�IUNE] [FI�IER_INTRARE]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:381
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -991,365 +587,280 @@ msgstr ""
 "Filtreaz� mesajele unui catalog de traduceri potrivit atributelor lor,\n"
 "�i manipuleaz� atributele.\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:372 src/msgmerge.c:502 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: 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
 #, 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: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: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
 #, c-format
 msgid "Input file location:\n"
 msgstr "Loca�ie fi�ier intrare(input):\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:390 src/msgconv.c:297 src/msggrep.c:451 src/msguniq.c:325
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  FI�IER_INTRARE                   fi�ier de intrare(input) 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:511 src/msguniq.c:349
-#: src/xgettext.c:875
+#: 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
 #, 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:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: 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
 #, 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: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: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
 #, c-format
 msgid "Output file location:\n"
 msgstr "Loca�ie fi�ier ie�ire(output):\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:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: 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
 #, 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: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/msgunfmt.c:493 src/msguniq.c:358
+#: 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
 #, 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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:405 src/msgcat.c:370 src/msgcomm.c:375 src/msguniq.c:340
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selec�ie mesaje:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:407
 #, 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:454
+#: src/msgattrib.c:409
 #, 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:456
+#: src/msgattrib.c:411
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              �terge mesajele marcate 'fuzzy'\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:413
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            p�streaz� mesajele marcate 'fuzzy'\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:415
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           �terge mesajele �nvechite #~ \n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:417
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         p�streaz� mesajele �nvechite #~ \n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:420
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulare de atribute:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:422
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             seteaz� toate mesajele 'fuzzy'\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:424
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           seteaz� toate mesajele non-'fuzzy'\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:426
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          seteaz� toate mesajele �nvechite\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:428
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        seteaz� toate mesajele non-�nvechite\n"
 
-#: src/msgattrib.c:475
-#, fuzzy, c-format
-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-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 ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --no-fuzzy              �terge mesajele marcate 'fuzzy'\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:430
 #, 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:484
+#: src/msgattrib.c:432
 #, 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:486
+#: src/msgattrib.c:434
 #, 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:488
+#: src/msgattrib.c:436
 #, 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: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/msguniq.c:369
+#: 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
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintax� fi�ier de intrare(input:\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:393 src/msguniq.c:371
+#: 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
 #, 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: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: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
 #, 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: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: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
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalii de output:\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:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: 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
 #, 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: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
-#, 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
-#, 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             nu folose�te escape-uri C �n output\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:580 src/msgunfmt.c:507
-#: src/msguniq.c:391 src/xgettext.c:979
+#: 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
 #, 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: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: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
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msguniq.c:367
+#: src/xgettext.c:816
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
+#: src/xgettext.c:818
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           nu scrie liniile '#: filename:line'\n"
 
-#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
+#: src/xgettext.c:820
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
+#: src/xgettext.c:822
 #, 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: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: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
 #, 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: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: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
 #, 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: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: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
 #, 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: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: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
 #, 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: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: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
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genereaz� output sortat\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:603 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: 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
 #, 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:322 src/msgcomm.c:327
+#: src/msgcat.c:288 src/msgcomm.c:305
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "criteriu de selec�ie specificat imposibil (%d < n < %d)"
 
-#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:331 src/msgcomm.c:337 src/xgettext.c:708
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Folosire: %s [OP�IUNE] [FI�IER_INTRARE]...\n"
 
-#: src/msgcat.c:372
-#, fuzzy, c-format, no-wrap
+#: src/msgcat.c:336
+#, 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"
@@ -1357,9 +868,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, 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"
+"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 ""
 "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"
@@ -1372,47 +883,42 @@ 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:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:353 src/msgcomm.c:358 src/xgettext.c:724
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FI�IER_INTRARE ...                  fi�iere de intrare(input)\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:726
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:359 src/msgcomm.c:364 src/msgen.c:283 src/msgfmt.c:553
+#: src/xgettext.c:730
 #, 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:408 src/msgcomm.c:399
+#: src/msgcat.c:372 src/msgcomm.c:377
 #, 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:411
+#: src/msgcat.c:375
 #, 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:414 src/msgcomm.c:405
+#: src/msgcat.c:378 src/msgcomm.c:383
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1421,17 +927,14 @@ msgstr ""
 "  -u, --unique                   scurt�tur� pentru --less-than=2, solicit�\n"
 "                                 ca doar mesajele unice s� fie tip�rite\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389 src/msgfmt.c:602
+#: src/msgmerge.c:496
 #, 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:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:604
+#: src/msgmerge.c:498
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1440,50 +943,36 @@ msgstr ""
 "      --stringtable-input     fi�ierele de intrare(input) sunt �n sintax� \n"
 "NeXTstep/GNUstep .strings\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:392 src/msgconv.c:314 src/msguniq.c:356
 #, 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:430 src/msguniq.c:380
+#: src/msgcat.c:394 src/msguniq.c:358
 #, 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"
-
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
-#, 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:178 src/msgcomm.c:291 src/msgmerge.c:359
-msgid "Peter Miller"
-msgstr ""
+"      --use-first                folose�te prima traducere disponibil� pentru\n"
+"                                 fiecare mesaj, nu �mbin� mai multe traduceri\n"
 
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:156 src/msgmerge.c:309
 #, c-format
 msgid "no input files given"
 msgstr "nu au fost date fi�iere de intrare(input)"
 
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:161 src/msgmerge.c:314
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "sunt necesare exact 2 fi�iere de intrare(input)"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:180 src/msgmerge.c:421
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Folosire: %s [OP�IUNE] def.po ref.pot\n"
 
-#: src/msgcmp.c:218
+#: src/msgcmp.c:185
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1501,100 +990,67 @@ 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:232
+#: src/msgcmp.c:199
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      traduceri\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:201
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     referin�e la surse\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:206 src/msgmerge.c:487
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modificatori de opera�ie:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:208 src/msgmerge.c:489
 #, 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 "  -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:243 src/msgmerge.c:555
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-"  -N, --no-fuzzy-matching     nu folose�te potrivire aproximativ�(fuzzy)\n"
-
-#: src/msgcmp.c:245
-#, fuzzy, c-format
-msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr ""
-"  -f, --use-fuzzy             folose�te intr�ri par�ial traduse la "
-"ie�ire(output)\n"
-
-#: src/msgcmp.c:247
-#, fuzzy, c-format
-msgid "      --use-untranslated      consider untranslated entries\n"
-msgstr ""
-"      --untranslated          p�streaz� pe cele netraduse, �terge mesajele "
-"traduse\n"
-
-#: src/msgcmp.c:324
-#, fuzzy, c-format
-msgid "this message is untranslated"
-msgstr "avertisment: acest mesaj nu este folosit"
-
-#: src/msgcmp.c:330
-#, c-format
-msgid "this message needs to be reviewed by the translator"
-msgstr ""
-
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:285 src/msgmerge.c:945
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "acest mesaj este folosit dar nu este definit..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:287 src/msgmerge.c:947
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...dar defini�ia este similar�"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:292 src/msgmerge.c:974
 #, 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:546
+#: src/msgcmp.c:396
 #, c-format
 msgid "warning: this message is not used"
 msgstr "avertisment: acest mesaj nu este folosit"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:403
 #, 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:316
+#: src/msgcomm.c:294
 #, c-format
 msgid "at least two files must be specified"
 msgstr "cel pu�in dou� fi�iere trebuie specificate"
 
-#: src/msgcomm.c:364
-#, fuzzy, c-format, no-wrap
+#: src/msgcomm.c:342
+#, 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"
+"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 ""
@@ -1607,86 +1063,76 @@ 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:402
+#: src/msgcomm.c:380
 #, 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:452 src/xgettext.c:1004
-#, fuzzy, 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: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/msgconv.c:311
+#: src/msgconv.c:288
 #, 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:335
+#: src/msgconv.c:312
 #, c-format
 msgid "Conversion target:\n"
 msgstr "�int� conversie:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:316
 #, 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:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:334 src/msgen.c:309 src/msgmerge.c:510
 #, 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:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgconv.c:336 src/msgen.c:311 src/msgfilter.c:433 src/msggrep.c:514
+#: src/msgmerge.c:512
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location              nu scrie linii '#: filename:line'\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
-#, fuzzy, c-format
-msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr ""
-"      --add-location             genereaz� linii '#: filename:"
-"line' (implicit)\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:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:437 src/msggrep.c:518
+#: src/msgmerge.c:516
 #, 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:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:219 src/msgfmt.c:354 src/xgettext.c:528
 #, c-format
 msgid "no input file given"
 msgstr "nu este furnizat nici un fi�ier de intrare"
 
-#: src/msgen.c:263
+#: src/msgen.c:224
 #, c-format
 msgid "exactly one input file required"
 msgstr "este solicitat exact un singur fi�ier de intrare"
 
-#: src/msgen.c:304
+#: src/msgen.c:262
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Folosire: %s [OP�IUNE] FI�IER_INTRARE\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:267
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1699,23 +1145,22 @@ 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:321
+#: src/msgen.c:279
 #, 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:196
+#: src/msgexec.c:192
 #, c-format
 msgid "missing command name"
 msgstr "lipse�te numele comenzii"
 
-#: src/msgexec.c:257
+#: src/msgexec.c:238
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Folosire: %s [OP�IUNE] COMAND� [OP�IUNE-COMAND�]\n"
 
-#: src/msgexec.c:262
+#: src/msgexec.c:243
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1730,7 +1175,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:271
+#: src/msgexec.c:252
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1740,38 +1185,42 @@ msgstr ""
 "un octet null.  Rezultatul(output) \"msgexec 0\" este potrivit ca intrare(input)\n"
 "pentru \"xargs - 0\".\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:262 src/msgfilter.c:384
 #, 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:345
+#: src/msgexec.c:322
 #, c-format
 msgid "write to stdout failed"
 msgstr "scriere la stdout e�uat�"
 
-#: src/msgfilter.c:298
+#: 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
 #, c-format
 msgid "missing filter name"
 msgstr "lipse�te numele de filtru"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:309
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "cel pu�in un script sed trebuie specificat"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:371
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Folosire: %s [OP�IUNE] FILTRU [OP�IUNE-FILTRU]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:375
 #, 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:435
+#: src/msgfilter.c:399
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1780,158 +1229,128 @@ 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:440
+#: src/msgfilter.c:404
 #, 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:442
+#: src/msgfilter.c:406
 #, 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:444
+#: src/msgfilter.c:408
 #, 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:447
+#: src/msgfilter.c:411
 #, 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:465 src/msggrep.c:600
+#: src/msgfilter.c:423 src/msggrep.c:506
 #, 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:471 src/msggrep.c:606
+#: src/msgfilter.c:429 src/msggrep.c:512
 #, c-format
 msgid "      --indent                indented output style\n"
-msgstr ""
-"      --indent                   scrie fi�ierul .po folosind stil indentat\n"
+msgstr "      --indent                   scrie fi�ierul .po folosind stil indentat\n"
 
-#: src/msgfilter.c:473
+#: 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"
+msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr "      --keep-header           p�streaz� headerul nemodificat, nu �l filtreaz�\n"
 
-#: src/msgfmt.c:345
+#: src/msgfilter.c:560
 #, 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"
+msgid "Not yet implemented."
+msgstr "Neimplimentat �nc�."
 
-#: src/msgfmt.c:392
+#: src/msgfilter.c:589
 #, c-format
-msgid "invalid endianness: %s"
-msgstr ""
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "nu se poate seta I/O neblocant pentru subprocesul %s"
 
-#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
-msgid "Ulrich Drepper"
-msgstr ""
+#: src/msgfilter.c:617
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "comunica�ia cu subprocesul %s a e�uat"
 
-#: src/msgfmt.c:439
-#, fuzzy, c-format
-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/msgfilter.c:668
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "citirea din subprocesul %s a e�uat"
+
+#: 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"
 
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
-#: src/msgunfmt.c:353
+#: 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:378 src/msgfmt.c:400 src/msgunfmt.c:265
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s necesit� specificarea \"-d director\""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:393 src/msgunfmt.c:258
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s necesit� specificarea \"-l localizare\""
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s necesit� specificarea \"-l localizare\""
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s necesit� specificarea \"-l localizare\""
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s �i %s se exclud reciproc"
+#: 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:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:415 src/msgfmt.c:421
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s e valid doar cu %s sau cu %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
-#, fuzzy, c-format
-msgid "%s is only valid with %s, %s or %s"
-msgstr "%s e valid doar cu %s sau cu %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
-#, c-format
-msgid "%s: "
-msgstr ""
-
-#: src/msgfmt.c:744
+#: src/msgfmt.c:503
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d mesaj tradus"
 msgstr[1] "%d mesaje traduse"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:508
 #, 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:754
+#: src/msgfmt.c:513
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d mesaj netradus"
 msgstr[1] ", %d mesaje netraduse"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:533
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Folosire: %s [OP�IUNE] numefi�ier.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:537
 #, 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"
+msgstr "Genereaz� un catalog binar de mesaje din descriere de traducere textual�\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: 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"
@@ -1940,391 +1359,372 @@ msgstr ""
 "Argumentele obligatorii pentru op�iunile lungi sunt obligatorii �i pentru op�iunile\n"
 "scurte. Similar pentru argumentele op�ionale.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:549
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  numefi�ier.po ...             fi�iere de intrare(input)\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:556 src/msgmerge.c:453 src/msgunfmt.c:345 src/xgettext.c:765
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mod de operare:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:558
 #, 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 "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
+msgstr "  -j, --java                  Mod Java: genereaz� o clas� Java ResourceBundle\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:560
 #, 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 "      --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:803
-#, fuzzy, c-format
-msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --qt                   Mod Qt: genereaz� un fi�ier .qm Qt\n"
-
-#: src/msgfmt.c:805
+#: src/msgfmt.c:562
 #, c-format
-msgid ""
-"      --csharp-resources      C# resources mode: generate a .NET .resources "
-"file\n"
-msgstr ""
+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:807
-#, c-format
-msgid ""
-"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr ""
-"      --tcl                   Mod tcl: genereaz� un fi�ier tcl/msgcat .msg\n"
-
-#: src/msgfmt.c:809
+#: src/msgfmt.c:564
 #, 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:811
-#, fuzzy, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --qt                   Mod Qt: genereaz� un fi�ier .qm Qt\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:571
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                activeaz� modul strict Uniforum\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:573 src/xgettext.c:741
 #, 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:823
+#: src/msgfmt.c:576
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Loca�ie fi�ier output �n mod Java:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:578 src/msgunfmt.c:361
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESURS�     nume resurs�\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:580 src/msgfmt.c:592 src/msgunfmt.c:363 src/msgunfmt.c:372
 #, 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"
-
-#: src/msgfmt.c:829
-#, fuzzy, c-format
-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"
+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:831
+#: src/msgfmt.c:582
 #, 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:833
+#: src/msgfmt.c:584
 #, 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:839
-#, fuzzy, c-format
-msgid "Output file location in C# mode:\n"
-msgstr "Loca�ie fi�ier output �n mod Tcl:\n"
-
-#: src/msgfmt.c:845 src/msgunfmt.c:473
-#, fuzzy, c-format
-msgid ""
-"  -d DIRECTORY                base directory for locale dependent .dll "
-"files\n"
-msgstr ""
-"  -d DIRECTOR                 directorul de baz� al ierarhiei directoarelor\n"
-
-#: src/msgfmt.c:847
-#, fuzzy, 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 ""
-"Op�iunile -l �i -d sunt obligatorii.  Fi�ierul .msg este scris �n "
-"directorul\n"
-"specificat\n"
-
-#: src/msgfmt.c:851
+#: src/msgfmt.c:590
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Loca�ie fi�ier output �n mod Tcl:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:594 src/msgunfmt.c:374
 #, 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:857
+#: src/msgfmt.c:596
 #, 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:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-"  -d DIRECTOR                 directorul de baz� al cataloagelor de mesaje ."
-"msg\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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[=CUV�NT]        cuvinte cheie de c�utat (f�r�\n"
-"                                  CUV�NT �nseamn� neutilizarea "
-"cuvintelor_cheie\n"
-"                                  implicite)\n"
-
-#: src/msgfmt.c:874
-#, 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:886 src/xgettext.c:905
+#: src/msgfmt.c:608 src/xgettext.c:757
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretare fi�ier de intrarea(input):\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:610
 #, 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                 execut� toate verific�rile sugerate\n"
-"                                --check-format, --check-header, --check-"
-"domain\n"
+"                                --check-format, --check-header, --check-domain\n"
 
-#: src/msgfmt.c:891
+#: src/msgfmt.c:613
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr ""
-"      --check-format          verific� �irurile format dependent de limbaj\n"
+msgstr "      --check-format          verific� �irurile format dependent de limbaj\n"
 
-#: src/msgfmt.c:893
+#: 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 "      --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:895
+#: src/msgfmt.c:617
 #, c-format
 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"
+"      --check-domain          verific� eventualele conflicte dintre directivele\n"
 "                                de domenii �i op�iunea --output-file\n"
 
-#: src/msgfmt.c:898
+#: 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"
+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:900
+#: src/msgfmt.c:622
 #, 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]  verific� prezen�a acceleratorilor de "
-"tastatur�\n"
+"      --check-accelerators[=CAR]  verific� prezen�a acceleratorilor de tastatur�\n"
 "                                pentru elementele meniului\n"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:625
 #, 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:908
-#, 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"
+msgstr "  -f, --use-fuzzy             folose�te intr�ri par�ial traduse la ie�ire(output)\n"
 
-#: src/msgfmt.c:910
+#: src/msgfmt.c:630
 #, 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 ""
+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:913
+#: 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"
+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:922
+#: src/msgfmt.c:641
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            afi�eaz� statistici despre traduceri\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: 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:1037
+#: 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\""
+
+#: src/msgfmt.c:951
+#, c-format
+msgid "invalid nplurals value"
+msgstr "valoare nplurals invalid�"
+
+#: src/msgfmt.c:965
+#, c-format
+msgid "invalid plural expression"
+msgstr "expresie plural� invalid�"
+
+#: src/msgfmt.c:984 src/msgfmt.c:999
+#, c-format
+msgid "nplurals = %lu..."
+msgstr "nplurals = %lu..."
+
+#: src/msgfmt.c:987
+#, c-format
+msgid "...but some messages have only one plural form"
+msgid_plural "...but some messages have only %lu plural forms"
+msgstr[0] "...dar c�teva mesaje au doar o singur� form� plural�"
+msgstr[1] "...dar c�teva mesaje au doar %lu forme plurale"
+
+#: src/msgfmt.c:1002
+#, c-format
+msgid "...but some messages have one plural form"
+msgid_plural "...but some messages have %lu plural forms"
+msgstr[0] "...dar c�teva mesaje au o singur� form� plural�"
+msgstr[1] "...dar c�teva mesaje au %lu forme plurale"
+
+#: src/msgfmt.c:1032
+#, c-format
+msgid "Try using the following, valid for %s:\n"
+msgstr "�ncerca�i s� folosi�i urm�toarele, valide pentru %s:\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'"
+
+#: src/msgfmt.c:1140
+#, 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'"
+
+#: src/msgfmt.c:1152
+#, c-format
+msgid "plural handling is a GNU gettext extension"
+msgstr "manipularea de plurale este o extensie a GNU gettext"
+
+#: src/msgfmt.c:1219
+#, 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"
+
+#: src/msgfmt.c:1261
+#, c-format
+msgid "msgstr lacks the keyboard accelerator mark '%c'"
+msgstr "msgstr nu are marcaj de accelerator de tastatur� '%c'"
+
+#: src/msgfmt.c:1269
+#, c-format
+msgid "msgstr has too many keyboard accelerator marks '%c'"
+msgstr "msgstr are prea multe marcaje de acceleratoare tastatur� '%c'"
+
+#: src/msgfmt.c:1303
+#, c-format
+msgid "headerfield `%s' missing in header\n"
+msgstr "c�mpul header '%s' lipse�te din header\n"
+
+#: src/msgfmt.c:1307
+#, 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"
+
+#: src/msgfmt.c:1330
+#, c-format
+msgid "field `%s' still has initial default value\n"
+msgstr "c�mpul `%s' �nc� are valoarea implicit� ini�ial�\n"
+
+#: src/msgfmt.c:1388
 #, 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:1040
+#: src/msgfmt.c:1391
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "avertisment: conversia setului de caractere nu va func�iona\n"
 
-#: src/msgfmt.c:1050
+#: 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:1052
+#: 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"
+msgstr "avertisment: versiunile mai vechi ale msgfmt ar putea aici raporta o eroare\n"
 
-#: src/msgfmt.c:1076
+#: src/msgfmt.c:1426
 #, 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:1081
+#: src/msgfmt.c:1431
 #, 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:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:1445
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "directiva `domain %s' ignorat�"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:1499
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "intrarea `msgstr' vid� ignorat�"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:1500
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "intrarea `msgstr' neclar�(fuzzy) ignorat�"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1558
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: avertisment: fi�ierul surs� con�ine traduceri aproximative(fuzzy)"
 
-#: src/msgfmt.c:1318
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
+#: src/msggrep.c:421
 #, c-format
-msgid "%s exists but cannot read"
-msgstr ""
+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"
 
-#: 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
-#, c-format
-msgid "error while reading \"%s\""
-msgstr "eroare �n timpul citirii \"%s\""
-
-#: src/msggrep.c:501
-#, fuzzy, c-format
-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
+#: src/msggrep.c:441
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2333,44 +1733,36 @@ 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:547
-#, fuzzy, c-format, no-wrap
+#: src/msggrep.c:467
+#, 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"
+"  [-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 -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"
+"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"
-"MSGCTXT-PATTERN or MSGID-PATTERN or MSGSTR-PATTERN or COMMENT-PATTERN or\n"
-"EXTRACTED-COMMENT-PATTERN syntax:\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"
-"  -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"
@@ -2399,26 +1791,29 @@ msgstr ""
 "  -f, --file=FI�IER             ob�ine TIPAR din FI�IER\n"
 "  -i, --ignore-case           ignor� distinc�ia de caz\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:508
 #, 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:623
+#: src/msggrep.c:529
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "       --sort-output           genereaz� output sortat\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:531
 #, 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"
+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:297
+#: src/msginit.c:293
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2439,12 +1834,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:347
+#: src/msginit.c:345
 #, c-format
 msgid "Created %s.\n"
 msgstr "S-a creat %s.\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:365
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2453,54 +1848,47 @@ msgstr ""
 "Creaz� un nou fi�er PO, ini�ializ�nd informa�iile meta cu valori pentru\n"
 "mediul utilizatorului.\n"
 
-#: src/msginit.c:377
+#: src/msginit.c:375
 #, 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:379
+#: src/msginit.c:377
 #, 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:385
+#: src/msginit.c:383
 #, 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:387
+#: src/msginit.c:385
 #, 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:400
+#: src/msginit.c:398
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          seteaz� localizarea �int�\n"
 
-#: src/msginit.c:402
+#: src/msginit.c:400
 #, 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:468
+#: src/msginit.c:456
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2508,12 +1896,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:476 src/msginit.c:481
+#: src/msginit.c:464 src/msginit.c:469
 #, c-format
 msgid "error reading current directory"
 msgstr "eroare �n citirea directorului curent"
 
-#: src/msginit.c:489
+#: src/msginit.c:477
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2521,25 +1909,31 @@ 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: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: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
 #, 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:1118
+#: src/msginit.c:1148
 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.
@@ -2550,85 +1944,60 @@ msgstr ""
 msgid "English translations for %s package"
 msgstr "Traducerea �n limba rom�n� pentru pachetul %s"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
+#: src/msgl-cat.c:175 src/msgl-charset.c:85 src/msgl-iconv.c:304
 #, 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:188 src/msgl-iconv.c:259
+#: src/msgl-cat.c:184 src/msgl-iconv.c:315
 #, 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)"
+msgstr "dou� seturi diferite de caractere \"%s\" �i \"%s\" �n fi�ierul de intrare(input)"
 
-#: src/msgl-cat.c:203
-#, fuzzy, 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"
+#: 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"
 
-#: 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 ""
-"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: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"
 
-#: src/msgl-cat.c:391 src/msgl-iconv.c:375
+#: src/msgl-cat.c:380 src/msgl-iconv.c:403
 #, 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: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: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
 #, c-format
 msgid "warning: "
 msgstr "avertisment: "
 
-#: src/msgl-cat.c:443
+#: src/msgl-cat.c:431
 #, 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:449
+#: src/msgl-cat.c:437
 #, 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-cat.c:488
-#, 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:93
+#: src/msgl-charset.c:91
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2641,12 +2010,12 @@ msgstr ""
 "Output-ul lui '%s' poate fi incorect.\n"
 "Rezolv�ri(workadrounds) posibile sunt:\n"
 
-#: src/msgl-charset.c:100
+#: src/msgl-charset.c:98
 #, 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:105
+#: src/msgl-charset.c:103
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2657,7 +2026,7 @@ msgstr ""
 "  dup� care se aplic� '%s',\n"
 "  �i apoi reconvertire �n %s folosind 'msgconv'.\n"
 
-#: src/msgl-charset.c:114
+#: src/msgl-charset.c:112
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2670,207 +2039,47 @@ msgstr ""
 "  apoi aplicarea '%s',\n"
 "  dup� care se reconverte�te �n %s folosind 'msgconv'.\n"
 
-#: src/msgl-charset.c:128
+#: src/msgl-charset.c:126
 #, 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-check.c:130
-msgid "plural expression can produce negative values"
-msgstr "expresiile plurale pot produce valori negative"
-
-#: src/msgl-check.c:141
+#: src/msgl-iconv.c:186 src/msgl-iconv.c:244
 #, 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:187
-msgid "plural expression can produce division by zero"
-msgstr "expresia plural� poate produce �mp�r�ire la zero"
-
-#: src/msgl-check.c:192
-msgid "plural expression can produce integer overflow"
-msgstr "plural expression can produce dep�ire(overflow) de �ntreg(integer)"
+msgid "conversion failure"
+msgstr "eroare de conversie"
 
-#: src/msgl-check.c:197
-msgid ""
-"plural expression can produce arithmetic exceptions, possibly division by "
-"zero"
-msgstr ""
-"expresia plural� poate produce excep�ii aritmetice, posibil �mp�r�ire la zero"
-
-#: src/msgl-check.c:266
-#, fuzzy, c-format
-msgid "Try using the following, valid for %s:"
-msgstr "�ncerca�i s� folosi�i urm�toarele, valide pentru %s:\n"
-
-#: src/msgl-check.c:358 src/msgl-check.c:382
-#, fuzzy
-msgid "message catalog has plural form translations"
-msgstr "catalogul de mesaje are traduceri �n forme plurale..."
-
-#: src/msgl-check.c:360
-#, fuzzy
-msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr "...dar header-ului �i lipse�te atributul \"plural=EXPRESSION\""
-
-#: src/msgl-check.c:384
-#, fuzzy
-msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr "...dar header-ului �i lipse�te atributul \"plural=INTEGER\""
-
-#: src/msgl-check.c:420
-msgid "invalid nplurals value"
-msgstr "valoare nplurals invalid�"
-
-#: src/msgl-check.c:442
-msgid "invalid plural expression"
-msgstr "expresie plural� invalid�"
-
-#: src/msgl-check.c:472 src/msgl-check.c:488
-#, fuzzy, c-format
-msgid "nplurals = %lu"
-msgstr "nplurals = %lu..."
-
-#: src/msgl-check.c:474
-#, fuzzy, c-format
-msgid "but some messages have only one plural form"
-msgid_plural "but some messages have only %lu plural forms"
-msgstr[0] "...dar c�teva mesaje au doar o singur� form� plural�"
-msgstr[1] "...dar c�teva mesaje au doar %lu forme plurale"
-
-#: src/msgl-check.c:490
-#, fuzzy, c-format
-msgid "but some messages have one plural form"
-msgid_plural "but some messages have %lu plural forms"
-msgstr[0] "...dar c�teva mesaje au o singur� form� plural�"
-msgstr[1] "...dar c�teva mesaje au %lu forme plurale"
-
-#: src/msgl-check.c:514
-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:611
-#, fuzzy
-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:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "intr�rile `msgid' �i `msgstr[%u]' nu �ncep am�ndou� cu '\\n'"
-
-#: src/msgl-check.c:634
-#, fuzzy
-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:652
-#, fuzzy
-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:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
-msgstr "intr�rile `msgid' �i `msgstr[%u]' nu se termin� am�ndou� cu '\\n'"
-
-#: src/msgl-check.c:675
-#, fuzzy
-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:687
-msgid "plural handling is a GNU gettext extension"
-msgstr "manipularea de plurale este o extensie a GNU gettext"
-
-#: src/msgl-check.c:729
-#, c-format
-msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr "msgstr nu are marcaj de accelerator de tastatur� '%c'"
-
-#: src/msgl-check.c:740
-#, 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:804
-#, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr ""
-"c�teva c�mpuri de header ar trebui s� aib� valoare implicit� ini�ial�\n"
-
-#: src/msgl-check.c:820
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "c�mpul header '%s' lipse�te din header\n"
-
-#: src/msgl-iconv.c:65
+#: src/msgl-iconv.c:337
 #, c-format
-msgid "%s: input is not valid in \"%s\" encoding"
-msgstr ""
-
-#: src/msgl-iconv.c:69
-#, fuzzy, c-format
-msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "eroare �n timpul deschiderii \"%s\" pentru citire"
-
-#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
-msgstr ""
-"fi�ierul de intrare(input) nu con�ine un header cu specifica�ia unui set de "
-"caractere"
+msgstr "fi�ierul de intrare(input) nu con�ine un header cu specifica�ia unui set de caractere"
 
-#: 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:356 src/xgettext.c:586
 #, 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."
-
-#: src/msgl-iconv.c:335
-#, 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 "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:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:378
 #, 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 "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/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgl-iconv.c:383 src/xgettext.c:593
 #, c-format
-msgid "%s is only valid with %s"
-msgstr "%s e valid doar cu %s"
+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:453
+#: src/msgmerge.c:391
 msgid "backup type"
 msgstr "tip de backup"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:426
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2894,234 +2103,180 @@ msgstr ""
 "exact�, se va folosi potrivirea aproximativ�(fuzzy) pentru a produce rezultate\n"
 "mai bune.\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:443
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      traducerile referitoare la surse vechi\n"
 
-#: src/msgmerge.c:509
+#: src/msgmerge.c:445
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     referin�e la surse noi\n"
 
-#: src/msgmerge.c:513
+#: src/msgmerge.c:449
 #, 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:519
+#: src/msgmerge.c:455
 #, 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:531
+#: src/msgmerge.c:467
 #, 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:533
+#: src/msgmerge.c:469
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Rezultatele vor fi scrise �n def.po:\n"
 
-#: src/msgmerge.c:535
+#: src/msgmerge.c:471
 #, 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:537
+#: src/msgmerge.c:473
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFIX         suprascrie sufixul obi�nuit de backup\n"
 
-#: src/msgmerge.c:539
+#: src/msgmerge.c:475
 #, 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:546
-#, fuzzy, c-format
+#: src/msgmerge.c:482
+#, 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 ""
-"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:557
-#, fuzzy, c-format
-msgid ""
-"      --previous              keep previous msgids of translated messages\n"
-msgstr ""
-"      --translated            p�streaz� pe cele traduse, �terge mesajele "
-"netraduse\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:614 src/urlget.c:192
+#: src/msgmerge.c:540
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       suprim� indicatorii de progres\n"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1024
 #, c-format
 msgid "this message should define plural forms"
 msgstr "acest mesaj ar trebui s� defineasc� formele plurale"
 
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1047
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "acest mesaj nu ar trebui s� defineasc� formele plurale"
 
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:1213
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
-#, c-format
+#: src/msgmerge.c:1221
 msgid " done.\n"
 msgstr " efectuat.\n"
 
-#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
+#: src/msgunfmt.c:243 src/msgunfmt.c:252
 #, 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:427
+#: src/msgunfmt.c:334
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Folosire: %s [OP�IUNE] [FI�IER]...\n"
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:338
 #, 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:440
+#: src/msgunfmt.c:347
 #, 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:442
-#, fuzzy, c-format
-msgid "      --csharp                C# mode: input is a .NET .dll file\n"
-msgstr ""
-"      --tcl                mod Tcl: intrarea(input) este un fi�ier tcl/"
-"msgcat .msg\n"
-
-#: src/msgunfmt.c:444
+#: src/msgunfmt.c:349
 #, c-format
-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"
-msgstr ""
-"      --tcl                mod Tcl: intrarea(input) este un fi�ier tcl/"
-"msgcat .msg\n"
+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
+#: src/msgunfmt.c:354
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FI�IER ...                 fi�iere de intrare(input) .mo\n"
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:359
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Loca�ie fi�iere intrare �n mod Java:\n"
 
-#: src/msgunfmt.c:462
+#: src/msgunfmt.c:365
 #, 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 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 .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:479
+#: src/msgunfmt.c:370
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Loca�ie fi�iere intrare �n mod Tcl:\n"
 
-#: src/msgunfmt.c:485
+#: src/msgunfmt.c:376
 #, 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:511
+#: src/msgunfmt.c:396
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent             scrie fi�ierul .po folosind stil indentat\n"
 
-#: src/msgunfmt.c:513
+#: src/msgunfmt.c:398
 #, 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:331
+#: src/msguniq.c:309
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3143,37 +2298,45 @@ 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:364
+#: src/msguniq.c:342
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated                 afi�eaz� doar duplicatele\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:344
 #, 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-catalog.c:56 libgettextpo/gettext-po.c:102
-#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
+#: src/open-po.c:55
 msgid "<stdin>"
 msgstr "<stdin>"
 
-#: src/po-charset.c:489
+#: 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
 #, 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:557
+#: 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
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
@@ -3182,7 +2345,8 @@ msgstr ""
 "Setul de caractere \"%s\" nu este suportat. %s se bazeaz� pe iconv(),\n"
 "iar iconv() nu suport� \"%s\".\n"
 
-#: src/po-charset.c:564 src/po-charset.c:612
+#: src/po-charset.c:304 src/po-charset.c:330
+#, c-format
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
@@ -3190,15 +2354,12 @@ msgstr ""
 "Instalarea GNU libiconv �i apoi reinstalarea GNU gettext\n"
 "va rezolva aceast� problem�.\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:309 src/po-charset.c:334
+#, c-format
+msgid "%s\n"
+msgstr "%s\n"
 
-#: src/po-charset.c:607
+#: src/po-charset.c:323
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
@@ -3207,205 +2368,177 @@ 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:644
+#: src/po-charset.c:349
+#, c-format
 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:93
+#: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "folosire inconsistent� a #~"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:198
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "lipse�te sec�iunea `msgstr[]'"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:206
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "lipse�te sec�iunea `msgid_plural[]'"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:213
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "lipse�te sec�iunea `msgstr'"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "primul plural are index nonzero"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:260
 #, c-format
 msgid "plural form has wrong index"
 msgstr "forma plural� are index gre�it"
 
-#: src/po-lex.c:90 src/po-lex.c:109
+#: 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
 #, c-format
 msgid "too many errors, aborting"
 msgstr "prea multe erori, se renun��"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:458 src/po-lex.c:522 src/write-po.c:554 src/write-po.c:660
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "secven�� multibyte invalid�"
 
-#: src/po-lex.c:465
+#: src/po-lex.c:486
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "secven�� multibyte incomplet� la sf�r�itul fi�ierului"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:496
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "secven�� multibyte incomplet� la sf�r�itul liniei"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:504
+#, c-format
 msgid "iconv failure"
 msgstr "eroare iconv"
 
-#: src/po-lex.c:744
+#: 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
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "cuv�ntul cheie \"%s\" este necunoscut"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:847
 #, c-format
 msgid "invalid control sequence"
 msgstr "secven�� de control invalid�"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:955
 #, c-format
 msgid "end-of-file within string"
 msgstr "sf�r�it de fi�ier �n �ir"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:961
 #, c-format
 msgid "end-of-line within string"
 msgstr "sf�r�it de linie �n �ir"
 
-#: src/po-lex.c:1008
-#, c-format
-msgid "context separator <EOT> within string"
-msgstr ""
-
-#: src/read-catalog.c:318 src/xgettext.c:1046
-#, 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:363
-msgid "duplicate message definition"
-msgstr "defini�ie duplicat� de mesaj"
-
-#: src/read-catalog.c:365
-#, fuzzy
-msgid "this is the location of the first definition"
-msgstr "...aceasta este loca�ia primei defini�ii"
-
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
+#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:164 src/read-mo.c:190
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "fi�ierul \"%s\" este trunchiat"
 
-#: src/read-mo.c:129
+#: src/read-mo.c:122
 #, 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:165 src/read-mo.c:274
+#: src/read-mo.c:157 src/read-mo.c:263
 #, 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:178
+#: src/read-mo.c:170
 #, 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-properties.c:227
-#, fuzzy
-msgid "warning: invalid \\uxxxx syntax for Unicode character"
+#: 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-po.c:358
+#, c-format
+msgid "...this is the location of the first definition"
+msgstr "...aceasta este loca�ia primei defini�ii"
+
+#: 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-stringtable.c:802
-#, fuzzy
-msgid "warning: unterminated string"
-msgstr "%s:%d: avertisment: �ir neterminat"
+#: src/read-stringtable.c:804
+#, c-format
+msgid "%s:%lu: warning: unterminated string"
+msgstr "%s:%lu: avertisment: �ir neterminat"
 
-#: src/read-stringtable.c:810
-#, fuzzy
-msgid "warning: syntax error"
+#: src/read-stringtable.c:815
+#, c-format
+msgid "%s:%lu: warning: syntax error"
 msgstr "%s:%lu: avertisment: eroare de sintax�"
 
-#: src/read-stringtable.c:871 src/read-stringtable.c:893
-#, fuzzy
-msgid "warning: unterminated key/value pair"
+#: src/read-stringtable.c:878 src/read-stringtable.c:900
+#, c-format
+msgid "%s:%lu: warning: unterminated key/value pair"
 msgstr "%s:%lu: avertisment: pereche cheie/valoare neterminat�"
 
-#: src/read-stringtable.c:939
-#, fuzzy
-msgid "warning: syntax error, expected ';' after string"
+#: src/read-stringtable.c:946
+#, c-format
+msgid "%s:%lu: warning: syntax error, expected ';' after string"
 msgstr "%s:%lu: avertisment: eroare de sintax�, se a�tepta ';' dup� �ir"
 
-#: src/read-stringtable.c:948
-#, fuzzy
-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:116
-#, fuzzy, c-format
-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:120
-msgid "Danilo Segan"
-msgstr ""
-
-#: src/recode-sr-latin.c:153
-#, c-format, no-wrap
-msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr ""
-
-#: src/recode-sr-latin.c:156
-#, 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/read-stringtable.c:956
 #, c-format
-msgid "input is not valid in \"%s\" encoding"
-msgstr ""
+msgid "%s:%lu: 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:367
-#, fuzzy, c-format
-msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "eroare �n timpul deschiderii \"%s\" pentru citire"
-
-#: src/urlget.c:159
+#: src/urlget.c:149
 #, c-format
 msgid "expected two arguments"
 msgstr "se a�teptau dou� argumente"
 
-#: src/urlget.c:176
+#: src/urlget.c:166
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Folosire: %s [OP�IUNE] URL FI�IER\n"
 
-#: src/urlget.c:181
+#: src/urlget.c:171
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3414,154 +2547,53 @@ 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:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "eroare �n citirea lui \"%s\""
-
-#: src/urlget.c:234
+#: src/urlget.c:218
 #, c-format
 msgid "error writing stdout"
 msgstr "eroare �n scrierea stdout"
 
-#: src/urlget.c:238
+#: src/write-java.c:977
 #, c-format
-msgid "error after reading \"%s\""
-msgstr "eroare dup� citirea lui \"%s\""
-
-#: src/urlget.c:264
-#, c-format
-msgid "Retrieving %s..."
-msgstr ""
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "nu se poate g�si un director temporar, �ncerca�i s� seta�i $TMPDIR"
 
-#: src/urlget.c:308
+#: src/write-java.c:987
 #, c-format
-msgid " timed out.\n"
-msgstr ""
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "nu se poate crea un director temporar folosind modelul(template) \"%s\""
 
-#: src/urlget.c:445
+#: src/write-java.c:1000
 #, c-format
-msgid " failed.\n"
-msgstr ""
-
-#: 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 ""
-"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:129
-#, fuzzy
-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:162
-#, fuzzy
-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: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 ""
-"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-catalog.c:202
-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�."
+msgid "not a valid Java class name: %s"
+msgstr "nu este un nume valid de clas� Java: %s"
 
-#: src/write-catalog.c:231 src/write-catalog.c:275
+#: src/write-java.c:1057 src/write-java.c:1070
 #, c-format
-msgid "cannot create output file \"%s\""
-msgstr "nu se poate crea fi�ierul de ie�ire(output) \"%s\""
-
-#: src/write-catalog.c:239 src/write-catalog.c:283
-msgid "standard output"
-msgstr "ie�ire(output) standard"
-
-#: src/write-csharp.c:703
-#, fuzzy, c-format
-msgid "failed to create directory \"%s\""
+msgid "failed to create \"%s\""
 msgstr "eroare �n crearea \"%s\""
 
-#: src/write-csharp.c:766
-#, fuzzy, c-format
-msgid "compilation of C# class failed, please try --verbose"
-msgstr ""
-"compilarea clasei Java a e�uat, v� rug�m �ncerca�i --verbose sau seta�i "
-"$JAVAC"
-
-#: src/write-csharp.c:768
-#, fuzzy, c-format
-msgid "compilation of C# class failed"
-msgstr "comunica�ia cu subprocesul %s a e�uat"
-
-#: src/write-java.c:1091
+#: 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 "not a valid Java class name: %s"
-msgstr "nu este un nume valid de clas� Java: %s"
+msgid "error while writing \"%s\" file"
+msgstr "eroare �n scrierea fi�ierului \"%s\""
 
-#: src/write-java.c:1210
+#: src/write-java.c:1092
 #, 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:1213
-#, fuzzy, c-format
-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"
+msgstr "compilarea clasei Java a e�uat, v� rug�m �ncerca�i --verbose sau seta�i $JAVAC"
 
-#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
+#: src/write-mo.c:695 src/write-qt.c:518 src/write-tcl.c:193
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "eroare �n deschiderea \"%s\" pentru scriere"
 
-#: src/write-po.c:875
-#, fuzzy, c-format
-msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
-msgstr ""
-"mesajele interna�ionalizate nu ar trebui s� con�in� secven�a de escape `\\%c'"
-
-#: src/write-po.c:1326 src/write-po.c:1450
-#, fuzzy, 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 ""
-"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-po.c:605
+#, c-format
+msgid "internationalized messages should not contain the `\\%c' escape sequence"
+msgstr "mesajele interna�ionalizate nu ar trebui s� con�in� secven�a de escape `\\%c'"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:851 src/write-po.c:917
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3571,12 +2603,41 @@ msgid ""
 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-qt.c:667
+#: src/write-po.c:1057
+#, 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"
+
+#: src/write-qt.c:475
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3584,65 +2645,17 @@ 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:693
-#, fuzzy
-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:717
+#: src/write-qt.c:499
 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-resources.c:94
-#, fuzzy, c-format
-msgid "error while writing to %s subprocess"
-msgstr "eroare �n scrierea fi�ierului \"%s\""
-
-#: src/write-resources.c:131
-#, fuzzy
-msgid ""
-"message catalog has context dependent translations\n"
-"but the C# .resources format doesn't support contexts\n"
-msgstr ""
-"catalogul de mesaje are traduceri �n form� plural�, dar formatul de "
-"ie�ire(output) nu le suport�."
-
-#: src/write-resources.c:150
-#, fuzzy
-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:157
-#, fuzzy
-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:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3650,124 +2663,32 @@ 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:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:339 src/x-python.c:388
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: avertisment: �ir neterminat"
 
-#: src/x-awk.c:592
+#: src/x-awk.c:590
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: avertisment: expresie regulat� neterminat�"
 
-#: src/x-c.c:1051
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: avertisment: caracter Unicode invalid"
-
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1077 src/x-java.c:899
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: avertisment: constant� caracter neterminat�"
 
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1101
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: avertisment: �ir literal neterminat"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
-#, fuzzy
-msgid "Please specify the source encoding through --from-code."
-msgstr ""
-"�ir non-ASCII la %s%s.\n"
-"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
-
-#: src/x-csharp.c:269
-#, fuzzy, c-format
-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-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 ""
-"�ir non-ASCII la %s%s.\n"
-"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
-
-#: 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 ""
-"�ir non-ASCII la %s%s.\n"
-"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
-
-#: 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 ""
-"�ir non-ASCII la %s%s.\n"
-"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
-
-#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
-#, fuzzy, c-format
-msgid "%s:%d: iconv failure"
-msgstr "eroare iconv"
-
-#: 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 ""
-"�ir non-ASCII la %s%s.\n"
-"V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
-
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-glade.c:413 src/x-glade.c:420
 #, c-format
-msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: avertisment: caracter Unicode invalid"
-
-#: src/x-csharp.c:1512 src/x-java.c:875
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: avertisment: �ir neterminat"
-
-#: src/x-csharp.c:2020 src/x-java.c:1369
-#, c-format
-msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: avertisment: s-a g�sit ')' unde se a�tepta '}'"
-
-#: src/x-csharp.c:2054 src/x-java.c:1403
-#, c-format
-msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: avertisment: s-a g�sit '}' unde se a�tepta ')'"
-
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
-#, fuzzy, c-format
-msgid "%s:%lu:%lu: %s"
+msgid "%s:%d:%d: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:447
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3776,286 +2697,153 @@ msgstr ""
 "Limbajul \"glade\" nu este suportat. %s se bazeaz� pe expat.\n"
 "Aceast� versiune a fost construit� f�r� expat.\n"
 
-#: src/x-java.c:494
-#, fuzzy, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: avertisment: �ir neterminat"
-
-#: src/x-javascript.c:230
-#, fuzzy
-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 ""
-"%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 ""
-"%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 ""
-"%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 ""
-"%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 ""
-"%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-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: avertisment: �ir literal neterminat"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%lu: avertisment: eroare de sintax�"
+#: src/x-java.c:1385
+#, c-format
+msgid "%s:%d: warning: ')' found where '}' was expected"
+msgstr "%s:%d: avertisment: s-a g�sit ')' unde se a�tepta '}'"
 
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: avertisment: �ir neterminat"
+#: src/x-java.c:1409
+#, c-format
+msgid "%s:%d: warning: '}' found where ')' was expected"
+msgstr "%s:%d: avertisment: s-a g�sit '}' unde se a�tepta ')'"
 
-#: src/x-perl.c:308
+#: 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"
+msgstr "%s:%d: nu se poate g�si terminatorul de �ir \"%s\" oriunde �nainte de EOF"
 
-#: src/x-perl.c:1043
+#: 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-perl.c:1163
+#: 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-perl.c:1183
+#: 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-perl.c:1217
+#: 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-perl.c:1230
+#: 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-perl.c:1247
+#: 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-python.c:278
-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/x-python.c:324
+#: src/x-perl.c:2997
 #, 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:341
-#, 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:354
-#, 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:364
-#, 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:397
-#, 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 ""
+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-python.c:722
+#: src/x-python.c:588
 #, c-format
-msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr ""
+msgid "%s:%d: warning: invalid Unicode character"
+msgstr "%s:%d: avertisment: caracter Unicode invalid"
 
-#: src/x-rst.c:108
+#: src/x-rst.c:107
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: defini�ie invalid� de �ir"
 
-#: src/x-rst.c:172
+#: src/x-rst.c:171
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: lipse�te num�r dup� #"
 
-#: src/x-rst.c:207
+#: src/x-rst.c:206
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: expresie �ir invalid�"
 
-#: 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: avertisment: sintaxa $\"...\" nu se mai folose�te din motive de "
-"securitate; �nlocui�i cu eval_gettext"
-
-#: src/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: avertisment: �ir literal neterminat"
-
-#: src/xgettext.c:545
+#: src/x-sh.c:1010
 #, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
+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/xgettext.c:648
+#: src/xgettext.c:515
 #, 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:653
+#: src/xgettext.c:520
 #, 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:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr ""
-"avertisment: fi�ierul `%s' extensia `%s' este necunoscut(�); se va �ncerca C"
+#: src/xgettext.c:661
+#, c-format
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
+msgstr "avertisment: fi�ierul `%s' extensia `%s' este necunoscut(�); se va �ncerca C"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:712
 #, 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:882
+#: src/xgettext.c:735
 #, 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:884
+#: src/xgettext.c:737
 #, 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:886
+#: src/xgettext.c:739
 #, 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:891
+#: src/xgettext.c:744
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Alegerea limbajul fi�ierelor de intrare(input):\n"
 
-#: src/xgettext.c:893
-#, fuzzy, c-format
+#: src/xgettext.c:746
+#, 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"
+"                                (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"
 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:900
+#: src/xgettext.c:752
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                      scurt�tur� pentru --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:754
 #, 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:907
+#: src/xgettext.c:759
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4064,260 +2852,179 @@ msgstr ""
 "      --from-code=NUME        codare pentru fi�ierele de intrare(input)\n"
 "                                (except�nd Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:762
 #, 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:915
+#: src/xgettext.c:767
 #, 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:917
+#: src/xgettext.c:769
 #, 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:919
-#, fuzzy, c-format
+#: src/xgettext.c:771
+#, 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"
+"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
+"                              preceding keyword lines) 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"
+"                                 ETICHET� (sau pe acelea care preced liniile cu\n"
+"                                 cuvinte cheie) �n fi�ierul de ie�ire(output)\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:775
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Op�iuni specifice limbajului:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:777
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all              extrage toate �irurile\n"
 
-#: src/xgettext.c:929
-#, fuzzy, c-format
+#: src/xgettext.c:779 src/xgettext.c:786
+#, 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"
+"                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+"                                Tcl, Perl, PHP, GCC-source, Glade)\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:937
-#, fuzzy, c-format
+#: src/xgettext.c:783
+#, 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"
+"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
+"                              WORD means not to use default keywords)\n"
 msgstr ""
-"                                (doar limbajele C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
-"                                Tcl, Perl, PHP, GCC-surs�, Glade)\n"
+"  -k, --keyword[=CUV�NT]        cuvinte cheie de c�utat (f�r�\n"
+"                                  CUV�NT �nseamn� neutilizarea cuvintelor_cheie\n"
+"                                  implicite)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:790
 #, 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:945
-#, fuzzy, c-format
+#: src/xgettext.c:793
+#, 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"
+"                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+"                                YCP, Tcl, Perl, PHP, GCC-source)\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:950
+#: src/xgettext.c:797
 #, 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:952
+#: src/xgettext.c:799
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (doar limbajele C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:801
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    recunoa�te formatul �irurilor Qt\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:803
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (doar limbajul C++)\n"
 
-#: src/xgettext.c:958
-#, fuzzy, c-format
-msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --qt                    recunoa�te formatul �irurilor Qt\n"
-
-#: src/xgettext.c:962
-#, fuzzy, c-format
-msgid "      --boost                 recognize Boost format strings\n"
-msgstr "      --qt                    recunoa�te formatul �irurilor Qt\n"
-
-#: src/xgettext.c:966
+#: src/xgettext.c:805
 #, 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:991
+#: src/xgettext.c:824
 #, 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:1006
+#: src/xgettext.c:839
 #, 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:1008
+#: src/xgettext.c:841
 #, 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:1010
+#: src/xgettext.c:843
 #, c-format
-msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr ""
-
-#: src/xgettext.c:1012
-#, fuzzy, c-format
-msgid "      --package-version=VERSION  set package version in output\n"
-msgstr ""
-"      --copyright-holder=�IR  seteaz� de�in�torul copyright-ului la "
-"ie�ire(output)\n"
-
-#: src/xgettext.c:1014
-#, 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@ADRES�  seteaz� adresa de reportare a\n"
 "bug-urilor msgid\n"
 
-#: src/xgettext.c:1016
-#, fuzzy, c-format
-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: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:1019
-#, fuzzy, c-format
-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:847
+#, 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"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1434
 #, 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:1965
+#: src/xgettext.c:1480
 msgid "standard input"
 msgstr "intrare(input) standard"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1592
 #, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2075
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr ""
-
-#: src/xgettext.c:2080
-#, c-format
-msgid "Non-ASCII string at %s%s."
+msgid ""
+"Non-ASCII string at %s%s.\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:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:1651 src/xgettext.c:1706
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: avertisment: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:1653
 #, c-format
-msgid ""
-"Although being used in a format string position, the %s is not a valid %s "
-"format string. Reason: %s\n"
+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"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:1653
 #, c-format
-msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: "
-"%s\n"
+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"
 
-#: 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 ""
-
-#: src/xgettext.c:2283
+#: src/xgettext.c:1708
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4327,31 +3034,10 @@ msgstr ""
 "gettext(\"\") returneaz� header-ul cu informa�ii\n"
 "meta, nu cu �irul vid.\n"
 
-#: src/xgettext.c:2979
-#, fuzzy, c-format
-msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "parametru ambiguu `%s' pentru `%s'"
-
-#: src/xgettext.c:3006
-#, c-format
-msgid "warning: missing context for keyword '%.*s'"
-msgstr ""
-
-#: src/xgettext.c:3031
-#, c-format
-msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr ""
-
-#: src/xgettext.c:3052
-#, c-format
-msgid "context mismatch between singular and plural form"
-msgstr ""
-
-#: src/xgettext.c:3419
-#, fuzzy
+#: src/xgettext.c:1990
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\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 ""
@@ -4360,93 +3046,43 @@ msgstr ""
 "aici variabila MSGID_BUGS_ADDRESS; �n caz contrar\n"
 "v� rug�m specifica�i optiunea --msgid-bugs-address �n linia de comand�.\n"
 
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:2179
+#, c-format
+msgid "language `%s' unknown"
 msgstr "limbajul `%s' este necunoscut"
 
-#: libgettextpo/gettext-po.c:84
-msgid "<unnamed>"
-msgstr ""
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: op�iune ilegal� -- %c\n"
-
-#~ msgid "DuplicateHandle failed with error code 0x%08x"
-#~ msgstr "DuplicateHandle a e�uat cu cod de eroare 0x%08x"
-
-#~ msgid "Multiple references to %%%c."
-#~ msgstr "Referin�e multiple la % % %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"
-#~ 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"
-
-#~ msgid "Not yet implemented."
-#~ msgstr "Neimplimentat �nc�."
-
-#~ msgid "header field `%s' should start at beginning of line\n"
-#~ msgstr "c�mpul header `%s' ar trebui s� �nceap� la �nceputul liniei\n"
-
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "c�mpul `%s' �nc� are valoarea implicit� ini�ial�\n"
-
-#~ msgid "write to grep subprocess failed"
-#~ msgstr "scrierea �n subprocesul grep a e�uat"
-
-#~ msgid "conversion failure"
-#~ msgstr "eroare de conversie"
-
-#~ msgid "%s: warning: "
-#~ msgstr "%s: avertisment: "
-
-#~ msgid "%s\n"
-#~ msgstr "%s\n"
-
-#~ msgid "%s:%lu: warning: unterminated string"
-#~ msgstr "%s:%lu: avertisment: �ir neterminat"
-
-#~ msgid "%s:%d: fatal: plural message seen before singular message\n"
-#~ msgstr "%s:%d: fatal: mesaj plural �nt�lnit �nainte de mesajul singular\n"
-
-#~ msgid "Which is your email address?"
-#~ msgstr "Care este adresa voastr� de email?"
+#: src/user-email.sh.in:340
+msgid "Which is your email address?"
+msgstr "Care este adresa voastr� de email?"
 
-#~ 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: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 "Invalid email address: invalid character."
-#~ msgstr "Adres� email invalid�: caracter invalid."
+#: 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: 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: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: missing @"
-#~ msgstr "Adres� email invalid�: lipse�te @"
+#: 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 "Is the following your email address?"
-#~ msgstr "Este aceasta adresa voastr� de e-mail?"
+#: src/user-email.sh.in:372
+msgid "Is the following your email address?"
+msgstr "Este aceasta adresa voastr� de e-mail?"
 
-#~ 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: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 "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:395
+msgid "Couldn't find out about your email address."
+msgstr "Nu se poate afla nimic despre adresa voastr� de e-mail."
 
-#~ msgid "Please enter your email address."
-#~ msgstr "V� rug�m introduce�i adresa voastr� de email."
+#: src/user-email.sh.in:397
+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 edc8a057b..fb5fe9853 100644
--- a/gettext-tools/po/ru.po
+++ b/gettext-tools/po/ru.po
@@ -8,7 +8,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-06-01 11:19+0900\n"
+"POT-Creation-Date: 2014-05-10 13:37+0900\n"
 "PO-Revision-Date: 2014-05-11 13:59+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -16,8 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%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"
 "X-Generator: Lokalize 1.5\n"
 
 #: gnulib-lib/argmatch.c:133
@@ -200,15 +199,12 @@ msgstr "ошибка записи файла «%s»"
 #: gnulib-lib/javacomp.c:2343
 #, 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
@@ -218,7 +214,7 @@ msgstr "ошибка ввода/вывода в дочернем процесс�
 
 #: 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
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "память исчерпана"
@@ -229,7 +225,7 @@ msgid "creation of threads failed"
 msgstr "ошибка при создании нитей"
 
 #: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "ошибка при записи в дочерний процесс %s"
@@ -242,8 +238,7 @@ msgstr "ошибка при чтении из дочернего процесс�
 #: gnulib-lib/pipe-filter-ii.c:298
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-"невозможно организовать неблокирующий ввод/вывод для дочернего процесса %s"
+msgstr "невозможно организовать неблокирующий ввод/вывод для дочернего процесса %s"
 
 #: gnulib-lib/pipe-filter-ii.c:329
 #, c-format
@@ -326,17 +321,14 @@ msgstr "ошибка открытия файла «%s» для чтения"
 #: src/format.c:151
 #, 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-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-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
@@ -364,25 +356,18 @@ msgstr "Директива номер %u начинается с |, но не з
 
 #: 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
@@ -402,15 +387,12 @@ 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 ""
-"Строка обрывается посреди директивы: найдена «{» без соответствующей «}»."
+msgid "The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr "Строка обрывается посреди директивы: найдена «{» без соответствующей «}»."
 
 #: src/format-csharp.c:139
 #, 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
@@ -419,11 +401,8 @@ 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 ""
-"Строка начинается посреди директивы: найдена «}» без соответствующей «{»."
+msgid "The string starts in the middle of a directive: found '}' without matching '{'."
+msgstr "Строка начинается посреди директивы: найдена «}» без соответствующей «{»."
 
 #: src/format-csharp.c:162
 #, c-format
@@ -442,19 +421,13 @@ 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
@@ -491,56 +464,33 @@ 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
@@ -549,11 +499,8 @@ 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
@@ -562,18 +509,13 @@ 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
@@ -582,17 +524,12 @@ 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
@@ -602,37 +539,22 @@ 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
 #, 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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -662,11 +584,8 @@ msgstr "В директиве номер %u одновременно задан�
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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
 #, c-format
@@ -685,17 +604,12 @@ msgstr "спецификации формата в «%s» и «%s» не экв�
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, c-format
 msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr ""
-"спецификации формата в «%s» не являются подмножеством спецификаций из «%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
@@ -705,12 +619,8 @@ msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "для аргумента «%s» нет спецификации формата в «%s»"
 
 #: 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
@@ -719,26 +629,22 @@ 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
@@ -758,11 +664,8 @@ msgstr "В директиве номер %u с «%c» не может начин
 
 #: 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 в спецификаторе формата невозможно указать большую "
-"вложенность."
+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
@@ -771,34 +674,20 @@ 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."
@@ -806,16 +695,12 @@ 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."
+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:355 src/msgcat.c:294 src/msgcmp.c:172
@@ -889,8 +774,7 @@ msgstr "  -s, --short                 короткое имя машины\n"
 #: src/hostname.c:222
 #, 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"
@@ -979,10 +863,8 @@ msgstr ""
 #: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 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
@@ -1002,17 +884,14 @@ msgstr "  ВХОДНОЙ-ФАЙЛ                входной PO-файл\n"
 #: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
 #: src/xgettext.c:875
 #, 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/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
@@ -1047,43 +926,33 @@ 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
@@ -1121,32 +990,24 @@ 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"
@@ -1158,10 +1019,8 @@ 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
@@ -1174,20 +1033,14 @@ 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:393 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:395 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
@@ -1204,13 +1057,11 @@ msgstr "Подробности выходного формата:\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"
+"                              WHEN may be 'always', 'never', 'auto', or 'html'.\n"
 msgstr ""
 "      --color                 всегда использовать цвета и другие\n"
 "                              текстовые атрибуты\n"
-"      --color=КОГДА           использовать цвета и другие "
-"текстовые                               атрибуты в соответствии с КОГДА\n"
+"      --color=КОГДА           использовать цвета и другие текстовые                               атрибуты в соответствии с КОГДА\n"
 "                              КОГДА может быть: «always» (всегда),\n"
 "                              «never» (никогда), «auto» или «html»\n"
 
@@ -1219,15 +1070,13 @@ msgstr ""
 #: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
 #, 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:578 src/msgunfmt.c:505 src/msguniq.c:389
 #: src/xgettext.c:977
 #, 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"
@@ -1236,8 +1085,7 @@ msgstr ""
 #: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
 #: src/msguniq.c:391 src/xgettext.c:979
 #, 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"
@@ -1253,8 +1101,7 @@ msgstr "      --force-po              записать PO-файл, даже е�
 #: src/xgettext.c:983
 #, 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
@@ -1265,8 +1112,7 @@ msgstr "      --no-location           не писать строки «#: фай
 #: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
 #: src/xgettext.c:987
 #, 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"
@@ -1274,11 +1120,9 @@ msgstr ""
 #: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
 #: src/xgettext.c:989
 #, 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
@@ -1292,10 +1136,8 @@ msgstr "  -p, --properties-output     записать .properties-файл Java
 #: 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
 #, 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:414
@@ -1370,8 +1212,7 @@ msgstr "  ВХОДНОЙ-ФАЙЛ...             входные файлы\n"
 #: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
 #, 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
@@ -1411,11 +1252,8 @@ msgstr ""
 #: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
 #: src/msgmerge.c:562
 #, 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:564
@@ -1424,8 +1262,7 @@ 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
@@ -1444,8 +1281,7 @@ msgstr ""
 
 #: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
 #, 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.
@@ -1503,11 +1339,8 @@ msgstr "Модификаторы режима работы:\n"
 
 #: src/msgcmp.c:241 src/msgmerge.c:553
 #, 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:555
 #, c-format
@@ -1554,7 +1387,7 @@ msgstr "это сообщение не было определено в %s"
 msgid "warning: this message is not used"
 msgstr "предупреждение: это сообщение не используется"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1599,10 +1432,8 @@ msgstr ""
 
 #: src/msgcomm.c:452 src/xgettext.c:1004
 #, 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
@@ -1633,8 +1464,7 @@ msgstr "      --no-location           убрать строки «#: файл:с
 #: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
 #: src/msgmerge.c:588
 #, 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"
@@ -1750,8 +1580,7 @@ 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
@@ -1761,15 +1590,13 @@ msgstr "Полезные ПАРАМЕТРЫ-ФИЛЬТРА в случае, ес
 
 #: src/msgfilter.c:442
 #, 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
 #, 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"
@@ -1777,19 +1604,15 @@ msgstr ""
 
 #: src/msgfilter.c:447
 #, 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
 #, 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
 #, c-format
@@ -1798,11 +1621,8 @@ msgstr "      --indent                использовать на выводе
 
 #: src/msgfilter.c:473
 #, 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
 #, c-format
@@ -1923,20 +1743,13 @@ msgstr "Режим работы:\n"
 
 #: src/msgfmt.c:799
 #, 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
 #, 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
 #, c-format
@@ -1945,19 +1758,13 @@ msgstr "      --csharp                режим C#: генерировать .d
 
 #: src/msgfmt.c:805
 #, 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
 #, 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
 #, c-format
@@ -1966,23 +1773,18 @@ msgstr "      --qt                    режим Qt: генерировать .q
 
 #: src/msgfmt.c:811
 #, 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:818
 #, 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
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
-msgstr ""
-"Если выходной файл задан как -, результаты выводятся на стандартный вывод.\n"
+msgstr "Если выходной файл задан как -, результаты выводятся на стандартный вывод.\n"
 
 #: src/msgfmt.c:823
 #, c-format
@@ -1997,38 +1799,28 @@ 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
 #, 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
 #, 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
 #, 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
 #, 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
@@ -2038,12 +1830,8 @@ msgstr "Нахождение выходного файла в режиме C#:\n
 
 #: src/msgfmt.c:845 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
 #, c-format
@@ -2070,9 +1858,7 @@ msgstr "  -d КАТАЛОГ                  корневой каталог и�
 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
 #, c-format
@@ -2082,8 +1868,7 @@ msgstr "Параметры режима Desktop Entry:\n"
 #: src/msgfmt.c:867
 #, 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
 #, c-format
@@ -2102,8 +1887,7 @@ msgstr ""
 #: src/msgfmt.c:874
 #, 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"
@@ -2118,8 +1902,7 @@ msgstr "Интерпретация входного файла:\n"
 #, 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"
@@ -2128,16 +1911,12 @@ msgstr ""
 #: src/msgfmt.c:891
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr ""
-"      --check-format          проверить зависящие от языка форматные строки\n"
+msgstr "      --check-format          проверить зависящие от языка форматные строки\n"
 
 #: src/msgfmt.c:893
 #, 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
 #, c-format
@@ -2145,15 +1924,12 @@ 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
 #, 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"
@@ -2161,8 +1937,7 @@ msgstr ""
 #: src/msgfmt.c:900
 #, 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"
@@ -2172,24 +1947,18 @@ msgstr ""
 #: src/msgfmt.c:903
 #, 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
 #, 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
 #, 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"
@@ -2197,10 +1966,8 @@ msgstr ""
 
 #: src/msgfmt.c:913
 #, 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
 #, c-format
@@ -2210,9 +1977,7 @@ msgstr "      --statistics            напечатать статистику
 #: src/msgfmt.c:924 src/msgmerge.c:612 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
 #, c-format
@@ -2266,12 +2031,12 @@ msgstr "неточная запись «msgstr» игнорируется"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: предупреждение: исходный файл содержит неточные переводы"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1306
 #, c-format
 msgid "%s does not exist"
 msgstr "%s не существует"
 
-#: src/msgfmt.c:1328
+#: src/msgfmt.c:1316
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s существует, но недоступен для чтения"
@@ -2290,12 +2055,8 @@ 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
@@ -2395,8 +2156,7 @@ 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"
@@ -2454,8 +2214,7 @@ msgstr "  -i, --input=ВХОДНОЙ-ФАЙЛ    входной POT-файл\n"
 #: src/msginit.c:379
 #, 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"
@@ -2483,11 +2242,8 @@ msgstr "  -l, --locale=ЯЯ_СС          задает целевую локал
 
 #: src/msginit.c:402
 #, 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:468
 msgid ""
@@ -2519,10 +2275,8 @@ msgstr "дочерний процесс %s завершился неуспехо
 
 #: src/msginit.c:1118
 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"
@@ -2550,18 +2304,13 @@ 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 "входной файл «%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
 #, c-format
@@ -2587,13 +2336,11 @@ msgstr ""
 #: src/msgl-cat.c:449
 #, 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"
 
@@ -2607,8 +2354,7 @@ 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
@@ -2670,9 +2416,7 @@ msgstr "выражение во множественном числе может
 #: src/msgl-check.c:141
 #, 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
 msgid "plural expression can produce division by zero"
@@ -2683,12 +2427,8 @@ 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 ""
-"выражение во множественном числе может давать исключительные ситуации в "
-"арифметике, возможно, деление на ноль"
+msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+msgstr "выражение во множественном числе может давать исключительные ситуации в арифметике, возможно, деление на ноль"
 
 #: src/msgl-check.c:266
 #, c-format
@@ -2737,12 +2477,8 @@ 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=ВЫРАЖЕНИЕ;»"
+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
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
@@ -2779,18 +2515,17 @@ msgstr "обработка форм во множественном числе �
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "в msgstr недостает отметки клавиатурного эквивалента «%c»"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "в msgstr слишком много отметок клавиатурных эквивалентов «%c»"
 
-#: src/msgl-check.c:804
+#: src/msgl-check.c:801
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
-msgstr ""
-"поле заголовка «%s» всё ещё содержит первоначальное значение по умолчанию\n"
+msgstr "поле заголовка «%s» всё ещё содержит первоначальное значение по умолчанию\n"
 
-#: src/msgl-check.c:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "в заголовке отсутствует поле «%s»\n"
@@ -2812,31 +2547,19 @@ 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
 #, 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
 #, 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
 #, 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:392 src/msgmerge.c:398
 #, c-format
@@ -2875,8 +2598,7 @@ msgstr ""
 #: src/msgmerge.c:507
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr ""
-"  def.po                      переводы, ссылающиеся на старые исходники\n"
+msgstr "  def.po                      переводы, ссылающиеся на старые исходники\n"
 
 #: src/msgmerge.c:509
 #, c-format
@@ -2889,8 +2611,7 @@ 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:519
@@ -2920,14 +2641,12 @@ msgstr "      --backup=МЕТОД          сделать резервную к�
 #: src/msgmerge.c:537
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr ""
-"      --suffix=СУФФИКС        перекрыть обычный суффикс резервной копии\n"
+msgstr "      --suffix=СУФФИКС        перекрыть обычный суффикс резервной копии\n"
 
 #: src/msgmerge.c:539
 #, 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"
@@ -2936,8 +2655,7 @@ msgid ""
 msgstr ""
 "Метод управления версиями можно выбрать с помощью параметра --backup или\n"
 "через переменную среды VERSION_CONTROL. Вот допустимые значения:\n"
-"  none, off       не делать резервных копий (даже если задан параметр --"
-"backup)\n"
+"  none, off       не делать резервных копий (даже если задан параметр --backup)\n"
 "  numbered, t     делать нумерованные резервные копии\n"
 "  existing, nil   нумерованные, если такие уже есть, и простые, если нет\n"
 "  simple, never   всегда делать простые резервные копии\n"
@@ -2946,8 +2664,7 @@ msgstr ""
 #: src/msgmerge.c:546
 #, 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"
@@ -2956,8 +2673,7 @@ msgstr ""
 
 #: src/msgmerge.c:557
 #, 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"
@@ -2979,12 +2695,8 @@ msgstr "данное сообщение не должно определять �
 
 #: src/msgmerge.c:2035
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -3009,12 +2721,8 @@ 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
@@ -3023,19 +2731,13 @@ 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
@@ -3050,8 +2752,7 @@ 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"
@@ -3081,9 +2782,7 @@ 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
@@ -3093,9 +2792,7 @@ 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
@@ -3127,12 +2824,8 @@ 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
@@ -3153,17 +2846,13 @@ 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."
@@ -3325,8 +3014,7 @@ msgstr "предупреждение: синтаксическая ошибка,
 
 #: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr ""
-"предупреждение: синтаксическая ошибка, после строки ожидается «=» или «;»"
+msgstr "предупреждение: синтаксическая ошибка, после строки ожидается «=» или «;»"
 
 #: src/recode-sr-latin.c:116
 #, c-format
@@ -3415,46 +3103,24 @@ 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-файлов."
+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 ""
-"Невозможно вывести несколько доменов перевода в единый файл указанного "
-"формата."
+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 ""
-"каталог сообщений содержит переводы с контекстом, но выходной формат их не "
-"поддерживает."
+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."
+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 ""
-"каталог сообщений содержит переводы во множественном числе, но выходной "
-"формат их не поддерживает."
+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
 #, c-format
@@ -3488,15 +3154,12 @@ msgstr "%s не является верным именем класса Java"
 #: src/write-java.c:1210
 #, 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
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr ""
-"компиляция класса Java завершилась с ошибкой, попробуйте установить $JAVAC"
+msgstr "компиляция класса Java завершилась с ошибкой, попробуйте установить $JAVAC"
 
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
@@ -3505,13 +3168,10 @@ msgstr "ошибка открытия «%s» для записи"
 
 #: src/write-po.c:875
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1326 src/write-po.c:1455
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3524,7 +3184,7 @@ msgstr ""
 "кодировку, что и вы. Подумайте об использовании в msgctxt только ASCII.\n"
 "%s\n"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1338 src/write-po.c:1467
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3548,8 +3208,7 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3917,18 +3576,13 @@ 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"
+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:413
 #, c-format
 msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr ""
-"%s:%d: предупреждение: литерал регулярного выражения завершился слишком рано"
+msgstr "%s:%d: предупреждение: литерал регулярного выражения завершился слишком рано"
 
 #: src/xgettext.c:545
 #, c-format
@@ -3938,9 +3592,7 @@ msgstr "«%s» не является корректным именем коди�
 #: src/xgettext.c:648
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
-msgstr ""
-"параметр --join-existing не может быть использован при записи в стандартный "
-"вывод"
+msgstr "параметр --join-existing не может быть использован при записи в стандартный вывод"
 
 #: src/xgettext.c:653
 #, c-format
@@ -3950,8 +3602,7 @@ msgstr "xgettext не может работать, не зная искомых
 #: src/xgettext.c:808
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr ""
-"предупреждение: файл «%s» имеет неизвестное расширение «%s»; трактуется как C"
+msgstr "предупреждение: файл «%s» имеет неизвестное расширение «%s»; трактуется как C"
 
 #: src/xgettext.c:859
 #, c-format
@@ -3960,11 +3611,8 @@ msgstr "Извлекает переводимые строки из указан
 
 #: 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=ИМЯ    выводить в файл ИМЯ.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:884
 #, c-format
@@ -3973,8 +3621,7 @@ msgstr "  -o, --output=ФАЙЛ           записать вывод в ука�
 
 #: src/xgettext.c:886
 #, 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:891
@@ -3986,11 +3633,9 @@ msgstr "Выбор языка входного файла:\n"
 #, 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"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 msgstr ""
@@ -4008,9 +3653,7 @@ msgstr "  -C, --c++                   синоним --language=C++\n"
 
 #: src/xgettext.c:902
 #, 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:907
@@ -4042,8 +3685,7 @@ msgstr "  -x, --exclude-file=ФАЙЛ.po  не извлекать вхожден
 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"
@@ -4065,14 +3707,12 @@ msgstr "  -a, --extract-all           извлечь все строки\n"
 #, 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"
 
@@ -4080,40 +3720,34 @@ msgstr ""
 #, 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:942
 #, 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"
+"      --flag=СЛОВО:АРГ:ФЛАГ   дополнительный флаг для строк внутри аргумента\n"
 "                              номер АРГ ключевого слова СЛОВО\n"
 
 #: src/xgettext.c:945
 #, 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"
 
@@ -4149,11 +3783,8 @@ msgstr "      --boost                 распознавать форматны�
 
 #: src/xgettext.c:966
 #, 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:991
 #, c-format
@@ -4169,11 +3800,8 @@ msgstr ""
 
 #: src/xgettext.c:1008
 #, 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:1010
 #, c-format
@@ -4189,18 +3817,15 @@ msgstr ""
 
 #: src/xgettext.c:1014
 #, 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"
-"                      задает адрес, куда следует отправлять отчет об "
-"ошибках\n"
+"                      задает адрес, куда следует отправлять отчет об ошибках\n"
 
 #: src/xgettext.c:1016
 #, 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"
@@ -4210,8 +3835,7 @@ msgstr ""
 #: src/xgettext.c:1019
 #, 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"
@@ -4220,12 +3844,8 @@ msgstr ""
 
 #: 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 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
+msgstr "Аргумент --flag не соответствует синтаксису <ключевое-слово>:<номер-арг>:[pass-]<флаг>: %s"
 
 #: src/xgettext.c:1965
 msgid "standard input"
@@ -4253,21 +3873,13 @@ 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
@@ -4306,9 +3918,7 @@ msgstr "предупреждение: не указан контекст для
 #: src/xgettext.c:3031
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr ""
-"предупреждение: не указан контекст для аргумента во множественном числе у "
-"ключевого слова «%.*s»"
+msgstr "предупреждение: не указан контекст для аргумента во множественном числе у ключевого слова «%.*s»"
 
 #: src/xgettext.c:3052
 #, c-format
@@ -4339,22 +3949,18 @@ msgstr "<без имени>"
 #~ 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"
 
@@ -4365,8 +3971,7 @@ 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 05e90c093..a129a8487 100644
--- a/gettext-tools/po/sk.po
+++ b/gettext-tools/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.19-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2014-05-10 13:37+0900\n"
 "PO-Revision-Date: 2014-05-10 17:44+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -198,15 +198,12 @@ msgstr "chyba počas zápisu do súboru \"%s\""
 #: gnulib-lib/javacomp.c:2343
 #, 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
@@ -216,7 +213,7 @@ msgstr "V/V chyba podprocesu %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
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "pamäť je vyčerpaná"
@@ -227,7 +224,7 @@ msgid "creation of threads failed"
 msgstr "vytváranie vláken zlyhalo"
 
 #: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "zápis do podprocesu %s zlyhal"
@@ -323,16 +320,14 @@ msgstr "chyba pri otváraní súboru \"%s\" na čítanie"
 #: src/format.c:151
 #, 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-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-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:520 src/format-boost.c:628 src/format-elisp.c:359
@@ -360,12 +355,8 @@ msgstr "Direktíva číslo %u začína znakom |, ale nekončí znakom |."
 
 #: 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:39
 #, c-format
@@ -375,8 +366,7 @@ msgstr "V direktíve číslo %u, token za '<' nie je nasledovaný znakom '>'."
 #: 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:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
 #: src/format-javascript.c:215 src/format-python.c:515
@@ -396,14 +386,12 @@ 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:130 src/format-java.c:191
-msgid ""
-"The string ends in the middle of a directive: found '{' without matching '}'."
+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:139
 #, 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:140
@@ -412,11 +400,8 @@ 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:161 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 '{'."
+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:162
 #, c-format
@@ -435,16 +420,12 @@ 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
@@ -482,47 +463,33 @@ 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
@@ -531,11 +498,8 @@ msgstr "Reťazec sa odkazuje na číslo parametra %u nekompatibilnými spôsobmi
 
 #: 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:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
@@ -544,18 +508,13 @@ msgstr "V direktíve číslo %u, \"%s\" nie je nasledované čiarkou."
 
 #: 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: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:572
 #, c-format
@@ -564,17 +523,12 @@ msgstr "V direktíve číslo %u, voľba neobsahuje číslo."
 
 #: 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: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:756
@@ -584,37 +538,22 @@ msgstr "formátovacia značka pre parameter {%u} neexistuje v '%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 "formátovacie značky v '%s' a '%s' pre parameter {%u} nie sú rovnaké"
 
 #: 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 ""
-"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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -644,12 +583,8 @@ msgstr "V direktíve číslo %u, obidva modifikátory @ a : sú zadané."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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:3326 src/format-scheme.c:3263
 #, c-format
@@ -672,12 +607,8 @@ msgstr "formátovacie značky v '%s' nie sú podmnožinou značiek z '%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 ""
-"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-perl-brace.c:199 src/format-python.c:471
 #: src/format-python-brace.c:434 src/format-python-brace.c:447
@@ -687,45 +618,32 @@ 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-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: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-python-brace.c:137
@@ -745,10 +663,8 @@ msgstr "V direktíve číslo %u, '%c' nemôže byť na začiatku parametra getit
 
 #: src/format-python-brace.c:185
 #, 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:270
 #, c-format
@@ -757,34 +673,20 @@ msgstr "V direktíve číslo %u je neukončená formátovacia direktíva."
 
 #: 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: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: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."
+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: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."
+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:85
 msgid "The string refers to a shell variable with an empty name."
@@ -792,16 +694,12 @@ msgstr "Reťazec sa odkazuje na premennú prostredia s prázdnym názvom."
 
 #: 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: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."
 
 #: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
@@ -875,12 +773,10 @@ msgstr "  -s, --short                 krátke meno hostiteľa\n"
 #: src/hostname.c:222
 #, 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:225
@@ -926,10 +822,8 @@ msgstr "  -V, --version               zobraziť informáciu o verzii a skončiť
 #: 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 ""
-"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/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
@@ -970,8 +864,7 @@ msgstr ""
 #: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 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:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
@@ -992,8 +885,7 @@ msgstr "  VSTUPNÝSÚBOR                vstupný PO súbor\n"
 #: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
 #: src/xgettext.c:875
 #, 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"
@@ -1002,8 +894,7 @@ msgstr ""
 #: 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: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
@@ -1038,19 +929,13 @@ msgstr "Výber správy:\n"
 
 #: 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: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:456
 #, c-format
@@ -1085,8 +970,7 @@ msgstr "      --set-fuzzy             nastaviť všetky správy ako nepresné\n"
 #: 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:471
 #, c-format
@@ -1096,8 +980,7 @@ msgstr "      --set-obsolete          nastaviť všetky správy ako zastarané\n
 #: 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:475
 #, c-format
@@ -1105,56 +988,41 @@ 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: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: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: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: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: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: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: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
@@ -1167,20 +1035,14 @@ msgstr "Syntax vstupného súboru:\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:393 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: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
 #, 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: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
@@ -1197,13 +1059,11 @@ msgstr "Podrobnosti výstupu:\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"
+"                              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:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
@@ -1217,8 +1077,7 @@ msgstr "      --style=SÚBORŠTÝLU      zadať pravidlo štýlu CSS pre --color
 #: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
 #: src/xgettext.c:977
 #, 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"
@@ -1227,11 +1086,9 @@ msgstr ""
 #: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
 #: src/msguniq.c:391 src/xgettext.c:979
 #, 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:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
@@ -1245,21 +1102,18 @@ msgstr "      --force-po              zapísať súbor PO, aj keď bude prázdny
 #: src/xgettext.c:983
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
 #: src/xgettext.c:985
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
 #: src/xgettext.c:987
 #, 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"
@@ -1267,8 +1121,7 @@ msgstr ""
 #: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
 #: src/xgettext.c:989
 #, 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"
@@ -1284,10 +1137,8 @@ msgstr "  -p, --properties-output     zapísať Java súbor .properties\n"
 #: 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
 #, 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: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
@@ -1319,8 +1170,7 @@ msgstr "  -s, --sort-output           generovať utriedený výstup\n"
 #: src/xgettext.c:1002
 #, 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
 #, c-format
@@ -1363,8 +1213,7 @@ msgstr "  VSTUPNÝSÚBOR ...            vstupné súbory\n"
 #: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
 #, 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:325 src/msgfmt.c:794
 #: src/xgettext.c:877
@@ -1402,10 +1251,8 @@ msgstr ""
 #: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
 #: src/msgmerge.c:562
 #, 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:254 src/msgcomm.c:413 src/msgfmt.c:882
 #: src/msgmerge.c:564
@@ -1428,16 +1275,13 @@ 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:345 src/msgmerge.c:570
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:359
@@ -1493,11 +1337,8 @@ msgstr "Modifikátory operácie:\n"
 
 #: src/msgcmp.c:241 src/msgmerge.c:553
 #, c-format
-msgid ""
-"  -m, --multi-domain          apply ref.pot to each of the domains in def."
-"po\n"
-msgstr ""
-"  -m, --multi-domain          použije 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žije ref.pot na všetky domény v def.po\n"
 
 #: src/msgcmp.c:243 src/msgmerge.c:555
 #, c-format
@@ -1546,7 +1387,7 @@ msgstr "táto správa je použitá, ale nie je definovaná v %s"
 msgid "warning: this message is not used"
 msgstr "upozornenie: táto správa nie je použitá"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1590,10 +1431,8 @@ msgstr ""
 
 #: src/msgcomm.c:452 src/xgettext.c:1004
 #, 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:311
 #, c-format
@@ -1619,14 +1458,12 @@ msgstr "  -i, --indent                výstup s použitím odsadzovania\n"
 #: src/msgmerge.c:586
 #, 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:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
 #: src/msgmerge.c:588
 #, 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"
@@ -1740,8 +1577,7 @@ 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:440
@@ -1751,32 +1587,26 @@ msgstr "Užitočné VOĽBY-FILTRA keď je použitý FILTER 'sed':\n"
 
 #: src/msgfilter.c:442
 #, 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:444
 #, 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:447
 #, 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:465 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"
@@ -1788,8 +1618,7 @@ msgstr "      --indent                výstup s použitím odsadzovania\n"
 
 #: src/msgfilter.c:473
 #, 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"
@@ -1913,44 +1742,30 @@ msgstr "Mód činnosti:\n"
 
 #: src/msgfmt.c:799
 #, 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 "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
+msgstr "  -j, --java                  režim Java: generovať triedu Java ResourceBundle\n"
 
 #: src/msgfmt.c:801
 #, 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                 ako --java, ale predpokladať Java2 (JDK 1.2 "
-"alebo\n"
+"      --java2                 ako --java, ale predpokladať Java2 (JDK 1.2 alebo\n"
 "                              vyššie)\n"
 
 #: src/msgfmt.c:803
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr ""
-"      --csharp                režim C#: generovať .dll súbor pre .NET\n"
+msgstr "      --csharp                režim C#: generovať .dll súbor pre .NET\n"
 
 #: src/msgfmt.c:805
 #, 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 "      --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:807
 #, 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"
+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:809
 #, c-format
@@ -1959,11 +1774,8 @@ msgstr "      --qt                    režim Qt: generovať Qt súbor .qm\n"
 
 #: src/msgfmt.c:811
 #, 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:818
 #, c-format
@@ -1988,33 +1800,25 @@ msgstr "  -r, --resource=ZDROJ        názov zdroja\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
 #, 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:829
 #, 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:831
 #, 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:833
 #, 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 ""
@@ -2029,12 +1833,8 @@ msgstr "Umiestnenie výstupného súboru v režime C#:\n"
 
 #: src/msgfmt.c:845 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:847
 #, c-format
@@ -2042,8 +1842,7 @@ 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:851
@@ -2061,8 +1860,7 @@ msgstr "  -d ADRESÁR                  základný adresár katalógov správ .ms
 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:861
 #, c-format
@@ -2091,8 +1889,7 @@ msgstr ""
 #: src/msgfmt.c:874
 #, 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"
@@ -2107,27 +1904,20 @@ msgstr "Interpretácia vstupného súboru:\n"
 #, 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:891
 #, 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:893
 #, 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:895
 #, c-format
@@ -2135,15 +1925,12 @@ 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:898
 #, 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"
@@ -2151,12 +1938,10 @@ msgstr ""
 #: src/msgfmt.c:900
 #, 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:903
@@ -2166,32 +1951,22 @@ msgstr "  -f, --use-fuzzy             použiť nepresné preklady vo výstupe\n"
 
 #: src/msgfmt.c:908
 #, 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:910
 #, 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:913
 #, 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:922
 #, c-format
@@ -2231,8 +2006,7 @@ msgstr "meno domény \"%s\" nie je použitelné ako meno súboru"
 #: src/msgfmt.c:1081
 #, 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:1095
 #, c-format
@@ -2254,12 +2028,12 @@ msgstr "nepresná položka 'msgstr' bola ignorovaná"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: upozornenie: zdrojový súbor obsahuje nepresné preklady"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1306
 #, c-format
 msgid "%s does not exist"
 msgstr "%s neexistuje"
 
-#: src/msgfmt.c:1328
+#: src/msgfmt.c:1316
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s existuje, ale nedá sa čítať"
@@ -2278,12 +2052,8 @@ msgstr "chyba pri čítaní súboru \"%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 ""
-"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:521
 #, c-format, no-wrap
@@ -2373,11 +2143,9 @@ 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                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:623
@@ -2388,8 +2156,7 @@ msgstr "      --sort-output           generovať utriedený výstup\n"
 #: 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"
+msgstr "      --sort-by-file          utriediť výstup podľa umiestnenia v súboroch\n"
 
 #: src/msginit.c:297
 msgid ""
@@ -2435,12 +2202,10 @@ msgstr "  -i, --input=VSTUPNÝSÚBOR    vstupný POT súbor\n"
 #: src/msginit.c:379
 #, 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:385
@@ -2465,11 +2230,8 @@ msgstr "  -l, --locale=LL_CC          nastaviť cieľové národné prostredie\n
 
 #: src/msginit.c:402
 #, 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:468
 msgid ""
@@ -2501,16 +2263,12 @@ msgstr "podproces %s zlyhal s ukončovacím kódom %d"
 
 #: src/msginit.c:1118
 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.
@@ -2533,17 +2291,13 @@ msgstr "dve rozdielne znakové sady \"%s\" a \"%s\" vo vstupnom súbore"
 
 #: 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: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:391 src/msgl-iconv.c:375
 #, c-format
@@ -2563,20 +2317,17 @@ 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:449
 #, 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"
 
@@ -2654,9 +2405,7 @@ msgstr "výraz pre množné číslo môže nadobúdať záporné hodnoty"
 #: src/msgl-check.c:141
 #, 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:187
 msgid "plural expression can produce division by zero"
@@ -2667,12 +2416,8 @@ 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:197
-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:266
 #, c-format
@@ -2721,12 +2466,8 @@ 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:514
-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:611
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
@@ -2763,17 +2504,17 @@ msgstr "spracovanie množných čísel je rozšírením GNU"
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "v msgstr chýba značka klávesovej skratky '%c'"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr obsahuje príliš veľa značiek klávesových skratiek '%c'"
 
-#: src/msgl-check.c:804
+#: src/msgl-check.c:801
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "položka hlavičky '%s' ešte obsahujú počiatočnú štandardnú hodnotu\n"
 
-#: src/msgl-check.c:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "položka hlavičky '%s' v hlavičke chýba\n"
@@ -2795,31 +2536,19 @@ msgstr "vstupný súbor nemá v hlavičke uvedenú znakovú sadu"
 #: 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
 #, 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
 #, 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:302 src/x-python.c:672
 #: src/xgettext.c:727
 #, 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:392 src/msgmerge.c:398
 #, c-format
@@ -2857,8 +2586,7 @@ msgstr ""
 #: src/msgmerge.c:507
 #, 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:509
 #, c-format
@@ -2906,8 +2634,7 @@ msgstr "      --suffix=PRÍPONA        prekryť obvyklú príponu zálohy\n"
 #: src/msgmerge.c:539
 #, 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"
@@ -2924,8 +2651,7 @@ msgstr ""
 #: src/msgmerge.c:546
 #, 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"
@@ -2933,11 +2659,8 @@ msgstr ""
 
 #: src/msgmerge.c:557
 #, 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:614 src/urlget.c:192
 #, c-format
@@ -2956,12 +2679,8 @@ msgstr "táto správa by nemala definovať tvary množného čísla"
 
 #: src/msgmerge.c:2035
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2986,12 +2705,8 @@ msgstr "Konvertovať binárny katalóg správ na .po súbor v Uniforum štýle.\
 
 #: 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:442
 #, c-format
@@ -3000,19 +2715,13 @@ msgstr "      --csharp                režim C#: vstup je .dll súbor .NET\n"
 
 #: 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: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:451
 #, c-format
@@ -3027,8 +2736,7 @@ msgstr "Umiestnenie vstupného súboru v režime 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ázov triedy je získaný pridaním názvu národného prostredia k názvu zdroja,\n"
@@ -3058,21 +2766,17 @@ msgstr "Umiestnenie vstupného súboru v režime Tcl:\n"
 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: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: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:331
 #, c-format, no-wrap
@@ -3102,12 +2806,8 @@ msgstr "  -d, --repeated              zobraziť len duplikáty\n"
 
 #: 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:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
@@ -3388,46 +3088,24 @@ msgid " failed.\n"
 msgstr " zlyhalo.\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 ""
-"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."
+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:129
-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."
+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:162
-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."
+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: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 ""
-"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í."
+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:202
-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."
+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:231 src/write-catalog.c:275
 #, c-format
@@ -3461,8 +3139,7 @@ msgstr "nie je platným názvom triedy Java: %s"
 #: src/write-java.c:1210
 #, 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
 #, c-format
@@ -3476,11 +3153,10 @@ msgstr "chyba pri otváraní súboru  \"%s\" na zápis"
 
 #: src/write-po.c:875
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1326 src/write-po.c:1455
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3493,7 +3169,7 @@ msgstr ""
 "ako vy. Zvážte namiesto toho použitie msgctxt len s ASCII znakmi.\n"
 "%s\n"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1338 src/write-po.c:1467
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3516,8 +3192,7 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3884,18 +3559,13 @@ msgstr "%s:%d: neplatný výraz reťazca"
 
 #: 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: 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:413
 #, 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"
 
 #: src/xgettext.c:545
 #, c-format
@@ -3905,8 +3575,7 @@ msgstr "'%s' nie je platný názov kódovania.  Použijem ASCII namiesto neho.\n
 #: src/xgettext.c:648
 #, 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:653
 #, c-format
@@ -3925,12 +3594,8 @@ msgstr "Extrahovať preložiteľné reťazce zo zadaných vstupných súborov.\n
 
 #: 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=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:884
 #, c-format
@@ -3939,11 +3604,8 @@ msgstr "  -o, --output=SÚBOR          zapísať výstup do zadaného súboru\n"
 
 #: src/xgettext.c:886
 #, 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:891
 #, c-format
@@ -3954,20 +3616,16 @@ msgstr "Voľba jazyka vstupného súboru:\n"
 #, 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"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                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"
 
@@ -3978,9 +3636,7 @@ msgstr "  -C, --c++                   skratka pre --language=C++\n"
 
 #: src/xgettext.c:902
 #, 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:907
@@ -4005,21 +3661,17 @@ msgstr "  -j, --join-existing         spojiť správy s existujúcim súborom\n"
 #: src/xgettext.c:917
 #, 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:919
 #, 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"
@@ -4040,14 +3692,12 @@ msgstr "  -a, --extract-all           extrahovať všetky reťazce\n"
 #, 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"
 
@@ -4055,40 +3705,34 @@ msgstr ""
 #, 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:942
 #, 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:945
 #, 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"
 
@@ -4124,11 +3768,9 @@ msgstr "      --boost                 rozoznať formát reťazcov Boost\n"
 
 #: src/xgettext.c:966
 #, 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:991
@@ -4139,14 +3781,11 @@ msgstr "      --properties-output     zapísať Java súbor .properties\n"
 #: src/xgettext.c:1006
 #, 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:1008
 #, 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"
@@ -4163,42 +3802,33 @@ msgstr "      --package-version=VERZIA   nastaviť verziu balíka vo výstupe\n"
 
 #: src/xgettext.c:1014
 #, 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:1016
 #, 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:1019
 #, 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:1840
 #, 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"
+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:1965
 msgid "standard input"
@@ -4226,21 +3856,13 @@ msgstr "%s%s: upozornenie: "
 
 #: 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 ""
-"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"
+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:2190
 #, 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"
+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:2221
 #, c-format
@@ -4279,9 +3901,7 @@ msgstr "upozornenie: chýbajúci kontext pre kľúčové slovo '%.*s'"
 #: src/xgettext.c:3031
 #, 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'"
+msgstr "upozornenie: chýbajúci kontext pre parameter množného čísla kľúčového slova '%.*s'"
 
 #: src/xgettext.c:3052
 #, c-format
diff --git a/gettext-tools/po/sl.po b/gettext-tools/po/sl.po
index ab9a02400..75e3c2d7e 100644
--- a/gettext-tools/po/sl.po
+++ b/gettext-tools/po/sl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.18.3\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2013-06-25 17:48+0900\n"
 "PO-Revision-Date: 2013-12-11 23:24+0100\n"
 "Last-Translator: Primoz PETERLIN <primozz.peterlin@gmail.com>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -17,8 +17,7 @@ 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"
+"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
 #, c-format
@@ -184,15 +183,15 @@ msgstr "neveljaven argument source_version za compile_java_class"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "neveljaven argument target_version za compile_java_class"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c: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:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "ustvarjanje »%s« neuspešno"
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c: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
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "napaka pri pisanju na datoteko »%s«"
@@ -205,8 +204,7 @@ 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
@@ -215,9 +213,9 @@ msgid "%s subprocess I/O error"
 msgstr "V/I napaka v podprocesu %s"
 
 #  Morda ,,Zmanjkalo pomnilnika''?
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
+#: 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:548 libgettextpo/gettext-po.c:1326
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "zmanjkalo pomnilnika"
@@ -228,7 +226,7 @@ msgid "creation of threads failed"
 msgstr "ustvarjanje niti ni uspelo"
 
 #: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "posredovanje podatkov podprocesu %s neuspešno"
@@ -315,8 +313,8 @@ msgid "%s subprocess got fatal signal %d"
 msgstr "podproces %s prejel kritični signal %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/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
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "datoteke \"%s\" ni moč odpreti za branje"
@@ -331,8 +329,7 @@ msgstr "»%s« ni veljaven formatni niz %s, za razliko od »%s« . Razlog: %s"
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%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:520 src/format-boost.c:628 src/format-elisp.c:359
@@ -360,12 +357,8 @@ msgstr "Direktiva številka %u se začenja z »|«, vendar se ne zaključuje z �
 
 #: 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:39
 #, c-format
@@ -375,8 +368,7 @@ msgstr "V direktivi številka %u elementu za »<« ne sledi »>«. "
 #: 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:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
 #: src/format-javascript.c:215 src/format-python.c:515
@@ -396,30 +388,22 @@ 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:130 src/format-java.c:191
-msgid ""
-"The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr ""
-"Niz se konča sredi direktive: najden je oklepaj »{« brez zaklepaja »}«."
+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:139
 #, 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:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr ""
-"Direktivo številka %u zaključuje neveljaven znak namesto zaklepaja »}«."
+msgstr "Direktivo številka %u zaključuje neveljaven znak namesto zaklepaja »}«."
 
 #: src/format-csharp.c:161 src/format-java.c:346
-msgid ""
-"The string starts in the middle of a directive: found '}' without matching "
-"'{'."
-msgstr ""
-"Niz se začne sredi direktive: najden je zaklepaj »}« brez oklepaja »{«."
+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:162
 #, c-format
@@ -438,17 +422,12 @@ 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
@@ -486,51 +465,33 @@ 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
@@ -539,9 +500,7 @@ msgstr "Niz se sklicuje na argument številka %u na nezdružljive načine."
 
 #: 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:251 src/format-java.c:285 src/format-java.c:314
@@ -551,18 +510,13 @@ msgstr "V direktivi številka %u nizu »%s« ne sledi vejica."
 
 #: 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: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:572
 #, c-format
@@ -571,17 +525,12 @@ msgstr "V direktivi številka %u izbira ne vsebuje števila."
 
 #: 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: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:756
@@ -591,40 +540,23 @@ msgstr "v »%2$s« ni formatnega določila za argument {%1$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 "formatni določili v »%s« in »%s« za argument {%u} nista enaki"
 
 #: 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 ""
-"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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -654,9 +586,7 @@ msgstr "V direktivi številka %u je podan tako modifikator @ kot modifikator :."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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:3326 src/format-scheme.c:3263
@@ -680,27 +610,19 @@ msgstr "formatna določila v »%s« niso podmnožica tistih v »%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 ""
-"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-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
 #: src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "v »%2$s« ni formatnega določila za argument »%1$s«"
 
 #: src/format-python.c: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."
+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:354
 #, c-format
@@ -709,91 +631,65 @@ msgstr "Niz se sklicuje na argument »%s« na nezdružljive načine."
 
 #: 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: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: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: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-python-brace.c:137
+#: src/format-python-brace.c:136
 #, 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:150
+#: src/format-python-brace.c:149
 #, 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:165
+#: src/format-python-brace.c:164
 #, 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:185
+#: src/format-python-brace.c:184
 #, 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:270
+#: src/format-python-brace.c:210
 #, 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-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: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: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."
+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: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."
+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:85
 msgid "The string refers to a shell variable with an empty name."
@@ -801,23 +697,19 @@ msgstr "Niz se sklicuje na spremenljivko ukazne lupine s praznim imenom."
 
 #: 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: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."
 
-#: 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
+#: 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"
@@ -830,19 +722,19 @@ msgstr ""
 "To je prost program; smete ga spreminjati in deliti z drugimi.\n"
 "Za program ni NOBENEGA JAMSTVA do zakonsko podanih omejitev.\n"
 
-#: src/hostname.c:184 src/msgattrib.c: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
+#: 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 "Avtor(ica) %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/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
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
@@ -852,11 +744,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "preveč argumentov"
 
-#: 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
+#: 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
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Poskusite »%s --help« za izčrpnejša navodila\n"
@@ -884,12 +776,10 @@ msgstr "  -s, --short           kratka oblika gostiteljskega imena\n"
 #: src/hostname.c:222
 #, 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:225
@@ -897,29 +787,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      internetni naslov za gostiteljsko ime\n"
 
-#: src/hostname.c:228 src/msgattrib.c: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: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
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativni izpis:\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
+#: 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                  ta navodila\n"
 
-#: 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
+#: 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               različica programa\n"
@@ -928,11 +818,11 @@ msgstr "  -V, --version               različica programa\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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
+#: 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 "Morebitne napake v programu sporočite na <bug-gnu-gettext@gnu.org>.\n"
 
@@ -941,27 +831,30 @@ msgstr "Morebitne napake v programu sporočite na <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "gostiteljskega imena ni moč ugotoviti"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: 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
 #, c-format
 msgid "at most one input file allowed"
 msgstr "dovoljena je največ ena vhodna datoteka"
 
-#: 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: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
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s in %s se med seboj izključujeta"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:414 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:419
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -970,375 +863,312 @@ msgstr ""
 "Filtriranje sporočil iz kataloga prevodov glede na njihova določila\n"
 "in rokovanje z njimi.\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:372 src/msgmerge.c:502 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: 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
 #, 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: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: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
 #, c-format
 msgid "Input file location:\n"
 msgstr "Izbira vhodne datoteke:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  VHODNA_DATOTEKA             vhodna datoteka PO\n"
 
-#: src/msgattrib.c: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: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
 #, 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:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: 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
 #, 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: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: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
 #, c-format
 msgid "Output file location:\n"
 msgstr "Izbira izhodne datoteke:\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:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: 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
 #, 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: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/msgunfmt.c:493 src/msguniq.c:358
+#: 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
 #, 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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Izbira sporočil:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:445
 #, 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:454
+#: src/msgattrib.c:447
 #, 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:456
+#: src/msgattrib.c:449
 #, 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:458
+#: src/msgattrib.c:451
 #, 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:460
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           brez zastarelih (#~) sporočil\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         zgolj zastarela (#~) sporočila\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Rokovanje z določili:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:460
 #, 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:469
+#: src/msgattrib.c:462
 #, 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:471
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          vsa sporočila označimo kot zastarela\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:466
 #, 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:475
+#: src/msgattrib.c:468
 #, 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:478
+#: src/msgattrib.c:471
 #, 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"
-
-#: src/msgattrib.c:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr ""
-"      --no-fuzzy              brez ohlapnih samodejno prevedenih 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:482
+#: src/msgattrib.c:473
 #, 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:484
+#: src/msgattrib.c:475
 #, 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:486
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 isto kot --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:479
 #, 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: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/msguniq.c:369
+#: 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
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Skladnja vhodne datoteke:\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:393 src/msguniq.c:371
+#: 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
 #, 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: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: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
 #, 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: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: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
 #, c-format
 msgid "Output details:\n"
 msgstr "Podrobnosti izpisa:\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:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: 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
 #, 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: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: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
 #, 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: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: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
 #, 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: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: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
 #, 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: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: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
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po           vedno izpišemo datoteko PO, četudi prazno\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:960
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:962
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:964
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:966
 #, 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: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: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
 #, 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: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: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
 #, 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: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: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
 #, 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: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: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
 #, 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            brez deljenja dolgih sporočil v več vrstic\n"
+msgstr "      --no-wrap            brez deljenja dolgih sporočil v več vrstic\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:601 src/msgunfmt.c:524
-#: src/msguniq.c:412 src/xgettext.c:1000
+#: 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
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output        izhod abecedno urejen po sporočilih\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:603 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: 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
 #, 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:322 src/msgcomm.c:327
+#: 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:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1360,46 +1190,41 @@ 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:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, 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:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:850
 #, 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: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:319 src/msgfmt.c:674
+#: src/xgettext.c:854
 #, 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: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=Š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: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=Š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: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"
@@ -1408,17 +1233,14 @@ msgstr ""
 "  -u, --unique                   okrajšava za --less-than=2, izpišemo samo\n"
 "                                 enolično definirana sporočila\n"
 
-#: 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:252 src/msgcomm.c:410 src/msgfmt.c:739
+#: src/msgmerge.c:557
 #, 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:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
+#: src/msgmerge.c:559
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1427,12 +1249,12 @@ msgstr ""
 "      --stringtable-input     skladnja vhodnih datotek je NeXTstep/GNUstep \n"
 "                              .strings\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NABOR      nabor znakov izhodne datoteke\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1441,28 +1263,27 @@ msgstr ""
 "      --use-first          uporabimo prvi prevod sporočila, na katerega\n"
 "                             naletimo; ne združujemo več prevodov\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
-msgid ""
-"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+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:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "vhodni datoteki nista podani"
 
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "potrebni sta natančno dve vhodni datoteki"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Uporaba: %s [IZBIRA] def.po ref.po\n"
@@ -1494,20 +1315,17 @@ msgstr "  def.po                      prevodi\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     sklici na vire\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Modifikatorji delovanja:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
-msgid ""
-"  -m, --multi-domain          apply ref.pot to each of the domains in def."
-"po\n"
-msgstr ""
-"  -m, --multi-domain          ref.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:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     ne uporabljamo ohlapnega ujemanja\n"
@@ -1515,8 +1333,7 @@ msgstr "  -N, --no-fuzzy-matching     ne uporabljamo ohlapnega ujemanja\n"
 #: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr ""
-"      --use-fuzzy             uporabimo ohlapne samodejno prevedene prevode\n"
+msgstr "      --use-fuzzy             uporabimo ohlapne samodejno prevedene prevode\n"
 
 #: src/msgcmp.c:247
 #, c-format
@@ -1533,17 +1350,17 @@ msgstr "to sporočilo ni prevedeno"
 msgid "this message needs to be reviewed by the translator"
 msgstr "to sporočilo mora pregledati prevajalec"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "to sporočilo je uporabljeno, a ne definirano..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...a ta definicija je podobna"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "to sporočilo je uporabljeno, a ne definirano v %s"
@@ -1553,7 +1370,7 @@ msgstr "to sporočilo je uporabljeno, a ne definirano v %s"
 msgid "warning: this message is not used"
 msgstr "opozorilo: to sporočilo ni uporabljeno"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:545
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1562,12 +1379,12 @@ msgstr[1] "%d kritična napaka"
 msgstr[2] "%d kritični napaki"
 msgstr[3] "%d kritične napake"
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:315
 #, c-format
 msgid "at least two files must be specified"
 msgstr "podani morata biti vsaj dve datoteki"
 
-#: 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"
@@ -1586,82 +1403,74 @@ 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: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=Š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:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, 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:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Pretvarjanje kataloga sporočil v drug kodni nabor.\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Cilj pretvorbe:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "Privzeta vrednost je kodni nabor izbrane krajevne nastavitve.\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                izpis datoteke PO z zamiki\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr ""
-"      --no-location           brez vrstic »#: datoteka:vrstica« v izpisu\n"
+msgstr "      --no-location           brez vrstic »#: datoteka:vrstica« v izpisu\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
-#, fuzzy, c-format
-msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr ""
-"      --add-location          z vrsticami »#: datoteka:vrstica« v izpisu "
-"(privzeto)\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          z vrsticami »#: datoteka:vrstica« v izpisu (privzeto)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
-msgstr ""
-"      --strict                izpis v strogi obliki Uniforum brez "
-"razširitev\n"
+msgstr "      --strict                izpis v strogi obliki Uniforum brez razširitev\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "vhodna datoteka ni podana"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "zahtevana je natančno ena vhodna datoteka"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Uporaba: %s [IZBIRA] VHODNA_DATOTEKA\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1674,7 +1483,7 @@ msgstr ""
 "ukazom xgettext). Neprevedenim sporočilom se pripiše prevod, enak izvirniku\n"
 "msgid.\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  VHODNA_DATOTEKA             vhodna datoteka PO\n"
@@ -1712,7 +1521,7 @@ 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:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=DATOTEKA        vhodna datoteka PO\n"
@@ -1722,27 +1531,27 @@ msgstr "  -i, --input=DATOTEKA        vhodna datoteka PO\n"
 msgid "write to stdout failed"
 msgstr "izpis na standardni izhod neuspešen"
 
-#: src/msgfilter.c:298
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "manjka ime filtra"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "podan mora biti vsaj en skript v sed"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Uporaba: %s [IZBIRA] FILTER [IZBIRA-FILTRA]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Na vsakem prevodu iz kataloga uporabimo dani filter.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1751,120 +1560,89 @@ 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:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Uporabne IZBIRE FILTRA, kadar je FILTER »sed«:\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, 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:444
+#: src/msgfilter.c:425
 #, 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:447
+#: src/msgfilter.c:428
 #, c-format
-msgid ""
-"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr ""
-"  -n, --quiet, --silent       brez samodejnega izpisa prostora vzorcev\n"
+msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgstr "  -n, --quiet, --silent       brez samodejnega izpisa prostora vzorcev\n"
 
-#: src/msgfilter.c:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, c-format
-msgid ""
-"      --no-escape             do not use C escapes in output (default)\n"
-msgstr ""
-"      --no-escape          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:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent             izpis datoteke PO z zamiki\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, c-format
-msgid ""
-"      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr ""
-"      --keep-header        ohrani glavo nespremenjeno, ne filtriraj je\n"
+msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
+msgstr "      --keep-header        ohrani glavo nespremenjeno, ne filtriraj je\n"
 
-#: src/msgfmt.c:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argument %s mora biti eno samo ločilo"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "neveljaven vrstni red bajtov: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, fuzzy, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr ""
-"Če vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n"
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s zahteva določitev \"-d directory\""
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s zahteva določitev \"-l locale\""
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s zahteva določitev \"-l locale\""
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s zahteva določitev \"-l locale\""
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s in %s se med seboj izključujeta"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s je veljavno edino z %s ali %s"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s je veljavno edino z %s, %s ali %s"
 
 #. 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:620
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:624
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
@@ -1873,7 +1651,7 @@ msgstr[1] "%d prevedeno sporočilo"
 msgstr[2] "%d prevedeni sporočili"
 msgstr[3] "%d prevedena sporočila"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:629
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
@@ -1882,7 +1660,7 @@ msgstr[1] ", %d ohlapni prevod"
 msgstr[2] ", %d ohlapna prevoda"
 msgstr[3] ", %d ohlapni prevodi"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:634
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
@@ -1891,17 +1669,17 @@ msgstr[1] ", %d neprevedeno sporočilo"
 msgstr[2] ", %d neprevedeni sporočili"
 msgstr[3] ", %d neprevedena sporočila"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:654
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Uporaba: %s [IZBIRA] datoteka.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:658
 #, 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:783 src/xgettext.c:864
+#: 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"
@@ -1910,140 +1688,101 @@ msgstr ""
 "Če je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n"
 "tudi za kratko obliko. Enako za neobvezne argumente.\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:670
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  datoteka.po ...             vhodne datoteke\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Način delovanja:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:679
 #, 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:801
+#: src/msgfmt.c:681
 #, 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:803
+#: src/msgfmt.c:683
 #, 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:805
+#: src/msgfmt.c:685
 #, 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:807
+#: src/msgfmt.c:687
 #, 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:809
+#: src/msgfmt.c:689
 #, 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:811
-#, fuzzy, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --qt                    način Qt: ustvarimo datoteko .qm za Qt\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:696
 #, 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:820 src/xgettext.c:888
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, 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:823
+#: src/msgfmt.c:701
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Izbira izhodne datoteke v javanskem načinu:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:703 src/msgfmt.c:717 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: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:705 src/msgfmt.c:719 src/msgfmt.c:729 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"
-
-#: src/msgfmt.c:829
-#, fuzzy, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --tcl                   način tcl: vhod je datoteka tcl/msgcat .msg\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:831
+#: src/msgfmt.c:707
 #, 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:833
+#: src/msgfmt.c:709
 #, 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:839
+#: src/msgfmt.c:715
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Položaj izhodne datoteke v načinu C#:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:721 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:847
+#: src/msgfmt.c:723
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -2052,86 +1791,48 @@ 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:851
+#: src/msgfmt.c:727
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Izbira izhodne datoteke v načinu tcl:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:731 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:857
+#: src/msgfmt.c:733
 #, 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"
-
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d IMENIK                   korenski imenik hierarhije razredov\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, c-format
-msgid ""
-"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
-"  -k, --keyword               do not to use default keywords\n"
-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:874
-#, 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 ""
+msgstr "Izbiri -l in  -d sta obvezni. Datoteka .msg se zapiše v podani imenik.\n"
 
-#: src/msgfmt.c:886 src/xgettext.c:905
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretacija vhodne datoteke:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:747
 #, 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:891
+#: src/msgfmt.c:750
 #, 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:893
+#: src/msgfmt.c:752
 #, 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:895
+#: src/msgfmt.c:754
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2140,152 +1841,123 @@ msgstr ""
 "      --check-domain          preverimo morebitna nesoglasja med direktivo\n"
 "                                domene in izbiro --output-file\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:757
 #, 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:900
+#: src/msgfmt.c:759
 #, 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:903
+#: src/msgfmt.c:762
 #, 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:908
+#: src/msgfmt.c:767
 #, 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:910
+#: src/msgfmt.c:769
 #, 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:913
+#: src/msgfmt.c:772
 #, 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:922
+#: src/msgfmt.c:781
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            s statistiko glede prevodov\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:783 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               z dodatnimi sporočili med izvajanjem\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:897
 #, 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:1040
+#: src/msgfmt.c:900
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "opozorilo: pretvorba v navedeni nabor znakov ne bo delovala\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:910
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "opozorilo: glava datoteke PO ni razberljiva\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:912
 #, 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:1076
+#: src/msgfmt.c:936
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "ime domene \"%s\" ni primerno kot ime datoteke"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:941
 #, 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:1095
+#: src/msgfmt.c:955
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr "direktiva »domain %s« ni bila upoštevana"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1015
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "prazno polje »msgstr« ni bilo upoštevano"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1016
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "ohlapni vnos za polje »msgstr« ni bil upoštevan"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1065
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: opozorilo: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
 
-#: src/msgfmt.c:1318
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
-#, 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-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:176
+#: 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
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "napaka pri branju \"%s\""
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
-msgid ""
-"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
-"specified"
-msgstr ""
-"izbire »%c« ni moč uporabiti, preden je izbrano »J«, »K«, »T«, »C« ali »X«"
+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:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2294,7 +1966,7 @@ msgstr ""
 "Izvlečemo vsa sporočila iz kataloga prevodov, ki ustrezajo danemu vzorcu ali\n"
 "pripadajo dani izvorni datoteki.\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2375,24 +2047,22 @@ msgstr ""
 "  -v, --invert-match          izpiši le sporočila, ki ne ustrezajo nobenemu\n"
 "                              od podanih kriterijev\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, 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:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output        izhod abecedno urejen po sporočilih\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr ""
-"      --sort-by-file       izhod abecedno urejen po izvornih datotekah\n"
+msgstr "      --sort-by-file       izhod abecedno urejen po izvornih datotekah\n"
 
 #: src/msginit.c:297
 msgid ""
@@ -2437,12 +2107,10 @@ msgstr "  -i, --input=DATOTEKA        vhodna datoteka POT\n"
 #: src/msginit.c:379
 #, 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:385
@@ -2467,11 +2135,8 @@ msgstr "  -l, --locale=JJ_DD          določitev ciljnega jezikovnega okolja\n"
 
 #: src/msginit.c:402
 #, 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:468
 msgid ""
@@ -2503,10 +2168,8 @@ msgstr "podproces %s neuspešen z izhodno kodo %d"
 
 #: src/msginit.c:1118
 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"
@@ -2533,18 +2196,13 @@ msgstr "v vhodni datoteki sta dva različna nabora znakov, \"%s\" in \"%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 "vhodna datoteka »%s« ne vsebuje glave z določitvijo nabora znakov"
 
 #: 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:391 src/msgl-iconv.c:375
 #, c-format
@@ -2553,7 +2211,7 @@ msgstr "ciljni nabor \"%s\" ni prenosljivo ime kodnega nabora."
 
 #: 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/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "opozorilo: "
@@ -2564,20 +2222,17 @@ 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:449
 #, 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"
 
@@ -2591,10 +2246,8 @@ 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:93
 #, c-format
@@ -2656,8 +2309,7 @@ msgstr "rezultat izraza za izbiro množinske oblike je lahko negativna vrednost"
 #: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr ""
-"nplurals = %lu, izraz za izbiro množinske oblike pa lahko da vrednosti do %lu"
+msgstr "nplurals = %lu, izraz za izbiro množinske oblike pa lahko da vrednosti do %lu"
 
 #: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
@@ -2668,9 +2320,7 @@ msgid "plural expression can produce integer overflow"
 msgstr "izraz za izbiro množinske oblike lahko povzroči prekoračitev obsega"
 
 #: src/msgl-check.c:197
-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"
 "deljenje z nič"
@@ -2734,9 +2384,7 @@ 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:514
-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;\""
@@ -2776,17 +2424,17 @@ msgstr "rokovanje z množinskimi oblikami je razširitev GNU gettext"
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "v msgstr manjka oznaka bližnjice »%c«"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "v msgstr je preveč oznak bližnjic »%c«"
 
-#: src/msgl-check.c:804
+#: src/msgl-check.c:801
 #, 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:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "v glavi manjka polje »%s«\n"
@@ -2806,44 +2454,32 @@ 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:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:720
+#: src/x-python.c:665 src/xgettext.c:708
 #, 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:335
 #, 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:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/xgettext.c:715
 #, 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:392 src/msgmerge.c:398
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s je veljavno edino z %s"
 
-#: src/msgmerge.c:453
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "vrsta varnostne kopije"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2866,27 +2502,26 @@ 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:507
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      prevodi\n"
 
-#: src/msgmerge.c:509
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     sklici na vire\n"
 
-#: src/msgmerge.c:513
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=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:519
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2895,33 +2530,30 @@ msgstr ""
 "  -U, --update                posodobi def.po,\n"
 "                                če je def.po že posodobljen, ne stori nič\n"
 
-#: src/msgmerge.c:531
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Mesto izhodne datoteke v posodobitvenem načinu:\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Rezultat se zapiše nazaj v datoteko def.po.\n"
 
-#: src/msgmerge.c:535
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
-msgstr ""
-"      --backup=TIP             izdelamo varnostno kopijo datoteke def.po\n"
+msgstr "      --backup=TIP             izdelamo varnostno kopijo datoteke def.po\n"
 
-#: src/msgmerge.c:537
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr ""
-"  -S, --suffix=PRIPONA         pripona varnostne kopije naj bo PRIPONA\n"
+msgstr "  -S, --suffix=PRIPONA         pripona varnostne kopije naj bo PRIPONA\n"
 
-#: src/msgmerge.c:539
+#: src/msgmerge.c:534
 #, 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"
@@ -2936,49 +2568,41 @@ msgstr ""
 "                  sicer enostavne\n"
 "  simple, never   vedno enostavne varnostne kopije\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:541
 #, 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:557
+#: src/msgmerge.c:552
 #, 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:614 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       brez kazalnika poteka\n"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "pri tem sporočilu bi morale biti določene množinske oblike"
 
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "pri tem sporočilu ne bi smele biti določene množinske oblike"
 
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2030
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2997,14 +2621,11 @@ msgstr "Uporaba: %s [IZBIRA] [DATOTEKA]...\n"
 #: 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: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"
@@ -3016,19 +2637,13 @@ msgstr "      --csharp                način C#: vhod je .NET-datoteka .dll\n"
 
 #: 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: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:451
 #, c-format
@@ -3043,12 +2658,10 @@ msgstr "Izbira izhodne datoteke v javanskem načinu:\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 ""
-"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:467
@@ -3075,8 +2688,7 @@ msgstr "Izbira izhodne datoteke v načinu tcl:\n"
 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:511
 #, c-format
@@ -3086,10 +2698,9 @@ msgstr "  -i, --indent             izpis datoteke PO z zamiki\n"
 #: 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:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3110,16 +2721,14 @@ 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:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated                 izpišemo le podvojena sporočila\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, 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"
@@ -3185,27 +2794,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "neskladna raba #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "manjkajoč razdelek »msgstr[]«"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "manjkajoč razdelek »msgid_plural«"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "manjkajoč razdelek »msgstr«"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, 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:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "množinska oblika ima napačen indeks"
@@ -3215,7 +2824,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:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:740 src/write-po.c:869
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "neveljavno večzložno zaporedje"
@@ -3259,16 +2868,16 @@ msgstr "znak za konec vrstice sredi niza"
 msgid "context separator <EOT> within string"
 msgstr "razmejilnik konteksta <EOT> znotraj niza"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "ta datoteka morda ne vsebuje direktiv domene"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "podvojena definicija sporočila"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "to je kraj prve definicije"
 
@@ -3403,46 +3012,24 @@ msgid " failed.\n"
 msgstr " ni uspelo.\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 ""
-"V izbranem izhodnem zapisu ni mogoče zapisati več domen prevodov kot eno "
-"datoteko. Poskusite uporabiti skladnjo PO."
+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:129
-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."
+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:162
-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"
+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: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 ""
-"katalog sporočil vsebuje množinske oblike, izbrani izhodni zapis pa jih ne "
-"podpira. Poskusite namesto datoteke .properties ustvariti javanski razred z "
-"\"msgfmt --java\"."
+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:202
-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"
+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:231 src/write-catalog.c:275
 #, c-format
@@ -3468,19 +3055,17 @@ msgstr "prevajanje razreda C# neuspešno, poskusite z --verbose"
 msgid "compilation of C# class failed"
 msgstr "prevajanje razreda C# neuspešno"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "ni veljavno javansko ime razreda: %s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr ""
-"prevajanje javanskega razreda neuspešno, uporabite --verbose ali nastavite "
-"$JAVAC"
+msgstr "prevajanje javanskega razreda neuspešno, uporabite --verbose ali nastavite $JAVAC"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "prevajanje javanskega razreda neuspešno, poskusite nastaviti $JAVAC"
@@ -3490,14 +3075,12 @@ msgstr "prevajanje javanskega razreda neuspešno, poskusite nastaviti $JAVAC"
 msgid "error while opening \"%s\" for writing"
 msgstr "napaka pri odpiranju \"%s\" za pisanje"
 
-#: src/write-po.c:875
+#: src/write-po.c:803
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1254 src/write-po.c:1383
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3506,12 +3089,11 @@ 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:1338 src/write-po.c:1462
+#: src/write-po.c:1266 src/write-po.c:1395
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3519,10 +3101,8 @@ 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"
 
@@ -3536,13 +3116,11 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"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"
 
@@ -3593,7 +3171,7 @@ msgstr ""
 "katalog sporočil vsebuje množinske oblike, vendar katalog sporočil TCL\n"
 "ne podpira množinskih oblik\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-javascript.c:988 src/x-python.c:1128
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: opozorilo: nezaključen niz"
@@ -3603,22 +3181,17 @@ msgstr "%s:%d: opozorilo: nezaključen niz"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: opozorilo: nezaključen regularni izraz"
 
-#: src/x-c.c:1051
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: opozorilo: neveljavni unikodni znak"
-
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:762
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: opozorilo: nezaključena znakovna konstanta"
 
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1247 src/x-vala.c:832
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: opozorilo: nezaključen niz"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr "Prosim, določite vhodni nabor znakov z izbiro --from-code."
 
@@ -3672,7 +3245,7 @@ msgstr ""
 "%s:%d: Neveljavno večbajtno zaporedje.\n"
 "Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: opozorilo: neveljavni unikodni znak"
@@ -3685,31 +3258,29 @@ msgstr "%s:%d: opozorilo: nezaključen konstanten nit"
 #: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr ""
-"%s:%d: opozorilo: zaklepaj »)« na mestu, kjer pričakujemo zaviti zaklepaj »}«"
+msgstr "%s:%d: opozorilo: zaklepaj »)« na mestu, kjer pričakujemo zaviti zaklepaj »}«"
 
 #: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr ""
-"%s:%d: opozorilo: zaviti zaklepaj »}« na mestu, kjer pričakujemo zaklepaj »)«"
+msgstr "%s:%d: opozorilo: zaviti zaklepaj »}« na mestu, kjer pričakujemo zaklepaj »)«"
 
-#: src/x-glade.c:295
+#: src/x-glade.c:561
 #, c-format
 msgid "Missing context for the string extracted from '%s' element"
 msgstr "Manjkajoči kontekst za niz, izvlečen iz elementa »%s«"
 
-#: src/x-glade.c:417
+#: src/x-glade.c:686
 #, c-format
 msgid "The root element <%s> is not allowed in a valid Glade file"
 msgstr "Krovni element <%s> ni dovoljen v veljavni datoteki glade"
 
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3772,21 +3343,11 @@ msgstr ""
 "%s:%d: Neveljavno večbajtno zaporedje.\n"
 "Prosim, določite vhodni nabor znakov z izbiro --from-code\n"
 
-#: src/x-javascript.c:954
+#: src/x-javascript.c:1147
 #, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: opozorilo: RegExp literal prekinjen predčasno"
 
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: opozorilo: neveljavni unikodni znak"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: opozorilo: nezaključen niz"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3827,8 +3388,7 @@ 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 ""
-"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:324
@@ -3839,8 +3399,7 @@ msgid ""
 "comment as specified in http://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:341
@@ -3851,8 +3410,7 @@ msgid ""
 "comment as specified in http://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:354
@@ -3863,8 +3421,7 @@ msgid ""
 "comment as specified in http://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:364
@@ -3875,8 +3432,7 @@ msgid ""
 "comment as specified in http://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:397
@@ -3887,8 +3443,7 @@ msgid ""
 "as specified in http://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:722
@@ -3913,105 +3468,82 @@ msgstr "%s:%d: niz ni veljaven izraz"
 
 #: 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: 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:413
+#: src/x-vala.c:558
 #, c-format
 msgid "%s:%d: warning: regular expression literal terminated too early"
 msgstr "%s:%d: opozorilo: regularni izraz prekinjen predčasno"
 
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:636
 #, 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:653
+#: src/xgettext.c:641
 #, 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:808
+#: src/xgettext.c:785
 #, 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:859
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Iz vhodnih datotek izvlečemo prevedljive nize znakov.\n"
 
-#: src/xgettext.c:882
+#: 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=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:884
+#: src/xgettext.c:861
 #, 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:886
+#: src/xgettext.c:863
 #, 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:891
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Izbira vhodnega jezika:\n"
 
-#: src/xgettext.c:893
-#, fuzzy, c-format
+#: src/xgettext.c:870
+#, 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"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaScript, Vala)\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"
+"                                   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)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                      okrajšava za --language=C++\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:879
 #, 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:907
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4020,30 +3552,27 @@ msgstr ""
 "      --from-code=NABOR          nabor znakov vhodnih datotek\n"
 "                                   (razen za Python, Tcl in Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:887
 #, 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:915
+#: src/xgettext.c:892
 #, 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"
+msgstr "  -j, --join-existing            združi sporočila z obstoječo datoteko\n"
 
-#: src/xgettext.c:917
+#: src/xgettext.c:894
 #, 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:919
+#: src/xgettext.c:896
 #, 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"
@@ -4052,223 +3581,181 @@ msgstr ""
 "  -c, --add-comments          postavi vse komentarje pred vrsticami s \n"
 "                                ključnimi besedami v izhodno datoteko\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Izbire, specifične za jezik:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all              iz datotek potegnemo vse nize\n"
 
-#: src/xgettext.c:929
+#: src/xgettext.c:906 src/xgettext.c:914
 #, 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:937
-#, fuzzy, c-format
+#: src/xgettext.c:911
+#, 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"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\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"
-"                                javascript, vala)\n"
+"  -kBESEDA, --keyword=BESEDA  uporabi BESEDO kot dodatno ključo besedo\n"
+"  -k, --keyword[=BESEDA]      ne uporabljaj privzetih ključnih besed\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:919
 #, 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:945
+#: src/xgettext.c:922
 #, 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:950
+#: src/xgettext.c:927
 #, 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:952
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (samo jeziki C, C++ in predmetni C)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    prepoznaj oblikovne nize Qt\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (samo jezik C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   prepoznaj oblikovne nize KDE 4\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 prepoznaj oblikovne nize Boost\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:943
 #, 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:991
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     zapiši javansko datoteko .properties\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:983
 #, 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:1008
+#: src/xgettext.c:985
 #, 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:1010
+#: src/xgettext.c:987
 #, 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:1012
+#: src/xgettext.c:989
 #, 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"
+msgstr "      --package-version=NIZ      v izhodu nastavimo različico paketa na NIZ\n"
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:991
 #, 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"
+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"
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:993
 #, 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[NIZ], --msgstr-prefix[=NIZ] uporabi NIZ ali \"\" kot predpono za "
-"msgstr\n"
+msgstr "  -m[NIZ], --msgstr-prefix[=NIZ] uporabi NIZ ali \"\" kot predpono za msgstr\n"
 
-#: src/xgettext.c:1019
+#: src/xgettext.c:996
 #, 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[NIZ], --msgstr-prefix[=NIZ] uporabi NIZ ali \"\" kot pripono za msgstr\n"
+msgstr "  -m[NIZ], --msgstr-prefix[=NIZ] uporabi NIZ ali \"\" kot pripono za msgstr\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1817
 #, 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"
+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:1965
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "standardni vhod"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Ne-ASCII znak pri %s%s."
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Ne-ASCII komentar pri ali okoli %s%s."
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Ne-ASCII niz pri %s%s."
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: opozorilo: "
 
-#: src/xgettext.c:2189
+#: 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 ""
-"Čeprav je uporabljen na mestu oblikovnega niza, %s ni veljaven oblikovni niz "
-"%s. Razlog: %s\n"
+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:2190
+#: src/xgettext.c:2139
 #, 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"
+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"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4281,7 +3768,7 @@ msgstr ""
 "Prosimo, razmislite o uporabi oblikovnega niza s poimenovanimi argumenti\n"
 "ter preslikave namesto n-terčka argumentov.\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4291,28 +3778,27 @@ msgstr ""
 "gettext(\"\") vrne glavo z metapodatki, ne pa\n"
 "praznega niza.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "dvoumno določen argument za ključno besede »%.*s«"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "opozorilo: manjkajoči kontekst za ključno besedo »%.*s«"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2921
 #, 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«"
+msgstr "opozorilo: manjkajoči kontekst za množinski argument ključne besede »%.*s«"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "neujemanje kontekstov med edninsko in množinsko obliko"
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4324,7 +3810,7 @@ msgstr ""
 "spremenljivko MSGID_BUGS_ADDRESS tam, sicer pa \n"
 "z izbiro --msgid-bugs-address v ukazni vrstici.\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3267
 #, c-format
 msgid "language '%s' unknown"
 msgstr "jezik »%s« ni poznan"
@@ -4356,10 +3842,8 @@ msgstr "<nepoimenovano>"
 
 #~ 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"
@@ -4413,10 +3897,8 @@ msgstr "<nepoimenovano>"
 #~ 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č @"
@@ -4425,8 +3907,7 @@ msgstr "<nepoimenovano>"
 #~ 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."
@@ -4440,49 +3921,39 @@ msgstr "<nepoimenovano>"
 #~ 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"
 
@@ -4493,22 +3964,17 @@ msgstr "<nepoimenovano>"
 #~ "      --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"
 
@@ -4519,29 +3985,23 @@ msgstr "<nepoimenovano>"
 #~ "      --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"
@@ -4551,76 +4011,58 @@ msgstr "<nepoimenovano>"
 #~ "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 ""
@@ -4628,17 +4070,14 @@ msgstr "<nepoimenovano>"
 #~ "  -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"
@@ -4657,20 +4096,17 @@ msgstr "<nepoimenovano>"
 #~ "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"
@@ -4678,51 +4114,38 @@ msgstr "<nepoimenovano>"
 #~ "                                 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"
@@ -4736,28 +4159,23 @@ msgstr "<nepoimenovano>"
 #~ "      --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"
@@ -4766,42 +4184,35 @@ msgstr "<nepoimenovano>"
 #~ 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"
 
@@ -4811,31 +4222,25 @@ msgstr "<nepoimenovano>"
 #~ "  -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"
@@ -4844,31 +4249,25 @@ msgstr "<nepoimenovano>"
 #~ 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"
@@ -4878,14 +4277,12 @@ msgstr "<nepoimenovano>"
 #~ 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"
@@ -4898,37 +4295,27 @@ msgstr "<nepoimenovano>"
 #~ 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"
@@ -4950,28 +4337,23 @@ msgstr "<nepoimenovano>"
 #~ "      --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"
@@ -4981,25 +4363,20 @@ msgstr "<nepoimenovano>"
 #~ "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"
@@ -5021,8 +4398,7 @@ msgstr "<nepoimenovano>"
 
 #~ 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"
@@ -5050,8 +4426,7 @@ msgstr "<nepoimenovano>"
 #~ "                           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"
@@ -5069,37 +4444,29 @@ msgstr "<nepoimenovano>"
 
 #~ 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"
@@ -5107,59 +4474,42 @@ msgstr "<nepoimenovano>"
 
 #~ 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"
 
@@ -5188,31 +4538,23 @@ msgstr "<nepoimenovano>"
 #~ 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"
@@ -5224,12 +4566,10 @@ msgstr "<nepoimenovano>"
 #~ 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 ""
@@ -5239,34 +4579,26 @@ msgstr "<nepoimenovano>"
 #~ "  -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"
@@ -5296,14 +4628,10 @@ msgstr "<nepoimenovano>"
 #~ 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"
@@ -5312,15 +4640,11 @@ msgstr "<nepoimenovano>"
 #~ "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"
@@ -5329,35 +4653,26 @@ msgstr "<nepoimenovano>"
 #~ 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 ""
@@ -5365,16 +4680,12 @@ msgstr "<nepoimenovano>"
 #~ "Generate binary message catalog from textual translation description.\n"
 #~ "\n"
 #~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
-#~ "%d)\n"
-#~ "  -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"
@@ -5390,8 +4701,7 @@ msgstr "<nepoimenovano>"
 #~ "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"
@@ -5405,10 +4715,8 @@ msgstr "<nepoimenovano>"
 #~ "\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"
@@ -5431,8 +4739,7 @@ msgstr "<nepoimenovano>"
 #~ "\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
@@ -5445,44 +4752,31 @@ msgstr "<nepoimenovano>"
 #~ "  -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"
 
@@ -5490,30 +4784,21 @@ msgstr "<nepoimenovano>"
 #~ "  -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"
@@ -5521,17 +4806,12 @@ msgstr "<nepoimenovano>"
 
 #  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"
@@ -5539,14 +4819,12 @@ msgstr "<nepoimenovano>"
 #~ "\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"
@@ -5558,9 +4836,7 @@ msgstr "<nepoimenovano>"
 #~ 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 927697694..27eb443d4 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2014-05-10 13:37+0900\n"
 "PO-Revision-Date: 2014-05-12 21:59+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -15,8 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 0.7.1\n"
 
 #: gnulib-lib/argmatch.c:133
@@ -36,8 +35,7 @@ msgstr "Исправни аргументи су:"
 #: gnulib-lib/clean-temp.c:332
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr ""
-"не могу да пронађем привремени директоријум, покушавам да подесим „$TMPDIR“"
+msgstr "не могу да пронађем привремени директоријум, покушавам да подесим „$TMPDIR“"
 
 #: gnulib-lib/clean-temp.c:346
 #, c-format
@@ -200,16 +198,12 @@ msgstr "грешка приликом писања датотеке „%s“"
 #: gnulib-lib/javacomp.c:2343
 #, 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
@@ -219,7 +213,7 @@ 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
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "меморија је потрошена"
@@ -230,7 +224,7 @@ msgid "creation of threads failed"
 msgstr "стварање нити није успело"
 
 #: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "писање у %s потпроцес није успело"
@@ -334,8 +328,7 @@ msgstr "„%s“ није исправна ниска записа %s, није
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%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
@@ -363,12 +356,8 @@ msgstr "Број одреднице %u почиње са | али се не за
 
 #: 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:39
 #, c-format
@@ -398,14 +387,12 @@ 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 '}'."
+msgid "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr "Ниска се завршава у сред смернице: нађох { без одговарајуће }."
 
 #: src/format-csharp.c:139
 #, 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
@@ -414,9 +401,7 @@ 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 "
-"'{'."
+msgid "The string starts in the middle of a directive: found '}' without matching '{'."
 msgstr "Ниска почиње у сред смернице: нађох } без одговарајуће {."
 
 #: src/format-csharp.c:162
@@ -436,16 +421,12 @@ 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
@@ -483,47 +464,33 @@ 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
@@ -532,12 +499,8 @@ 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
@@ -546,18 +509,13 @@ 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
@@ -566,16 +524,12 @@ 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
@@ -585,37 +539,22 @@ 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
 #, 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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -645,9 +584,7 @@ msgstr "У смерници број %u, дата су оба измењивач
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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:3326 src/format-scheme.c:3263
@@ -671,12 +608,8 @@ msgstr "спецификакције записа у „%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
@@ -686,12 +619,8 @@ msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "особеност записа за аргумент „%s“ не постоји у „%s“"
 
 #: 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
@@ -700,26 +629,22 @@ 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: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
@@ -739,10 +664,8 @@ msgstr "У смерници број %u, „%c“ не не може да зап
 
 #: 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, није дозвољено више угнежђавања у одреднику записа."
+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
@@ -751,32 +674,20 @@ 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 "Ниска упућује на променљиву љуске помоћу не-АСКРИ назива."
 
 #: 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."
@@ -784,16 +695,12 @@ 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."
+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:355 src/msgcat.c:294 src/msgcmp.c:172
@@ -867,8 +774,7 @@ msgstr "  -s, --short                 кратак назив рачунара\n
 #: src/hostname.c:222
 #, 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"
@@ -957,10 +863,8 @@ msgstr ""
 #: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 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
@@ -980,11 +884,8 @@ msgstr "  УЛАЗНАДАТОТЕКА              улазна по датот
 #: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
 #: src/xgettext.c:875
 #, 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/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
@@ -1015,8 +916,7 @@ 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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
@@ -1026,31 +926,23 @@ 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
@@ -1075,8 +967,7 @@ msgstr "      --set-fuzzy                означава све поруке к
 #: 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:471
 #, c-format
@@ -1086,8 +977,7 @@ msgstr "      --set-obsolete             означава све поруке к
 #: 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:475
 #, c-format
@@ -1095,55 +985,38 @@ msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
 "                              of translated messages.\n"
 msgstr ""
-"      --previous                 када означава „нејасне“, задржава претходни "
-"„msgids“\n"
+"      --previous                 када означава „нејасне“, задржава претходни „msgids“\n"
 "                                 преведених порука.\n"
 
 #: 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"
-msgstr ""
-"      --empty                 када уклања „нејасне“, такође подешава "
-"„msgstr“ празним\n"
+msgid "      --empty                 when removing 'fuzzy', also set msgstr empty\n"
+msgstr "      --empty                 када уклања „нејасне“, такође подешава „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"
-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: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: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
@@ -1156,21 +1029,15 @@ 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:393 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: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
 #, 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:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
@@ -1188,14 +1055,11 @@ msgstr "Појединости излаза:\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"
+"                              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:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
@@ -1203,88 +1067,66 @@ msgstr ""
 #: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
-msgstr ""
-"      --style=ИЗГЛЕДДАТОТЕКЕ     наводи датотеку правила ЦСС изгледа за --"
-"color\n"
+msgstr "      --style=ИЗГЛЕДДАТОТЕКЕ     наводи датотеку правила ЦСС изгледа за --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:578 src/msgunfmt.c:505 src/msguniq.c:389
 #: src/xgettext.c:977
 #, 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: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
 #, 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: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
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
-msgstr ""
-"      --force-po                 записује по датотеку чак и ако је празна\n"
+msgstr "      --force-po                 записује по датотеку чак и ако је празна\n"
 
 #: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
 #: src/xgettext.c:983
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
-msgstr ""
-"  -i, --indent                   записује .по датотеку користећи увучени "
-"изглед\n"
+msgstr "  -i, --indent                   записује .по датотеку користећи увучени изглед\n"
 
 #: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
 #: src/xgettext.c:985
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr ""
-"      --no-location              не исписује редове „#: датотека:ред“\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
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
 #: src/xgettext.c:989
 #, 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: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
 #, 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: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
 #, 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: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
@@ -1301,8 +1143,7 @@ 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:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
@@ -1359,8 +1200,7 @@ msgstr "  УЛАЗНАДАТОТЕКА ...          улазне датотек�
 #: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
 #, 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
@@ -1398,11 +1238,8 @@ msgstr ""
 #: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
 #: src/msgmerge.c:562
 #, 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:254 src/msgcomm.c:413 src/msgfmt.c:882
 #: src/msgmerge.c:564
@@ -1411,8 +1248,7 @@ 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
@@ -1431,10 +1267,8 @@ msgstr ""
 
 #: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:359
@@ -1490,11 +1324,8 @@ msgstr "Измењивачи рада:\n"
 
 #: src/msgcmp.c:241 src/msgmerge.c:553
 #, 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:243 src/msgmerge.c:555
 #, c-format
@@ -1541,7 +1372,7 @@ msgstr "ова порука се користи али није одређена
 msgid "warning: this message is not used"
 msgstr "упозорење: ова порука се не користи"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1585,10 +1416,8 @@ msgstr ""
 
 #: src/msgcomm.c:452 src/xgettext.c:1004
 #, 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
@@ -1619,10 +1448,8 @@ msgstr "      --no-location           избацује редове „#: дат
 #: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
 #: src/msgmerge.c:588
 #, 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:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
 #: src/msgmerge.c:590
@@ -1742,16 +1569,13 @@ msgstr "Корисне ОПЦИЈЕ-ПРОПУСНИКА када је сед П
 
 #: src/msgfilter.c:442
 #, 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:444
 #, 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"
@@ -1759,18 +1583,13 @@ msgstr ""
 
 #: src/msgfilter.c:447
 #, 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
 #, 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:471 src/msggrep.c:606
 #, c-format
@@ -1779,10 +1598,8 @@ msgstr "      --indent                увучени изглед излаза\n
 
 #: src/msgfilter.c:473
 #, 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
 #, c-format
@@ -1903,58 +1720,38 @@ msgstr "Начин рада:\n"
 
 #: src/msgfmt.c:799
 #, c-format
-msgid ""
-"  -j, --java                  Java mode: generate a Java ResourceBundle "
-"class\n"
-msgstr ""
-"  -j, --java                  режим Јаве: ствара Јавин разред „Група "
-"изворишта“\n"
+msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
+msgstr "  -j, --java                  режим Јаве: ствара Јавин разред „Група изворишта“\n"
 
 #: src/msgfmt.c:801
 #, c-format
-msgid ""
-"      --java2                 like --java, and assume Java2 (JDK 1.2 or "
-"higher)\n"
-msgstr ""
-"      --java2                 као --java, и претпоставља Јаву2 (ЈДК 1.2 или "
-"новији)\n"
+msgid "      --java2                 like --java, and assume Java2 (JDK 1.2 or higher)\n"
+msgstr "      --java2                 као --java, и претпоставља Јаву2 (ЈДК 1.2 или новији)\n"
 
 #: src/msgfmt.c:803
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr ""
-"      --csharp                Ц# режим: ствара .НЕТ-ову „.dll“ датотеку\n"
+msgstr "      --csharp                Ц# режим: ствара .НЕТ-ову „.dll“ датотеку\n"
 
 #: src/msgfmt.c:805
 #, c-format
-msgid ""
-"      --csharp-resources      C# resources mode: generate a .NET .resources "
-"file\n"
-msgstr ""
-"      --csharp-resources      Режим Ц# изворишта: ствара .НЕТ-ову „."
-"resources“ датотеку\n"
+msgid "      --csharp-resources      C# resources mode: generate a .NET .resources file\n"
+msgstr "      --csharp-resources      Режим Ц# изворишта: ствара .НЕТ-ову „.resources“ датотеку\n"
 
 #: src/msgfmt.c:807
 #, c-format
-msgid ""
-"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr ""
-"      --tcl                   Тцл режим: ствара тцл/мсгкат-ову „.msg“ "
-"датотеку\n"
+msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr "      --tcl                   Тцл режим: ствара тцл/мсгкат-ову „.msg“ датотеку\n"
 
 #: src/msgfmt.c:809
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
-msgstr ""
-"      --qt                    Кут режим: ствара Кутову „.qm“ датотеку\n"
+msgstr "      --qt                    Кут режим: ствара Кутову „.qm“ датотеку\n"
 
 #: src/msgfmt.c:811
 #, 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:818
 #, c-format
@@ -1979,24 +1776,17 @@ 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
 #, 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
 #, 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
 #, 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"
@@ -2004,13 +1794,11 @@ msgstr ""
 #: src/msgfmt.c:833
 #, 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"
 
@@ -2021,12 +1809,8 @@ msgstr "Путања излазне датотеке у Ц# режиму:\n"
 
 #: src/msgfmt.c:845 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
 #, c-format
@@ -2045,16 +1829,14 @@ msgstr "Путања излазне датотеке у Тцл режиму:\n"
 #: src/msgfmt.c:855 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:857
 #, 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
 #, c-format
@@ -2064,15 +1846,12 @@ msgstr "Могућности режима Десктоп уноса:\n"
 #: src/msgfmt.c:867
 #, 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
 #, c-format
 msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr ""
-"  -d ДИРЕКТОРИЈУМ                   основни директоријум „.po“ датотека\n"
+msgstr "  -d ДИРЕКТОРИЈУМ                   основни директоријум „.po“ датотека\n"
 
 #: src/msgfmt.c:871 src/xgettext.c:934
 #, c-format
@@ -2086,8 +1865,7 @@ msgstr ""
 #: src/msgfmt.c:874
 #, 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"
@@ -2102,27 +1880,20 @@ msgstr "Тумачење улазне датотеке:\n"
 #, 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:891
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr ""
-"      --check-format               проверава ниске записа у зависности од "
-"језика\n"
+msgstr "      --check-format               проверава ниске записа у зависности од језика\n"
 
 #: src/msgfmt.c:893
 #, 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
 #, c-format
@@ -2130,29 +1901,22 @@ 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
 #, 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:900
 #, 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:903
 #, c-format
@@ -2161,32 +1925,22 @@ msgstr "  -f, --use-fuzzy                  користи нејасне уно�
 
 #: src/msgfmt.c:908
 #, 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
 #, 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:913
 #, 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
 #, c-format
@@ -2248,12 +2002,12 @@ msgstr "нејасан „msgstr“ унос је занемарен"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: упозорење: изворна датотека садржи нејасан превод"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1306
 #, c-format
 msgid "%s does not exist"
 msgstr "Не постоји „%s“"
 
-#: src/msgfmt.c:1328
+#: src/msgfmt.c:1316
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "„%s“ постоји али је не могу прочитати"
@@ -2272,12 +2026,8 @@ 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
@@ -2365,11 +2115,8 @@ msgstr ""
 
 #: 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:623
 #, c-format
@@ -2424,8 +2171,7 @@ msgstr "  -i, --input=УЛАЗНАДАТОТЕКА  улазна ПОТ дато
 #: src/msginit.c:379
 #, 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"
@@ -2453,10 +2199,8 @@ msgstr "  -l, --locale=ЈЈ_ДД          поставља одредишни л
 
 #: src/msginit.c:402
 #, 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:468
 msgid ""
@@ -2488,16 +2232,12 @@ msgstr "%s: потпроцес није успео са излазном шиф�
 
 #: src/msginit.c:1118
 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.
@@ -2520,18 +2260,13 @@ 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
 #, c-format
@@ -2551,20 +2286,17 @@ 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:449
 #, 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"
 
@@ -2652,11 +2384,8 @@ 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 ""
-"израз за множине може проузроковати аритметичке изузетке, нпр. дељење нулом"
+msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+msgstr "израз за множине може проузроковати аритметичке изузетке, нпр. дељење нулом"
 
 #: src/msgl-check.c:266
 #, c-format
@@ -2705,12 +2434,8 @@ 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=ИЗРАЗ;“"
+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
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
@@ -2747,17 +2472,17 @@ msgstr "баратање множинама је проширење Гнуово
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "У мсгстр недостаје ознака пречице тастатуре „%c“"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "У мсгстр има превише ознака пречица тастатуре „%c“"
 
-#: src/msgl-check.c:804
+#: src/msgl-check.c:801
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "поље заглавља „%s“ и даље садржи почетну задату вредност\n"
 
-#: src/msgl-check.c:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "у заглављу недостаје поље заглавља „%s“\n"
@@ -2779,31 +2504,19 @@ 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
 #, 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
 #, 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
 #, 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:392 src/msgmerge.c:398
 #, c-format
@@ -2888,16 +2601,14 @@ msgstr "      --suffix=СУФИКС         мења уобичајени суф
 #: src/msgmerge.c:539
 #, 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"
@@ -2907,20 +2618,16 @@ msgstr ""
 #: src/msgmerge.c:546
 #, 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:557
 #, 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:614 src/urlget.c:192
 #, c-format
@@ -2939,12 +2646,8 @@ msgstr "ова порука не треба да одреди облике мн�
 
 #: src/msgmerge.c:2035
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2969,35 +2672,23 @@ msgstr "Претворите бинарни каталог порука у .по
 
 #: 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: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: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: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:451
 #, c-format
@@ -3012,8 +2703,7 @@ msgstr "Путања улазне датотеке у Јава режиму:\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"
@@ -3043,9 +2733,7 @@ msgstr "Путања улазне датотеке у Тцл режиму:\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
@@ -3086,12 +2774,8 @@ 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
@@ -3372,46 +3056,24 @@ 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 ""
-"Не могу да испишем више домена превода у једну датотеку са наведеним записом "
-"излаза. Покушајте да користите синтаксу ПО датотеке уместо тога."
+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."
-msgstr ""
-"Не могу да испишем више домена превода у једну датотеку са наведеним записом "
-"излаза."
+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 ""
-"каталог порука садржи преводе зависне од садржаја, али запис излаза их не "
-"подржава."
+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“ уместо "
-"датотеке особина."
+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:202
-msgid ""
-"message catalog has plural form translations, but the output format does not "
-"support them."
-msgstr ""
-"каталог порука садржи преводе са облицима множине, али запис излаза их не "
-"подржава."
+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
 #, c-format
@@ -3445,9 +3107,7 @@ msgstr "неисправан назив разреда Јаве: %s"
 #: src/write-java.c:1210
 #, 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
 #, c-format
@@ -3461,12 +3121,10 @@ msgstr "грешка приликом отварања „%s“ за писањ�
 
 #: src/write-po.c:875
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1326 src/write-po.c:1455
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3479,7 +3137,7 @@ msgstr ""
 "другачије од вашег. Пробајте да користите чисти АСКРИ мсгцтхт.\n"
 "%s\n"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1338 src/write-po.c:1467
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3502,8 +3160,7 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3754,8 +3411,7 @@ msgstr "%s:%d: упозорење: неокончана ниска"
 #: src/x-perl.c:308
 #, 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
 #, c-format
@@ -3872,12 +3528,8 @@ 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“"
+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:413
 #, c-format
@@ -3892,9 +3544,7 @@ msgstr "„%s“ није исправан назив кодирања.  Кор�
 #: src/xgettext.c:648
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
-msgstr ""
-"„--join-existing“ се не може користити када се излаз исписује на стандардни "
-"излаз"
+msgstr "„--join-existing“ се не може користити када се излаз исписује на стандардни излаз"
 
 #: src/xgettext.c:653
 #, c-format
@@ -3913,26 +3563,18 @@ msgstr "Извуците преводиве ниске из датих улаз�
 
 #: 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=НАЗИВ        користи НАЗИВ.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:884
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr ""
-"  -o, --output=ДАТОТЕКА             исписује излаз у наведену датотеку\n"
+msgstr "  -o, --output=ДАТОТЕКА             исписује излаз у наведену датотеку\n"
 
 #: src/xgettext.c:886
 #, 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:891
 #, c-format
@@ -3943,11 +3585,9 @@ msgstr "Избор језика улазне датотеке:\n"
 #, 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"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                JavaScript, Vala, Desktop)\n"
 msgstr ""
@@ -3956,8 +3596,7 @@ msgstr ""
 "                                    Лисп, ЕмаксЛисп, либреп, Шема, Смолток,\n"
 "                                    Јава, ЈаваОсобине, Ц#, авк, УЦП, Тцл,\n"
 "                                    Перл, ПХП, ГЦЦ-извор, НИксНискеТабела,\n"
-"                                    РСТ, Глејд, Луа, ЈаваСпис, Вала, "
-"Десктоп)\n"
+"                                    РСТ, Глејд, Луа, ЈаваСпис, Вала, Десктоп)\n"
 
 #: src/xgettext.c:900
 #, c-format
@@ -3966,11 +3605,8 @@ msgstr "  -C, --c++                         скраћеница за „--langu
 
 #: src/xgettext.c:902
 #, 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:907
 #, c-format
@@ -3989,30 +3625,24 @@ msgstr "Подразумева се да су улазне датотеке у �
 #: src/xgettext.c:915
 #, 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:917
 #, 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:919
 #, 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:925
@@ -4029,37 +3659,32 @@ msgstr "  -a, --extract-all                 извлачи све ниске\n"
 #, 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:937
 #, 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:942
 #, 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"
@@ -4069,8 +3694,7 @@ msgstr ""
 #, 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 ""
@@ -4111,32 +3735,23 @@ msgstr "      --boost                       препознаје ниске за
 
 #: src/xgettext.c:966
 #, 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:991
 #, 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:1006
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr ""
-"      --copyright-holder=НИСКА      поставља носиоца ауторских права у "
-"излазу\n"
+msgstr "      --copyright-holder=НИСКА      поставља носиоца ауторских права у излазу\n"
 
 #: src/xgettext.c:1008
 #, 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:1010
 #, c-format
@@ -4150,41 +3765,29 @@ msgstr "      --package-version=ИЗДАЊЕ      поставља издање
 
 #: src/xgettext.c:1014
 #, 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:1016
 #, 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:1019
 #, 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"
+msgstr "  -M[НИСКА], --msgstr-suffix[=НИСКА]   користи НИСКА или „“ за суфикс поља мсгстр-а\n"
 
 #: src/xgettext.c:1840
 #, c-format
-msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
-"%s"
-msgstr ""
-"Аргумент „--flag“ не користи синтаксу <кључна-реч>:<бр.арг>:"
-"[пролаз-]<обележје>: %s"
+msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
+msgstr "Аргумент „--flag“ не користи синтаксу <кључна-реч>:<бр.арг>:[пролаз-]<обележје>: %s"
 
 #: src/xgettext.c:1965
 msgid "standard input"
@@ -4212,21 +3815,13 @@ 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
@@ -4236,8 +3831,7 @@ msgid ""
 "Please consider using a format string with named arguments,\n"
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
-"„%s“ запис ниске са неименованим аргументима не може бити исправно "
-"локализован:\n"
+"„%s“ запис ниске са неименованим аргументима не може бити исправно локализован:\n"
 "Преводилац не може да промени поредак аргумената.\n"
 "Размотрите употребу ниску заоиса са именованим аргументима,\n"
 "и са мапирањем уместо н-торке за аргументе.\n"
@@ -4305,10 +3899,8 @@ msgstr "<неименован>"
 #~ 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 30b3cf1d0..dc3d047a1 100644
--- a/gettext-tools/po/sv.po
+++ b/gettext-tools/po/sv.po
@@ -7,7 +7,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-06-01 11:19+0900\n"
+"POT-Creation-Date: 2014-05-10 13:37+0900\n"
 "PO-Revision-Date: 2014-05-17 09:18+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -202,8 +202,7 @@ 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
@@ -213,7 +212,7 @@ msgstr "I/O-fel i %s-barnprocess"
 
 #: 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
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "minnet slut"
@@ -224,7 +223,7 @@ msgid "creation of threads failed"
 msgstr "skapa trådar misslyckades"
 
 #: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "skrivning till %s-barnprocess misslyckades"
@@ -329,10 +328,8 @@ msgstr ""
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%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: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
@@ -350,8 +347,7 @@ msgstr "formateringsdirektiv för argument %u finns inte i \"%s\""
 #: 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:449
 #, c-format
@@ -360,13 +356,8 @@ msgstr "Direktiv nummer %u börjar med | men avslutas inte med |."
 
 #: 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:39
 #, c-format
@@ -376,8 +367,7 @@ msgstr "I direktiv nummer %u följs symbolen efter \"<\" inte av \">\"."
 #: 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:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
 #: src/format-javascript.c:215 src/format-python.c:515
@@ -397,31 +387,22 @@ 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:130 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 \"}\"."
+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:139
 #, 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:140
 #, 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:161 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 \"{\"."
+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:162
 #, c-format
@@ -440,19 +421,13 @@ 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
@@ -489,50 +464,33 @@ 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
@@ -541,11 +499,8 @@ msgstr "Strängen refererar till argument nummer %u på inkompatibla sätt."
 
 #: 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:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
@@ -554,18 +509,13 @@ msgstr "I direktiv nummer %u följs inte \"%s\" av ett 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 är delsträngen \"%s\" inte en giltig 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ö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:572
 #, c-format
@@ -574,19 +524,13 @@ msgstr "I direktiv nummer %u innehåller ett val inga 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 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: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:756
 #, c-format
@@ -595,35 +539,21 @@ msgstr "formateringsdirektiv för argument {%u} finns inte i \"%s\""
 
 #: 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-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 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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -653,11 +583,8 @@ msgstr "I direktiv nummer %u anges båda modifierarna @ och :."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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:3326 src/format-scheme.c:3263
 #, c-format
@@ -680,12 +607,8 @@ msgstr "formateringsdirektiv i \"%s\" är inte en delmängd av de 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 ä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-perl-brace.c:199 src/format-python.c:471
 #: src/format-python-brace.c:434 src/format-python-brace.c:447
@@ -695,12 +618,8 @@ msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "formateringsdirektiv för argument \"%s\" finns inte i \"%s\""
 
 #: src/format-python.c: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
@@ -709,31 +628,23 @@ 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: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-python-brace.c:137
 #, c-format
@@ -752,11 +663,8 @@ msgstr "I direktiv nummer %u kan inte \"%c\" inleda ett getitem-argument."
 
 #: src/format-python-brace.c:185
 #, 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ästling 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ästling inte tillåten i en formatspecifikation."
 
 #: src/format-python-brace.c:270
 #, c-format
@@ -765,32 +673,20 @@ msgstr "I direktiv nummer %u finns ett oavslutat formatdirektiv."
 
 #: 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: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: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 krullparentessyntax.  "
-"Denna syntax stöds inte här av säkerhetsskäl."
+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 krullparentessyntax.  Denna syntax stöds inte här av säkerhetsskäl."
 
 #: 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."
+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:85
 msgid "The string refers to a shell variable with an empty name."
@@ -798,18 +694,13 @@ msgstr "Strängen refererar till en skalvariabel utan namn."
 
 #: 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: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."
 
 #: 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
@@ -882,8 +773,7 @@ msgstr "  -s, --short                 kort värdnamn\n"
 #: src/hostname.c:222
 #, 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"
@@ -933,8 +823,7 @@ msgstr "  -V, --version               visa versionsinformation och avsluta\n"
 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/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
@@ -975,10 +864,8 @@ msgstr ""
 #: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 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: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
@@ -998,8 +885,7 @@ msgstr "  INFIL                       PO-infil\n"
 #: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
 #: src/xgettext.c:875
 #, 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:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
@@ -1030,8 +916,7 @@ msgstr "  -o, --output-file=FIL       skriv resultat till angiven fil\n"
 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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
 #, c-format
@@ -1040,31 +925,23 @@ msgstr "Meddelandeval:\n"
 
 #: 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: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: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: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:460
 #, c-format
@@ -1089,22 +966,17 @@ msgstr "      --set-fuzzy             markera alla meddelanden som \"fuzzy\"\n"
 #: 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: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: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:475
 #, c-format
@@ -1117,34 +989,23 @@ msgstr ""
 
 #: 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: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: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: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:486
 #, c-format
@@ -1153,10 +1014,8 @@ msgstr "      --fuzzy                 samma som --only-fuzzy --clear-fuzzy\n"
 
 #: 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: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
@@ -1169,19 +1028,14 @@ msgstr "Syntax på infil:\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:393 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: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
 #, 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: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
@@ -1198,14 +1052,11 @@ msgstr "Resultatdetaljer:\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"
+"                              WHEN may be 'always', 'never', 'auto', or 'html'.\n"
 msgstr ""
 "      --color                 använd alltid färger och andra textattribut\n"
-"      --color=VILLKOR         använd färger och andra textattribut beroende "
-"på\n"
-"                              VILLKOR, som kan vara \"always\", \"never\", "
-"\"auto\"\n"
+"      --color=VILLKOR         använd färger och andra textattribut beroende på\n"
+"                              VILLKOR, som kan vara \"always\", \"never\", \"auto\"\n"
 "                              eller \"html\".\n"
 
 #: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
@@ -1219,8 +1070,7 @@ msgstr "      --style=STILMALL        ange CSS stillmallsfil för --color\n"
 #: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
 #: src/xgettext.c:977
 #, 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"
@@ -1229,8 +1079,7 @@ msgstr ""
 #: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
 #: src/msguniq.c:391 src/xgettext.c:979
 #, 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"
 "                              inte \\v eller \\a\n"
@@ -1252,23 +1101,18 @@ msgstr "  -i, --indent                indentera resultatet\n"
 #: src/xgettext.c:985
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
 #: src/xgettext.c:987
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
 #: src/xgettext.c:989
 #, 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
@@ -1282,10 +1126,8 @@ msgstr "  -p, --properties-output     skriv en \"Java .properties\"-fil\n"
 #: 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
 #, 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:414
@@ -1398,10 +1240,8 @@ msgstr ""
 #: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
 #: src/msgmerge.c:562
 #, 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:254 src/msgcomm.c:413 src/msgfmt.c:882
 #: src/msgmerge.c:564
@@ -1409,9 +1249,7 @@ msgstr ""
 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:337 src/msguniq.c:378
 #, c-format
@@ -1429,8 +1267,7 @@ msgstr ""
 
 #: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
 #, 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.
@@ -1488,11 +1325,8 @@ msgstr "Bearbetningsvarianter:\n"
 
 #: src/msgcmp.c:241 src/msgmerge.c:553
 #, 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:243 src/msgmerge.c:555
 #, c-format
@@ -1539,7 +1373,7 @@ msgstr "detta meddelande används men är inte definierat i %s"
 msgid "warning: this message is not used"
 msgstr "varning: detta meddelande används inte"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1583,8 +1417,7 @@ msgstr ""
 
 #: src/msgcomm.c:452 src/xgettext.c:1004
 #, 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:311
@@ -1611,17 +1444,13 @@ msgstr "  -i, --indent                indentera resultatet\n"
 #: src/msgmerge.c:586
 #, 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:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
 #: src/msgmerge.c:588
 #, 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:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
 #: src/msgmerge.c:590
@@ -1742,34 +1571,26 @@ msgstr "Användbara FILTERFLAGGOR när FILTER är \"sed\":\n"
 
 #: src/msgfilter.c:442
 #, 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:444
 #, 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:447
 #, 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:465 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"
@@ -1781,11 +1602,8 @@ msgstr "      --indent                indentera resultatet\n"
 
 #: src/msgfilter.c:473
 #, 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/msgfmt.c:345
 #, c-format
@@ -1880,8 +1698,7 @@ msgstr "Användning: %s [FLAGGA] filnamn.po ...\n"
 #: src/msgfmt.c:778
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
-msgstr ""
-"Generera en binär meddelandekatalog från en textuell meddelandekatalog.\n"
+msgstr "Generera en binär meddelandekatalog från en textuell meddelandekatalog.\n"
 
 #: src/msgfmt.c:783 src/xgettext.c:864
 #, c-format, no-wrap
@@ -1904,21 +1721,13 @@ msgstr "Körläge:\n"
 
 #: src/msgfmt.c:799
 #, 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 "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
+msgstr "  -j, --java                  Javaläge: generera en Java ResourceBundle-klass\n"
 
 #: src/msgfmt.c:801
 #, 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 "      --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:803
 #, c-format
@@ -1927,20 +1736,13 @@ msgstr "      --csharp                C#-läge: generera en .NET .dll-fil\n"
 
 #: src/msgfmt.c:805
 #, 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 "      --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:807
 #, 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"
+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:809
 #, c-format
@@ -1949,11 +1751,8 @@ msgstr "      --qt                    Qt-läge: generera en Qt .qm-fil\n"
 
 #: src/msgfmt.c:811
 #, 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:818
 #, c-format
@@ -1978,32 +1777,23 @@ msgstr "  -r, --resource=RESURS       resursnamn\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
 #, 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:829
 #, 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:831
 #, 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:833
 #, 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,11 +1808,8 @@ msgstr "Plats för utfil i C#-läge:\n"
 
 #: src/msgfmt.c:845 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:847
 #, c-format
@@ -2030,8 +1817,7 @@ 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 givna katalogen.  Underkatalogens namn beror på lokalen.\n"
 
 #: src/msgfmt.c:851
@@ -2042,8 +1828,7 @@ msgstr "Plats för utfil i Tcl-läge:\n"
 #: src/msgfmt.c:855 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:857
 #, c-format
@@ -2081,8 +1866,7 @@ msgstr ""
 #: src/msgfmt.c:874
 #, 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"
@@ -2097,26 +1881,20 @@ msgstr "Tolkning av infil:\n"
 #, 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:891
 #, 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:893
 #, 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:895
 #, c-format
@@ -2129,9 +1907,7 @@ msgstr ""
 
 #: src/msgfmt.c:898
 #, 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"
@@ -2139,12 +1915,10 @@ msgstr ""
 #: src/msgfmt.c:900
 #, 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:903
@@ -2154,27 +1928,21 @@ msgstr "  -f, --use-fuzzy             använd luddiga poster i resultatet\n"
 
 #: src/msgfmt.c:908
 #, 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:910
 #, 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:913
 #, 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:922
@@ -2195,9 +1963,7 @@ msgstr "varning: PO-filens huvudrader saknas eller är ogiltiga\n"
 #: src/msgfmt.c:1040
 #, c-format
 msgid "warning: charset conversion will not work\n"
-msgstr ""
-"varning: konvertering till användarens teckenuppsättning kommer att "
-"misslyckas.\n"
+msgstr "varning: konvertering till användarens teckenuppsättning kommer att misslyckas.\n"
 
 #: src/msgfmt.c:1050
 #, c-format
@@ -2239,12 +2005,12 @@ msgstr "luddig \"msgstr\"-rad ignorerad"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: varning: källfilen innehåller luddiga översättningar"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1306
 #, c-format
 msgid "%s does not exist"
 msgstr "%s finns inte"
 
-#: src/msgfmt.c:1328
+#: src/msgfmt.c:1316
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s finns men kan inte läsas"
@@ -2263,12 +2029,8 @@ msgstr "fel uppstod då \"%s\" lästes"
 
 #: 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:521
 #, c-format, no-wrap
@@ -2357,8 +2119,7 @@ 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                använd C-kontrollsekvenser i resultatet, men\n"
 "                                inte \\v eller \\a\n"
@@ -2416,8 +2177,7 @@ msgstr "  -i, --input=INFIL           POT-infil\n"
 #: src/msginit.c:379
 #, 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"
@@ -2426,8 +2186,7 @@ msgstr ""
 #: src/msginit.c:385
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
-msgstr ""
-"  -o, --output-file=FIL       skriv resultatet till den givna PO-filen\n"
+msgstr "  -o, --output-file=FIL       skriv resultatet till den givna PO-filen\n"
 
 #: src/msginit.c:387
 #, c-format
@@ -2445,8 +2204,7 @@ msgstr "  -l, --locale=LL_CC          sätt mållokal\n"
 
 #: src/msginit.c:402
 #, 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:468
@@ -2479,10 +2237,8 @@ msgstr "%s-barnprocess terminerade med slutstatus %d"
 
 #: src/msginit.c:1118
 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"
@@ -2509,17 +2265,13 @@ msgstr "två olika teckenuppsättningar \"%s\" och \"%s\" i infilen"
 
 #: 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: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:391 src/msgl-iconv.c:375
 #, c-format
@@ -2545,8 +2297,7 @@ msgstr ""
 #: src/msgl-cat.c:449
 #, 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,9 +2390,7 @@ msgid "plural expression can produce integer overflow"
 msgstr "pluraluttryck kan ge heltalsspill"
 
 #: src/msgl-check.c:197
-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:266
@@ -2689,12 +2438,8 @@ msgstr[0] "men några meddelanden har en pluralform"
 msgstr[1] "men några meddelanden har %lu pluralformer"
 
 #: 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 ""
-"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:611
 msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
@@ -2731,17 +2476,17 @@ msgstr "hantering av plural är en utökning i GNU gettext"
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr saknar märket \"%c\" för tangentkortkommandon"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr har för många märken \"%c\" för tangentkortkommandon"
 
-#: src/msgl-check.c:804
+#: src/msgl-check.c:801
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "huvudrad \"%s\" har kvar initialt standardvärde\n"
 
-#: src/msgl-check.c:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "huvudrad \"%s\" saknas i huvudet\n"
@@ -2754,9 +2499,7 @@ 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
 msgid "input file doesn't contain a header entry with a charset specification"
@@ -2765,28 +2508,20 @@ msgstr "infilen saknar en huvudrad som anger teckenuppsättning"
 #: 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
 #, 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."
 
 #: src/msgl-iconv.c:335
 #, 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:302 src/x-python.c:672
 #: src/xgettext.c:727
 #, 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()."
@@ -2826,9 +2561,7 @@ msgstr ""
 #: src/msgmerge.c:507
 #, 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:509
 #, c-format
@@ -2876,8 +2609,7 @@ msgstr "      --suffix=SUFFIX         använd ett annat suffix än det vanliga\n
 #: src/msgmerge.c:539
 #, 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"
@@ -2888,15 +2620,13 @@ 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:546
 #, 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"
@@ -2904,11 +2634,8 @@ msgstr ""
 
 #: src/msgmerge.c:557
 #, 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:614 src/urlget.c:192
 #, c-format
@@ -2927,12 +2654,8 @@ msgstr "detta meddelande ska inte definiera pluralformer"
 
 #: src/msgmerge.c:2035
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2953,17 +2676,12 @@ msgstr "Användning: %s [FLAGGA] [FIL]...\n"
 #: 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: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:442
 #, c-format
@@ -2972,20 +2690,13 @@ msgstr "      --csharp                C#-läge: indata är 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#-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: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:451
 #, c-format
@@ -3000,8 +2711,7 @@ msgstr "Plats för infil i Javaläge:\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 ""
 "Klassnamnet härleds genom att lägga till lokalnamnet till resursnamnet\n"
@@ -3018,8 +2728,7 @@ 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"
+"Flaggorna -l och -d är obligatoriska.  .dll-filen skrivs till en underkatalog\n"
 "till den givna katalogen.  Underkatalogens namn beror på lokalen.\n"
 
 #: src/msgunfmt.c:479
@@ -3075,11 +2784,8 @@ msgstr "  -d, --repeated              skriv bara duplicerade meddelanden\n"
 
 #: 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:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
@@ -3135,8 +2841,7 @@ 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:93
 #, c-format
@@ -3248,8 +2953,7 @@ msgstr "filen \"%s\" är inte på GNUs .mo-format"
 #: src/read-mo.c:178
 #, 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:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
@@ -3310,9 +3014,7 @@ msgstr "indata är inte giltig i teckenkodningen \"%s\""
 #: src/recode-sr-latin.c:367
 #, 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:159
 #, c-format
@@ -3364,46 +3066,27 @@ msgid " failed.\n"
 msgstr " misslyckades.\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 inte skriva ut flera översättningsdomäner till en enstaka fil med det "
-"angivna resultatformatet. Försök använda PO-filsyntax istället."
+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:129
-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."
+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:162
-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."
+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: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."
+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:202
-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."
+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:231 src/write-catalog.c:275
 #, c-format
@@ -3437,8 +3120,7 @@ msgstr "inte ett giltigt Javaklassnamn: %s"
 #: src/write-java.c:1210
 #, 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
 #, c-format
@@ -3452,12 +3134,10 @@ msgstr "fel uppstod när \"%s\" öppnades för skrivning"
 
 #: src/write-po.c:875
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1326 src/write-po.c:1455
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3470,7 +3150,7 @@ msgstr ""
 "teckenuppsättning än du.  Försök använda en ren ASCII-msgctxt istället.\n"
 "%s\n"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1338 src/write-po.c:1467
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3493,8 +3173,7 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3864,12 +3543,8 @@ msgstr "%s:%d: ogiltigt strängmönster"
 
 #: 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: varning: syntaxen $\"...\" kommer att tas bort av säkerhetsskäl; "
-"använd eval_gettext istället"
+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:413
 #, c-format
@@ -3879,14 +3554,12 @@ msgstr "%s:%d: varning: reguljärt uttryck avslutas för tidigt"
 #: src/xgettext.c:545
 #, 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.  Använder ASCII som reservalternativ\n"
 
 #: src/xgettext.c:648
 #, 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:653
 #, c-format
@@ -3905,12 +3578,8 @@ msgstr "Extrahera översättbara strängar från givna infiler.\n"
 
 #: 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=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 (i st.f. messages.po) \n"
 
 #: src/xgettext.c:884
 #, c-format
@@ -3919,8 +3588,7 @@ msgstr "  -o, --output=FIL            skriv resultatet till FIL\n"
 
 #: src/xgettext.c:886
 #, 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:891
@@ -3932,20 +3600,16 @@ msgstr "Språkval i infiler:\n"
 #, 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"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                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"
 
@@ -3956,9 +3620,7 @@ msgstr "  -C, --c++                   samma som --language=C++\n"
 
 #: src/xgettext.c:902
 #, 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:907
@@ -3978,8 +3640,7 @@ msgstr "Normalt antas att filer är i ASCII-format.\n"
 #: src/xgettext.c:915
 #, 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:917
 #, c-format
@@ -3991,15 +3652,12 @@ msgstr "  -x, --exclude-file=FIL.po   rader från FIL tas inte ut\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"
+"  -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:925
@@ -4016,14 +3674,12 @@ msgstr "  -a, --extract-all           extrahera alla strängar\n"
 #, 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"
 
@@ -4031,22 +3687,19 @@ msgstr ""
 #, 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:942
 #, 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"
@@ -4056,22 +3709,19 @@ msgstr ""
 #, 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:950
 #, 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:952
 #, c-format
@@ -4100,10 +3750,8 @@ msgstr "      --boost                 känn igen Boost-formatsträngar\n"
 
 #: src/xgettext.c:966
 #, 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:991
 #, c-format
@@ -4113,15 +3761,12 @@ msgstr "      --properties-output     skriv en \"Java .properties\"-fil\n"
 #: src/xgettext.c:1006
 #, 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:1008
 #, 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:1010
 #, c-format
@@ -4135,39 +3780,27 @@ msgstr "      --package-version=VERSION  sätt paketversion i utdata\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@ADRESS   sätt mottagare för msgid-"
-"felrapporter\n"
+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:1016
 #, 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[STRÄNG], --msgstr-prefix[=STRÄNG]  inled översatta strängar med STRÄNG "
-"eller \"\"\n"
+msgstr "  -m[STRÄNG], --msgstr-prefix[=STRÄNG]  inled översatta strängar med STRÄNG eller \"\"\n"
 
 #: src/xgettext.c:1019
 #, 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[STRÄNG], --msgstr-suffix[=STRÄNG]  avsluta översatta strängar med "
-"STRÄNG eller \"\"\n"
+msgstr "  -M[STRÄNG], --msgstr-suffix[=STRÄNG]  avsluta översatta strängar med STRÄNG eller \"\"\n"
 
 #: src/xgettext.c:1840
 #, 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"
+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:1965
 msgid "standard input"
@@ -4195,21 +3828,13 @@ msgstr "%s%s: varning: "
 
 #: 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 är inte en giltig formatsträng för %s trots att den används i en "
-"formatsträngsposition. Orsak: %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 är inte en giltig formatsträng för %s trots att den används i en formatsträngsposition. Orsak: %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 är inte en giltig formatsträng för %s trots att den är deklarerad som en. "
-"Orsak: %s\n"
+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"
 
 #: src/xgettext.c:2221
 #, c-format
@@ -4219,8 +3844,7 @@ msgid ""
 "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"
+"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"
diff --git a/gettext-tools/po/tr.po b/gettext-tools/po/tr.po
index 461f58b5c..1c7f4b29f 100644
--- a/gettext-tools/po/tr.po
+++ b/gettext-tools/po/tr.po
@@ -6,959 +6,756 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2006-10-23 23:07+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"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: gnulib-lib/argmatch.c:133
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "argüman %s, %s için geçersiz"
 
-#: gnulib-lib/argmatch.c:134
+#: gnulib-lib/argmatch.c:136
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "argüman %s, %s için belirsiz"
 
-#: gnulib-lib/argmatch.c:153
+#: gnulib-lib/argmatch.c:155
+#, c-format
 msgid "Valid arguments are:"
 msgstr "Geçerli argümanlar:"
 
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:322
 #, 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:346
+#: gnulib-lib/clean-temp.c:336
 #, 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:442
+#: gnulib-lib/clean-temp.c:432
 #, c-format
 msgid "cannot remove temporary file %s"
 msgstr "geçici dosya %s silinemiyor"
 
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:447
 #, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "geçici dizin %s silinemiyor"
 
-#: gnulib-lib/closeout.c:66
+#: gnulib-lib/closeout.c:67
 msgid "write error"
 msgstr "yazma hatası"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: 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
 #, c-format
-msgid "preserving permissions for %s"
-msgstr ""
-
-#: gnulib-lib/copy-file.c:194
-#, 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:198
-#, fuzzy, c-format
-msgid "cannot open backup file %s for writing"
+#: gnulib-lib/copy-file.c:67
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
 msgstr "\"%s\" yedek dosyası yazılmak için açılırken hata"
 
-#: gnulib-lib/copy-file.c:202
-#, fuzzy, c-format
-msgid "error reading %s"
+#: gnulib-lib/copy-file.c:75 src/urlget.c:210
+#, c-format
+msgid "error reading \"%s\""
 msgstr "\"%s\" okunurken hata"
 
-#: gnulib-lib/copy-file.c:206
-#, fuzzy, c-format
-msgid "error writing %s"
+#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
+#, c-format
+msgid "error writing \"%s\""
 msgstr "\"%s\" yazılırken hata"
 
-#: gnulib-lib/copy-file.c:210
-#, fuzzy, c-format
-msgid "error after reading %s"
+#: gnulib-lib/copy-file.c:86 src/urlget.c:220
+#, c-format
+msgid "error after reading \"%s\""
 msgstr "\"%s\" okunduktan sonra hata"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c: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: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
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() başarısız"
 
-#: gnulib-lib/csharpcomp.c:571
+#: gnulib-lib/csharpcomp.c:539
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "C# derleyici bulunamadı, pnet kurmayı deneyin"
 
-#: gnulib-lib/csharpexec.c:343
+#: gnulib-lib/csharpexec.c:344
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# sanal makinası bulunamadı, pnet kurmayı deneyin"
 
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:125
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatası"
 
-#: 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: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
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s alt süreci başarısız"
 
-#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: `%s' seçeneği belirsiz\n"
 
-#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: `--%s' seçeneği argümansız kullanılır\n"
 
-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: `%c%s' seçeneği argümansız kullanılır\n"
 
-#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
+#: gnulib-lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
 
-#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
+#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: `--%s' seçeneği bilinmiyor\n"
 
-#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
+#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: `%c%s' seçeneği bilinmiyor\n"
 
-#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
+#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: kuraldışı seçenek -- %c\n"
+
+#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr "%s: geçersiz seçenek -- %c\n"
 
-#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
-#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
+#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
+#: gnulib-lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: seçenek için bir argüman gerekli -- %c\n"
 
-#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
+#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: `-W %s' seçeneği belirsiz\n"
 
-#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
+#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' seçeneği bir argümanla kullanılmaz\n"
 
-#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
-
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
+#: gnulib-lib/javacomp.c:153
 #, 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:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
 #, 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: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:473 src/write-csharp.c:721 src/write-java.c:996
+#: src/write-java.c:1008
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "\"%s\" oluşturulamadı"
 
-#: 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: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
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "\"%s\" dosyasına yazarken hata"
 
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:1795
 #, 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:417
+#: gnulib-lib/javaexec.c:418
 #, 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:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
+#: src/msginit.c:1073
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s alt süreci G/Ç hatası"
 
-#: 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: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
 #, c-format
 msgid "memory exhausted"
 msgstr "bellek tükendi"
 
-#: gnulib-lib/pipe-filter-ii.c:192
-#, 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
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr "%s alt sürecine yazılamadı"
-
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "%s alt sürecinden okunamadı"
-
-#: gnulib-lib/pipe-filter-ii.c:298
+#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
+#: gnulib-lib/pipe.c:262
 #, 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:329
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "%s alt süreci ile haberleşilemedi"
-
-#: gnulib-lib/pipe-filter-ii.c:449
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s alt süreci %d çıkış kodu ile sonlandırıldı"
+msgid "cannot create pipe"
+msgstr "veriyolu oluşturulamıyor"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
+#.
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
-#. "'".  For example, a French Unicode local should translate
-#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
-#. QUOTATION MARK), respectively.
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
 #.
-#. If the catalog has no translation, we will try to
-#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
-#. current locale is not Unicode, locale_quoting_style
-#. will quote 'like this', and clocale_quoting_style will
-#. quote "like this".  You should always include translations
-#. for "`" and "'" even if U+2018 and U+2019 are appropriate
-#. for your locale.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:312
+#: gnulib-lib/quotearg.c:245
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:313
+#: gnulib-lib/quotearg.c:246
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-acl.c:46
+#: gnulib-lib/w32spawn.h:48
 #, c-format
-msgid "setting permissions for %s"
-msgstr ""
-
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
-#, c-format
-msgid "cannot create pipe"
-msgstr "veriyolu oluşturulamıyor"
+msgid "DuplicateHandle failed with error code 0x%08x"
+msgstr "DuplicateHandle 0x%08x hata kodu vererek başarısız oldu"
 
-#: gnulib-lib/w32spawn.h:43
+#: gnulib-lib/w32spawn.h:53
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle başarısız oldu"
 
-#: gnulib-lib/w32spawn.h:84
-#, fuzzy, c-format
-msgid "cannot restore fd %d: dup2 failed"
-msgstr "\"%s\" çıktı dosyası oluşturulamıyor"
-
-#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
-#: gnulib-lib/wait-process.c:317
+#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
+#: gnulib-lib/wait-process.c:367
 #, c-format
 msgid "%s subprocess"
 msgstr "%s alt süreci"
 
-#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
+#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s alt süreci ölümcül sinyal %d aldı"
 
-#: 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/format.c:149
 #, c-format
-msgid "error while opening \"%s\" for reading"
-msgstr "\"%s\" okunmak için açılırken hata"
-
-#: src/format.c:151
-#, fuzzy, c-format
-msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
+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"
 
-#: 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-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' içindeki %1$u.argüman için bir biçem belirteci 'msgid' içinde yok"
+#: 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
+#, 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"
 
-#: 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-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
+#: 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
 #, 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: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-perl.c:615 src/format-php.c:381 src/format-python.c:527
-#: src/format-tcl.c:421
-#, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' for argument %u are not the same"
+#: 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' ve '%s' girdilerindeki biçem belirteçleri %u için aynı değil"
 
-#: src/format-boost.c:449
+#: src/format-boost.c:427
 #, 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:36
+#: src/format-c.c:177
 #, 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:39
+#: src/format-c.c:565
 #, 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:42 src/format-gfc-internal.c:289
+#: src/format-c.c:779
 #, 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: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
-msgid "number of format specifications in '%s' and '%s' does not match"
+#: 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"
 msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri farklı sayıda"
 
-#: src/format-csharp.c:88 src/format-java.c:205
+#: src/format-csharp.c:86 src/format-java.c:203
 #, 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:109
+#: 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:130 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: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:139
+#: src/format-csharp.c:133
 #, 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:140
+#: src/format-csharp.c:134
 #, 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:161 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: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:162
+#: src/format-csharp.c:153
 #, 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:255
+#: src/format-gcc-internal.c:245
 #, 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:292
+#: src/format-gcc-internal.c:276 src/format-gcc-internal.c:370
 #, 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:334
+#: src/format-gcc-internal.c:314
 #, 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:398
-#, fuzzy, c-format
-msgid ""
-"In the directive number %u, a precision specification is not allowed before "
-"'%c'."
-msgstr "%u numaralı yönergede, '%c' den önce bir hassasiyet olmamalı."
-
-#: src/format-gcc-internal.c:406
+#: src/format-gcc-internal.c:376
 #, 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:463
+#: src/format-gcc-internal.c:424
 #, 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:677
-#, fuzzy, c-format
-msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "'msgid' %%m kullanırken '%s' kullanmıyor"
-
-#: src/format-gcc-internal.c:680
-#, fuzzy, c-format
-msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "'msgid' %%m kullanmazken '%s' %%m kullanıyor"
-
-#: src/format-gfc-internal.c:383
-#, fuzzy, c-format
-msgid "'%s' uses %%C but '%s' doesn't"
+#: src/format-gcc-internal.c:630
+#, c-format
+msgid "'msgid' uses %%m but '%s' doesn't"
 msgstr "'msgid' %%m kullanırken '%s' kullanmıyor"
 
-#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
-msgid "'%s' does not use %%C but '%s' uses %%C"
+#: src/format-gcc-internal.c:633
+#, c-format
+msgid "'msgid' does not use %%m but '%s' uses %%m"
 msgstr "'msgid' %%m kullanmazken '%s' %%m kullanıyor"
 
-#: src/format-invalid.h:22
+#: src/format-invalid.h:23
 msgid "The string ends in the middle of a directive."
 msgstr "Dizge yönergenin ortasında bitiyor."
 
-#: 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: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:28
+#: src/format-invalid.h:29
 #, 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:30
+#: src/format-invalid.h:31
 #, 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:32
+#: src/format-invalid.h:33
 #, 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:36
+#: src/format-invalid.h:37
 #, 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:37
+#: src/format-invalid.h:38
 #, 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:40
+#: src/format-invalid.h:41
 #, 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:240
+#: src/format-java.c:237
 #, 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:251 src/format-java.c:285 src/format-java.c:314
+#: src/format-java.c:247 src/format-java.c:279 src/format-java.c:306
 #, 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:274
+#: src/format-java.c:269
 #, 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:323
+#: src/format-java.c:314
 #, 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:572
+#: src/format-java.c:558
 #, 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:583
+#: src/format-java.c:569
 #, 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."
+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 '%s'"
-msgstr ""
-"'%2$s' içindeki {%1$u}. argüman için bir biçem belirteci 'msgid' içinde yok"
+#: 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"
 
-#: src/format-java.c:756
+#: src/format-java.c:739
 #, 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:776
-#, fuzzy, c-format
-msgid ""
-"format specifications in '%s' and '%s' for argument {%u} are not the same"
+#: src/format-java.c:759
+#, c-format
+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"
 
-#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
-#: src/format-scheme.c:2375
+#: 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."
+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:2372 src/format-scheme.c:2398
+#: src/format-lisp.c:2387 src/format-scheme.c:2413
 #, 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:2496 src/format-scheme.c:2499
+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:2502 src/format-scheme.c:2505
 #, 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:2736 src/format-scheme.c:2754
+#: src/format-lisp.c:2700 src/format-scheme.c:2715
 #, 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:2805
+#: src/format-lisp.c:2762
 msgid "The string ends in the middle of a ~/.../ directive."
 msgstr "Dizge, bir ~/.../ yönergesinin ortasında bitiyor."
 
-#: 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: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
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
 msgstr "'~%2$c' ile eşleşmeyen '~%1$c' bulundu."
 
-#: src/format-lisp.c:2863 src/format-scheme.c:2860
+#: src/format-lisp.c:2808 src/format-scheme.c:2806
 #, 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:2976 src/format-scheme.c:2973
+#: src/format-lisp.c:2906 src/format-scheme.c:2904
 #, 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:3326 src/format-scheme.c:3263
+#: src/format-lisp.c:3214 src/format-scheme.c:3163
 #, 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:3432 src/format-scheme.c:3355
+#: src/format-lisp.c:3300 src/format-scheme.c:3238
 msgid "The string refers to some argument in incompatible ways."
 msgstr "Dizge bazı argümanlara uyumsuz bir yolla karşılık getirilmiş."
 
-#: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, fuzzy, c-format
-msgid "format specifications in '%s' and '%s' are not equivalent"
+#: src/format-lisp.c:3342 src/format-scheme.c:3280
+#, c-format
+msgid "format specifications in 'msgid' and '%s' are not equivalent"
 msgstr "`msgid' ve '%s' girdilerindeki biçem belirteçleri aynı değil"
 
-#: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr ""
-"'%s' içindeki biçem belirteçleri 'msgid' içindekilerin bir alt kümesi değil"
+#: 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:433
+#: 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."
+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-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:194 src/format-python.c:443 src/format-sh.c:295
 #, 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: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: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:354
+#: src/format-python.c:327
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "Dizge '%s' isimli argümana uyumsuz bir yolla karşılık getirilmiş."
 
-#: src/format-python.c:430
-#, fuzzy, c-format
-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: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.c:437
-#, fuzzy, c-format
-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: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.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'"
+#: src/format-python.c:433 src/format-sh.c:285
+#, c-format
+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"
 
-#: src/format-python.c:494
-#, fuzzy, c-format
-msgid ""
-"format specifications in '%s' and '%s' for argument '%s' are not the same"
+#: src/format-python.c:463
+#, c-format
+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"
 
-#: src/format-python-brace.c:137
-#, fuzzy, c-format
-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-brace.c:150
-#, fuzzy, c-format
-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:165
-#, fuzzy, c-format
-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:185
-#, fuzzy, c-format
-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:270
-#, fuzzy, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "%u numaralı yönergede, %d. argüman negatif."
-
-#: src/format-qt.c:152
+#: src/format-qt.c:78
 #, 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 ""
+msgid "Multiple references to %%%c."
+msgstr "%%%c için çoklu başvuru."
 
-#: src/format-sh.c:79
+#: src/format-sh.c:80
 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: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: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: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: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:85
+#: src/format-sh.c:86
 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:90
+#: src/format-ycp.c:83
 #, 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."
+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:91
+#: 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."
+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: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
+#: 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"
-"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"
+"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"
 
-#: 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
+#: 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 tarafından yazıldı.\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: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
 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:275 src/recode-sr-latin.c:131
 #, c-format
 msgid "too many arguments"
 msgstr "çok fazla argüman"
 
-#: 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
-#, fuzzy, c-format
-msgid "Try '%s --help' for more information.\n"
+#: 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:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Kullanımı: %s [SEÇENEK]\n"
 
-#: src/hostname.c:215
+#: src/hostname.c:216
 #, c-format
 msgid "Print the machine's hostname.\n"
 msgstr "Makina ismini gösterir.\n"
 
-#: src/hostname.c:218
+#: src/hostname.c:219
 #, c-format
 msgid "Output format:\n"
 msgstr "Çıktı biçemi:\n"
 
-#: src/hostname.c:220
+#: src/hostname.c:221
 #, c-format
 msgid "  -s, --short                 short host name\n"
 msgstr "  -s, --short                 kısa konak ismi\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          uzun konak ismi; alan ismini ve rümuzları da\n"
 "                              içerir\n"
 
-#: src/hostname.c:225
+#: src/hostname.c:226
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            konak adresleri\n"
 
-#: 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: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
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Bilgilendirme çıktısı:\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
+#: 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: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
+#: 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"
 
-#. 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
+#: 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 ""
 "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:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:252 src/hostname.c:258 src/hostname.c:265
 #, c-format
 msgid "could not get host name"
 msgstr "makina ismi alınamadı"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: 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
 #, c-format
 msgid "at most one input file allowed"
 msgstr "en fazla bir girdi dosyasına izin var"
 
-#: 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: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
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ile %s bağdaşmıyor"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Kullanımı: %s [SEÇENEK] [GİRDİDOSYASI]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:401
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -967,328 +764,255 @@ msgstr ""
 "Çeviri kataloğundaki iletileri belirtilen özelliklere göre süzer,\n"
 "ve özellikleri uygular.\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:372 src/msgmerge.c:502 src/msgunfmt.c:435
-#: src/msguniq.c:342
+#: 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
 #, 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: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: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
 #, c-format
 msgid "Input file location:\n"
 msgstr "Girdi dosyasının yeri:\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  GİRDİDOSYASI                girdi olan PO dosyası\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:511 src/msguniq.c:349
-#: src/xgettext.c:875
+#: 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
 #, 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:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: 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
 #, 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: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: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
 #, c-format
 msgid "Output file location:\n"
 msgstr "Çıktı dosyasının yeri:\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:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: 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
 #, 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: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/msgunfmt.c:493 src/msguniq.c:358
+#: 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
 #, 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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
 #, c-format
 msgid "Message selection:\n"
 msgstr "İleti seçimi:\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:427
 #, 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:454
+#: src/msgattrib.c:429
 #, 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:456
+#: src/msgattrib.c:431
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              'fuzzy' imli iletileri siler\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:433
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            'fuzzy' imli iletileri tutar\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:435
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           kullanımdışı olan #~ iletilerini siler\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:437
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         kullanımdışı olan #~ iletilerini tutar\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:440
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Nitelik değiştirme:\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             tüm iletileri 'fuzzy' olarak imler\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:444
 #, 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:471
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          tüm iletileri kullanımdışı yapar\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr ""
-"      --clear-obsolete        kullanımdışı iletilerin tümünü kullanıma "
-"sokar\n"
-
-#: src/msgattrib.c:475
-#, fuzzy, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr ""
-"      --previous              çevrilmiş iletinin eski msgid'sini tutar\n"
+msgstr "      --clear-obsolete        kullanımdışı iletilerin tümünü kullanıma sokar\n"
 
-#: src/msgattrib.c:478
+#: src/msgattrib.c:450
 #, 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:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --no-fuzzy              'fuzzy' imli iletileri siler\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:452
 #, 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:484
+#: src/msgattrib.c:454
 #, 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:486
+#: src/msgattrib.c:456
 #, 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:488
+#: src/msgattrib.c:458
 #, 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: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/msguniq.c:369
+#: 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
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Girdi dosyası sözdizimi:\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:393 src/msguniq.c:371
+#: 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
 #, 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: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: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
 #, 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: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: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
 #, c-format
 msgid "Output details:\n"
 msgstr "Çıktı ayrıntıları:\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:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: 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
 #, 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 ""
+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: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: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
 #, 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
-#, 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"
-
-#: 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
-#, 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: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: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
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
-#: src/xgettext.c:983
+#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
+#: src/xgettext.c:854
 #, 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:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
-#: src/xgettext.c:985
+#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
+#: src/xgettext.c:856
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
-#: src/xgettext.c:987
+#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
+#: src/xgettext.c:858
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
+#: src/xgettext.c:860
 #, 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: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: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
 #, 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: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: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
 #, 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: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: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
 #, 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: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: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
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1297,32 +1021,32 @@ 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: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: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
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           sıralı çıktı üretir\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:603 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: 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
 #, 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:322 src/msgcomm.c:327
+#: src/msgcat.c:296 src/msgcomm.c:315
 #, 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:367 src/msgcomm.c:359 src/xgettext.c:855
+#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Kullanımı: %s [SEÇENEK] [GİRDİDOSYASI]...\n"
 
-#: src/msgcat.c:372
-#, fuzzy, c-format, no-wrap
+#: src/msgcat.c:342
+#, 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"
@@ -1330,9 +1054,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, 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"
+"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"
@@ -1345,24 +1069,23 @@ msgstr ""
 "korunur, belirtildiğinde bunlar ilk PO dosyasında belirtildiği şekliyle\n"
 "alınır.\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  GİRDİDOSYASI ...            girdi dosyaları\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
 #, 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:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
+#: src/xgettext.c:764
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Girdi dosyası - ise, standart girdi okunur.\n"
 
-#: src/msgcat.c:408 src/msgcomm.c:399
+#: src/msgcat.c:378 src/msgcomm.c:387
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1371,7 +1094,7 @@ msgstr ""
 "  -<, --less-than=SAYI        bu SAYIdan daha fazla olan iletileri basmaz,\n"
 "                              belirtilmezse öntanımlı sonsuzdur.\n"
 
-#: src/msgcat.c:411
+#: src/msgcat.c:381
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1380,7 +1103,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      bu SAYIdan daha az olan iletileri basmaz,\n"
 "                              belirtilmezse öntanımlı 0 dır.\n"
 
-#: src/msgcat.c:414 src/msgcomm.c:405
+#: src/msgcat.c:384 src/msgcomm.c:393
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1389,17 +1112,14 @@ msgstr ""
 "  -u, --unique                --less-than=2 için kısaltmadır, sadece\n"
 "                              eşi olmayan iletiler basılır\n"
 
-#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgmerge.c:530
 #, 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:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgmerge.c:532
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1408,12 +1128,12 @@ msgstr ""
 "      --stringtable-input     NeXTstep/GNUstep .strings sözdizimli girdi\n"
 "                              dosyaları\n"
 
-#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
+#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
 #, 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:430 src/msguniq.c:380
+#: src/msgcat.c:400 src/msguniq.c:368
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1422,33 +1142,27 @@ 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:433 src/msgen.c:345 src/msgmerge.c:570
-#, 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:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:179 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "hiçbir girdi dosyası verilmemiş"
 
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:184 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "tam olarak 2 girdi dosyası gerekli"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:203 src/msgmerge.c:453
 #, 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:218
+#: src/msgcmp.c:208
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1464,96 +1178,87 @@ 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:232
+#: src/msgcmp.c:222
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      çeviriler\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:224
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     kaynaklara bağlantılar\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:229 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "İşlem değiştiriciler:\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:553
-#, 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"
-
-#: src/msgcmp.c:243 src/msgmerge.c:555
+#: src/msgcmp.c:231 src/msgmerge.c:521
 #, 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"
+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:245
+#: src/msgcmp.c:233
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             çıktıda fuzzy girdiler kullanılır\n"
 
-#: src/msgcmp.c:247
+#: src/msgcmp.c:235
 #, 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:324
+#: src/msgcmp.c:306
 #, c-format
 msgid "this message is untranslated"
 msgstr "bu ileti çevrilmemiş"
 
-#: src/msgcmp.c:330
+#: src/msgcmp.c:312
 #, 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:369 src/msgmerge.c:1505
+#: src/msgcmp.c:328 src/msgmerge.c:1214
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "bu ileti kullanıldı ama tanımlı değil..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:331 src/msgmerge.c:1217
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...ama bu tanımlama benzer"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:336 src/msgmerge.c:1245
 #, 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:546
+#: src/msgcmp.c:440
 #, c-format
 msgid "warning: this message is not used"
 msgstr "uyarı: bu ileti kullanılmamış"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:447 src/msgfmt.c:543
 #, 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:316
+#: src/msgcomm.c:304
 #, c-format
 msgid "at least two files must be specified"
 msgstr "en az iki dosya belirtilmelidir"
 
-#: src/msgcomm.c:364
-#, fuzzy, c-format, no-wrap
+#: src/msgcomm.c:352
+#, 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"
+"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 ""
@@ -1567,7 +1272,7 @@ msgstr ""
 "çıkarma yorumları korunmuş olacaktır. Tüm PO dosyalarındaki dosya konumları\n"
 "korunmuş olacaktır.\n"
 
-#: src/msgcomm.c:402
+#: src/msgcomm.c:390
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1576,71 +1281,67 @@ msgstr ""
 "  ->, --more-than=SAYI        SAYIdan daha fazla olan iletileri basar,\n"
 "                              verilmezse öntanımlı 1 dir\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
-#, fuzzy, 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: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/msgconv.c:311
+#: src/msgconv.c:295
 #, 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:335
+#: src/msgconv.c:319
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Dönüşüm hedefi:\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:323
 #, 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:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                girintili çıktı tarzı\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr ""
-"      --no-location           '#: dosyaismi:satır' satırlarını engeller\n"
+msgstr "      --no-location           '#: dosyaismi:satır' satırlarını engeller\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
-#, fuzzy, c-format
-msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\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          '#: dosyaismi:satır' satırları korunur\n"
 "                              (öntanımlı)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                çıktı bilinen biçemde yazılır\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
 #, c-format
 msgid "no input file given"
 msgstr "hiç girdi dosyası verilmemiş"
 
-#: src/msgen.c:263
+#: src/msgen.c:234
 #, c-format
 msgid "exactly one input file required"
 msgstr "tam olarak 1 girdi dosyası gerekli"
 
-#: src/msgen.c:304
+#: src/msgen.c:275
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Kullanımı: %s [SEÇENEK] GİRDİDOSYASI\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:280
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1653,22 +1354,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:321
+#: src/msgen.c:292
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  GİRDİDOSYASI                PO ya da POT dosyası\n"
 
-#: src/msgexec.c:196
+#: src/msgexec.c:195
 #, c-format
 msgid "missing command name"
 msgstr "komut ismi eksik"
 
-#: src/msgexec.c:257
+#: src/msgexec.c:241
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Kullanımı: %s [SEÇENEK] KOMUT [KOMUT-SEÇENEĞİ]\n"
 
-#: src/msgexec.c:262
+#: src/msgexec.c:246
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1683,7 +1384,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:271
+#: src/msgexec.c:255
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1692,37 +1393,42 @@ msgstr ""
 "'0' özel bir yerleşik komuttur ve bir null bayt ile sonlanan çeviri\n"
 "çıktılar.  \"msgexec 0\"ın çıktısı \"xargs -0\"a girdi olarak elverişlidir.\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:265 src/msgfilter.c:413
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=GİRDİDOSYASI    PO dosyası\n"
 
-#: src/msgexec.c:345
+#: src/msgexec.c:325
 #, c-format
 msgid "write to stdout failed"
 msgstr "standart çıktıya yazılamadı"
 
-#: src/msgfilter.c:298
+#: 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
 #, c-format
 msgid "missing filter name"
 msgstr "süzgeç ismi eksik"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:325
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "en az bir sed betiği belirtilmelidir"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:400
 #, 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:411
+#: src/msgfilter.c:404
 #, 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:435
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1731,149 +1437,138 @@ 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:440
+#: src/msgfilter.c:433
 #, 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:442
+#: src/msgfilter.c:435
 #, 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:444
+#: src/msgfilter.c:437
 #, 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:447
+#: src/msgfilter.c:440
 #, 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:465 src/msggrep.c:600
+#: 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             çı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:471 src/msggrep.c:606
+#: src/msgfilter.c:458 src/msggrep.c:584
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                girintili çıktı tarzı\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:460
 #, 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/msgfmt.c:345
+#: 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/msgfmt.c:305
 #, 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:392
+#: src/msgfmt.c:352
 #, 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:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, fuzzy, c-format
-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:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
-#: src/msgunfmt.c:353
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
+#: src/msgunfmt.c:342
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s bir \"-d dizin\" uygulanmasını gerektiriyor"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s bir \"-l yerel\" belirtilmesini gerektiriyor"
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s bir \"-l yerel\" belirtilmesini gerektiriyor"
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s bir \"-l yerel\" belirtilmesini gerektiriyor"
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s ile %s bağdaşmıyor"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s sadece %s ya da %s ile geçerlidir"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s sadece %s, %s ya da %s ile geçerlidir"
 
-#. 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
-#, c-format
-msgid "%s: "
-msgstr ""
-
-#: src/msgfmt.c:744
+#: src/msgfmt.c:601
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d çevrilmiş ileti"
 msgstr[1] "%d çevrilmiş ileti"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:606
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d belirsiz çeviri"
 msgstr[1] ", %d belirsiz çeviri"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:611
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d çevrilmemiş ileti"
 msgstr[1] ", %d çevrilmemiş ileti"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:631
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Kullanımı: %s [SEÇENEK] dosyaismi.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:635
 #, 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:783 src/xgettext.c:864
+#: 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"
@@ -1882,227 +1577,154 @@ 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:790
+#: src/msgfmt.c:647
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  DOSYAİSMİ.po ...            girdi dosyaları\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
 #, c-format
 msgid "Operation mode:\n"
 msgstr "İşlem kipi:\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:656
 #, 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:801
+#: src/msgfmt.c:658
 #, 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:803
+#: src/msgfmt.c:660
 #, 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:805
+#: src/msgfmt.c:662
 #, 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:807
+#: src/msgfmt.c:664
 #, 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:809
+#: src/msgfmt.c:666
 #, 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:811
-#, fuzzy, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --qt                    Qt kipi: bir Qt .qm dosyası üretir\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:673
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                bilinen kip etkinleştirilir\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:675 src/xgettext.c:775
 #, 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:823
+#: src/msgfmt.c:678
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Java kipinde çıktı dosyasının yeri:\n"
 
-#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=ÖZKAYNAK     özkaynak ismi\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:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
+#: src/msgunfmt.c:460 src/msgunfmt.c:470
 #, 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:829
-#, fuzzy, c-format
-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:831
+#: src/msgfmt.c:684
 #, 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:833
+#: src/msgfmt.c:686
 #, 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:839
+#: src/msgfmt.c:692
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# kipinde çıktı dosyasının yeri:\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:698 src/msgunfmt.c:462
 #, 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:847
+#: src/msgfmt.c:700
 #, 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:851
+#: src/msgfmt.c:704
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl kipte çıktı dosyasının yeri:\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:708 src/msgunfmt.c:472
 #, 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:857
+#: src/msgfmt.c:710
 #, 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"
-
-#: src/msgfmt.c:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-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:871 src/xgettext.c:934
-#, 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[=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"
+msgstr "-l ve -d seçenekleri zorunludur. .msg dosyası belirtilen dizine yazılır.\n"
 
-#: src/msgfmt.c:874
-#, 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:886 src/xgettext.c:905
+#: src/msgfmt.c:722 src/xgettext.c:791
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Girdi dosyası yorumlaması:\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:724
 #, 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:891
+#: src/msgfmt.c:727
 #, 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:893
+#: src/msgfmt.c:729
 #, 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:895
+#: src/msgfmt.c:731
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2111,145 +1733,112 @@ msgstr ""
 "      --check-domain          --output-file seçeneği ile paket yönergeleri\n"
 "                              arasındaki çelişkiler kontrol edilir\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:734
 #, 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:900
+#: src/msgfmt.c:736
 #, 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:903
+#: src/msgfmt.c:739
 #, 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:908
-#, c-format
-msgid ""
-"  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
-msgstr ""
-"  -a, --alignment=SAYI        dizgeleri SAYI bayta ayarlar (öntanımlı: %d)\n"
-
-#: src/msgfmt.c:910
+#: src/msgfmt.c:744
 #, 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 ""
+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:913
+#: src/msgfmt.c:746
 #, 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 "      --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:922
+#: src/msgfmt.c:755
 #, 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:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               daha ayrıntılı çıktı verilir\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:867
 #, 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:1040
+#: src/msgfmt.c:870
 #, 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:1050
+#: src/msgfmt.c:880
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "uyarı: PO dosya başlığı fuzzy\n"
 
-#: src/msgfmt.c:1052
+#: 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:1076
+#: src/msgfmt.c:906
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "dosya ismi olarak paket ismi \"%s\" uygun değil"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:911
 #, 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:1095
-#, fuzzy, c-format
-msgid "'domain %s' directive ignored"
+#: src/msgfmt.c:925
+#, c-format
+msgid "`domain %s' directive ignored"
 msgstr "`domain %s' yönergesi yoksayıldı"
 
-#: src/msgfmt.c:1155
-#, fuzzy, c-format
-msgid "empty 'msgstr' entry ignored"
+#: src/msgfmt.c:985
+#, c-format
+msgid "empty `msgstr' entry ignored"
 msgstr "boş `msgstr' girdisi yoksayıldı"
 
-#: src/msgfmt.c:1156
-#, fuzzy, c-format
-msgid "fuzzy 'msgstr' entry ignored"
+#: src/msgfmt.c:986
+#, c-format
+msgid "fuzzy `msgstr' entry ignored"
 msgstr "fuzzy `msgstr' girdisi yoksayıldı"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1035
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: uyarı: kaynak dosya fuzzy çeviriler içeriyor"
 
-#: src/msgfmt.c:1318
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
-#, 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: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
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" okunurken hata"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:485
 #, 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:521
+#: src/msggrep.c:505
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2258,7 +1847,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:547
+#: src/msggrep.c:531
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2336,26 +1925,24 @@ msgstr ""
 "  -v, --invert-match        sadece bir seçim kriteri ile eşleşmeyen iletiler\n"
 "                            çıktılanır\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:580
 #, 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:623
+#: src/msggrep.c:601
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           sıralı çıktı üretir\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:603
 #, 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:297
+#: src/msginit.c:288
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2365,7 +1952,7 @@ msgstr ""
 "değişkenini ABOUT-NLS dosyasında açıklandığı gibi belirtin.\n"
 "Bu çevirinizi test edebilmeniz için gereklidir.\n"
 
-#: src/msginit.c:321
+#: src/msginit.c:312
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2376,39 +1963,38 @@ 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:347
+#: src/msginit.c:338
 #, c-format
 msgid "Created %s.\n"
 msgstr "%s oluşturuldu.\n"
 
-#: src/msginit.c:367
+#: src/msginit.c:358
 #, 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:377
+#: src/msginit.c:368
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=GİRDİDOSYASI    POT dosyası\n"
 
-#: src/msginit.c:379
+#: src/msginit.c:370
 #, 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:385
+#: src/msginit.c:376
 #, 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:387
+#: src/msginit.c:378
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2417,54 +2003,48 @@ 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:400
+#: src/msginit.c:391
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=tr_TR          hedef yerel belirtilir\n"
 
-#: src/msginit.c:402
+#: src/msginit.c:393
 #, 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:468
+#: src/msginit.c:449
 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:476 src/msginit.c:481
+#: src/msginit.c:457 src/msginit.c:462
 #, c-format
 msgid "error reading current directory"
 msgstr "dizin okunurken hata"
 
-#: src/msginit.c:489
+#: src/msginit.c:470
 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: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: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
 #, 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:1118
+#: src/msginit.c:1051
 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"
@@ -2474,49 +2054,46 @@ 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:1438
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s paketi için Türkçe çeviriler"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
+#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
 #, 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:188 src/msgl-iconv.c:259
+#: src/msgl-cat.c:190 src/msgl-iconv.c:238
 #, 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:203
-#, fuzzy, c-format
-msgid ""
-"input file '%s' doesn't contain a header entry with a charset specification"
+#: src/msgl-cat.c:205
+#, c-format
+msgid "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "girdi dosyası `%s' başlığında bir karakter kümesi belirtilmemiş."
 
-#: src/msgl-cat.c:207
-#, fuzzy, c-format
-msgid ""
-"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
-"charset specification"
+#: src/msgl-cat.c:209
+#, c-format
+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:391 src/msgl-iconv.c:375
+#: src/msgl-cat.c:392 src/msgl-iconv.c:343
 #, 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: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:94
+#: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
+#: src/xgettext.c:2778
 #, c-format
 msgid "warning: "
 msgstr "uyarı: "
 
-#: 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"
@@ -2525,11 +2102,10 @@ msgstr ""
 "Girdi dosyası UTF-8 ile karışık farklı kodlamalar içeriyor.\n"
 "Çıktı UTF-8'e dönüştürülüyor.\n"
 
-#: src/msgl-cat.c: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 ""
@@ -2537,7 +2113,7 @@ msgstr ""
 "Çıktı UTF-8'e çevriliyor.\n"
 "--to-code seçeneğini kullanarak başka bir kodlama da seçebilirsiniz.\n"
 
-#: src/msgl-cat.c:488
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2548,10 +2124,9 @@ 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:93
+#: src/msgl-charset.c:95
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2564,12 +2139,12 @@ msgstr ""
 "'%s' çıktısı yanlış olabilir.\n"
 "Yapılabilecekler:\n"
 
-#: src/msgl-charset.c:100
+#: src/msgl-charset.c:102
 #, 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:105
+#: src/msgl-charset.c:107
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2580,7 +2155,7 @@ msgstr ""
 "  '%s' uyguladıktan sonra,\n"
 "  'msgconv' kullanarak tekrar %s a dönün.\n"
 
-#: src/msgl-charset.c:114
+#: src/msgl-charset.c:116
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2593,7 +2168,7 @@ msgstr ""
 "  '%s' uyguladıktan sonra,\n"
 "  'msgconv' kullanarak tekrar %s a dönün.\n"
 
-#: src/msgl-charset.c:128
+#: src/msgl-charset.c:130
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2604,136 +2179,135 @@ msgstr ""
 "'%s' çıktısı yanlış olabilir.\n"
 "Tek yapılabilecek LC_ALL=C ayarlamaktır.\n"
 
-#: src/msgl-check.c:130
+#: src/msgl-check.c:92
 msgid "plural expression can produce negative values"
 msgstr "çoğul ifadeler negatif değerler üretebilir"
 
-#: src/msgl-check.c:141
+#: src/msgl-check.c:102
 #, 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:187
+#: src/msgl-check.c:143
 msgid "plural expression can produce division by zero"
 msgstr "çoğul ifade sıfırla bölme hatası üretebilir"
 
-#: src/msgl-check.c:192
+#: src/msgl-check.c:148
 msgid "plural expression can produce integer overflow"
 msgstr "çoğul ifade tamsayı taşması üretebilir"
 
-#: src/msgl-check.c:197
-msgid ""
-"plural expression can produce arithmetic exceptions, possibly division by "
-"zero"
-msgstr ""
-"çoğul ifade aritmetik hatalar, özellikle de sıfırla bölme hatası üretebilir"
+#: src/msgl-check.c: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:266
+#: src/msgl-check.c:185
 #, 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:358 src/msgl-check.c:382
+#: src/msgl-check.c:268 src/msgl-check.c:292
 msgid "message catalog has plural form translations"
 msgstr "ileti kataloğu çoğul çeviriler içeriyor"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:270
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "...ama başlıkta \"plural=İFADE\" gibi bir şey yok"
 
-#: src/msgl-check.c:384
+#: src/msgl-check.c:294
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "...ama başlıkta \"nplurals=TAMSAYI\" gibi bir şey yok"
 
-#: src/msgl-check.c:420
+#: src/msgl-check.c:330
 msgid "invalid nplurals value"
 msgstr "nplurals değeri geçersiz"
 
-#: src/msgl-check.c:442
+#: src/msgl-check.c:352
 msgid "invalid plural expression"
 msgstr "plural= ile verilen ifade geçersiz"
 
-#: src/msgl-check.c:472 src/msgl-check.c:488
+#: src/msgl-check.c:382 src/msgl-check.c:398
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:474
+#: src/msgl-check.c:384
 #, 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:490
+#: src/msgl-check.c:400
 #, 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:514
-msgid ""
-"message catalog has plural form translations, but lacks a header entry with "
-"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
+#: 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 ""
 "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:611
-#, fuzzy
-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: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:619
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:510
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' ve `msgstr[%u]' girdilerinin her ikisi de '\\n' ile başlamıyor"
 
-#: src/msgl-check.c:634
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:525
+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:652
-#, fuzzy
-msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
+#: src/msgl-check.c:543
+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:660
-#, fuzzy, c-format
-msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:551
+#, c-format
+msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' ve `msgstr[%u]' girdilerinin her ikisi de '\\n' ile bitmiyor"
 
-#: src/msgl-check.c:675
-#, fuzzy
-msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:566
+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:687
+#: src/msgl-check.c:578
 msgid "plural handling is a GNU gettext extension"
 msgstr "çoğul biçemler bir GNU gettext özelliğidir"
 
-#: src/msgl-check.c:729
+#: src/msgl-check.c:620
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "içinde '%c' tuş kısayolu eksik"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:630
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "çok fazla '%c' tuş kısayolu içeriyor"
 
-#: src/msgl-check.c:804
-#, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
+#: src/msgl-check.c:670
+#, c-format
+msgid "headerfield `%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: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:820
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "başlıkta `%s' başlık alanı yok\n"
+#: src/msgl-check.c:705
+#, c-format
+msgid "field `%s' still has initial default value\n"
+msgstr "`%s' başlık alanı hala öntanımlı ilk değere sahip\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2745,49 +2319,41 @@ 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:290
+#: src/msgl-iconv.c:262
 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: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:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
+#: src/x-python.c:618 src/xgettext.c:618
 #, 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:335
+#: src/msgl-iconv.c:314
 #, 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:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
+#: src/xgettext.c:625
 #, 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:392 src/msgmerge.c:398
+#: src/msgmerge.c:361 src/msgmerge.c:367
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s sadece %s ile geçerlidir"
 
-#: src/msgmerge.c:453
+#: src/msgmerge.c:421
 msgid "backup type"
 msgstr "yedekleme türü"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:458
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2810,17 +2376,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:507
+#: src/msgmerge.c:475
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      eski kaynaklara bağlı çeviriler\n"
 
-#: src/msgmerge.c:509
+#: src/msgmerge.c:477
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     yeni kaynaklara bağlar\n"
 
-#: src/msgmerge.c:513
+#: src/msgmerge.c:481
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2829,7 +2395,7 @@ msgstr ""
 "  -C, --compendium=DOSYA      ileti çevirileri için ek veritabanı, birden\n"
 "                              fazla belirtilebilir\n"
 
-#: src/msgmerge.c:519
+#: src/msgmerge.c:487
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2838,31 +2404,30 @@ msgstr ""
 "  -U, --update                def.po dosyasını günceller,\n"
 "                              def.po zaten güncelse bir şey yapmaz\n"
 
-#: src/msgmerge.c:531
+#: src/msgmerge.c:499
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Güncelleme kipinde çıktı dosyasının yeri:\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:501
 #, 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:535
+#: src/msgmerge.c:503
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=KONTROL        def.po'nun yedeklemesini yapar\n"
 
-#: src/msgmerge.c:537
+#: src/msgmerge.c:505
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SONEK          yedekleme sonek kullanarak yapılır\n"
 
-#: src/msgmerge.c:539
+#: src/msgmerge.c:507
 #, 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"
@@ -2877,158 +2442,142 @@ msgstr ""
 "                              yedekleme yapılır\n"
 "  simple, never               daima basit yedekleme yapılır\n"
 
-#: src/msgmerge.c:546
-#, fuzzy, c-format
+#: src/msgmerge.c:514
+#, 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 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:557
+#: src/msgmerge.c:523
 #, c-format
-msgid ""
-"      --previous              keep previous msgids of translated messages\n"
-msgstr ""
-"      --previous              çevrilmiş iletinin eski msgid'sini tutar\n"
+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:614 src/urlget.c:192
+#: src/msgmerge.c:525
+#, c-format
+msgid "      --previous              keep previous msgids of translated messages\n"
+msgstr "      --previous              çevrilmiş iletinin eski msgid'sini tutar\n"
+
+#: src/msgmerge.c:574
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       işlemin ilerleyişi gösterilmez\n"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1318
 #, c-format
 msgid "this message should define plural forms"
 msgstr ".bu ileti çoğul biçem olmalıydı"
 
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1341
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "bu ileti çoğul biçem olmamalıydı"
 
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:1679
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
-#: src/urlget.c:437
-#, c-format
+#: src/msgmerge.c:1687
 msgid " done.\n"
 msgstr " bitti.\n"
 
-#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
+#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
 #, 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:427
+#: src/msgunfmt.c:416
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Kullanımı: %s [SEÇENEK] [DOSYA]...\n"
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:420
 #, 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:440
+#: src/msgunfmt.c:429
 #, 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:442
+#: src/msgunfmt.c:431
 #, 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:444
+#: src/msgunfmt.c:433
 #, 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:446
+#: src/msgunfmt.c:435
 #, 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:451
+#: src/msgunfmt.c:440
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  DOSYA ...                   girdi .mo dosyaları\n"
 
-#: src/msgunfmt.c:456
+#: src/msgunfmt.c:445
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Java kipinde girdi dosyasının yeri:\n"
 
-#: src/msgunfmt.c:462
+#: src/msgunfmt.c:451
 #, 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:467
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "C# kipinde girdi dosyasının yeri:\n"
 
-#: src/msgunfmt.c:475
+#: src/msgunfmt.c:464
 #, 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:479
+#: src/msgunfmt.c:468
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Tcl kipinde girdi dosyasının yeri:\n"
 
-#: src/msgunfmt.c:485
+#: src/msgunfmt.c:474
 #, 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:511
+#: src/msgunfmt.c:494
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                girintili çıktı tarzı kullanılır\n"
 
-#: src/msgunfmt.c:513
+#: src/msgunfmt.c:496
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                bilinen biçemde yazılır\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:319
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -3049,26 +2598,24 @@ 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:364
+#: src/msguniq.c:352
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              sadece yinelenenler yazılır\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:354
 #, 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:102
-#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
+#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
 msgid "<stdin>"
 msgstr "<stdÇ>"
 
-#: src/po-charset.c:489
+#: src/po-charset.c:490
 #, c-format
 msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
@@ -3119,144 +2666,143 @@ msgstr ""
 "Başlıkta karakter kümesi yok.\n"
 "Kullanıcının karakter kümesinde ileti dönüşümü yapılamayacak.\n"
 
-#: src/po-gram-gen.y:93
+#: src/po-gram-gen.y:94
 #, c-format
 msgid "inconsistent use of #~"
 msgstr "#~ kullanımı aykırı"
 
-#: src/po-gram-gen.y:243
-#, fuzzy, c-format
-msgid "missing 'msgstr[]' section"
+#: src/po-gram-gen.y:241
+#, c-format
+msgid "missing `msgstr[]' section"
 msgstr "`msgstr[]' bölümü yok"
 
-#: src/po-gram-gen.y:252
-#, fuzzy, c-format
-msgid "missing 'msgid_plural' section"
+#: src/po-gram-gen.y:250
+#, c-format
+msgid "missing `msgid_plural' section"
 msgstr "`msgid_plural' bölümü yok"
 
-#: src/po-gram-gen.y:260
-#, fuzzy, c-format
-msgid "missing 'msgstr' section"
+#: src/po-gram-gen.y:258
+#, c-format
+msgid "missing `msgstr' section"
 msgstr "`msgstr' bölümü yok"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "ilk çoğul biçemin indeksi sıfır değil"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "çoğul biçemin indeksi hatalı"
 
-#: src/po-lex.c:90 src/po-lex.c:109
+#: src/po-lex.c:93 src/po-lex.c:112
 #, c-format
 msgid "too many errors, aborting"
 msgstr "hatalar çok fazla, bunları düzeltince programı tekrar çalıştırın"
 
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "çoklu bayt dizisi geçersiz"
 
-#: src/po-lex.c:465
+#: src/po-lex.c:468
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "dosya sonunda çoklu bayt dizisi tamamlanmadı"
 
-#: src/po-lex.c:475
+#: src/po-lex.c:478
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "satır sonunda çoklu bayt dizisi tamamlanmadı"
 
-#: src/po-lex.c:487
+#: src/po-lex.c:490
 msgid "iconv failure"
 msgstr "iconv başarısızlığı"
 
-#: src/po-lex.c:744
+#: src/po-lex.c:747
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "anahtar-sözcük \"%s\" bilinmiyor"
 
-#: src/po-lex.c:854
+#: src/po-lex.c:857
 #, c-format
 msgid "invalid control sequence"
 msgstr "denetim dizisi geçersiz"
 
-#: src/po-lex.c:981
+#: src/po-lex.c:984
 #, c-format
 msgid "end-of-file within string"
 msgstr "dizge içinde dosya sonu"
 
-#: src/po-lex.c:987
+#: src/po-lex.c:990
 #, c-format
 msgid "end-of-line within string"
 msgstr "dizge içinde satır sonu"
 
-#: src/po-lex.c:1008
+#: src/po-lex.c:1011
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "dizge içinde <EOT> bağlam ayracı"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:328 src/xgettext.c:907
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "bu dosya paket yönergelerini içermeyebilir"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:373
 msgid "duplicate message definition"
 msgstr "ileti iki defa tanımlanmış"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:375
 msgid "this is the location of the first definition"
 msgstr "bu ilk tanımlamanın konumu"
 
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
+#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "\"%s\" dosyası kırpılmış"
 
-#: src/read-mo.c:129
+#: src/read-mo.c:125
 #, 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:165 src/read-mo.c:274
+#: src/read-mo.c:161 src/read-mo.c:270
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "\"%s\" dosyası bir GNU .mo dosyas değil"
 
-#: src/read-mo.c:178
+#: src/read-mo.c:174
 #, 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:227
+#: src/read-properties.c:223
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "uyarı: Unicode karakter için \\uxxxx sözdizimi geçersiz"
 
-#: src/read-stringtable.c:802
+#: src/read-stringtable.c:804
 msgid "warning: unterminated string"
 msgstr "uyarı: sonlandırılmamış dizge"
 
-#: src/read-stringtable.c:810
+#: src/read-stringtable.c:812
 msgid "warning: syntax error"
 msgstr "uyarı: sözdizimi hatası"
 
-#: src/read-stringtable.c:871 src/read-stringtable.c:893
+#: src/read-stringtable.c:873 src/read-stringtable.c:895
 msgid "warning: unterminated key/value pair"
 msgstr "uyarı: sonlandırılmamış isim/değer çifti"
 
-#: src/read-stringtable.c:939
+#: src/read-stringtable.c:941
 msgid "warning: syntax error, expected ';' after string"
 msgstr "uyarı: sözdizimi hatası, dizgeden sonra ';' yok"
 
-#: src/read-stringtable.c:948
+#: src/read-stringtable.c:950
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "uyarı: sözdizimi hatası, dizgeden sonra ';' ya da '=' umuluyor"
 
-#: src/recode-sr-latin.c:116
+#: src/recode-sr-latin.c:117
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "%s ve %s tarafından yazıldı.\n"
@@ -3265,16 +2811,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:120
+#: src/recode-sr-latin.c:121
 msgid "Danilo Segan"
 msgstr "Danilo Šegan"
 
-#: src/recode-sr-latin.c:153
+#: src/recode-sr-latin.c:154
 #, 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:156
+#: src/recode-sr-latin.c:157
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
@@ -3283,27 +2829,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:339
+#: src/recode-sr-latin.c:332
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr "girdi \"%s\" kodlama için geçersiz"
 
-#: src/recode-sr-latin.c:367
+#: src/recode-sr-latin.c:349
 #, 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:159
+#: src/urlget.c:147
 #, c-format
 msgid "expected two arguments"
 msgstr "iki argüman gerekiyor"
 
-#: src/urlget.c:176
+#: src/urlget.c:164
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Kullanımı: %s [SEÇENEK] URL DOSYA\n"
 
-#: src/urlget.c:181
+#: src/urlget.c:169
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3312,132 +2858,92 @@ 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:228
-#, c-format
-msgid "error reading \"%s\""
-msgstr "\"%s\" okunurken hata"
-
-#: src/urlget.c:234
+#: src/urlget.c:216
 #, c-format
 msgid "error writing stdout"
 msgstr "standart çıktıya yazılırken hata"
 
-#: src/urlget.c:238
-#, c-format
-msgid "error after reading \"%s\""
-msgstr "\"%s\" okunduktan sonra 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:264
-#, c-format
-msgid "Retrieving %s..."
-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/urlget.c:308
-#, c-format
-msgid " timed out.\n"
-msgstr ""
-
-#: src/urlget.c:445
-#, c-format
-msgid " failed.\n"
-msgstr ""
-
-#: 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 ""
-"Belirtilen çıktı biçimi ile çok sayıda çeviri dosyası aynı dosyaya "
-"yazılamaz. PO dosyası sözdizimini kullanmayı deneyin."
-
-#: src/write-catalog.c:129
-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:162
-msgid ""
-"message catalog has context dependent translations, but the output format "
-"does not support them."
+#: src/write-catalog.c:138
+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: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 ""
-"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: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:202
-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: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:231 src/write-catalog.c:275
+#: src/write-catalog.c:195
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "\"%s\" çıktı dosyası oluşturulamıyor"
 
-#: src/write-catalog.c:239 src/write-catalog.c:283
+#: src/write-catalog.c:204
+#, no-c-format
 msgid "standard output"
 msgstr "standart çıktı"
 
-#: src/write-csharp.c:703
+#: 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
 #, c-format
 msgid "failed to create directory \"%s\""
 msgstr "\"%s\" dizini oluşturulamadı"
 
-#: src/write-csharp.c:766
+#: src/write-csharp.c:747
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
 msgstr "C# sınıfı derlenemedi, lütfen --verbose seçeneğini deneyin"
 
-#: src/write-csharp.c:768
-#, fuzzy, c-format
-msgid "compilation of C# class failed"
-msgstr "C# sınıfı derlenemedi, lütfen --verbose seçeneğini deneyin"
+#: src/write-java.c: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-java.c:1091
+#: src/write-java.c:945
 #, 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:1210
+#: src/write-java.c:1029
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
 "Java sınıfı derlenemedi, lütfen --verbose seçeneğini kullanın ya da\n"
 "$JAVAC ortam değişkenine uygun değeri atayın."
 
-#: src/write-java.c:1213
-#, fuzzy, c-format
-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-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
+#: 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-po.c:875
-#, fuzzy, c-format
-msgid ""
-"internationalized messages should not contain the '\\%c' escape sequence"
+#: src/write-po.c:567
+#, c-format
+msgid "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "i18n iletileri `\\%c' öncelem dizilerini içeremez"
 
-#: src/write-po.c:1326 src/write-po.c:1450
+#: src/write-po.c:848 src/write-po.c:961
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3450,7 +2956,7 @@ msgstr ""
 "olabilir. Salt ASCII msgctxt kullanmanız önerilir.\n"
 "%s\n"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:860 src/write-po.c:973
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3463,7 +2969,7 @@ msgstr ""
 "olabilir. Salt ASCII msgid kullanmanız önerilir.\n"
 "%s\n"
 
-#: src/write-qt.c:667
+#: src/write-qt.c:671
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
@@ -3471,35 +2977,32 @@ 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:693
+#: src/write-qt.c:697
 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:717
+#: src/write-qt.c:721
 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"
 
-#: src/write-resources.c:94
+#: src/write-resources.c:96
 #, c-format
 msgid "error while writing to %s subprocess"
 msgstr "%s alt süreçine yazarken hata"
 
-#: src/write-resources.c:131
+#: src/write-resources.c:132
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3507,7 +3010,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:150
+#: src/write-resources.c:151
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3515,7 +3018,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:157
+#: src/write-tcl.c:158
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
@@ -3523,7 +3026,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:176
+#: src/write-tcl.c:177
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
@@ -3531,7 +3034,7 @@ 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-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1059
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge"
@@ -3541,29 +3044,26 @@ msgstr "%s:%d: uyarı: sonlandırılmamış dizge"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: uyarı: sonlandırılmamış düzenli ifade"
 
-#: src/x-c.c:1051
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: uyarı: Unicode karakter geçersiz"
-
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1153 src/x-csharp.c:1501 src/x-java.c:822
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: uyarı: sonlandırılmamış karakter sabiti"
 
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1177
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
 
-#: src/x-csharp.c:224 src/xgettext.c:2106
-#, fuzzy
-msgid "Please specify the source encoding through --from-code."
+#: 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"
 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:269
+#: src/x-csharp.c:263
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3572,7 +3072,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:285
+#: src/x-csharp.c:279
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3581,7 +3081,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:297
+#: src/x-csharp.c:291
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3590,7 +3090,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:306
+#: src/x-csharp.c:300
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3599,12 +3099,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:315 src/x-javascript.c:321 src/x-python.c:374
+#: src/x-csharp.c:309 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv başarısızlığı"
 
-#: src/x-csharp.c:338
+#: src/x-csharp.c:332
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3613,42 +3113,32 @@ msgstr ""
 "%s:%d: Çokbaytlı dizilim geçersiz.\n"
 "Lütfen, kaynak kodlamasını --from-code seçeneği ile belirtiniz.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: 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:1512 src/x-java.c:875
+#: src/x-csharp.c:1504 src/x-java.c:825
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabit"
 
-#: src/x-csharp.c:2020 src/x-java.c:1369
+#: src/x-csharp.c:2008 src/x-java.c:1319
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: uyarı: '}' umulan yerde ')' var"
 
-#: src/x-csharp.c:2054 src/x-java.c:1403
+#: src/x-csharp.c:2042 src/x-java.c:1353
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: uyarı: ')' umulan yerde '}' var"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: 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:606
+#: src/x-glade.c:463
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3657,117 +3147,45 @@ msgstr ""
 "\"glade\" dili desteklenmiyor. %s expat'a bağlı.\n"
 "Bu sürüm expat olmaksızın kurgulanmış.\n"
 
-#: src/x-java.c:494
-#, fuzzy, c-format
-msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: uyarı: sonlandırılmamış dizge"
-
-#: src/x-javascript.c:230
-#, fuzzy
-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"
-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"
-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"
-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"
-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"
-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:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: uyarı: Unicode karakter geçersiz"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: uyarı: sonlandırılmamış dizge"
-
-#: src/x-perl.c:308
+#: 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ı"
+msgstr "%s:%d: EOF'dan önce hiçbir yerde \"%s\" dizge sonlandırıcısı bulunamadı"
 
-#: src/x-perl.c:1043
+#: 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:1163
+#: 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:1183
+#: 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:1217
+#: 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:1230
+#: 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:1247
+#: 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/x-python.c:278
-#, fuzzy
+#: src/x-python.c:234
+#, 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 ""
@@ -3776,7 +3194,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3788,7 +3206,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3800,7 +3218,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3812,7 +3230,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3824,7 +3242,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3836,122 +3254,97 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html adresinde belirtildiği gibi\n"
 "bir açıklama ile belirtiniz.\n"
 
-#: src/x-python.c:722
+#: 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:108
+#: src/x-rst.c:107
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: dizge ataması geçersiz"
 
-#: src/x-rst.c:172
+#: src/x-rst.c:171
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d:  # dan sonra sayı yok"
 
-#: src/x-rst.c:207
+#: 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/x-vala.c:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
+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:648
+#: 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:653
+#: 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:808
-#, fuzzy, c-format
-msgid "warning: file '%s' extension '%s' is unknown; will try C"
+#: src/xgettext.c:695
+#, c-format
+msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "uyarı: `%s' dosyası `%s' uzantısı bilinmiyor; C denenecek"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:746
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Belirtilen girdi dosyalarından çevrilebilir dizgeleri çıkartır.\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:769
 #, 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:884
+#: src/xgettext.c:771
 #, 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:886
+#: src/xgettext.c:773
 #, 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:891
+#: src/xgettext.c:778
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Girdi dosyası dilinin seçimi:\n"
 
-#: src/xgettext.c:893
-#, fuzzy, c-format
+#: src/xgettext.c:780
+#, 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, Glade)\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:900
+#: src/xgettext.c:786
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ ile aynı\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:788
 #, 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:907
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3960,243 +3353,171 @@ msgstr ""
 "      --from-code=İSİM        girdi dosyası için yerel kodlaması\n"
 "                              (Python, Tcl, Glade dışında)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:796
 #, 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:915
+#: src/xgettext.c:801
 #, 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:917
+#: src/xgettext.c:803
 #, 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:919
-#, fuzzy, c-format
+#: src/xgettext.c:805
+#, 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[=ETİTET] ETİKETli yorum bloğunu çıktı dosyasına yazar\n"
+"  -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"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:809
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Dile özel seçenekler:\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:811
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           tüm dizgeler çıkarılır\n"
 
-#: src/xgettext.c:929
-#, fuzzy, c-format
+#: src/xgettext.c:813 src/xgettext.c:820
+#, 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"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\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:937
-#, fuzzy, c-format
+#: src/xgettext.c:817
+#, 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"
+"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
+"                              WORD means not to use default keywords)\n"
 msgstr ""
-"                              (sadece bu diller: C, C++, ObjectiveC, Shell,\n"
-"                              Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                              C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"  -k, --keyword[=SÖZCÜK]      aranan ek anahtar sözcük (SÖZCÜK için öntanımlı\n"
+"                              anahtar sözcükler kullanılmamalıdır)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:824
 #, 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:945
-#, fuzzy, c-format
+#: src/xgettext.c:827
+#, 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"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\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:950
+#: src/xgettext.c:831
 #, 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:952
+#: src/xgettext.c:833
 #, 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:954
+#: src/xgettext.c:835
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt biçim dizgeleri tanınır\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:837 src/xgettext.c:841
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (sadece C++)\n"
 
-#: src/xgettext.c:958
-#, fuzzy, c-format
-msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --qt                    Qt biçim dizgeleri tanınır\n"
-
-#: src/xgettext.c:962
+#: src/xgettext.c:839
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost biçim dizgeleri tanınır\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:843
 #, 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:991
+#: src/xgettext.c:862
 #, 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:1006
+#: src/xgettext.c:877
 #, 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:1008
+#: src/xgettext.c:879
 #, 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:1010
-#, c-format
-msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr ""
-
-#: src/xgettext.c:1012
-#, fuzzy, c-format
-msgid "      --package-version=VERSION  set package version in output\n"
-msgstr "      --copyright-holder=DİZGE    çıktı için telif hakkı bilgisi\n"
-
-#: src/xgettext.c:1014
+#: src/xgettext.c:881
 #, 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=EPOSTA@ADRESİ\n"
 "                              msgid hatalarının bildirileceği adres\n"
 
-#: src/xgettext.c:1016
-#, fuzzy, c-format
-msgid ""
-"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
-"msgstr\n"
-"                                values\n"
+#: src/xgettext.c:883
+#, c-format
+msgid "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr entries\n"
 msgstr ""
 "  -m, --msgstr-prefix[=DİZGE]  msgstr girdilerinde önek olarak \"\" yerine\n"
 "                               DİZGE kullanılır\n"
 
-#: src/xgettext.c:1019
-#, fuzzy, c-format
-msgid ""
-"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
-"msgstr\n"
-"                                values\n"
+#: src/xgettext.c:885
+#, c-format
+msgid "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr entries\n"
 msgstr ""
 "  -M, --msgstr-suffix[=DİZGE]  msgstr girdilerinde sonek olarak \"\" yerine\n"
 "                               DİZGE kullanılır\n"
 
-#: src/xgettext.c:1840
+#: src/xgettext.c:1649
 #, 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:1965
+#: src/xgettext.c:1750
 msgid "standard input"
 msgstr "standart girdi"
 
-#: src/xgettext.c:2071
-#, c-format
-msgid "Non-ASCII character at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2075
-#, c-format
-msgid "Non-ASCII comment at or before %s%s."
-msgstr ""
-
-#: src/xgettext.c:2080
-#, c-format
-msgid "Non-ASCII string at %s%s."
-msgstr ""
-
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: uyarı: "
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:1933
 #, 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 "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"
 
-#: src/xgettext.c:2190
+#: src/xgettext.c:1934
 #, 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 "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
+msgstr "Böyle bildirilebilirse de %s, %s biçim dizgesi içinde geçerli değil. Sebebi: %s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:1965
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4209,7 +3530,7 @@ msgstr ""
 "Lütfen isimli argümarları destekleyen bir biçim dizgesi kullanmayı\n"
 "ve argümanlar için bir demet yerine bir eşleme yapmayı düşünün.\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2023
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4219,31 +3540,30 @@ msgstr ""
 "gettext(\"\") ile başlık girdilerindeki bilgileri\n"
 "döndürür. Boş dizge değildir.\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2626
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "anahtar sözcük '%.*s' için anlamı belirsiz argüman belirtimi"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2653
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "uyarı: anahtar sözcük '%.*s' için bağlam eksik"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2678
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "uyarı: '%.*s' anahtar sözcüğünün çoğul biçimi için bağlam eksik"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2699
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "tekil ve çoğul biçimler arasında bağlamsal çelişki"
 
-#: src/xgettext.c:3419
-#, fuzzy
+#: src/xgettext.c:2779
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
-"If you are using a 'Makevars' file, please specify\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 ""
@@ -4252,56 +3572,11 @@ msgstr ""
 "MSGID_BUGS_ADDRESS değişkenini belirtin; ya da\n"
 "bir --msgid-bugs-address seçeneği kullanın.\n"
 
-#: src/xgettext.c:3638
-#, fuzzy, c-format
-msgid "language '%s' unknown"
+#: src/xgettext.c:2978
+#, c-format
+msgid "language `%s' unknown"
 msgstr "dil `%s' bilinmiyor"
 
-#: libgettextpo/gettext-po.c:84
+#: libgettextpo/gettext-po.c:85
 msgid "<unnamed>"
 msgstr "<isimsiz>"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: kuraldışı seçenek -- %c\n"
-
-#~ msgid "DuplicateHandle failed with error code 0x%08x"
-#~ msgstr "DuplicateHandle 0x%08x hata kodu vererek başarısız oldu"
-
-#~ msgid "Multiple references to %%%c."
-#~ msgstr "%%%c için çoklu başvuru."
-
-#~ 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"
-
-#~ msgid "Not yet implemented."
-#~ msgstr "Henüz çalışmıyor."
-
-#~ 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"
-
-#~ 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"
diff --git a/gettext-tools/po/uk.po b/gettext-tools/po/uk.po
index 022070a98..9bdea19d6 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2014-05-10 13:37+0900\n"
 "PO-Revision-Date: 2014-05-10 17:41+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -16,8 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%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"
 "X-Generator: Lokalize 1.5\n"
 
 #: gnulib-lib/argmatch.c:133
@@ -200,15 +199,12 @@ msgstr "помилка запису файлу «%s»"
 #: gnulib-lib/javacomp.c:2343
 #, 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
@@ -218,7 +214,7 @@ msgstr "помилка вводу-виводу у дочірньому проц�
 
 #: 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
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "пам'ять вичерпано"
@@ -229,7 +225,7 @@ msgid "creation of threads failed"
 msgstr "спроба створення потоків обробки зазнала невдачі"
 
 #: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "не вдається записати у дочірній процес %s"
@@ -242,8 +238,7 @@ msgstr "помилка читання з дочірнього процесу %s"
 #: gnulib-lib/pipe-filter-ii.c:298
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-"не вдається встановити неблокуючий режим вводу/виводу дочірнього процесу %s"
+msgstr "не вдається встановити неблокуючий режим вводу/виводу дочірнього процесу %s"
 
 #: gnulib-lib/pipe-filter-ii.c:329
 #, c-format
@@ -326,16 +321,14 @@ msgstr "помилка при відкриванні «%s» для читанн�
 #: src/format.c:151
 #, 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-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-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
@@ -359,32 +352,22 @@ msgstr "специфікації форматів у «%s» і «%s» для а�
 #: 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.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: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
@@ -404,18 +387,13 @@ 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 ""
-"Рядок закінчується у середині директиви: знайдено «{» без відповідної дужки "
-"«}»."
+msgid "The string ends in the middle of a directive: found '{' without matching '}'."
+msgstr "Рядок закінчується у середині директиви: знайдено «{» без відповідної дужки «}»."
 
 #: src/format-csharp.c:139
 #, 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
 #, c-format
@@ -423,12 +401,8 @@ 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 ""
-"Рядок починається в середині директиви: знайдено «}» без відповідної дужки "
-"«{»."
+msgid "The string starts in the middle of a directive: found '}' without matching '{'."
+msgstr "Рядок починається в середині директиви: знайдено «}» без відповідної дужки «{»."
 
 #: src/format-csharp.c:162
 #, c-format
@@ -443,25 +417,17 @@ 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
@@ -498,50 +464,33 @@ 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
@@ -550,11 +499,8 @@ 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 ""
-"У директиві з номером %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
@@ -563,18 +509,13 @@ 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
@@ -583,17 +524,12 @@ 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
@@ -603,37 +539,22 @@ 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
 #, 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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -663,18 +584,13 @@ msgstr "У директиві з номером %u, вказано обидва
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr ""
-"У директиві з номером %u, '~;' використовується у неправильній позиції."
+msgstr "У директиві з номером %u, '~;' використовується у неправильній позиції."
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
@@ -692,12 +608,8 @@ msgstr "специфікації формату у «%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
@@ -707,11 +619,8 @@ msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "специфікація формату для аргументу «%s» не існує у «%s»"
 
 #: 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
@@ -720,30 +629,22 @@ 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: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
@@ -763,46 +664,30 @@ msgstr "У директиві з номером %u «%c» не може розп
 
 #: 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 у визначенні форматування не можна використовувати "
-"більший рівень вкладеності."
+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 вказано незавершену інструкцію щодо форматування."
+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 назвою."
 
 #: 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."
@@ -810,16 +695,12 @@ 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."
+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:355 src/msgcat.c:294 src/msgcmp.c:172
@@ -893,12 +774,10 @@ msgstr "  -s, --short                 коротка назва вузла\n"
 #: src/hostname.c:222
 #, 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:225
@@ -984,10 +863,8 @@ msgstr ""
 #: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 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
@@ -1007,19 +884,14 @@ msgstr "  ВХІДНИЙ_ФАЙЛ                вхідний файл PO\n"
 #: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
 #: src/xgettext.c:875
 #, 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/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
@@ -1044,8 +916,7 @@ 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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
@@ -1055,29 +926,23 @@ 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              видалити повідомлення, позначені як 'fuzzy'\n"
+msgstr "      --no-fuzzy              видалити повідомлення, позначені як 'fuzzy'\n"
 
 #: 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:460
 #, c-format
@@ -1102,8 +967,7 @@ msgstr "      --set-fuzzy             позначити всі повідомл
 #: 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:471
 #, c-format
@@ -1113,8 +977,7 @@ msgstr "      --set-obsolete          позначити всі повідомл
 #: 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:475
 #, c-format
@@ -1122,40 +985,28 @@ 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: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: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: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"
-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:486
 #, c-format
@@ -1164,10 +1015,8 @@ 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
@@ -1180,20 +1029,14 @@ 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:393 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:395 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
@@ -1210,41 +1053,33 @@ msgstr "Подробиці виводу:\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"
+"                              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: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
 #, 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:578 src/msgunfmt.c:505 src/msguniq.c:389
 #: src/xgettext.c:977
 #, 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: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
 #, 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"
@@ -1260,34 +1095,25 @@ msgstr "      --force-po              записувати файл PO, наві
 #: src/xgettext.c:983
 #, 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
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr ""
-"      --no-location           не записувати рядки '#: назва_файлу:рядок'\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
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
 #: src/xgettext.c:989
 #, 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: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
@@ -1300,10 +1126,8 @@ msgstr "  -p, --properties-output     записати файл Java .properties
 #: 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
 #, 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: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
@@ -1335,8 +1159,7 @@ msgstr "  -s, --sort-output           сортувати вивід\n"
 #: src/xgettext.c:1002
 #, 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
 #, c-format
@@ -1393,8 +1216,7 @@ 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"
 
@@ -1404,8 +1226,7 @@ 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"
 
@@ -1421,10 +1242,8 @@ msgstr ""
 #: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
 #: src/msgmerge.c:562
 #, 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:564
@@ -1453,11 +1272,8 @@ msgstr ""
 
 #: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
 #, 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:178 src/msgcomm.c:291 src/msgmerge.c:359
@@ -1513,18 +1329,13 @@ msgstr "Модифікатори режиму роботи:\n"
 
 #: src/msgcmp.c:241 src/msgmerge.c:553
 #, 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:555
 #, 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:245
 #, c-format
@@ -1566,7 +1377,7 @@ msgstr "це повідомлення використовується, але �
 msgid "warning: this message is not used"
 msgstr "попередження: це повідомлення не використовується"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1612,10 +1423,8 @@ msgstr ""
 
 #: src/msgcomm.c:452 src/xgettext.c:1004
 #, 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
@@ -1646,11 +1455,8 @@ msgstr "      --no-location           не виводити '#: filename:line' �
 #: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
 #: src/msgmerge.c:588
 #, 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:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
 #: src/msgmerge.c:590
@@ -1760,8 +1566,7 @@ 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
@@ -1771,33 +1576,25 @@ msgstr "Корисні ПАРАМЕТРИ-ФІЛЬТРУ якщо ФІЛЬТР �
 
 #: src/msgfilter.c:442
 #, 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
 #, 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:447
 #, 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:465 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:471 src/msggrep.c:606
 #, c-format
@@ -1806,11 +1603,8 @@ msgstr "      --indent                стиль виводу з відступ�
 
 #: src/msgfilter.c:473
 #, 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
 #, c-format
@@ -1931,20 +1725,13 @@ msgstr "Режим роботи:\n"
 
 #: src/msgfmt.c:799
 #, 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
 #, 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
 #, c-format
@@ -1953,19 +1740,13 @@ msgstr "      --csharp                режим C#: створює файли .
 
 #: src/msgfmt.c:805
 #, c-format
-msgid ""
-"      --csharp-resources      C# resources mode: generate a .NET .resources "
-"file\n"
-msgstr ""
-"      --csharp-resources      режим C# ресурсів: створює файл .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:807
 #, c-format
-msgid ""
-"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr ""
-"      --tcl                   режим Tcl: створює файл tcl/msgcat .msg\n"
+msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr "      --tcl                   режим Tcl: створює файл tcl/msgcat .msg\n"
 
 #: src/msgfmt.c:809
 #, c-format
@@ -1974,23 +1755,18 @@ msgstr "      --qt                    режим Qt: створює файл Qt
 
 #: src/msgfmt.c:811
 #, 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:818
 #, 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
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
-msgstr ""
-"Якщо як файл виводу вказано -, вивід відбуватиметься у стандартний вивід.\n"
+msgstr "Якщо як файл виводу вказано -, вивід відбуватиметься у стандартний вивід.\n"
 
 #: src/msgfmt.c:823
 #, c-format
@@ -2005,30 +1781,23 @@ 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
 #, 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:829
 #, 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:831
 #, 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
 #, 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 ""
@@ -2043,12 +1812,8 @@ msgstr "Розташування вхідного файлу у режимі C#:
 
 #: src/msgfmt.c:845 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
 #, c-format
@@ -2067,17 +1832,14 @@ msgstr "Розташування вхідного файлу у режимі Tcl
 #: src/msgfmt.c:855 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:857
 #, 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
 #, c-format
@@ -2087,9 +1849,7 @@ msgstr "Параметри режиму запису desktop:\n"
 #: src/msgfmt.c:867
 #, 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
 #, c-format
@@ -2108,8 +1868,7 @@ msgstr ""
 #: src/msgfmt.c:874
 #, 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"
@@ -2125,27 +1884,20 @@ msgstr "Інтерпретація вхідного файлу:\n"
 #, 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:891
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr ""
-"      --check-format          перевірити залежний від мови формат рядків\n"
+msgstr "      --check-format          перевірити залежний від мови формат рядків\n"
 
 #: src/msgfmt.c:893
 #, 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
 #, c-format
@@ -2153,28 +1905,21 @@ 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
 #, 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:900
 #, 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:903
@@ -2184,31 +1929,23 @@ msgstr "  -f, --use-fuzzy             виводити елементи нето
 
 #: src/msgfmt.c:908
 #, 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
 #, 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:913
 #, 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
 #, c-format
@@ -2248,9 +1985,7 @@ msgstr "назва домену «%s» не може використовува�
 #: src/msgfmt.c:1081
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr ""
-"назва домену «%s» не може використовуватись як назва файлу: буде використано "
-"префікс"
+msgstr "назва домену «%s» не може використовуватись як назва файлу: буде використано префікс"
 
 #: src/msgfmt.c:1095
 #, c-format
@@ -2272,12 +2007,12 @@ msgstr "елемент з нечітким перекладом «msgstr» пр�
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: попередження: вихідний файл містить нечіткий переклад"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1306
 #, c-format
 msgid "%s does not exist"
 msgstr "%s не існує"
 
-#: src/msgfmt.c:1328
+#: src/msgfmt.c:1316
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "%s існує, але непридатний до читання"
@@ -2296,12 +2031,8 @@ 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
@@ -2389,11 +2120,8 @@ msgstr ""
 
 #: 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:623
 #, c-format
@@ -2446,8 +2174,7 @@ msgstr "  -i, --input=ВХІДНИЙ_ФАЙЛ    вхідний POT файл\n"
 #: src/msginit.c:379
 #, 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"
@@ -2464,8 +2191,7 @@ 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
@@ -2475,10 +2201,8 @@ msgstr "  -l, --locale=LL_CC          встановити цільову лок
 
 #: src/msginit.c:402
 #, 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:468
 msgid ""
@@ -2510,14 +2234,11 @@ msgstr "процес-нащадок %s завершився аварійно з
 
 #: src/msginit.c:1118
 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"
@@ -2542,18 +2263,13 @@ msgstr "у вхідному файлі два різні кодування «%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
 #, c-format
@@ -2579,8 +2295,7 @@ msgstr ""
 #: src/msgl-cat.c:449
 #, 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 ""
@@ -2598,8 +2313,7 @@ msgid ""
 msgstr ""
 "Перетворення файлу %s з кодування %s у кодування %s\n"
 "змінить деякі поля msgids чи msgctxts.\n"
-"Або перетворіть усі поля msgids msgctxts у кодування ASCII, або перевірте, "
-"що\n"
+"Або перетворіть усі поля msgids msgctxts у кодування ASCII, або перевірте, що\n"
 "вони вже у кодуванні UTF-8, тобто у файлах з текстом програми.\n"
 
 #: src/msgl-charset.c:93
@@ -2662,9 +2376,7 @@ msgstr "розширення множинних форм можуть дават
 #: src/msgl-check.c:141
 #, 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
 msgid "plural expression can produce division by zero"
@@ -2672,16 +2384,11 @@ msgstr "розширення множинних форм можуть призв
 
 #: src/msgl-check.c:192
 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 ""
-"розширення множинних форм можуть призводити до арифметичних виключних "
-"ситуацій, можливе ділення на нуль"
+msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
+msgstr "розширення множинних форм можуть призводити до арифметичних виключних ситуацій, можливе ділення на нуль"
 
 #: src/msgl-check.c:266
 #, c-format
@@ -2730,23 +2437,17 @@ 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=ВИРАЗ;\""
+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
 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
 #, 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
 msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
@@ -2774,17 +2475,17 @@ msgstr "обробка множинних форм є розширенням GNU
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "у msgstr відсутній символ клавішного акселератора «%c»"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr містить надто багато символів клавішних акселераторів «%c»"
 
-#: src/msgl-check.c:804
+#: src/msgl-check.c:801
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "поле заголовка «%s» все ще містить початкове типове значення\n"
 
-#: src/msgl-check.c:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "у заголовку немає поля «%s»\n"
@@ -2806,31 +2507,19 @@ 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
 #, 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
 #, 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:302 src/x-python.c:672
 #: src/xgettext.c:727
 #, 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:392 src/msgmerge.c:398
 #, c-format
@@ -2910,15 +2599,12 @@ msgstr "      --backup=КОНТРОЛЬ       зробити резервну к
 #: src/msgmerge.c:537
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr ""
-"      --suffix=СУФІКС         перевизначити звичайний суфікс резервної "
-"копії\n"
+msgstr "      --suffix=СУФІКС         перевизначити звичайний суфікс резервної копії\n"
 
 #: src/msgmerge.c:539
 #, 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"
@@ -2929,28 +2615,22 @@ msgstr ""
 "середовища VERSION_CONTROL.  Ось можливі значення:\n"
 "  none, off       не робити резервних копій (навіть якщо вказано --backup)\n"
 "  numbered, t     робити резервні копії з номерами\n"
-"  existing, nil   нумеровані, якщо є нумеровані резервні копії, інакше - "
-"прості\n"
+"  existing, nil   нумеровані, якщо є нумеровані резервні копії, інакше - прості\n"
 "  simple, never   завжди використовувати прості резервні копії\n"
 
 #: src/msgmerge.c:546
 #, 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:557
 #, 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:614 src/urlget.c:192
 #, c-format
@@ -2969,12 +2649,8 @@ msgstr "це повідомлення не повинно визначати м�
 
 #: src/msgmerge.c:2035
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2999,34 +2675,23 @@ 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
 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: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: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
@@ -3041,13 +2706,11 @@ msgstr "Розташування вхідних файлів у Java режим�
 #: 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:467
 #, c-format
@@ -3080,14 +2743,12 @@ msgstr ""
 #: 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"
+msgstr "      --strict                виводити у точній відповідності до uniforum\n"
 
 #: src/msguniq.c:331
 #, c-format, no-wrap
@@ -3117,12 +2778,8 @@ 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
@@ -3178,8 +2835,7 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 "Кодування у заголовку відсутнє.\n"
-"Перетворення повідомлення у вказане користувачем кодування може не "
-"працювати.\n"
+"Перетворення повідомлення у вказане користувачем кодування може не працювати.\n"
 
 #: src/po-gram-gen.y:93
 #, c-format
@@ -3404,46 +3060,24 @@ 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 синтаксис."
+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 ""
-"Не можна виводити декілька доменів перекладу у єдиний файл з вказаним "
-"форматом виводу."
+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 ""
-"каталог повідомлень містить залежний від контексту переклад, але контексти "
-"не підтримуються форматом виводу."
+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\", "
-"замість створення файлу властивостей."
+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:202
-msgid ""
-"message catalog has plural form translations, but the output format does not "
-"support them."
-msgstr ""
-"каталог повідомлень має переклад з множинними формами, але формат виводу їх "
-"не підтримує."
+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
 #, c-format
@@ -3477,14 +3111,12 @@ msgstr "не є правильною назвою класу Java: %s"
 #: src/write-java.c:1210
 #, 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
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr ""
-"помилка при компіляції класу Java, спробуйте встановити значення $JAVAC"
+msgstr "помилка при компіляції класу Java, спробуйте встановити значення $JAVAC"
 
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
@@ -3493,13 +3125,10 @@ msgstr "помилка при відкриванні «%s» для запису"
 
 #: src/write-po.c:875
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1326 src/write-po.c:1455
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3512,7 +3141,7 @@ msgstr ""
 "вашого кодування символів. Використовуйте лише ASCII символи у msgctxt.\n"
 "%s\n"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1338 src/write-po.c:1467
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3535,15 +3164,12 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"каталог повідомлень має msgctxt рядки з символи за межами кодування "
-"ISO-8859-1\n"
-"але формат каталогу повідомлень Qt підтримує Юнікод лише у полях "
-"перекладених\n"
+"каталог повідомлень має msgctxt рядки з символи за межами кодування ISO-8859-1\n"
+"але формат каталогу повідомлень Qt підтримує Юнікод лише у полях перекладених\n"
 "рядків, а не у рядках контексту\n"
 
 #: src/write-qt.c:717
@@ -3552,10 +3178,8 @@ msgid ""
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"каталог повідомлень має msgid рядки з символи за межами кодування "
-"ISO-8859-1\n"
-"але формат каталогу повідомлень Qt підтримує Юнікод лише у перекладених "
-"рядках\n"
+"каталог повідомлень має msgid рядки з символи за межами кодування ISO-8859-1\n"
+"але формат каталогу повідомлень Qt підтримує Юнікод лише у перекладених рядках\n"
 
 #: src/write-resources.c:94
 #, c-format
@@ -3701,8 +3325,7 @@ msgstr "Для рядка, видобутого з елемента «%s», не
 #: src/x-glade.c:417
 #, c-format
 msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-"У коректному файлі Glade не можна використовувати кореневий елемент <%s>"
+msgstr "У коректному файлі Glade не можна використовувати кореневий елемент <%s>"
 
 #: src/x-glade.c:572 src/x-glade.c:579
 #, c-format
@@ -3907,12 +3530,8 @@ 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"
+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:413
 #, c-format
@@ -3922,16 +3541,12 @@ msgstr "%s:%d: попередження: літерал формального �
 #: src/xgettext.c:545
 #, 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:648
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
-msgstr ""
-"--join-existing не може використовуватись, якщо вивід направляється у "
-"стандартний вивід"
+msgstr "--join-existing не може використовуватись, якщо вивід направляється у стандартний вивід"
 
 #: src/xgettext.c:653
 #, c-format
@@ -3941,8 +3556,7 @@ msgstr "xgettext не може працювати без вказаних клю
 #: src/xgettext.c:808
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr ""
-"попередження: у файлі «%s» невідоме розширення «%s»; спроба використати C"
+msgstr "попередження: у файлі «%s» невідоме розширення «%s»; спроба використати C"
 
 #: src/xgettext.c:859
 #, c-format
@@ -3951,12 +3565,8 @@ msgstr "Витягує рядки для перекладу з вказаних
 
 #: 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=НАЗВА  виводити у файл НАЗВА.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:884
 #, c-format
@@ -3965,11 +3575,8 @@ msgstr "  -o, --output=ФАЙЛ           записувати вивід у в�
 
 #: src/xgettext.c:886
 #, 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:891
 #, c-format
@@ -3980,20 +3587,16 @@ msgstr "Вибір мови вхідного файлу:\n"
 #, 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"
+"                                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"
+"                                (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"
 
@@ -4004,9 +3607,7 @@ msgstr "  -C, --c++                   скорочення для --language=C++
 
 #: src/xgettext.c:902
 #, 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:907
@@ -4026,30 +3627,24 @@ msgstr "Типово, вважається, що вхідні файли у ко
 #: src/xgettext.c:915
 #, 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:917
 #, 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:919
 #, 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:925
@@ -4066,14 +3661,12 @@ msgstr "  -a, --extract-all           витягнути усі рядки\n"
 #, 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"
 
@@ -4081,22 +3674,19 @@ msgstr ""
 #, 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:942
 #, 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"
@@ -4106,22 +3696,19 @@ msgstr ""
 #, 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:950
 #, 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:952
 #, c-format
@@ -4150,10 +3737,8 @@ msgstr "      --boost                 розпізнавати рядки у ф�
 
 #: src/xgettext.c:966
 #, 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:991
 #, c-format
@@ -4167,63 +3752,46 @@ msgstr "      --copyright-holder=РЯДОК  встановити власник
 
 #: src/xgettext.c:1008
 #, 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:1010
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr ""
-"      --package-name=ПАКУНОК  встановити назву пакунка у виведених даних\n"
+msgstr "      --package-name=ПАКУНОК  встановити назву пакунка у виведених даних\n"
 
 #: src/xgettext.c:1012
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
-msgstr ""
-"      --package-version=ВЕРСІЯ   встановити версію пакунка у виведених "
-"даних\n"
+msgstr "      --package-version=ВЕРСІЯ   встановити версію пакунка у виведених даних\n"
 
 #: src/xgettext.c:1014
 #, 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:1016
 #, 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:1019
 #, 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:1840
 #, c-format
-msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
-"%s"
-msgstr ""
-"Аргумент --flag не підтримує синтаксис <ключове_слово>:<argnum>:"
-"[pass-]<flag>: %s"
+msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
+msgstr "Аргумент --flag не підтримує синтаксис <ключове_слово>:<argnum>:[pass-]<flag>: %s"
 
 #: src/xgettext.c:1965
 msgid "standard input"
@@ -4251,21 +3819,13 @@ 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
@@ -4303,9 +3863,7 @@ msgstr "попередження: відсутній контекст для к�
 #: src/xgettext.c:3031
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr ""
-"попередження: відсутній контекст для множинного аргументу ключового слова "
-"'%.*s'"
+msgstr "попередження: відсутній контекст для множинного аргументу ключового слова '%.*s'"
 
 #: src/xgettext.c:3052
 #, c-format
@@ -4350,16 +3908,12 @@ 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"
+#~ "коді. Не надається НІЯКОЇ гарантії; навіть гарантії КОМЕРЦІЙНОЇ ПРИДАТНОСТІ\n"
 #~ "або ПРИДАТНОСТІ ДО ПЕВНОЇ МЕТИ.\n"
 
 #~ msgid "Not yet implemented."
diff --git a/gettext-tools/po/vi.po b/gettext-tools/po/vi.po
index 98ddb38cb..aecce4fa8 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-rc1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2014-05-10 13:37+0900\n"
 "PO-Revision-Date: 2014-05-11 07:45+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -179,16 +179,12 @@ msgstr "%s: tùy chọn “-W %s” yêu cầu một đối số\n"
 #: gnulib-lib/javacomp.c:156
 #, 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:171 gnulib-lib/javacomp.c:192
 #, 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: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
@@ -206,8 +202,7 @@ msgstr "gặp lỗi khi ghi tập tin “%s”"
 #: gnulib-lib/javacomp.c:2343
 #, 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
@@ -222,7 +217,7 @@ msgstr "%s lỗi V/R tiến trình con"
 
 #: 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
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "cạn bộ nhớ"
@@ -233,7 +228,7 @@ msgid "creation of threads failed"
 msgstr "việc tạo tuyến trình gặp lỗi"
 
 #: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "gặp lỗi khi ghi vào tiến trình phụ %s"
@@ -329,19 +324,15 @@ msgstr "gặp lỗi khi mở “%s” để đọc"
 #: src/format.c:151
 #, 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-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-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: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
@@ -359,24 +350,17 @@ msgstr "một đặc tả định dạng cho đối số %u cũng không tồn t
 #: 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: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.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:39
 #, c-format
@@ -386,8 +370,7 @@ msgstr "Trong chỉ thị số %u, thẻ bài nằm sau “<” không có “>�
 #: 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:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
 #: src/format-javascript.c:215 src/format-python.c:515
@@ -407,29 +390,21 @@ 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:130 src/format-java.c:191
-msgid ""
-"The string ends in the middle of a directive: found '{' without matching '}'."
+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:139
 #, 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:140
 #, 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:161 src/format-java.c:346
-msgid ""
-"The string starts in the middle of a directive: found '}' without matching "
-"'{'."
+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:162
@@ -449,18 +424,13 @@ 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
@@ -497,61 +467,42 @@ 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: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:251 src/format-java.c:285 src/format-java.c:314
@@ -561,18 +512,13 @@ msgstr "Trong chỉ thị số %u, “%s” không cho phép dấu phẩy đi th
 
 #: 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: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:572
 #, c-format
@@ -581,19 +527,13 @@ msgstr "trong chỉ thị số %u, có một lựa chọn không chứa con số
 
 #: 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: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:756
 #, c-format
@@ -602,31 +542,20 @@ msgstr "đặc tả định dạng cho đối số {%u} không tồn tại trong
 
 #: 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-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 ""
-"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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
 #, c-format
@@ -656,11 +585,8 @@ msgstr "Trong chỉ thị số %u, cả hai dấu sửa đổi “@” và “:�
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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:3326 src/format-scheme.c:3263
 #, c-format
@@ -669,9 +595,7 @@ msgstr "Trong chỉ thị số %u, “~;” được dùng ở vị trí không
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 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:3474 src/format-scheme.c:3397
 #, c-format
@@ -681,17 +605,12 @@ msgstr "đặc tả định dạng trong “%s” và “%s” không phải tư
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, 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.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-perl-brace.c:199 src/format-python.c:471
 #: src/format-python-brace.c:434 src/format-python-brace.c:447
@@ -701,49 +620,33 @@ 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-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: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-python-brace.c:137
 #, c-format
@@ -753,9 +656,7 @@ msgstr "Trong chỉ thị số %u, “%c” không thể bắt đầu bằng m�
 #: src/format-python-brace.c:150
 #, 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:165
 #, c-format
@@ -764,11 +665,8 @@ msgstr "Trong chỉ thị số %u, “%c” không thể bắt đầu bằng m�
 
 #: src/format-python-brace.c:185
 #, 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:270
 #, c-format
@@ -777,31 +675,20 @@ msgstr "Trong chỉ thị số %u, có một chỉ thị định dạng chưa đ
 
 #: 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: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: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."
+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: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."
+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:85
 msgid "The string refers to a shell variable with an empty name."
@@ -809,16 +696,12 @@ msgstr "Chuỗi tham chiếu đến biến hệ vỏ có tên rỗng."
 
 #: 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: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."
 
 #: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
@@ -893,8 +776,7 @@ msgstr "  -s, --short                 tên máy ngắn\n"
 #: src/hostname.c:222
 #, 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"
@@ -944,8 +826,7 @@ msgstr "  -V, --version               xuất thông tin phiên bản rồi thoá
 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"
+"Hãy thông báo lỗi dịch nào cho <http://translationproject.org/team/vi.html>.\n"
 
 #: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
@@ -986,11 +867,8 @@ msgstr ""
 #: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 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: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
@@ -1010,8 +888,7 @@ msgstr "  TẬP_TIN_ĐẦU_VÀO             tập tin PO đầu vào\n"
 #: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
 #: src/xgettext.c:875
 #, 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"
@@ -1020,8 +897,7 @@ msgstr ""
 #: 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: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
@@ -1056,15 +932,12 @@ msgstr "Chọn chuỗi:\n"
 
 #: 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: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"
@@ -1104,8 +977,7 @@ msgstr "      --set-fuzzy             đặt mọi chuỗi là “fuzzy” (tạ
 #: 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:471
 #, c-format
@@ -1123,38 +995,31 @@ 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: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: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"
 "                               (tạm dịch), xóa trống chuỗi này\n"
 
 #: 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: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"
@@ -1162,16 +1027,12 @@ msgstr ""
 #: 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: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: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
@@ -1184,8 +1045,7 @@ msgstr "Cú pháp tập tin đầu vào:\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:393 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"
@@ -1193,9 +1053,7 @@ 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
 #, 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"
@@ -1215,13 +1073,11 @@ msgstr "Chi tiết kết xuất:\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"
+"                              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"
@@ -1241,18 +1097,14 @@ msgstr ""
 #: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
 #: src/xgettext.c:977
 #, 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: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
 #, 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"
@@ -1262,8 +1114,7 @@ msgstr ""
 #: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
 #, 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:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
 #: src/xgettext.c:983
@@ -1275,43 +1126,34 @@ msgstr "  -i, --indent                ghi ra tập tin PO có thụt lề\n"
 #: src/xgettext.c:985
 #, 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:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
 #: src/xgettext.c:987
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
 #: src/xgettext.c:989
 #, 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: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
 #, 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: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
 #, 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"
@@ -1321,8 +1163,7 @@ msgstr ""
 #: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
 #, 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"
+msgstr "  -w, --width=SỐ                        đặt chiều rộng của trang kết xuất\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:416
@@ -1332,8 +1173,7 @@ 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:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
@@ -1393,9 +1233,7 @@ 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:873
 #, 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:325 src/msgfmt.c:794
 #: src/xgettext.c:877
@@ -1418,8 +1256,7 @@ msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
-"  ->, --more-than=SỐ                 in ra các chuỗi có nhiều hơn SỐ các "
-"lời\n"
+"  ->, --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
@@ -1428,15 +1265,13 @@ 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:252 src/msgcomm.c:411 src/msgfmt.c:880
 #: src/msgmerge.c:562
 #, 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"
@@ -1467,11 +1302,8 @@ msgstr ""
 
 #: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
 #, 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.
@@ -1520,9 +1352,7 @@ msgstr "  cũ.po                       bản dịch cũ\n"
 #: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
-msgstr ""
-"  mới.pot                     mẫu dùng để tham chiếu (được tạo bởi "
-"xgettext)\n"
+msgstr "  mới.pot                     mẫu dùng để tham chiếu (được tạo bởi xgettext)\n"
 
 #: src/msgcmp.c:239 src/msgmerge.c:551
 #, c-format
@@ -1531,12 +1361,8 @@ msgstr "Sửa đổi thao tác:\n"
 
 #: src/msgcmp.c:241 src/msgmerge.c:553
 #, 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:243 src/msgmerge.c:555
 #, c-format
@@ -1583,7 +1409,7 @@ msgstr "chuỗi này được dùng còn chưa được định nghĩa trong %s"
 msgid "warning: this message is not used"
 msgstr "cảnh báo: chuỗi này không được dùng"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1626,10 +1452,8 @@ msgstr ""
 
 #: src/msgcomm.c:452 src/xgettext.c:1004
 #, 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:311
 #, c-format
@@ -1655,17 +1479,13 @@ msgstr "  -i, --indent                thụt lề cho kết xuất\n"
 #: src/msgmerge.c:586
 #, 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:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
 #: src/msgmerge.c:588
 #, 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:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
 #: src/msgmerge.c:590
@@ -1777,8 +1597,7 @@ 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:440
@@ -1788,17 +1607,13 @@ msgstr "TÙY CHỌN LỌC hữu ích khi BỘ LỌC là “sed”:\n"
 
 #: src/msgfilter.c:442
 #, 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:444
 #, 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"
@@ -1807,14 +1622,12 @@ msgstr ""
 
 #: src/msgfilter.c:447
 #, 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:465 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"
@@ -1826,11 +1639,8 @@ msgstr "      --indent                kiểu dáng kết xuất đã thụt lề
 
 #: src/msgfilter.c:473
 #, 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/msgfmt.c:345
 #, c-format
@@ -1946,18 +1756,14 @@ msgstr "Chế độ thao tác:\n"
 
 #: src/msgfmt.c:799
 #, 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:801
 #, 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"
@@ -1965,46 +1771,34 @@ msgstr ""
 #: src/msgfmt.c:803
 #, 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:805
 #, 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:807
 #, 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:809
 #, 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:811
 #, 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:818
 #, 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:820 src/xgettext.c:888
 #, c-format
@@ -2024,33 +1818,25 @@ msgstr "  -r, --resource=TÀI_NGUYÊN   tên của tài nguyên\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
 #, 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:829
 #, 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:831
 #, 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:833
 #, 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 ""
@@ -2065,9 +1851,7 @@ msgstr "Vị trí của tập tin xuất trong chế độ C#:\n"
 
 #: src/msgfmt.c:845 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"
@@ -2090,8 +1874,7 @@ msgstr "Vị trí của tập tin xuất trong chế độ Tcl:\n"
 #: src/msgfmt.c:855 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:857
 #, c-format
@@ -2129,12 +1912,10 @@ msgstr ""
 #: src/msgfmt.c:874
 #, 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:886 src/xgettext.c:905
@@ -2146,8 +1927,7 @@ msgstr "Giải thích tập tin đầu vào:\n"
 #, 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"
@@ -2163,11 +1943,8 @@ msgstr ""
 
 #: src/msgfmt.c:893
 #, 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:895
 #, c-format
@@ -2180,9 +1957,7 @@ msgstr ""
 
 #: src/msgfmt.c:898
 #, 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"
@@ -2190,8 +1965,7 @@ msgstr ""
 #: src/msgfmt.c:900
 #, 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"
@@ -2204,32 +1978,23 @@ msgstr "  -f, --use-fuzzy             dùng mục tin tạm dịch trong kết x
 
 #: src/msgfmt.c:908
 #, 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:910
 #, 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:913
 #, 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:922
 #, c-format
@@ -2259,8 +2024,7 @@ msgstr "cảnh báo: phần đầu tập tin PO thiếu thông tin\n"
 #: src/msgfmt.c:1052
 #, 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"
+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:1076
 #, c-format
@@ -2292,12 +2056,12 @@ msgstr "chuỗi “msgstr” tạm dịch bị bỏ qua"
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: cảnh báo: tập tin nguồn chứa chuỗi tạm dịch"
 
-#: src/msgfmt.c:1318
+#: src/msgfmt.c:1306
 #, c-format
 msgid "%s does not exist"
 msgstr "%s không tồn tại"
 
-#: src/msgfmt.c:1328
+#: src/msgfmt.c:1316
 #, c-format
 msgid "%s exists but cannot read"
 msgstr "có %s nhưng không thể đọc nó"
@@ -2316,12 +2080,8 @@ msgstr "gặp lỗi khi đọc “%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 ""
-"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:521
 #, c-format, no-wrap
@@ -2417,8 +2177,7 @@ 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                dùng ký tự thoát dạng C trong kết xuất,\n"
 "                              không có ký tự đã mở rộng\n"
@@ -2431,8 +2190,7 @@ msgstr "      --sort-output           tạo ra kết xuất được sắp xếp
 #: 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:297
 msgid ""
@@ -2478,12 +2236,10 @@ msgstr "  -i, --input=TẬP_TIN_ĐẦU_VÀO tập tin dạng POT đầu vào\n"
 #: src/msginit.c:379
 #, 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:385
@@ -2508,8 +2264,7 @@ msgstr "  -l, --locale=NN_QQ          đặt miền địa phương đích (v.d.
 
 #: src/msginit.c:402
 #, 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:468
@@ -2542,16 +2297,13 @@ msgstr "tiến trình con %s bị lỗi với mã thoát %d"
 
 #: src/msginit.c:1118
 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 ...",
@@ -2573,17 +2325,13 @@ msgstr "tập tin đầu vào chứa hai bộ ký tự khác nhau “%s” và �
 
 #: 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: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:391 src/msgl-iconv.c:375
 #, c-format
@@ -2609,16 +2357,13 @@ msgstr ""
 #: src/msgl-cat.c:449
 #, 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:488
 #, c-format
@@ -2705,12 +2450,8 @@ 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:197
-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:266
 #, c-format
@@ -2723,15 +2464,11 @@ msgstr "catalog bản dịch chứa bản dịch dạng số nhiều"
 
 #: src/msgl-check.c:360
 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:384
 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:420
 msgid "invalid nplurals value"
@@ -2760,12 +2497,9 @@ 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:514
-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;\""
@@ -2798,26 +2532,24 @@ msgstr "cả hai mục tin “msgid” và “msgstr” đều không kết thú
 
 #: src/msgl-check.c:687
 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:729
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "chuỗi dịch msgstr còn thiếu ký tự phím tắt “%c”"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "chuỗi dịch msgstr có quá nhiều ký tự phím tắt “%c”"
 
-#: src/msgl-check.c:804
+#: src/msgl-check.c:801
 #, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "trường “%s” ở phần vẫn có giá trị khởi tạo mặc định (sửa đi)\n"
 
-#: src/msgl-check.c:820
+#: src/msgl-check.c:816
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "trường “%s” còn thiếu trong phần đầu\n"
@@ -2830,8 +2562,7 @@ msgstr "%s: đầu vào không đúng trong bảng mã ký tự “%s”"
 #: 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
 msgid "input file doesn't contain a header entry with a charset specification"
@@ -2840,31 +2571,19 @@ msgstr "tập tin đầu vào không chứa mục tin phần đầu xác định
 #: 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
 #, 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
 #, 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:302 src/x-python.c:672
 #: src/xgettext.c:727
 #, 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:392 src/msgmerge.c:398
 #, c-format
@@ -2915,8 +2634,7 @@ 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:519
@@ -2946,14 +2664,12 @@ msgstr "      --backup=ĐIỀU_KHIỂN     sao lưu tập tin cũ.po (_sao lưu_
 #: src/msgmerge.c:537
 #, 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:539
 #, 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"
@@ -2976,8 +2692,7 @@ msgstr ""
 #: src/msgmerge.c:546
 #, 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"
@@ -2985,11 +2700,8 @@ msgstr ""
 
 #: src/msgmerge.c:557
 #, 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:614 src/urlget.c:192
 #, c-format
@@ -3008,12 +2720,8 @@ msgstr "chuỗi này không nên dùng ở dạng thức số nhiều"
 
 #: src/msgmerge.c:2035
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -3034,14 +2742,11 @@ msgstr "Cách dùng: %s [TÙY_CHỌN] [TẬP_TIN]...\n"
 #: 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: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"
@@ -3055,17 +2760,14 @@ 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 ""
 "      --csharp-resources      chế độ tài nguyên C#: đầu vào là tập tin\n"
 "                             .resources kiểu .NET\n"
 
 #: 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"
@@ -3083,8 +2785,7 @@ msgstr "vị trí của tập tin đầu vào trong chế độ 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 ""
 "Tên lớp được quyết định bằng cách phụ thêm tên miền địa phương\n"
@@ -3128,8 +2829,7 @@ msgstr "  -i, --indent                ghi kết xuất kiểu thụt lề (_th�
 #: 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:331
 #, c-format, no-wrap
@@ -3160,9 +2860,7 @@ msgstr "  -d, --repeated              in ra chỉ bản sao (trùng nhau)\n"
 
 #: 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                chỉ in ra chuỗi duy nhất, hủy các bản sao\n"
 "                              (trùng nhau)\n"
@@ -3359,8 +3057,7 @@ msgstr "cảnh báo: lỗi cú pháp; cần dấu chấm phẩy “;” nằm sa
 
 #: 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:116
 #, c-format
@@ -3450,46 +3147,24 @@ msgid " failed.\n"
 msgstr " gặp lỗi.\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 ""
-"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ế."
+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:129
-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."
+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:162
-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ợ."
+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: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 ""
-"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."
+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:202
-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ợ."
+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:231 src/write-catalog.c:275
 #, c-format
@@ -3523,9 +3198,7 @@ msgstr "không phải tên lớp Java hợp lệ: %s"
 #: src/write-java.c:1210
 #, 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
 #, c-format
@@ -3539,11 +3212,10 @@ msgstr "gặp lỗi khi mở “%s” để ghi"
 
 #: src/write-po.c:875
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1326 src/write-po.c:1455
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3556,7 +3228,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:1338 src/write-po.c:1462
+#: src/write-po.c:1338 src/write-po.c:1467
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3580,8 +3252,7 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3734,14 +3405,12 @@ msgstr "%s:%d: cảnh báo: hằng chuỗi chưa được kết thúc"
 #: src/x-csharp.c:2020 src/x-java.c:1369
 #, 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:2054 src/x-java.c:1403
 #, 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/x-glade.c:295
 #, c-format
@@ -3843,9 +3512,7 @@ msgstr "%s:%d: cảnh báo: đánh dấu XML chưa được hoàn tất"
 #: src/x-perl.c:308
 #, 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
@@ -3969,12 +3636,8 @@ msgstr "%s:%d: dạng thức chuỗi không hợp lệ"
 
 #: 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: cảnh báo: cú pháp $\"...\" bị phản đối vì lý do bảo mật; hãy dùng "
-"eval_gettext thay thế."
+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 $\"...\" bị phản đối vì lý do bảo mật; hãy dùng eval_gettext thay thế."
 
 #: src/x-vala.c:413
 #, c-format
@@ -3989,9 +3652,7 @@ msgstr "“%s” không phải là tên bảng mã. Quay lại dùng ASCII.\n"
 #: src/xgettext.c:648
 #, 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:653
 #, c-format
@@ -4010,9 +3671,7 @@ msgstr "Trích các chuỗi có thể dịch ra những tập tin đầu vào đ
 
 #: src/xgettext.c:882
 #, 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 như là kết xuất\n"
 "                              (thay cho messages.po)\n"
@@ -4024,10 +3683,8 @@ msgstr "  -o, --output=TẬP_TIN        ghi kết xuất vào tập tin này\n"
 
 #: src/xgettext.c:886
 #, 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:891
 #, c-format
@@ -4038,37 +3695,28 @@ msgstr "Chọn ngôn ngữ của tập tin đầu vào:\n"
 #, 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"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
 "                                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:900
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr ""
-"  -C, --c++                   dạng viết tắt cho tùy chọn “--language=C++”\n"
+msgstr "  -C, --c++                   dạng viết tắt cho tùy chọn “--language=C++”\n"
 
 #: src/xgettext.c:902
 #, 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:907
 #, c-format
@@ -4092,17 +3740,14 @@ msgstr "  -j, --join-existing         nối lại các chuỗi với tập tin �
 #: src/xgettext.c:917
 #, 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:919
 #, 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"
@@ -4124,14 +3769,12 @@ msgstr "  -a, --extract-all           trích ra mọi chuỗi\n"
 #, 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"
 
@@ -4139,22 +3782,19 @@ msgstr ""
 #, 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:942
 #, 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"
@@ -4164,14 +3804,12 @@ msgstr ""
 #, 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"
 
@@ -4183,8 +3821,7 @@ msgstr "  -T, --trigraphs             hiểu chữ ba C kiểu ANSI để nhập
 #: src/xgettext.c:952
 #, 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:954
 #, c-format
@@ -4208,11 +3845,8 @@ msgstr "      --boost                 chấp nhận chuỗi định dạng Boost
 
 #: src/xgettext.c:966
 #, 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:991
 #, c-format
@@ -4224,13 +3858,11 @@ msgstr ""
 #: src/xgettext.c:1006
 #, 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:1008
 #, 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          thiếu 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"
@@ -4243,23 +3875,19 @@ msgstr "      --package-name=GÓI      đặt tên gói trong kết xuất\n"
 #: src/xgettext.c:1012
 #, 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:1014
 #, 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 trong chuỗi gốc "
-"msgid\n"
+"                              đặt địa chỉ thông báo lỗi trong chuỗi gốc msgid\n"
 
 #: src/xgettext.c:1016
 #, 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"
@@ -4268,8 +3896,7 @@ msgstr ""
 #: src/xgettext.c:1019
 #, 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"
@@ -4277,11 +3904,8 @@ msgstr ""
 
 #: src/xgettext.c:1840
 #, 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"
+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:1965
 msgid "standard input"
@@ -4309,21 +3933,13 @@ msgstr "%s%s: cảnh báo: "
 
 #: 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 ""
-"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"
+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:2190
 #, 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"
+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:2221
 #, c-format
@@ -4395,5 +4011,4 @@ msgstr "<không_tên>"
 #~ msgstr "trường phần đầu “%s” nên bắt đầu tại đầu dòng\n"
 
 #~ msgid "some header fields still have the initial default value\n"
-#~ msgstr ""
-#~ "một số trường phần đầu vẫn còn chứa giá tri mặc định ban đầu (sửa đi)\n"
+#~ msgstr "một số trường phần đầu vẫn còn chứa giá tri mặc định ban đầu (sửa đi)\n"
diff --git a/gettext-tools/po/zh_CN.po b/gettext-tools/po/zh_CN.po
index a8dca849d..7238b6021 100644
--- a/gettext-tools/po/zh_CN.po
+++ b/gettext-tools/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"POT-Creation-Date: 2012-12-25 14:22+0900\n"
 "PO-Revision-Date: 2013-03-05 16:18+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -55,32 +55,32 @@ msgstr "无法删除临时目录 %s"
 msgid "write error"
 msgstr "写错误"
 
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "保存 %s 的权限"
 
-#: gnulib-lib/copy-file.c:194
+#: gnulib-lib/copy-file.c:193
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "读取 %s 时出错"
 
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:197
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "无法写入备份文件 %s"
 
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:201
 #, c-format
 msgid "error reading %s"
 msgstr "读取 %s 出错"
 
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:205
 #, c-format
 msgid "error writing %s"
 msgstr "写入 %s 出错"
 
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:209
 #, c-format
 msgid "error after reading %s"
 msgstr "读取 %s 后出错"
@@ -181,15 +181,15 @@ msgstr "compile_java_class 中有无效的 source_version 参数"
 msgid "invalid target_version argument to compile_java_class"
 msgstr "compile_java_class 中有无效的 target_version 参数"
 
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c: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:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "创建“%s”失败"
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c: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
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "写入“%s”出错"
@@ -210,9 +210,9 @@ msgstr "未找到 Java 虚拟机，试着安装 gij 或设置 $JAVA"
 msgid "%s subprocess I/O error"
 msgstr "%s 子进程 I/O 错误"
 
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
+#: 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:548 libgettextpo/gettext-po.c:1326
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "内存耗尽"
@@ -223,7 +223,7 @@ msgid "creation of threads failed"
 msgstr "线程创建失败"
 
 #: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "写入 %s 子进程失败"
@@ -277,7 +277,7 @@ msgstr "“"
 msgid "'"
 msgstr "”"
 
-#: gnulib-lib/set-acl.c:46
+#: gnulib-lib/set-mode-acl.c:697
 #, c-format
 msgid "setting permissions for %s"
 msgstr "设置 %s 的权限"
@@ -310,28 +310,27 @@ 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/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1891
+#: src/xgettext.c:1904 src/xgettext.c:1914
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "打开“%s”读取时出错"
 
-#: src/format.c:151
+#: src/format.c:148
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "不像“%3$s”，“%1$s”不是有效的 %2$s 格式字符串。原因: %4$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-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%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-gcc-internal.c:638 src/format-librep.c:323
 #: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
 #: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
@@ -340,10 +339,9 @@ 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-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-librep.c:343
+#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
+#: src/format-python.c:527 src/format-tcl.c:421
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "参数 %3$u 的指定格式在“%1$s”和“%2$s”中不同"
@@ -355,12 +353,8 @@ msgstr "第 %u 条指令以“|”开始但并不以“|”。"
 
 #: 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
@@ -373,8 +367,7 @@ msgid "The string refers to argument number %u but ignores argument number %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-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”中的指定格式数量不匹配"
@@ -390,14 +383,12 @@ 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 '}'."
+msgid "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr "指令中间字符串发生中断：发现了“{”但没有匹配的“}”。"
 
 #: src/format-csharp.c:139
 #, 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
@@ -406,9 +397,7 @@ 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 "
-"'{'."
+msgid "The string starts in the middle of a directive: found '}' without matching '{'."
 msgstr "指令中间开始字符串：发现了“}”但没有匹配的“{”。"
 
 #: src/format-csharp.c:162
@@ -428,16 +417,12 @@ 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
@@ -475,43 +460,32 @@ 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
@@ -521,9 +495,7 @@ 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."
+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
@@ -533,15 +505,12 @@ 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\"."
+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
@@ -551,15 +520,12 @@ 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'."
+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
@@ -569,26 +535,19 @@ msgstr "参数 {%u} 中未在“%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 "参数 {%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
 #, 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:2372 src/format-scheme.c:2398
 #, 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:2496 src/format-scheme.c:2499
@@ -619,9 +578,7 @@ msgstr "第 %u 条指令中，同时给出了 @ 和 : 修饰符。"
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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:3326 src/format-scheme.c:3263
@@ -645,22 +602,16 @@ 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'."
+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-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "参数“%s”的格式指定符未在“%s”中找到"
 
 #: src/format-python.c: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
@@ -670,77 +621,39 @@ 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: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
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "第 %u 条指令中，“%c”后面没有数字。"
-
-#: src/format-python-brace.c:150
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "第 %u 条指令中，“{”后没有参数编号。"
-
-#: src/format-python-brace.c:165
-#, fuzzy, c-format
-msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "第 %u 条指令中，“%c”后面没有数字。"
-
-#: src/format-python-brace.c:185
-#, fuzzy, c-format
-msgid ""
-"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "第 %u 条指令中，“%c”前不允许有精度。"
-
-#: src/format-python-brace.c:270
-#, fuzzy, c-format
-msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "第 %u 条指令中，参数 %d 为负数。"
-
 #: 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 名称引用 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 变量中大括号语法过于复杂。为安全起见，此语法不被支持。"
+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."
+msgid "The string refers to a shell variable whose value may be different inside shell functions."
 msgstr "字符串引用的 shell 变量值可能在 shell 函数中有所不同。"
 
 #: src/format-sh.c:85
@@ -749,23 +662,19 @@ 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."
+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."
+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: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
+#: 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"
@@ -778,19 +687,19 @@ msgstr ""
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 
-#: src/hostname.c:184 src/msgattrib.c: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
+#: 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: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/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
+#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
@@ -800,11 +709,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "参数太多"
 
-#: 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
+#: 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: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:813
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "试试“%s --help”查看帮助信息。\n"
@@ -832,8 +741,7 @@ msgstr "  -s, --short                 短主机名\n"
 #: src/hostname.c:222
 #, 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"
 
@@ -842,29 +750,29 @@ msgstr "  -f, --fqdn, --long          长主机名，包括全称域名和别名
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            主机名地址\n"
 
-#: src/hostname.c:228 src/msgattrib.c: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: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: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:981
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "信息性输出：\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
+#: 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: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:983
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  显示此帮助并退出\n"
 
-#: 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
+#: 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: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:985
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               输出版本信息并退出\n"
@@ -873,11 +781,11 @@ msgstr "  -V, --version               输出版本信息并退出\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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
+#: 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: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:992
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "将错误报告至 <bug-gnu-gettext@gnu.org>。\n"
 
@@ -886,359 +794,328 @@ msgstr "将错误报告至 <bug-gnu-gettext@gnu.org>。\n"
 msgid "could not get host name"
 msgstr "无法获得主机名"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, c-format
 msgid "at most one input file allowed"
 msgstr "允许最多一个输入文件"
 
-#: src/msgattrib.c: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:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
+#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
+#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
+#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
+#: src/xgettext.c:617
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s 和 %s 互相排斥"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "用法：%s [选项] [输入文件]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:412
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr "根据消息的属性过滤一个翻译库里的消息，并处理消息的属性。\n"
 
-#: src/msgattrib.c: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/msguniq.c:342
+#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
+#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
+#: src/msguniq.c:341
 #, c-format
-msgid ""
-"Mandatory arguments to long options are mandatory for short options too.\n"
+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:375 src/msgmerge.c:505
-#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
+#: 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:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:831
 #, c-format
 msgid "Input file location:\n"
 msgstr "输入文件的位置：\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  输入文件                    做为输入的 PO 文件\n"
 
-#: src/msgattrib.c: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: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:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:837
 #, 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:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "如果没有指定输入文件或输入文件是 -，则读取标准输入。\n"
 
-#: src/msgattrib.c: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:428 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:842
 #, 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:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: 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:694 src/msggrep.c:535
+#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=文件      将输出写入指定文件\n"
 
-#: src/msgattrib.c: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/msgunfmt.c:493 src/msguniq.c:358
+#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
+#: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr "如果没有指定输出文件或输出文件是 -，则将结果写入至标准输出。\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "消息选择：\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:438
 #, c-format
-msgid ""
-"      --translated            keep translated, remove untranslated messages\n"
+msgid "      --translated            keep translated, remove untranslated messages\n"
 msgstr "      --translated            保留已翻译的，去掉未翻译的消息\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:440
 #, c-format
-msgid ""
-"      --untranslated          keep untranslated, remove translated messages\n"
+msgid "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr "      --untranslated          保留未翻译的，去掉已翻译的消息\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              删除标为模糊的消息\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            保留标为模糊的消息\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           移除过时 #~ 的消息\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         保留过时 #~ 的消息\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:451
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "属性操纵：\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             全部消息设为“模糊”\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           全部消息清除“模糊”属性\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:457
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          全部消息设为过时\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:459
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        全部消息清除过时属性\n"
 
-#: src/msgattrib.c:475
-#, fuzzy, c-format
-msgid ""
-"      --previous              when setting 'fuzzy', keep previous msgids\n"
-"                              of translated messages.\n"
-msgstr "      --previous              保留已翻译条目的 msgids\n"
-
-#: src/msgattrib.c:478
+#: src/msgattrib.c:461
 #, 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:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --no-fuzzy              删除标为模糊的消息\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:463
 #, 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:484
+#: src/msgattrib.c:465
 #, 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:486
+#: src/msgattrib.c:467
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 等于 --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:469
 #, 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: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/msguniq.c:369
+#: 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:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "输入文件的语法：\n"
 
-#: src/msgattrib.c: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:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
-msgid ""
-"  -P, --properties-input      input file is in Java .properties syntax\n"
+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:395 src/msguniq.c:373
+#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
-msgid ""
-"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
-"syntax\n"
-msgstr ""
-"      --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:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: 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:765 src/msggrep.c:587
+#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
+#: src/xgettext.c:927
 #, 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:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: 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:929
 #, 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: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: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:933
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr "      --style=STYLEFILE       为 --color 参数指定 CSS 样式文件\n"
 
-#: 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: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:935
 #, 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: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: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:937
 #, 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: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: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:939
 #, 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:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:941
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\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:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:943
 #, 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:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:945
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:947
 #, 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: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:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
+#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     写出 Java .properties 文件\n"
 
-#: src/msgattrib.c: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: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:951
 #, 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: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: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:953
 #, 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:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: 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:955
 #, 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: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: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:958
 #, 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:603 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: 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:960
 #, 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:817
 #, 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"
@@ -1261,23 +1138,23 @@ msgstr ""
 "翻译内容、自行加上的批注和源程序代码批注，以及文件中的位置等都会累积，\n"
 "除非使用了 --use-first选项，那样则会由第一个包含该翻译条目的文件获取数据。\n"
 
-#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
 #, 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:835
 #, 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:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
+#: src/xgettext.c:839
 #, 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"
@@ -1286,7 +1163,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"
@@ -1295,7 +1172,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"
@@ -1304,28 +1181,26 @@ 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:562
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:739
+#: src/msgmerge.c:557
 #, 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:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
+#: src/msgmerge.c:559
 #, 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:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=名称          输出的编码\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1334,28 +1209,27 @@ msgstr ""
 "      --use-first             对每条消息均使用第一个可用的翻译，不合并若干\n"
 "                              种翻译\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
-msgid ""
-"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+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:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "没有给出输入文件"
 
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "需要两个输入文件"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "用法：%s [选项] def.po ref.pot\n"
@@ -1386,19 +1260,17 @@ msgstr "  def.po                      翻译\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     对源文件的引用\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "操作修饰：\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
-msgid ""
-"  -m, --multi-domain          apply ref.pot to each of the domains in def."
-"po\n"
+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:555
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     不使用模糊匹配\n"
@@ -1423,17 +1295,17 @@ msgstr "此条目未翻译"
 msgid "this message needs to be reviewed by the translator"
 msgstr "此条目需要由翻译者复审"
 
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "此消息使用了但却未定义..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...但此定义十分类似"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "此消息已使用，但未定义于 %s 中"
@@ -1443,18 +1315,18 @@ msgstr "此消息已使用，但未定义于 %s 中"
 msgid "warning: this message is not used"
 msgstr "警告：此消息未使用"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:545
 #, 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"
@@ -1474,7 +1346,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"
@@ -1483,67 +1355,65 @@ msgstr ""
 "  ->, --more-than=数字        只打印出现次数多于指定次数的消息，若没有\n"
 "                              指定次数则默认值为 1\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:962
 #, 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:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "将一个翻译库的编码转换为另一种文字编码。\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "转换目标：\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "默认编码为当前区域设置的编码。\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                缩进的输出风格\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           排除“#: filename:line”行\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
-#, fuzzy, c-format
-msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\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          保留“#: filename:line”行(默认)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                严格的 Uniforum 输出风格\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
 #, c-format
 msgid "no input file given"
 msgstr "没有给出输入文件"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "需要一个输入文件"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "用法：%s [选项] 输入文件\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1555,7 +1425,7 @@ msgstr ""
 "(通常由 xgettext 创建)。未翻译的条目会填上和 msgid 一样的字符串，\n"
 "并标记为模糊。\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  输入文件                    输入 PO 或 POT 文件\n"
@@ -1594,7 +1464,7 @@ msgstr ""
 "有一个称为“0”的特殊内置命令，它会输出翻译条目，并随后加上一个 null\n"
 "字节。“msgexec 0”的输出适用于作为“xargs -0”的输入。\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=输入文件        输入的 PO 文件\n"
@@ -1604,27 +1474,27 @@ msgstr "  -i, --input=输入文件        输入的 PO 文件\n"
 msgid "write to stdout failed"
 msgstr "写入 stdout 失败"
 
-#: src/msgfilter.c:298
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "缺少过滤器名称"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "必须指定至少一个 sed 脚本"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "用法：%s [选项] 过滤器 [过滤器选项]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "对于翻译库中的所有翻译条目进行过滤。\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1633,141 +1503,115 @@ msgstr ""
 "<过滤器>可以是任何由标准输入读入翻译条目\n"
 "并将修改后的翻译写进标准输出的程序。\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "当过滤器是“sed”时可用的过滤选项：\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, 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:425
 #, 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:447
+#: src/msgfilter.c:428
 #, 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:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, 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:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                缩进的输出风格\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, 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:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s 的参数应该是一个标点符号"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "无效的 endianness：%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:372 src/msgunfmt.c:268 src/xgettext.c:590
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:439
-#, fuzzy, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr "如果没有指定输入文件或输入文件是 -，则读取标准输入。\n"
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s 需要指定“-d 目录”选项"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s 需要指定“-l locale”选项"
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s 需要指定“-l locale”选项"
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s 需要指定“-l locale”选项"
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s 和 %s 互相排斥"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s 只能配合 %s 或 %s 一起使用才有效"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s 只能配合 %s、%s 或 %s 一起使用才有效"
 
 #. 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:620
 #, c-format
 msgid "%s: "
 msgstr "%s: "
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:624
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d 条已翻译消息"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:629
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] "，%d 条模糊消息"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:634
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] "，%d 条未翻译消息"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:654
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "用法：%s [选项] 文件名.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:658
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "由文字模式描述生成二进制消息文件。\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: src/msgfmt.c:663 src/xgettext.c:826
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1776,212 +1620,148 @@ msgstr ""
 "长选项必须用的参数在使用短选项时也是必须的。\n"
 "可选参数也是如此。\n"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:670
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  文件名.po ...               输入文件\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
 #, c-format
 msgid "Operation mode:\n"
 msgstr "操作模式：\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:679
 #, 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:801
+#: src/msgfmt.c:681
 #, 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:803
+#: src/msgfmt.c:683
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# 模式：生成 .NET .dll 文件\n"
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:685
 #, 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:807
+#: src/msgfmt.c:687
 #, 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:809
+#: src/msgfmt.c:689
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt 模式：生成 Qt .qm 文件\n"
 
-#: src/msgfmt.c:811
-#, fuzzy, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --qt                    Qt 模式：生成 Qt .qm 文件\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:696
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                使用严格的 Uniforum 模式\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:698 src/xgettext.c:850
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "如果输出文件是 -，则会将结果写入至标准输出。\n"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:701
 #, 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:703 src/msgfmt.c:717 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:705 src/msgfmt.c:719 src/msgfmt.c:729 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
-#, fuzzy, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr "      --tcl                   Tcl 模式：输入为 tcl/msgcat .msg 文件\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:707
 #, 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:833
+#: src/msgfmt.c:709
 #, 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:839
+#: src/msgfmt.c:715
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "以 C# 模式输出文件位置：\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:721 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:847
+#: src/msgfmt.c:723
 #, 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:851
+#: src/msgfmt.c:727
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "以 Tcl 模式输出文件位置：\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:731 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:733
 #, 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:861
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  --d 目录                    .msg 消息库的基本目录\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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:874
-#, 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:886 src/xgettext.c:905
+#: src/msgfmt.c:745 src/xgettext.c:866
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "输入文件的解释：\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:747
 #, 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:891
+#: src/msgfmt.c:750
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr "      --check-format          检查和语言有关的格式字符串\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:752
 #, 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:895
+#: src/msgfmt.c:754
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1990,149 +1770,126 @@ msgstr ""
 "      --check-domain          检查 domain 指令和 --output-file 选项之间\n"
 "                                是否冲突\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:757
 #, 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:900
+#: src/msgfmt.c:759
 #, 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:903
+#: src/msgfmt.c:762
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             在输出中使用模糊的翻译条目\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:767
 #, 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:769
 #, 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:913
+#: src/msgfmt.c:772
 #, 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:922
+#: src/msgfmt.c:781
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            打印关于翻译的统计\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:783 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               增加输出的详细程度\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:897
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "警告：PO 文件头丢失或无效\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:900
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "警告：字符集转换无法工作\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:910
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "警告：PO 文件头模糊\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:912
 #, 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:936
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "域名“%s”无法用于文件名"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:941
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "域名“%s”无法用于文件名：将使用前缀"
 
-#: src/msgfmt.c:1095
+#: src/msgfmt.c:955
 #, c-format
 msgid "'domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1015
 #, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "忽略了空的“msgstr”项"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1016
 #, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "忽略了模糊的“msgstr”项"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1065
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s：警告：源文件包含模糊的翻译条目"
 
-#: src/msgfmt.c:1318
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
-#, 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/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
+#: src/x-tcl.c:150 src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "读取“%s”出错"
 
-#: src/msggrep.c:501
+#: src/msggrep.c:496
 #, c-format
-msgid ""
-"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
-"specified"
+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:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr "提取翻译库中的消息，这些消息符合某个给出的模式或属于某个给出的源文件。\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2206,18 +1963,17 @@ msgstr ""
 "  -i, --ignore-case           忽略大小写区别\n"
 "  -v, --invert-match          仅输出不符合任何条件的消息\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, 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:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           生成排序输出\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          根据文件位置排序输出\n"
@@ -2262,8 +2018,7 @@ msgstr "  -i, --input=输入文件        输入的 POT 文件\n"
 #: src/msginit.c:379
 #, 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"
@@ -2280,8 +2035,7 @@ 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
@@ -2291,8 +2045,7 @@ msgstr "  -l, --locale=LL_CC          设置目标语系\n"
 
 #: src/msginit.c:402
 #, 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
@@ -2325,10 +2078,8 @@ msgstr "%s 子进程失败，错误码为 %d"
 
 #: src/msginit.c:1118
 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"
@@ -2354,15 +2105,12 @@ 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"
+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
@@ -2371,8 +2119,8 @@ 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-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:3016
 #, c-format
 msgid "warning: "
 msgstr "警告："
@@ -2389,8 +2137,7 @@ msgstr ""
 #: src/msgl-cat.c:449
 #, 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 ""
@@ -2478,9 +2225,7 @@ msgid "plural expression can produce integer overflow"
 msgstr "复数表达式将引起整数溢出"
 
 #: src/msgl-check.c:197
-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:266
@@ -2526,9 +2271,7 @@ msgid_plural "but some messages have %lu plural forms"
 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;\""
+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=<表达式>;”"
@@ -2568,21 +2311,30 @@ msgstr "复数处理是 GNU gettext 的扩展功能"
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr 缺少快捷键标记“%c”"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr 包含过多的快捷键标记“%c”"
 
-#: src/msgl-check.c:804
-#, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "文件头\"%s\"仍然是默认值未改变\n"
-
-#: src/msgl-check.c:820
+#: src/msgl-check.c:785
 #, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "头部缺少文件头\"%s\"\n"
 
+#: src/msgl-check.c:793
+#, c-format
+msgid "header field '%s' should start at beginning of line\n"
+msgstr "文件头项“%s”应该位于行首\n"
+
+#: src/msgl-check.c:818
+msgid "some header fields still have the initial default value\n"
+msgstr "某些文件头项仍然是默认值\n"
+
+#: src/msgl-check.c:835
+#, c-format
+msgid "header field '%s' still has the initial default value\n"
+msgstr "文件头\"%s\"仍然是默认值未改变\n"
+
 #: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
@@ -2598,38 +2350,32 @@ 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/x-python.c:623 src/xgettext.c:693
 #, 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:335
 #, 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:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630
+#: src/xgettext.c:700
 #, 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:392 src/msgmerge.c:398
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s 只能和 %s 配合一起使用才有效"
 
-#: src/msgmerge.c:453
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "备份类型"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2650,24 +2396,24 @@ msgstr ""
 "在程序执行的过程中找不到完全匹配的文字，则会使用模糊的匹配以求达到较好的\n"
 "效果。\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      根据旧源文件进行的翻译成果\n"
 
-#: src/msgmerge.c:509
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     对新源文件的引用\n"
 
-#: src/msgmerge.c:513
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr "  -C, --compendium=文件       消息翻译的额外库，可指定多个\n"
 
-#: src/msgmerge.c:519
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2676,31 +2422,30 @@ msgstr ""
 "  -U, --update                更新 def.po,\n"
 "                              如果 def.po 已经是最新则不作任何事\n"
 
-#: src/msgmerge.c:531
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "以更新模式输出文件位置：\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "结果将写回 def.po 中。\n"
 
-#: src/msgmerge.c:535
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=备份方法       备份 def.po\n"
 
-#: src/msgmerge.c:537
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=后缀           覆盖默认备份后缀\n"
 
-#: src/msgmerge.c:539
+#: src/msgmerge.c:534
 #, 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"
@@ -2714,46 +2459,39 @@ msgstr ""
 "  existing, nil   如果编号备份存在则继续编号，否则执行简单备份\n"
 "  simple, never   总是制作简单的备份\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:541
 #, 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:557
+#: src/msgmerge.c:552
 #, 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:614 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       隐藏进度指示\n"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "此消息应定义复数形式"
 
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "此消息不应定义复数形式"
 
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2030
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2776,9 +2514,7 @@ msgstr "将二进制消息库转换为 Uniforum 风格的 .po 文件。\n"
 
 #: 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:442
@@ -2788,16 +2524,12 @@ 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# 资源模式：输入为 .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"
+msgid "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr "      --tcl                   Tcl 模式：输入为 tcl/msgcat .msg 文件\n"
 
 #: src/msgunfmt.c:451
@@ -2813,8 +2545,7 @@ 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"
@@ -2830,9 +2561,7 @@ msgstr "C# 模式下的输入文件位置：\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 ""
-"-l 和 -d 选项是必要的。.dll 文件位于指定目录的子目录，而子目录的名称取决于语"
-"系。\n"
+msgstr "-l 和 -d 选项是必要的。.dll 文件位于指定目录的子目录，而子目录的名称取决于语系。\n"
 
 #: src/msgunfmt.c:479
 #, c-format
@@ -2856,7 +2585,7 @@ msgstr "  -i, --indent                写出缩进的输出风格\n"
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                写出严格的 Uniforum 风格\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2875,16 +2604,14 @@ msgstr ""
 "累积起来，但如果指定了 --use-first 选项，则会从第一个翻译中取得注释。文件位置\n"
 "将会累积。如果使用了 --unique 选项，重复项将会被忽略。\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              只打印重复项\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, 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:56 libgettextpo/gettext-po.c:102
@@ -2946,27 +2673,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "#~ 使用不一致"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "缺少“msgstr[]”区"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "缺少“msgid_plural”区"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, c-format
 msgid "missing 'msgstr' section"
 msgstr "缺少“msgstr”区"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "复数格式的第一项索引非零"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "复数形式的索引出错"
@@ -2976,7 +2703,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:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:740 src/write-po.c:869
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "无效的多字节序列"
@@ -3020,16 +2747,16 @@ msgstr "字符串内遇到行尾"
 msgid "context separator <EOT> within string"
 msgstr "上下文分隔符 <EOT> 出现于字符串中"
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1004
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "此文件可能不包含域指令"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "重复的消息定义"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "这是第一次定义的位置"
 
@@ -3161,37 +2888,23 @@ 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 文件语法代替。"
+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."
+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."
+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 类，"
-"而不是 properties 文件。"
+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:202
-msgid ""
-"message catalog has plural form translations, but the output format does not "
-"support them."
+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
@@ -3218,17 +2931,17 @@ msgstr "编译 C# 类失败，试试 --verbose"
 msgid "compilation of C# class failed"
 msgstr "编译 C# 类失败"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "不是有效的 Java 类名：%s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr "编译 Java 类失败，试试 --verbose 或设置 $JAVAC 变量"
 
-#: src/write-java.c:1213
+#: src/write-java.c:1168
 #, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
 msgstr "编译 Java 类失败，请尝试设置 $JAVAC 变量"
@@ -3238,13 +2951,12 @@ msgstr "编译 Java 类失败，请尝试设置 $JAVAC 变量"
 msgid "error while opening \"%s\" for writing"
 msgstr "打开“%s”写入出错"
 
-#: src/write-po.c:875
+#: src/write-po.c:803
 #, 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:1326 src/write-po.c:1450
+#: src/write-po.c:1254 src/write-po.c:1383
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3257,7 +2969,7 @@ msgstr ""
 "用纯 ASCII 的 msgctxt。\n"
 "%s\n"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1266 src/write-po.c:1395
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3280,13 +2992,11 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"消息库中的 msgctxt 字符串包含超出 ISO-8859-1 的字符，但 Qt 消息库格式仅在翻"
-"译\n"
+"消息库中的 msgctxt 字符串包含超出 ISO-8859-1 的字符，但 Qt 消息库格式仅在翻译\n"
 "后的字符串中支持 Unicode，在翻译前的字符串中不支持\n"
 
 #: src/write-qt.c:717
@@ -3335,7 +3045,7 @@ msgstr ""
 "消息库有复数翻译\n"
 "但是 Tcl 消息库不支持复数处理\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-python.c:1075
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d：警告：未结束的字符串"
@@ -3345,22 +3055,17 @@ msgstr "%s:%d：警告：未结束的字符串"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d：警告：未结束的正规表达式"
 
-#: src/x-c.c:1051
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d：警告：无效的 Unicode 字符"
-
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d：警告：未结束的字符常量"
 
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1247
 #, 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:224 src/xgettext.c:2021
 msgid "Please specify the source encoding through --from-code."
 msgstr "请用 --from-code 指定源编码"
 
@@ -3400,7 +3105,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-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d：iconv 失败"
@@ -3414,7 +3119,7 @@ msgstr ""
 "%s:%d：无效的多字节序列。\n"
 "请通过 --from-code 指定源文件的编码。\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1282
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d：警告：无效的 Unicode 字符"
@@ -3434,22 +3139,12 @@ msgstr "%s:%d：警告：期待“}”却发现了“)”"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d：警告：期待“)”却发现了“}”"
 
-#: src/x-glade.c:295
-#, c-format
-msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
-
-#: src/x-glade.c:417
-#, c-format
-msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
-
-#: src/x-glade.c:572 src/x-glade.c:579
+#: 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:606
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3463,71 +3158,6 @@ msgstr ""
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: 警告:未结束的字符串 U+%04X"
 
-#: src/x-javascript.c:230
-#, fuzzy
-msgid "Please specify the source encoding through --from-code\n"
-msgstr "请用 --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"
-msgstr ""
-"%s:%d：出现了无效的多字节序列。\n"
-"请通过 --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"
-msgstr ""
-"%s:%d：较长的不完整多字节序列。\n"
-"请通过 --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"
-msgstr ""
-"%s:%d：文件结尾处出现了不完整的多字节序列。\n"
-"请通过 --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"
-msgstr ""
-"%s:%d：文件结尾处出现了不完整的多字节序列。\n"
-"请通过 --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"
-msgstr ""
-"%s:%d：无效的多字节序列。\n"
-"请通过 --from-code 指定源文件的编码。\n"
-
-#: src/x-javascript.c:954
-#, fuzzy, c-format
-msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d：警告：未结束的字符串字面"
-
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d：警告：无效的 Unicode 字符"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d：警告：未结束的字符串"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3563,7 +3193,7 @@ msgstr "%s:%d：8位字符“%c”转义无效(“\\L”)"
 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: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"
@@ -3571,7 +3201,7 @@ msgstr ""
 "请通过 --from-code 或是注释指定源文件的编码，\n"
 "如 http://www.python.org/peps/pep-0263.html 中所指定的那样。\n"
 
-#: src/x-python.c:324
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3582,7 +3212,7 @@ msgstr ""
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:341
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3593,7 +3223,7 @@ msgstr ""
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3604,7 +3234,7 @@ msgstr ""
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:364
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3615,7 +3245,7 @@ msgstr ""
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:397
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3626,7 +3256,7 @@ msgstr ""
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:722
+#: src/x-python.c:680
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "未知编码“%s”。先按照 ASCII 处理。"
@@ -3648,97 +3278,75 @@ 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"
+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:413
-#, fuzzy, c-format
-msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d：警告：未结束的字符串字面"
-
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:621
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "输出写到 stdout 时无法使用 --join-existing"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:626
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "没有指定关键字 xgettext 将无法工作"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:770
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "警告：文件“%s”扩展名“%s”未知; 将试试 C"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:821
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "从给定的输入文件中提取可翻译的字符串。\n"
 
-#: src/xgettext.c:882
+#: src/xgettext.c:844
 #, 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:884
+#: src/xgettext.c:846
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=文件           将输出写入指定文件\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:848
 #, 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:891
+#: src/xgettext.c:853
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "选择输入文件所用的语言：\n"
 
-#: src/xgettext.c:893
-#, fuzzy, c-format
+#: src/xgettext.c:855
+#, 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, Glade)\n"
 msgstr ""
 "  -L, --language=名称         识别指定语言\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, "
-"Lisp,\n"
+"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
 "                                EmacsLisp, librep, Schme, Smalltalk, Java,\n"
-"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
-"PHP,\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-源, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:861
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ 的简写\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:863
 #, 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:907
+#: src/xgettext.c:868
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3747,28 +3355,27 @@ msgstr ""
 "      --from-code=名称        输入文件的编码\n"
 "                                (除了 Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:871
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "默认情况下，输入文件都认为是纯 ASCII 文件。\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:876
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         将消息加入已有文件\n"
 
-#: src/xgettext.c:917
+#: src/xgettext.c:878
 #, 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:919
+#: src/xgettext.c:880
 #, 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"
@@ -3776,207 +3383,177 @@ msgstr ""
 "  -c, --add-comments          在输出文件中以关键词开启一行，\n"
 "                              并放置所有注释块\n"
 
-#: src/xgettext.c:925
+#: src/xgettext.c:886
 #, c-format
 msgid "Language specific options:\n"
 msgstr "语言特定选项：\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:888
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           提取所有字符串\n"
 
-#: src/xgettext.c:929
-#, fuzzy, c-format
+#: src/xgettext.c:890 src/xgettext.c:897
+#, 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, Python, "
-"Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Java, C#, awk, "
-"Tcl,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+msgstr ""
+"                                (仅 C, C++, ObjectiveC, Shell, Python, Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Java, C#, awk, Tcl,\n"
 "                                Perl, PHP, GCC-源, Glade 语言)\n"
 
-#: src/xgettext.c:937
-#, fuzzy, c-format
+#: src/xgettext.c:894
+#, 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, Python, "
-"Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Java, C#, awk, "
-"Tcl,\n"
-"                                Perl, PHP, GCC-源, Glade 语言)\n"
+"  -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/xgettext.c:942
+#: src/xgettext.c:901
 #, 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"
+"      --flag=单词:参数:标志   在关键字<单词>的指定次序的<参数>中，添加额外的标\n"
 "                              志\n"
 
-#: src/xgettext.c:945
-#, fuzzy, c-format
+#: src/xgettext.c:904
+#, 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, Python, "
-"Lisp,\n"
-"                                EmacsLisp, librep, Scheme, Java, C#, awk, "
-"Tcl,\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+msgstr ""
+"                                (仅 C, C++, ObjectiveC, Shell, Python, Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Java, C#, awk, Tcl,\n"
 "                                Perl, PHP, GCC-源语言)\n"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:908
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             理解输入时的 ANSI C 分段\n"
 
-#: src/xgettext.c:952
+#: src/xgettext.c:910
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (仅 C, C++, ObjectiveC 语言)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:912
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    识别 Qt 格式字符串\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (仅 C++ 语言)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:916
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   识别 KDE 4 格式字符串\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:920
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 识别 Boost 格式字符串\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:924
 #, c-format
-msgid ""
-"      --debug                 more detailed formatstring recognition result\n"
+msgid "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 更详细的格式字符串识别结果\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:949
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     写出 Java .properties 文件\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:964
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=字符串  在输出中设置版权占位符\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:966
 #, 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:1010
+#: src/xgettext.c:968
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  输出时设定软件包名字\n"
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:970
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  输出时设定软件包版本\n"
 
-#: src/xgettext.c:1014
+#: src/xgettext.c:972
 #, 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:1016
+#: src/xgettext.c:974
 #, 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:1019
+#: src/xgettext.c:977
 #, 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:1840
+#: src/xgettext.c:1783
 #, 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:1965
+#: src/xgettext.c:1882
 msgid "standard input"
 msgstr "标准输入"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:1986
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "%s%s 处有非 ASCII 码字符。"
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:1990
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "%s%s 处或之前位置有非 ASCII 码注释。"
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:1995
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "%s%s 处有非 ASCII 字符串。"
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s：警告："
 
-#: src/xgettext.c:2189
+#: src/xgettext.c:2104
 #, 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
+#: src/xgettext.c:2105
 #, c-format
-msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: "
-"%s\n"
+msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
 msgstr "以所声明的语言 %2$s 来看，%1$s 不是有效的格式字符串。原因：%3$s\n"
 
-#: src/xgettext.c:2221
+#: src/xgettext.c:2136
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3988,7 +3565,7 @@ msgstr ""
 "翻译者无法重新编排参数的顺序。\n"
 "请考虑使用带有命名参数和映射的格式字符串，而不是使用参数数组。\n"
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2198
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3998,27 +3575,27 @@ msgstr ""
 "gettext(\"\") 将返回文件头项，而不\n"
 "是空字符串。\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2835
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "关键字“%.*s”的参数指定含糊"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2862
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "警告：关键字“%.*s”缺少上下文"
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2887
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "警告：关键字“%.*s”缺少复数参数上下文"
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2908
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "单数和复数的上下文不匹配"
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3017
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -4030,7 +3607,7 @@ msgstr ""
 " MSGID_BUGS_ADDRESS 变量；\n"
 "否则，请指定 --msgid-bugs-address 命令行选项。\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3227
 #, c-format
 msgid "language '%s' unknown"
 msgstr "语言“%s”未知"
@@ -4039,12 +3616,6 @@ msgstr "语言“%s”未知"
 msgid "<unnamed>"
 msgstr "<未命名>"
 
-#~ 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"
-
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s：非法选项 -- %c\n"
 
@@ -4062,14 +3633,11 @@ 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 fbcb31af5..0ae023127 100644
--- a/gettext-tools/po/zh_TW.po
+++ b/gettext-tools/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.18.3\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-06-01 11:19+0900\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"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -185,15 +185,15 @@ msgstr ""
 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:503 src/write-csharp.c:739 src/write-java.c:1131
+#: src/write-java.c:1143
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "無法建立 “%s”"
 
 #: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c: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
+#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
+#: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "當寫入檔案 %s 時發生錯誤"
@@ -214,9 +214,9 @@ msgstr "找不到 Java virtual machine，請安裝 gij 或是設定 $JAVA 環境
 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/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:548 libgettextpo/gettext-po.c:1326
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "記憶體耗盡"
@@ -227,7 +227,7 @@ msgid "creation of threads failed"
 msgstr ""
 
 #: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:405
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "寫入至 %s 副行程時發生錯誤"
@@ -315,8 +315,8 @@ msgstr "%s 副行程出現代表嚴重錯誤的訊號 %d"
 
 # 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:1974
-#: src/xgettext.c:1987 src/xgettext.c:1997
+#: 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
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "當開啟檔案 %s 準備讀取時發生錯誤"
@@ -331,8 +331,7 @@ msgstr "和 ‘msgid’ 不同，‘%s’ 的 %s 格式字串無效。原因：%
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
-msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+msgid "a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "‘%2$s’ 中第 %1$u 個引數的規格在 ‘msgid’ 中並不存在"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
@@ -360,12 +359,8 @@ msgstr "第 %u 個指令結束的不是 ‘}’，而是不合法的字元。"
 
 #: 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
@@ -395,14 +390,12 @@ 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 '}'."
+msgid "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
 
 #: src/format-csharp.c:139
 #, 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
@@ -411,9 +404,7 @@ 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 "
-"'{'."
+msgid "The string starts in the middle of a directive: found '}' without matching '{'."
 msgstr ""
 
 #: src/format-csharp.c:162
@@ -433,16 +424,12 @@ msgstr "第 %u 個指令的 %s 後面缺少了逗號。"
 
 #: 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."
+msgid "In the directive number %u, the argument number for the precision must be equal to %u."
 msgstr "第 %u 個指令中的數字 0 不是正整數。"
 
 #: src/format-gcc-internal.c:398
 #, fuzzy, 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 個指令，‘<’ 之後的關鍵字後面缺少了 ‘>’。"
 
 #: src/format-gcc-internal.c:406
@@ -480,43 +467,32 @@ 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 ""
 
 #: 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 "第 %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
@@ -526,9 +502,7 @@ 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."
+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
@@ -538,15 +512,12 @@ 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\"."
+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
@@ -556,15 +527,12 @@ 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
 #, fuzzy, 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} 的格式在 ‘msgid’ 中並不存在"
 
 #: src/format-java.c:756
@@ -574,26 +542,19 @@ 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"
+msgid "format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "‘msgid’ 和 ‘%s’ 的引數 {%u} 規格並不相同"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: 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."
+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
 #, 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] ""
 
@@ -625,9 +586,7 @@ msgstr ""
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, 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
@@ -651,22 +610,18 @@ msgstr "‘%s’ 的格式規格並非 ‘msgid’ 的格式規格的一部份"
 
 #: 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-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:434 src/format-python-brace.c:447
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
 #: 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: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
@@ -676,61 +631,52 @@ msgstr ""
 
 #: 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)"
+msgid "format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr "‘msgid’ 裡的規格對應的是雜湊表 (mapping)，而 ‘%s’ 的卻是固定有序列 (tuple)"
 
 #: 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)"
+msgid "format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr "‘msgid’ 裡的規格對應的是固定有序列 (tuple)，而 ‘%s’ 的卻是雜湊表 (mapping)"
 
 #: 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'"
+msgid "a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "‘%2$s’ 中的引數 ‘%1$s’ 的格式在 ‘msgid’ 中並不存在"
 
 #: src/format-python.c:494
 #, fuzzy, 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 "‘msgid’和‘%s’的引數‘%s’的格式並不相同"
 
-#: src/format-python-brace.c:137
+#: 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:150
+#: 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:165
+#: 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:185
+#: src/format-python-brace.c:184
 #, fuzzy, 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:270
+#: src/format-python-brace.c:210
 #, fuzzy, c-format
 msgid "In the directive number %u, there is an unterminated format directive."
 msgstr "第 %u 個指令中的數字 0 不是正整數。"
 
 #: 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
@@ -738,16 +684,11 @@ 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."
+msgid "The string refers to a shell variable whose value may be different inside shell functions."
 msgstr ""
 
 #: src/format-sh.c:85
@@ -756,23 +697,19 @@ 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."
+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."
+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: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
+#: 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"
@@ -781,19 +718,19 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 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
+#: 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"
 
 #. 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/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
 msgid "Bruno Haible"
 msgstr ""
@@ -803,11 +740,11 @@ msgstr ""
 msgid "too many arguments"
 msgstr "引數過多"
 
-#: 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
+#: 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"
@@ -835,40 +772,38 @@ msgstr "  -s, --short                 短的主機名稱\n"
 #: src/hostname.c:222
 #, 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
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            主機的 IP 地址\n"
 
-#: 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: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
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "顯示資訊：\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
+#: 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: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
+#: 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"
@@ -877,11 +812,11 @@ msgstr "  -V, --version               顯示版本資訊，然後結束\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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
+#: 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"
 
@@ -890,157 +825,156 @@ msgstr "請向 <bug-gnu-gettext@gnu.org> 匯報錯誤。\n"
 msgid "could not get host name"
 msgstr "無法取得主機名稱"
 
-#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: 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
 #, 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: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: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
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s 和 %s 兩者是互不相容的"
 
-#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
+#: src/msgattrib.c:414 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "用法：%s [選項] [輸入檔]\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:419
 #, 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: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/msguniq.c:342
+#: 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
 #, 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: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: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
 #, c-format
 msgid "Input file location:\n"
 msgstr "輸入檔位置：\n"
 
-#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
+#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   用作輸入的 PO 檔\n"
 
-#: src/msgattrib.c: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: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
 #, 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:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
-#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
+#: 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
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\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:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
-#: src/xgettext.c:880
+#: 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
 #, 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:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: 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
 #, 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:527
-#: src/msgunfmt.c:493 src/msguniq.c:358
+#: 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
 #, 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:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "篩選訊息：\n"
 
-#: src/msgattrib.c:452
+#: src/msgattrib.c:445
 #, c-format
-msgid ""
-"      --translated            keep translated, remove untranslated messages\n"
+msgid "      --translated            keep translated, remove untranslated messages\n"
 msgstr "      --translated            只保留已翻譯條目，刪除未翻譯條目\n"
 
-#: src/msgattrib.c:454
+#: src/msgattrib.c:447
 #, c-format
-msgid ""
-"      --untranslated          keep untranslated, remove translated messages\n"
+msgid "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr "      --untranslated          只保留未翻譯條目，刪除已翻譯條目\n"
 
-#: src/msgattrib.c:456
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              刪除加上 'fuzzy' 標記的條目\n"
 
-#: src/msgattrib.c:458
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            只保留加上 'fuzzy' 標記的條目\n"
 
-#: src/msgattrib.c:460
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           刪除過時的條目 (#~)\n"
 
-#: src/msgattrib.c:462
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         只保留過時的條目 (#~) \n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "處理屬性：\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             將所有條目標記為 'fuzzy'\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           移除所有條目的 'fuzzy' 狀態\n"
 
-#: src/msgattrib.c:471
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          將所有條目標記為過時\n"
 
-#: src/msgattrib.c:473
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        清除所有條目的過時標記\n"
 
-#: src/msgattrib.c:475
+#: src/msgattrib.c:468
 #, fuzzy, c-format
 msgid ""
 "      --previous              when setting 'fuzzy', keep previous msgids\n"
@@ -1049,205 +983,180 @@ msgstr ""
 "  -u, --unique                等於 --less-than=2，表示只顯示\n"
 "                              只有一種翻譯的字句\n"
 
-#: src/msgattrib.c:478
+#: src/msgattrib.c:471
 #, fuzzy, 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-fuzzy           移除所有條目的 'fuzzy' 狀態\n"
 
-#: src/msgattrib.c:480
-#, fuzzy, c-format
-msgid ""
-"      --empty                 when removing 'fuzzy', also set msgstr empty\n"
-msgstr "      --no-fuzzy              刪除加上 'fuzzy' 標記的條目\n"
-
-#: src/msgattrib.c:482
+#: src/msgattrib.c:473
 #, 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:484
+#: src/msgattrib.c:475
 #, 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:486
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 等於 --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:488
+#: src/msgattrib.c:479
 #, 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: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/msguniq.c:369
+#: 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
 #, 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:393 src/msguniq.c:371
+#: 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
 #, 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: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: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
 #, 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:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
-#: src/xgettext.c:969
+#: 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
 #, 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:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: 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
 #, 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: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
 #, 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: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
 #, 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: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: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
 #, 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: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: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
 #, 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:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:960
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\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:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:962
 #, 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:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:964
 #, 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:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
-#: src/xgettext.c:989
+#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:966
 #, 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: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: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
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output    產生 Java .properties 檔案\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:412
-#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: 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
 #, 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: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: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
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          指定輸出檔每行寬度\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:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: 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
 #, 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: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: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
 #, 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:603 src/msguniq.c:414
-#: src/xgettext.c:1002
+#: 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
 #, 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:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "用法：%s [選項] [輸入檔]...\n"
 
-#: src/msgcat.c:372
+#: src/msgcat.c:371
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1268,23 +1177,23 @@ msgstr ""
 "--use-first 選項，那樣則會由第一個含有該翻譯條目的檔案取得資料。\n"
 "所有 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:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               輸入檔\n"
 
-#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:850
 #, 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:325 src/msgfmt.c:794
-#: src/xgettext.c:877
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
+#: src/xgettext.c:854
 #, 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"
@@ -1293,7 +1202,7 @@ msgstr ""
 "  -<, --less-than=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"
@@ -1302,7 +1211,7 @@ msgstr ""
 "  ->, --more-than=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"
@@ -1311,28 +1220,26 @@ 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:562
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:739
+#: src/msgmerge.c:557
 #, 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:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
+#: src/msgmerge.c:559
 #, 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:337 src/msguniq.c:378
+#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=名稱          輸出的編碼\n"
 
-#: src/msgcat.c:430 src/msguniq.c:380
+#: src/msgcat.c:429 src/msguniq.c:379
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1341,28 +1248,27 @@ msgstr ""
 "      --use-first             每句只使用第一個出現的翻譯，而不會將所有\n"
 "                              翻譯合併起來\n"
 
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
 #, c-format
-msgid ""
-"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+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:178 src/msgcomm.c:286 src/msgmerge.c:350
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:361
 #, c-format
 msgid "no input files given"
 msgstr "未指定輸入檔"
 
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:366
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "需要恰好指定兩個輸入檔"
 
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:480
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "用法：%s [選項] def.po ref.pot\n"
@@ -1393,20 +1299,17 @@ msgstr "  def.po                      翻譯檔\n"
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     未翻譯檔案\n"
 
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:546
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "運作模式有關選項：\n"
 
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
-msgid ""
-"  -m, --multi-domain          apply ref.pot to each of the domains in def."
-"po\n"
-msgstr ""
-"  -m, --multi-domain          將 ref.pot 套用於 def.po 中的每一個領域\n"
+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:555
+#: src/msgcmp.c:243 src/msgmerge.c:550
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     不進行模糊字串配對\n"
@@ -1431,17 +1334,17 @@ msgstr "警告：沒有使用這個訊息"
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1500
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "這個訊息有使用過但沒有定義..."
 
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1503
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...但這個定義很相似"
 
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1531
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "這個訊息有使用過但在 %s 中沒有定義"
@@ -1451,18 +1354,18 @@ msgstr "這個訊息有使用過但在 %s 中沒有定義"
 msgid "warning: this message is not used"
 msgstr "警告：沒有使用這個訊息"
 
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
+#: src/msgcmp.c:553 src/msgfmt.c:545
 #, 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
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1480,75 +1383,72 @@ msgstr ""
 "訊息）。翻譯內容、自行加上的註解和原程式碼的註解都會保留，但只會由第一個\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"
 "                              definitions, defaults to 1 if not set\n"
-msgstr ""
-"  ->, --more-than=NUMBER      顯示出現多於指定次數的字句，預設為 1 次\n"
+msgstr "  ->, --more-than=NUMBER      顯示出現多於指定次數的字句，預設為 1 次\n"
 
-#: src/msgcomm.c:452 src/xgettext.c:1004
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, 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           不顯示標頭 (即 ‘msgid \"\"’ 項目)\n"
 
-#: src/msgconv.c:311
+#: src/msgconv.c:306
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "將一個翻譯檔的編碼轉換為另一種文字編碼。\n"
 
-#: src/msgconv.c:335
+#: src/msgconv.c:330
 #, c-format
 msgid "Conversion target:\n"
 msgstr "轉換目標：\n"
 
-#: src/msgconv.c:339
+#: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "預設的編碼為目前語言的編碼。\n"
 
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                將輸出結果進行縮排\n"
 
-#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
+#: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           不輸出源代碼位置\n"
 
-#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
-#, fuzzy, c-format
-msgid ""
-"  -n, --add-location          preserve '#: filename:line' lines (default)\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          保留源代碼位置 (預設)\n"
 
-#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
+#: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                嚴格遵從 Uniforum 格式\n"
 
-#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "未指定輸入檔"
 
-#: src/msgen.c:263
+#: src/msgen.c:253
 #, c-format
 msgid "exactly one input file required"
 msgstr "需要恰好指定一個輸入檔"
 
-#: src/msgen.c:304
+#: src/msgen.c:298
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "用法：%s [選項] 輸入檔\n"
 
-#: src/msgen.c:309
+#: src/msgen.c:303
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1559,7 +1459,7 @@ msgstr ""
 "產生英文翻譯檔。輸入檔可以是 PO 檔或 POT 檔 (通常由 xgettext 產生)。\n"
 "未翻譯的條目會填上和 msgid 一樣的字串。\n"
 
-#: src/msgen.c:321
+#: src/msgen.c:315
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  輸入檔                      作為輸入的 PO 或 POT 檔\n"
@@ -1598,7 +1498,7 @@ msgstr ""
 "有一個稱為 '0' 的特殊內置指令，它會輸出所有翻譯條目，並隨後加上 null 位元。\n"
 "“msgexec 0” 的輸出適用於作為 “xargs -0” 的輸入。\n"
 
-#: src/msgexec.c:281 src/msgfilter.c:420
+#: src/msgexec.c:281 src/msgfilter.c:401
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       作為輸入的 PO 檔\n"
@@ -1608,27 +1508,27 @@ msgstr "  -i, --input=INPUTFILE       作為輸入的 PO 檔\n"
 msgid "write to stdout failed"
 msgstr "寫入至標準輸出時發生錯誤"
 
-#: src/msgfilter.c:298
+#: src/msgfilter.c:289
 #, c-format
 msgid "missing filter name"
 msgstr "未指定過濾器"
 
-#: src/msgfilter.c:318
+#: src/msgfilter.c:313
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "必須指定至少一個 sed script"
 
-#: src/msgfilter.c:407
+#: src/msgfilter.c:388
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "用法：%s [選項] 過濾器 [過濾器選項]\n"
 
-#: src/msgfilter.c:411
+#: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "對於翻譯檔中的所有翻譯條目進行過濾。\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1637,359 +1537,265 @@ msgstr ""
 "<過濾器>可以是任何由標準輸入讀入翻譯條目\n"
 "並將修改後的翻譯寫進標準輸出的程式。\n"
 
-#: src/msgfilter.c:440
+#: src/msgfilter.c:421
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "當<過濾器>是 ‘sed’ 時一些比較有用的選項：\n"
 
-#: src/msgfilter.c:442
+#: src/msgfilter.c:423
 #, 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:425
 #, 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:428
 #, 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:465 src/msggrep.c:600
+#: src/msgfilter.c:446 src/msggrep.c:595
 #, 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:471 src/msggrep.c:606
+#: src/msgfilter.c:452 src/msggrep.c:601
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                將輸出結果進行縮排\n"
 
-#: src/msgfilter.c:473
+#: src/msgfilter.c:454
 #, 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:345
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s 的引數應該是一個標點符號"
 
-#: src/msgfmt.c:392
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:439
-#, fuzzy, c-format
-msgid "no input file should be given if %s and %s are specified"
-msgstr "如果沒有指定輸入檔或輸入檔是 ‘-’，則由標準輸入讀取內容。\n"
-
-#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
 #: src/msgunfmt.c:353
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s 需要指定 “-d 目錄” 選項"
 
-#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
-#: src/msgunfmt.c:346
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s 需要指定 “-l locale” 選項"
 
-#: src/msgfmt.c:538
-#, fuzzy, c-format
-msgid "%s requires a \"--template template\" specification"
-msgstr "%s 需要指定 “-l locale” 選項"
-
-#: src/msgfmt.c:545
-#, fuzzy, c-format
-msgid "%s requires a \"-o file\" specification"
-msgstr "%s 需要指定 “-l locale” 選項"
-
-#: src/msgfmt.c:551
-#, fuzzy, c-format
-msgid "%s and %s are mutually exclusive in %s"
-msgstr "%s 和 %s 兩者是互不相容的"
-
-#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s 只能配合 %s 或 %s 一起使用才有效"
 
-#: src/msgfmt.c:571 src/msgfmt.c:577
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s 只能配合 %s、%s 或 %s 一起使用才有效"
 
 #. 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:620
 #, c-format
 msgid "%s: "
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:624
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "已翻譯 %d 個條目"
 
-#: src/msgfmt.c:749
+#: src/msgfmt.c:629
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] "，有 %d 個條目標記為模糊翻譯"
 
-#: src/msgfmt.c:754
+#: src/msgfmt.c:634
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] "，還有 %d 個條目未翻譯"
 
-#: src/msgfmt.c:774
+#: src/msgfmt.c:654
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "用法：%s [選項] filename.po ...\n"
 
-#: src/msgfmt.c:778
+#: src/msgfmt.c:658
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "由文字模式翻譯檔產生二元碼翻譯檔。\n"
 
-#: src/msgfmt.c:783 src/xgettext.c:864
+#: 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"
 
-#: src/msgfmt.c:790
+#: src/msgfmt.c:670
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             輸入檔\n"
 
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "操作模式：\n"
 
-#: src/msgfmt.c:799
+#: src/msgfmt.c:679
 #, 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 class\n"
 
-#: src/msgfmt.c:801
+#: src/msgfmt.c:681
 #, 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:683
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# 模式，會產生 .NET .dll 檔\n"
 
-#: src/msgfmt.c:805
+#: src/msgfmt.c:685
 #, 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# resources 模式，會產生 .NET .resources 檔案\n"
 
-#: src/msgfmt.c:807
+#: src/msgfmt.c:687
 #, 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:809
+#: src/msgfmt.c:689
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt 模式：產生 Qt .qm 檔\n"
 
-#: src/msgfmt.c:811
-#, fuzzy, c-format
-msgid ""
-"      --desktop               Desktop Entry mode: generate a .desktop file\n"
-msgstr "      --qt                    Qt 模式：產生 Qt .qm 檔\n"
-
-#: src/msgfmt.c:818
+#: src/msgfmt.c:696
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                強制使用 Uniforum 格式翻譯檔\n"
 
-#: src/msgfmt.c:820 src/xgettext.c:888
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "如果輸出檔是 - 的話，則會在標準輸出顯示結果。\n"
 
-#: src/msgfmt.c:823
+#: src/msgfmt.c:701
 #, 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:703 src/msgfmt.c:717 src/msgunfmt.c:458 src/msgunfmt.c:469
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     resource 名稱\n"
 
-#: src/msgfmt.c: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:705 src/msgfmt.c:719 src/msgfmt.c:729 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"
 "                              語言代號\n"
 
-#: src/msgfmt.c:829
-#, fuzzy, c-format
-msgid ""
-"      --source                produce a .java file, instead of a .class "
-"file\n"
-msgstr ""
-"      --tcl                   Tcl 模式：輸入資料是 tcl/msgcat .msg 檔\n"
-
-#: src/msgfmt.c:831
+#: src/msgfmt.c:707
 #, c-format
-msgid ""
-"  -d DIRECTORY                base directory of classes directory hierarchy\n"
+msgid "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d 目錄                     class 目錄層的基本目錄\n"
 
-#: src/msgfmt.c:833
+#: src/msgfmt.c:709
 #, 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"
 
-#: src/msgfmt.c:839
+#: src/msgfmt.c:715
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# 模式的輸出檔位置：\n"
 
-#: src/msgfmt.c:845 src/msgunfmt.c:473
+#: src/msgfmt.c:721 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:723
 #, 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:727
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl 模式的輸出檔位置：\n"
 
-#: src/msgfmt.c:855 src/msgunfmt.c:483
+#: src/msgfmt.c:731 src/msgunfmt.c:483
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:857
+#: src/msgfmt.c:733
 #, 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
-#, c-format
-msgid "Desktop Entry mode options:\n"
-msgstr ""
-
-#: src/msgfmt.c:867
-#, c-format
-msgid "  --template=TEMPLATE         a .desktop file used as a template\n"
-msgstr ""
-
-#: src/msgfmt.c:869
-#, fuzzy, c-format
-msgid "  -d DIRECTORY                base directory of .po files\n"
-msgstr "  -d 目錄                     class 目錄層的基本目錄\n"
-
-#: src/msgfmt.c:871 src/xgettext.c:934
-#, 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"
-
-#: src/msgfmt.c:874
-#, 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:886 src/xgettext.c:905
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "輸入檔處理：\n"
 
-#: src/msgfmt.c:888
+#: src/msgfmt.c:747
 #, 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:891
+#: src/msgfmt.c:750
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr "      --check-format          檢查各種程式語言的格式字串\n"
 
-#: src/msgfmt.c:893
+#: src/msgfmt.c:752
 #, 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:895
+#: src/msgfmt.c:754
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1998,148 +1804,125 @@ msgstr ""
 "      --check-domain          檢查 domain 關鍵字和 --output-file 選項之間\n"
 "                                有沒有衝突\n"
 
-#: src/msgfmt.c:898
+#: src/msgfmt.c:757
 #, 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:900
+#: src/msgfmt.c:759
 #, 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"
 
-#: src/msgfmt.c:903
+#: src/msgfmt.c:762
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             在輸出結果中顯示模糊翻譯\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:767
 #, 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:769
 #, 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:772
 #, 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:922
+#: src/msgfmt.c:781
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            顯示有關翻譯訊息的統計\n"
 
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:783 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               顯示詳細資訊\n"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:897
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "警告：缺少了 PO 檔的標頭或是格式無效\n"
 
-#: src/msgfmt.c:1040
+#: src/msgfmt.c:900
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "警告：字元集轉換的功能不會生效\n"
 
-#: src/msgfmt.c:1050
+#: src/msgfmt.c:910
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "警告：PO 檔的標頭仍然是模糊狀態\n"
 
-#: src/msgfmt.c:1052
+#: src/msgfmt.c:912
 #, 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:936
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "領域名稱 %s 不適合作為檔案名稱"
 
-#: src/msgfmt.c:1081
+#: src/msgfmt.c:941
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "領域名稱 %s 不適合作為檔案名稱：將使用字首"
 
-#: src/msgfmt.c:1095
+#: src/msgfmt.c:955
 #, fuzzy, c-format
 msgid "'domain %s' directive ignored"
 msgstr "忽略‘domain %s’指令"
 
-#: src/msgfmt.c:1155
+#: src/msgfmt.c:1015
 #, fuzzy, c-format
 msgid "empty 'msgstr' entry ignored"
 msgstr "忽略空的‘msgstr’欄位"
 
-#: src/msgfmt.c:1156
+#: src/msgfmt.c:1016
 #, fuzzy, c-format
 msgid "fuzzy 'msgstr' entry ignored"
 msgstr "忽略模糊的‘msgstr’欄位"
 
-#: src/msgfmt.c:1205
+#: src/msgfmt.c:1065
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s：警告：原始檔包含模糊翻譯條目"
 
-#: src/msgfmt.c:1318
-#, c-format
-msgid "%s does not exist"
-msgstr ""
-
-#: src/msgfmt.c:1328
-#, 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-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:176
+#: 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
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "讀取 %s 時出現錯誤"
 
-#: src/msggrep.c:501
+#: 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"
+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:521
+#: src/msggrep.c:516
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr "抽取翻譯檔中的訊息，而這些訊息符合某種樣式或屬於某個指定的來源檔。\n"
 
-#: src/msggrep.c:547
+#: src/msggrep.c:542
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2208,21 +1991,19 @@ msgstr ""
 "  -f, --file=FILE             PATTERN 採用 FILE 的內容 \n"
 "  -i, --ignore-case           不區分大小寫\n"
 
-#: src/msggrep.c:602
+#: src/msggrep.c:597
 #, 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:623
+#: src/msggrep.c:618
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           將訊息排序\n"
 
-#: src/msggrep.c:625
+#: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          根據檔案位置排序\n"
@@ -2267,8 +2048,7 @@ msgstr "  -i, --input=輸入檔          輸入的 POT 檔\n"
 #: src/msginit.c:379
 #, 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"
@@ -2295,8 +2075,7 @@ msgstr "  -l, --locale=LL_CC          指定地區設定\n"
 
 #: src/msginit.c:402
 #, 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
@@ -2329,10 +2108,8 @@ msgstr "%s 副行程失敗，錯誤碼為 %d"
 
 #: src/msginit.c:1118
 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"
@@ -2358,15 +2135,12 @@ 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"
+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"
+msgid "domain \"%s\" in input file '%s' doesn't contain a header entry with a charset specification"
 msgstr "輸入檔 ‘%2$s’ 的 domain “%1$s” 的標頭欄位中沒有指定字元集"
 
 #: src/msgl-cat.c:391 src/msgl-iconv.c:375
@@ -2376,7 +2150,7 @@ msgstr "目標的字元集編碼 %s 不是通用的編碼名稱。"
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
 #: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "警告："
@@ -2386,14 +2160,12 @@ msgstr "警告："
 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
 #, 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 ""
@@ -2479,9 +2251,7 @@ msgid "plural expression can produce integer overflow"
 msgstr "複數表示式會引致整數溢位的錯誤"
 
 #: src/msgl-check.c:197
-msgid ""
-"plural expression can produce arithmetic exceptions, possibly division by "
-"zero"
+msgid "plural expression can produce arithmetic exceptions, possibly division by zero"
 msgstr "複數表示式會引致運算錯誤，例如被 0 整除"
 
 #: src/msgl-check.c:266
@@ -2530,9 +2300,7 @@ msgid_plural "but some messages have %lu plural forms"
 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;\""
+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=<表示式>;”"
@@ -2576,17 +2344,17 @@ msgstr "複數處理是 GNU gettext 的擴展功能"
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr 缺少了捷徑鍵標記‘%c’"
 
-#: src/msgl-check.c:740
+#: src/msgl-check.c:739
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr 含有過多的捷徑鍵標記‘%c’"
 
-#: src/msgl-check.c:804
+#: src/msgl-check.c:801
 #, fuzzy, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "某些標頭欄位仍然是預設值\n"
 
-#: src/msgl-check.c:820
+#: src/msgl-check.c:816
 #, fuzzy, c-format
 msgid "header field '%s' missing in header\n"
 msgstr "缺少了標頭欄位‘%s’\n"
@@ -2607,43 +2375,32 @@ 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/x-python.c:665 src/xgettext.c:708
 #, 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
 #, 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:302 src/x-python.c:672
-#: src/xgettext.c:727
+#: src/xgettext.c:715
 #, 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:392 src/msgmerge.c:398
+#: src/msgmerge.c:383 src/msgmerge.c:389
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s 只能和 %s 配合一起使用才有效"
 
-#: src/msgmerge.c:453
+#: src/msgmerge.c:448
 msgid "backup type"
 msgstr "備份方式"
 
-#: src/msgmerge.c:490
+#: src/msgmerge.c:485
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2663,55 +2420,54 @@ msgstr ""
 "的註解都會被捨棄，但特殊旗標註解和檔案位置都會被保留。比較時如果有不完全\n"
 "配合的字串出現，程式會以模糊配對的方式得出較好的結果。\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      舊版本的翻譯檔\n"
 
-#: src/msgmerge.c:509
+#: src/msgmerge.c:504
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     新版本程式的翻譯檔\n"
 
-#: src/msgmerge.c:513
+#: src/msgmerge.c:508
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr "  -C, --compendium=FILE       額外的翻譯記憶庫，選項可以使用多次\n"
 
-#: src/msgmerge.c:519
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr "  -U, --update                更新 def.po (僅當 def.po 未更新時)\n"
 
-#: src/msgmerge.c:531
+#: src/msgmerge.c:526
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "更新模式的檔案輸出位置：\n"
 
-#: src/msgmerge.c:533
+#: src/msgmerge.c:528
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "輸出結果會寫入至 def.po。\n"
 
-#: src/msgmerge.c:535
+#: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        將 def.po 備份\n"
 
-#: src/msgmerge.c:537
+#: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFFIX         自行指定備份檔名末端的字串\n"
 
-#: src/msgmerge.c:539
+#: src/msgmerge.c:534
 #, 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"
@@ -2725,48 +2481,43 @@ msgstr ""
 "  existing, nil   若有數字的備份檔已經存在則使用數字，否則使用一般名稱\n"
 "  simple, never   永遠使用普通方式備份\n"
 
-#: src/msgmerge.c:546
+#: src/msgmerge.c:541
 #, 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"
 msgstr ""
 "備份檔的後置字元為‘~’，除非以 --suffix 選項或是 SIMPLE_BACKUP_SUFFIX\n"
 "環境變數指定。\n"
 
-#: src/msgmerge.c:557
+#: src/msgmerge.c:552
 #, fuzzy, c-format
-msgid ""
-"      --previous              keep previous msgids of translated messages\n"
+msgid "      --previous              keep previous msgids of translated messages\n"
 msgstr "      --translated            只保留已翻譯條目，刪除未翻譯條目\n"
 
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:609 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       隱藏進度指示\n"
 
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1604
 #, c-format
 msgid "this message should define plural forms"
 msgstr "此訊息應該有複數型態"
 
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1627
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "此訊息不應有複數型態"
 
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2030
 #, 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:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
 #, c-format
 msgid " done.\n"
@@ -2789,11 +2540,8 @@ 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 class\n"
 
 #: src/msgunfmt.c:442
 #, c-format
@@ -2802,19 +2550,13 @@ 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# resources 模式：輸入內容是 .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
@@ -2829,8 +2571,7 @@ 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"
@@ -2870,7 +2611,7 @@ msgstr "  -i, --indent                將輸出結果進行縮排\n"
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                輸出結果嚴格遵從 Uniforum 格式\n"
 
-#: src/msguniq.c:331
+#: src/msguniq.c:330
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2890,18 +2631,15 @@ msgstr ""
 "則會由第一個翻譯條目中讀取這些資料。檔案位置是會累積下來的。\n"
 "當使用 --unique 選項時，則會捨棄任何重複的翻譯條目。\n"
 
-#: src/msguniq.c:364
+#: src/msguniq.c:363
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              只顯示重複條目\n"
 
-#: src/msguniq.c:366
+#: src/msguniq.c:365
 #, 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
@@ -2962,27 +2700,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "不一致地使用 #~"
 
-#: src/po-gram-gen.y:243
+#: src/po-gram-gen.y:240
 #, fuzzy, c-format
 msgid "missing 'msgstr[]' section"
 msgstr "缺少了 ‘msgstr[]’ 段落"
 
-#: src/po-gram-gen.y:252
+#: src/po-gram-gen.y:249
 #, fuzzy, c-format
 msgid "missing 'msgid_plural' section"
 msgstr "缺少了 ‘msgid_plural’ 段落"
 
-#: src/po-gram-gen.y:260
+#: src/po-gram-gen.y:257
 #, fuzzy, c-format
 msgid "missing 'msgstr' section"
 msgstr "缺少了 ‘msgstr’ 段落"
 
-#: src/po-gram-gen.y:399
+#: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "第一個複數格式的索引數字不是 0"
 
-#: src/po-gram-gen.y:401
+#: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
 msgstr "複數格式含有錯誤的索引數字"
@@ -2992,7 +2730,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:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:740 src/write-po.c:869
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "無效的位元組序列"
@@ -3036,16 +2774,16 @@ msgstr "字串中間突然斷行"
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:318 src/xgettext.c:1046
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "此檔案不能含有 domain 指令"
 
-#: src/read-catalog.c:363
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "訊息被重複定義"
 
-#: src/read-catalog.c:365
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
 msgstr "...這是第一次定義的位置"
@@ -3185,41 +2923,25 @@ msgstr ""
 
 #: 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 檔案格式。"
+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:129
 #, fuzzy
-msgid ""
-"Cannot output multiple translation domains into a single file with the "
-"specified output format."
-msgstr ""
-"不可以將多個屬於不同領域的翻譯訊息寫入一個 NeXTstep/GNUstep .strings 檔案。"
+msgid "Cannot output multiple translation domains into a single file with the specified output format."
+msgstr "不可以將多個屬於不同領域的翻譯訊息寫入一個 NeXTstep/GNUstep .strings 檔案。"
 
 #: src/write-catalog.c:162
 #, 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 "翻譯檔含有複數型態的翻譯，但輸出檔的格式不支援複數型態。"
 
 #: 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 檔案。"
+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:202
-msgid ""
-"message catalog has plural form translations, but the output format does not "
-"support them."
+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
@@ -3246,35 +2968,32 @@ msgstr "編譯 C# class 檔出現錯誤，請嘗試使用 --verbose 選項"
 msgid "compilation of C# class failed"
 msgstr "編譯 C# class 檔出現錯誤，請嘗試使用 --verbose 選項"
 
-#: src/write-java.c:1091
+#: src/write-java.c:1080
 #, c-format
 msgid "not a valid Java class name: %s"
 msgstr "並非有效的 Java class 名稱：%s"
 
-#: src/write-java.c:1210
+#: src/write-java.c:1165
 #, 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:1213
+#: src/write-java.c:1168
 #, fuzzy, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr ""
-"編譯 Java class 檔出現錯誤，請嘗試使用 --verbose 選項或設定 $JAVAC 環境變數"
+msgstr "編譯 Java class 檔出現錯誤，請嘗試使用 --verbose 選項或設定 $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:875
+#: src/write-po.c:803
 #, 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’ 這個轉義控制序列 (escape sequence)"
 
-#: src/write-po.c:1326 src/write-po.c:1450
+#: src/write-po.c:1254 src/write-po.c:1383
 #, fuzzy, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3287,7 +3006,7 @@ msgstr ""
 "請考慮使用只有 ASCII 字元的 msgid。\n"
 "%s\n"
 
-#: src/write-po.c:1338 src/write-po.c:1462
+#: src/write-po.c:1266 src/write-po.c:1395
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3309,22 +3028,17 @@ msgstr "翻譯檔含有複數型態的翻譯，但 Qt 的翻譯檔不能處理�
 #: src/write-qt.c:693
 #, fuzzy
 msgid ""
-"message catalog has msgctxt strings containing characters outside "
-"ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
-msgstr ""
-"翻譯檔中某些 msgid 含有 ISO-8859-1 以外的字元，但 Qt 翻譯檔格式只支援翻譯後的"
-"字句使用 Unicode，未翻譯的字句是不支援的。\n"
+msgstr "翻譯檔中某些 msgid 含有 ISO-8859-1 以外的字元，但 Qt 翻譯檔格式只支援翻譯後的字句使用 Unicode，未翻譯的字句是不支援的。\n"
 
 #: src/write-qt.c:717
 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 以外的字元，但 Qt 翻譯檔格式只支援翻譯後的字句使用 Unicode，未翻譯的字句是不支援的。\n"
 
 #: src/write-resources.c:94
 #, c-format
@@ -3357,7 +3071,7 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr "翻譯檔含有複數型態的翻譯，但 Tcl 的翻譯檔不能處理複數型態\n"
 
-#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
+#: src/x-awk.c:341 src/x-javascript.c:988 src/x-python.c:1128
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: 警告：字串未完結"
@@ -3367,22 +3081,17 @@ msgstr "%s:%d: 警告：字串未完結"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: 警告：正規表示式不完整"
 
-#: src/x-c.c:1051
-#, fuzzy, c-format
-msgid "warning: invalid Unicode character"
-msgstr "%s:%d: 警告：Unicode 字元無效"
-
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:762
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: 警告：字元常數未完結"
 
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1247 src/x-vala.c:832
 #, 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:224 src/xgettext.c:2055
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3439,7 +3148,7 @@ msgstr ""
 "%s:%d: 出現無效的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1138
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: 警告：Unicode 字元無效"
@@ -3459,22 +3168,22 @@ msgstr "%s:%d: 應該有 ‘)’ 的地方出現了 ‘}’"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: 應該有 ‘}’ 的地方出現了 ‘)’"
 
-#: src/x-glade.c:295
+#: src/x-glade.c:561
 #, c-format
 msgid "Missing context for the string extracted from '%s' element"
 msgstr ""
 
-#: src/x-glade.c:417
+#: src/x-glade.c:686
 #, c-format
 msgid "The root element <%s> is not allowed in a valid Glade file"
 msgstr ""
 
-#: src/x-glade.c:572 src/x-glade.c:579
+#: src/x-glade.c:841 src/x-glade.c:848
 #, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:606
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3540,21 +3249,11 @@ msgstr ""
 "%s:%d: 出現無效的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-javascript.c:954
+#: src/x-javascript.c:1147
 #, fuzzy, c-format
 msgid "%s:%d: warning: RegExp literal terminated too early"
 msgstr "%s:%d: 警告：字串未完結"
 
-#: src/x-javascript.c:1055
-#, fuzzy, c-format
-msgid "%s:%d: warning: %s is not allowed"
-msgstr "%s:%d: 警告：Unicode 字元無效"
-
-#: src/x-javascript.c:1069
-#, fuzzy, c-format
-msgid "%s:%d: warning: unterminated XML markup"
-msgstr "%s:%d: 警告：字串未完結"
-
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3668,99 +3367,81 @@ 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"
+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:413
+#: src/x-vala.c:558
 #, fuzzy, c-format
 msgid "%s:%d: warning: regular expression literal terminated too early"
 msgstr "%s:%d: 警告：字串未完結"
 
-#: src/xgettext.c:545
-#, c-format
-msgid "'%s' is not a valid encoding name.  Using ASCII as fallback.\n"
-msgstr ""
-
-#: src/xgettext.c:648
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "當結果被導向至標準輸出時，不可以用 --join-existing 選項"
 
-#: src/xgettext.c:653
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "若無關鍵字，xgettext 將無法運作"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:785
 #, fuzzy, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "警告：無法辨認檔案 ‘%s’ 的副檔名 ‘%s’；會假設是 C 格式來處理"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "由指定的輸入檔抽取可翻譯的字串。\n"
 
-#: src/xgettext.c:882
+#: 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"
+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:884
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           將輸出內容寫入至指定檔案\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:863
 #, 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        輸出檔會存取在指定目錄\n"
 
-#: src/xgettext.c:891
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "輸入檔的語言選擇：\n"
 
-#: src/xgettext.c:893
+#: src/xgettext.c:870
 #, fuzzy, 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"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
-"                                JavaScript, Vala, Desktop)\n"
+"                                JavaScript, Vala)\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)\n"
 
-#: src/xgettext.c:900
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ 的簡寫\n"
 
-#: src/xgettext.c:902
+#: src/xgettext.c:879
 #, 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:907
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3769,224 +3450,199 @@ msgstr ""
 "      --from-code=NAME        輸入檔的文字編碼\n"
 "                                (Python, Tcl, Glade 例外)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:887
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "輸入檔內容預設會當作 ASCII 看待。\n"
 
-#: src/xgettext.c:915
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         合併已存在的訊息檔\n"
 
-#: src/xgettext.c:917
+#: 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"
 
-#: src/xgettext.c:919
+#: src/xgettext.c:896
 #, 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:925
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "個別語言特殊選項：\n"
 
-#: src/xgettext.c:927
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           抽取所有字串\n"
 
-#: src/xgettext.c:929
+#: 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"
+"                                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"
 
-#: src/xgettext.c:937
+#: src/xgettext.c:911
 #, 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, Desktop)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"                                (只適用於 C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, "
-"Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"  -k, --keyword[=WORD]        要留意的額外關鍵字 (如果沒有指定，\n"
+"                              表示不使用預設的關鍵字)\n"
 
-#: src/xgettext.c:942
+#: src/xgettext.c:919
 #, 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:945
+#: src/xgettext.c:922
 #, fuzzy, 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"
 
-#: src/xgettext.c:950
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             支援讀取輸入內容中的 ANSI C trigraph\n"
 
-#: src/xgettext.c:952
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (只適用於 C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:954
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    辨認 Qt 格式的字串\n"
 
-#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (只適用於 C++)\n"
 
-#: src/xgettext.c:958
+#: src/xgettext.c:935
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    辨認 Qt 格式的字串\n"
 
-#: src/xgettext.c:962
+#: src/xgettext.c:939
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --qt                    辨認 Qt 格式的字串\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:943
 #, c-format
-msgid ""
-"      --debug                 more detailed formatstring recognition result\n"
+msgid "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 顯示較詳細的格式字串辨認結果\n"
 
-#: src/xgettext.c:991
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     輸出檔格式為 Java .properties 檔\n"
 
-#: src/xgettext.c:1006
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=STRING  設定輸出檔的版權所有者\n"
 
-#: src/xgettext.c:1008
+#: src/xgettext.c:985
 #, c-format
-msgid ""
-"      --foreign-user          omit FSF copyright in output for foreign user\n"
-msgstr ""
-"      --foreign-user          輸出檔不加上 FSF 的版權宣告，適用於 FSF 以外的"
-"專案\n"
+msgid "      --foreign-user          omit FSF copyright in output for foreign user\n"
+msgstr "      --foreign-user          輸出檔不加上 FSF 的版權宣告，適用於 FSF 以外的專案\n"
 
-#: src/xgettext.c:1010
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:1012
+#: src/xgettext.c:989
 #, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --copyright-holder=STRING  設定輸出檔的版權所有者\n"
 
-#: src/xgettext.c:1014
+#: 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 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr "      --msgid-bugs-address=EMAIL@ADDRESS  指定匯報 msgid 問題時的郵件地址\n"
 
-#: src/xgettext.c:1016
+#: src/xgettext.c:993
 #, 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:1019
+#: src/xgettext.c:996
 #, 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:1840
+#: src/xgettext.c:1817
 #, 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:1965
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "標準輸入"
 
-#: src/xgettext.c:2071
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2075
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:2080
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: 警告："
 
-#: src/xgettext.c:2189
+#: 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"
+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:2190
+#: src/xgettext.c:2139
 #, c-format
-msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: "
-"%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
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3995,7 +3651,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2283
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4005,27 +3661,27 @@ msgstr ""
 "gettext(\"\") 會回傳檔案開始部份的資訊，\n"
 "並非空白字串。\n"
 
-#: src/xgettext.c:2979
+#: src/xgettext.c:2869
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "%2$s 的引數 %1$s 不明確"
 
-#: src/xgettext.c:3006
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3031
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:3052
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3419
+#: src/xgettext.c:3052
 #, fuzzy
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
@@ -4038,7 +3694,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS 變數；否則請在指令中\n"
 "使用 --msgid-bugs-address 選項。\n"
 
-#: src/xgettext.c:3638
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "不明的語言 ‘%s’"
@@ -4058,10 +3714,8 @@ 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"
@@ -4100,8 +3754,7 @@ 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 @"