Regenerated for 0.18.3.

36 files changed, 18406 insertions, 9791 deletions

diff --git a/gettext-tools/po/be.po b/gettext-tools/po/be.po
index e69f7c0..aa8c336 100644
--- a/gettext-tools/po/be.po
+++ b/gettext-tools/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 0.11.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\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"
@@ -59,32 +59,32 @@ msgstr ""
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "памылка ў час чытаньня файла \"%s\""
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "немагчыма адчыніць дубліруючы файл \"%s\" для запісу"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "памылка чытаньня \"%s\""
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "памылка запісу файла \"%s\""
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "памылка пасля чытаньня \"%s\""
@@ -218,7 +218,7 @@ msgstr "падпрацэс %s, памылка ўводу-вываду"
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "памяць вычарпана"
@@ -285,7 +285,7 @@ msgstr ""
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -318,19 +318,19 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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\""
 
-#: src/format.c:148
+#: 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-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
@@ -339,7 +339,7 @@ msgid ""
 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-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
@@ -348,9 +348,10 @@ 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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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 неаднолькавыя"
@@ -378,7 +379,8 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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 "колькасьць спэцыфікацый фармату ў 'msgid' і '%s' не супадае"
@@ -657,7 +659,9 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: 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\""
@@ -699,6 +703,32 @@ msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта '%s' неаднолькавыя"
 
+#: src/format-python-brace.c:136
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr ""
+
+#: src/format-python-brace.c:149
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+
+#: src/format-python-brace.c:164
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
+
+#: src/format-python-brace.c:184
+#, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+
+#: src/format-python-brace.c:210
+#, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr ""
+
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -740,11 +770,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -753,17 +783,17 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -775,11 +805,11 @@ msgstr ""
 msgid "too many arguments"
 msgstr "вельмі шмат аргумэнтаў"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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"
@@ -822,29 +852,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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 ""
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1004
 #, fuzzy, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -856,11 +886,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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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"
 
@@ -869,30 +899,30 @@ msgstr "Паведамляйце аб памылках на адрас <bug-gnu-
 msgid "could not get host name"
 msgstr "немагчыма атрымаць назву вузла"
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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:412
+#: src/msgattrib.c:419
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -901,7 +931,7 @@ msgstr ""
 "Фільтруе паведамленьні каталёга перакладаў суадносна іх атрыбутам, а так сама,\n"
 "узьдзейнічае на іх\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -911,29 +941,29 @@ msgid ""
 msgstr ""
 "Аргумэнты, абавязковыя для доўгіх выбараў, абавязковы й для кароткіх.\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "невызначан уваходзячы файл"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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 ""
 
-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/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
 #, fuzzy, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
@@ -942,22 +972,22 @@ msgstr ""
 "  ФАЙЛ ...                 .mo файлы\n"
 "Калі ўваходзячы файл не зададзен, ці замест яго -, чытае стандартны ўвод.\n"
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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 ""
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
 #, fuzzy, c-format
@@ -970,99 +1000,109 @@ msgstr ""
 "Вынікі запісваюцца ў стандартны вывад, калі ймя файла для вываду не\n"
 "зададзена, ці замест яго -.\n"
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, fuzzy, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+"Рэжым дзеяньня:\n"
+"  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
+"      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
+
+#: src/msgattrib.c:471
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/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
@@ -1070,14 +1110,14 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1085,17 +1125,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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"
@@ -1104,87 +1144,87 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/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:939
+#: 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 ""
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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 ""
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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 ""
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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 ""
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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 ""
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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 ""
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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 ""
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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 ""
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1205,16 +1245,16 @@ msgstr ""
 "                           даўжэй чым шырыня, на некалькі радкоў\n"
 "  -s, --sort-output        ствараць упарадкаваны вывад\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1224,7 +1264,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "зададзен немагчымы крытэрый выбару (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]...\n"
@@ -1253,18 +1293,18 @@ msgstr ""
 "будуць узяты  з першага PO-файла.\n"
 "Пазіцыі з усіх PO-файлаў будуць аб'яднаны ў кучу\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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 ""
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
@@ -1475,7 +1515,7 @@ msgid ""
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1523,7 +1563,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "невызначан уваходзячы файл"
@@ -1682,7 +1722,7 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr ""
 
@@ -1760,7 +1800,7 @@ msgstr "Выкарыстаньне: %s [ВЫБАР] файл.po ...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Стварае дваічны каталёг паведамленьняў зь іх тэкставага апісаньня.\n"
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1774,7 +1814,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
@@ -1830,7 +1870,7 @@ msgstr ""
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -1913,7 +1953,7 @@ msgid ""
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
@@ -2058,11 +2098,12 @@ msgstr "%s: увага: ізыходны файл змяшчае недакла�
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "памылка ў час чытаньня \"%s\""
@@ -2291,8 +2332,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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "увага: "
@@ -2489,24 +2530,15 @@ msgstr ""
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:785
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "поле загалоку `%s' прапушчана ў загалоўку\n"
-
-#: src/msgl-check.c:793
+#: src/msgl-check.c:801
 #, fuzzy, 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"
+msgid "header field '%s' still has the initial default value\n"
 msgstr "некаторыя палі загалока ўсё яшчэ маюць пачатковае значэньне\n"
 
-#: src/msgl-check.c:835
+#: src/msgl-check.c:816
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "некаторыя палі загалока ўсё яшчэ маюць пачатковае значэньне\n"
+msgid "header field '%s' missing in header\n"
+msgstr "поле загалоку `%s' прапушчана ў загалоўку\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2523,7 +2555,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "уваходзячы файл не змяшчае загаловачнага запісу аб наборы сімвалаў"
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:623 src/xgettext.c:693
+#: src/x-python.c:665 src/xgettext.c:708
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2539,8 +2571,8 @@ msgid ""
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2959,7 +2991,7 @@ msgstr "сімвал канца радка знаходзіцца ўнутры �
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "гэты файл можа не змяшчаць дырэктыў дамену"
@@ -3278,7 +3310,7 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: src/x-awk.c:341 src/x-javascript.c:988 src/x-python.c:1128
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: увага: незавершаны радок"
@@ -3288,17 +3320,17 @@ msgstr "%s:%d: увага: незавершаны радок"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: увага: незавершаны радок"
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-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:1247
+#: 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:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3330,7 +3362,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, fuzzy, c-format
 msgid "%s:%d: iconv failure"
 msgstr "памылка iconv"
@@ -3342,7 +3374,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
@@ -3362,12 +3394,22 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3381,6 +3423,50 @@ msgstr ""
 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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: увага: незавершаны радок"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3416,13 +3502,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:236
+#: 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:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3430,7 +3516,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3438,7 +3524,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3446,7 +3532,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3454,7 +3540,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3462,7 +3548,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3489,50 +3575,55 @@ msgid ""
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: увага: незавершаны радок"
+
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--joun-existing не можа быць выкарастаны пры запісы ў stdout"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не можа працаваць без ключавых слоў для пошуку"
 
-#: src/xgettext.c:770
+#: 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:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Атрымлівае перакладаемыя радкі з дадзеных уваходзячых файлаў.\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "невызначан уваходзячы файл"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:870
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3541,44 +3632,45 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:880
+#: src/xgettext.c:896
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3588,33 +3680,34 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:890 src/xgettext.c:897
+#: 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"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3622,26 +3715,27 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:904
+#: src/xgettext.c:922
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, fuzzy, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
@@ -3649,12 +3743,12 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
@@ -3662,7 +3756,7 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
@@ -3670,45 +3764,45 @@ msgstr ""
 "  -j, --java               Java рэжым: увод гэта ResourceBundle кляс\n"
 "      --tcl                Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3716,7 +3810,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3724,52 +3818,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "стандартны ўвод"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: увага: "
 
-#: src/xgettext.c:2104
+#: 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 ""
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, fuzzy, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr "'%s' - гэта нерэчаісны %s фармат радку, у адрозьненьне ад 'msgid'"
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3778,7 +3872,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3788,27 +3882,27 @@ msgstr ""
 "gettext(\"\") вяртае загаловак зь\n"
 "метададзенымі, а ня пусты радок.\n"
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "неадназначны аргумэнт `%s' для `%s'"
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "неадназначны аргумэнт `%s' для `%s'"
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "неадназначны аргумэнт `%s' для `%s'"
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3816,7 +3910,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "невядомая мова `%s'"
@@ -3825,6 +3919,13 @@ msgstr "невядомая мова `%s'"
 msgid "<unnamed>"
 msgstr ""
 
+#, fuzzy
+#~ 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"
 
diff --git a/gettext-tools/po/bg.po b/gettext-tools/po/bg.po
index e576fc3..7bf7371 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.18.3\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-06-25 17:48+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2013-06-25 23:33+0300\n"
 "Last-Translator: Roumen Petrov <transl@roumenpetrov.info>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -34,7 +34,8 @@ 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
@@ -197,12 +198,16 @@ 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
@@ -326,7 +331,8 @@ 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
@@ -354,8 +360,12 @@ 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
@@ -385,12 +395,15 @@ 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
@@ -399,7 +412,9 @@ 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
@@ -419,13 +434,18 @@ msgstr "При директива номер %u, точност не е разр
 
 #: src/format-gcc-internal.c:334
 #, c-format
-msgid "In the directive number %u, the argument number for the precision must be equal to %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
 msgstr "При директива номер %u, числото за точност трябва да бъде равно на %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "При директива номер %u, указването на точност не е разрешено преди '%c'."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"При директива номер %u, указването на точност не е разрешено преди '%c'."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -462,33 +482,51 @@ 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
@@ -497,7 +535,9 @@ 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
@@ -507,13 +547,18 @@ msgstr "При директива номер %u, \"%s\" не е последва
 
 #: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "При директива номер %u, низът \"%s\" не е правилен за число."
 
 #: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "При директива номер %u, номера на аргумент не е последван от запетая или някой от \"%s\", \"%s\", \"%s\", \"%s\"."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"При директива номер %u, номера на аргумент не е последван от запетая или "
+"някой от \"%s\", \"%s\", \"%s\", \"%s\"."
 
 #: src/format-java.c:572
 #, c-format
@@ -522,13 +567,19 @@ 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
@@ -537,21 +588,34 @@ 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
@@ -581,8 +645,12 @@ 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
@@ -605,7 +673,9 @@ 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
@@ -616,8 +686,12 @@ 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
@@ -626,22 +700,31 @@ 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:136
@@ -661,8 +744,11 @@ msgstr "При директива номер %u, с '%c' не може да се
 
 #: src/format-python-brace.c:184
 #, 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:210
 #, c-format
@@ -671,20 +757,32 @@ 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."
@@ -692,12 +790,16 @@ 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:344 src/msgcat.c:289 src/msgcmp.c:172
@@ -771,10 +873,12 @@ 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
@@ -865,8 +969,11 @@ msgstr ""
 #: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
 #: src/msguniq.c:341
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Задължителни аргументи за \"дълги\" опции са също задължителни за \"къси\" опции.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Задължителни аргументи за \"дълги\" опции са също задължителни за \"къси\" "
+"опции.\n"
 
 #: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
 #: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
@@ -886,14 +993,19 @@ msgstr "  ВХФАЙЛ                      входящ PO файл\n"
 #: 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=ДИР         добавя директория ДИР към списъка за търсене на входящи файлове\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr ""
+"  -D, --directory=ДИР         добавя директория ДИР към списъка за търсене "
+"на входящи файлове\n"
 
 #: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
 #: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
-msgstr "Ако не е зададено име на входящ файл или то е -, ще се чете от стандартния вход.\n"
+msgstr ""
+"Ако не е зададено име на входящ файл или то е -, ще се чете от стандартния "
+"вход.\n"
 
 #: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
 #: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
@@ -908,7 +1020,8 @@ msgstr "Местоположение на резултатата:\n"
 #: 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"
+msgstr ""
+"  -o, --output-file=ФАЙЛ      записване на резултата в зададения файл\n"
 
 #: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
 #: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
@@ -917,7 +1030,9 @@ msgstr "  -o, --output-file=ФАЙЛ      записване на резулта
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
-msgstr "Резултатите се извеждат на стандартния изход, ако не е зададен файл за запис или той е -\n"
+msgstr ""
+"Резултатите се извеждат на стандартния изход, ако не е зададен файл за запис "
+"или той е -\n"
 
 #: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
@@ -926,23 +1041,33 @@ msgstr "Избор на съобщения:\n"
 
 #: src/msgattrib.c:445
 #, 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:447
 #, 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:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy              изтриване на съобщенията отбелязани като мъгляви('fuzzy')\n"
+msgstr ""
+"      --no-fuzzy              изтриване на съобщенията отбелязани като "
+"мъгляви('fuzzy')\n"
 
 #: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            запазване на на съобщенията отбелязани като мъгляви('fuzzy')\n"
+msgstr ""
+"      --only-fuzzy            запазване на на съобщенията отбелязани като "
+"мъгляви('fuzzy')\n"
 
 #: src/msgattrib.c:453
 #, c-format
@@ -962,22 +1087,30 @@ msgstr "Управление на атрибутите:\n"
 #: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr "      --set-fuzzy             установяване на всички съобщения като мъгляви('fuzzy')\n"
+msgstr ""
+"      --set-fuzzy             установяване на всички съобщения като "
+"мъгляви('fuzzy')\n"
 
 #: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr "      --clear-fuzzy           установяване на всички съобщения да не са мъгляви('fuzzy')\n"
+msgstr ""
+"      --clear-fuzzy           установяване на всички съобщения да не са "
+"мъгляви('fuzzy')\n"
 
 #: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
-msgstr "      --set-obsolete          установяване на всички съобщения като остаряли\n"
+msgstr ""
+"      --set-obsolete          установяване на всички съобщения като "
+"остаряли\n"
 
 #: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        установяване на всички съобщения да не са остаряли\n"
+msgstr ""
+"      --clear-obsolete        установяване на всички съобщения да не са "
+"остаряли\n"
 
 #: src/msgattrib.c:468
 #, c-format
@@ -986,22 +1119,32 @@ msgid ""
 "                              of translated messages.\n"
 msgstr ""
 "      --previous              при отбелязване като 'мъгляв', да се запазват\n"
-"                              предишните msgid-та, на преведените съобщения.\n"
+"                              предишните msgid-та, на преведените "
+"съобщения.\n"
 
 #: src/msgattrib.c:471
 #, 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:473
 #, 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:475
 #, 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:477
 #, c-format
@@ -1010,8 +1153,10 @@ msgstr "      --fuzzy                 синоним за --only-fuzzy --clear-f
 
 #: src/msgattrib.c:479
 #, 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: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
@@ -1024,14 +1169,21 @@ msgstr "Синтаксис на входящия файл:\n"
 #: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
 #: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, 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: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 .низове\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     входящия файл е със синтаксис на NeXTstep/"
+"GNUstep .низове\n"
 
 #: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
 #: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
@@ -1048,11 +1200,15 @@ 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: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
@@ -1065,46 +1221,61 @@ msgstr "      --style=СТИЛФАЙЛ        задава CSS правила з
 #: 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             без използване на Си освобождаващи последователности в резултата (по подразбиране)\n"
+msgid ""
+"  -e, --no-escape             do not use C escapes in output (default)\n"
+msgstr ""
+"  -e, --no-escape             без използване на Си освобождаващи "
+"последователности в резултата (по подразбиране)\n"
 
 #: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
 #: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
 #: src/msguniq.c:390 src/xgettext.c:956
 #, 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: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"
+msgstr ""
+"      --force-po              записване на PO файл, дори ако е празен\n"
 
 #: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
 #: src/xgettext.c:960
 #, 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: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           без записване на редове '#: filename:line'\n"
+msgstr ""
+"      --no-location           без записване на редове '#: filename:line'\n"
 
 #: 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          създаване на редове '#: filename:line' (по подразбиране)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          създаване на редове '#: filename:line' (по "
+"подразбиране)\n"
 
 #: 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 файл\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                записва строго отговарящ за уеднаквяване .po "
+"файл\n"
 
 #: src/msgattrib.c:511 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
 #: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
@@ -1117,15 +1288,19 @@ msgstr "  -p, --properties-output     записване на Java .properties �
 #: 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    записване на 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: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=ЦЯЛО            установяване на ширината на изходящата страница\n"
+msgstr ""
+"  -w, --width=ЦЯЛО            установяване на ширината на изходящата "
+"страница\n"
 
 #: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
 #: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
@@ -1150,7 +1325,8 @@ msgstr "  -s, --sort-output           резултатът да е подред�
 #: src/xgettext.c:979
 #, 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:321 src/msgcomm.c:326
 #, c-format
@@ -1193,7 +1369,9 @@ msgstr "  ВХФАЙЛ ...                  входящи файлове\n"
 #: 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=ФАЙЛ       получаване на списъка с входящи файлове от ФАЙЛ\n"
+msgstr ""
+"  -f, --files-from=ФАЙЛ       получаване на списъка с входящи файлове от "
+"ФАЙЛ\n"
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
 #: src/xgettext.c:854
@@ -1207,8 +1385,10 @@ 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:410
 #, c-format
@@ -1216,7 +1396,8 @@ 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:413 src/msgcomm.c:404
@@ -1231,8 +1412,11 @@ msgstr ""
 #: 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      входящите файлове са с 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:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
 #: src/msgmerge.c:559
@@ -1241,7 +1425,8 @@ 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:427 src/msgconv.c:332 src/msguniq.c:377
@@ -1260,8 +1445,10 @@ msgstr ""
 
 #: 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=ИМЕКАТАЛОГ       задава поле '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:286 src/msgmerge.c:350
@@ -1317,8 +1504,12 @@ msgstr "Уточняване на операциите:\n"
 
 #: 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:550
 #, c-format
@@ -1404,13 +1595,16 @@ 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:451 src/xgettext.c:981
 #, 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:306
 #, c-format
@@ -1436,13 +1630,17 @@ msgstr "  -i, --indent                резултат в стил с отмес
 #: src/msgmerge.c:581
 #, 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: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"
+msgid ""
+"      --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"      --add-location          запазване на редове '#: filename:line' (по "
+"подразбиране)\n"
 
 #: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
 #: src/msgmerge.c:585
@@ -1563,27 +1761,37 @@ msgstr "Полезни ФИЛТЪР-ОПЦИИ, когато ФИЛТЪР е 'se
 
 #: src/msgfilter.c:423
 #, 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: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"
+"  -f, --file=СКРИПТФАЙЛ       добавя съдържанието на СКРИПТФАЙЛ към "
+"командите\n"
 "                                за изпълнение\n"
 
 #: src/msgfilter.c:428
 #, 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:446 src/msggrep.c:595
 #, 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:452 src/msggrep.c:601
 #, c-format
@@ -1592,8 +1800,11 @@ msgstr "      --indent                резултат в стил с отмес
 
 #: src/msgfilter.c:454
 #, 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:304
 #, c-format
@@ -1667,7 +1878,9 @@ msgstr "Употреба: %s [ОПЦИЯ] имефайл.po ...\n"
 #: src/msgfmt.c:658
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
-msgstr "Създаване на двоичен каталог със съобщения от текстово описание на преводите.\n"
+msgstr ""
+"Създаване на двоичен каталог със съобщения от текстово описание на "
+"преводите.\n"
 
 #: src/msgfmt.c:663 src/xgettext.c:841
 #, c-format, no-wrap
@@ -1690,13 +1903,21 @@ msgstr "Режими на работа:\n"
 
 #: src/msgfmt.c:679
 #, 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: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:683
 #, c-format
@@ -1705,13 +1926,19 @@ msgstr "      --csharp                C# режим: създаване на .NE
 
 #: src/msgfmt.c:685
 #, 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:687
 #, 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:689
 #, c-format
@@ -1741,22 +1968,29 @@ msgstr "  -r, --resource=РЕСУРС       име на ресурс\n"
 #: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
 #: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, 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:707
 #, 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: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"
+"Името на класа се определя като се добави името на локал към името на "
+"ресурса,\n"
 "разделени с долна черта.  Опцията -d е задължителна.  Класът се записва в\n"
 "зададената директория.\n"
 
@@ -1767,8 +2001,12 @@ msgstr "Местоположение на резултата при C# режи�
 
 #: src/msgfmt.c:721 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:723
 #, c-format
@@ -1787,7 +2025,9 @@ msgstr "Местоположение на резултата при Tcl режи
 #: src/msgfmt.c:731 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:733
 #, c-format
@@ -1807,20 +2047,29 @@ 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:750
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr "      --check-format          проверка на езиково зависимите форматиращи низове\n"
+msgstr ""
+"      --check-format          проверка на езиково зависимите форматиращи "
+"низове\n"
 
 #: src/msgfmt.c:752
 #, 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:754
 #, c-format
@@ -1828,46 +2077,64 @@ 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:757
 #, 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: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[=ЗНАК]  проверка за наличието на ускорени клавиши\n"
+"      --check-accelerators[=ЗНАК]  проверка за наличието на ускорени "
+"клавиши\n"
 "                                за елементи на меню\n"
 
 #: src/msgfmt.c:762
 #, 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: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: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=ПОДРБАЙТ   извежда 32-битови числа в зададената подредба на байтове\n"
-"                                (старши или младши, по подразбиране зависи от процесора)\n"
+"      --endianness=ПОДРБАЙТ   извежда 32-битови числа в зададената подредба "
+"на байтове\n"
+"                                (старши или младши, по подразбиране зависи "
+"от процесора)\n"
 
 #: src/msgfmt.c:772
 #, 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:781
 #, c-format
@@ -1907,7 +2174,9 @@ msgstr "името на област \"%s\" не е подходящо за им
 #: src/msgfmt.c:941
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "името на област  \"%s\" не е подходящо за име на файл: ще се използва представка"
+msgstr ""
+"името на област  \"%s\" не е подходящо за име на файл: ще се използва "
+"представка"
 
 #: src/msgfmt.c:955
 #, c-format
@@ -1943,8 +2212,12 @@ msgstr "грешка при четене на \"%s\""
 
 #: 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 "опцията '%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:516
 #, c-format, no-wrap
@@ -2032,8 +2305,11 @@ msgstr ""
 
 #: src/msggrep.c:597
 #, 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:618
 #, c-format
@@ -2043,7 +2319,8 @@ msgstr "      --sort-output           резултатът да е подред�
 #: src/msggrep.c:620
 #, 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 ""
@@ -2088,7 +2365,8 @@ 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"
@@ -2097,7 +2375,8 @@ 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
@@ -2116,8 +2395,10 @@ 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 ""
@@ -2149,13 +2430,18 @@ 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 ...",
@@ -2177,13 +2463,18 @@ 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
@@ -2203,17 +2494,20 @@ 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"
 
@@ -2227,7 +2521,8 @@ 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
@@ -2290,7 +2585,9 @@ 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"
@@ -2301,8 +2598,12 @@ 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
@@ -2349,8 +2650,12 @@ 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'"
@@ -2419,19 +2724,31 @@ msgstr "входящия файл не съдържа запис указващ
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
 #: src/x-python.c:665 src/xgettext.c:708
 #, 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: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:383 src/msgmerge.c:389
 #, c-format
@@ -2469,7 +2786,8 @@ msgstr ""
 #: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      преводи препращащи към на старите източници\n"
+msgstr ""
+"  def.po                      преводи препращащи към на старите източници\n"
 
 #: src/msgmerge.c:504
 #, c-format
@@ -2482,7 +2800,8 @@ 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:514
@@ -2517,7 +2836,8 @@ msgstr "      --suffix=НАСТ           задава наставка за р�
 #: 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"
@@ -2534,7 +2854,8 @@ msgstr ""
 #: 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 или с\n"
@@ -2542,13 +2863,17 @@ msgstr ""
 
 #: src/msgmerge.c:552
 #, 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:609 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:1604
 #, c-format
@@ -2562,8 +2887,12 @@ msgstr "това съобщение не трябва да зададе форм
 
 #: 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:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2584,12 +2913,18 @@ 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
@@ -2598,13 +2933,19 @@ 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
@@ -2619,10 +2960,12 @@ 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
@@ -2656,7 +2999,8 @@ 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
@@ -2691,8 +3035,12 @@ msgstr "  -d, --repeated              извежда само повторени
 
 #: 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
@@ -2706,7 +3054,8 @@ msgid ""
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 "Кодовото множество, \"%s\", не е с преносимо име за кодировка.\n"
-"Преобразуването на съобщенията към потребителското кодовото множество може да не работи.\n"
+"Преобразуването на съобщенията към потребителското кодовото множество може "
+"да не работи.\n"
 
 #: src/po-charset.c:557
 #, c-format
@@ -2973,24 +3322,46 @@ 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
@@ -3024,12 +3395,15 @@ msgstr "неправилно име за клас на Java: %s"
 #: src/write-java.c:1165
 #, 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:1168
 #, 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
@@ -3038,8 +3412,11 @@ msgstr "грешка при отваряне на \"%s\" за запис"
 
 #: src/write-po.c:803
 #, 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:1254 src/write-po.c:1383
 #, c-format
@@ -3077,7 +3454,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 ""
@@ -3313,7 +3691,9 @@ 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
@@ -3430,8 +3810,12 @@ 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:558
 #, c-format
@@ -3441,7 +3825,9 @@ msgstr "%s:%d: предупреждение: предсрочно прекъсн
 #: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
-msgstr "--join-existing не може да се използва, когато резултата се записва на стандартния изход"
+msgstr ""
+"--join-existing не може да се използва, когато резултата се записва на "
+"стандартния изход"
 
 #: src/xgettext.c:641
 #, c-format
@@ -3451,7 +3837,8 @@ msgstr "xgettext не може да работи без ключове за тъ
 #: src/xgettext.c:785
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr "предупреждение: файлът '%s' с окончание '%s' е непознат, ще се опита Си"
+msgstr ""
+"предупреждение: файлът '%s' с окончание '%s' е непознат, ще се опита Си"
 
 #: src/xgettext.c:836
 #, c-format
@@ -3460,18 +3847,26 @@ msgstr "Извличане на низовете за превод от зада
 
 #: 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=ИМЕ   използване на ИМЕ.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:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr "  -o, --output=ФАЙЛ           записване на изходните данни в указания файл\n"
+msgstr ""
+"  -o, --output=ФАЙЛ           записване на изходните данни в указания файл\n"
 
 #: src/xgettext.c:863
 #, 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:868
 #, c-format
@@ -3482,16 +3877,20 @@ 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)\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)\n"
 
@@ -3502,8 +3901,12 @@ msgstr "  -C, --c++                   за краткост на --language=C++\
 
 #: src/xgettext.c:879
 #, 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:884
 #, c-format
@@ -3522,7 +3925,8 @@ msgstr "По подразбиране входящите файлове са в
 #: src/xgettext.c:892
 #, 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:894
 #, c-format
@@ -3534,7 +3938,8 @@ 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"
@@ -3556,12 +3961,14 @@ 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"
 
@@ -3577,7 +3984,8 @@ msgstr ""
 #: 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=ДУМА:АРГ:ФЛАГ    допълнителен флаг за низове при номер на\n"
@@ -3587,19 +3995,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, 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:927
 #, 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:929
 #, c-format
@@ -3628,8 +4040,11 @@ msgstr "      --boost                 разпознава Boost формат з
 
 #: src/xgettext.c:943
 #, 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:968
 #, c-format
@@ -3639,11 +4054,14 @@ msgstr "      --properties-output     записва Java .properties файл\n
 #: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr "      --copyright-holder=НИЗ     задава носител на авторско право в резултата\n"
+msgstr ""
+"      --copyright-holder=НИЗ     задава носител на авторско право в "
+"резултата\n"
 
 #: 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          резултат без авторско право на ФСС за\n"
 "                              чуждестранни потребители\n"
@@ -3660,30 +4078,39 @@ msgstr "      --package-version=ВЕРСИЯ   задава версия на п
 
 #: src/xgettext.c:991
 #, 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: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[НИЗ], --msgstr-prefix[=НИЗ]        използва НИЗ или \"\" като представка за\n"
+"  -m[НИЗ], --msgstr-prefix[=НИЗ]        използва НИЗ или \"\" като "
+"представка за\n"
 "                                стойностите на msgstr\n"
 
 #: 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[НИЗ], --msgstr-suffix[=НИЗ]        използва НИЗ или \"\" като наставка за\n"
+"  -M[НИЗ], --msgstr-suffix[=НИЗ]        използва НИЗ или \"\" като наставка "
+"за\n"
 "                                стойности на msgstr\n"
 
 #: 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 "Аргумента --flag не е с <ключ>:<ном_арг>:[pass-]<флаг> синтаксис: %s"
 
 #: src/xgettext.c:1916
@@ -3712,13 +4139,21 @@ msgstr "%s%s: предупреждение: "
 
 #: src/xgettext.c:2138
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Макар че е използван в място за низове за формат, %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:2139
 #, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Макар че е обявен като такъв, %s не е правилен низ за %s формат. Причина: %s\n"
+msgid ""
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
+msgstr ""
+"Макар че е обявен като такъв, %s не е правилен низ за %s формат. Причина: "
+"%s\n"
 
 #: src/xgettext.c:2170
 #, c-format
@@ -3788,4 +4223,5 @@ 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 2c7b4ce..38c0576 100644
--- a/gettext-tools/po/ca.po
+++ b/gettext-tools/po/ca.po
@@ -50,7 +50,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2007-10-28 18:06+0100\n"
 "Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -105,32 +105,32 @@ msgstr "no s’ha pogut eliminar el directori temporal «%s»"
 msgid "write error"
 msgstr "error d’escriptura"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "error en obrir «%s» per a llegir"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "no s’ha pogut obrir el fitxer còpia de seguretat «%s» per a escriure"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "error en llegir «%s»"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "error en escriure «%s»"
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "error després d’haver llegit «%s»"
@@ -267,7 +267,7 @@ msgstr "error d’E/S amb el subprocés «%s»"
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "la memòria s’ha exhaurit"
@@ -332,7 +332,7 @@ msgstr "«"
 msgid "'"
 msgstr "»"
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -365,8 +365,8 @@ msgid "%s subprocess got fatal signal %d"
 msgstr "el subprocés «%s» ha rebut el senyal 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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 "error en obrir «%s» per a llegir"
@@ -375,7 +375,7 @@ msgstr "error en obrir «%s» per a llegir"
 # ivb  Ací el segon «%s» és el nom d’un llenguatge de programació.
 # El primer és «msgstr» o «msgstr[n]».  ivb
 # El motiu està traduït.  ivb
-#: src/format.c:148
+#: src/format.c:151
 #, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
@@ -383,7 +383,7 @@ msgstr ""
 
 # «%s» és «msgstr».  ivb
 #: 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-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
@@ -395,7 +395,7 @@ msgstr ""
 
 # «%s» és «msgstr».  ivb
 #: 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-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
@@ -404,9 +404,10 @@ msgstr "no existeix una especificació de format de l’argument %u en «%s»"
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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 ""
@@ -442,7 +443,8 @@ msgstr ""
 "número %u."
 
 #: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-python.c:515 src/format-qt-plural.c:110
+#: 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 "el nombre d’especificacions de format en «msgid» i «%s» no coincideix"
@@ -765,7 +767,9 @@ msgstr ""
 "A la directiva número %u, l’especificador de mida no és compatible amb "
 "l’especificador de conversió «%c»."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "no existeix una especificació de format de l’argument «%s» en «%s»"
@@ -816,6 +820,33 @@ msgstr ""
 "les especificacions de format de l’argument «%2$s» en «msgid» i «%1$s» no "
 "són les mateixes"
 
+#: src/format-python-brace.c:136
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "A la directiva número %u, «%c» no està seguit d’un dígit."
+
+#: src/format-python-brace.c:149
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr "A la directiva número %u, «{» no està seguit d’un número d’argument."
+
+#: src/format-python-brace.c:164
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "A la directiva número %u, «%c» no està seguit d’un dígit."
+
+#: src/format-python-brace.c:184
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"A la directiva número %u, no es pot especificar la precisió abans de «%c»."
+
+#: src/format-python-brace.c:210
+#, fuzzy, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr "A la directiva número %u, l’argument %d és negatiu."
+
 #: src/format-qt.c:152
 #, fuzzy, c-format
 msgid ""
@@ -864,11 +895,11 @@ msgid ""
 msgstr ""
 "El caràcter que termina la directiva número %u no és un dígit entre 1 i 9."
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -881,17 +912,17 @@ msgstr ""
 "Aquest és programari lliure: podeu modificar‐lo i redistribuir‐lo si voleu.\n"
 "No hi ha CAP GARANTIA, en la mesura que ho permeta la llei.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: src/xgettext.c:605
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrit per %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -903,11 +934,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "sobren arguments"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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 "Proveu «%s --help» per a obtenir més informació.\n"
@@ -947,29 +978,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address     Adreces corresponents al nom d’estació.\n"
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Eixida informativa:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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 aquesta ajuda i ix.\n"
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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 informació sobre la versió i ix.\n"
@@ -978,11 +1009,11 @@ msgstr "  -V, --version        Mostra informació sobre la versió i ix.\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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 "Informeu dels errors a <bug-gnu-gettext@gnu.org>.\n"
 
@@ -991,30 +1022,30 @@ msgstr "Informeu dels errors a <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "no s’ha pogut obtenir el nom d’estació"
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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 "es permet com a molt un fitxer d’entrada"
 
-#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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» i «%s» són mútuament excloents"
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 "Forma d’ús: %s [OPCIÓ] [FITXER_ENTRADA]\n"
 
-#: src/msgattrib.c:412
+#: src/msgattrib.c:419
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -1023,7 +1054,7 @@ msgstr ""
 "Filtra els missatges d’un catàleg de traduccions segons els seus atributs, i\n"
 "manipula aquests atributs.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -1034,23 +1065,23 @@ msgstr ""
 "Els arguments obligatoris per a les opcions llargues també ho són per a les\n"
 "opcions curtes corresponents.\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, c-format
 msgid "Input file location:\n"
 msgstr "Ubicació del fitxer d’entrada:\n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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 "  FITXER_ENTRADA       Fitxer PO d’entrada.\n"
 
-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1059,7 +1090,7 @@ msgstr ""
 "                       Afegeix el DIRECTORI a la llista de cerca de fitxers\n"
 "                       d’entrada.\n"
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: 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"
@@ -1067,15 +1098,15 @@ msgstr ""
 "Si no s’especifica cap fitxer d’entrada, o si aquest és «-», es llegirà\n"
 "l’entrada estàndard.\n"
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr "Ubicació del fitxer d’eixida:\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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
@@ -1084,7 +1115,7 @@ msgstr ""
 "  -o, --output-file=FITXER\n"
 "                       Escriu l’eixida al fitxer especificat.\n"
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -1096,12 +1127,12 @@ msgstr ""
 "fitxer\n"
 "d’eixida, o si aquest és «-».\n"
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selecció dels missatges:\n"
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1109,7 +1140,7 @@ msgstr ""
 "      --translated     Manté els missatges traduïts, elimina els no "
 "traduïts.\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1117,53 +1148,61 @@ msgstr ""
 "      --untranslated    Manté els missatges no traduïts, elimina els "
 "traduïts.\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy       Elimina els missatges marcats com a «fuzzy».\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy     Manté els missatges marcats com a «fuzzy».\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete    Elimina els missatges obsolets («#~»).\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete    Manté els missatges obsolets («#~»).\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulació dels atributs:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy      Marca tots els missatges com a «fuzzy».\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy    Marca tots els missatges com a no‐«fuzzy».\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete    Marca tots els missatges com a obsolets.\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete    Marca tots els missatges com a no obsolets.\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, fuzzy, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+"      --previous       Manté els «msgid» anteriors dels missatges traduïts.\n"
+
+#: src/msgattrib.c:471
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1172,7 +1211,7 @@ msgstr ""
 "      --clear-previous    Elimina de tots els missatges el comentari amb el\n"
 "                       «msgid» anterior.\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1181,7 +1220,7 @@ msgstr ""
 "                       Només manipula les entrades llistades al FITXER.po\n"
 "                       indicat.\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1191,18 +1230,18 @@ msgstr ""
 "po\n"
 "                       indicat.\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy          Equival a «--only-fuzzy --clear-fuzzy».\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr "      --obsolete       Equival a «--only-obsolete --clear-obsolete».\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: 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
@@ -1210,7 +1249,7 @@ msgstr "      --obsolete       Equival a «--only-obsolete --clear-obsolete».\n
 msgid "Input file syntax:\n"
 msgstr "Sintaxi del fitxer d’entrada:\n"
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
@@ -1221,7 +1260,7 @@ msgstr ""
 "de\n"
 "                       Java.\n"
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1232,17 +1271,17 @@ msgstr ""
 "                       El fitxer d’entrada segueix la sintaxi «.strings» de\n"
 "                       NeXTstep/GNUstep.\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalls de l’eixida:\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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"
@@ -1257,18 +1296,18 @@ msgstr ""
 "«html»\n"
 "                       (sempre, mai, automàtic, HTML).\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/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:933
+#: 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=FITXER    Empra el fitxer indicat de full d’estil CSS per a\n"
 "                        «--color».\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1276,9 +1315,9 @@ msgstr ""
 "  -e, --no-escape      No empra seqüències d’escapada de C a l’eixida (per\n"
 "                       defecte).\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: 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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1286,27 +1325,27 @@ msgstr ""
 "  -E, --escape         Empra seqüències d’escapada de C a l’eixida, en lloc\n"
 "                       de caràcters estesos.\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: 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:939
+#: 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       Genera el fitxer PO encara que estiga buit.\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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         Genera el fitxer PO emprant l’estil indentat.\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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    No escriu les línies «#: nom_fitxer:línia».\n"
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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"
@@ -1314,8 +1353,8 @@ msgstr ""
 "  -n, --add-location    Escriu les línies «#: nom_fitxer:línia» (per\n"
 "                       defecte).\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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"
@@ -1323,7 +1362,7 @@ msgstr ""
 "      --strict         Genera un fitxer PO estrictament conforme amb "
 "Uniforum.\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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
@@ -1332,9 +1371,9 @@ msgstr ""
 "  -p, --properties-output\n"
 "                       Genera un fitxer amb sintaxi «.properties» de Java.\n"
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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"
@@ -1343,16 +1382,16 @@ msgstr ""
 "                       Genera un fitxer amb sintaxi «.strings» de\n"
 "                       NeXTstep/GNUstep.\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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=AMPLADA    Estableix l’amplada de pàgina de l’eixida.\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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"
@@ -1361,16 +1400,16 @@ msgstr ""
 "      --no-wrap        No parteix les línies de missatge més llargues que\n"
 "                       l’amplada de pàgina.\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output    Genera una eixida ordenada.\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: 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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1381,7 +1420,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "s’ha especificat un criteri de selecció impossible (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Forma d’ús: %s [OPCIÓ] [FITXER_ENTRADA]…\n"
@@ -1412,12 +1451,12 @@ msgstr ""
 "treuran del primer fitxer PO que els definesca.  Les posicions de fitxer de\n"
 "tots els fitxers PO s’acumularan.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FITXER_ENTRADA…      Fitxers d’entrada.\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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 ""
@@ -1425,7 +1464,7 @@ msgstr ""
 "                       Obté la llista de fitxers d’entrada del FITXER.\n"
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Si el fitxer d’entrada és «-» es llegirà l’entrada estàndard.\n"
@@ -1663,7 +1702,7 @@ msgstr ""
 "(per\n"
 "                       defecte 1).\n"
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, fuzzy, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1715,7 +1754,7 @@ msgstr ""
 "      --strict         Genera un fitxer PO estrictament conforme amb "
 "Uniforum.\n"
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "no s’ha especificat cap fitxer d’entrada"
@@ -1886,7 +1925,7 @@ msgid "invalid endianness: %s"
 msgstr "l’ordenació d’octets «%s» no és vàlida"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -1955,7 +1994,7 @@ msgstr ""
 "Genera un catàleg binari de missatges partint d’una descripció textual de\n"
 "traduccions.\n"
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1969,7 +2008,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  nom_fitxer.po…       Fitxers d’entrada.\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mode de funcionament:\n"
@@ -2030,7 +2069,7 @@ msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict         Genera un fitxer estrictament conforme amb Uniforum.\n"
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Si el fitxer d’eixida és «-» s’escriurà a l’eixida estàndard.\n"
@@ -2121,7 +2160,7 @@ msgstr ""
 "el\n"
 "directori especificat.\n"
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretació del fitxer d’entrada:\n"
@@ -2279,11 +2318,12 @@ msgstr "%s: avís: el fitxer font conté una traducció difusa"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error en llegir «%s»"
@@ -2582,8 +2622,8 @@ 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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "avís: "
@@ -2815,26 +2855,16 @@ msgstr "manca la marca d’accelerador de teclat «%c» en «msgstr»"
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "sobren marques d’accelerador de teclat «%c» en «msgstr»"
 
-#: src/msgl-check.c:785
+#: src/msgl-check.c:801
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "manca el camp de capçalera «%s» a la capçalera\n"
-
-#: src/msgl-check.c:793
-#, fuzzy, c-format
-msgid "header field '%s' should start at beginning of line\n"
-msgstr "cal que el camp de capçalera «%s» comence a l’inici de la línia\n"
-
-#: src/msgl-check.c:818
-msgid "some header fields still have the initial default value\n"
+msgid "header field '%s' still has the initial default value\n"
 msgstr ""
 "alguns camps de la capçalera encara tenen els valors inicials per defecte\n"
 
-#: src/msgl-check.c:835
+#: src/msgl-check.c:816
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr ""
-"alguns camps de la capçalera encara tenen els valors inicials per defecte\n"
+msgid "header field '%s' missing in header\n"
+msgstr "manca el camp de capçalera «%s» a la capçalera\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2853,7 +2883,7 @@ msgstr ""
 "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:623 src/xgettext.c:693
+#: 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 "
@@ -2872,8 +2902,8 @@ 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:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3345,7 +3375,7 @@ msgstr "s’ha trobat un final de línia emmig de la cadena"
 msgid "context separator <EOT> within string"
 msgstr "s’ha trobat un separador de context «EOT» enmig de la cadena"
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "aquest fitxer no ha de contenir directives «domain»"
@@ -3693,7 +3723,7 @@ msgstr ""
 "format de catàleg de missatges de Tcl no permet el tractament de\n"
 "plurals.\n"
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: 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: avís: la cadena no està terminada"
@@ -3703,19 +3733,19 @@ msgstr "%s:%d: avís: la cadena no està terminada"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: avís: l’expressió regular no està terminada"
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: 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: avís: la constant caràcter no està terminada"
 
-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: avís: el literal cadena no està terminat"
 
 # Multilínia.  ivb
 # Cadena amb format «nom_fitxer:línia».  ivb
-#: src/x-csharp.c:224 src/xgettext.c:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3764,7 +3794,7 @@ msgstr ""
 "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
 
 # La funció.  ivb
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: ha fallat iconv()"
@@ -3779,7 +3809,7 @@ msgstr ""
 "%s:%d: La seqüència multioctet no és vàlida.\n"
 "Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: avís: el caràcter Unicode no és vàlid"
@@ -3799,14 +3829,24 @@ msgstr "%s:%d: avís: s’ha trobat «)» on s’esperava «}»"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: avís: s’ha trobat «}» on s’esperava «)»"
 
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: src/x-glade.c:686
+#, c-format
+msgid "The root element <%s> is not allowed in a valid Glade file"
+msgstr ""
+
 # Crec que no hauria de tenir traducció.  ivb
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
 # Multilínia.  L’argument és el nom del programa.  ivb
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3820,6 +3860,71 @@ msgstr ""
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: avís: el punt de codi surrogat U+%04X està solt"
 
+# Multilínia.  ivb
+# Cadena amb format «nom_fitxer:línia».  ivb
+#: src/x-javascript.c:230
+#, fuzzy
+msgid "Please specify the source encoding through --from-code\n"
+msgstr ""
+"Hi ha una cadena no‐ASCII en «%s%s».\n"
+"Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
+
+# Multilínia.  ivb
+#: src/x-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: La seqüència multioctet no és vàlida.\n"
+"Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
+
+# Multilínia.  ivb
+# Hau!  ivb
+#: 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: La seqüència multioctet llarga no és completa.\n"
+"Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
+
+# Multilínia.  ivb
+#: 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: Hi ha una seqüència multioctet incompleta al final del fitxer.\n"
+"Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
+
+# Multilínia.  ivb
+#: 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: Hi ha una seqüència multioctet incompleta al final de la línia.\n"
+"Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
+
+# Multilínia.  ivb
+#: 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: La seqüència multioctet no és vàlida.\n"
+"Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
+
+#: src/x-javascript.c:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: avís: el literal cadena no està terminat"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3863,7 +3968,7 @@ msgstr "%s:%d: la interpolació «\\U» del caràcter de 8 bits «%c» no és v�
 
 # Multilínia.  ivb
 # Cadena amb format «nom_fitxer:línia».  ivb
-#: src/x-python.c:236
+#: src/x-python.c:278
 #, fuzzy
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
@@ -3875,7 +3980,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # Multilínia.  ivb
-#: src/x-python.c:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3889,7 +3994,7 @@ msgstr ""
 
 # Multilínia.  ivb
 # Hau!  ivb
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3902,7 +4007,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # Multilínia.  ivb
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3915,7 +4020,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # Multilínia.  ivb
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3928,7 +4033,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # Multilínia.  ivb
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3941,7 +4046,7 @@ msgstr ""
 "http://www.python.org/peps/pep-0263.html.\n"
 
 # No multilínia.  ivb
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "la codificació «%s» no és coneguda, s’emprarà ASCII al seu lloc"
@@ -3971,29 +4076,34 @@ msgstr ""
 "%s:%lu: avís: la sintaxi «$\"…\"» està desaprovada per motius de seguretat; "
 "useu «eval_gettext» al seu lloc"
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: avís: el literal cadena no està terminat"
+
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "no es pot emprar «--join-existing» quan s’escriu a l’eixida estàndard"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "«xgettext» no funciona sense paraules clau que cercar"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:785
 #, fuzzy, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "avís: l’extensió «%2$s» del fitxer «%1$s» no és coneguda; es provarà amb el "
 "llenguatge «C»"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extreu les cadenes traduïbles dels fitxers d’entrada indicats.\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4003,12 +4113,12 @@ msgstr ""
 "                       Empra «NOM.po» com a eixida (en lloc de «messages."
 "po»).\n"
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FITXER    Escriu l’eixida al FITXER especificat.\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -4017,13 +4127,13 @@ msgstr ""
 "                       Els fitxers d’eixida es desaran al DIRECTORI.\n"
 
 # Es refereix al llenguatge de programació.  ivb
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Selecció del llenguatge del fitxer d’entrada:\n"
 
-#: src/xgettext.c:855
-#, c-format
+#: src/xgettext.c:870
+#, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -4031,7 +4141,8 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 "  -L, --language=NOM    Reconeix el llenguatge especificat (C, C++,\n"
 "                       ObjectiveC, PO, Shell, Python, Lisp, EmacsLisp, "
@@ -4041,12 +4152,12 @@ msgstr ""
 "                       Tcl, Perl, PHP, GCC-source, NXStringTable, RST, "
 "Glade).\n"
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++            Equival a «--language=C++».\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4056,7 +4167,7 @@ msgstr ""
 "fitxer\n"
 "d’entrada.\n"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4065,20 +4176,20 @@ msgstr ""
 "      --from-code=NOM    Codificació dels fitxers d’entrada (excepte per a\n"
 "                       Python, Tcl i Glade).\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 "Per defecte s’assumeix que els fitxers d’entrada estan codificats en ASCII.\n"
 
-#: src/xgettext.c:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing    Uneix els missatges extrets amb els d’un fitxer\n"
 "                       existent.\n"
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
@@ -4086,7 +4197,7 @@ msgstr ""
 "                       No extreu les entrades que ja es troben al FITXER.po\n"
 "                       indicat.\n"
 
-#: src/xgettext.c:880
+#: src/xgettext.c:896
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4101,24 +4212,25 @@ msgstr ""
 "                       o aquells que precedeixen les línies amb una paraula\n"
 "                       clau, al fitxer d’eixida.\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opcions específiques del llenguatge:\n"
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all    Extreu totes les cadenes.\n"
 
 # No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:890 src/xgettext.c:897
-#, c-format
+#: src/xgettext.c:906 src/xgettext.c:914
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                       (Només per als llenguatges C, C++, ObjectiveC, "
 "Shell,\n"
@@ -4126,7 +4238,7 @@ msgstr ""
 "awk,\n"
 "                       Tcl, Perl, PHP, GCC-source i Glade.)\n"
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -4138,7 +4250,7 @@ msgstr ""
 "                       PARAULA no s’empraran les paraules clau per "
 "defecte).\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4151,13 +4263,14 @@ msgstr ""
 "                       l’argument ARG de la paraula clau PARAULA.\n"
 
 # No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:904
-#, c-format
+#: src/xgettext.c:922
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                       (Només per als llenguatges C, C++, ObjectiveC, "
 "Shell,\n"
@@ -4165,42 +4278,42 @@ msgstr ""
 "awk,\n"
 "                       YCP, Tcl, Perl, PHP i GCC-source.)\n"
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs      Interpreta els trígrafs del C ANSI a l’entrada.\n"
 
 # No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                       (Només per als llenguatges C, C++ i ObjectiveC.)\n"
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt             Reconeix les cadenes de format de Qt.\n"
 
 # No mola pq va darrere d’un punt…  ivb
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                       (Només per al llenguatge C++.)\n"
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde            Reconeix les cadenes de format de KDE 4.\n"
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost          Reconeix les cadenes de format de Boost.\n"
 
 # Simplement mireu l’info.  ivb
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4209,14 +4322,14 @@ msgstr ""
 "de\n"
 "                       cadenes de format.\n"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "  -p, --properties-output\n"
 "                       Genera un fitxer amb sintaxi «.properties» de Java.\n"
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
@@ -4224,7 +4337,7 @@ msgstr ""
 "                       Estableix a l’eixida la propietària o propietari del\n"
 "                       copyright.\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4233,21 +4346,21 @@ msgstr ""
 "a\n"
 "                       uns usuaris diferents.\n"
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 "      --package-name=NOM\n"
 "                       Estableix a l’eixida el NOM del paquet.\n"
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --package-version=VERSIÓ\n"
 "                       Estableix a l’eixida la VERSIÓ del paquet.\n"
 
-#: src/xgettext.c:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4257,7 +4370,7 @@ msgstr ""
 "cadenes\n"
 "                       «msgid».\n"
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4268,7 +4381,7 @@ msgstr ""
 "                       Empra la CADENA, o «», com a prefix de les entrades\n"
 "                       «msgstr».\n"
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4280,7 +4393,7 @@ msgstr ""
 "                       «msgstr».\n"
 
 # Missatge d’error.  ivb
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4288,26 +4401,26 @@ msgid ""
 msgstr ""
 "Un argument de «--flag» no té la sintaxi «PARCLAU:NUMARG:[pass-]INDIC»: %s"
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "entrada estàndard"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: avís: "
@@ -4317,7 +4430,7 @@ msgstr "%s%s: avís: "
 # ivb  Ací el segon «%s» és el nom d’un llenguatge de programació.
 # El primer és «msgid» o «msgid_plural».  ivb
 # El motiu està traduït.  ivb
-#: src/xgettext.c:2104
+#: src/xgettext.c:2138
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4331,7 +4444,7 @@ msgstr ""
 # ivb  Ací el segon «%s» és el nom d’un llenguatge de programació.
 # El primer és «msgid» o «msgid_plural».  ivb
 # El motiu està traduït.  ivb
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4341,7 +4454,7 @@ msgstr ""
 "Motiu: %s\n"
 
 # Multilínia.  ivb
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4355,7 +4468,7 @@ msgstr ""
 "arguments amb nom, i un mapa en lloc d’una tupla per a aquests.\n"
 
 # Multilínia.  ivb
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4365,29 +4478,29 @@ msgstr ""
 "«gettext(\"\")» retorna l’entrada de capçalera amb metainformació, no la\n"
 "cadena buida.\n"
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "l’especificació d’argument per a la paraula clau «%.*s» és ambígua"
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "avís: manca el context de la paraula clau «%.*s»"
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, 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»"
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "els contexts de les formes singular i plural no corcorden"
 
 # Multilínia.  ivb
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 #, fuzzy
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
@@ -4401,7 +4514,7 @@ msgstr ""
 "d’ordres.\n"
 
 # Llenguatge de programació.  ivb
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "el llenguatge «%s» no és conegut"
@@ -4410,6 +4523,15 @@ msgstr "el llenguatge «%s» no és conegut"
 msgid "<unnamed>"
 msgstr "<sense nom>"
 
+#, fuzzy
+#~ msgid "header field '%s' should start at beginning of line\n"
+#~ msgstr "cal que el camp de capçalera «%s» comence a l’inici de la línia\n"
+
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr ""
+#~ "alguns camps de la capçalera encara tenen els valors inicials per "
+#~ "defecte\n"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: no es permet l’opció «%c»\n"
 
diff --git a/gettext-tools/po/cs.po b/gettext-tools/po/cs.po
index d155a05..8cd95a1 100644
--- a/gettext-tools/po/cs.po
+++ b/gettext-tools/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.38\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\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"
@@ -66,38 +66,38 @@ msgstr "v�stupn� soubor \"%s\" nelze vytvo�it"
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: 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�"
 
 # src/msgfmt.c:321
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "chyba p�i otev�r�n� souboru \"%s\" pro z�pis"
 
 # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
-#: gnulib-lib/copy-file.c:201
+#: 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:205
+#: 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:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "chyba p�i �ten� \"%s\""
@@ -243,7 +243,7 @@ msgstr ""
 # lib/xmalloc.c:82
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "pam� vy�erp�na"
@@ -308,7 +308,7 @@ msgstr ""
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -345,20 +345,20 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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 "chyba p�i otev�r�n� souboru \"%s\" pro �ten�"
 
-#: src/format.c:148
+#: 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-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
@@ -368,7 +368,7 @@ 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-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
@@ -378,9 +378,10 @@ 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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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�"
@@ -409,7 +410,8 @@ msgstr ""
 
 # src/msgfmt.c:892
 #: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-python.c:515 src/format-qt-plural.c:110
+#: 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�"
@@ -692,7 +694,9 @@ msgid ""
 msgstr ""
 
 # src/msgfmt.c:909
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: 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�"
@@ -736,6 +740,32 @@ 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:136
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr ""
+
+#: src/format-python-brace.c:149
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+
+#: src/format-python-brace.c:164
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
+
+#: src/format-python-brace.c:184
+#, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+
+#: src/format-python-brace.c:210
+#, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr ""
+
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -777,11 +807,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -792,17 +822,17 @@ msgstr ""
 
 # src/gettextp.c:139 src/msgcmp.c:149 src/msgfmt.c:262 src/msgmerge.c:256
 # src/msgunfmt.c:180 src/xgettext.c:399
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: src/xgettext.c:605
 #, 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -817,11 +847,11 @@ msgstr "p��li� mnoho argument�"
 
 # src/gettextp.c:228 src/msgcmp.c:181 src/msgfmt.c:361 src/msgmerge.c:298
 # src/msgunfmt.c:210 src/xgettext.c:532
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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 "V�ce informac� z�sk�te p��kazem `%s --help'.\n"
@@ -859,29 +889,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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 ""
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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 ""
@@ -892,11 +922,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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1011
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
@@ -910,38 +940,38 @@ msgid "could not get host name"
 msgstr ""
 
 # src/msgcmp.c:165 src/msgmerge.c:272
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "jsou po�adov�ny p�esn� 2 vstupn� soubory"
 
 # src/xgettext.c:378 src/xgettext.c:382
-#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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 a %s se vz�jemn� vylu�uj�"
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 ""
 
-#: src/msgattrib.c:412
+#: 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 ""
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -951,50 +981,50 @@ msgid ""
 msgstr ""
 
 # src/msgfmt.c:273 src/xgettext.c:410
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "vstupn� soubor nen� zad�n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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 ""
 
-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/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 ""
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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 ""
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -1003,99 +1033,106 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+
+#: src/msgattrib.c:471
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/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
@@ -1103,14 +1140,14 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1118,17 +1155,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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"
@@ -1137,88 +1174,88 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/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:939
+#: 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 ""
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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 ""
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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 ""
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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 ""
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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 ""
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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 ""
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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 ""
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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 ""
 
 # src/msgunfmt.c:215
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1241,16 +1278,16 @@ msgstr ""
 "  -V, --version            vyp��e ozna�en� verze a ukon�� se\n"
 "  -w, --width=��SLO        nastav� ���ku v�stupn� str�nky\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1260,7 +1297,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "zad�no nemo�n� v�b�rov� krit�rium (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -1294,18 +1331,18 @@ msgstr ""
 "ponech�ny, ale pouze z prvn�ho .po souboru, kter� je definuje. Ozna�en� pozic\n"
 "v souborech bude ponech�no ze v�ech .po soubor�.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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 ""
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
@@ -1533,7 +1570,7 @@ msgid ""
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1579,7 +1616,7 @@ msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
 # src/msgfmt.c:273 src/xgettext.c:410
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "vstupn� soubor nen� zad�n"
@@ -1728,7 +1765,7 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr ""
 
@@ -1797,7 +1834,7 @@ msgstr ""
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1809,7 +1846,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
@@ -1856,7 +1893,7 @@ msgstr ""
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -1931,7 +1968,7 @@ msgid ""
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
@@ -2081,11 +2118,12 @@ msgstr "%s: upozorn�n�: zdrojov� soubor obsahuje ne�pln� p�eklad"
 # src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "chyba p�i �ten� \"%s\""
@@ -2293,8 +2331,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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: upozorn�n�: "
@@ -2495,30 +2533,18 @@ msgstr ""
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-# src/msgfmt.c:561
-#: src/msgl-check.c:785
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "polo�ka hlavi�ky `%s' v hlavi�ce chyb�"
-
-# src/msgfmt.c:564
-#: src/msgl-check.c:793
-#, fuzzy, c-format
-msgid "header field '%s' should start at beginning of line\n"
-msgstr "polo�ka hlavi�ky `%s' by m�la za��nat na za��tku ��dku"
-
-# src/msgfmt.c:573
-#: src/msgl-check.c:818
-#, fuzzy
-msgid "some header fields still have the initial default value\n"
-msgstr "n�kter� polo�ky hlavi�ky maj� st�le po��te�n� implicitn� hodnotu"
-
 # src/msgfmt.c:573
-#: src/msgl-check.c:835
+#: src/msgl-check.c:801
 #, 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:816
+#, 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"
@@ -2536,7 +2562,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:623 src/xgettext.c:693
+#: src/x-python.c:665 src/xgettext.c:708
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2552,8 +2578,8 @@ msgid ""
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2964,7 +2990,7 @@ msgid "context separator <EOT> within string"
 msgstr ""
 
 # src/xgettext.c:658 src/xgettext.c:968
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "tento soubor nem��e obsahovat p��kazy pro dom�nu"
@@ -3285,7 +3311,7 @@ msgid ""
 msgstr ""
 
 # src/xget-lex.c:914
-#: src/x-awk.c:341 src/x-python.c:1075
+#: src/x-awk.c:341 src/x-javascript.c:988 src/x-python.c:1128
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
@@ -3297,18 +3323,18 @@ msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: upozorn�n�: neukon�en� �et�zec liter�l�"
 
 # src/xget-lex.c:892
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: 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: upozorn�n�: neukon�en� znakov� konstanta"
 
 # src/xget-lex.c:914
-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832
 #, 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:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3340,7 +3366,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3353,7 +3379,7 @@ msgid ""
 msgstr ""
 
 # src/xget-lex.c:892
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: upozorn�n�: neukon�en� znakov� konstanta"
@@ -3374,12 +3400,22 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3394,6 +3430,51 @@ msgstr ""
 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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+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"
@@ -3430,13 +3511,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:236
+#: 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:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3444,7 +3525,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3452,7 +3533,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3460,7 +3541,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3468,7 +3549,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3476,7 +3557,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3504,53 +3585,59 @@ msgid ""
 "use eval_gettext instead"
 msgstr ""
 
+# src/xget-lex.c:914
+#: src/x-vala.c:558
+#, 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:386
-#: src/xgettext.c:621
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing nem��e b�t pou�it, je-li v�stup zapisov�n do stdout"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext nem��e pracovat bez toho, ani� by znal slova, kter� m� hledat"
 
 # src/xgettext.c:501
-#: src/xgettext.c:770
+#: src/xgettext.c:785
 #, 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:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, 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:853
+#: src/xgettext.c:868
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "vstupn� soubor nen� zad�n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:870
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3559,44 +3646,45 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:880
+#: src/xgettext.c:896
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3606,33 +3694,34 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:890 src/xgettext.c:897
+#: 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"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3640,84 +3729,85 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:904
+#: src/xgettext.c:922
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3725,7 +3815,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3733,7 +3823,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -3741,45 +3831,45 @@ msgid ""
 msgstr ""
 
 # src/xget-lex.c:150
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "standardn� vstup"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: upozorn�n�: "
 
-#: src/xgettext.c:2104
+#: 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 ""
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3788,34 +3878,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3824,7 +3914,7 @@ msgid ""
 msgstr ""
 
 # src/xgettext.c:1342
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "jazyk `%s' nen� zn�m"
@@ -3833,6 +3923,16 @@ msgstr "jazyk `%s' nen� zn�m"
 msgid "<unnamed>"
 msgstr ""
 
+# src/msgfmt.c:564
+#, fuzzy
+#~ msgid "header field '%s' should start at beginning of line\n"
+#~ msgstr "polo�ka hlavi�ky `%s' by m�la za��nat na za��tku ��dku"
+
+# src/msgfmt.c:573
+#, fuzzy
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr "n�kter� polo�ky hlavi�ky maj� st�le po��te�n� implicitn� hodnotu"
+
 # lib/getopt.c:733
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: nezn�m� p�ep�na� -- %c\n"
diff --git a/gettext-tools/po/da.po b/gettext-tools/po/da.po
index 622cddb..574ebc1 100644
--- a/gettext-tools/po/da.po
+++ b/gettext-tools/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\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"
@@ -57,32 +57,32 @@ msgstr "kan ikke fjerne midlertidigt katalog %s"
 msgid "write error"
 msgstr "skrivefejl"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "fejl ved l�se-�bning af '%s'"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "Kan ikke �bne sikkerhedskopi-fil '%s' for skrivning"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "fejl ved l�sning af '%s'"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "fejl ved skrivning til filen '%s'"
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "fejl efter l�sning af '%s'"
@@ -215,7 +215,7 @@ msgstr "I/O-fejl i %s-underproces"
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "ikke mere ledig hukommelse"
@@ -280,7 +280,7 @@ msgstr "'"
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -313,20 +313,20 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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 "fejl ved l�se-�bning af '%s'"
 
-#: src/format.c:148
+#: src/format.c:151
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "'%s' er ikke en gyldig %s-formatstreng, til forskel fra '%s'. �rsag: %s"
 
 #: src/format-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-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
@@ -336,7 +336,7 @@ 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-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
@@ -345,9 +345,10 @@ msgstr "formateringsdirektiv for argument %u findes ikke i '%s'"
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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
 #, 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"
@@ -379,7 +380,8 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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 "antal af formatangivelser i '%s' og '%s' er ikke overensstemmende"
@@ -680,7 +682,9 @@ 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-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "et formateringsdirektiv for argument '%s' findes ikke i '%s'"
@@ -725,6 +729,32 @@ 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:136
+#, 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:149
+#, 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:164
+#, 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:184
+#, 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:210
+#, 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 ""
@@ -773,11 +803,11 @@ msgid ""
 msgstr ""
 "Tegnet som afslutter direktiv nummer %u er ikke et ciffer mellem 1 og 9."
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -790,17 +820,17 @@ 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:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: src/xgettext.c:605
 #, 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -812,11 +842,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "For mange argumenter"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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 "Pr�v '%s --help' for yderligere oplysninger.\n"
@@ -856,29 +886,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:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informativt uddata:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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                  vis denne hj�lp og afslut\n"
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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               vis versionsinformation og afslut\n"
@@ -887,11 +917,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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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 "Rapport�r fejl p� engelsk til <bug-gnu-gettext@gnu.org>.\n"
 
@@ -900,30 +930,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:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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 "H�jst �n inddatalinje tilladt"
 
-#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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 og %s udelukker hinanden"
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 "Brug: %s [TILVALG] [INDDATAFIL]\n"
 
-#: src/msgattrib.c:412
+#: src/msgattrib.c:419
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -932,7 +962,7 @@ msgstr ""
 "Filtrerer beskederne i et beskedskatalog efter deres attributter og\n"
 "manipulerer attributterne.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -944,50 +974,50 @@ msgstr ""
 "tilsvarende\n"
 "korte tilvalg.\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, c-format
 msgid "Input file location:\n"
 msgstr "Placering for indfil:\n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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 "  INFIL                       PO-indfil\n"
 
-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 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:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: 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 "Hvis ingen indfil er givet eller hvis den er -, l�ses standard-ind.\n"
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr "Placering af uddatafil:\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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=FIL       uddata skrives til FIL\n"
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -998,12 +1028,12 @@ msgstr ""
 "Resultaterne udskrives til standard-uddata hvis ingen uddatafil er angivet,\n"
 "eller hvis den er angivet til - .\n"
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Meddelelsevalg:\n"
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1011,7 +1041,7 @@ msgstr ""
 "      --translated            behold oversatte, fjern uoversatte "
 "meddelelser\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1019,57 +1049,66 @@ msgstr ""
 "      --translated            behold uoversatte, fjern oversatte "
 "meddelelser\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              fjern meddelelser markerede som 'fuzzy'\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            behold meddelelser markerede som 'fuzzy'\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           fjern for�ldede #~ meddelelser\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         behold for�ldede #~ meddelelsen\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Attributmanipulation:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             mark�r alle meddelelser som 'fuzzy'\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           fjern 'fuzzy'-markering fra alle meddelelser\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          mark�r alle meddelelser som for�ldede\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        fjern for�ldelsesmarkering fra alle "
 "meddelelser\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, 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"
+
+#: src/msgattrib.c:471
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1077,33 +1116,33 @@ msgid ""
 msgstr ""
 "      --clear-previous        fjern 'previous msgid' fra alle meddelelser\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, 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"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, 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"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 samme som --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              samme som --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: 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
@@ -1111,14 +1150,14 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr "Syntaks p� indfil:\n"
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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      indfil har 'Java .properties'-syntaks\n"
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1128,17 +1167,17 @@ msgstr ""
 "      --stringtable-input     indfil har NeXTstep/GNUstep '.strings'-"
 "syntaks\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr "Resultatdetaljer:\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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"
@@ -1153,16 +1192,16 @@ msgstr ""
 "'auto'\n"
 "                              eller 'html'.\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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=STILSKABELON    angiv CSS stilskabel�nfil for --color\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1170,9 +1209,9 @@ msgstr ""
 "  -e, --no-escape             brug ikke C-kontrolsekvenser i resultatet\n"
 "                                (normaltilstand)\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: 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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1180,28 +1219,28 @@ msgstr ""
 "  -E, --escape                brug C-kontrolsekvenser i resultatet, men\n"
 "                              ikke \\v eller \\a\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: 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:939
+#: 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              skriv PO-fil selv hvis den er tom\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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                lav indrykningsst�l i .po-fil\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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           skriv ikke linjer med '#: filnavn:linje'\n"
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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"
@@ -1209,39 +1248,39 @@ msgstr ""
 "  -n, --add-location          skriv linjer med '#: filnavn:"
 "linje' (normaltilstand)\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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                strikt Uniforum-format p� resultatet\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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     skriv en 'Java .properties'-fil\n"
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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    skriv en NeXTstep/GNUstep '.strings'-fil\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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=ANTAL           s�t sidebredde for uddata\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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"
@@ -1250,16 +1289,16 @@ msgstr ""
 "      --no-wrap               ombryd ikke lange beskeder, l�ngere end\n"
 "                              uddatasidens bredde, til flere linjer\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           sort�r resultatet\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: 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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          sort�r resultatet efter filposition\n"
@@ -1269,7 +1308,7 @@ msgstr "  -F, --sort-by-file          sort�r resultatet efter filposition\n"
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Umuligt udv�lgelseskriterium angivet (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Brug: %s [TILVALG] [INDDATAFIL]...\n"
@@ -1296,18 +1335,18 @@ 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:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INFIL ...                   indfiler\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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=FIL        l�s liste af indfiler fra FIL\n"
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Hvis indfil er -, l�ses standard ind.\n"
@@ -1524,7 +1563,7 @@ msgstr ""
 "  ->, --more-than=ANTAL       skriv meddelelser med mere end ANTAL\n"
 "                              definitioner. Standardv�rdi: 1\n"
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, fuzzy, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1572,7 +1611,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                strikt Uniforum-format p� resultatet\n"
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "ingen inddatafil angivet"
@@ -1741,7 +1780,7 @@ msgid "invalid endianness: %s"
 msgstr "ugyldig byteorden: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -1805,7 +1844,7 @@ msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Gener�r bin�rt tekstkatalog fra overs�ttelsebeskrivelse i kildetekst.\n"
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1820,7 +1859,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  filnavn.po ...              indfiler\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "K�rselstilstand:\n"
@@ -1875,7 +1914,7 @@ msgstr "      --qt                    Qt-tilstand: gener�r en Qt .qm-fil\n"
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                strikt Uniforum-format p� resultatet\n"
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Hvis UDFIL er -, skrives resultatet til standard ud.\n"
@@ -1959,7 +1998,7 @@ msgstr ""
 "Flagene -l og -d er obligatoriske. .msg filen bliver skrevet i det\n"
 "angivne katalog.\n"
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Tolkning af indfil:\n"
@@ -2111,11 +2150,12 @@ 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:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fejl ved l�sning af '%s'"
@@ -2387,8 +2427,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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "advarsel: "
@@ -2601,25 +2641,16 @@ msgstr "msgstr mangler m�rket '%c' for tastaturgenvej"
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr har for mange m�rker '%c' for tastaturgenveje"
 
-#: src/msgl-check.c:785
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "feltet '%s' mangler i hovedet\n"
-
-#: src/msgl-check.c:793
-#, fuzzy, 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:818
-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:835
+#: src/msgl-check.c:801
 #, 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:816
+#, fuzzy, c-format
+msgid "header field '%s' missing in header\n"
+msgstr "feltet '%s' mangler i hovedet\n"
+
 #: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
@@ -2636,7 +2667,7 @@ 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:623 src/xgettext.c:693
+#: 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 "
@@ -2654,8 +2685,8 @@ 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:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3091,7 +3122,7 @@ msgstr "tekststreng var ikke afsluttet ved linjeskift"
 msgid "context separator <EOT> within string"
 msgstr "kontekstseparator <EOT> inde i streng"
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne fil m� ikke indeholde 'domain'-kommandoer"
@@ -3422,7 +3453,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-python.c:1075
+#: 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: advarsel: streng ikke afsluttet"
@@ -3432,17 +3463,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:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: 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: advarsel:  tegnkonstant ikke afsluttet korrekt"
 
-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
 
-#: src/x-csharp.c:224 src/xgettext.c:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr "Angiv venligst indkodning af kildetekst via --from-code."
 
@@ -3482,7 +3513,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-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv-fejl"
@@ -3496,7 +3527,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:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: advarsel: ugyldigt UCS-tegn"
@@ -3516,12 +3547,22 @@ 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:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3535,6 +3576,61 @@ 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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3570,7 +3666,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:236
+#: 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"
@@ -3578,7 +3674,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:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3589,7 +3685,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:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3600,7 +3696,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:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3611,7 +3707,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:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3622,7 +3718,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:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3633,7 +3729,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:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Ukendt kodning '%s'. Forts�tter med ASCII i stedet."
@@ -3662,29 +3758,34 @@ msgstr ""
 "%s:%lu: advarsel: syntaksen $\"...\" vil fremover blive fjernet af "
 "sikkerheds�rsager; brug eval_gettext i stedet"
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
+
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing kan ikke benyttes n�r uddata sendes til standard-uddata"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, 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:770
+#: src/xgettext.c:785
 #, 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:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Udtr�k overs�ttelige strenge fra givne indfiler.\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3692,24 +3793,24 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=NAVN  brug NAVN.po som udfil (i st.f. messages.po) \n"
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FIL            skriv resultatet til FIL\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=KATALOG    udfiler placeres i kataloget KATALOG\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Valg af sprog for indfil\n"
 
-#: src/xgettext.c:855
-#, c-format
+#: src/xgettext.c:870
+#, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3717,7 +3818,8 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 "  -L, --language=NAVN         genkend det angivne sprog\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3727,19 +3829,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   kort skrivem�de for --language=C++\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Som standard antages sproget ud fra endelsen p� inddatafilen.\n"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3748,23 +3850,23 @@ msgstr ""
 "      --from-code=NAVN        kodning af inddatafiler\n"
 "                                (undtagen for Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, 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:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         sammenflet meddelelser med eksisterende fil\n"
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, 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:880
+#: src/xgettext.c:896
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3781,30 +3883,31 @@ msgstr ""
 "n�gleordslinjer\n"
 "                                 til resultatfilen\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Sprogspecifikke valg:\n"
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           uddrag alle strenge\n"
 
-#: src/xgettext.c:890 src/xgettext.c:897
-#, c-format
+#: src/xgettext.c:906 src/xgettext.c:914
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (kun sprogene C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3813,7 +3916,7 @@ msgstr ""
 "  -kORD, --keyword[=ORD]      s�g efter ORD som et ekstra n�gleord\n"
 "  -k, --keyword               brug ikke standardn�gleord\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3823,84 +3926,85 @@ msgstr ""
 "      --flag=ORD:NR:FLAG      ekstra FLAG for strenge inde i argument\n"
 "                              nummer NR for n�gleord ORD\n"
 
-#: src/xgettext.c:904
-#, c-format
+#: src/xgettext.c:922
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (kun sprogene C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs             behandl ISO C tretegnssekvenser i indfiler\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (kun sprogene C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    genkend Qt-formatstrenge\n"
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (kun sproget C++)\n"
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   genkend KDE 4-formatstrenge\n"
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 genkend Boost-formatstrenge\n"
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 mere detaljeret genkendelse af formatstrenge\n"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     skriv en 'Java .properties'-fil\n"
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, 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:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr "      --foreign-user          udelad FSF-copyrighttekst i resultatet\n"
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, 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:970
+#: src/xgettext.c:989
 #, 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:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3908,7 +4012,7 @@ msgstr ""
 "      --msgid-bugs-address=EPOST@ADRESSE  s�t modtager for msgid-"
 "fejlrapporter\n"
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3918,7 +4022,7 @@ msgstr ""
 "  -m[STRENG], --msgstr-prefix[=STRENG]  indled oversatte strenge med STRENG "
 "eller \"\"\n"
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3928,7 +4032,7 @@ msgstr ""
 "  -M[STRENG], --msgstr-suffix[=STRENG]  afslut oversatte strenge med STRENG "
 "eller \"\"\n"
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -3936,31 +4040,31 @@ msgid ""
 msgstr ""
 "Et '--flag'-argument har ikke <n�gleord>:<nummer>:[pass-]<flag> syntaks: %s"
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "standard-inddata"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Ikke-ASCII-tegn ved %s%s."
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Ikke-ASCII-kommentar ved eller f�r %s%s."
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Ikke-ASCII-streng ved %s%s."
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: advarsel: "
 
-#: src/xgettext.c:2104
+#: src/xgettext.c:2138
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3969,7 +4073,7 @@ msgstr ""
 "%s er ikke en gyldig formatstreng for %s selvom den bruges i en "
 "formatstrengsposition. �rsag: %s\n"
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -3978,7 +4082,7 @@ msgstr ""
 "%s er ikke en gyldig formatstreng for %s selvom den er deklareret som en. "
 "�rsag: %s\n"
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3992,7 +4096,7 @@ msgstr ""
 "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:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4002,28 +4106,28 @@ msgstr ""
 "gettext(\"\") returnerer hovedet med metainformation,\n"
 "ikke den tomme streng.\n"
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "flertydig argumentangivelse for n�gleord '%.*s'"
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "advarsel: kontekst mangles for n�gleordet '%.*s'"
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "advarsel: kontekst mangles for flertalsargumentet til n�gleordet '%.*s'"
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "kontekst passer ikke mellem entals- og flertalsformen"
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 #, fuzzy
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
@@ -4036,7 +4140,7 @@ msgstr ""
 "variablen MSGID_BUGS_ADDRESS d�r; ellers angiv\n"
 "tilvalget --msgid-bugs-address p� kommandolinjen.\n"
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "ukendt sprog '%s'"
@@ -4044,3 +4148,10 @@ msgstr "ukendt sprog '%s'"
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<uden navn>"
+
+#, fuzzy
+#~ 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 8079270..4063e6a 100644
--- a/gettext-tools/po/de.po
+++ b/gettext-tools/po/de.po
@@ -82,7 +82,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2013-04-09 23:17+0200\n"
 "Last-Translator: Jakob Kramer <jakob.kramer@gmx.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -132,32 +132,32 @@ msgstr "Temporäres Verzeichnis %s kann nicht entfernt werden"
 msgid "write error"
 msgstr "Fehler beim Schreiben"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "Berechtigungen für %s werden beibehalten"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:194
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "Öffnen der Datei %s zum Lesen fehlgeschlagen"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "Öffnen der Sicherungsdatei %s zum Schreiben fehlgeschlagen"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, c-format
 msgid "error reading %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, c-format
 msgid "error writing %s"
 msgstr "Fehler beim Schreiben von %s"
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, c-format
 msgid "error after reading %s"
 msgstr "Fehler nach dem Lesen von %s"
@@ -274,7 +274,8 @@ 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
@@ -291,7 +292,7 @@ msgstr "Subprozess %s mit Ein-/Ausgabefehler"
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "virtueller Speicher aufgebraucht"
@@ -358,7 +359,7 @@ msgstr "»"
 msgid "'"
 msgstr "«"
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr "Festlegung der Berechtigungen für %s"
@@ -377,7 +378,8 @@ 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
@@ -391,27 +393,30 @@ msgid "%s subprocess got fatal signal %d"
 msgstr "Subprozess %s hat das fatale Signal %d erhalten"
 
 #: 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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 "Öffnen der Datei »%s« zum Lesen fehlgeschlagen"
 
-#: src/format.c:148
+#: 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-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
-#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: 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
@@ -420,12 +425,14 @@ msgstr "eine Formatspezifikation für Argument »%u« fehlt in »%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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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
 #, 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
@@ -434,8 +441,13 @@ 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
@@ -445,13 +457,17 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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
@@ -464,12 +480,16 @@ 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"
 "'}'."
@@ -477,16 +497,22 @@ 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
@@ -496,17 +522,26 @@ msgstr "In der %u. Formatanweisung ist die Kombination der Flags ungültig."
 #: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr "In der %u. Formatanweisung ist eine Genauigkeit vor »%c« nicht erlaubt."
+msgstr ""
+"In der %u. Formatanweisung ist eine Genauigkeit vor »%c« nicht erlaubt."
 
 #: src/format-gcc-internal.c:334
 #, c-format
-msgid "In the directive number %u, the argument number for the precision must be equal to %u."
-msgstr "In der %u. Formatanweisung muss die Argumentzahl für die Genauigkeit gleich sein mit %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"In der %u. Formatanweisung muss die Argumentzahl für die Genauigkeit gleich "
+"sein mit %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "In der %u. Formatanweisung ist eine Genauigkeitsspezifikation vor »%c« nicht erlaubt."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"In der %u. Formatanweisung ist eine Genauigkeitsspezifikation vor »%c« nicht "
+"erlaubt."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -543,43 +578,71 @@ 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
@@ -588,13 +651,20 @@ 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
@@ -603,12 +673,17 @@ msgstr "In der %u. Formatanweisung beinhaltet eine Choice 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 Choice eine Zahl der keins von '<', '#' or '%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 Choice eine Zahl der keins von "
+"'<', '#' or '%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
@@ -618,21 +693,35 @@ 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 zo viele Parameter angegeben; es wird höchstens %u Parameter erwartet."
-msgstr[1] "In der %u. Formatanweisung sind zo 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 zo viele Parameter angegeben; es wird "
+"höchstens %u Parameter erwartet."
+msgstr[1] ""
+"In der %u. Formatanweisung sind zo viele Parameter angegeben; es werden "
+"höchstens %u Parameter erwartet."
 
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
@@ -663,17 +752,23 @@ 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
@@ -683,86 +778,159 @@ 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 deren in »%s«"
+msgstr ""
+"die Formatspezifikationen in »%s« sind keine Untermenge von deren 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-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "eine Formatspezifikation für Argument »%s« fehlt in »%s«"
 
 #: src/format-python.c: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 Tuple"
+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 "
+"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 ""
-"die Formatspezifikationen in »%s« erwarten ein Tuple, die in »%s« jedoch ein\n"
+"die Formatspezifikationen in »%s« erwarten ein Tuple, 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:136
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "In der %u. Formatanweisung folgt dem '%c' keine Ziffer."
+
+#: src/format-python-brace.c:149
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr "In der %u. Formatanweisung folgt der »{« kein nummeriertes Argument."
+
+#: src/format-python-brace.c:164
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "In der %u. Formatanweisung folgt dem '%c' keine Ziffer."
+
+#: src/format-python-brace.c:184
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"In der %u. Formatanweisung ist eine Genauigkeit vor »%c« nicht erlaubt."
+
+#: src/format-python-brace.c:210
+#, fuzzy, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr "In der %u. Formatanweisung ist das %d. Argument negativ."
 
 #: 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, dernicht ASCII-kodiert ist."
+msgstr ""
+"Die Zeichenkette bezieht sich auf eine Shell-Variable mit einem Namen, "
+"dernicht 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' ist 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' ist 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:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -777,17 +945,17 @@ msgstr ""
 "weiterzugeben.\n"
 "Es gibt KEINE GARANTIE, soweit als vom Gesetz erlaubt.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: src/xgettext.c:605
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschrieben von %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -799,11 +967,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "zu viele Argumente"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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 "»%s --help« gibt weitere Informationen.\n"
@@ -831,7 +999,8 @@ 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"
@@ -842,29 +1011,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      Adressen für den Rechnernamen\n"
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informative Ausgabe:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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                   diese Hilfe anzeigen und beenden\n"
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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                Versionsnummer anzeigen und beenden\n"
@@ -873,11 +1042,11 @@ msgstr "  -V, --version                Versionsnummer anzeigen und beenden\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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 ""
 "Fehler bitte auf Englisch an <bug-gnu-gettext@gnu.org> melden.\n"
@@ -890,30 +1059,30 @@ msgstr ""
 msgid "could not get host name"
 msgstr "es ist nicht möglich, den Rechnernamen (Hostname) herauszufinden"
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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 "höchstens eine Eingabedatei erlaubt"
 
-#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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 und %s schließen sich gegenseitig aus"
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 "Aufruf: %s [OPTION] [EINGABEDATEI]\n"
 
-#: src/msgattrib.c:412
+#: src/msgattrib.c:419
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -922,38 +1091,41 @@ msgstr ""
 "Meldungen eines Katalogs mit Übersetzungen anhand von Attributen filtern und\n"
 "Attribute der Meldungen bearbeiten.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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 ""
 "Notwendige Argumente für Optionen in Langform sind auch für die Kurzform\n"
 "notwendig.\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, c-format
 msgid "Input file location:\n"
 msgstr "Angaben zu Eingabedateien:\n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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 "  EINGABEDATEI                PO-Eingabedatei\n"
 
-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, 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:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: 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"
@@ -961,22 +1133,23 @@ msgstr ""
 "Wenn keine Eingabedatei oder »-« angegeben ist, wird die Standardeingabe\n"
 "gelesen.\n"
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr "Angaben zu Ausgabedateien:\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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=DATEI      Ausgabe in die angegebene DATEI schreiben\n"
+msgstr ""
+"  -o, --output-file=DATEI      Ausgabe in die angegebene DATEI schreiben\n"
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -984,99 +1157,128 @@ 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:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Auswahl der Meldungen:\n"
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:445
 #, 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:440
+#: src/msgattrib.c:447
 #, 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:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              mit »fuzzy« markierte verwerfen\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            mit »fuzzy« markierte übernehmen\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           obsolete Meldungen (#~) verwerfen\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         obsolete Meldungen (#~) übernehmen\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Attribute verändern:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy              alle Meldungen auf 'fuzzy' setzen\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, 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:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete           alle Meldungen obsolet machen\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete         alle Meldungen nicht-obsolet machen\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, fuzzy, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+"      --previous           die vorherigen Schlüssel der übersetzten "
+"Meldungen\n"
+"                             beibehalten\n"
+
+#: src/msgattrib.c:471
 #, 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:463
+#: 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=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:465
+#: 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=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:467
+#: src/msgattrib.c:477
 #, 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:469
+#: src/msgattrib.c:479
 #, 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:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: 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
@@ -1084,100 +1286,117 @@ msgstr "      --obsolete               Synonym für »--only-obsolete --clear-ob
 msgid "Input file syntax:\n"
 msgstr "Syntax der Eingabedatei:\n"
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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      Eingabedatei folgt der .properties-Syntax von\n"
 "                                Java\n"
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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     Eingabedatei folgt der .strings-Syntax von\n"
 "                                Nextstep/Gnustep\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr "Details zur Ausgabe:\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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                 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:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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=STYLEDATEI      CSS-Datei mit Style-Regel für --color angeben\n"
+msgstr ""
+"      --style=STYLEDATEI      CSS-Datei mit Style-Regel für --color angeben\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/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:935
+#: 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           keine C-Escape-Sequenzen in Ausgabe verwenden\n"
 "                              (Vorgabe)\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: 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:937
+#: 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-Sequenzen und keine erweiterten\n"
 "                              Zeichen in Ausgabe verwenden\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: 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:939
+#: 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-Datei erstellen, auch wenn sie leer ist\n"
+msgstr ""
+"      --force-po            PO-Datei erstellen, auch wenn sie leer ist\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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              Ausgabe eingerückt darstellen\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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         Zeilen mit »#: Datei:Zeilennr.« nicht schreiben\n"
+msgstr ""
+"      --no-location         Zeilen mit »#: Datei:Zeilennr.« nicht schreiben\n"
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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        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:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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-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:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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
@@ -1186,25 +1405,27 @@ msgstr ""
 "  -p, --properties-output   Datei in der .properties-Syntax von Java\n"
 "                              ausgeben\n"
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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   eine ».strings«-Datei von Nextstep/Gnustep\n"
 "                               erstellen\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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=ANZAHL        Breite der Ausgabe auf ANZAHL Spalten festlegen\n"
+msgstr ""
+"  -w, --width=ANZAHL        Breite der Ausgabe auf ANZAHL Spalten festlegen\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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"
@@ -1214,26 +1435,27 @@ msgstr ""
 "                              Breite der Ausgabe sind, nicht auf mehrere\n"
 "                              Zeilen umbrechen\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output         sortierte Ausgabe erstellen\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: 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:960
+#: src/xgettext.c:979
 #, 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:321 src/msgcomm.c:326
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Auswahlkriterium nicht möglich (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Aufruf: %s [OPTION] [EINGABEDATEI]...\n"
@@ -1262,18 +1484,19 @@ msgstr ""
 "entsprechende Eintrag nur von der ersten PO-Datei berücksichtigt, in der der\n"
 "Eintrag vorkommt.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  EINGABEDATEI...             Eingabedateien\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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=DATEI      Namen der Eingabedateien aus DATEI holen\n"
+msgstr ""
+"  -f, --files-from=DATEI      Namen der Eingabedateien aus DATEI holen\n"
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Wenn die Eingabedatei »-« ist, wird die Standardeingabe gelesen.\n"
@@ -1308,9 +1531,11 @@ msgstr ""
 #: 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      Eingabedateien folgen der .properties-Syntax von\n"
+"  -P, --properties-input      Eingabedateien folgen der .properties-Syntax "
+"von\n"
 "                              Java\n"
 
 #: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
@@ -1320,7 +1545,8 @@ 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:427 src/msgconv.c:332 src/msguniq.c:377
@@ -1340,8 +1566,10 @@ msgstr ""
 
 #: 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=CATALOGNAME      'Language'-Feld in dem Kopfeintrag setzen\n"
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr ""
+"      --lang=CATALOGNAME      '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:286 src/msgmerge.c:350
@@ -1400,8 +1628,11 @@ msgstr "Optionen, die Verarbeitungen modifizieren:\n"
 
 #: 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 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:550
 #, c-format
@@ -1491,10 +1722,13 @@ msgstr ""
 "  ->, --more-than=ANZAHL     Meldungen mit mehr als ANZAHL Definitionen\n"
 "                               anzeigen (Vorgabe: 1)\n"
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, 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:306
 #, c-format
@@ -1511,7 +1745,8 @@ msgstr "Zielformat der Konvertierung:\n"
 #: src/msgconv.c:334
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
-msgstr "Die Vorgabe für die Kodierung ist die Kodierung der aktuellen Lokale.\n"
+msgstr ""
+"Die Vorgabe für die Kodierung ist die Kodierung der aktuellen Lokale.\n"
 
 #: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
@@ -1522,12 +1757,15 @@ msgstr "  -i, --indent                  Ausgabe eingerückt darstellen\n"
 #: src/msgmerge.c:581
 #, 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: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"
+msgid ""
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "      --add-location            Zeilen mit »#: Datei:Zeilennr.« erhalten\n"
 "                                  (Vorgabe)\n"
@@ -1536,9 +1774,11 @@ msgstr ""
 #: src/msgmerge.c:585
 #, 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:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "Eingabedatei fehlt"
@@ -1635,7 +1875,9 @@ msgstr "Aufruf: %s [OPTION] FILTER [FILTER-OPTION]\n"
 #: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr "Einen Filter auf alle Übersetzungen eines Katalogs mit Übersetzungen anwenden.\n"
+msgstr ""
+"Einen Filter auf alle Übersetzungen eines Katalogs mit Übersetzungen "
+"anwenden.\n"
 
 #: src/msgfilter.c:416
 #, c-format
@@ -1644,7 +1886,8 @@ 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:421
@@ -1654,13 +1897,16 @@ msgstr "Nützliche FILTER-OPTIONen, wenn »sed« der FILTER ist:\n"
 
 #: src/msgfilter.c:423
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr "  -e, --expression=SKRIPT     SKRIPT den auszuführenden Befehlen hinzufügen\n"
+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: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=SKRIPT_DATEI     Inhalt der SKRIPT_DATEI den auszuführenden\n"
@@ -1668,12 +1914,15 @@ msgstr ""
 
 #: src/msgfilter.c:428
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr "  -n, --quiet, --silent       \"Pattern-Space\" nicht automatisch ausgeben\n"
+msgid ""
+"  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
+msgstr ""
+"  -n, --quiet, --silent       \"Pattern-Space\" nicht automatisch ausgeben\n"
 
 #: 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                   keine C-Escape-Sequenzen in Ausgabe\n"
 "                                      verwenden (Vorgabe)\n"
@@ -1685,8 +1934,11 @@ msgstr "      --indent               Ausgabe eingerückt darstellen\n"
 
 #: src/msgfilter.c:454
 #, 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:304
 #, c-format
@@ -1699,7 +1951,7 @@ msgid "invalid endianness: %s"
 msgstr "ungültiger Endian-Wert: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -1760,9 +2012,10 @@ msgstr "Aufruf: %s [OPTION] Datei.po ...\n"
 #: src/msgfmt.c:658
 #, 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:663 src/xgettext.c:826
+#: 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"
@@ -1776,39 +2029,51 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  Datei.po ...                Eingabedateien\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Art der Verarbeitung:\n"
 
 #: 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-Modus: eine ResourceBundle-Klasse für Java\n"
 "                             erstellen\n"
 
 #: src/msgfmt.c:681
 #, 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:683
 #, 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: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#-Ressourcenmodus: eine .resources-Datei für\n"
 "                                .NET erstellen\n"
 
 #: src/msgfmt.c:687
 #, 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:689
 #, c-format
@@ -1818,12 +2083,15 @@ msgstr "      --qt                 Qt-Modus: eine .qm-Datei für Qt erstellen\n"
 #: src/msgfmt.c:696
 #, 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:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, 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:701
 #, c-format
@@ -1838,27 +2106,35 @@ msgstr "  -r, --resource=RESSOURCE    Name der Ressource\n"
 #: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
 #: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, 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 Lokale, entweder »sprache« (z. B. »de«)\n"
+"  -l, --locale=LOKALE         Name der Lokale, entweder »sprache« (z. B. "
+"»de«)\n"
 "                                oder »sprache_LAND\" (z. B. »de_DE«)\n"
 
 #: 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 VERZEICHNIS              Basis-Verzeichnis der Verzeichnis-Hierarchie mit\n"
+"  -d VERZEICHNIS              Basis-Verzeichnis der Verzeichnis-Hierarchie "
+"mit\n"
 "                                den Klassen\n"
 
 #: 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 ""
-"Der Name der Klasse wird durch das Anhängen des Namens der Lokale an den Namen\n"
-"der Ressource festgelegt, abgetrennt durch einen Unterstrich (»_«).  Die Option\n"
+"Der Name der Klasse wird durch das Anhängen des Namens der Lokale an den "
+"Namen\n"
+"der Ressource festgelegt, abgetrennt durch einen Unterstrich (»_«).  Die "
+"Option\n"
 "»-d« ist notwendig.  Die Klasse wird unter dem angegebenen Verzeichnis\n"
 "geschrieben.\n"
 
@@ -1869,9 +2145,12 @@ msgstr "Angaben zu Ausgabedateien im C#-Modus:\n"
 
 #: 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 VERZEICHNIS              Basis-Verzeichnis der von der Lokale abhängigen\n"
+"  -d VERZEICHNIS              Basis-Verzeichnis der von der Lokale "
+"abhängigen\n"
 "                                .dll-Dateien\n"
 
 #: src/msgfmt.c:723
@@ -1881,7 +2160,8 @@ 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 Lokale abhängig ist.\n"
 
 #: src/msgfmt.c:727
@@ -1892,7 +2172,9 @@ msgstr "Angaben zu Ausgabedateien im Tcl-Modus:\n"
 #: src/msgfmt.c:731 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:733
 #, c-format
@@ -1903,7 +2185,7 @@ msgstr ""
 "Die Optionen »-l« und »-d« sind notwendig.  Die .msg-Datei wird in das\n"
 "angegebene Verzeichnis geschrieben.\n"
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Überprüfung der Eingabedatei:\n"
@@ -1912,20 +2194,27 @@ 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:750
 #, 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:752
 #, 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:754
 #, c-format
@@ -1933,33 +2222,42 @@ 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: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   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: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[=ZEICHEN]   Vorhandensein des Tastatur-Accelerators\n"
+"      --check-accelerators[=ZEICHEN]   Vorhandensein des Tastatur-"
+"Accelerators\n"
 "                                für Menüeinträge überprüfen\n"
 
 #: src/msgfmt.c:762
 #, 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: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=ZAHL          Ausgaben an ZAHL (Vorgabe: %d) Bytegrenze\n"
 "                                  ausrichten\n"
@@ -1967,26 +2265,35 @@ msgstr ""
 #: 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=BYTEFOLGE  32-Bit-Zahlen in der angegebenen Byte-Reihenfolge\n"
-"                                (»big« oder »little«, Standard von Plattform abhängig)\n"
+"      --endianness=BYTEFOLGE  32-Bit-Zahlen in der angegebenen Byte-"
+"Reihenfolge\n"
+"                                (»big« oder »little«, Standard von Plattform "
+"abhängig)\n"
 
 #: src/msgfmt.c:772
 #, 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:781
 #, 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:783 src/msgmerge.c:607 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:897
 #, c-format
@@ -2008,7 +2315,8 @@ msgstr "Warnung: Kopfteil der PO-Datei ist ungenau (fuzzy)\n"
 #: src/msgfmt.c:912
 #, 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:936
 #, c-format
@@ -2018,7 +2326,8 @@ msgstr "Bereichsname »%s« ist nicht als Dateiname geeignet"
 #: src/msgfmt.c:941
 #, 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:955
 #, c-format
@@ -2042,19 +2351,24 @@ msgstr "%s: Warnung: Quelldatei enthält ungenaue Übersetzungen"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "Fehler beim Lesen von »%s«"
 
 #: 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 "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:516
 #, c-format, no-wrap
@@ -2152,7 +2466,8 @@ msgstr ""
 
 #: 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-Sequenzen und keine erweiterten\n"
 "                              Zeichen in Ausgabe verwenden\n"
@@ -2165,7 +2480,8 @@ msgstr "      --sort-output         sortierte Ausgabe erstellen\n"
 #: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr "      --sort-by-file        Ausgabe gemäß Vorkommen in Dateien erstellen\n"
+msgstr ""
+"      --sort-by-file        Ausgabe gemäß Vorkommen in Dateien erstellen\n"
 
 #: src/msginit.c:297
 msgid ""
@@ -2175,7 +2491,8 @@ 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
@@ -2210,17 +2527,20 @@ 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
@@ -2230,7 +2550,8 @@ 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
@@ -2239,8 +2560,10 @@ 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 ""
@@ -2272,12 +2595,16 @@ msgstr "Subprozess %s mit dem Exitcode %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 soll Ihre E-Mail-Adresse enthalten, damit\n"
-"Benutzer Ihnen Rückmeldungen zur Übersetzung schicken oder Programmautoren im\n"
+"Der neue Katalog mit den Meldungen soll 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.
@@ -2300,12 +2627,16 @@ 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"
@@ -2316,8 +2647,8 @@ msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "Zeichensatz »%s« für die Ausgabe bezeichnet keine portable Kodierung"
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "Warnung: "
@@ -2334,13 +2665,15 @@ 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
@@ -2428,9 +2761,12 @@ 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
@@ -2478,7 +2814,9 @@ 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"
@@ -2522,26 +2860,19 @@ msgstr "bei »msgstr« fehlt die Markierung »%c« für den Tastatur-Accelerator
 #: 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-Accelerator auf"
-
-#: src/msgl-check.c:785
-#, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "Im Kopfeintrag fehlt das Feld »%s«\n"
+msgstr ""
+"»msgstr« weist mehr als eine Markierung »%c« für den Tastatur-Accelerator auf"
 
-#: src/msgl-check.c:793
+#: src/msgl-check.c:801
 #, c-format
-msgid "header field '%s' should start at beginning of line\n"
-msgstr "Feld »%s« im Kopfeintrag sollte am Beginn der Zeile anfangen\n"
-
-#: src/msgl-check.c:818
-msgid "some header fields still have the initial default value\n"
-msgstr "Einige Felder im Kopfeintrag haben immer noch den anfänglichen Vorgabewert\n"
+msgid "header field '%s' still has the initial default value\n"
+msgstr ""
+"Das Felder »%s« im Kopfeintrag hat immer noch den anfänglichen Vorgabewert\n"
 
-#: src/msgl-check.c:835
+#: src/msgl-check.c:816
 #, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "Das Felder »%s« im Kopfeintrag hat immer noch den anfänglichen Vorgabewert\n"
+msgid "header field '%s' missing in header\n"
+msgstr "Im Kopfeintrag fehlt das Feld »%s«\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2557,25 +2888,34 @@ 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:623 src/xgettext.c:693
+#: 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."
+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:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, 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."
@@ -2656,7 +2996,8 @@ msgstr "Das Ergebnis wird nach Def.po zurückgeschrieben.\n"
 #: src/msgmerge.c:530
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
-msgstr "      --backup=KONTROLLE      Eine Sicherungskopie von Def.po anlegen\n"
+msgstr ""
+"      --backup=KONTROLLE      Eine Sicherungskopie von Def.po anlegen\n"
 
 #: src/msgmerge.c:532
 #, c-format
@@ -2668,26 +3009,30 @@ msgstr ""
 #: 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 ""
-"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: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 ""
 "Das Suffix für Sicherungskopien ist ~, außer wenn --suffix oder die\n"
@@ -2695,9 +3040,11 @@ msgstr ""
 
 #: 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           die vorherigen Schlüssel der übersetzten Meldungen\n"
+"      --previous           die vorherigen Schlüssel der übersetzten "
+"Meldungen\n"
 "                             beibehalten\n"
 
 #: src/msgmerge.c:609 src/urlget.c:192
@@ -2717,7 +3064,9 @@ msgstr "diese Meldung sollte keine Pluralformen definieren"
 
 #: 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%ld alte + %ld Referenzeinträge gelesen,\n"
 "%ld stimmen überein, %ld ungenau, %ld fehlen, %ld veraltet.\n"
@@ -2747,9 +3096,12 @@ 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 erstellen\n"
 
 #: src/msgunfmt.c:442
@@ -2759,15 +3111,20 @@ 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: .NET-.resources-Datei ist\n"
 "                                eine eingabedatei\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
@@ -2782,11 +3139,14 @@ 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 Lokale an den Namen\n"
-"der Ressource festgelegt, abgetrennt durch einen Unterstrich (»_«).  Die Option\n"
+"Der Name der Klasse wird durch das Anhängen des Namens der Lokale an den "
+"Namen\n"
+"der Ressource festgelegt, abgetrennt durch einen Unterstrich (»_«).  Die "
+"Option\n"
 "»-d« ist notwendig.  Die Klasse mittels CLASSPATH gesucht.\n"
 
 #: src/msgunfmt.c:467
@@ -2801,7 +3161,8 @@ msgid ""
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 "Die Optionen »-l« und »-d« sind notwendig.  Die .dll-Datei ist in einem\n"
-"Unterverzeichnis des angegebenen Verzeichnisses geschrieben plaziert, dessen\n"
+"Unterverzeichnis des angegebenen Verzeichnisses geschrieben plaziert, "
+"dessen\n"
 "Name von der Lokale abhängig ist.\n"
 
 #: src/msgunfmt.c:479
@@ -2826,7 +3187,8 @@ 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:330
 #, c-format, no-wrap
@@ -2858,9 +3220,12 @@ msgstr "  -d, --repeated                 nur doppelte Einträge ausgeben\n"
 
 #: 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                   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
@@ -3000,7 +3365,7 @@ msgstr "Zeilenende innerhalb einer Zeichenkette"
 msgid "context separator <EOT> within string"
 msgstr "Kontext-Trenner <EOT> innerhalb einer Zeichenkette"
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "diese Datei darf keine »domain«-Anweisung enthalten"
@@ -3092,7 +3457,8 @@ msgstr "Eingabe ist nicht gültig in der Kodierung »%s«"
 #: 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
@@ -3144,24 +3510,47 @@ 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
@@ -3180,7 +3569,8 @@ msgstr "Fehler beim Anlegen von Verzeichnis »%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
@@ -3203,7 +3593,8 @@ 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
@@ -3213,8 +3604,10 @@ msgstr "Fehler beim Öffnen von  »%s« zum Schreiben"
 
 #: src/write-po.c:803
 #, 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:1254 src/write-po.c:1383
 #, c-format
@@ -3239,7 +3632,8 @@ msgid ""
 "%s\n"
 msgstr ""
 "Die folgende msgid enthält Zeichen, die nicht ASCII-kodiert sind.\n"
-"Dies kann bei den Übersetzungen Schwierigkeiten bereiten, wenn die Übersetzer\n"
+"Dies kann bei den Übersetzungen Schwierigkeiten bereiten, wenn die "
+"Übersetzer\n"
 "eine andere Zeichen-Kodierung als Sie verwenden.  Bitte auf eine msgid\n"
 "ausweichen, die nur aus ASCII-kodierten Zeichen besteht.\n"
 "%s\n"
@@ -3254,11 +3648,13 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"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"
@@ -3269,9 +3665,12 @@ 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, die 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, die 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
@@ -3310,7 +3709,7 @@ msgstr ""
 "Katalog mit Meldungen weist Übersetzungen mit Pluralformen auf, aber der\n"
 "Tcl-Katalog mit den Meldungen unterstützt keine Pluralbehandlung\n"
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: 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: Warnung: Zeichenkette nicht korrekt terminiert"
@@ -3320,17 +3719,17 @@ msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: Warnung: regulärer Ausdruck nicht korrekt terminiert"
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: 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: Warnung: Zeichenkonstante nicht korrekt terminiert"
 
-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
 
-#: src/x-csharp.c:224 src/xgettext.c:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr "Bitte die Kodierung des Quelltextes mit --from-code angeben."
 
@@ -3370,7 +3769,7 @@ msgstr ""
 "%s:%d: Unvollständige Multibyte-Sequenz am Ende der Zeile.\n"
 "Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: Fehler von iconv"
@@ -3384,7 +3783,7 @@ msgstr ""
 "%s:%d: Ungültige Multibyte-Sequenz.\n"
 "Bitte die Kodierung des Quelltextes mit --from-code angeben.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: Warnung: ungültiges Unicode-Zeichen"
@@ -3404,13 +3803,23 @@ msgstr "%s:%d: Warnung: ')' gefunden, wo '}' erwartet wurde"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: Warnung: '}' gefunden, wo ')' erwartet wurde"
 
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: src/x-glade.c:686
+#, c-format
+msgid "The root element <%s> is not allowed in a valid Glade file"
+msgstr ""
+
 # CHECKIT
-#: src/x-glade.c:623 src/x-glade.c:630
+#: 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:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3424,10 +3833,66 @@ msgstr ""
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: Warnung: Einzelnes Surrogat U+%04X"
 
+#: src/x-javascript.c:230
+#, fuzzy
+msgid "Please specify the source encoding through --from-code\n"
+msgstr "Bitte die Kodierung des Quelltextes mit --from-code angeben."
+
+#: 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: Ungültige Multibyte-Sequenz.\n"
+"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\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: Lange unvollständige Multibyte-Sequenz.\n"
+"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\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: Unvollständige Multibyte-Sequenz am Ende der Datei.\n"
+"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
+
+#: src/x-javascript.c:312
+#, 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: Unvollständige Multibyte-Sequenz am Ende der Zeile.\n"
+"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
+
+#: src/x-javascript.c:344
+#, fuzzy, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code\n"
+msgstr ""
+"%s:%d: Ungültige Multibyte-Sequenz.\n"
+"Bitte die Kodierung des Quelltextes mit --from-code angeben.\n"
+
+#: src/x-javascript.c:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
+
 #: 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
@@ -3459,15 +3924,17 @@ msgstr "%s:%d: ungültige Interpolation (»\\L«) bei dem 8-Bit-Zeichen »%c«"
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: ungültige Interpolation (»\\U«) bei dem 8-Bit-Zeichen »%c«"
 
-#: src/x-python.c:236
+#: 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 ""
-"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:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3475,10 +3942,12 @@ 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 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:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3486,10 +3955,12 @@ 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 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:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3497,10 +3968,12 @@ 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 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:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3508,10 +3981,12 @@ 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 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:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3519,10 +3994,12 @@ 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:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Unbekannt Kodierung »%s«. Es wird stattdessen mit ASCII fortgefahren."
@@ -3544,79 +4021,104 @@ 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:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
 
-#: src/xgettext.c:621
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "»--join-existing« kann nicht benutzt werden, wenn nach Standardausgabe\n"
 "geschrieben wird"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, 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:770
+#: src/xgettext.c:785
 #, 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:821
+#: src/xgettext.c:836
 #, 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:844
+#: 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  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:846
+#: src/xgettext.c:861
 #, 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:848
+#: src/xgettext.c:863
 #, 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:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Wahl der Sprache für die Eingabedatei:\n"
 
-#: src/xgettext.c:855
-#, c-format
+#: 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"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 "  -L, --language=NAME            angegebene Programmiersprache erkennen\n"
 "                                   (C, C++, ObjectiveC, PO, Python, Lisp,\n"
 "                                   EmacsLisp, librep, Smalltalk, Java,\n"
 "                                   JavaProperties, C#, awk, YCP, Tcl, Perl,\n"
-"                                   PHP, GCC-source, NXStringTable, RST, Glade)\n"
+"                                   PHP, GCC-source, NXStringTable, RST, "
+"Glade)\n"
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                      Abkürzung für --language=C++\n"
 
-#: src/xgettext.c:863
+#: 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 ""
-"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:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3625,59 +4127,67 @@ msgstr ""
 "      --from-code=NAME           Kodierung der Eingabedateien\n"
 "                                   (außer für Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Die Vorgabe ist, dass für Eingabedateien ASCII angenommen wird.\n"
 
-#: src/xgettext.c:876
+#: src/xgettext.c:892
 #, 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:878
+#: src/xgettext.c:894
 #, 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:880
+#: 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 ""
-"  -cKENNUNG, --add-comments=KENNUNG   Kommentare, die mit KENNUNG beginnen und welche\n"
-"                                        einer Zeile mit Schlüsselworten vorausgehen in\n"
+"  -cKENNUNG, --add-comments=KENNUNG   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"
+"  -c, --add-comments                  Alle Kommentarblöcke, die einer Zeile "
+"mit\n"
 "                                        Schlüsselworten vorausgehen, in die\n"
 "                                        Ausgabedatei schreiben.\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Besondere Optionen bei »Language«:\n"
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all          alle Zeichenketten extrahieren\n"
 
-#: src/xgettext.c:890 src/xgettext.c:897
-#, c-format
+#: src/xgettext.c:906 src/xgettext.c:914
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                 (nur die Programmiersprachen C, C++,\n"
 "                                 ObjectiveC, Shell, Python, Lisp,\n"
 "                                 EmacsLisp, librep, Scheme, Java, C#, awk,\n"
 "                                 Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3688,158 +4198,188 @@ msgstr ""
 "  -k, --keyword               es wird nicht nach den vorgegebenen\n"
 "                              Schlüsselwörtern gesucht\n"
 
-#: src/xgettext.c:901
+#: 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=WORT:ARG:FLAG    zusätzliches Flag für Zeichenketten innerhalb der\n"
-"                                der Argumentzahl ARG des Schlüsselworts WORT\n"
+"      --flag=WORT:ARG:FLAG    zusätzliches Flag für Zeichenketten innerhalb "
+"der\n"
+"                                der Argumentzahl ARG des Schlüsselworts "
+"WORT\n"
 
-#: src/xgettext.c:904
-#, c-format
+#: src/xgettext.c:922
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                   (nur die Programmiersprachen C, C++,\n"
-"                                   ObjectiveC, Shell, Python, Lisp, EmacsLisp,\n"
+"                                   ObjectiveC, Shell, Python, Lisp, "
+"EmacsLisp,\n"
 "                                   librep, Scheme, Java, C#, awk, YCP, Tcl,\n"
 "                                   Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs            Trigraph-Zeichen von ANSI C bei der Eingabe\n"
 "                               erkennen\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                   (nur die Programmiersprachen C, C++,\n"
 "                                   ObjectiveC)\n"
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                     Zeichenketten im Qt-Format erkennen\n"
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                 (nur die Programmiersprache C++)\n"
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --kde                     Zeichenketten im KDE 4-Format erkennen\n"
+msgstr ""
+"      --kde                     Zeichenketten im KDE 4-Format erkennen\n"
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
-msgstr "      --boost                  Zeichenketten im Boost-Format erkennen\n"
+msgstr ""
+"      --boost                  Zeichenketten im Boost-Format erkennen\n"
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
-msgid "      --debug                 more detailed formatstring recognition result\n"
+msgid ""
+"      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "  --debug                    detaillierteres Ergebnis bei Erkennung der\n"
 "                               Formatelemente\n"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, 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:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr "      --copyright-holder=KETTE  Halter des Copyrights in Ausgabe setzen\n"
+msgstr ""
+"      --copyright-holder=KETTE  Halter des Copyrights in Ausgabe setzen\n"
 
-#: src/xgettext.c:966
+#: 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            keine Zeile mit FSF-Copyright in Ausgabe\n"
 "                                  einfügen\n"
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PAKET    Paketname für die Ausgabe setzen\n"
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  Paketversion in Ausgabe setzen\n"
 
-#: src/xgettext.c:972
+#: src/xgettext.c:991
 #, 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:974
+#: 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[KETTE], --msgstr-prefix[=KETTE]    KETTE oder \"\" als Präfix für msgstr\n"
+"  -m[KETTE], --msgstr-prefix[=KETTE]    KETTE oder \"\" als Präfix für "
+"msgstr\n"
 "                                nehmen\n"
 
-#: src/xgettext.c:977
+#: 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[KETTE], --msgstr-suffix[=KETTE]    KETTE oder \"\" als Suffix für msgstr\n"
+"  -M[KETTE], --msgstr-suffix[=KETTE]    KETTE oder \"\" als Suffix für "
+"msgstr\n"
 "                                nehmen\n"
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, 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:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "Standardeingabe"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Nicht in ASCII kodiertes Zeichen bei %s%s."
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Nicht in ASCII kodierter Kommentar bei oder vor %s%s."
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Nich in ASCII kodierte Zeichenkette bei oder vor %s%s."
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: Warnung: "
 
-#: src/xgettext.c:2104
+#: 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 "Obwohl das Formatelement 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 das Formatelement an der Position eines Formatelements verwendet "
+"wird, ist %s kein gültiges %s Formatelement. Der Grund: %s\n"
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Obwohl es als Formatelement 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 als Formatelement deklariert wurde, ist %s kein gültiges %s "
+"Formatelement. Der Grund: %s\n"
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3853,7 +4393,7 @@ msgstr ""
 "Verwenden Sie besser ein Formatelement mit bezeichneten Argumenten\n"
 "und einem Mapping anstelle eines Tuples für die Argumente.\n"
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3863,27 +4403,28 @@ msgstr ""
 "gettext(\"\") gibt den Kopfeintrag mit Meta-Informationen\n"
 "zurück, keine leere Zeichenkette.\n"
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "mehrdeutige Argumentspezifikation für das Schlüsselwort »%.*s«"
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "Warnung: fehlender Kontext für das Schlüsselwort »%.*s«"
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, 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:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "Abweichung beim Kontext zwischen Singular- und Pluralform"
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3895,7 +4436,7 @@ msgstr ""
 "Variable MSGID_BUGS_ADDRESS aus; falls nicht, geben Sie bitte die\n"
 "Option an der Befehlszeile mit --msgid-bugs-address an.\n"
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, c-format
 msgid "language '%s' unknown"
 msgstr "Programmiersprache »%s« unbekannt"
@@ -3904,6 +4445,14 @@ msgstr "Programmiersprache »%s« unbekannt"
 msgid "<unnamed>"
 msgstr "<unbenannt>"
 
+#~ msgid "header field '%s' should start at beginning of line\n"
+#~ msgstr "Feld »%s« im Kopfeintrag sollte am Beginn der Zeile anfangen\n"
+
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr ""
+#~ "Einige Felder im Kopfeintrag haben immer noch den anfänglichen "
+#~ "Vorgabewert\n"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: unzulässige Option -- %c\n"
 
@@ -3923,4 +4472,5 @@ 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 8e77c4e..c361cd1 100644
--- a/gettext-tools/po/el.po
+++ b/gettext-tools/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.34\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\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"
@@ -58,37 +58,37 @@ msgstr "�������� ���������� ��� �������� \"%s\""
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "������ ��� ������� ��� \"%s\" ��� ��������"
 
 #
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "������ ���� �� ������� ��� ������� \"%s\" ��� �������"
 
 #
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "������ ���� �������� ��� \"%s\""
 
 #
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "������ ���� ������� ��� ������� \"%s\""
 
 #
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "������ ���� �������� ��� \"%s\""
@@ -234,7 +234,7 @@ msgstr ""
 #
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, fuzzy, c-format
 msgid "memory exhausted"
 msgstr "H ����� �����������"
@@ -299,7 +299,7 @@ msgstr ""
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -335,20 +335,20 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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\" ��� ��������"
 
-#: src/format.c:148
+#: 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-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
@@ -358,7 +358,7 @@ 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-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
@@ -368,9 +368,10 @@ 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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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 "�� ������������� ��� �� ��������� %u ��� ����� �����"
@@ -399,7 +400,8 @@ msgstr ""
 
 #
 #: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-python.c:515 src/format-qt-plural.c:110
+#: 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 ""
@@ -684,7 +686,9 @@ msgid ""
 msgstr ""
 
 #
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-sh.c:308
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "�� ������������� ��� �� ��������� %u ��� ����� �����"
@@ -730,6 +734,32 @@ msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "�� ������������� ��� �� ��������� %u ��� ����� �����"
 
+#: src/format-python-brace.c:136
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr ""
+
+#: src/format-python-brace.c:149
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+
+#: src/format-python-brace.c:164
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
+
+#: src/format-python-brace.c:184
+#, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+
+#: src/format-python-brace.c:210
+#, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr ""
+
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -771,11 +801,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -785,17 +815,17 @@ msgid ""
 msgstr ""
 
 #
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -809,11 +839,11 @@ msgid "too many arguments"
 msgstr "���� ����� ��������"
 
 #
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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"
@@ -851,29 +881,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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 ""
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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 ""
@@ -883,11 +913,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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1011
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "������� �������� ��������� ��� <bug-gnu-utils@gnu.org>.\n"
@@ -898,38 +928,38 @@ msgid "could not get host name"
 msgstr ""
 
 #
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "����������� ������� ��� ������ �������"
 
 #
-#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 ""
 
-#: src/msgattrib.c:412
+#: 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 ""
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -939,50 +969,50 @@ msgid ""
 msgstr ""
 
 #
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "��� ������ ������ �������"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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 ""
 
-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/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 ""
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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 ""
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -991,99 +1021,106 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+
+#: src/msgattrib.c:471
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/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
@@ -1091,14 +1128,14 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1106,17 +1143,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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"
@@ -1125,88 +1162,88 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/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:939
+#: 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 ""
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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 ""
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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 ""
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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 ""
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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 ""
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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 ""
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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 ""
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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 ""
 
 #
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1224,16 +1261,16 @@ msgstr ""
 "  -S, --strict             ����� ������ �� ������� Uniforum\n"
 "  -V, --version            �������� ����������� ������� ��� ������\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1244,7 +1281,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "���� ��������� ������� �������� �������� (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -1280,18 +1317,18 @@ msgstr ""
 "����� ������ PO ��� �� ���� ������. �� ������ ������� ��� ��� �� ������ PO\n"
 "�� �����������.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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 ""
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
@@ -1521,7 +1558,7 @@ msgid ""
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1567,7 +1604,7 @@ msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
 #
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "��� ������ ������ �������"
@@ -1717,7 +1754,7 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr ""
 
@@ -1780,7 +1817,7 @@ msgstr ""
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1792,7 +1829,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
@@ -1839,7 +1876,7 @@ msgstr ""
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -1914,7 +1951,7 @@ msgid ""
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
@@ -2065,11 +2102,12 @@ 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:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "������ ���� �������� ��� \"%s\""
@@ -2277,8 +2315,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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr ""
@@ -2478,28 +2516,16 @@ msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
 #
-#: src/msgl-check.c:785
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "�� ����� `%s' ���� ���������� ��� �� ��������"
-
-#
-#: src/msgl-check.c:793
+#: src/msgl-check.c:801
 #, fuzzy, c-format
-msgid "header field '%s' should start at beginning of line\n"
-msgstr "�� ����� ��������� `%s' �� ������ �� ������ ���� ���� ��� �������"
-
-#
-#: src/msgl-check.c:818
-#, fuzzy
-msgid "some header fields still have the initial default value\n"
+msgid "header field '%s' still has the initial default value\n"
 msgstr "������ ����� ��� ��������� ����� ����� ��� ������ �� ������� ����"
 
 #
-#: src/msgl-check.c:835
+#: src/msgl-check.c:816
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "������ ����� ��� ��������� ����� ����� ��� ������ �� ������� ����"
+msgid "header field '%s' missing in header\n"
+msgstr "�� ����� `%s' ���� ���������� ��� �� ��������"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2517,7 +2543,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:623 src/xgettext.c:693
+#: 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 "
@@ -2531,8 +2557,8 @@ msgid ""
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2940,7 +2966,7 @@ msgid "context separator <EOT> within string"
 msgstr ""
 
 #
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "���� �� ������ ��� ������ �� �������� ������� ��� �� �������"
@@ -3261,7 +3287,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/x-awk.c:341 src/x-python.c:1075
+#: src/x-awk.c:341 src/x-javascript.c:988 src/x-python.c:1128
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: �������������: �� ������������ �������������"
@@ -3273,18 +3299,18 @@ msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: �������������: �� ������������ �������������"
 
 #
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-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:1247
+#: 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:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3316,7 +3342,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3329,7 +3355,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: �������������: �� ������������ ������� ����������"
@@ -3350,12 +3376,22 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3368,6 +3404,51 @@ msgstr ""
 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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: �������������: �� ������������ �������������"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3404,13 +3485,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:236
+#: 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:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3418,7 +3499,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3426,7 +3507,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3434,7 +3515,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3442,7 +3523,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3450,7 +3531,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3479,55 +3560,61 @@ msgid ""
 msgstr ""
 
 #
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: �������������: �� ������������ �������������"
+
+#
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "�� --join-existing �� ������ �� �������������� ���� � ������ �������� ���� "
 "�������� �����"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
 #
-#: src/xgettext.c:770
+#: 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:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
 #
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "��� ������ ������ �������"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:870
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3536,44 +3623,45 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:880
+#: src/xgettext.c:896
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3583,33 +3671,34 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:890 src/xgettext.c:897
+#: 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"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3617,84 +3706,85 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:904
+#: src/xgettext.c:922
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3702,7 +3792,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3710,7 +3800,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -3718,45 +3808,45 @@ msgid ""
 msgstr ""
 
 #
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "�������� �������"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:2104
+#: 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 ""
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3765,34 +3855,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3801,7 +3891,7 @@ msgid ""
 msgstr ""
 
 #
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "� ������ `%s' ����� �������"
@@ -3811,6 +3901,16 @@ msgid "<unnamed>"
 msgstr ""
 
 #
+#, fuzzy
+#~ msgid "header field '%s' should start at beginning of line\n"
+#~ msgstr "�� ����� ��������� `%s' �� ������ �� ������ ���� ���� ��� �������"
+
+#
+#, fuzzy
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr "������ ����� ��� ��������� ����� ����� ��� ������ �� ������� ����"
+
+#
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: �� �������� ������� -- %c\n"
 
diff --git a/gettext-tools/po/es.po b/gettext-tools/po/es.po
index 8ea3233..a23679a 100644
--- a/gettext-tools/po/es.po
+++ b/gettext-tools/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2005-06-27 17:09-0500\n"
 "Last-Translator: Max de Mendiz�bal <max@upn.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -55,32 +55,32 @@ msgstr "no se puede crear un directorio temporal utilizando el formato \"%s\""
 msgid "write error"
 msgstr "error de escritura"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "error al abrir el fichero \"%s\" para lectura"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "no se puede abrir el fichero de respaldo \"%s\" para escritura"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "error al leer \"%s\""
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "error al escribir \"%s\""
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "error despu�s de leer \"%s\""
@@ -217,7 +217,7 @@ msgstr "error de E/S en el subproceso %s"
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "Memoria agotada"
@@ -282,7 +282,7 @@ msgstr ""
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -315,20 +315,20 @@ msgid "%s subprocess got fatal signal %d"
 msgstr "el subproceso %s tiene una se�al 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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 "error al abrir el fichero \"%s\" para lectura"
 
-#: src/format.c:148
+#: src/format.c:151
 #, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "'%s' no es un formato de cadena v�lido %s, a diferencia de 'msgid'. Raz�n: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: 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
@@ -339,7 +339,7 @@ msgstr ""
 "en '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-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
@@ -348,9 +348,10 @@ msgstr "una especificaci�n de formato para el argumento %u no existe en '%s'"
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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 ""
@@ -388,7 +389,8 @@ msgstr ""
 "%u."
 
 #: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-python.c:515 src/format-qt-plural.c:110
+#: 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 "el n�mero de especificaciones de formato en `msgid' y '%s' no coincide"
@@ -715,7 +717,9 @@ 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-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "una especificaci�n de formato para el argumento '%s' no existe en '%s'"
@@ -766,6 +770,34 @@ msgstr ""
 "las especificaciones de formato en 'msgid' y '%s' para el argumento '%s' no "
 "son las mismas"
 
+#: src/format-python-brace.c:136
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "En la instrucci�n n�mero %u, '%c' no est� seguida de un d�gito."
+
+#: src/format-python-brace.c:149
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+"En la instrucci�n n�mero %u, '{' no est� seguido de un n�mero de argumento."
+
+#: src/format-python-brace.c:164
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "En la instrucci�n n�mero %u, '%c' no est� seguida de un d�gito."
+
+#: src/format-python-brace.c:184
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"En la instrucci�n n�mero %u, las banderas no est�n permitidas antes de '%c'."
+
+#: src/format-python-brace.c:210
+#, fuzzy, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr "En la instrucci�n n�mero %u, el argumento %d es negativo."
+
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -814,11 +846,11 @@ msgid ""
 msgstr ""
 "El car�cter que termina la instrucci�n n�mero %u no es un d�gito entre 1 y 9."
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -827,17 +859,17 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: src/xgettext.c:605
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -849,11 +881,11 @@ msgstr ""
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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 "Pruebe `%s --help' para m�s informaci�n.\n"
@@ -895,29 +927,29 @@ msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 "  -i, --ip-address            direcciones para el nombre de la m�quina\n"
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Salida informativa:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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                  muestra esta ayuda y finaliza\n"
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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               muestra la versi�n y finaliza\n"
@@ -926,11 +958,11 @@ msgstr "  -V, --version               muestra la versi�n y finaliza\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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 "Comunicar los `bugs' a <bug-gnu-gettext@gnu.org>.\n"
 
@@ -939,30 +971,30 @@ msgstr "Comunicar los `bugs' a <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "no se pudo obtener el nombre de la m�quina"
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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 "s�lo se permite un fichero de entrada m�ximo"
 
-#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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 y %s son mutuamente excluyentes"
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 "Modo de empleo: %s [OPCI�N] [FICHEROENTRADA]\n"
 
-#: src/msgattrib.c:412
+#: src/msgattrib.c:419
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -971,7 +1003,7 @@ msgstr ""
 "Filtra los mensajes de un cat�logo de traducci�n de acuerdo con sus\n"
 "atributos, y luego manipula los atributos.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -983,23 +1015,23 @@ msgstr ""
 "obligatorios para las opciones cortas.\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, c-format
 msgid "Input file location:\n"
 msgstr "Localizaci�n del fichero de entrada:\n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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 "  FICHERODEENTRADA            fichero PO de entrada\n"
 
-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1008,7 +1040,7 @@ msgstr ""
 "ficheros\n"
 "                              de entrada\n"
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: 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"
@@ -1016,15 +1048,15 @@ msgstr ""
 "Si no se especifica un fichero de entrada o si es -, se lee la entrada "
 "est�ndar.\n"
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr "Localizaci�n del fichero de salida:\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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
@@ -1032,7 +1064,7 @@ msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=FICHERO   escribe la salida al FICHERO especificado\n"
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -1043,12 +1075,12 @@ msgstr ""
 "Los resultados se escriben a la salida est�ndar si no se especifica ning�n\n"
 "fichero de salida o si es -.\n"
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selecci�n de mensaje:\n"
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1056,7 +1088,7 @@ msgstr ""
 "     --translated             mantiene lo traducido, elimina los mensajes "
 "sin traducir\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1064,61 +1096,70 @@ msgstr ""
 "      --untranslated          mantiene lo no traducido, elimina los mensajes "
 "traducidos\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              elimina los mensajes difusos marcados como "
 "'fuzzy'\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            mantiene los mensajes difusos marcados con "
 "'fuzzy'\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           elimina los mensajes obsoletos #~\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         mantiene los mensajes obsoletos #~\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulaci�n de atributos:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 "      --set-fuzzy             marca todos los mensajes como difusos 'fuzzy'\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           marca todos los mensajes como no difusos "
 "(no-'fuzzy')\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 "      --set-obsolete          marca todos los mensajes como obsoletos\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        marca todos los mensajes como no-obsoletos\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, fuzzy, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+"     --translated             mantiene lo traducido, elimina los mensajes "
+"sin traducir\n"
+
+#: src/msgattrib.c:471
 #, fuzzy, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1127,7 +1168,7 @@ msgstr ""
 "      --clear-fuzzy           marca todos los mensajes como no difusos "
 "(no-'fuzzy')\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1135,7 +1176,7 @@ msgstr ""
 "      --only-file=FICHERO.po  manipula s�lo las entradas enlistadas en el "
 "FICHERO.po\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1143,19 +1184,19 @@ msgstr ""
 "      --ignore-file=FICHERO.po  manipula s�lo las entradas no listadas en "
 "FICHERO.po\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 sin�nimo de --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              sin�nimo de --only-obsolete --clean-obsolete\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: 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
@@ -1163,7 +1204,7 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr "Sint�xis del fichero de entrada:\n"
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
@@ -1172,7 +1213,7 @@ msgstr ""
 "  -P, --properties-input      el fichero de entrada est� en la sint�xis de ."
 "properties de Java\n"
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1182,17 +1223,17 @@ msgstr ""
 "    --stringtable-input     el fichero de entrada est� en la sint�xis de ."
 "strings de NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalles de salida:\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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"
@@ -1201,16 +1242,16 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1218,9 +1259,9 @@ msgstr ""
 "  -e, --no-escape             no utiliza escapes de C en la salida (por "
 "omisi�n)\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: 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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1228,55 +1269,55 @@ msgstr ""
 "  -E, --escape                utiliza escapes de C en la salida, sin "
 "car�cteres extendidos\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: 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:939
+#: 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              escribe un fichero PO a�n si est� vac�o\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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                escribe el fichero .po utilizando estilo con "
 "sangrados\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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           no escribe las l�neas '#: fichero:l�nea'\n"
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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       genera l�neas '#: fichero:l�nea' (por omisi�n)\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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                escribe un fichero .po con Uniforum estricto\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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     escribe un fichero .properties de Java\n"
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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"
@@ -1284,16 +1325,16 @@ msgstr ""
 "     --stringtable-output     escribe un fichero .strings de NeXTstep/"
 "GNUstep\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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=N�MERO          pone la anchura de la p�gina de salida\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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"
@@ -1304,16 +1345,16 @@ msgstr ""
 "                              sean mayores a la anchura de la p�gina de "
 "salida\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genera una salida ordenada\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: 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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1324,7 +1365,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "se especific� un criterio de selecci�n imposible (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Modo de empleo: %s [OPCI�N] [FICHEROENTRADA]...\n"
@@ -1355,12 +1396,12 @@ msgstr ""
 "fichero PO para definirlos. Las posiciones dentro del fichero de todos\n"
 "los ficheros PO se conservar�n.  \n"
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FICHERODEENTRADA ...        ficheros de entrada\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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 ""
@@ -1368,7 +1409,7 @@ msgstr ""
 "FICHERO\n"
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Si el fichero de entrada es -, se lee la entrada est�ndar.\n"
@@ -1679,7 +1720,7 @@ msgstr ""
 "                              n�mero de definiciones, si no se pone,\n"
 "                              el valor por omisi�n es 0\n"
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, fuzzy, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1732,7 +1773,7 @@ msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                escribe en estilo Uniforum estricto\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "no se especific� el fichero de entrada"
@@ -1906,7 +1947,7 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr ""
 
@@ -1971,7 +2012,7 @@ msgstr ""
 "Genera un cat�logo binario de mensajes a partir de la descripci�n de la "
 "traducci�n textual.\n"
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1985,7 +2026,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  fichero.po ...             ficheros de entrada\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Modo de operaci�n:\n"
@@ -2040,7 +2081,7 @@ msgstr "      --qt                    Modo Qt: genera un fichero .qm de Qt\n"
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                escribe en estilo Uniforum estricto\n"
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Si el fichero de salida es -,  se escribe en la salida est�ndar.\n"
@@ -2128,7 +2169,7 @@ msgstr ""
 "Las opciones -l y -d son obligatorias. El fichero .msg ser� escrito en\n"
 "el directorio especificado.\n"
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretaci�n del fichero de entrada:\n"
@@ -2295,11 +2336,12 @@ msgstr "%s: atenci�n: el fichero fuente contiene una traducci�n difusa"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "error al leer \"%s\""
@@ -2587,8 +2629,8 @@ msgstr ""
 "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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "atenci�n: "
@@ -2860,24 +2902,15 @@ msgstr "msgstr no tiene la marca del acelerador de teclado '%c'"
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr tiene demasiadas marcas de aceleraci�n de teclado '%c'"
 
-#: src/msgl-check.c:785
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "no existe el campo `%s' en la cabecera\n"
-
-#: src/msgl-check.c:793
+#: src/msgl-check.c:801
 #, fuzzy, c-format
-msgid "header field '%s' should start at beginning of line\n"
-msgstr "el campo de encabezado `%s' debe comenzar al principio de la l�nea\n"
-
-#: src/msgl-check.c:818
-msgid "some header fields still have the initial default value\n"
+msgid "header field '%s' still has the initial default value\n"
 msgstr "algunos campos de cabecera a�n tienen el valor inicial por omisi�n\n"
 
-#: src/msgl-check.c:835
+#: src/msgl-check.c:816
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "algunos campos de cabecera a�n tienen el valor inicial por omisi�n\n"
+msgid "header field '%s' missing in header\n"
+msgstr "no existe el campo `%s' en la cabecera\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2896,7 +2929,7 @@ msgstr ""
 "conjunto de caracteres"
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:623 src/xgettext.c:693
+#: 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 "
@@ -2914,8 +2947,8 @@ 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:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3427,7 +3460,7 @@ msgstr ""
 # mente el verbo poder en Castellano es mucho m�s flexible que en otros
 # idiomas. De todas maneras siempre se puede mirar otras traducciones.  em
 # ok. Acepto en 'no puede' a reserva de encontrar nuevos argumentos. mm
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este fichero no puede contener instrucciones de dominio"
@@ -3775,7 +3808,7 @@ msgstr ""
 "el cat�logo de mensajes tiene traducciones con formas plurales, pero el \n"
 "cat�logo de mensajes de Tcl no soporta el trato plural\n"
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: 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: atenci�n: cadena no finalizada"
@@ -3785,17 +3818,17 @@ msgstr "%s:%d: atenci�n: cadena no finalizada"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: atenci�n: expresi�n regular no finalizada"
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: 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: atenci�n: constante de tipo car�cter no finalizada"
 
-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: atenci�n: literal de cadena no finalizada"
 
-#: src/x-csharp.c:224 src/xgettext.c:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3838,7 +3871,7 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte incompleta al final de la l�nea.\n"
 "Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: fallo en iconv"
@@ -3852,7 +3885,7 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte inv�lida.\n"
 "Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: atenci�n: car�cter Unicode inv�lido"
@@ -3872,12 +3905,22 @@ msgstr "%s:%d: cuidado: se encontr� un ')' en donde se esperaba un '}'"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: cuidado: se encontr� un '}' en donde se esperaba un ')'"
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3891,6 +3934,63 @@ msgstr ""
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: atenci�n: cadena no finalizada"
 
+#: src/x-javascript.c:230
+#, fuzzy
+msgid "Please specify the source encoding through --from-code\n"
+msgstr ""
+"Hay una cadena que no est� en ASCII en %s%s.\n"
+"Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
+
+#: src/x-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: Secuencia multibyte inv�lida.\n"
+"Especifique la codificaci�n del c�digo fuente utilizando --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: Secuencia multibyte larga incompleta.\n"
+"Especifique la codificaci�n del c�digo fuente utilizando --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: Hay una secuencia multibyte incompleta al final del fichero.\n"
+"Especifique la codificaci�n del c�digo fuente utilizando --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: Hay una secuencia multibyte incompleta al final de la l�nea.\n"
+"Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
+
+#: src/x-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: Hay una secuencia multibyte inv�lida.\n"
+"Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
+
+#: src/x-javascript.c:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: atenci�n: literal de cadena no finalizada"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3928,7 +4028,7 @@ msgstr "%s%d: interpolaci�n no v�lida (\"\\L\") del caracter de 8 bits \"%c\""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolaci�n no v�lida (\"\\U\") del caracter de 8 bits \"%c\""
 
-#: src/x-python.c:236
+#: src/x-python.c:278
 #, fuzzy
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
@@ -3937,7 +4037,7 @@ msgstr ""
 "Hay una cadena que no est� en ASCII en %s%s.\n"
 "Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:324
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3947,7 +4047,7 @@ msgstr ""
 "%s:%d: Secuencia multibyte inv�lida.\n"
 "Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3957,7 +4057,7 @@ msgstr ""
 "%s:%d: Secuencia multibyte larga incompleta.\n"
 "Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3967,7 +4067,7 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte incompleta al final del fichero.\n"
 "Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3977,7 +4077,7 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte incompleta al final de la l�nea.\n"
 "Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3987,7 +4087,7 @@ msgstr ""
 "%s:%d: Hay una secuencia multibyte inv�lida.\n"
 "Especifique la codificaci�n del c�digo fuente utilizando --from-code.\n"
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -4016,32 +4116,37 @@ msgstr ""
 "%s:%lu: cuidado: la sint�xis $\"...\" se desaconseja debido a cuestiones de "
 "seguiridad; mejor utilice eval_gettext"
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: atenci�n: literal de cadena no finalizada"
+
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "no se puede utilizar --join-existing cuando el resultado se escribe en la\n"
 "salida est�ndar (stdout)"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext no puede funcionar sin palabras claves que buscar"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:785
 #, fuzzy, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "atenci�n: el fichero `%s' con extensi�n `%s'\n"
 "es desconocido; se intentar� tipo C"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Extrae las cadenas traducibles a partir de un grupo de ficheros dados.\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -4050,13 +4155,13 @@ msgstr ""
 "  -d, --default-domain=NOMBRE   utiliza NOMBRE.po para la salida (en vez de\n"
 "                                mensajes.po)\n"
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=FICHERO        escribe la salida al fichero especificado\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -4065,13 +4170,13 @@ msgstr ""
 "                              directorio DIR\n"
 
 # acepto sugerencia de em pero agrego un "el". mm
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Selecci�n del lenguaje del fichero de entrada:\n"
 
-#: src/xgettext.c:855
-#, c-format
+#: src/xgettext.c:870
+#, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -4079,7 +4184,8 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 "   -L, --language=NOMBRE        reconoce el lenguaje especificado\n"
 "                                  (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -4090,12 +4196,12 @@ msgstr ""
 "PHP,\n"
 "                                  fuente-GCC, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   abreviatura de --language=C++\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -4104,7 +4210,7 @@ msgstr ""
 "Por omisi�n, el lenguaje se adivina dependiendo de la extensi�n del fichero "
 "de entrada.\n"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -4113,25 +4219,25 @@ msgstr ""
 "      --from-code=NOMBRE      codifica a partir de los ficheros de entrada\n"
 "                                (excepto para Python, Tcl y Glade)\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 "Por omisi�n, los ficheros de entrada se presupone que est�n en ASCII.\n"
 
-#: src/xgettext.c:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         une los mensajes con un fichero existente\n"
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=FICHERO.po  las l�neas del FICHERO.po no son extraidas\n"
 
-#: src/xgettext.c:880
+#: src/xgettext.c:896
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4144,23 +4250,24 @@ msgstr ""
 "                                 aquellas l�neas que preceden a la palabra\n"
 "                                 clave) en el fichero de salida\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opciones espec�ficas del lenguaje:\n"
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extrae todas las cadenas\n"
 
-#: src/xgettext.c:890 src/xgettext.c:897
-#, c-format
+#: src/xgettext.c:906 src/xgettext.c:914
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (s�lo los lenguajes C, C++, ObjectiveC, "
 "Shell,\n"
@@ -4168,7 +4275,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, fuente-GCC, Glade)\n"
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -4180,7 +4287,7 @@ msgstr ""
 "utilizar \n"
 "                               las palabras clave por omisi�n)\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4193,13 +4300,14 @@ msgstr ""
 "palabra\n"
 "                                  clave PALABRA\n"
 
-#: src/xgettext.c:904
-#, c-format
+#: src/xgettext.c:922
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (S�lo los lenguajes C, C++, ObjectiveC, "
 "Shell,\n"
@@ -4207,40 +4315,40 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, fuente-GCC)\n"
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs              entiende los tr�grafos de ANSI C para la\n"
 "                               entrada\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (s�lo en lenguajes C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    reconoce los formatos de cadena Qt\n"
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (s�lo lenguaje C++)\n"
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    reconoce los formatos de cadena Qt\n"
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --qt                    reconoce los formatos de cadena Qt\n"
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4248,18 +4356,18 @@ msgstr ""
 "      --debug                  muestra con m�s detalle el reconocimiento\n"
 "                               de las cadenas de formato\n"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     escribe un fichero .properties de Java\n"
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=CADENA  pone al due�o del copyright en la salida\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4267,18 +4375,18 @@ msgstr ""
 "      --foreign-user          omite el copyright de la FSF en la salida\n"
 "                              para los usuarios extranjeros\n"
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --copyright-holder=CADENA  pone al due�o del copyright en la salida\n"
 
-#: src/xgettext.c:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4286,7 +4394,7 @@ msgstr ""
 "      --msgid-bugs-address=DIRECCION@DECORREO  pone la direcci�n de correo \n"
 "                                               para reportar los errores\n"
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4297,7 +4405,7 @@ msgstr ""
 "las\n"
 "                                  l�neas del msgstr\n"
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4308,7 +4416,7 @@ msgstr ""
 "las\n"
 "                                l�neas del msgstr\n"
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4317,31 +4425,31 @@ msgstr ""
 "Un argumento --flag no tiene la sint�xis <palabraclave>:<n�marg>:"
 "[pass-]<bandera>: %s"
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "entrada est�ndar"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: atenci�n: "
 
-#: src/xgettext.c:2104
+#: src/xgettext.c:2138
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4350,7 +4458,7 @@ 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:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4359,7 +4467,7 @@ msgstr ""
 "Aunque as� est� declarado, '%s' no es un formato de cadena v�lido %s. Raz�n: "
 "%s\n"
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4368,7 +4476,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4378,27 +4486,27 @@ msgstr ""
 "gettext(\"\") regresa la l�nea de encabezado con la\n"
 "metainformaci�n, no una cadena vac�a.\n"
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "el argumento %s es ambiguo para %s"
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 #, fuzzy
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
@@ -4411,7 +4519,7 @@ msgstr ""
 "all� la variable MSGID_BUGS_ADDRESS; si no lo hace,\n"
 "debe se poner la opci�n --msgid-bugs-address\n"
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "idioma `%s' desconocido"
@@ -4420,6 +4528,15 @@ msgstr "idioma `%s' desconocido"
 msgid "<unnamed>"
 msgstr "<sinnombrar>"
 
+#, fuzzy
+#~ msgid "header field '%s' should start at beginning of line\n"
+#~ msgstr ""
+#~ "el campo de encabezado `%s' debe comenzar al principio de la l�nea\n"
+
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr ""
+#~ "algunos campos de cabecera a�n tienen el valor inicial por omisi�n\n"
+
 # acepto la sugerencia de em en cuanto a que inv�lida parece c�rcel
 # o in�til pero mejor puse inv�lida
 #~ msgid "%s: illegal option -- %c\n"
diff --git a/gettext-tools/po/et.po b/gettext-tools/po/et.po
index 04eb539..992b236 100644
--- a/gettext-tools/po/et.po
+++ b/gettext-tools/po/et.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\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"
@@ -53,32 +53,32 @@ msgstr "ei suuda luua v�ljundfaili \"%s\""
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "viga faili \"%s\" avamisel (lugemiseks)"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "viga faili \"%s\" avamisel (kirjutamiseks)"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "viga \"%s\" lugemisel"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "viga faili \"%s\" kirjutamisel"
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "viga \"%s\" lugemisel"
@@ -210,7 +210,7 @@ msgstr ""
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "m�lu sai otsa"
@@ -275,7 +275,7 @@ msgstr ""
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -308,19 +308,19 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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 "viga faili \"%s\" avamisel (lugemiseks)"
 
-#: src/format.c:148
+#: 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-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
@@ -329,7 +329,7 @@ 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-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
@@ -338,9 +338,10 @@ 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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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 "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
@@ -368,7 +369,8 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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 "vormingukirjeldused `msgid' ja `msgstr' kirjetel ei ole sarnased"
@@ -645,7 +647,9 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-sh.c:308
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
@@ -685,6 +689,32 @@ msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "vormingukirjeldused argumendi %lu jaoks ei ole sarnased"
 
+#: src/format-python-brace.c:136
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr ""
+
+#: src/format-python-brace.c:149
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+
+#: src/format-python-brace.c:164
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
+
+#: src/format-python-brace.c:184
+#, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+
+#: src/format-python-brace.c:210
+#, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr ""
+
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -726,11 +756,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -739,17 +769,17 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: src/xgettext.c:605
 #, 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -761,11 +791,11 @@ msgstr ""
 msgid "too many arguments"
 msgstr "liiga palju argumente"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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 "T�iendava info saamiseks proovi `%s --help'.\n"
@@ -803,29 +833,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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 ""
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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 ""
@@ -834,11 +864,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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1011
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Vigadest teata aadressile <bug-gnu-utils@gnu.org>.\n"
@@ -848,37 +878,37 @@ msgstr "Vigadest teata aadressile <bug-gnu-utils@gnu.org>.\n"
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "vaja l�heb t�pselt kahte sisendfaili"
 
-#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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 ja %s on vastastikku v�listavad"
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 ""
 
-#: src/msgattrib.c:412
+#: 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 ""
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -887,50 +917,50 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "sisendfail on m��ramata"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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 ""
 
-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/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 ""
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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 ""
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -939,99 +969,106 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+
+#: src/msgattrib.c:471
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/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
@@ -1039,14 +1076,14 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1054,17 +1091,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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"
@@ -1073,87 +1110,87 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/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:939
+#: 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 ""
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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 ""
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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 ""
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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 ""
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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 ""
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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 ""
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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 ""
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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 ""
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1174,16 +1211,16 @@ 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:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1193,7 +1230,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "lubamatu valikukriteeriumi kirjeldus (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -1226,18 +1263,18 @@ 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:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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 ""
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
@@ -1455,7 +1492,7 @@ msgid ""
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1500,7 +1537,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "sisendfail on m��ramata"
@@ -1646,7 +1683,7 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr ""
 
@@ -1709,7 +1746,7 @@ msgstr ""
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1721,7 +1758,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
@@ -1768,7 +1805,7 @@ msgstr ""
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -1842,7 +1879,7 @@ msgid ""
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
@@ -1983,11 +2020,12 @@ msgstr "%s: hoiatus: l�htefail sisaldab kahtlast t�lget"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "viga \"%s\" lugemisel"
@@ -2195,8 +2233,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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: hoiatus: "
@@ -2384,25 +2422,15 @@ msgstr ""
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:785
+#: src/msgl-check.c:801
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "p�ise kirjest on puudu v�li `%s'"
-
-#: src/msgl-check.c:793
-#, fuzzy, c-format
-msgid "header field '%s' should start at beginning of line\n"
-msgstr "p�ise kirjes peab v�li `%s' algama rea algusest"
-
-#: src/msgl-check.c:818
-#, fuzzy
-msgid "some header fields still have the initial default value\n"
+msgid "header field '%s' still has the initial default value\n"
 msgstr "m�ned p�ise kirjes olevad v�ljad sisaldavad ikka veel algseid v��rtusi"
 
-#: src/msgl-check.c:835
+#: src/msgl-check.c:816
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "m�ned p�ise kirjes olevad v�ljad sisaldavad ikka veel algseid v��rtusi"
+msgid "header field '%s' missing in header\n"
+msgstr "p�ise kirjest on puudu v�li `%s'"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2419,7 +2447,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:623 src/xgettext.c:693
+#: src/x-python.c:665 src/xgettext.c:708
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2435,8 +2463,8 @@ msgid ""
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2834,7 +2862,7 @@ msgstr "reavahetus asub stringi sees"
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "see fail ei tohi sisaldada domeeni direktiive"
@@ -3129,7 +3157,7 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: src/x-awk.c:341 src/x-javascript.c:988 src/x-python.c:1128
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: hoiatus: l�petamata string"
@@ -3139,17 +3167,17 @@ msgstr "%s:%d: hoiatus: l�petamata string"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: hoiatus: l�petamata string"
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: 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: l�petamata s�mbolkonstant"
 
-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: hoiatus: l�petamata string"
 
-#: src/x-csharp.c:224 src/xgettext.c:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3181,7 +3209,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3193,7 +3221,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: l�petamata s�mbolkonstant"
@@ -3213,12 +3241,22 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3232,6 +3270,50 @@ msgstr ""
 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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: hoiatus: l�petamata string"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3267,13 +3349,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:236
+#: 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:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3281,7 +3363,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3289,7 +3371,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3297,7 +3379,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3305,7 +3387,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3313,7 +3395,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3340,52 +3422,57 @@ msgid ""
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: hoiatus: l�petamata string"
+
+#: src/xgettext.c:636
 #, 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:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ei t��ta ilma vajalike v�tmes�nadeta"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:785
 #, fuzzy, 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:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "sisendfail on m��ramata"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:870
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3394,44 +3481,45 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:880
+#: src/xgettext.c:896
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3441,33 +3529,34 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:890 src/xgettext.c:897
+#: 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"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3475,84 +3564,85 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:904
+#: src/xgettext.c:922
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3560,7 +3650,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3568,52 +3658,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "standardsisend"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: hoiatus: "
 
-#: src/xgettext.c:2104
+#: 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 ""
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3622,34 +3712,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3657,7 +3747,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "tundmatu keel `%s'"
@@ -3666,6 +3756,15 @@ msgstr "tundmatu keel `%s'"
 msgid "<unnamed>"
 msgstr ""
 
+#, 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 "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"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: lubamatu v�ti -- %c\n"
 
diff --git a/gettext-tools/po/eu.po b/gettext-tools/po/eu.po
index faad197..b47c78f 100644
--- a/gettext-tools/po/eu.po
+++ b/gettext-tools/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\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"
@@ -56,32 +56,32 @@ msgstr "ezin da aldiroko %s direktorioa ezabatu"
 msgid "write error"
 msgstr "idazketa errorea"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "errorea \"%s\" irakurketarako irekitzerakoan"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "ezin da \"%s\" babeskopia fitxategia idazketarako ireki"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "errorea \"%s\" irakurtzean"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "errorea \"%s\" idaztean"
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "errorea \"%s\" irakurri ondoren"
@@ -216,7 +216,7 @@ msgstr "%s azpiprozesu S/I errorea"
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria askieza"
@@ -281,7 +281,7 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -314,19 +314,19 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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 "errorea \"%s\" irakurketarako irekitzerakoan"
 
-#: src/format.c:148
+#: src/format.c:151
 #, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "'%s' ez da baliozko %s formatu katea, ez 'msgid' bezala. Arrazoia: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: 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
@@ -335,7 +335,7 @@ msgid ""
 msgstr "a formateatu - u in s t in"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: 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
@@ -344,9 +344,10 @@ 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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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 ""
@@ -381,7 +382,8 @@ msgstr ""
 "du."
 
 #: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-python.c:515 src/format-qt-plural.c:110
+#: 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 "'msgid' eta '%s' -ren formatu espezifikazio zenbakiak ez dira berdinak"
@@ -684,7 +686,9 @@ msgid ""
 "conversion specifier '%c'."
 msgstr "Handiagotu u tamaina da honekin k."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-sh.c:308
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "a formateatu - s t in s"
@@ -725,6 +729,33 @@ msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "formateatu in eta s - s"
 
+#: src/format-python-brace.c:136
+#, 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:149
+#, 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:164
+#, 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:184
+#, 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:210
+#, 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 ""
@@ -770,11 +801,11 @@ msgid ""
 "1 and 9."
 msgstr "u da a eta."
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -783,17 +814,17 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: src/xgettext.c:605
 #, 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -805,11 +836,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "argumentu gehiegi"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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' erabili argibide gehiagorako.\n"
@@ -850,29 +881,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            ostalari izenaren helbidea\n"
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informazio irteera:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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                  laguntza hau bisarazi eta irten\n"
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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               bertsio argibideak bistarazi eta irten\n"
@@ -881,11 +912,11 @@ msgstr "  -V, --version               bertsio argibideak bistarazi eta irten\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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 "Programa erroreen berri emateko: <bug-gnu-gettext@gnu.org>.\n"
 
@@ -894,30 +925,30 @@ msgstr "Programa erroreen berri emateko: <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "ezind a ostalari izena eskuratu"
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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 "behintzat sarrera fitxategi bat onartu da"
 
-#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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 eta %s ez dira bateragarriak"
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 "Erabilera: %s [AUKERA] [SARFITXATEGIA]\n"
 
-#: src/msgattrib.c:412
+#: src/msgattrib.c:419
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -926,7 +957,7 @@ msgstr ""
 "Itzulpen katalogko kateak beraien atributuen arabera iragazi,\n"
 "eta beren atributuak eraldatu.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -937,23 +968,23 @@ msgstr ""
 "Aukera luzeentzat beharrezko argumentuak beharrezkoak dira aukera "
 "laburrentzat ere.\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, c-format
 msgid "Input file location:\n"
 msgstr "Sarrera fitxategi kokapena:\n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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 "  SARRERA_FITXATEGIA        sarrera PO fitxatergia\n"
 
-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -961,7 +992,7 @@ msgstr ""
 "  -D, --directory=DIRECTORIOA Gehitu DIRECTORIOA sarrera fitxategiak "
 "bilatzeko zerrendara\n"
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: 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"
@@ -969,22 +1000,22 @@ msgstr ""
 "Sarrera fitxategirik ematen ez bada edo berau - bada, sarrera estandarra "
 "irakurriko da.\n"
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr "Irteera fitxategi kokapena:\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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=FITX      idatzi irteera ezarritako fitxategian\n"
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -996,12 +1027,12 @@ msgstr ""
 "bada\n"
 "edo berau - bada.\n"
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Mezu hautapena:\n"
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1009,7 +1040,7 @@ msgstr ""
 "      --translated            mantendu itzulitakoak, ezabatu itzuli gabeko "
 "mezuak\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1017,55 +1048,63 @@ msgstr ""
 "      --untranslated          mantendu itzuli gabekoak, ezabatu itzulitako "
 "mezuak\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              ezabatu zalantza bezala markaturiko kateak\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            mantendu zalantza bezala markaturiko kateka\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         mantendu zaharkituriko #~ mezuak\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Atributu manipulazioa:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             ezarri kate guztiak zalantza bezala\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           zalantza bandera kendu kate guztiei\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          ezarri mezu guztiak zaharkituak bezala\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        ezarri mezu guztiak ez-zaharkituk bezala\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, 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:471
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1073,7 +1112,7 @@ msgid ""
 msgstr ""
 "      --clear-previous        ezabatu \"previous msgid\" mezu guztietatik\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1081,7 +1120,7 @@ msgstr ""
 "      --only-file=FITX.po     FITX.po fitxategian zerrendaturiko sarrerak "
 "bakarrik eraldatu\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1089,13 +1128,13 @@ msgstr ""
 "      --ignore-file=FILE.po   FITX.po fitxategian ez zerrendaturiko sarrerak "
 "bakarrik eraldatu\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 --only-fuzzy --clear-fuzzy -ren sinonimo\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1103,7 +1142,7 @@ msgstr ""
 "      --obsolete              --only-obsolete --clear-obsolete -ren "
 "sinonimo\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: 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
@@ -1111,7 +1150,7 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr "Sarrera fitxategi sintaxia:\n"
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
@@ -1120,7 +1159,7 @@ msgstr ""
 "  -P, --properties-input      sarrera fitxategia Java .properties sintaxian "
 "dago\n"
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1130,17 +1169,17 @@ msgstr ""
 "      --stringtable-input     sarrera fitxategia NeXTstep/GNUstep .strings "
 "sintaxian dago\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr "Irteera xehetasunak:\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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"
@@ -1149,25 +1188,25 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             ez erabili C ihesak irteeran (lehenetsia)\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: 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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1175,82 +1214,82 @@ msgstr ""
 "  -E, --escape                C ihesak erabili irteeran, ez hedatutako "
 "karaktereak\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: 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:939
+#: 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 fitxategia idatzi nahiz hutsik egon\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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 fitxategia koskadun estiloa erabiliaz "
 "idatzi\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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 ""
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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 ""
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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 ""
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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 ""
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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 ""
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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=ZENBAKIA        irteera orri zabalera ezarri\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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 ""
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           ordenatutako irteera sortu\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: 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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          irteera fixattegi kokapenaz ordenatu\n"
@@ -1260,7 +1299,7 @@ msgstr "  -F, --sort-by-file          irteera fixattegi kokapenaz ordenatu\n"
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "ezinezko hatapen kriterio bat ezarri da (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Erabilera: %s [AUKERA] [SARRERA_FITX]...\n"
@@ -1279,12 +1318,12 @@ msgid ""
 "to define them.\n"
 msgstr ""
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               sarrera fitxategiak\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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 ""
@@ -1292,7 +1331,7 @@ msgstr ""
 "eskuratu\n"
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Sarrera fitxategia - bada, sarrera estandarra irakurriko da.\n"
@@ -1486,7 +1525,7 @@ msgid ""
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, fuzzy, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1535,7 +1574,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                Uniforum zehatz irteera estiloa\n"
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "ez da sarrera fitxategirik eman"
@@ -1683,7 +1722,7 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -1746,7 +1785,7 @@ msgstr "Erabilera: %s [AUKERA] fitxategizena.po ...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Testu itzulpen deskribapen batetik mezu katalogo bitar bat sortu.\n"
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1760,7 +1799,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  fitxategizena.po ...             sarrera fitxategiak\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Funtzionamendu modua:\n"
@@ -1814,7 +1853,7 @@ msgstr "      --qt                    Qt modua: Qt .qm fitxategi bat sortu\n"
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                Uniforum zehatz modua gaitu\n"
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Irteera fitxategia - bada, irteera irteera estandarrean idatziko da.\n"
@@ -1901,7 +1940,7 @@ msgstr ""
 "direktorioan\n"
 "idatziko da.\n"
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Sarrera fitxategi interpretazioa:\n"
@@ -2040,11 +2079,12 @@ msgstr "%s: oharra: jatorri fitxategiak zalantzazko itzulpenak ditu"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "errorea \"%s\" irakurtzean"
@@ -2280,8 +2320,8 @@ 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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "oharra: "
@@ -2494,24 +2534,15 @@ msgstr ""
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:785
+#: src/msgl-check.c:801
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "`%s' goiburu eremua falta da goiburuan\n"
-
-#: src/msgl-check.c:793
-#, fuzzy, 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:818
-msgid "some header fields still have the initial default value\n"
+msgid "header field '%s' still has the initial default value\n"
 msgstr "zenbait goiburu eremuk oraindik hasierako balioa dute\n"
 
-#: src/msgl-check.c:835
+#: src/msgl-check.c:816
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "zenbait goiburu eremuk oraindik hasierako balioa dute\n"
+msgid "header field '%s' missing in header\n"
+msgstr "`%s' goiburu eremua falta da goiburuan\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2529,7 +2560,7 @@ 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:623 src/xgettext.c:693
+#: 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 "
@@ -2545,8 +2576,8 @@ msgid ""
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2941,7 +2972,7 @@ msgstr "lerro-amaiera katerik gabe"
 msgid "context separator <EOT> within string"
 msgstr "kontestu bereizlea <EOT> katerik gabe"
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "fitxategi honek ez lituzke domeinu direktibak izan beharko"
@@ -3261,7 +3292,7 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr "formateatu t n"
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: src/x-awk.c:341 src/x-javascript.c:988 src/x-python.c:1128
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "s l katea"
@@ -3271,17 +3302,17 @@ msgstr "s l katea"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "s l"
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:762
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "s l"
 
-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "s l katea"
 
-#: src/x-csharp.c:224 src/xgettext.c:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr "ASCII katea s s Nork n"
@@ -3314,7 +3345,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr "s l Osatugabea - Nork n"
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv hutsa"
@@ -3326,7 +3357,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr "s l Baliogabea Nork n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: oharra: Unicode karaktere baliogabea"
@@ -3346,12 +3377,22 @@ msgstr "%s:%d: oharra: ')' aurkitu da '}' espero zen lekuan"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: oharra: '}' aurkitu da ')'espero zen lekuan"
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3365,6 +3406,51 @@ msgstr ""
 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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "s l katea"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3401,14 +3487,14 @@ msgstr "%s:%d: interpolazio baliogabea (\"\\L\") 8bit-eko karakterean\"%c\""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolazio baliogabea (\"\\U\") 8bit-eko karakterean\"%c\""
 
-#: src/x-python.c:236
+#: src/x-python.c:278
 #, fuzzy
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr "ASCII katea s s Nork a inhttp://www.python.org/peps/pep-0263.html. n"
 
-#: src/x-python.c:282
+#: src/x-python.c:324
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3416,7 +3502,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:299
+#: src/x-python.c:341
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3424,7 +3510,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:312
+#: src/x-python.c:354
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3432,7 +3518,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:322
+#: src/x-python.c:364
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3440,7 +3526,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:355
+#: src/x-python.c:397
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3448,7 +3534,7 @@ 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:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "\"%s\" kodeketa ezezaguna. ASCII erabiliaz aurrera egingo da."
@@ -3477,28 +3563,33 @@ msgstr ""
 "%s:%lu: oharra: $\"...\" sintasia zaharkiturik dago segurtasun "
 "arrazoiegatik ; eval_gettext erabili horren ordez"
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "s l katea"
+
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing ezin da erabili irteera irteera estandarrean idazten denean"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:770
+#: src/xgettext.c:785
 #, fuzzy, 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:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Irauli kate itzulgarriak emandako sarrera fitxategietatik.\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3507,12 +3598,12 @@ msgstr ""
 "  -d, --default-domain=IZENA   IZENA erabili irteerarako (messages.po "
 "ordez)\n"
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           idatzi irteera ezarritako fitxategian\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3520,13 +3611,13 @@ msgstr ""
 "  -p, --output-dir=DIR        irteera fitxategiak DIR direktorioan utziko "
 "dira\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Sarrera fitxategiaren hizkuntza hautapena:\n"
 
-#: src/xgettext.c:855
-#, c-format
+#: src/xgettext.c:870
+#, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3534,7 +3625,8 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 "  -L, --language=IZENA        ezarritako hizkuntza ezagutu\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3544,12 +3636,12 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++-ren laburopena\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3558,7 +3650,7 @@ msgstr ""
 "Lehenespen bezala hizkuntza sarrera fitxategiaren izen hedapenaz igarriko "
 "da.\n"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3567,24 +3659,24 @@ msgstr ""
 "      --from-code=NAME        sarrera fixtategien kodeket\n"
 "                                (Python, Tcl, Glade-en ezezik)\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, 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:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=FITXATEGIA.po  FITXATEGIA.po fitxategiko kateak ez dira "
 "irauliko\n"
 
-#: src/xgettext.c:880
+#: src/xgettext.c:896
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3594,23 +3686,24 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Hizkuntzaren aukera bereziak:\n"
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           kate guztiak atera\n"
 
-#: src/xgettext.c:890 src/xgettext.c:897
-#, c-format
+#: src/xgettext.c:906 src/xgettext.c:914
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                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, "
@@ -3618,14 +3711,14 @@ msgstr ""
 "                                Perl, PHP, GCC-source eta Glade hizkuntzetan "
 "bakarrik)\n"
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3633,13 +3726,14 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:904
-#, c-format
+#: src/xgettext.c:922
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                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, "
@@ -3647,38 +3741,38 @@ msgstr ""
 "                                Tcl, Perl, PHP, GCC-source hizkuntzetan "
 "bakarrik)\n"
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, 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:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (C, C++, ObjectiveC hizkuntzetan bakarrik)\n"
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt formatuko kateak antzeman\n"
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (C++ hizkuntz bakarrik)\n"
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    Qt formatuko kateak antzeman\n"
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost formatuko kateak antzeman\n"
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -3686,17 +3780,17 @@ msgstr ""
 "      --debug                 kate formatu atzemateari buruzko informazio "
 "hedatuagoa\n"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     idatzi Java .properties fitxategi bat\n"
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=KATEA  copyright jabea ezarri irteeran\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3704,17 +3798,17 @@ msgstr ""
 "      --foreign-user          alde batera utzi FSF copyright-a kanpoko "
 "erabiltzaileen irteeran\n"
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, 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:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3722,7 +3816,7 @@ msgstr ""
 "      --msgid-bugs-address=EPOSTA@HELBIDEA  msgid erroreentzat erreporte "
 "helbidea ezarri\n"
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3732,7 +3826,7 @@ msgstr ""
 "  -M, --msgstr-prefix[=KATEA]  KATEA erabili edo \"\" aurrizki bezala msgstr "
 "sarreretan\n"
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3742,7 +3836,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=KATEA]  KATEA erabili edo \"\" atzizki bezala msgstr "
 "sarreretan\n"
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -3750,45 +3844,45 @@ msgid ""
 msgstr ""
 "--flag argumentuak ez du <hitz-ako>:<argzenb>:[pasa-]<badera> sintasia: %s"
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "sarrera estandarra"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: oharra: "
 
-#: src/xgettext.c:2104
+#: 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 ""
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3797,7 +3891,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3807,28 +3901,28 @@ msgstr ""
 "gettext(\"\")-ek meta informazioa duen goiburua\n"
 "itzultzen du, ez date hutsa.\n"
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "oharra: argumentu ezarpen zalanatzagarria '%.*s' hitz-gakoarentzat"
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "oharra: kontestua falta da '%.*s' hitz-gakoarentzat"
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "oharra: kontestua falta da '%.*s' hitz-gakoaren plural arumentuarentzat"
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "kontestu parekatze okerra formatu singular eta pluralaren artean"
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 #, fuzzy
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
@@ -3841,7 +3935,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS aldagaia hor; bestela mesedez ezarri\n"
 "--msgid-bugs-address aukera komando lerroan.\n"
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "`%s' hizkuntza ezezaguna"
@@ -3850,6 +3944,13 @@ msgstr "`%s' hizkuntza ezezaguna"
 msgid "<unnamed>"
 msgstr "<izengabea>"
 
+#, fuzzy
+#~ msgid "header field '%s' should start at beginning of line\n"
+#~ msgstr "`%s' goiburu eremua lerro hasieran hasi behar da\n"
+
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr "zenbait goiburu eremuk oraindik hasierako balioa dute\n"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: legezkanpoko aukera -- %c\n"
 
diff --git a/gettext-tools/po/fi.po b/gettext-tools/po/fi.po
index 1c1a26f..4318512 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.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2013-03-03 11:26+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -37,12 +37,14 @@ 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
@@ -58,32 +60,32 @@ msgstr "tilapäisen hakemiston %s poistaminen epäonnistui"
 msgid "write error"
 msgstr "kirjoitusvirhe"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "säilytetään käyttöoikeudet kohteelle %s"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:194
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "virhe avattaessa tiedostoa %s lukemista varten"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "varmuuskopiotiedoston %s avaaminen kirjoittamista varten epäonnistui"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, c-format
 msgid "error reading %s"
 msgstr "virhe luettaessa tiedostoa %s"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, c-format
 msgid "error writing %s"
 msgstr "virhe kirjoitettaessa tiedostoa %s"
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, c-format
 msgid "error after reading %s"
 msgstr "virhe tiedoston %s lukemisen jälkeen"
@@ -200,12 +202,14 @@ 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
@@ -215,7 +219,7 @@ msgstr "%s aliprosessisiirräntävirhe"
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "muisti loppui"
@@ -281,7 +285,7 @@ msgstr "”"
 msgid "'"
 msgstr "”"
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr "asetetaan käyttöoikeuksia kohteelle %s"
@@ -314,27 +318,30 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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"
 
-#: src/format.c:148
+#: src/format.c:151
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "’%s’ ei ole kelvollinen %s-muotomerkkijono, toisin kuin ’%s’. Syy: %s"
 
 #: 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-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 "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-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
@@ -343,12 +350,15 @@ msgstr "muotomäärittelyä argumentille %u ei ole merkkijonossa ’%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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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
 #, 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
@@ -358,24 +368,35 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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
@@ -388,27 +409,37 @@ 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
@@ -422,13 +453,20 @@ msgstr "Direktiivissä numero %u tarkkuus ei ole sallittu ennen merkkiä ’%c�
 
 #: src/format-gcc-internal.c:334
 #, c-format
-msgid "In the directive number %u, the argument number for the precision must be equal to %u."
-msgstr "Direktiivissä numero %u argumenttinumeron tarkkuuden on oltava sama kuin %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"Direktiivissä numero %u argumenttinumeron tarkkuuden on oltava sama kuin %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "Direktiivissä numero %u tarkkuusmäärittely ei ole sallittu ennen merkkiä ’%c’."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"Direktiivissä numero %u tarkkuusmäärittely ei ole sallittu ennen merkkiä "
+"’%c’."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -465,43 +503,68 @@ 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ä/aika -tyyli."
+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ä/"
+"aika -tyyli."
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
@@ -510,13 +573,19 @@ 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
@@ -525,13 +594,20 @@ 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
@@ -540,21 +616,36 @@ 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
@@ -584,83 +675,154 @@ 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-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-sh.c:308
 #, 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:136
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "Direktiivissä numero %u merkkiä ’%c’ ei seuraa luku."
+
+#: src/format-python-brace.c:149
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr "Direktiivissä numero %u argumenttinumeroa ei ole merkin ’{’ jäljessä."
+
+#: src/format-python-brace.c:164
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "Direktiivissä numero %u merkkiä ’%c’ ei seuraa luku."
+
+#: src/format-python-brace.c:184
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr "Direktiivissä numero %u tarkkuus ei ole sallittu ennen merkkiä ’%c’."
+
+#: src/format-python-brace.c:210
+#, fuzzy, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr "Direktiivissä numero %u argumentti %d on negatiivinen."
 
 #: 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."
@@ -668,20 +830,24 @@ 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:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -694,17 +860,17 @@ 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:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -716,11 +882,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "liian monta argumenttia"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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"
@@ -748,10 +914,12 @@ 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
@@ -759,29 +927,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:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: 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:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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"
@@ -790,45 +958,47 @@ 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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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:412
+#: src/msgattrib.c:419
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -837,57 +1007,63 @@ msgstr ""
 "Suodattaa käännösluettelon viestit niiden attribuuttien mukaan,\n"
 "ja manipuloi attribuutteja.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: 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:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: 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:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: 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:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr "Tulostetiedostosijainti:\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -895,95 +1071,123 @@ 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:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: 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:438
+#: 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:440
+#: 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:442
+#: 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:444
+#: 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:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           poista vanhentuneet #~ -viestit\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         pidä vanhentuneet #~ -viestit\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Attribuuttimanipulointi:\n"
 
-#: src/msgattrib.c:453
+#: 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:455
+#: 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:457
+#: 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:459
+#: 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:461
+#: src/msgattrib.c:468
+#, fuzzy, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+"      --previous              säilytä käännettyjen viestien aikaisemmat "
+"msgid-merkkijonot\n"
+
+#: 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"
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        poista \"previous msgid\" kaikista viesteistä\n"
 
-#: src/msgattrib.c:463
+#: 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:465
+#: 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:467
+#: 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:469
+#: 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:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: 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
@@ -991,143 +1195,175 @@ msgstr "      --obsolete              synonyymi valitsimelle --only-obsolete --c
 msgid "Input file syntax:\n"
 msgstr "Syötetiedoston syntaksi:\n"
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr "Tulosteen yksityiskohdat:\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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"
-
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+"      --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: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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: 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:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: 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:937
+#: 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:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: 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:939
+#: 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:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: 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:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: 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:960
+#: 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: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:366 src/msgcomm.c:358 src/xgettext.c:817
+#: 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"
@@ -1156,18 +1392,19 @@ msgstr ""
 "--use-first on määritelty. Silloin ne otetaan ensimmäisestä PO-tiedostosta,\n"
 "joka on määritellyt ne.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: 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:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: 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"
@@ -1179,8 +1416,10 @@ 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:410
 #, c-format
@@ -1188,7 +1427,8 @@ 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:413 src/msgcomm.c:404
@@ -1197,14 +1437,18 @@ 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: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:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
 #: src/msgmerge.c:559
@@ -1227,12 +1471,15 @@ 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: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.
@@ -1291,8 +1538,12 @@ msgstr "Toimintomääreet:\n"
 
 #: 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:550
 #, c-format
@@ -1332,7 +1583,8 @@ msgstr "...mutta tämä määrittely on samanlainen"
 #: 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
@@ -1378,13 +1630,18 @@ 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:451 src/xgettext.c:962
+#: 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:306
 #, c-format
@@ -1415,8 +1672,10 @@ msgstr "      --no-location           vaienna ’#: filename:line’ -rivit\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"
+msgid ""
+"      --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"      --add-location          säilytä ’#: filename:line’ -rivit (oletus)\n"
 
 #: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
 #: src/msgmerge.c:585
@@ -1424,7 +1683,7 @@ msgstr "      --add-location          säilytä ’#: filename:line’ -rivit (o
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                tiukka Uniforum-tulostetyyli\n"
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "syötetiedostoa ei annettu"
@@ -1527,7 +1786,8 @@ 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:421
@@ -1537,13 +1797,16 @@ msgstr "Hyödylliset SUODATTIMEN VALITSIN-asetukset kun SUODATIN on ’sed’:\n
 
 #: 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: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"
@@ -1551,13 +1814,18 @@ msgstr ""
 
 #: 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: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:452 src/msggrep.c:601
 #, c-format
@@ -1566,8 +1834,11 @@ msgstr "      --indent                sisennetty tulostetyyli\n"
 
 #: 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:304
 #, c-format
@@ -1580,7 +1851,7 @@ msgid "invalid endianness: %s"
 msgstr "virheellinen endian-tyyppi: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -1641,9 +1912,11 @@ msgstr "Käyttö: %s [VALITSIN] tiedosto.po ...\n"
 #: 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:663 src/xgettext.c:826
+#: 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"
@@ -1657,20 +1930,27 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  tiedosto.po ...             syötetiedostot\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: 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: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: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:683
 #, c-format
@@ -1679,13 +1959,19 @@ msgstr "      --csharp                C#-tila: tuota .NET .dll -tiedosto\n"
 
 #: 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: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:689
 #, c-format
@@ -1697,7 +1983,7 @@ msgstr "      --qt                    Qt-tila: tuota Qt .qm -tiedosto\n"
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                ota käyttöön tiukka Uniforum-tila\n"
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: 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"
@@ -1715,18 +2001,24 @@ msgstr "  -r, --resource=RESURSSI     resurssinimi\n"
 #: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
 #: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
-msgid "  -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"
-msgstr "  -l, --locale=MAA-ASETUSTO   maa-asetuston nimi, joko kieli tai kieli_MAA\n"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=MAA-ASETUSTO   maa-asetuston nimi, joko kieli tai kieli_MAA\n"
 
 #: src/msgfmt.c: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: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 ""
@@ -1741,8 +2033,12 @@ msgstr "Tulostetiedostosijainti C#-tilassa:\n"
 
 #: 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:723
 #, c-format
@@ -1750,7 +2046,8 @@ 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:727
@@ -1772,7 +2069,7 @@ msgstr ""
 "Valitsimet -l ja -d ovat pakollisia.  Tiedosto .msg kirjoitetaan\n"
 "määriteltyyn hakemistoon.\n"
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Syötetiedoston tulkinta:\n"
@@ -1781,20 +2078,27 @@ msgstr "Syötetiedoston tulkinta:\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                 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: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: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:754
 #, c-format
@@ -1802,21 +2106,28 @@ 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: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: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:762
@@ -1826,22 +2137,30 @@ msgstr "  -f, --use-fuzzy             käytä vajausmerkintöjä tulosteessa\n"
 
 #: 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: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: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:781
@@ -1906,19 +2225,24 @@ msgstr "%s: varoitus: lähdetiedosto sisältää vajaan käännöksen"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "virhe luettaessa tiedostoa ”%s”"
 
 #: 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:516
 #, c-format, no-wrap
@@ -2008,8 +2332,11 @@ msgstr ""
 
 #: 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:618
 #, c-format
@@ -2019,7 +2346,9 @@ msgstr "      --sort-output           tuota lajiteltu tuloste\n"
 #: 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 ""
@@ -2062,16 +2391,19 @@ 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
@@ -2079,8 +2411,10 @@ 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
@@ -2089,8 +2423,10 @@ 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 ""
@@ -2122,12 +2458,16 @@ 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.
@@ -2150,13 +2490,18 @@ 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
@@ -2164,8 +2509,8 @@ msgid "target charset \"%s\" is not a portable encoding name."
 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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "varoitus: "
@@ -2182,11 +2527,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 ""
-"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"
 
@@ -2229,9 +2576,11 @@ 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
@@ -2244,7 +2593,8 @@ 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
@@ -2275,8 +2625,12 @@ 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
@@ -2323,8 +2677,12 @@ 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'"
@@ -2366,25 +2724,16 @@ msgstr "msgstr-merkkijonosta puuttuu pikanäppäinmerkki ’%c’"
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr-merkkijonossa on liian monta pikanäppäinmerkkiä ’%c’"
 
-#: src/msgl-check.c:785
-#, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "otsakekenttä ’%s’ puuttuu otsakkeessa\n"
-
-#: src/msgl-check.c:793
-#, c-format
-msgid "header field '%s' should start at beginning of line\n"
-msgstr "otsakekentän ’%s’ pitäisi alkaa rivin alusta\n"
-
-#: src/msgl-check.c:818
-msgid "some header fields still have the initial default value\n"
-msgstr "joillakin otsakekentillä on yhä alustava oletusarvo\n"
-
-#: src/msgl-check.c:835
+#: 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:816
+#, c-format
+msgid "header field '%s' missing in header\n"
+msgstr "otsakekenttä ’%s’ puuttuu otsakkeessa\n"
+
 #: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
@@ -2400,21 +2749,33 @@ 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:623 src/xgettext.c:693
+#: 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:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: 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:383 src/msgmerge.c:389
 #, c-format
@@ -2451,7 +2812,9 @@ msgstr ""
 #: 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:504
 #, c-format
@@ -2474,7 +2837,8 @@ msgid ""
 "                              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:526
 #, c-format
@@ -2494,12 +2858,14 @@ msgstr "      --backup=CONTROL        tee tiedoston def.po varmuuskopio\n"
 #: 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: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"
@@ -2508,16 +2874,19 @@ 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: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"
@@ -2525,8 +2894,11 @@ msgstr ""
 
 #: 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:609 src/urlget.c:192
 #, c-format
@@ -2546,8 +2918,12 @@ msgstr "tämän viestin ei pitäisi määritellä monikkomuotoja"
 #  Ensimmäinen parametri on joko tyhjä merkkijono tai rivinvaihto
 #: 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:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2558,7 +2934,8 @@ 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
@@ -2568,12 +2945,17 @@ 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
@@ -2582,13 +2964,19 @@ 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
@@ -2603,7 +2991,8 @@ 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"
@@ -2676,8 +3065,12 @@ msgstr "  -d, --repeated              tulosta vain kaksoiskappaleet\n"
 
 #: 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
@@ -2814,7 +3207,7 @@ msgstr "rivinvaihto merkkijonon sisällä"
 msgid "context separator <EOT> within string"
 msgstr "kontekstierotin <EOT> merkkijonon sisällä"
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: 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ä"
@@ -2845,7 +3238,9 @@ 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"
@@ -2959,24 +3354,46 @@ 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
@@ -3013,7 +3430,9 @@ msgstr "kelvoton Java-luokkanimi: %s"
 #: 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:1168
@@ -3028,8 +3447,10 @@ msgstr "virhe avattaessa tiedostoa ”%s” kirjoittamista varten"
 
 #: 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:1254 src/write-po.c:1383
 #, c-format
@@ -3069,12 +3490,15 @@ 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
@@ -3083,8 +3507,10 @@ 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
@@ -3124,7 +3550,7 @@ msgstr ""
 "viestiluettelossa on monikkomuotoisia käännöksiä\n"
 "mutta Tcl-viestiluettelomuoto ei tule monikkokäsittelyä\n"
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: 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"
@@ -3134,17 +3560,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:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: 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:1247
+#: 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:2021
+#: 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."
 
@@ -3184,7 +3610,7 @@ msgstr ""
 "%s:%d: Vaillinainen monitavusekvenssi rivin lopussa.\n"
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla.\n"
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv-häiriö"
@@ -3198,7 +3624,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:1282
+#: 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"
@@ -3218,12 +3644,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:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3237,10 +3673,67 @@ msgstr ""
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: varoitus: yksinäinen sijainen U+%04X"
 
+#: src/x-javascript.c:230
+#, fuzzy
+msgid "Please specify the source encoding through --from-code\n"
+msgstr "Määritä lähdekoodaus valitsimen --from-code avulla."
+
+#: 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: Virheellinen monitavusekvenssi.\n"
+"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla.\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: Pitkä vaillinainen monitavusekvenssi.\n"
+"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla.\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: Vaillinainen monitavusekvenssi tiedoston lopussa.\n"
+"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla.\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: Vaillinainen monitavusekvenssi rivin lopussa.\n"
+"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla.\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: Virheellinen monitavusekvenssi.\n"
+"Määritä lähdekoodikoodaus valitsimen --from-code avulla.\n"
+
+#: src/x-javascript.c:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: varoitus: päättämätön merkkijonoliteraali"
+
 #: 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
@@ -3272,7 +3765,7 @@ msgstr "%s:%d: virheellinen 8-bitisen merkin ”%c” interpolaatio (”\\L”)"
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: virheellinen 8-bittisen merkin ”%c” interpolaatio (”\\U”)"
 
-#: src/x-python.c:236
+#: 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"
@@ -3280,7 +3773,7 @@ msgstr ""
 "Määritä lähdekoodikoodaus valitsimen --from-code tai kommentin avulla\n"
 "kuten on määritelty asiakirjassa http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3291,7 +3784,7 @@ msgstr ""
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code tai kommentin avulla\n"
 "kuten on määritelty asiakirjassa http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3302,7 +3795,7 @@ msgstr ""
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code tai kommentin avulla\n"
 "kuten on määritelty asiakirjassa http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3313,7 +3806,7 @@ msgstr ""
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code tai kommentin avulla\n"
 "kuten on määritelty asiakirjassa http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3324,7 +3817,7 @@ msgstr ""
 "Määritä oikea lähdekoodikoodaus valitsimen --from-code tai kommentin avulla\n"
 "kuten on määritelty asiakirjassa http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3335,7 +3828,7 @@ msgstr ""
 "Määritä lähdekoodikoodaus valitsimen --from-code tai kommentin avulla\n"
 "kuten on määritelty asiakirjassa http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Tuntematon koodaus ”%s”. Jatketaan sen sijaan ASCII-koodauksella."
@@ -3357,75 +3850,104 @@ 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:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: varoitus: päättämätön merkkijonoliteraali"
 
-#: src/xgettext.c:621
+#: 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:626
+#: 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:770
+#: 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:821
+#: 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:844
+#: 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:846
+#: 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:848
+#: 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:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Syötetiedoston kielen valinta:\n"
 
-#: src/xgettext.c:855
-#, c-format
+#: 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"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\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)\n"
 
-#: src/xgettext.c:861
+#: 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:863
+#: 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:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3434,56 +3956,63 @@ msgstr ""
 "      --from-code=NIMI        syötetiedostojen koodaus\n"
 "                                (paitsi kielille Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:871
+#: 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:876
+#: 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:878
+#: 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:880
+#: 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:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Kielikohtaiset valitsimet:\n"
 
-#: src/xgettext.c:888
+#: 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:890 src/xgettext.c:897
-#, c-format
+#: src/xgettext.c:906 src/xgettext.c:914
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                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"
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3492,149 +4021,181 @@ msgstr ""
 "  -kWORD, --keyword=WORD      etsi WORD-argumentti lisäavainsanana\n"
 "  -k, --keyword               älä käytä oletusavainsanoja\n"
 
-#: src/xgettext.c:901
+#: 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:904
-#, c-format
+#: src/xgettext.c:922
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                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"
 
-#: src/xgettext.c:908
+#: 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:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (vain kielet C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    tunnista Qt-muotoiset merkkijonot\n"
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: 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:916
+#: 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:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 tunnista Boost-muotoiset merkkijonot\n"
 
-#: src/xgettext.c:924
+#: 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:949
+#: 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:964
+#: 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:966
+#: 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:968
+#: 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:970
+#: 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:972
+#: 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:974
+#: 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:977
+#: 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:1783
+#: 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:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "vakiosyöte"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Ei-ASCII-merkki osoitteessa %s%s."
 
-#: src/xgettext.c:1990
+#: 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:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Ei-ASCII-merkkijono osoitteessa %s%s."
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: 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:2104
+#: 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:2105
+#: 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:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3642,12 +4203,13 @@ 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:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3657,27 +4219,27 @@ msgstr ""
 "gettext(\"\") palauttaa otsakkeen metatiedolla,\n"
 "ei tyhjää merkkijonoa.\n"
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "argumenttimäärittely avainsanalle ’%.*s’ ei ole yksiselitteinen"
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "varoitus: puuttuva konteksti avainsanalle ’%.*s’"
 
-#: src/xgettext.c:2887
+#: 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:2908
+#: 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:3017
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3689,7 +4251,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS-muuttuja; muussa tapauksessa\n"
 "määritä komentorivivalitsin --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, c-format
 msgid "language '%s' unknown"
 msgstr "kieli ’%s’ on tuntematon"
@@ -3698,6 +4260,12 @@ msgstr "kieli ’%s’ on tuntematon"
 msgid "<unnamed>"
 msgstr "<nimetön>"
 
+#~ msgid "header field '%s' should start at beginning of line\n"
+#~ msgstr "otsakekentän ’%s’ pitäisi alkaa rivin alusta\n"
+
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr "joillakin otsakekentillä on yhä alustava oletusarvo\n"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: virheellinen valitsin – %c\n"
 
@@ -3716,13 +4284,19 @@ msgstr "<nimetön>"
 #~ msgid "Substitutes the values of environment variables.\n"
 #~ msgstr "Korvaa ympäristömuuttujien arvot.\n"
 
-#~ msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-#~ msgstr "  -v, --variables             tulostaa SHELL-MUODOSSA ilmenevät muuttujat\n"
+#~ msgid ""
+#~ "  -v, --variables             output the variables occurring in SHELL-"
+#~ "FORMAT\n"
+#~ msgstr ""
+#~ "  -v, --variables             tulostaa SHELL-MUODOSSA ilmenevät "
+#~ "muuttujat\n"
 
 #~ msgid ""
 #~ "In normal operation mode, standard input is copied to standard output,\n"
-#~ "with references to environment variables of the form $VARIABLE or ${VARIABLE}\n"
-#~ "being replaced with the corresponding values.  If a SHELL-FORMAT is given,\n"
+#~ "with references to environment variables of the form $VARIABLE or "
+#~ "${VARIABLE}\n"
+#~ "being replaced with the corresponding values.  If a SHELL-FORMAT is "
+#~ "given,\n"
 #~ "only those environment variables that are referenced in SHELL-FORMAT are\n"
 #~ "substituted; otherwise all environment variables references occurring in\n"
 #~ "standard input are substituted.\n"
@@ -3735,8 +4309,10 @@ msgstr "<nimetön>"
 #~ "ympäristömuuttujat korvataan.\n"
 
 #~ msgid ""
-#~ "When --variables is used, standard input is ignored, and the output consists\n"
-#~ "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n"
+#~ "When --variables is used, standard input is ignored, and the output "
+#~ "consists\n"
+#~ "of the environment variables that are referenced in SHELL-FORMAT, one per "
+#~ "line.\n"
 #~ msgstr ""
 #~ "Valitsinta --variables käytettäessä vakiosyöte jätetään huomiotta ja\n"
 #~ "tuloste muodostuu ympäristömuuttujista, yksi kutakin riviä kohti,\n"
@@ -3769,22 +4345,29 @@ msgstr "<nimetön>"
 #~ "  -n                        jättää pois rivinvaihdon rivin lopusta\n"
 #~ "  -V, --version             näyttää ohjelmiston versiotiedot ja lopettaa\n"
 #~ "                            suorituksen\n"
-#~ "  [KÄÄNNÖSJOUKKO] VIESTI-ID  etsii käännetyn viestin, joka vastaa VIESTI-ID:tä\n"
+#~ "  [KÄÄNNÖSJOUKKO] VIESTI-ID  etsii käännetyn viestin, joka vastaa VIESTI-"
+#~ "ID:tä\n"
 #~ "                            KÄÄNNÖSJOUKOSSA\n"
 
 #~ msgid ""
-#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
-#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
-#~ "regular directory, another location can be specified with the environment\n"
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
+#~ "the\n"
+#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in "
+#~ "the\n"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
 #~ "variable TEXTDOMAINDIR.\n"
-#~ "When used with the -s option the program behaves like the `echo' command.\n"
-#~ "But it does not simply copy its arguments to stdout.  Instead those messages\n"
+#~ "When used with the -s option the program behaves like the `echo' "
+#~ "command.\n"
+#~ "But it does not simply copy its arguments to stdout.  Instead those "
+#~ "messages\n"
 #~ "found in the selected catalog are translated.\n"
 #~ "Standard search directory: %s\n"
 #~ msgstr ""
 #~ "Jos KÄÄNNÖSJOUKKO-parametria ei anneta, joukko päätellään TEXTDOMAIN-\n"
 #~ "ympäristömuuttujan perusteella. Jos viestiluettelo ei ole tavanomaisessa\n"
-#~ "hakemistossa, vaihtoehtoinen sijainti voidaan määritellä ympäristömuuttu-\n"
+#~ "hakemistossa, vaihtoehtoinen sijainti voidaan määritellä "
+#~ "ympäristömuuttu-\n"
 #~ "jalla TEXTDOMAINDIR.\n"
 #~ "Valitsimen -s kanssa ohjelma toimii kuten ”echo”-komento.\n"
 #~ "Ohjelma ei kuitenkaan vain kopioi argumenttejaan vakiotulosteeseen, vaan\n"
@@ -3792,10 +4375,12 @@ msgstr "<nimetön>"
 #~ "Perushakemisto, josta haku suoritetaan: %s\n"
 
 #~ msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-#~ msgstr "Käyttö: %s [VALITSIN] [KÄÄNNÖSJOUKKO] VIESTI-ID VIESTI-ID-MONIKKO MÄÄRÄ\n"
+#~ msgstr ""
+#~ "Käyttö: %s [VALITSIN] [KÄÄNNÖSJOUKKO] VIESTI-ID VIESTI-ID-MONIKKO MÄÄRÄ\n"
 
 #~ msgid ""
-#~ "Display native language translation of a textual message whose grammatical\n"
+#~ "Display native language translation of a textual message whose "
+#~ "grammatical\n"
 #~ "form depends on a number.\n"
 #~ msgstr ""
 #~ "Näyttää kotoistetun käännöksen tekstimuotoiselle viestille, jonka muoto\n"
@@ -3808,28 +4393,35 @@ msgstr "<nimetön>"
 #~ "  -h, --help                display this help and exit\n"
 #~ "  -V, --version             display version information and exit\n"
 #~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
-#~ "  COUNT                     choose singular/plural form based on this value\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+#~ "(plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this "
+#~ "value\n"
 #~ msgstr ""
 #~ "  -d, --domain=KÄÄNNÖSJOUKKO hae käännetyt viestit KÄÄNNÖSJOUKOSTA\n"
 #~ "  -e                        salli joidenkin lainauskoodien laajentaminen\n"
 #~ "  -h, --help                näytä tämä ohje ja poistu\n"
 #~ "  -V, --version             näytä versiotiedot ja poistu\n"
 #~ "  [KÄÄNNÖSJOUKKO]           hae käännetty sanoma KÄÄNNÖSJOUKOSTA\n"
-#~ "  VIESTI-ID VIESTI-ID-MON   käännä VIESTI-ID (yksikkö) / VIESTI-ID-MON (monikko)\n"
+#~ "  VIESTI-ID VIESTI-ID-MON   käännä VIESTI-ID (yksikkö) / VIESTI-ID-MON "
+#~ "(monikko)\n"
 #~ "  MÄÄRÄ                     valitse yksikkö-/monikkomuoto tämän arvon\n"
 #~ "                              perusteella\n"
 
 #~ msgid ""
-#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n"
-#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in the\n"
-#~ "regular directory, another location can be specified with the environment\n"
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
+#~ "the\n"
+#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in "
+#~ "the\n"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
 #~ "variable TEXTDOMAINDIR.\n"
 #~ "Standard search directory: %s\n"
 #~ msgstr ""
 #~ "Jos KÄÄNNÖSJOUKKO-parametria ei anneta, joukko päätellään TEXTDOMAIN-\n"
 #~ "ympäristömuuttujan perusteella. Jos viestiluettelo ei ole tavanomaisessa\n"
-#~ "hakemistossa, vaihtoehtoinen sijainti voidaan määritellä ympäristömuuttu-\n"
+#~ "hakemistossa, vaihtoehtoinen sijainti voidaan määritellä "
+#~ "ympäristömuuttu-\n"
 #~ "jalla TEXTDOMAINDIR.\n"
 #~ "Perushakemisto, josta haku suoritetaan: %s\n"
 
@@ -3849,13 +4441,18 @@ msgstr "<nimetön>"
 #~ msgstr "       getopt [valitsimet] [--] valitsinmerkkijono parametrit\n"
 
 #~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr "       getopt [valitsimet] -o|--options valitsinmerkkijono [valitsimet] [--]\n"
+#~ msgstr ""
+#~ "       getopt [valitsimet] -o|--options valitsinmerkkijono [valitsimet] "
+#~ "[--]\n"
 
 #~ msgid "              parameters\n"
 #~ msgstr "              parametrit\n"
 
-#~ msgid "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr "  -a, --alternative            Salli pitkien valitsimien alkaminen yhdellä -:lla\n"
+#~ msgid ""
+#~ "  -a, --alternative            Allow long options starting with single -\n"
+#~ msgstr ""
+#~ "  -a, --alternative            Salli pitkien valitsimien alkaminen "
+#~ "yhdellä -:lla\n"
 
 #~ msgid "  -h, --help                   This small usage guide\n"
 #~ msgstr "  -h, --help                   Tämä pieni käyttöopas\n"
@@ -3863,14 +4460,19 @@ msgstr "<nimetön>"
 #~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
 #~ msgstr "  -l, --longoptions=valitsimet Pitkät tunnistettavat valitsimet\n"
 
-#~ msgid "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr "  -n, --name=ohjelmanimi       Nimi, joka ilmoitetaan virheiden yhteydessä\n"
+#~ msgid ""
+#~ "  -n, --name=progname          The name under which errors are reported\n"
+#~ msgstr ""
+#~ "  -n, --name=ohjelmanimi       Nimi, joka ilmoitetaan virheiden "
+#~ "yhteydessä\n"
 
 #~ msgid "  -o, --options=optstring      Short options to be recognized\n"
 #~ msgstr "  -o, --options=valitsimet     Lyhyet tunnistettavat valitsimet\n"
 
-#~ msgid "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr "  -q, --quiet                  Vaienna getopt(3):n virheilmoitukset\n"
+#~ msgid ""
+#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
+#~ msgstr ""
+#~ "  -q, --quiet                  Vaienna getopt(3):n virheilmoitukset\n"
 
 #~ msgid "  -Q, --quiet-output           No normal output\n"
 #~ msgstr "  -Q, --quiet-output           Ei normaalia tulostetta\n"
@@ -3898,12 +4500,16 @@ msgstr "<nimetön>"
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright © %s Free Software Foundation, Inc.\n"
-#~ "Tämä on vapaa ohjelmisto; kts. lähdekoodi kopioinnin ehdoille. Ohjelmistolle\n"
-#~ "EI myönnetä takuuta; ei edes KAUPATTAVUUDELLE tai SOVELTUVUUDELLE TIETTYYN\n"
+#~ "Tämä on vapaa ohjelmisto; kts. lähdekoodi kopioinnin ehdoille. "
+#~ "Ohjelmistolle\n"
+#~ "EI myönnetä takuuta; ei edes KAUPATTAVUUDELLE tai SOVELTUVUUDELLE "
+#~ "TIETTYYN\n"
 #~ "tarkoitukseen.\n"
 
 #~ msgid "write to grep subprocess failed"
@@ -3915,7 +4521,8 @@ msgstr "<nimetön>"
 #~ "  -V, --version                  output version information and exit\n"
 #~ msgstr ""
 #~ "Tietoja antavat tulosteet:\n"
-#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa suorituksen\n"
+#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa "
+#~ "suorituksen\n"
 #~ "  -V, --version               näyttää ohjelmiston version ja poistuu\n"
 
 #~ msgid ""
@@ -3926,7 +4533,8 @@ msgstr "<nimetön>"
 #~ "  -v, --verbose               increase verbosity level\n"
 #~ msgstr ""
 #~ "Tietoja antavat tulosteet:\n"
-#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa suorituksen\n"
+#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa "
+#~ "suorituksen\n"
 #~ "  -V, --version               näyttää ohjelmiston version ja poistuu\n"
 #~ "      --statistics            tulostaa tilastot käännöksistä\n"
 #~ "  -v, --verbose               kasvata laveustasoa\n"
@@ -3939,7 +4547,8 @@ msgstr "<nimetön>"
 #~ "  -q, --quiet, --silent       suppress progress indicators\n"
 #~ msgstr ""
 #~ "Tietoja antavat tulosteet:\n"
-#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa suorituksen\n"
+#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa "
+#~ "suorituksen\n"
 #~ "  -V, --version               näyttää ohjelmiston version ja poistuu\n"
 #~ "  -v, --verbose               kasvata laveustasoa\n"
 #~ "  -q, --quiet, --silent       vaienna edistymisindikaattorit\n"
@@ -3951,6 +4560,7 @@ msgstr "<nimetön>"
 #~ "  -v, --verbose            increase verbosity level\n"
 #~ msgstr ""
 #~ "Tietoja antavat tulosteet:\n"
-#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa suorituksen\n"
+#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa "
+#~ "suorituksen\n"
 #~ "  -V, --version               näyttää ohjelmiston version ja poistuu\n"
 #~ "  -v, --verbose               kasvata laveustasoa\n"
diff --git a/gettext-tools/po/fr.po b/gettext-tools/po/fr.po
index 989c616..f44ab97 100644
--- a/gettext-tools/po/fr.po
+++ b/gettext-tools/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\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"
@@ -61,32 +61,32 @@ msgstr "Impossible de supprimer le dossier temporaire « %s »"
 msgid "write error"
 msgstr "Erreur d'écriture"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "Erreur lors de l'ouverture de « %s » en lecture "
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, 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:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "Erreur de lecture de « %s »"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "Erreur d'écriture de « %s »"
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "Erreur après la lecture de « %s »"
@@ -222,7 +222,7 @@ msgstr "Erreur d'E/S du sous-processus %s"
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "Mémoire épuisée"
@@ -289,7 +289,7 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -322,13 +322,13 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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 "Erreur lors de l'ouverture de « %s » en lecture "
 
-#: src/format.c:148
+#: src/format.c:151
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
@@ -336,7 +336,7 @@ msgstr ""
 "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-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
@@ -347,7 +347,7 @@ msgstr ""
 "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-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
@@ -356,9 +356,10 @@ 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-elisp.c:379 src/format-gcc-internal.c:658
-#: 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
+#: 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
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
@@ -395,7 +396,8 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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 ""
@@ -733,7 +735,9 @@ 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-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-sh.c:308
 #, 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é."
@@ -783,6 +787,35 @@ 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:136
+#, 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:149
+#, 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:164
+#, 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:184
+#, 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:210
+#, 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."
+
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -837,11 +870,11 @@ msgstr ""
 "Le caractère qui termine la directive numéro %u n'est pas un chiffre compris "
 "entre 1 et 9."
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -854,17 +887,17 @@ 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:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: src/xgettext.c:605
 #, 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -876,11 +909,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "Trop d'arguments"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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 "Pour plus d'information, essayez « %s --help ».\n"
@@ -921,29 +954,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:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Sortie informative :\n"
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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                  afficher ce message d'aide, puis terminer\n"
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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               afficher le numéro de version de ce programme, puis terminer\n"
@@ -952,11 +985,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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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 "Signalez tout bogue à <bug-gnu-gettext@gnu.org>.\n"
 
@@ -965,30 +998,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:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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 "Un seul fichier est permis en entrée"
 
-#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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 et %s s'excluent mutuellement"
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 "Usage : %s [OPTION] [FICHIER_ENTRÉE]\n"
 
-#: src/msgattrib.c:412
+#: src/msgattrib.c:419
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -997,7 +1030,7 @@ 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:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -1009,23 +1042,23 @@ msgstr ""
 "également\n"
 "obligatoires pour les formes courtes correspondantes.\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, c-format
 msgid "Input file location:\n"
 msgstr "Emplacement du fichier d'entrée :\n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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 "  FICHIER ...                 fichier PO d'entrée\n"
 
-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -1033,7 +1066,7 @@ msgstr ""
 "  -D, --directory=DOSSIER     ajouter le DOSSIER pour la recherche des "
 "fichiers d'entrée\n"
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: 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"
@@ -1041,22 +1074,22 @@ 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:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr "Emplacement du fichier de sortie :\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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=FICHIER   écrire la sortie dans le FICHIER\n"
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -1067,12 +1100,12 @@ msgstr ""
 "  Si aucun fichier n'est spécifié ou si le nom de fichier est « - »,\n"
 "  les résultats sont envoyés vers la sortie standard.\n"
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 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:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1080,7 +1113,7 @@ msgstr ""
 "      --translated            conserver les messages traduit, retirer les "
 "messages non traduits\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1088,61 +1121,70 @@ msgstr ""
 "      --untranslated          conserver les messages non traduits, retirer "
 "les messages traduits\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              retirer les messages marqués « fuzzy »\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            conserver seulement les messages marqués "
 "« fuzzy »\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           retirer les messages obsolètes « #~ »\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 "      --only-obsolete         conserver seulement les messages obsolètes "
 "« #~ »\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulation d'attribut :\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 "      --set-fuzzy             placer tous les messages dans l'état "
 "« fuzzy »\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 "      --clear-fuzzy           retirer l'état « fuzzy » de tous les messages\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 "      --set-obsolete          marquer tous les messages comme obsolètes\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 "      --clear-obsolete        marquer tous les messages comme non-obsolètes\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, 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:471
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1151,7 +1193,7 @@ msgstr ""
 "      --clear-previous        retirer la chaîne « previous msgid » de tous "
 "les messages\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1159,7 +1201,7 @@ msgstr ""
 "      --only-file=FICHIER.po  manipuler seulement les entrées listées dans "
 "le FICHIER.po\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1167,13 +1209,13 @@ msgstr ""
 "      --ignore-file=FICHIER.po  manipuler seulement les entrées qui ne sont "
 "pas listées dans le FICHIER.po\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 identique à « --only-fuzzy --clear-fuzzy »\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1181,7 +1223,7 @@ msgstr ""
 "      --obsolete              identique à « --only-obsolete --clear-"
 "obsolete »\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: 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
@@ -1189,7 +1231,7 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr "Syntaxe du fichier d'entrée :\n"
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
@@ -1198,7 +1240,7 @@ msgstr ""
 "  -P, --properties-input      la syntaxe du fichier d'entrée est celle\n"
 "                              des fichiers « .properties » de Java\n"
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1208,17 +1250,17 @@ msgstr ""
 "      --stringtable-input     la syntaxe du fichier d'entrée est celle\n"
 "                              des fichiers « .strings » de NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr "Détails des données de sortie :\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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"
@@ -1233,18 +1275,18 @@ msgstr ""
 "                              QUAND peut être « always », « never », « auto "
 "», or « html ».\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/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:933
+#: 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=FICHIERSTYLE    spécifie le fichier de règles de style CSS "
 "pour --color\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1252,9 +1294,9 @@ msgstr ""
 "  -e, --no-escape             ne pas utiliser de séquences d'échappement C "
 "dans la sortie (par défaut)\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: 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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1262,31 +1304,31 @@ msgstr ""
 "  -E, --escape                utiliser des séquences d'échappements C dans "
 "la sortie, sans caractère étendu\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: 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:939
+#: 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              créer un fichier .po même s'il est vide\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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                créer le fichier .po avec un style indenté\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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           ne pas créer les commentaires de numérotation "
 "du type « #: fichier:ligne»\n"
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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"
@@ -1294,8 +1336,8 @@ msgstr ""
 "  -n, --add-location          créer des commentaires de numérotation du type "
 "« #: fichier:ligne » (par défaut)\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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"
@@ -1303,7 +1345,7 @@ msgstr ""
 "      --strict                créer des fichier .po strictement conformes à "
 "l'Uniforum\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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
@@ -1311,9 +1353,9 @@ msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 "  -p, --properties-output     créer un fichier « .properties » de type Java\n"
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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"
@@ -1321,16 +1363,16 @@ msgstr ""
 "      --stringtable-output    créer un fichier « .strings » de type NeXTstep/"
 "GNUstep\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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=NOMBRE          spécifier la largeur de page\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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"
@@ -1340,16 +1382,16 @@ msgstr ""
 "plus longues\n"
 "                              que la largeur des pages de sortie.\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           trier les données de sortie\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: 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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1361,7 +1403,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "Critère de sélection irréalisable (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Usage : %s [OPTION] [FICHIER_ENTRÉE]...\n"
@@ -1388,12 +1430,12 @@ 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:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FICHIER ...                 fichiers d'entrée\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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 ""
@@ -1401,7 +1443,7 @@ msgstr ""
 "partir du FICHIER\n"
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
@@ -1630,7 +1672,7 @@ msgstr ""
 "N\n"
 "                              définitions (1 par défaut)\n"
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, fuzzy, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1686,7 +1728,7 @@ msgstr ""
 "      --strict                créer une sortie strictement conforme à "
 "l'Uniforum\n"
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "Aucun fichier d'entrée n'a été fourni"
@@ -1856,7 +1898,7 @@ 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:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -1921,7 +1963,7 @@ msgstr ""
 "msgfmt permet de créer un catalogue binaire de messages à partir de la "
 "description textuelle des traductions.\n"
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1935,7 +1977,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  fichier.po ...              fichiers d'entrée\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mode d'exécution :\n"
@@ -1996,7 +2038,7 @@ msgstr ""
 "      --strict                active le mode de conformité stricte à "
 "l'Uniforum\n"
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -2090,7 +2132,7 @@ msgstr ""
 "  Les options « -l » et « -d » sont obligatoires.\n"
 "  Le fichier .msg est créé dans le répertoire spécifié.\n"
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interprétation du fichier d'entrée :\n"
@@ -2254,11 +2296,12 @@ 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:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "Erreur lors de la lecture de « %s »"
@@ -2547,8 +2590,8 @@ 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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "AVERTISSEMENT : "
@@ -2786,25 +2829,16 @@ msgstr "« msgstr » n'a pas de marqueur de raccourci clavier « %c »"
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "« msgstr » a trop de marqueurs de raccourcis clavier « %c »"
 
-#: src/msgl-check.c:785
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "Le champ « %s » est absent de l'en-tête\n"
-
-#: src/msgl-check.c:793
-#, fuzzy, 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:818
-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:835
+#: src/msgl-check.c:801
 #, 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:816
+#, fuzzy, c-format
+msgid "header field '%s' missing in header\n"
+msgstr "Le champ « %s » est absent de l'en-tête\n"
+
 #: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
@@ -2823,7 +2857,7 @@ 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:623 src/xgettext.c:693
+#: 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 "
@@ -2841,8 +2875,8 @@ 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:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3299,7 +3333,7 @@ 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:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "Ce fichier peut ne pas contenir de directive de domaine"
@@ -3640,7 +3674,7 @@ msgstr ""
 "mais le format de catalogue de type Tcl ne supporte pas les formes au "
 "pluriel\n"
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: 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 : AVERTISSEMENT : chaîne non terminée"
@@ -3650,17 +3684,17 @@ 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:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: 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 : AVERTISSEMENT : constante caractère sans terminaison"
 
-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832
 #, 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:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "Veuillez spécifier l'encodage de la source avec l'option « --from-code »."
@@ -3701,7 +3735,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-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d : Échec de « iconv »"
@@ -3715,7 +3749,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:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d : AVERTISSEMENT : caractère Unicode invalide"
@@ -3735,12 +3769,22 @@ 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:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3754,6 +3798,62 @@ 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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d : AVERTISSEMENT : chaîne sans terminaison"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3795,7 +3895,7 @@ msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 "%s:%d : interpolation invalide (« \\U ») de caractères de 8 bits « %c »"
 
-#: src/x-python.c:236
+#: 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"
@@ -3804,7 +3904,7 @@ msgstr ""
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3816,7 +3916,7 @@ msgstr ""
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3828,7 +3928,7 @@ msgstr ""
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3840,7 +3940,7 @@ msgstr ""
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3852,7 +3952,7 @@ msgstr ""
 "avec un commentaire\n"
 "comme spécifié sur la page : http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3864,7 +3964,7 @@ msgstr ""
 "avec un commentaire\n"
 "comme spécifié sur la page http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Encodage « %s » inconnu. Traitement effectué en ASCII."
@@ -3893,33 +3993,38 @@ 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:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d : AVERTISSEMENT : chaîne sans terminaison"
+
+#: src/xgettext.c:636
 #, 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"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ne peut pas fonctionner sans mot clé à rechercher"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:785
 #, 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:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "xgettext analyse des fichiers de code source et permet d'en extraire les "
 "chaînes qui peuvent être traduites dans d'autres langues.\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3928,13 +4033,13 @@ msgstr ""
 "  -d, --default-domain=NOM    utiliser NOM.po pour la sortie (au lieu de "
 "messages.po)\n"
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=FICHIER        écrire la sortie dans le FICHIER spécifié\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3942,13 +4047,13 @@ msgstr ""
 "  -p, --output-dir=RÉP        créer les fichiers de sortie dans le "
 "répertoire spécifié\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Choix du langage du fichier d'entrée :\n"
 
-#: src/xgettext.c:855
-#, c-format
+#: src/xgettext.c:870
+#, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3956,7 +4061,8 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 "  -L, --language=NOM          reconnaître le langage spécifié\n"
 "                              (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
@@ -3964,12 +4070,12 @@ msgstr ""
 "                              JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
 "                              GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   identique à « --language=C++ »\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3977,7 +4083,7 @@ msgid ""
 msgstr ""
 "  Par défaut, le langage est deviné selon l'extension du nom du fichier.\n"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3986,25 +4092,25 @@ msgstr ""
 "      --from-code=NOM         encodage des fichiers d'entrée\n"
 "                              (sauf pour Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, 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:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing            joindre les messages au fichier existant\n"
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=FICHIER.po  les entrées du FICHIER.po ne sont pas "
 "extraites\n"
 
-#: src/xgettext.c:880
+#: src/xgettext.c:896
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -4021,23 +4127,24 @@ msgstr ""
 "précédant les lignes de mots clés\n"
 "                                dans le fichier de sortie\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Options spécifiques au langage:\n"
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extraire toutes les chaînes\n"
 
-#: src/xgettext.c:890 src/xgettext.c:897
-#, c-format
+#: src/xgettext.c:906 src/xgettext.c:914
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                              (seulement les langages C, C++, ObjectiveC, "
 "Shell,\n"
@@ -4045,7 +4152,7 @@ msgstr ""
 "C#, awk,\n"
 "                              awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -4054,7 +4161,7 @@ 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/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -4065,13 +4172,14 @@ msgstr ""
 "l'intérieur de\n"
 "                              l'argument numéro ARG du MOT clé\n"
 
-#: src/xgettext.c:904
-#, c-format
+#: src/xgettext.c:922
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                              (seulement les langages C, C++, ObjectiveC, "
 "Shell,\n"
@@ -4079,42 +4187,42 @@ msgstr ""
 "Java,\n"
 "                              C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs             comprendre les trigrammes ANSI C pour "
 "l'entrée\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                              (seuls les langages C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    reconnaître les chaînes au format Qt\n"
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                              (seulement le langage C++)\n"
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 "      --kde                   reconnaître les chaînes au format KDE 4\n"
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 "      --boost                 reconnaître les chaînes au format Boost\n"
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4122,19 +4230,19 @@ msgstr ""
 "      --debug                 mieux détailler la reconnaissance des chaînes "
 "de format\n"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output     produire un fichier « .properties » de type "
 "Java\n"
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, 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:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4142,18 +4250,18 @@ msgstr ""
 "      --foreign-user          omettre le copyright FSF dans la sortie pour "
 "les utilisateurs étrangers\n"
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, 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:970
+#: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --package-version=VERSION  donne la version du paquet dans la sortie\n"
 
-#: src/xgettext.c:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4161,7 +4269,7 @@ msgstr ""
 "      --msgid-bugs-address=ADRESSE@COURRIEL  adresse de courriel pour les "
 "rapport d'anomalie des msgid\n"
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4172,7 +4280,7 @@ msgstr ""
 "préfixe aux valeurs\n"
 "                                msgstr\n"
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4183,7 +4291,7 @@ msgstr ""
 "suffixe aux valeurs\n"
 "                                msgstr\n"
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4192,31 +4300,31 @@ msgstr ""
 "Un argument « --flag » n'a pas la syntaxe <mot_clé>:<n°_argument>:"
 "[pass-]<drapeau>:%s"
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "entrée standard"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Caractère non-ASCII à %s%s."
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Commentaire non-ASCII à (ou avant) %s%s."
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Chaîne non-ASCII à %s%s."
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s : AVERTISSEMENT : "
 
-#: src/xgettext.c:2104
+#: src/xgettext.c:2138
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4225,7 +4333,7 @@ msgstr ""
 "Malgré sa position, %s n'est pas une chaîne de format %s valide. La raison "
 "est :%s\n"
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4234,7 +4342,7 @@ msgstr ""
 "Malgré sa déclaration, %s n'est pas une chaîne de format %s valide. La "
 "raison est :%s\n"
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4248,7 +4356,7 @@ msgstr ""
 "Envisagez d'utiliser une chaîne de format contenant des arguments nommés,\n"
 "et un mapping plutôt qu'un tuple pour les arguments.\n"
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4258,30 +4366,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:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "Argument ambigu pour le mot clé « %.*s »"
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "AVERTISSEMENT : contexte absent pour le mot clé « %.*s »"
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, 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 "
 "»"
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 "incohérence de contexte entre la forme du singulier et celle du pluriel"
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 #, fuzzy
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
@@ -4294,7 +4402,7 @@ msgstr ""
 "la variable MSGID_BUGS_ADDRESS à cet endroit. Sinon, veuillez\n"
 "utiliser l'option « --msgid-bugs-address » en ligne de commande.\n"
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "langage « %s » inconnu"
@@ -4303,6 +4411,14 @@ msgstr "langage « %s » inconnu"
 msgid "<unnamed>"
 msgstr "<sans nom>"
 
+#, fuzzy
+#~ 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"
 
diff --git a/gettext-tools/po/gettext-tools.pot b/gettext-tools/po/gettext-tools.pot
index 8bcd48f..0df02f7 100644
--- a/gettext-tools/po/gettext-tools.pot
+++ b/gettext-tools/po/gettext-tools.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.18.2\n"
+"Project-Id-Version: gettext-tools 0.18.3\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -56,32 +56,32 @@ msgstr ""
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, c-format
 msgid "error while opening %s for reading"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, c-format
 msgid "error reading %s"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, c-format
 msgid "error writing %s"
 msgstr ""
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, c-format
 msgid "error after reading %s"
 msgstr ""
@@ -213,7 +213,7 @@ msgstr ""
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr ""
@@ -278,7 +278,7 @@ msgstr ""
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -311,19 +311,19 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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 ""
 
-#: src/format.c:148
+#: 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-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
@@ -332,7 +332,7 @@ 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-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
@@ -341,9 +341,10 @@ msgstr ""
 
 #: 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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
@@ -371,7 +372,8 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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 ""
@@ -648,7 +650,9 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: 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 ""
@@ -688,6 +692,32 @@ msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
 
+#: src/format-python-brace.c:136
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr ""
+
+#: src/format-python-brace.c:149
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+
+#: src/format-python-brace.c:164
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
+
+#: src/format-python-brace.c:184
+#, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+
+#: src/format-python-brace.c:210
+#, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr ""
+
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -729,11 +759,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -742,17 +772,17 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: src/xgettext.c:605
 #, 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -764,11 +794,11 @@ msgstr ""
 msgid "too many arguments"
 msgstr ""
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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 ""
@@ -806,29 +836,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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 ""
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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 ""
@@ -837,11 +867,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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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 ""
 
@@ -850,37 +880,37 @@ msgstr ""
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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 ""
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 ""
 
-#: src/msgattrib.c:412
+#: 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 ""
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -889,50 +919,50 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, c-format
 msgid "Input file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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 ""
 
-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/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 ""
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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 ""
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -941,99 +971,106 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+
+#: src/msgattrib.c:471
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/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
@@ -1041,14 +1078,14 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1056,17 +1093,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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"
@@ -1075,103 +1112,103 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/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:939
+#: 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 ""
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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 ""
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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 ""
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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 ""
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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 ""
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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 ""
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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 ""
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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 ""
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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 ""
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1181,7 +1218,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -1200,18 +1237,18 @@ msgid ""
 "to define them.\n"
 msgstr ""
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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 ""
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
@@ -1400,7 +1437,7 @@ msgid ""
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1445,7 +1482,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr ""
@@ -1591,7 +1628,7 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr ""
 
@@ -1654,7 +1691,7 @@ msgstr ""
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1666,7 +1703,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
@@ -1713,7 +1750,7 @@ msgstr ""
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -1787,7 +1824,7 @@ msgid ""
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
@@ -1922,11 +1959,12 @@ 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:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr ""
@@ -2134,8 +2172,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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr ""
@@ -2317,23 +2355,14 @@ msgstr ""
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:785
-#, c-format
-msgid "header field '%s' missing in header\n"
-msgstr ""
-
-#: src/msgl-check.c:793
+#: src/msgl-check.c:801
 #, c-format
-msgid "header field '%s' should start at beginning of line\n"
-msgstr ""
-
-#: src/msgl-check.c:818
-msgid "some header fields still have the initial default value\n"
+msgid "header field '%s' still has the initial default value\n"
 msgstr ""
 
-#: src/msgl-check.c:835
+#: src/msgl-check.c:816
 #, c-format
-msgid "header field '%s' still has the initial default value\n"
+msgid "header field '%s' missing in header\n"
 msgstr ""
 
 #: src/msgl-iconv.c:65
@@ -2351,7 +2380,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:623 src/xgettext.c:693
+#: 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 "
@@ -2365,8 +2394,8 @@ msgid ""
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2736,7 +2765,7 @@ msgstr ""
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr ""
@@ -3024,7 +3053,7 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: src/x-awk.c:341 src/x-javascript.c:988 src/x-python.c:1128
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr ""
@@ -3034,17 +3063,17 @@ msgstr ""
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr ""
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-c.c: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 ""
 
-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:224 src/xgettext.c:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3076,7 +3105,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3088,7 +3117,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr ""
@@ -3108,12 +3137,22 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3125,6 +3164,50 @@ 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:1147
+#, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr ""
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3160,13 +3243,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:236
+#: 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:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3174,7 +3257,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3182,7 +3265,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3190,7 +3273,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3198,7 +3281,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3206,7 +3289,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3233,50 +3316,55 @@ msgid ""
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr ""
+
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:770
+#: src/xgettext.c:785
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:870
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3285,44 +3373,45 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:880
+#: src/xgettext.c:896
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3332,33 +3421,34 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:890 src/xgettext.c:897
+#: 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"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3366,84 +3456,85 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:904
+#: src/xgettext.c:922
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3451,7 +3542,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3459,52 +3550,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:2104
+#: 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 ""
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3513,34 +3604,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3548,7 +3639,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, c-format
 msgid "language '%s' unknown"
 msgstr ""
diff --git a/gettext-tools/po/gl.po b/gettext-tools/po/gl.po
index 27f64b4..6beb9a7 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.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2012-11-11 12:53+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -61,33 +61,33 @@ msgstr "non é posíbel retirar o directorio temporal %s"
 msgid "write error"
 msgstr "erro de escritura"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "produciuse un erro ao abrir «%s» para lectura"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, c-format
 msgid "cannot open backup file %s for writing"
 msgstr ""
 "non é posíbel abrir o ficheiro de copia de seguridade «%s» para escribir"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "produciuse un erro ao ler «%s»"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "produciuse un erro ao escribir «%s»"
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "produciuse un erro despois de ler «%s»"
@@ -219,7 +219,7 @@ msgstr ""
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "memoria esgotada"
@@ -284,7 +284,7 @@ msgstr "«"
 msgid "'"
 msgstr "»"
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -317,19 +317,19 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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 "produciuse un erro ao abrir «%s» para lectura"
 
-#: src/format.c:148
+#: 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-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
@@ -340,7 +340,7 @@ msgstr ""
 "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-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
@@ -349,9 +349,10 @@ msgstr "unha especificación de formato para o argumento %u non existe en «%s»
 
 #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
-#: src/format-gfc-internal.c:372 src/format-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
@@ -381,7 +382,8 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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 "o número de especificacións de formato en «%s» e «%s» non coincide"
@@ -664,7 +666,9 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: 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 ""
@@ -709,6 +713,32 @@ msgstr ""
 "as especificacións de formato en «%s» e «%s» para o argumento «%s» non son "
 "as mesmas"
 
+#: src/format-python-brace.c:136
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr ""
+
+#: src/format-python-brace.c:149
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+
+#: src/format-python-brace.c:164
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
+
+#: src/format-python-brace.c:184
+#, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+
+#: src/format-python-brace.c:210
+#, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr ""
+
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -750,11 +780,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -763,17 +793,17 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: src/xgettext.c:605
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Escrito por %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -785,11 +815,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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 "Use «%s --help» para obter máis información.\n"
@@ -827,29 +857,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Saída informativa:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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 esta mensaxe de axuda e sae\n"
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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 a información da versión e sae\n"
@@ -858,11 +888,11 @@ msgstr "  -V, --version               Mostra a información da versión e sae\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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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 "Envíe informes de fallo a <bug-gnu-gettext@gnu.org>.\n"
 
@@ -871,37 +901,37 @@ msgstr "Envíe informes de fallo a <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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 "permítese un ficheiro de entrada como moito"
 
-#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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 son mutuamente excluíntes"
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 [OPCIÓN] [FICHEIRO_ENTRADA]\n"
 
-#: src/msgattrib.c:412
+#: 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 ""
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -910,50 +940,50 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, c-format
 msgid "Input file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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 ""
 
-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/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 ""
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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 ""
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -962,99 +992,106 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selección de mensaxes:\n"
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+
+#: src/msgattrib.c:471
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/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
@@ -1062,14 +1099,14 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1077,17 +1114,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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"
@@ -1096,103 +1133,103 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/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:939
+#: 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 ""
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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 ""
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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 ""
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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 ""
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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 ""
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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 ""
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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 ""
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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 ""
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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 ""
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1202,7 +1239,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "o criterio de selección indicado é imposíbel (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -1229,18 +1266,18 @@ msgstr ""
 "ficheiro, para definilos. Mantéñense as posicións nos ficheiros de todos\n"
 "os ficheiros PO.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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 ""
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
@@ -1444,7 +1481,7 @@ msgid ""
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1489,7 +1526,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "non se indicou ningún ficheiro de entrada"
@@ -1635,7 +1672,7 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -1698,7 +1735,7 @@ msgstr ""
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1710,7 +1747,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Modo de operación:\n"
@@ -1757,7 +1794,7 @@ msgstr ""
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -1831,7 +1868,7 @@ msgid ""
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
@@ -1968,11 +2005,12 @@ msgstr "%s: aviso: o ficheiro fonte contén traducións dubidosas"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "produciuse un erro ao ler «%s»"
@@ -2180,8 +2218,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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "aviso: "
@@ -2369,25 +2407,16 @@ msgstr ""
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:785
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "falta o campo «%s» na cabeceira\n"
-
-#: src/msgl-check.c:793
-#, fuzzy, c-format
-msgid "header field '%s' should start at beginning of line\n"
-msgstr "o campo «%s» da cabeceira tería que comezar ao principio da liña\n"
-
-#: src/msgl-check.c:818
-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"
-
-#: src/msgl-check.c:835
+#: src/msgl-check.c:801
 #, fuzzy, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "o campo «%s» da cabeceira aínda ten o valor inicial predefinido\n"
 
+#: src/msgl-check.c:816
+#, fuzzy, c-format
+msgid "header field '%s' missing in header\n"
+msgstr "falta o campo «%s» na cabeceira\n"
+
 #: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
@@ -2405,7 +2434,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:623 src/xgettext.c:693
+#: 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 "
@@ -2421,8 +2450,8 @@ msgid ""
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2818,7 +2847,7 @@ msgstr "fin de liña nunha cadea"
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este ficheiro non pode conter directivas de dominio"
@@ -3108,7 +3137,7 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: 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: aviso: cadea non rematada"
@@ -3118,17 +3147,17 @@ msgstr "%s:%d: aviso: cadea non rematada"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: aviso: expresión regular non rematada"
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: 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: aviso: constante de tipo carácter non rematada"
 
-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: aviso: literal de cadea non rematada"
 
-#: src/x-csharp.c:224 src/xgettext.c:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3160,7 +3189,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3172,7 +3201,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: aviso: carácter Unicode incorrecto"
@@ -3192,12 +3221,22 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3211,6 +3250,50 @@ 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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: aviso: literal de cadea non rematada"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3246,13 +3329,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:236
+#: 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:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3260,7 +3343,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3268,7 +3351,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3276,7 +3359,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3284,7 +3367,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3292,7 +3375,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3319,51 +3402,56 @@ msgid ""
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: aviso: literal de cadea non rematada"
+
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "non é posíbel usar --join-existing cando a saída se escribe en stdout"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext non funciona sen palabras clave polas que buscar"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:785
 #, fuzzy, 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"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:870
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3372,44 +3460,45 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:880
+#: src/xgettext.c:896
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3419,33 +3508,34 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:890 src/xgettext.c:897
+#: 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"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3453,84 +3543,85 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:904
+#: src/xgettext.c:922
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3538,7 +3629,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3546,52 +3637,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "entrada estándar"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: aviso: "
 
-#: src/xgettext.c:2104
+#: 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 ""
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3600,34 +3691,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3635,7 +3726,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "linguaxe «%s» descoñecida"
@@ -3644,6 +3735,14 @@ msgstr "linguaxe «%s» descoñecida"
 msgid "<unnamed>"
 msgstr ""
 
+#, fuzzy
+#~ msgid "header field '%s' should start at beginning of line\n"
+#~ msgstr "o campo «%s» da cabeceira tería que comezar ao principio da liña\n"
+
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr ""
+#~ "algúns campos da cabeceira aínda teñen o valor inicial predefinido\n"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: opción ilegal -- %c\n"
 
diff --git a/gettext-tools/po/id.po b/gettext-tools/po/id.po
index 4fa0c8e..dfa8a3e 100644
--- a/gettext-tools/po/id.po
+++ b/gettext-tools/po/id.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.18\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\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"
@@ -58,32 +58,32 @@ msgstr "tidak dapat menghapus direktori sementara %s"
 msgid "write error"
 msgstr "tulis error"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "error ketika membuka \"%s\" untuk dibaca"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "tidak dapat membuka berkas backup \"%s\" untuk ditulis"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "error ketika membaca \"%s\""
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "error ketika menulis \"%s\""
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "error setelah membaca \"%s\""
@@ -215,7 +215,7 @@ msgstr "%s subproses I/O error"
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "kehabisan memori"
@@ -280,7 +280,7 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -313,20 +313,20 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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 "error ketika membuka \"%s\" untuk dibaca"
 
-#: src/format.c:148
+#: src/format.c:151
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "'%s' bukan sebuah format string %s yang sah, tidak seperti '%s'. Karena: %s"
 
 #: src/format-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-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
@@ -337,7 +337,7 @@ msgstr ""
 "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-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
@@ -346,9 +346,10 @@ 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-elisp.c:379 src/format-gcc-internal.c:658
-#: 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
+#: 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
 #, 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"
@@ -381,7 +382,8 @@ msgstr ""
 "%u."
 
 #: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-python.c:515 src/format-qt-plural.c:110
+#: 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 "jumlah spesifikasi format dalam '%s' dan '%s' tidak cocok"
@@ -700,7 +702,9 @@ msgstr ""
 "Dalam direktif nomor %u, ukuran penspesifikasi tidak kompatibel dengan "
 "penspesifkasi konversi '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: 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 "spesifikasi format untuk argumen '%s' tidak ada dalam '%s'"
@@ -750,6 +754,33 @@ 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:136
+#, 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:149
+#, 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:164
+#, 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:184
+#, 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:210
+#, 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 ""
@@ -802,11 +833,11 @@ 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/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:584
+#: 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"
@@ -819,17 +850,17 @@ 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:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: src/xgettext.c:605
 #, 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -841,11 +872,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "terlalu banyak argumen"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/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:813
+#: 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 "Coba `%s --help' untuk informasi lebih jauh.\n"
@@ -886,29 +917,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:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Keluaran informatif:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/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:983
+#: 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                  tampilkan bantuan ini dan keluar\n"
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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               keluarkan informasi versi dan keluar\n"
@@ -917,11 +948,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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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 "Laporkan bugs ke <bug-gnu-gettext@gnu.org>.\n"
 
@@ -930,30 +961,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:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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 "di paling tidak satu berkas masukan diijinkan"
 
-#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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 dan %s adalah mutually exclusive"
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 "Penggunaan: %s [PILIHAN] [BERKAS MASUKAN]\n"
 
-#: src/msgattrib.c:412
+#: src/msgattrib.c:419
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -962,7 +993,7 @@ msgstr ""
 "Saring pesan dari sebuah katalog terjemahan menurut atributnya,\n"
 "dan manipulasi atribut.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/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
@@ -972,23 +1003,23 @@ msgid ""
 msgstr ""
 "Argumen wajib untuk pilihan panjang juga wajib untuk pilihan pendek juga.\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, c-format
 msgid "Input file location:\n"
 msgstr "Lokasi berkas masukan:\n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:428 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:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -996,7 +1027,7 @@ msgstr ""
 "  -D, --directory=DIREKTORI   tambahkan DIREKTORI ke daftar pencarian "
 "masukan berkas\n"
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/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"
@@ -1004,15 +1035,15 @@ msgstr ""
 "Jika tidak ada berkas masukan yang diberikan atau jika ini adalah -, standar "
 "masukan yang dibaca.\n"
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr "Lokasi berkas keluaran:\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/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
@@ -1021,7 +1052,7 @@ msgstr ""
 "  -o, --output-file=BERKAS    tulis keluaran ke berkas yang "
 "dispesifikasikan\n"
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/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
@@ -1032,12 +1063,12 @@ msgstr ""
 "Hasil ditulis ke standar keluaran jika tidak ada berkas keluaran yang\n"
 "dispesifikasikan atau jika ini adalah -.\n"
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 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:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1045,7 +1076,7 @@ msgstr ""
 "      --translated            simpan terjemahan, hapus pesan tidak "
 "diterjemahkan\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1053,52 +1084,61 @@ msgstr ""
 "      --untranslated          simpan tidak terjemahkan, hapus pesan "
 "terjemahan\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              hapus pesan ditandai 'fuzzy'\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            simpan pesan ditandai 'fuzzy'\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           hapus pesan sudah ditinggalkan #~\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         simpan pesan sudah ditinggalkan #~\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulasi atribut:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             set seluruh pesan 'fuzzy'\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "     --clear-fuzzy            set seluruh pesan non-'fuzzy'\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          set seluruh pesan sudah ditinggalkan\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        set seluruh pesan tidak ditinggalkan\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, 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:471
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1106,7 +1146,7 @@ msgid ""
 msgstr ""
 "      --clear-previous        hapus \"previous msgid\" dari seluruh pesan\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1114,7 +1154,7 @@ msgstr ""
 "      --only-file=BERKAS.po   hanya manipulasi masukan terdaftar dalam "
 "BERKAS.po\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1122,13 +1162,13 @@ msgstr ""
 "      --ignore-file=BERKAS.po hanya manipulasi masukan tidak terdaftar dalam "
 "BERKAS.po\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 sinonim untuk --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1136,7 +1176,7 @@ msgstr ""
 "      --obsolete               sinonim untuk --only-obsolete --clear-"
 "obsolete\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/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
@@ -1144,7 +1184,7 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr "Sintaks berkas masukan:\n"
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/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 ""
@@ -1153,7 +1193,7 @@ msgstr ""
 "  -P, --properties-input      berkas masukan berada dalam .properties "
 "sintaks Java\n"
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/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 ""
@@ -1163,17 +1203,17 @@ msgstr ""
 "      --stringtable-input     berkas masukan berada dalam sintaks .strings "
 "NexTstep/GNUstep\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr "Detil keluaran:\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/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:929
+#: 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"
@@ -1187,27 +1227,27 @@ msgstr ""
 "                              KETIKA dapat berupa 'always', 'never', 'auto', "
 "atau 'html'.\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/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:933
+#: 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=BERKAS GAYA     spesifikasikan aturan gaya CSS berkas untuk --"
 "color\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             jangan gunakan C escape dalam keluaran (baku)\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: 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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1215,69 +1255,69 @@ msgstr ""
 "  -E, --escape                gunakan C escape dalam keluaran, bukan "
 "karakter ekstensi\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/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:939
+#: 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              tulis berkas PO walaupun itu kosong\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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                tulis berkas .po menggunakan gaya teridentasi\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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           jangan tulis '#: nama berkas:baris' baris\n"
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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          hasilkan '#: nama berkas:baris' baris (baku)\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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                tulis strict Uniforum konform berkas .po\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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     tulis sebuah berkas .properties Java\n"
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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    tulis sebuah .string berkas NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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=ANGKA           set keluaran lebar halaman\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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"
@@ -1288,16 +1328,16 @@ msgstr ""
 "                              dari lebar halaman keluaran, dalam beberapa "
 "beris\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           hasilkan keluaran terurut\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1309,7 +1349,7 @@ msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 "kriteria pemilihan yang dispesifikasikan tidak memungkinkan (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Penggunaan: %s [PILIHAN] [BERKAS MASUKAN]...\n"
@@ -1336,12 +1376,12 @@ msgstr ""
 "komentar ekstraksi akan dijaga, tetapi hanya dari berkas PO pertama yang\n"
 "mendefinisikan mereka. Posisi berkas dari seluruh berkas PO akan dijaga.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  BERKAS MASUKAN ...          berkas masukan\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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 ""
@@ -1349,7 +1389,7 @@ msgstr ""
 "BERKAS\n"
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Jika berkas masukan adalah -, standar masukan dibaca.\n"
@@ -1572,7 +1612,7 @@ msgstr ""
 "  ->, --more-than=ANGKA       tampilkan pesan dengan lebih dari definisi\n"
 "                              ini, baku ke 1 jika tidak diset\n"
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, fuzzy, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1621,7 +1661,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                gaya keluaran Uniforum strict\n"
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "tidak ada berkas masukan yang diberikan"
@@ -1791,7 +1831,7 @@ msgid "invalid endianness: %s"
 msgstr "endianness tidak valid: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -1854,7 +1894,7 @@ msgstr "Penggunaan: %s [PILIHAN] nama-berkas.po ...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Hasilkan katalog pesan binari dari deskripsi tekstual terjemahan.\n"
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1868,7 +1908,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  nama-berkas.po ...           berkas masukan\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mode operasi:\n"
@@ -1922,7 +1962,7 @@ msgstr "      --qt                    mode Qt: hasilkan sebuah berkas Qt .qm\n"
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                aktifkan mode strict Uniforum\n"
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, 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"
@@ -2009,7 +2049,7 @@ msgstr ""
 "Pilihan -l dan -d wajib. Berkas .msg ditulis dalam direktori yang "
 "dispesifikasikan.\n"
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretasi masukan berkas:\n"
@@ -2165,11 +2205,12 @@ msgstr "%s: peringatan: berkas sumber mengandung terjemahan fuzzy"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "kesalahan ketika membaca \"%s\""
@@ -2450,8 +2491,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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "peringatan: "
@@ -2671,25 +2712,16 @@ msgstr "msgstr kuran tanda akselerasi keyboard '%c'"
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr memiliki terlalu banyak tanda akselerasi keyboard '%c'"
 
-#: src/msgl-check.c:785
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "header field `%s' hilang dalam header\n"
-
-#: src/msgl-check.c:793
-#, fuzzy, 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:818
-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:835
+#: src/msgl-check.c:801
 #, 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:816
+#, fuzzy, c-format
+msgid "header field '%s' missing in header\n"
+msgstr "header field `%s' hilang dalam header\n"
+
 #: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
@@ -2707,7 +2739,7 @@ msgstr ""
 "set karakter"
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:623 src/xgettext.c:693
+#: 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 "
@@ -2725,8 +2757,8 @@ 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:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3160,7 +3192,7 @@ msgstr "akhir-dari-baris dalam string"
 msgid "context separator <EOT> within string"
 msgstr "konteks pemisah <EOT> dalam string"
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "berkas ini tidak boleh mengandung direktif domain"
@@ -3490,7 +3522,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-python.c:1075
+#: 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: peringatan: string tidak terselesaikan"
@@ -3500,17 +3532,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:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: 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: peringatan: karakter konstan yang unterminated"
 
-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832
 #, 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:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr "Mohon spesifikasikan sumber pengkodean melalui --from-code."
 
@@ -3550,7 +3582,7 @@ msgstr ""
 "%s:%d: Urutan multibyte tidak lengkap diakhir dari baris.\n"
 "Mohon spesifikasikan sumber pengkodean yang benar melalui --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv gagal"
@@ -3564,7 +3596,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:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: peringatan: karakter Unicode tidak valid"
@@ -3584,12 +3616,22 @@ 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:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3603,6 +3645,61 @@ 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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: peringatan: string literal yang unterminated"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3639,7 +3736,7 @@ 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:236
+#: 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"
@@ -3648,7 +3745,7 @@ msgstr ""
 "sebuah komentar\n"
 "seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3661,7 +3758,7 @@ msgstr ""
 "komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263."
 "html.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3674,7 +3771,7 @@ msgstr ""
 "komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263."
 "html.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3687,7 +3784,7 @@ msgstr ""
 "komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263."
 "html.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3700,7 +3797,7 @@ msgstr ""
 "komentar seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263."
 "html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3712,7 +3809,7 @@ msgstr ""
 "sebuah komentar\n"
 "seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Pengkodean \"%s\" tidak dikenal. Lebih baik melanjutkan dengan ASCII."
@@ -3741,28 +3838,33 @@ msgstr ""
 "%s:%lu: peringatan: sintaks $\"...\" telah ditinggalkan karena alasan "
 "keamanan; lebih baik gunakan eval_gettext"
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: peringatan: string literal yang unterminated"
+
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing tidak dapat digunakan ketika output ditulis ke stdout"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext tidak dapat bekerja tanpa kata kunci untuk dicari"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:785
 #, fuzzy, 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:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Ekstrak string yang dapat diterjemahkan dari masukan berkas yang diberikan.\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3771,14 +3873,14 @@ msgstr ""
 "  -d, --default-domain=NAMA   gunakan NAMA.po untuk keluaran (daripada "
 "messages.po)\n"
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=BERKAS         tulis keluaran ke berkas yang "
 "dispesifikasikan\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3786,13 +3888,13 @@ msgstr ""
 "  -p, --output-dir=DIR        keluarkan berkas akan ditempatkan dalam "
 "direktori DIR\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Pilihan dari masukan bahasa berkas:\n"
 
-#: src/xgettext.c:855
-#, c-format
+#: src/xgettext.c:870
+#, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3800,7 +3902,8 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 "  -L, --language=NAMA         kenali bahasa yang dispesifikasikan\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3810,12 +3913,12 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   kependekan untuk --language=C++\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3823,7 +3926,7 @@ msgid ""
 msgstr ""
 "Secara baku bahasa ditebak tergantung dari ekstensi masukan nama berkas.\n"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3832,24 +3935,24 @@ msgstr ""
 "      --from-code=NAMA        pengkodean dari berkas masukan\n"
 "                                (kecuali untuk Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, 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:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         gabungkan pesan dengan berkas yang sudah ada\n"
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=BERKAS.po masukan dari BERKAS.po tidak diekstraksi\n"
 
-#: src/xgettext.c:880
+#: src/xgettext.c:896
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3866,30 +3969,31 @@ msgstr ""
 "kata kunci\n"
 "                              dalam berkas keluaran\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Pilihan spesifik untuk bahasa:\n"
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           ekstrak seluruh string\n"
 
-#: src/xgettext.c:890 src/xgettext.c:897
-#, c-format
+#: src/xgettext.c:906 src/xgettext.c:914
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (hanya bahasa C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3898,7 +4002,7 @@ msgstr ""
 "  -kKATA, --keyword=KATA      cari untuk KATA sebagai kata kunci tambahan\n"
 "  -k, --keyword               jangan gunakan untuk kata kunci baku\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3908,69 +4012,70 @@ msgstr ""
 "      --flag=WORD:ARG:FLAG    simbol tambahan untuk string didalam argumen\n"
 "                              nomor ARG dari kata kunci KATA\n"
 
-#: src/xgettext.c:904
-#, c-format
+#: src/xgettext.c:922
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (hanya bahasa C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, 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:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (hanya bahasa C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    kenali format string Qt\n"
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (hanya bahasa C++)\n"
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   kenali format string KDE 4\n"
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 kenali format string Boost\n"
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 lebih detil hasil pengenalan format string\n"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output     tulis keluar sebuah berkas .properties Java\n"
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=STRING  set pemegang hak cipta dalam keluaran\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3978,17 +4083,17 @@ msgstr ""
 "      --foreign-user          abaikan FSF hak cipta dalam keluaran untuk "
 "pengguna luar negri\n"
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, 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:970
+#: src/xgettext.c:989
 #, 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:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3996,7 +4101,7 @@ msgstr ""
 "      --msgid-bugs-address=EMAIL@ALAMAT   set alamat laporan untuk msgid "
 "bugs\n"
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4007,7 +4112,7 @@ msgstr ""
 "awalan\n"
 "                                untuk nilai msgstr\n"
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4018,7 +4123,7 @@ msgstr ""
 "akhiran\n"
 "                                untuk nilai msgstr\n"
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4027,31 +4132,31 @@ msgstr ""
 "Sebuah argumen --flag tidak memiliki <keyword>:<argnum>:[pass-]<flag> "
 "sintaks: %s"
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Karakter bukan-ASCII di %s%s."
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "Komentar bukan-ASCII di atau sebelum %s%s."
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "String bukan-ASCII di %s%s."
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: peringatan: "
 
-#: src/xgettext.c:2104
+#: src/xgettext.c:2138
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4060,7 +4165,7 @@ msgstr ""
 "Walaupun telah digunakan dalam sebuah posisi format string, %s bukan sebuah "
 "format string %s valid. Karena: %s\n"
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4069,7 +4174,7 @@ msgstr ""
 "Walaupun dideklarasikan seperti itu, %s bukan sebuah format string %s yang "
 "valid. Karena: %s\n"
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4084,7 +4189,7 @@ msgstr ""
 "bernama,\n"
 "dan sebuah pemetaan daripada sebuah tuple untuk argumen.\n"
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4094,27 +4199,27 @@ msgstr ""
 "gettext(\"\") mengembalikan masukan header dengan\n"
 "informasi meta, bukan string kosong.\n"
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "spesifikasi argumen ambigu untuk kata kunci '%.*s'"
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "peringatan: hilang konteks untuk kata kunci '%.*s'"
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, 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:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "konteks tidak cocok diantara bentuk singular dan plural"
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 #, fuzzy
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
@@ -4127,7 +4232,7 @@ msgstr ""
 "variabel MSGID_BUGS_ADDRESS disana; jika tidak mohon spesifikasikan\n"
 "sebuah pilihan baris perintah --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "bahasa `%s' tidak dikenal"
@@ -4136,6 +4241,13 @@ msgstr "bahasa `%s' tidak dikenal"
 msgid "<unnamed>"
 msgstr "<tidak bernama>"
 
+#, fuzzy
+#~ 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"
 
diff --git a/gettext-tools/po/it.po b/gettext-tools/po/it.po
index 3f608cd..d908901 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: 2013-06-25 17:48+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+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,7 +35,8 @@ 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
@@ -198,12 +199,15 @@ 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
@@ -320,15 +324,20 @@ 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
@@ -346,7 +355,9 @@ 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
@@ -355,18 +366,26 @@ 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
@@ -378,7 +397,8 @@ 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
@@ -386,22 +406,33 @@ 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
@@ -416,22 +447,31 @@ msgstr "Nella direttiva numero %u, la combinazione delle opzioni non è valida."
 #: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr "Nella direttiva numero %u, la precisione non è ammessa prima di \"%c\"."
+msgstr ""
+"Nella direttiva numero %u, la precisione non è ammessa prima di \"%c\"."
 
 #: src/format-gcc-internal.c:334
 #, c-format
-msgid "In the directive number %u, the argument number for the precision must be equal to %u."
-msgstr "Nella direttiva numero %u, il numero di argomento per la precisione deve essere uguale a %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"Nella direttiva numero %u, il numero di argomento per la precisione deve "
+"essere uguale a %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "Nella direttiva numero %u, la precisione non è ammessa prima di \"%c\"."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"Nella direttiva numero %u, la precisione non è ammessa prima di \"%c\"."
 
 #: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
-msgstr "Nella direttiva numero %u, la specificazione di precisione non è valida."
+msgstr ""
+"Nella direttiva numero %u, la specificazione di precisione non è valida."
 
 #: src/format-gcc-internal.c:463
 #, c-format
@@ -463,43 +503,70 @@ 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
@@ -508,13 +575,20 @@ 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
@@ -523,13 +597,20 @@ 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
@@ -538,21 +619,36 @@ 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
@@ -578,12 +674,18 @@ 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
@@ -602,12 +704,18 @@ 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:374 src/format-python-brace.c:387
@@ -617,54 +725,78 @@ 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: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: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: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: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:210
 #, c-format
@@ -673,20 +805,33 @@ 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."
@@ -694,13 +839,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: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
@@ -774,10 +925,12 @@ 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
@@ -866,8 +1019,11 @@ msgstr ""
 #: 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: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
@@ -887,16 +1043,19 @@ msgstr "  FILEINPUT                   file PO di input\n"
 #: 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: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: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
@@ -931,14 +1090,17 @@ msgstr "Selezione dei messaggi:\n"
 
 #: 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: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"
@@ -946,12 +1108,14 @@ msgstr ""
 #: 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: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:453
 #, c-format
@@ -994,23 +1158,32 @@ 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: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: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: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:477
 #, c-format
@@ -1019,8 +1192,10 @@ msgstr "      --fuzzy                 sinonimo di --only-fuzzy --clear-fuzzy\n"
 
 #: 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: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
@@ -1033,15 +1208,21 @@ msgstr "Sintassi del file di input:\n"
 #: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
 #: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, 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: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:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
@@ -1059,33 +1240,41 @@ msgstr "Dettagli di output:\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                 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: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: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: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:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
@@ -1099,27 +1288,33 @@ msgstr "      --force-po              scrive il file PO anche se vuoto\n"
 #: 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: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: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: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: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
@@ -1132,8 +1327,10 @@ msgstr "  -p, --properties-output     genera un file Java .properties\n"
 #: 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: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
@@ -1150,7 +1347,8 @@ 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:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
@@ -1165,7 +1363,9 @@ msgstr "  -s, --sort-output           genera un output ordinato\n"
 #: 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:321 src/msgcomm.c:326
 #, c-format
@@ -1208,7 +1408,8 @@ msgstr "  FILEINPUT ...               file di input\n"
 #: 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:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
 #: src/xgettext.c:854
@@ -1231,7 +1432,8 @@ 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:413 src/msgcomm.c:404
@@ -1240,14 +1442,18 @@ 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: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:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
 #: src/msgmerge.c:559
@@ -1256,7 +1462,8 @@ 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:427 src/msgconv.c:332 src/msguniq.c:377
@@ -1275,8 +1482,10 @@ msgstr ""
 
 #: 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:286 src/msgmerge.c:350
@@ -1334,8 +1543,12 @@ msgstr "Modificatori di operazione:\n"
 
 #: 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:550
 #, c-format
@@ -1420,13 +1633,17 @@ 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: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:306
 #, c-format
@@ -1458,8 +1675,11 @@ msgstr "      --no-location           sopprime le righe \"#: nomefile:riga\"\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"
+msgid ""
+"      --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"      --add-location          preserva le righe \"#: nomefile:riga"
+"\" (predefinito)\n"
 
 #: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
 #: src/msgmerge.c:585
@@ -1563,7 +1783,8 @@ msgstr "Uso: %s [OPZIONE] FILTRO [OPZIONE-FILTRO]\n"
 #: 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:416
 #, c-format
@@ -1581,13 +1802,15 @@ msgstr "OPZIONI-FILTRO utili quando FILTRO è \"sed\":\n"
 
 #: 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: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"
@@ -1596,15 +1819,20 @@ msgstr ""
 # FIXME
 #: 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: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:452 src/msggrep.c:601
 #, c-format
@@ -1613,8 +1841,10 @@ msgstr "      --indent                stile di output indentato\n"
 
 #: 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:304
 #, c-format
@@ -1689,7 +1919,9 @@ msgstr "Uso: %s [OPZIONE] nomefile.po ...\n"
 #: 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:663 src/xgettext.c:841
 #, c-format, no-wrap
@@ -1712,13 +1944,21 @@ msgstr "Modo di operazione:\n"
 
 #: 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: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:683
 #, c-format
@@ -1727,13 +1967,19 @@ msgstr "      --csharp                modo C#: genera un file .NET .dll\n"
 
 #: 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: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:689
 #, c-format
@@ -1748,7 +1994,8 @@ msgstr "      --strict                abilita il modo Uniforum strict\n"
 #: 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:701
 #, c-format
@@ -1764,21 +2011,27 @@ msgstr "  -r, --resource=RISORSA      nome della risorsa\n"
 #: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
 #: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
-msgid "  -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"
-msgstr "  -l, --locale=LOCALE         nome della locale, o lingua o lingua_PAESE\n"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=LOCALE         nome della locale, o lingua o lingua_PAESE\n"
 
 # FIXME
 #: 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: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 ""
@@ -1793,9 +2046,12 @@ msgstr "Posizione del file di output in modo C#:\n"
 
 #: 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:723
@@ -1815,7 +2071,8 @@ msgstr "Posizione del file di output in modo Tcl:\n"
 #: 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:733
 #, c-format
@@ -1835,10 +2092,12 @@ msgstr "Interpretazione del file di input:\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                 esegue tutti i controlli implicati da\n"
-"                                --check-format, --check-header, --check-domain\n"
+"                                --check-format, --check-header, --check-"
+"domain\n"
 
 #: src/msgfmt.c:750
 #, c-format
@@ -1849,7 +2108,9 @@ msgstr ""
 
 #: 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"
@@ -1860,12 +2121,15 @@ 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: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"
@@ -1873,7 +2137,8 @@ msgstr ""
 #: 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"
@@ -1886,7 +2151,8 @@ msgstr "  -f, --use-fuzzy             usa le voci fuzzy nell'output\n"
 
 #: 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"
@@ -1894,8 +2160,10 @@ msgstr ""
 #: 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"
@@ -1903,8 +2171,10 @@ msgstr ""
 
 #: 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:781
 #, c-format
@@ -1934,7 +2204,9 @@ msgstr "attenzione: intestazione fuzzy del file PO\n"
 #: 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:936
 #, c-format
@@ -1982,8 +2254,12 @@ msgstr "errore durante la lettura di \"%s\""
 
 #: 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:516
 #, c-format, no-wrap
@@ -2072,9 +2348,11 @@ msgstr ""
 
 #: 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:618
@@ -2086,7 +2364,9 @@ msgstr "      --sort-output           genera un output ordinato\n"
 #: 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 ""
@@ -2131,10 +2411,12 @@ 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
@@ -2159,8 +2441,11 @@ 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 ""
@@ -2193,11 +2478,14 @@ 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"
 
@@ -2213,7 +2501,8 @@ 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
@@ -2222,18 +2511,26 @@ 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
@@ -2254,7 +2551,8 @@ 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 ""
@@ -2324,7 +2622,8 @@ 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"
 
@@ -2335,7 +2634,8 @@ 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"
@@ -2347,8 +2647,12 @@ 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
@@ -2395,12 +2699,18 @@ 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
@@ -2413,7 +2723,8 @@ 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
@@ -2436,12 +2747,14 @@ msgstr "in msgstr manca il carattere \"%c\" per l'acceleratore da tastiera"
 #: 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: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:816
 #, c-format
@@ -2456,30 +2769,44 @@ 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: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: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:383 src/msgmerge.c:389
 #, c-format
@@ -2519,7 +2846,9 @@ msgstr ""
 #: 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:504
 #, c-format
@@ -2532,7 +2861,8 @@ 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:514
@@ -2568,7 +2898,8 @@ msgstr "      --suffix=SUFFISSO       cambia il solito suffisso dei backup\n"
 #: 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"
@@ -2576,7 +2907,8 @@ 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"
@@ -2585,7 +2917,8 @@ msgstr ""
 #: 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"
@@ -2593,8 +2926,11 @@ msgstr ""
 
 #: 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:609 src/urlget.c:192
 #, c-format
@@ -2613,8 +2949,12 @@ msgstr "questo messaggio non dovrebbe definire forme plurali"
 
 #: 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:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2635,13 +2975,17 @@ 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
@@ -2651,13 +2995,19 @@ 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
@@ -2672,7 +3022,8 @@ 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"
@@ -2748,8 +3099,12 @@ msgstr "  -d, --repeated              stampa solo i duplicati\n"
 
 #: 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
@@ -2763,7 +3118,8 @@ msgid ""
 "Message conversion to user's charset might not work.\n"
 msgstr ""
 "Il set di caratteri \"%s\" non è un nome di codifica portabile.\n"
-"La conversione del messaggio nel set di caratteri dell'utente potrebbe fallire.\n"
+"La conversione del messaggio nel set di caratteri dell'utente potrebbe "
+"fallire.\n"
 
 #: src/po-charset.c:557
 #, c-format
@@ -2779,7 +3135,8 @@ msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
-"Questo problema può essere risolto installando GNU libiconv e poi reinstallando\n"
+"Questo problema può essere risolto installando GNU libiconv e poi "
+"reinstallando\n"
 "GNU gettext.\n"
 
 #: src/po-charset.c:578 src/po-charset.c:616
@@ -2805,7 +3162,8 @@ 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
@@ -2977,7 +3335,8 @@ 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
@@ -3029,28 +3388,47 @@ 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
@@ -3085,12 +3463,15 @@ msgstr "nome di classe Java non valido: %s"
 #: 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: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
@@ -3099,8 +3480,11 @@ msgstr "errore durante l'apertura di \"%s\" in scrittura"
 
 #: 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:1254 src/write-po.c:1383
 #, c-format
@@ -3133,17 +3517,21 @@ msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
-"il catalogo dei messaggi contiene traduzioni di forme plurali, ma il formato\n"
+"il catalogo dei messaggi contiene traduzioni di forme plurali, ma il "
+"formato\n"
 "dei cataloghi Qt non le gestisce.\n"
 
 #: src/write-qt.c: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
@@ -3152,8 +3540,10 @@ 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
@@ -3174,7 +3564,8 @@ 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
@@ -3190,7 +3581,8 @@ 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:988 src/x-python.c:1128
@@ -3374,7 +3766,8 @@ msgstr "%s:%d: attenzione: costante RegExp terminata troppo presto"
 #: 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
@@ -3422,7 +3815,8 @@ 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
@@ -3433,7 +3827,8 @@ 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
@@ -3444,7 +3839,8 @@ 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
@@ -3455,7 +3851,8 @@ 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
@@ -3491,8 +3888,12 @@ 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:558
 #, c-format
@@ -3502,7 +3903,9 @@ msgstr "%s:%d: attenzione: espressione regolare terminata troppo presto"
 #: 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:641
 #, c-format
@@ -3512,7 +3915,8 @@ msgstr "xgettext non può operare senza parole chiavi da ricercare"
 #: 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:836
 #, c-format
@@ -3521,8 +3925,12 @@ msgstr "Estrae le stringhe traducibili dai file di input indicati.\n"
 
 #: 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:861
 #, c-format
@@ -3531,7 +3939,8 @@ msgstr "  -o, --output=FILE           scrive l'output sul file indicato\n"
 
 #: 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"
@@ -3545,16 +3954,20 @@ msgstr "Scelta del linguaggio del file di input:\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)\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"
 
@@ -3565,8 +3978,12 @@ msgstr "  -C, --c++                   abbreviazione di --language=C++\n"
 
 #: 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:884
 #, c-format
@@ -3585,7 +4002,8 @@ msgstr "Come impostazione predefinita, i file di input si considerano ASCII.\n"
 #: 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:894
 #, c-format
@@ -3597,14 +4015,18 @@ msgstr "  -x, --exclude-file=FILE.po  non estrae le voci in 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   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:902
 #, c-format
@@ -3620,12 +4042,14 @@ msgstr "  -a, --extract-all           estrae tutte le stringhe\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 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"
 
@@ -3641,22 +4065,26 @@ msgstr ""
 #: 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: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"
 
@@ -3692,9 +4120,11 @@ msgstr "      --boost                 riconosce le stringhe di formato Boost\n"
 
 #: 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:968
@@ -3705,12 +4135,15 @@ msgstr "      --properties-output     scrive un file .properties Java\n"
 #: 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: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"
@@ -3718,43 +4151,56 @@ msgstr ""
 #: 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: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: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: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: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: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:1916
 msgid "standard input"
@@ -3782,13 +4228,21 @@ msgstr "%s%s: attenzione: "
 
 #: 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: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:2170
@@ -3799,7 +4253,8 @@ 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"
@@ -3827,7 +4282,9 @@ msgstr "attenzione: contesto mancante per la parola chiave \"%.*s\""
 #: 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:2942
 #, c-format
diff --git a/gettext-tools/po/ja.po b/gettext-tools/po/ja.po
index ecc933c..850d4b6 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.18.3\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-06-25 17:48+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2013-06-25 22:58+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -197,12 +197,16 @@ 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
@@ -326,7 +330,8 @@ 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
@@ -354,8 +359,12 @@ 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
@@ -385,12 +394,14 @@ 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
@@ -399,7 +410,9 @@ 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
@@ -419,12 +432,16 @@ msgstr "̿���ֹ� %u �Ǥ�, '%c' ���������٤���뤳�ȤϤ���ޤ���."
 
 #: src/format-gcc-internal.c:334
 #, c-format
-msgid "In the directive number %u, the argument number for the precision must be equal to %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
 msgstr "̿���ֹ� %u �Ǥ�, ���٤ΰ����ͤ� %u ���������ʤ��ƤϤʤ�ޤ���."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
 msgstr "̿���ֹ� %u �Ǥ�, '%c' ���������ٻ��꤬��뤳�ȤϤ���ޤ���."
 
 #: src/format-gcc-internal.c:406
@@ -462,32 +479,45 @@ msgid "The string ends in the middle of a directive."
 msgstr "ʸ����̿�������ǽ���äƤ��ޤ�."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "ʸ�����, �ֹ��դ����줿������, �ֹ��դ�����Ƥ��ʤ�������, �ɤ���ΰ����⻲�Ȥ��Ƥ��ޤ�."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"ʸ�����, �ֹ��դ����줿������, �ֹ��դ�����Ƥ��ʤ�������, �ɤ���ΰ����⻲"
+"�Ȥ��Ƥ��ޤ�."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "̿���ֹ� %u �Ǥ�, �����ֹ� 0 �����������ǤϤ���ޤ���."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
 msgstr "̿���ֹ� %u �Ǥ�, ���ΰ����ֹ� 0 �����������ǤϤ���ޤ���."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
 msgstr "̿���ֹ� %u �Ǥ�, ���٤ΰ����ֹ� 0 �����������ǤϤ���ޤ���."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
 msgstr "̿���ֹ� %u �Ǥ�, ʸ�� '%c' ���������Ѵ����һҤǤϤ���ޤ���."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
 msgstr "̿���ֹ� %u �ν�üʸ�����������Ѵ����һҤǤϤ���ޤ���."
 
 #: src/format-invalid.h:40
@@ -497,7 +527,9 @@ 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
@@ -507,13 +539,18 @@ msgstr "̿���ֹ� %u �Ǥ�, \"%s\" �θ�˥���ޤ���뤳�ȤϤ���ޤ���."
 
 #: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "̿���ֹ� %u �Ǥ�, \"%s\" �����������ͤη����ǤϤ���ޤ���."
 
 #: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "̿���ֹ� %u �Ǥ�, �����ο��θ�˥���ޤ� \"%s\", \"%s\", \"%s\", \"%s\" ����� 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
@@ -522,12 +559,17 @@ msgstr "̿���ֹ� %u �Ǥ�, �����˿��ͤ�����ޤ���."
 
 #: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "̿���ֹ� %u �Ǥ�, �����˿��ͤ�����, '<', '#' �� '%s' �����θ�ˤ��뤳�ȤϤ���ޤ���."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"̿���ֹ� %u �Ǥ�, �����˿��ͤ�����, '<', '#' �� '%s' �����θ�ˤ��뤳�ȤϤ�"
+"��ޤ���."
 
 #: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "���� {%u} ���Ф�������λ��꤬ '%s' �Τ褦�� '%s' ��¸�ߤ��ޤ���"
 
 #: src/format-java.c:756
@@ -537,20 +579,31 @@ 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
@@ -580,7 +633,9 @@ 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
@@ -604,7 +659,9 @@ 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
@@ -615,8 +672,11 @@ 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
@@ -625,22 +685,26 @@ 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:136
@@ -660,7 +724,8 @@ msgstr "̿���ֹ� %u �Ǥ�, '%c' �� getitem �ΰ�����Ϥ���뤳�Ȥ��Ǥ��ޤ���."
 
 #: src/format-python-brace.c:184
 #, 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:210
@@ -670,20 +735,31 @@ 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."
@@ -691,12 +767,16 @@ 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:344 src/msgcat.c:289 src/msgcmp.c:172
@@ -774,10 +854,12 @@ 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
@@ -864,7 +946,8 @@ msgstr "°���˽��ä��������������Υ�å����������̤�, °���򤦤ޤ����ޤ�.\n"
 #: 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:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
@@ -885,14 +968,17 @@ msgstr "  INPUTFILE                   ���� PO �ե�����\n"
 #: 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=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: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"
+msgstr ""
+"���ϥե����뤬���ꤵ��ʤ�, �⤷���� - �ξ���ɸ�����Ϥ��ɤ߹��ޤ�ޤ�.\n"
 
 #: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
 #: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
@@ -916,7 +1002,9 @@ 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:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
@@ -925,13 +1013,18 @@ msgstr "����������:\n"
 
 #: src/msgattrib.c:445
 #, 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:447
 #, 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:449
 #, c-format
@@ -976,7 +1069,8 @@ msgstr "      --set-obsolete          ���ƤΥ�å������� '�Ѥ줿' ���֤�����\n"
 #: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        ���ƤΥ�å��������� '�Ѥ줿' ���֤�����\n"
+msgstr ""
+"      --clear-obsolete        ���ƤΥ�å��������� '�Ѥ줿' ���֤�����\n"
 
 #: src/msgattrib.c:468
 #, c-format
@@ -989,17 +1083,22 @@ msgstr ""
 
 #: src/msgattrib.c:471
 #, 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: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: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:477
@@ -1009,8 +1108,10 @@ msgstr "      --fuzzy                 --only-fuzzy --clear-fuzzy ��Ʊ��\n"
 
 #: src/msgattrib.c:479
 #, 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: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
@@ -1023,14 +1124,19 @@ msgstr "���ϥե������ʸˡ:\n"
 #: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
 #: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
-msgid "  -P, --properties-input      input file is in Java .properties syntax\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr "  -P, --properties-input      ���ϥե������ Java .properties ��ʸˡ\n"
 
 #: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
 #: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
-msgid "      --stringtable-input     input file is in NeXTstep/GNUstep .strings syntax\n"
-msgstr "      --stringtable-input     ���ϥե������ NeXTstep/GNUstep .strings ��ʸˡ\n"
+msgid ""
+"      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
+"syntax\n"
+msgstr ""
+"      --stringtable-input     ���ϥե������ NeXTstep/GNUstep .strings ��ʸ"
+"ˡ\n"
 
 #: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
 #: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
@@ -1047,31 +1153,37 @@ 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: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=STYLEFILE       --color ���Ф��� CSS ��������롼������\n"
+msgstr ""
+"      --style=STYLEFILE       --color ���Ф��� CSS ��������롼������\n"
 
 #: src/msgattrib.c:497 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
 #: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
 #: src/xgettext.c:954
 #, 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: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 ����Υ��������פ�Ȥ�,\n"
 "                              ��ĥʸ����ޤ�ʤ�\n"
@@ -1093,19 +1205,24 @@ msgstr "  -i, --indent                ������������ .po �ե���������\n"
 #: src/xgettext.c:962
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
-msgstr "      --no-location           '#: �ե�����̾:���ֹ�' �ιԤ�񤭽Ф��ʤ�\n"
+msgstr ""
+"      --no-location           '#: �ե�����̾:���ֹ�' �ιԤ�񤭽Ф��ʤ�\n"
 
 #: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
 #: src/xgettext.c:964
 #, c-format
-msgid "  -n, --add-location          generate '#: filename:line' lines (default)\n"
-msgstr "  -n, --add-location          '#: �ե�����̾:���ֹ�' �ιԤ����� (ɸ��)\n"
+msgid ""
+"  -n, --add-location          generate '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          '#: �ե�����̾:���ֹ�' �ιԤ����� (ɸ��)\n"
 
 #: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
 #: src/xgettext.c:966
 #, 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: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
@@ -1118,8 +1235,10 @@ msgstr "  -p, --properties-output     Java .properties �ե���������\n"
 #: 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    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: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
@@ -1135,7 +1254,9 @@ 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: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
@@ -1229,7 +1350,8 @@ msgstr ""
 #: 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:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
@@ -1238,7 +1360,9 @@ 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:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
@@ -1256,7 +1380,8 @@ msgstr ""
 
 #: 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.
@@ -1314,8 +1439,11 @@ msgstr "������:\n"
 
 #: 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:550
 #, c-format
@@ -1404,8 +1532,10 @@ msgstr ""
 
 #: src/msgcomm.c:451 src/xgettext.c:981
 #, 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:306
 #, c-format
@@ -1436,7 +1566,8 @@ msgstr "      --no-location           '#: filename:line' �ιԤ���Ϥ��ʤ�\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"
+msgid ""
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr "      --add-location          '#: filename:line' �ιԤ��ݻ� (ɸ��)\n"
 
 #: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
@@ -1547,7 +1678,8 @@ 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:421
@@ -1557,25 +1689,31 @@ msgstr "FILTER �� 'sed' ��������� FILTER-OPTION:\n"
 
 #: 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     �¹Ԥ���륳�ޥ�ɤ� SCRIPT ���ɲ�\n"
 
 #: 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       SCRIPTFILE �����Ƥ�¹Ԥ���륳�ޥ�ɤ��ɲ�\n"
+msgstr ""
+"  -f, --file=SCRIPTFILE       SCRIPTFILE �����Ƥ�¹Ԥ���륳�ޥ�ɤ��ɲ�\n"
 
 #: 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:446 src/msggrep.c:595
 #, 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:452 src/msggrep.c:601
 #, c-format
@@ -1584,7 +1722,8 @@ msgstr "      --indent                �������������\n"
 
 #: 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:304
@@ -1679,13 +1818,19 @@ msgstr "���⡼��:\n"
 
 #: src/msgfmt.c:679
 #, 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: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:683
 #, c-format
@@ -1694,13 +1839,19 @@ msgstr "      --csharp                C# �⡼��: .NET .dll �ե����������\n"
 
 #: 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:687
 #, 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:689
 #, c-format
@@ -1730,23 +1881,31 @@ msgstr "  -r, --resource=RESOURCE     �꥽����̾\n"
 #: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
 #: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, 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:707
 #, 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: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 ���ץ�����ɬ�ܤǤ�. ���饹�ϻ��ꤵ�줿�ǥ��쥯�ȥ�ʲ���\n"
+"���饹̾��, �꥽����̾�������˲��դ��С� \"_\" �򶴤�ǥ�������̾��ä��뤳"
+"��\n"
+"�Ƿ����ޤ�. -d ���ץ�����ɬ�ܤǤ�. ���饹�ϻ��ꤵ�줿�ǥ��쥯�ȥ�ʲ�"
+"��\n"
 "�񤭽Ф���ޤ�.\n"
 
 #: src/msgfmt.c:715
@@ -1756,8 +1915,12 @@ msgstr "C# �⡼�ɤˤ�������ϥե�����ξ��:\n"
 
 #: src/msgfmt.c:721 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:723
 #, c-format
@@ -1776,7 +1939,8 @@ msgstr "Tcl �⡼�ɤˤ�������ϥե�����ξ��:\n"
 #: src/msgfmt.c:731 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:733
 #, c-format
@@ -1796,19 +1960,24 @@ 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:750
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr "      --check-format          ����˰�¸�����ե����ޥå�ʸ���������å�\n"
+msgstr ""
+"      --check-format          ����˰�¸�����ե����ޥå�ʸ���������å�\n"
 
 #: 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:754
@@ -1822,15 +1991,20 @@ msgstr ""
 
 #: 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: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[=ʸ��]  ��˥塼���ܤؤΥ���������Ƥ�����å�\n"
+msgstr ""
+"      --check-accelerators[=ʸ��]  ��˥塼���ܤؤΥ���������Ƥ�����å�\n"
 
 #: src/msgfmt.c:762
 #, c-format
@@ -1839,22 +2013,30 @@ msgstr "  -f, --use-fuzzy             fuzzy (�����ޤ�) ���ܤ���Ϥ˻Ȥ�\n"
 
 #: src/msgfmt.c:767
 #, 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: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"
+"      --endianness=BYTEORDER  ���ꤵ�줿�Х��ȥ�������32�ӥåȤο��ͤ�񤭽�"
+"��\n"
+"                                (ɸ��ϥץ�åȥե�����ˤ�� big �� "
+"little)\n"
 
 #: src/msgfmt.c:772
 #, 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:781
 #, c-format
@@ -1894,7 +2076,8 @@ msgstr "�ɥᥤ��̾ \"%s\" �ϥե�����̾�Ȥ���Ŭ�ڤǤϤ���ޤ���"
 #: src/msgfmt.c:941
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "�ɥᥤ��̾ \"%s\" �ϥե�����̾�Ȥ���Ŭ�ڤǤϤ���ޤ���. ��Ƭ����Ȥ��ޤ�"
+msgstr ""
+"�ɥᥤ��̾ \"%s\" �ϥե�����̾�Ȥ���Ŭ�ڤǤϤ���ޤ���. ��Ƭ����Ȥ��ޤ�"
 
 #: src/msgfmt.c:955
 #, c-format
@@ -1930,8 +2113,12 @@ msgstr "\"%s\" ���ɤ߹�����˥��顼��ȯ�����ޤ���"
 
 #: 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 "���ץ���� '%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:516
 #, c-format, no-wrap
@@ -2019,7 +2206,8 @@ msgstr ""
 
 #: 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"
 "                              ��ĥʸ����ޤ�ʤ�\n"
@@ -2074,7 +2262,8 @@ 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"
@@ -2091,7 +2280,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 ""
-"���ϥե����뤬���ꤵ��ʤ����, ���ϥե������ --locale ���ץ���󤫥桼����\n"
+"���ϥե����뤬���ꤵ��ʤ����, ���ϥե������ --locale ���ץ���󤫥桼��"
+"��\n"
 "������������˰�¸���ޤ�. �⤷ - �ʤ�з�̤�ɸ����Ϥ˽��Ϥ���ޤ�.\n"
 
 #: src/msginit.c:400
@@ -2101,7 +2291,8 @@ 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
@@ -2134,13 +2325,16 @@ 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.
@@ -2163,18 +2357,24 @@ 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
@@ -2195,13 +2395,16 @@ 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
@@ -2213,7 +2416,8 @@ msgid ""
 msgstr ""
 "�ե����� %s �� %s ���󥳡��ǥ��󥰤��� %s ���󥳡��ǥ��󥰤ؤ��Ѵ���\n"
 "�����Ĥ��� msgid �� msgctxt ���ѹ����ޤ�.\n"
-"���Ƥ� msgid �� msgctxt ����� ASCII ���Ѵ����뤫, ����餬�ǽ餫��, �Ĥޤ�\n"
+"���Ƥ� msgid �� msgctxt ����� ASCII ���Ѵ����뤫, ����餬�ǽ餫��, �Ĥ�"
+"��\n"
 "�����������ɥե���������, UTF-8 �ǥ��󥳡��ɤ���Ƥ��뤳�Ȥ��ݾڤ��뤫\n"
 "�ɤ��餫�Ǥ�.\n"
 
@@ -2277,7 +2481,8 @@ 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"
@@ -2288,7 +2493,9 @@ 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
@@ -2334,12 +2541,17 @@ 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
@@ -2352,7 +2564,8 @@ 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
@@ -2375,7 +2588,8 @@ msgstr "msgstr �ˤϥ����ܡ��ɥ�������졼���ε��� '%c' ������ޤ���"
 #: 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:801
 #, c-format
@@ -2395,7 +2609,9 @@ 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"
@@ -2404,19 +2620,31 @@ msgstr "���ϥե������ʸ�����åȤ���ꤹ��إå����ܤ�����ޤ���"
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
 #: src/x-python.c:665 src/xgettext.c:708
 #, 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: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:383 src/msgmerge.c:389
 #, c-format
@@ -2500,24 +2728,28 @@ msgstr "      --suffix=SUFFIX         �̾�ΥХå����å�����������\n"
 #: 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 ""
-"�С�������������ˡ�� --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: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"
@@ -2525,8 +2757,10 @@ msgstr ""
 
 #: src/msgmerge.c:552
 #, 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:609 src/urlget.c:192
 #, c-format
@@ -2545,8 +2779,12 @@ msgstr "���Υ�å�������ʣ������������٤��ǤϤ���ޤ���"
 
 #: 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:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2571,8 +2809,12 @@ 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
@@ -2581,13 +2823,19 @@ 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
@@ -2602,10 +2850,12 @@ 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
@@ -2632,7 +2882,9 @@ msgstr "Tcl �⡼�ɤˤ��������ϥե�����ξ��:\n"
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
-msgstr "-l �� -d ���ץ�����ɬ��. .msg �ե�����ϻ��ꤵ�줿�ǥ��쥯�ȥ���֤���ޤ�.\n"
+msgstr ""
+"-l �� -d ���ץ�����ɬ��. .msg �ե�����ϻ��ꤵ�줿�ǥ��쥯�ȥ���֤����"
+"��.\n"
 
 #: src/msgunfmt.c:511
 #, c-format
@@ -2672,8 +2924,11 @@ msgstr "  -d, --repeated              ��ʣ���Ƥ����ΤΤߤ�ɽ��\n"
 
 #: 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
@@ -2902,7 +3157,9 @@ 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
@@ -2954,24 +3211,46 @@ 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
@@ -3005,7 +3284,8 @@ msgstr "������ Java ���饹̾�ǤϤ���ޤ���: %s"
 #: src/write-java.c:1165
 #, 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:1168
 #, c-format
@@ -3019,8 +3299,11 @@ msgstr "\"%s\" �˽񤭹��⤦�Ȥ��ƥ��顼��ȯ�����ޤ���"
 
 #: src/write-po.c:803
 #, 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:1254 src/write-po.c:1383
 #, c-format
@@ -3060,11 +3343,13 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"��å��������������ˤ� ISO-8859-1 �ʳ���ʸ����ޤ� msgctxt ʸ���󤬤���ޤ���\n"
+"��å��������������ˤ� ISO-8859-1 �ʳ���ʸ����ޤ� msgctxt ʸ���󤬤���ޤ�"
+"��\n"
 "Qt ��å�����������������������ʸ����ǤΤ� Unicode �������, ����ʸ����\n"
 "�Ǥϼ������Ƥ��ޤ���.\n"
 
@@ -3075,7 +3360,8 @@ 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
@@ -3332,7 +3618,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 ""
-"--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
@@ -3343,7 +3630,8 @@ 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
@@ -3354,7 +3642,8 @@ 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
@@ -3365,7 +3654,8 @@ 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
@@ -3376,7 +3666,8 @@ 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
@@ -3387,7 +3678,8 @@ 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
@@ -3412,8 +3704,12 @@ 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:558
 #, c-format
@@ -3442,8 +3738,11 @@ msgstr "Ϳ����줿���ϥե����뤫��������ǽ��ʸ�������Ф��ޤ�.\n"
 
 #: 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 ����� (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:861
 #, c-format
@@ -3452,7 +3751,8 @@ msgstr "  -o, --output=FILE           ���ꤵ�줿�ե�����˽���\n"
 
 #: 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        �ǥ��쥯�ȥ� DIR �˥ե���������\n"
 
 #: src/xgettext.c:868
@@ -3464,16 +3764,20 @@ 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)\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)\n"
 
@@ -3484,7 +3788,9 @@ msgstr "  -C, --c++                   --language=C++ ��û�̷�\n"
 
 #: 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:884
@@ -3516,7 +3822,8 @@ 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"
@@ -3538,12 +3845,14 @@ 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"
 
@@ -3559,22 +3868,26 @@ msgstr ""
 #: 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    ������� WORD �ΰ����ο� ARG �����ʸ������Ф���\n"
+"      --flag=WORD:ARG:FLAG    ������� WORD �ΰ����ο� ARG �����ʸ�������"
+"����\n"
 "                              �ղåե饰\n"
 
 #: 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 ""
 "                                (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"
 
@@ -3610,7 +3923,8 @@ msgstr "      --boost                 Boost ������ʸ�����ǧ��\n"
 
 #: 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:968
@@ -3625,8 +3939,11 @@ msgstr "      --copyright-holder=STRING  �����ͭ�Ԥ���Ϥ�����\n"
 
 #: src/xgettext.c:985
 #, 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:987
 #, c-format
@@ -3640,31 +3957,40 @@ msgstr "      --package-version=VERSION  �ѥå������С���������Ϥ�����\n"
 
 #: src/xgettext.c:991
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr "      --msgid-bugs-address=EMAIL@ADDRESS  msgid �ΥХ�����ѥ��ɥ쥹������\n"
+msgid ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
+msgstr ""
+"      --msgid-bugs-address=EMAIL@ADDRESS  msgid �ΥХ�����ѥ��ɥ쥹������\n"
 
 #: 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]  msgstr ���ܤ���Ƭ���� STRING �� \"\"\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  msgstr ���ܤ���Ƭ���� STRING �� "
+"\"\"\n"
 "                                �����\n"
 
 #: 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]  msgstr ���ܤ��������� STRING �� \"\"\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  msgstr ���ܤ��������� STRING �� "
+"\"\"\n"
 "                                �����\n"
 
 #: src/xgettext.c:1817
 #, 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:1916
 msgid "standard input"
@@ -3692,13 +4018,21 @@ msgstr "%s%s: �ٹ�: "
 
 #: src/xgettext.c:2138
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "�ե����ޥå�ʸ����ΰ��֤ǻȤ��Ƥ��ޤ���, %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:2139
 #, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "���Τ褦���������Ƥ��ޤ���, '%s' �������� %s ������ʸ����ǤϤ���ޤ���. ��ͳ: %s\n"
+msgid ""
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
+msgstr ""
+"���Τ褦���������Ƥ��ޤ���, '%s' �������� %s ������ʸ����ǤϤ���ޤ���. ��"
+"ͳ: %s\n"
 
 #: src/xgettext.c:2170
 #, c-format
@@ -3751,7 +4085,8 @@ 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:3267
diff --git a/gettext-tools/po/ko.po b/gettext-tools/po/ko.po
index dae53d7..e107c23 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.18.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2013-03-12 03:39+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
@@ -57,32 +57,32 @@ msgstr "임시 디렉터리 %s을(를) 지울 수 없습니다"
 msgid "write error"
 msgstr "쓰기 오류"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "%s에 대한 권한 보존"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:194
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "읽으려고 %s 파일을 여는 동안 오류 발생"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "%s 백업 파일을 위해 열지 못했습니다"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, c-format
 msgid "error reading %s"
 msgstr "%s 파일을 읽는 동안 오류 발생"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, c-format
 msgid "error writing %s"
 msgstr "%s 파일을 쓰는 동안 오류 발생"
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, c-format
 msgid "error after reading %s"
 msgstr "%s 파일을 읽은 후에 오류 발생"
@@ -199,12 +199,14 @@ 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
@@ -214,7 +216,7 @@ msgstr "%s 하위 프로세스 입출력 오류"
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "메모리가 바닥났습니다"
@@ -279,7 +281,7 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr "%s에 대한 권한 설정"
@@ -313,27 +315,29 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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\"을(를) 여는 동안 오류 발생"
 
-#: src/format.c:148
+#: 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-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
-#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: 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
@@ -342,9 +346,10 @@ 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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "'%s'과(와) '%s'에 쓰인 인자 %u에 대한 서식 지정이 같지 않습니다"
@@ -356,8 +361,12 @@ 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
@@ -370,7 +379,8 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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 "'%s'과(와) '%s'에 쓰인 서식 지정자의 개수가 일치하지 않습니다"
@@ -386,12 +396,15 @@ 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
@@ -400,8 +413,11 @@ 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
@@ -420,12 +436,16 @@ msgstr "지시자 %u번에서, '%c' 앞에는 유효숫자가 올 수 없습니�
 
 #: src/format-gcc-internal.c:334
 #, c-format
-msgid "In the directive number %u, the argument number for the precision must be equal to %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
 msgstr "지시자 %u번에서, 유효숫자에 대해 인자 개수가 %u와(과) 같아야 합니다."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
 msgstr "지시자 %u번에서, '%c' 앞에는 유효숫자를 지정할 수 없습니다."
 
 #: src/format-gcc-internal.c:406
@@ -463,32 +483,45 @@ msgid "The string ends in the middle of a directive."
 msgstr "지시자 중간에서 문자열이 끝납니다."
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
-msgstr "문자열이 인자의 절대 번호를 통한 방법과 이름없이 지정하는 방법 두 가지로 인자를 참조합니다."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
+msgstr ""
+"문자열이 인자의 절대 번호를 통한 방법과 이름없이 지정하는 방법 두 가지로 인자"
+"를 참조합니다."
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "지시자 %u번에서, 인자 번호 0이 1 이상의 정수가 아닙니다."
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
 msgstr "지시자 %u번에서, 너비의 인자 번호 0이 1 이상의 정수가 아닙니다."
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
 msgstr "지시자 %u번에서, 정밀도의 인자 번호 0이 1 이상의 정수가 아닙니다."
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
 msgstr "지시자 %u번에서, '%c' 문자는 올바른 변환 지정자가 아닙니다."
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
 msgstr "지시자 %u번을 끝마치는 문자가 올바른 변환 지정자가 아닙니다."
 
 #: src/format-invalid.h:40
@@ -498,8 +531,11 @@ msgstr "문자열에서 호환되지 않는 방법으로 인자 번호 %u을(를
 
 #: src/format-java.c:240
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid date/time style."
-msgstr "지시자 %u번에서, 서브문자열 \"%s\"은(는) 올바른 날짜/시각 스타일이 아닙니다."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid date/time "
+"style."
+msgstr ""
+"지시자 %u번에서, 서브문자열 \"%s\"은(는) 올바른 날짜/시각 스타일이 아닙니다."
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
@@ -508,13 +544,19 @@ 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
@@ -523,12 +565,17 @@ msgstr "지시자 %u번에서, 선택 지정에 숫자가 들어 있지 않습�
 
 #: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "지시자 %u번에서, 선택 지정에 숫자 다음에 '<', '#', 혹은 '%s'이(가) 오지 않습니다."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"지시자 %u번에서, 선택 지정에 숫자 다음에 '<', '#', 혹은 '%s'이(가) 오지 않습"
+"니다."
 
 #: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "'%2$s' 안에 있는, 인자 {%1$u}에 대한 서식 지정이 '%3$s'에 없습니다"
 
 #: src/format-java.c:756
@@ -538,20 +585,30 @@ 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
@@ -581,8 +638,12 @@ 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
@@ -606,17 +667,25 @@ 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-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-sh.c:308
 #, 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 "문자열이 인자 이름을 통한 방법과 이름없이 지정하는 방법 두 가지로 인자를 참조합니다."
+msgid ""
+"The string refers to arguments both through argument names and through "
+"unnamed argument specifications."
+msgstr ""
+"문자열이 인자 이름을 통한 방법과 이름없이 지정하는 방법 두 가지로 인자를 참조"
+"합니다."
 
 #: src/format-python.c:354
 #, c-format
@@ -626,39 +695,79 @@ 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:136
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "지시자 %u번에서, '%c' 다음에 숫자가 오지 않습니다."
+
+#: src/format-python-brace.c:149
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr "지시자 %u번에서, '{' 다음에 인자 번호가 오지 않습니다."
+
+#: src/format-python-brace.c:164
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "지시자 %u번에서, '%c' 다음에 숫자가 오지 않습니다."
+
+#: src/format-python-brace.c:184
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr "지시자 %u번에서, '%c' 앞에는 유효숫자가 올 수 없습니다."
+
+#: src/format-python-brace.c:210
+#, fuzzy, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr "지시자 %u번에서, 인자 %d이(가) 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"
-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
@@ -667,19 +776,23 @@ 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:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -692,17 +805,17 @@ 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:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -714,11 +827,11 @@ msgstr "브루노 헤이블(Bruno Haible)"
 msgid "too many arguments"
 msgstr "인수가 너무 많음"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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 "더 많은 정보를 보려면 '%s --help' 하십시오.\n"
@@ -746,7 +859,8 @@ 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"
@@ -757,29 +871,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      호스트이름에 대한 주소\n"
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/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:981
+#: 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:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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"
@@ -788,11 +902,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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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"
 
@@ -801,87 +915,90 @@ msgstr "<bug-gnu-gettext@gnu.org>로 문제점을 알려 주십시오.\n"
 msgid "could not get host name"
 msgstr "호스트이름을 알아낼 수 없습니다"
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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:412
+#: 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:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, c-format
 msgid "Input file location:\n"
 msgstr "입력 파일 위치:\n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:428 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:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, 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:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: 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:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr "출력 파일 위치:\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/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:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -892,92 +1009,119 @@ msgstr ""
 "만약 출력 파일이 지정되지 않았거나 \"-\"인 경우, 결과물을 표준 출력으로 \n"
 "출력합니다.\n"
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: 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:438
+#: src/msgattrib.c:445
 #, 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:440
+#: src/msgattrib.c:447
 #, 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:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              'fuzzy'로 표시된 메시지를 지웁니다\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            'fuzzy'로 표시된 메시지를 놔 둡니다\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           없어진 #~ 메시지를 지웁니다\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         없어진 #~ 메시지를 놔 둡니다\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "속성 조작:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             모든 메시지를 'fuzzy'로 만듭니다\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr "      --clear-fuzzy           모든 메시지를 'fuzzy'가 아니도록 만듭니다\n"
+msgstr ""
+"      --clear-fuzzy           모든 메시지를 'fuzzy'가 아니도록 만듭니다\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          모든 메시지를 없는 메시지로 만듭니다\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        모든 메시지를 없는 메시지가 아니도록 만듭니다\n"
+msgstr ""
+"      --clear-obsolete        모든 메시지를 없는 메시지가 아니도록 만듭니다\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, fuzzy, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+"      --previous              이전에 번역한 메시지의 msgid를 놔 둡니다\n"
+
+#: src/msgattrib.c:471
 #, 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:463
+#: src/msgattrib.c:473
 #, 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:465
+#: src/msgattrib.c:475
 #, 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:467
+#: src/msgattrib.c:477
 #, 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:469
+#: src/msgattrib.c:479
 #, 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:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: 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
@@ -985,115 +1129,136 @@ msgstr "      --obsolete              \"--only-obsolete --clear-obsolete\"와 �
 msgid "Input file syntax:\n"
 msgstr "입력 파일 문법:\n"
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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      입력 파일이 자바 .properties 문법입니다\n"
+msgid ""
+"  -P, --properties-input      input file is in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      입력 파일이 자바 .properties 문법입니다\n"
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr "출력 상세:\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/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:929
+#: 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                 색이나 기타 텍스트 속성을 항상 사용합니다\n"
 "      --color=<상황>          색이나 기타 텍스트 속성을 <상황>에 사용합니다\n"
-"                              <상황>은 'always', 'never', 'auto', 혹은 'html'.\n"
+"                              <상황>은 'always', 'never', 'auto', 혹은 "
+"'html'.\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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=<스타일파일>    --color 옵션에 대해 CSS 스타일을 지정합니다\n"
+msgstr ""
+"      --style=<스타일파일>    --color 옵션에 대해 CSS 스타일을 지정합니다\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, 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:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: 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:937
+#: 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                출력에 C 이스케이프를 쓰고 확장 문자를 쓰지 않습니다\n"
+msgid ""
+"  -E, --escape                use C escapes in output, no extended chars\n"
+msgstr ""
+"  -E, --escape                출력에 C 이스케이프를 쓰고 확장 문자를 쓰지 않"
+"습니다\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: 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:939
+#: 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:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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"
+msgstr ""
+"      --no-location           '#: 파일_이름:줄번호' 줄을 쓰지 않습니다\n"
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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 파일을 씁니다\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                엄격하게 유니포럼을 따르는 .po 파일을 씁니다\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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     자바 .properties 파일을 씁니다\n"
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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     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:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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=<숫자>          출력 페이지의 너비를 지정합니다\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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"
@@ -1102,16 +1267,16 @@ msgstr ""
 "      --no-wrap               출력 페이지 폭보다 긴 메시지 라인을 여러 줄로\n"
 "                              자르지 않습니다.\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: 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:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: 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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          파일 위치에 따라 출력을 정렬합니다\n"
@@ -1121,7 +1286,7 @@ msgstr "  -F, --sort-by-file          파일 위치에 따라 출력을 정렬�
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "불가능한 선택 조건을 지정하였습니다 (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "사용법: %s [<옵션>] [<입력파일>]...\n"
@@ -1148,18 +1313,18 @@ msgstr ""
 "나타나는 가장 첫 번째 PO 파일에 들어 있는 모든 PO 파일에서 파일 위치는 그대로\n"
 "유지됩니다.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  입력파일 ...                입력 파일\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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=<파일>     입력 파일의 목록을 <파일>에서 읽습니다\n"
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "입력 파일이 -이면, 표준 입력을 읽습니다.\n"
@@ -1194,8 +1359,11 @@ msgstr ""
 #: 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      입력 파일이 자바 .properties 문법으로 되어 있습니다\n"
+msgid ""
+"  -P, --properties-input      input files are in Java .properties syntax\n"
+msgstr ""
+"  -P, --properties-input      입력 파일이 자바 .properties 문법으로 되어 있습"
+"니다\n"
 
 #: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
 #: src/msgmerge.c:559
@@ -1203,7 +1371,9 @@ msgstr "  -P, --properties-input      입력 파일이 자바 .properties 문법
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
-msgstr "      --stringtable-input     입력 파일이 NeXTstep/GNUstep .strings 문법입니다\n"
+msgstr ""
+"      --stringtable-input     입력 파일이 NeXTstep/GNUstep .strings 문법입니"
+"다\n"
 
 #: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
@@ -1221,7 +1391,8 @@ msgstr ""
 
 #: 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=<목록이름>       헤더에 'Language' 항목을 설정합니다\n"
 
 #. This is a proper name. See the gettext manual, section Names.
@@ -1278,8 +1449,12 @@ msgstr "동작 변경:\n"
 
 #: 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:550
 #, c-format
@@ -1365,10 +1540,12 @@ msgstr ""
 "  ->, --more-than=<크기>         지정한 것보다 많은 메시지만을 출력합니다.\n"
 "                                 이 옵션이 없을 경우에 기본값은 1입니다.\n"
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, 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:306
 #, c-format
@@ -1394,13 +1571,16 @@ msgstr "  -i, --indent                들여쓰기된 출력 형태\n"
 #: src/msgmerge.c:581
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
-msgstr "      --no-location           ''#: 파일_이름:줄번호' 줄을 쓰지 않습니다\n"
+msgstr ""
+"      --no-location           ''#: 파일_이름:줄번호' 줄을 쓰지 않습니다\n"
 
 #: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
 #: src/msgmerge.c:583
 #, c-format
-msgid "      --add-location          preserve '#: filename:line' lines (default)\n"
-msgstr "      --add-location          '#: 파일_이름:줄번호 줄을 만듭니다(기본값)\n"
+msgid ""
+"      --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"      --add-location          '#: 파일_이름:줄번호 줄을 만듭니다(기본값)\n"
 
 #: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
 #: src/msgmerge.c:585
@@ -1408,7 +1588,7 @@ msgstr "      --add-location          '#: 파일_이름:줄번호 줄을 만듭�
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                엄격한 Uniforum 출력 형태로 씁니다\n"
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "입력 파일이 주어지지 않았습니다"
@@ -1520,13 +1700,16 @@ msgstr "<필터>가 'sed'일 때 유용한 <필터-옵션>들:\n"
 
 #: src/msgfilter.c:423
 #, 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: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"
@@ -1534,13 +1717,17 @@ msgstr ""
 
 #: src/msgfilter.c:428
 #, 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:446 src/msggrep.c:595
 #, 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:452 src/msggrep.c:601
 #, c-format
@@ -1549,8 +1736,11 @@ msgstr "      --indent                들여 쓰기된 출력 스타일\n"
 
 #: src/msgfilter.c:454
 #, 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:304
 #, c-format
@@ -1563,7 +1753,7 @@ msgid "invalid endianness: %s"
 msgstr "엔디안이 틀렸습니다: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr "울리히 드레퍼(Ulrich Drepper)"
 
@@ -1623,7 +1813,7 @@ msgstr "사용법: %s [<옵션>] <파일이름>.po ...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "주어진 번역문에서 이진 메시지 목록 파일을 만들어 냅니다.\n"
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1637,20 +1827,28 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  <파일이름>.po ...             입력 파일\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: 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:679
 #, 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: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:683
 #, c-format
@@ -1659,13 +1857,19 @@ msgstr "      --csharp                C# 모드: .NET .dll 파일을 만듭니�
 
 #: src/msgfmt.c:685
 #, 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:687
 #, 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:689
 #, c-format
@@ -1677,7 +1881,7 @@ msgstr "      --qt                    Qt 모드: Qt .qm 파일을 만듭니다\n
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                   엄격한 Uniforum 출력 형태로 씁니다\n"
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "출력 파일이 -이면, 출력은 표준 출력에 씁니다.\n"
@@ -1695,18 +1899,22 @@ msgstr "  -r, --resource=<리소스>     리소스 이름\n"
 #: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
 #: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, 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: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: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 ""
@@ -1721,7 +1929,9 @@ msgstr "C# 모드에서 출력 파일 위치:\n"
 
 #: 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:723
@@ -1729,7 +1939,9 @@ 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:727
 #, c-format
@@ -1748,7 +1960,7 @@ msgid ""
 "specified directory.\n"
 msgstr "-l과 -d 옵션은 꼭 필요합니다. .msg 파일은 지정한 디렉터리에 씁니다.\n"
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "입력 파일 해석:\n"
@@ -1757,10 +1969,12 @@ 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:750
 #, c-format
@@ -1769,8 +1983,11 @@ msgstr "      --check-format          언어에 따라 포맷 문자열을 검�
 
 #: src/msgfmt.c:752
 #, 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:754
 #, c-format
@@ -1783,13 +2000,17 @@ msgstr ""
 
 #: 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: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"
@@ -1802,22 +2023,29 @@ msgstr "  -f, --use-fuzzy             출력에 퍼지 항목을 사용합니다
 
 #: 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: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=<바이트순> 32비트 수를 주어진 바이트 순서로 씁니다\n"
 "                                (big 또는 little, 기본값은 플랫폼에 따라)\n"
 
 #: src/msgfmt.c:772
 #, 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:781
 #, c-format
@@ -1883,19 +2111,23 @@ msgstr "%s: 경고: 소스 파일이 퍼지 번역문을 포함하고 있습니�
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\"을(를) 읽는 동안 오류 발생"
 
 #: 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 "'%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:516
 #, c-format, no-wrap
@@ -1982,8 +2214,10 @@ msgstr ""
 
 #: src/msggrep.c:597
 #, 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:618
 #, c-format
@@ -2036,7 +2270,8 @@ 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"
@@ -2063,8 +2298,10 @@ 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 ""
@@ -2096,8 +2333,10 @@ 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"
@@ -2124,13 +2363,18 @@ 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
@@ -2138,8 +2382,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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "경고: "
@@ -2156,7 +2400,8 @@ 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 ""
@@ -2172,7 +2417,8 @@ 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"
 
@@ -2247,8 +2493,12 @@ 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
@@ -2293,8 +2543,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=정수; 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'"
@@ -2336,25 +2590,16 @@ msgstr "msgstr에 키보드 단축키 '%c'에 대한 표시가 없습니다"
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr에 키보드 단축키 '%c' 표시가 너무 많습니다"
 
-#: 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
+#: 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:816
+#, 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"
@@ -2370,21 +2615,33 @@ 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:623 src/xgettext.c:693
+#: 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:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: 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:383 src/msgmerge.c:389
 #, c-format
@@ -2444,7 +2701,8 @@ 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:526
 #, c-format
@@ -2464,12 +2722,14 @@ msgstr "      --backup=<컨트롤>       def.po의 백업을 만듭니다\n"
 #: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr "      --suffix=<접미어>       일반적인 백업 접미어 대신 <접미어>를 씁니다\n"
+msgstr ""
+"      --suffix=<접미어>       일반적인 백업 접미어 대신 <접미어>를 씁니다\n"
 
 #: 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"
@@ -2480,20 +2740,26 @@ msgstr ""
 "선택할 수 있습니다. 다음의 값을 쓸 수 있습니다:\n"
 "  none, off       백업을 만들지 않습니다 (--backup 옵션이 있을지라도)\n"
 "  nummbered, t    번호를 붙인 백업을 만듭니다\n"
-"  existing, nil   번호를 붙인 백업이 있으면 번호를 붙여서, 그렇지 않으면 간단히\n"
+"  existing, nil   번호를 붙인 백업이 있으면 번호를 붙여서, 그렇지 않으면 간단"
+"히\n"
 "  simple, never   간단한 백업만을 만듭니다\n"
 
 #: 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:552
 #, 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:609 src/urlget.c:192
 #, c-format
@@ -2512,8 +2778,12 @@ msgstr "이 메시지는 복수형을 지정해서는 안 됩니다"
 
 #: 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:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2538,8 +2808,12 @@ 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
@@ -2548,13 +2822,19 @@ 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
@@ -2569,7 +2849,8 @@ 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"
@@ -2641,8 +2922,12 @@ msgstr "  -d, --repeated                 중복된 메시지만을 출력합니�
 
 #: 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
@@ -2779,7 +3064,7 @@ msgstr "문자열 내부에서 행이 끝남"
 msgid "context separator <EOT> within string"
 msgstr "문자열 안에 컨텍스트 구분 <EOT>가 있습니다."
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "이 파일은 도메인 지시자를 포함하고 있지 않을 수도 있습니다"
@@ -2921,24 +3206,44 @@ 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
@@ -2972,7 +3277,9 @@ msgstr "올바른 자바 클래스 이름이 아닙니다: %s"
 #: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr "자바 클래스 컴파일에 실패했습니다. --verbose로 시도해 보거나 $JAVAC 환경변수를 세팅하십시오"
+msgstr ""
+"자바 클래스 컴파일에 실패했습니다. --verbose로 시도해 보거나 $JAVAC 환경변수"
+"를 세팅하십시오"
 
 #: src/write-java.c:1168
 #, c-format
@@ -2986,7 +3293,8 @@ msgstr "쓰려고 \"%s\"을(를) 여는 동안 오류 발생"
 
 #: 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:1254 src/write-po.c:1383
@@ -3019,16 +3327,21 @@ msgstr ""
 msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
-msgstr "메시지 목록에 복수형 번역이 들어 있지만, Qt 메시지 목록은 복수형을 지원하지 않습니다\n"
+msgstr ""
+"메시지 목록에 복수형 번역이 들어 있지만, Qt 메시지 목록은 복수형을 지원하지 "
+"않습니다\n"
 
 #: src/write-qt.c: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
@@ -3037,8 +3350,10 @@ 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
@@ -3078,7 +3393,7 @@ msgstr ""
 "메시지 목록에 복수형 번역이 들어 있지만, \n"
 "Tcl 메시지 목록 형식은 복수형을 지원하지 않습니다\n"
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: 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: 경고: 완결되지 않은 문자열"
@@ -3088,17 +3403,17 @@ msgstr "%s:%d: 경고: 완결되지 않은 문자열"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: 경고: 완결되지 않은 정규식"
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-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:1247
+#: 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:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr "소스 인코딩을 --from-code 옵션으로 지정하십시오."
 
@@ -3138,7 +3453,7 @@ msgstr ""
 "%s:%d: 줄 끝에 불완전한 다중바이트 시퀀스.\n"
 "올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv 실패"
@@ -3152,7 +3467,7 @@ msgstr ""
 "%s:%d: 잘못된 다중바이트 시퀀스.\n"
 "올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: 경고: 잘못된 유니코드 문자"
@@ -3172,12 +3487,22 @@ msgstr "%s:%d: 경고: '}'가 와야 하는 곳에 ')'가 발견되었습니다"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: 경고: ')가 와야 하는 곳에 '}'가 발견되었습니다"
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3191,10 +3516,66 @@ 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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+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
@@ -3226,13 +3607,15 @@ 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:236
+#: 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 "소스 인코딩을 --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:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3240,9 +3623,10 @@ 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:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3250,9 +3634,10 @@ 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:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3260,9 +3645,10 @@ 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:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3270,9 +3656,10 @@ 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:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3280,12 +3667,14 @@ 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:680
+#: 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
@@ -3304,75 +3693,98 @@ 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:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: 경고: 완결되지 않은 문자열 상수"
 
-#: src/xgettext.c:621
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-exeisting은 출력이 표준출력에 쓰여질 때 사용될 수 없습니다"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext는 검색할 키워드 없이는 동작하지 않습니다"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:785
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "경고: '%s' 파일의 확장자 '%s'을(를) 알 수 없습니다; C 형식으로 간주함"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "주어진 입력 파일에서 번역 가능한 문자열을 뽑아냅니다.\n"
 
-#: src/xgettext.c:844
+#: 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=<이름>    출력에(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:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=<파일>            지정된 파일에 출력합니다\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, 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:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "입력 파일의 언어 선택:\n"
 
-#: src/xgettext.c:855
-#, c-format
+#: 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"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 "  -L, --language=<이름>          지정한 언어로 인식하도록 합니다\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (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:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++를 짧게 쓴 것입니다\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, 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:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3381,28 +3793,30 @@ msgstr ""
 "      --from-code=<이름>      입력 파일의 인코딩\n"
 "                                (Python, Tcl, Glade 제외)\n"
 
-#: src/xgettext.c:871
+#: 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:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing            현존하는 파일과 메시지를 합칩니다\n"
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, 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:880
+#: 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 ""
 "  -c<태그>, --add-comments[=<태그>]  키워드 줄 앞에 <태그>로 시작하는 주석\n"
@@ -3410,28 +3824,32 @@ msgstr ""
 "  -c, --add-comments                 키워드 줄 앞에 모든 주석 부분을 출력\n"
 "                                     파일에 씁니다\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Language 관련 옵션:\n"
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all              모든 문자열을 뽑아 냅니다\n"
 
-#: src/xgettext.c:890 src/xgettext.c:897
-#, c-format
+#: src/xgettext.c:906 src/xgettext.c:914
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                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"
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3440,149 +3858,177 @@ msgstr ""
 "  -k<단어>, --keyword=<단어>     <단어>를 추가 키워드로 찾습니다\n"
 "  -k, --keyword                  기본 키워드를 사용하지 않습니다\n"
 
-#: src/xgettext.c:901
+#: 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    키워드 WORD의 인자 번호 ARG안에 있는 문자열의\n"
 "                              추가 플래그\n"
 
-#: src/xgettext.c:904
-#, c-format
+#: src/xgettext.c:922
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                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"
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, 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:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
-msgstr "                                (다음 언어만 지원: C, C++, ObjectiveC)\n"
+msgstr ""
+"                                (다음 언어만 지원: C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt 형식 문자열을 알아냅니다\n"
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: 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:916
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   KDE 4 형식 문자열을 알아냅니다\n"
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost 형식 문자열을 알아냅니다\n"
 
-#: src/xgettext.c:924
+#: 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:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     자바 .properties 파일을 씁니다\n"
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=<문자열> 출력할 저작권 소유자를 지정합니다\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, 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:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=<패키지> 출력에서 패키지 이름을 지정합니다\n"
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=<버전>   출력에서 패키지 버전을 지정합니다\n"
 
-#: src/xgettext.c:972
+#: src/xgettext.c:991
 #, 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:974
+#: 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[<문자열>], --msgstr-prefix[=<문자열>]  msgstr 항목에 <문자열> 혹은 \"\"을 \n"
+"  -m[<문자열>], --msgstr-prefix[=<문자열>]  msgstr 항목에 <문자열> 혹은 "
+"\"\"을 \n"
 "                                            접두어로 사용합니다\n"
 
-#: src/xgettext.c:977
+#: 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[<문자열>], --msgstr-suffix[=<문자열>]  msgstr 항목에 <문자열> 혹은 \"\"을 \n"
+"  -M[<문자열>], --msgstr-suffix[=<문자열>]  msgstr 항목에 <문자열> 혹은 "
+"\"\"을 \n"
 "                                            접미어로 사용합니다\n"
 
-#: src/xgettext.c:1783
+#: 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 "--flag의 인자가 <keyword>:<argnum>:[pass-]<flag> 문법이 아닙니다: %s"
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "표준 입력"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "%s%s에 ASCII가 아닌 문자열이 있습니다."
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "%s%s에 또는 그 앞에 ASCII가 아닌 문자열이 있습니다."
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "%s%s에 시작하는 ASCII가 아닌 문자열이 있습니다."
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: 경고: "
 
-#: src/xgettext.c:2104
+#: 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 "형식 문자열에 위치 지정을 사용했지만, %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:2105
+#: src/xgettext.c:2139
 #, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "선언한 것과는 달리, '%s'은(는) 올바른 %s 형식 문자열이 아닙니다. 이유: %s\n"
+msgid ""
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
+msgstr ""
+"선언한 것과는 달리, '%s'은(는) 올바른 %s 형식 문자열이 아닙니다. 이유: %s\n"
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3595,7 +4041,7 @@ msgstr ""
 "이름이 있는 인자를 이용해 형식 문자열을 사용해 보십시오.\n"
 "아니면 인자에 대해 튜플 대신에 매핑을 사용해 보십시오.\n"
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3605,27 +4051,27 @@ msgstr ""
 "gettext(\"\")는 빈 문자열이 아니라, 메타 정보가 들어 있는 \n"
 "헤더 항목을 리턴합니다.\n"
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "'%.*s' 키워드에 대한 인자 지정이 애매합니다"
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "경고: '%.*s' 키워드에 대해 컨텍스트가 없습니다"
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "경고: '%.*s' 키워드의 복수형 인자에 대해 컨텍스트가 없습니다"
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "단수형과 복수형 사이에 컨텍스트가 다릅니다"
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3637,7 +4083,7 @@ msgstr ""
 "변수를 지정하십시오; 그렇지 않으면 --msgid-bugs-address\n"
 "명령행 옵션을 사용하십시오.\n"
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, c-format
 msgid "language '%s' unknown"
 msgstr "'%s' 언어를 알 수 없습니다"
@@ -3645,3 +4091,9 @@ 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/nb.po b/gettext-tools/po/nb.po
index 2f38610..8ca2cd8 100644
--- a/gettext-tools/po/nb.po
+++ b/gettext-tools/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\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"
@@ -54,32 +54,32 @@ msgstr "kan ikke opprette utfilen �%s�"
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "feil under �pning av �%s� for lesing"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "feil under �pning av �%s� for skriving"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "feil under lesing av �%s�"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "feil under skriving av filen �%s�"
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "feil under lesing av �%s�"
@@ -211,7 +211,7 @@ msgstr ""
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "minnet oppbrukt"
@@ -276,7 +276,7 @@ msgstr ""
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -309,19 +309,19 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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 "feil under �pning av �%s� for lesing"
 
-#: src/format.c:148
+#: 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-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
@@ -330,7 +330,7 @@ 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-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
@@ -339,9 +339,10 @@ 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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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 "format-spesifiseringene for argument %lu er ulike"
@@ -369,7 +370,8 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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 "antallet format-spesifiseringer i �msgid� og �msgstr� stemmer ikke"
@@ -646,7 +648,9 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-sh.c:308
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
@@ -686,6 +690,32 @@ msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
+#: src/format-python-brace.c:136
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr ""
+
+#: src/format-python-brace.c:149
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+
+#: src/format-python-brace.c:164
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
+
+#: src/format-python-brace.c:184
+#, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+
+#: src/format-python-brace.c:210
+#, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr ""
+
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -727,11 +757,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -740,17 +770,17 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: src/xgettext.c:605
 #, 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -762,11 +792,11 @@ msgstr ""
 msgid "too many arguments"
 msgstr "for mange argumenter"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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 "Pr�v �%s --help� for mer informasjon.\n"
@@ -804,29 +834,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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 ""
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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 ""
@@ -835,11 +865,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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1011
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
@@ -849,37 +879,37 @@ msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "trenger n�yaktig to innfiler"
 
-#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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 og %s utelukker hverandre"
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 ""
 
-#: src/msgattrib.c:412
+#: 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 ""
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -888,50 +918,50 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "ingen innfil angitt"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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 ""
 
-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/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 ""
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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 ""
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -940,99 +970,106 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+
+#: src/msgattrib.c:471
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/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
@@ -1040,14 +1077,14 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1055,17 +1092,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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"
@@ -1074,87 +1111,87 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/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:939
+#: 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 ""
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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 ""
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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 ""
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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 ""
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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 ""
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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 ""
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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 ""
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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 ""
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1173,16 +1210,16 @@ msgstr ""
 "  -V, --version            skriv ut programversjon og avslutt\n"
 "  -w, --width=ANTALL       sett sidebredden i utdata\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1192,7 +1229,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "umulig utvalgskriterie angitt (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -1227,18 +1264,18 @@ msgstr ""
 "PO-filen som definerer dem.  Filposisjonene fra alle PO-filene vil\n"
 "bli bevart.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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 ""
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
@@ -1455,7 +1492,7 @@ msgid ""
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1500,7 +1537,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "ingen innfil angitt"
@@ -1646,7 +1683,7 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr ""
 
@@ -1709,7 +1746,7 @@ msgstr ""
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1721,7 +1758,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
@@ -1768,7 +1805,7 @@ msgstr ""
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -1842,7 +1879,7 @@ msgid ""
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
@@ -1983,11 +2020,12 @@ msgstr "%s: advarselL: kildefil har antatte oversettelser"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under lesing av �%s�"
@@ -2195,8 +2233,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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: advarsel: "
@@ -2384,25 +2422,15 @@ msgstr ""
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:785
+#: src/msgl-check.c:801
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "filhodefelt �%s� mangler i filhode"
-
-#: src/msgl-check.c:793
-#, fuzzy, c-format
-msgid "header field '%s' should start at beginning of line\n"
-msgstr "filhodefelt �%s� skulle ha startet ved begynnelsen av linjen"
-
-#: src/msgl-check.c:818
-#, fuzzy
-msgid "some header fields still have the initial default value\n"
+msgid "header field '%s' still has the initial default value\n"
 msgstr "noen filhodefelt har fremdeles sin initielle verdi"
 
-#: src/msgl-check.c:835
+#: src/msgl-check.c:816
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "noen filhodefelt har fremdeles sin initielle verdi"
+msgid "header field '%s' missing in header\n"
+msgstr "filhodefelt �%s� mangler i filhode"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2419,7 +2447,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:623 src/xgettext.c:693
+#: src/x-python.c:665 src/xgettext.c:708
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2435,8 +2463,8 @@ msgid ""
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2831,7 +2859,7 @@ msgstr "slutt-p�-linje inne i streng"
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne filen kan ikke inneholde domene-direktiver"
@@ -3127,7 +3155,7 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: src/x-awk.c:341 src/x-javascript.c:988 src/x-python.c:1128
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
@@ -3137,17 +3165,17 @@ msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: 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: advarsel: uavsluttet tegnkonstant"
 
-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
-#: src/x-csharp.c:224 src/xgettext.c:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3179,7 +3207,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3191,7 +3219,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
@@ -3211,12 +3239,22 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3230,6 +3268,50 @@ msgstr ""
 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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: advarsel: uavsluttet strengliteral"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3265,13 +3347,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:236
+#: 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:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3279,7 +3361,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3287,7 +3369,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3295,7 +3377,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3303,7 +3385,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3311,7 +3393,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3338,51 +3420,56 @@ msgid ""
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: advarsel: uavsluttet strengliteral"
+
+#: src/xgettext.c:636
 #, 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:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext kan ikke arbeide uten � finne n�kkelord"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:785
 #, fuzzy, 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:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "ingen innfil angitt"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:870
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3391,44 +3478,45 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:880
+#: src/xgettext.c:896
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3438,33 +3526,34 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:890 src/xgettext.c:897
+#: 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"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3472,84 +3561,85 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:904
+#: src/xgettext.c:922
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3557,7 +3647,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3565,52 +3655,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "standard inn"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: advarsel: "
 
-#: src/xgettext.c:2104
+#: 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 ""
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3619,34 +3709,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3654,7 +3744,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "spr�ket �%s� er ukjent"
@@ -3663,6 +3753,14 @@ msgstr "spr�ket �%s� er ukjent"
 msgid "<unnamed>"
 msgstr ""
 
+#, fuzzy
+#~ msgid "header field '%s' should start at beginning of line\n"
+#~ msgstr "filhodefelt �%s� skulle ha startet ved begynnelsen av linjen"
+
+#, fuzzy
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr "noen filhodefelt har fremdeles sin initielle verdi"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: ulovlig flagg -- %c\n"
 
diff --git a/gettext-tools/po/nl.po b/gettext-tools/po/nl.po
index 7cd8ffb..cf89ea9 100644
--- a/gettext-tools/po/nl.po
+++ b/gettext-tools/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2009-03-10 12:48+0100\n"
 "Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -58,32 +58,32 @@ msgstr "kan tijdelijke map '%s' niet verwijderen"
 msgid "write error"
 msgstr "schrijffout"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "fout bij openen van '%s' voor lezen"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "kan reservebestand '%s' niet openen voor schrijven"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "fout bij lezen van '%s'"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "fout bij schrijven van '%s'"
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "fout na lezen van '%s'"
@@ -215,7 +215,7 @@ msgstr "I/O-fout in subproces %s"
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "onvoldoende geheugen beschikbaar"
@@ -280,7 +280,7 @@ msgstr "‘"
 msgid "'"
 msgstr "’"
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -313,20 +313,20 @@ msgid "%s subprocess got fatal signal %d"
 msgstr "subproces %s ontving het fatale signaal %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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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 "fout bij openen van '%s' voor lezen"
 
-#: src/format.c:148
+#: src/format.c:151
 #, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "'%s' is geen geldige opmaakreeks voor %s, anders dan 'msgid'.  Reden: %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-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
@@ -335,7 +335,7 @@ msgid ""
 msgstr "opmaakcode voor argument %u, als in '%s', komt niet voor in 'msgid'"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-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
@@ -344,9 +344,10 @@ msgstr "opmaakcode voor argument %u komt niet voor in '%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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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 "opmaakcodes in 'msgid' en '%s' voor argument %u zijn niet hetzelfde"
@@ -378,7 +379,8 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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 "het aantal opmaakcodes in 'msgid' en '%s' is niet gelijk"
@@ -695,7 +697,9 @@ msgstr ""
 "In directiefnummer %u is de groottespecificatie niet-compatibel met de "
 "conversiespecificatie '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: 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 "opmaakcode voor argument '%s' komt niet voor in '%s'"
@@ -744,6 +748,33 @@ msgid ""
 msgstr ""
 "de opmaakcodes in 'msgid' en '%s' voor argument '%s' zijn niet hetzelfde"
 
+#: src/format-python-brace.c:136
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "In directiefnummer %u wordt '%c' niet gevolgd door een cijfer."
+
+#: src/format-python-brace.c:149
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr "In directiefnummer %u wordt '{' niet gevolgd door een argumentnummer."
+
+#: src/format-python-brace.c:164
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "In directiefnummer %u wordt '%c' niet gevolgd door een cijfer."
+
+#: src/format-python-brace.c:184
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+"In directiefnummer %u is geen nauwkeurigheidsaanduiding voor '%c' toegestaan."
+
+#: src/format-python-brace.c:210
+#, fuzzy, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr "In directiefnummer %u is argument %d negatief."
+
 #: src/format-qt.c:152
 #, fuzzy, c-format
 msgid ""
@@ -787,11 +818,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -805,17 +836,17 @@ msgstr ""
 "zie http://gnu.org/licenses/gpl.html voor de volledige tekst.\n"
 "Er is GEEN GARANTIE, voor zover de wet dit toestaat.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: src/xgettext.c:605
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschreven door %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -827,11 +858,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "te veel argumenten"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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 "Typ '%s --help' voor meer informatie.\n"
@@ -869,29 +900,29 @@ msgstr "  -f, --fqdn, --long          lange hostnaam: FQDN plus aliassen\n"
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            IP-adressen behorend bij de hostnaam\n"
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informatieve uitvoer:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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          deze hulptekst tonen en stoppen\n"
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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       programmaversie tonen en stoppen\n"
@@ -900,11 +931,11 @@ msgstr "  -V, --version       programmaversie tonen en stoppen\n"
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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 ""
 "Rapporteer gebreken in het programma aan <bug-gnu-gettext@gnu.org>;\n"
@@ -915,37 +946,37 @@ msgstr ""
 msgid "could not get host name"
 msgstr "kan hostnaam niet verkrijgen"
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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 "hoogstens één invoerbestand is toegestaan"
 
-#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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 en %s sluiten elkaar uit"
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 "Gebruik:  %s [OPTIE...] [INVOERBESTAND]\n"
 
-#: src/msgattrib.c:412
+#: 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 ""
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -955,50 +986,50 @@ msgid ""
 msgstr ""
 "Een verplicht argument bij een lange optie geldt ook voor de korte vorm.\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, c-format
 msgid "Input file location:\n"
 msgstr "Locatie van invoerbestand:\n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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 "  INVOERBESTAND               in te lezen PO-bestand\n"
 
-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/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 ""
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr "Locatie van uitvoerbestand:\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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 ""
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -1007,99 +1038,106 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Berichtenselectie:\n"
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+
+#: src/msgattrib.c:471
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/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
@@ -1107,14 +1145,14 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1122,17 +1160,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr "Uitvoerdetails:\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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"
@@ -1141,103 +1179,103 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/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:939
+#: 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 ""
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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 ""
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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 ""
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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 ""
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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 ""
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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 ""
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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 ""
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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 ""
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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 ""
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1247,7 +1285,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Gebruik:  %s [OPTIE...] [INVOERBESTAND]...\n"
@@ -1266,18 +1304,18 @@ msgid ""
 "to define them.\n"
 msgstr ""
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INVOERBESTAND...            invoerbestanden\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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 ""
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
@@ -1473,7 +1511,7 @@ msgid ""
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1518,7 +1556,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "geen invoerbestand gegeven"
@@ -1666,7 +1704,7 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -1729,7 +1767,7 @@ msgstr "Gebruik:  %s [OPTIE] bestandsnaam.po...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Uit een vertalingenbestand een binaire berichtencatalogus genereren.\n"
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1743,7 +1781,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  bestandsnaam.po...          invoerbestanden\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Werkingsmodus:\n"
@@ -1790,7 +1828,7 @@ msgstr ""
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -1864,7 +1902,7 @@ msgid ""
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
@@ -2001,11 +2039,12 @@ msgstr "%s: waarschuwing: bronbestand bevat vage vertaling"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fout tijdens lezen van '%s'"
@@ -2215,8 +2254,8 @@ msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "doeltekensetnaam '%s' is geen overdraagbare coderingsnaam"
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "waarschuwing: "
@@ -2405,24 +2444,15 @@ msgstr "sneltoetsmarkering '%c' ontbreekt in 'msgstr'"
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "'msgstr' bevat te veel '%c'-sneltoetsmarkeringen"
 
-#: src/msgl-check.c:785
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "kopveld '%s' ontbreekt in PO-kopregels\n"
-
-#: src/msgl-check.c:793
+#: src/msgl-check.c:801
 #, fuzzy, c-format
-msgid "header field '%s' should start at beginning of line\n"
-msgstr "kopveld '%s' moet aan het begin van de regel beginnen\n"
-
-#: src/msgl-check.c:818
-msgid "some header fields still have the initial default value\n"
+msgid "header field '%s' still has the initial default value\n"
 msgstr "sommige kopvelden hebben nog de standaardwaarde\n"
 
-#: src/msgl-check.c:835
+#: src/msgl-check.c:816
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "sommige kopvelden hebben nog de standaardwaarde\n"
+msgid "header field '%s' missing in header\n"
+msgstr "kopveld '%s' ontbreekt in PO-kopregels\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2439,7 +2469,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "invoerbestand bevat geen kopregel met een tekensetspecificatie"
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:623 src/xgettext.c:693
+#: 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 "
@@ -2453,8 +2483,8 @@ msgid ""
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2845,7 +2875,7 @@ msgstr "regeleindeteken IN een tekenreeks"
 msgid "context separator <EOT> within string"
 msgstr "tekstscheidingteken <EOT> IN een tekenreeks"
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "dit bestand mag geen domeindirectieven bevatten"
@@ -3137,7 +3167,7 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: 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: waarschuwing: onafgesloten tekenreeks"
@@ -3147,17 +3177,17 @@ msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: waarschuwing: onafgesloten reguliere expressie"
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: 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: waarschuwing: onafgesloten tekenconstante"
 
-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
 
-#: src/x-csharp.c:224 src/xgettext.c:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3189,7 +3219,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3201,7 +3231,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: waarschuwing: ongeldig Unicode-teken"
@@ -3221,12 +3251,22 @@ msgstr "%s:%d: waarschuwing: ')' gevonden waar '}' werd verwacht"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: waarschuwing: '}' gevonden waar ')' werd verwacht"
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3238,6 +3278,50 @@ msgstr ""
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: waarschuwing: losse U+%04X"
 
+#: 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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3273,13 +3357,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:236
+#: 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:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3287,7 +3371,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3295,7 +3379,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3303,7 +3387,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3311,7 +3395,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3319,7 +3403,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3346,54 +3430,59 @@ msgid ""
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
+
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "'--join-existing' kan niet gebruikt worden wanneer uitvoer naar "
 "standaarduitvoer wordt geschreven"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:770
+#: src/xgettext.c:785
 #, fuzzy, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "waarschuwing: onbekende extensie '%2$s' van bestand '%1$s'; C wordt "
 "aangenomen"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Vertaalbare berichten extraheren uit de gegeven invoerbestanden.\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:870
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3402,44 +3491,45 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:880
+#: src/xgettext.c:896
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3449,33 +3539,34 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:890 src/xgettext.c:897
+#: 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"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3483,84 +3574,85 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:904
+#: src/xgettext.c:922
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3568,7 +3660,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3576,52 +3668,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "standaardinvoer"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: waarschuwing: "
 
-#: src/xgettext.c:2104
+#: 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 ""
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3630,34 +3722,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3665,7 +3757,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "taal '%s' is onbekend"
@@ -3674,6 +3766,13 @@ msgstr "taal '%s' is onbekend"
 msgid "<unnamed>"
 msgstr "<ongenoemd>"
 
+#, fuzzy
+#~ msgid "header field '%s' should start at beginning of line\n"
+#~ msgstr "kopveld '%s' moet aan het begin van de regel beginnen\n"
+
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr "sommige kopvelden hebben nog de standaardwaarde\n"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: ongeldige optie -- %c\n"
 
diff --git a/gettext-tools/po/nn.po b/gettext-tools/po/nn.po
index 87d430a..48b44c1 100644
--- a/gettext-tools/po/nn.po
+++ b/gettext-tools/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\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"
@@ -57,32 +57,32 @@ msgstr "Klarer ikkje fjerna mellombelsmappa «%s»"
 msgid "write error"
 msgstr "Skrivefeil"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "Feil ved opning av fila «%s» for lesing"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "Klarer ikkje opna reservekopien «%s» for skriving"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "Feil ved lesing av «%s»"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "Feil ved skriving til «%s»"
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "Feil etter lesing av «%s»"
@@ -218,7 +218,7 @@ msgstr "Inn/ut-feil i underprosessen %s"
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "Tomt for minne"
@@ -283,7 +283,7 @@ msgstr "'"
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -316,13 +316,13 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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 "Feil ved opning av fila «%s» for lesing"
 
-#: src/format.c:148
+#: src/format.c:151
 #, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
@@ -330,7 +330,7 @@ msgstr ""
 "Å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-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
@@ -341,7 +341,7 @@ msgstr ""
 "«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-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
@@ -350,9 +350,10 @@ 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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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 ""
@@ -387,7 +388,8 @@ msgstr ""
 "%u."
 
 #: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-python.c:515 src/format-qt-plural.c:110
+#: 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 ""
@@ -703,7 +705,9 @@ msgstr ""
 "Storleiksspesifikasjonen i direktivnummer %u er ikkje gyldig med "
 "omgjeringsspesifikasjonen «%c»."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: 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 "Ein formatspesifikasjon for argument «%s» finst ikkje i «%s»"
@@ -749,6 +753,32 @@ msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "format-spesifiseringane for argument %u er ulike"
 
+#: src/format-python-brace.c:136
+#, 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:149
+#, 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:164
+#, 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:184
+#, 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:210
+#, 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 ""
@@ -790,11 +820,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -807,17 +837,17 @@ 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:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: src/xgettext.c:605
 #, 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -829,11 +859,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "For mange argument"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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 "Prøv «%s --help» for meir informasjon.\n"
@@ -871,29 +901,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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 ""
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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 ""
@@ -902,11 +932,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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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 ""
 
@@ -915,37 +945,37 @@ msgstr ""
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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 og %s utelukker kvarandre"
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 ""
 
-#: src/msgattrib.c:412
+#: 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 ""
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -954,50 +984,50 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "inga innfil spesifisert"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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 ""
 
-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/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 ""
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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 ""
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -1006,99 +1036,106 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+
+#: src/msgattrib.c:471
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/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
@@ -1106,14 +1143,14 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1121,17 +1158,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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"
@@ -1140,103 +1177,103 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/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:939
+#: 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 ""
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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 ""
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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 ""
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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 ""
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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 ""
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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 ""
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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 ""
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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 ""
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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 ""
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1246,7 +1283,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -1265,18 +1302,18 @@ msgid ""
 "to define them.\n"
 msgstr ""
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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 ""
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
@@ -1476,7 +1513,7 @@ msgid ""
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1521,7 +1558,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "inga innfil spesifisert"
@@ -1667,7 +1704,7 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr ""
 
@@ -1730,7 +1767,7 @@ msgstr ""
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1742,7 +1779,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
@@ -1789,7 +1826,7 @@ msgstr ""
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -1863,7 +1900,7 @@ msgid ""
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
@@ -1998,11 +2035,12 @@ msgstr "ADVARSEL: kildefila har «fuzzy» oversetjingar"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, fuzzy, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under skriving av fila \"%s\""
@@ -2210,8 +2248,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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr ""
@@ -2397,25 +2435,15 @@ msgstr ""
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:785
+#: src/msgl-check.c:801
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "filhovud-feltet «%s» manglar i filhovud"
-
-#: src/msgl-check.c:793
-#, fuzzy, c-format
-msgid "header field '%s' should start at beginning of line\n"
-msgstr "filhovud-feltet «%s» skulle ha starta på byrjinga av linja"
-
-#: src/msgl-check.c:818
-#, fuzzy
-msgid "some header fields still have the initial default value\n"
+msgid "header field '%s' still has the initial default value\n"
 msgstr "nokre filhovud-felt har framleis sin initielle verdi"
 
-#: src/msgl-check.c:835
+#: src/msgl-check.c:816
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "nokre filhovud-felt har framleis sin initielle verdi"
+msgid "header field '%s' missing in header\n"
+msgstr "filhovud-feltet «%s» manglar i filhovud"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2432,7 +2460,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:623 src/xgettext.c:693
+#: 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 "
@@ -2446,8 +2474,8 @@ msgid ""
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2830,7 +2858,7 @@ msgstr ""
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne fila kan ikkje innehalde domene-nøkkelord"
@@ -3120,7 +3148,7 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: src/x-awk.c:341 src/x-javascript.c:988 src/x-python.c:1128
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "advarsel: denne meldinga er ikkje brukt"
@@ -3130,17 +3158,17 @@ msgstr "advarsel: denne meldinga er ikkje brukt"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr ""
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-c.c: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 ""
 
-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:224 src/xgettext.c:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3172,7 +3200,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3184,7 +3212,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr ""
@@ -3204,12 +3232,22 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3221,6 +3259,50 @@ 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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "advarsel: denne meldinga er ikkje brukt"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3256,13 +3338,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:236
+#: 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:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3270,7 +3352,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3278,7 +3360,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3286,7 +3368,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3294,7 +3376,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3302,7 +3384,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3329,51 +3411,56 @@ msgid ""
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "advarsel: denne meldinga er ikkje brukt"
+
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing kan ikkje brukast når utdata vert skrive til standard ut"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:770
+#: src/xgettext.c:785
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "inga innfil spesifisert"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:870
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3382,44 +3469,45 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:880
+#: src/xgettext.c:896
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3429,33 +3517,34 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:890 src/xgettext.c:897
+#: 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"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3463,84 +3552,85 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:904
+#: src/xgettext.c:922
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3548,7 +3638,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3556,52 +3646,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:2104
+#: 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 ""
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3610,34 +3700,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3645,7 +3735,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, c-format
 msgid "language '%s' unknown"
 msgstr ""
@@ -3654,6 +3744,14 @@ msgstr ""
 msgid "<unnamed>"
 msgstr ""
 
+#, 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 "some header fields still have the initial default value\n"
+#~ msgstr "nokre filhovud-felt har framleis sin initielle verdi"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: Flagget «-- %c» er ulovleg\n"
 
diff --git a/gettext-tools/po/pa.po b/gettext-tools/po/pa.po
index 4b37cb9..f0265db 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: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\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"
@@ -56,32 +56,32 @@ msgstr "ਆਰਜ਼ੀ ਡਾਇਰੈਕਟਰੀ %s ਹਟਾਈ ਨਹੀਂ
 msgid "write error"
 msgstr "ਲਿਖਣ ਗਲਤੀ"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "ਪੜ੍ਹਨ ਵਾਸਤੇ \"%s\" ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "ਲਿਖਣ ਲਈ ਬੈਕਅੱਪ ਫਾਇਲ \"%s\" ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "\"%s\" ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "\"%s\" ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "\"%s\" ਪੜ੍ਹਨ ਦੇ ਬਾਅਦ ਗਲਤੀ"
@@ -213,7 +213,7 @@ msgstr "%s ਸਬ-ਪ੍ਰੋਸੈਸ I/O ਗਲਤੀ"
 
 #: gnulib-lib/obstack.c:413 gnulib-lib/obstack.c:415 gnulib-lib/xmalloc.c:37
 #: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "ਮੈਮੋਰੀ ਖਤਮ ਹੋਈ"
@@ -278,7 +278,7 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -311,19 +311,19 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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\" ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: src/format.c:148
+#: 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-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
@@ -332,7 +332,7 @@ 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-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
@@ -341,9 +341,10 @@ msgstr ""
 
 #: 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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
@@ -371,7 +372,8 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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 ""
@@ -648,7 +650,9 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: 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 ""
@@ -688,6 +692,32 @@ msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
 
+#: src/format-python-brace.c:136
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr ""
+
+#: src/format-python-brace.c:149
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+
+#: src/format-python-brace.c:164
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
+
+#: src/format-python-brace.c:184
+#, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+
+#: src/format-python-brace.c:210
+#, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr ""
+
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -729,11 +759,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -746,17 +776,17 @@ msgstr ""
 "ਇਹ ਮੁਕਤ/ਮੁਫ਼ਤ ਸਾਫਟਵੇਅਰ ਹੈ: ਤੁਸੀਂ ਇਹ ਬਦਲਣ ਅਤੇ ਮੁੜ-ਵੰਡਣ ਲਈ ਮੁਕਤ ਹੋ।\n"
 "ਕੋਈ ਵੀ ਵਾਰੰਟੀ ਨਹੀਂ ਹੈ, ਕਾਨੂੰਨ ਰਾਹੀਂ ਵੱਧ ਵੱਧ ਮਨਜ਼ੂਰੀ ਮੁਤਾਬਕ।\n"
 
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -768,11 +798,11 @@ msgstr "ਬਰੁਨੋ ਹਏਬਲੇ"
 msgid "too many arguments"
 msgstr "ਬਹੁਤ ਸਾਰੇ ਆਰਗੂਮੈਂਟ"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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"
@@ -810,29 +840,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            ਹੋਸਟ-ਨਾਂ ਲਈ ਐਡਰੈਸ\n"
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/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:981
+#: 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:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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"
@@ -841,11 +871,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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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"
 
@@ -854,37 +884,37 @@ msgstr "ਬੱਗ ਬਾਰੇ ਜਾਣਕਾਰੀ <bug-gnu-gettext@gnu.org> �
 msgid "could not get host name"
 msgstr "ਹੋਸਟ ਨਾਂ ਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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 ""
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 [OPTION] [INPUTFILE]\n"
 
-#: src/msgattrib.c:412
+#: 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 ""
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -893,50 +923,50 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, c-format
 msgid "Input file location:\n"
 msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c: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:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/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 ""
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr "ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/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      ਆਉਟਪੁੱਟ ਦਿੱਤੀ ਫਾਇਲ ਵਿੱਚ ਲਿਖੋ\n"
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -945,99 +975,106 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "ਸੁਨੇਹਾ ਚੋਣ:\n"
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr "      --translated            ਕੀਤਾ ਅਨੁਵਾਦ ਰੱਖੋ, ਨਾ-ਅਨੁਵਾਦ ਸੁਨੇਹਿਆਂ ਨੂੰ ਹਟਾਓ\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr "      --untranslated          ਨਾ-ਅਨੁਵਾਦ ਰੱਖੋ, ਕੀਤਾ ਅਨੁਵਾਦ ਸੁਨੇਹੇ ਹਟਾਓ\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              ਅਸਪਸ਼ਟ ('fuzzy') ਨਿਸ਼ਾਨਬੱਧ ਕੀਤੇ ਸੁਨੇਹੇ ਹਟਾਓ\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           ਬਰਤਰਫ਼ #~ ਸੁਨੇਹੇ ਹਟਾਓ\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             ਸਭ ਸੁਨੇਹੇ ਅਸਪਸ਼ਟ ('fuzzy') ਬਣਾਓ\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+
+#: src/msgattrib.c:471
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/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
@@ -1045,14 +1082,14 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਸੰਟੈਕਸ:\n"
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1060,17 +1097,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr "ਆਉਟਪੁੱਟ ਵੇਰਵਾ:\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/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:929
+#: 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"
@@ -1079,103 +1116,103 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/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:939
+#: 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 ""
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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 ""
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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 ""
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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 ""
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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 ""
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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 ""
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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 ""
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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 ""
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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 ""
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1185,7 +1222,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "ਵਰਤੋਂ: %s [OPTION] [INPUTFILE]...\n"
@@ -1204,18 +1241,18 @@ msgid ""
 "to define them.\n"
 msgstr ""
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: 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:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
@@ -1404,7 +1441,7 @@ msgid ""
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1449,7 +1486,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "ਕੋਈ ਇੰਪੁੱਟ ਫਾਇਲ ਨਹੀਂ ਦਿੱਤੀ"
@@ -1595,7 +1632,7 @@ msgid "invalid endianness: %s"
 msgstr "ਗਲਤ ਅੰਤ(endianness): %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr "ਉਲਰਿਚ ਡਰਿੱਪਰ"
 
@@ -1658,7 +1695,7 @@ msgstr "ਵਰਤੋਂ: %s [OPTION] ਫਾਇਲ-ਨਾਂ.po ...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "ਟੈਕਸਟ ਅਨੁਵਾਦ ਵੇਰਵੇ ਤੋਂ ਬਾਈਨਰੀ ਸੁਨੇਹਾ ਕੈਟਾਲਾਗ ਤਿਆਰ ਕਰੋ।\n"
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1670,7 +1707,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             ਇੰਪੁੱਟ ਫਾਇਲ ਨਾਂ\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "ਓਪਰੇਸ਼ਨ ਮੋਡ:\n"
@@ -1717,7 +1754,7 @@ msgstr ""
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -1791,7 +1828,7 @@ msgid ""
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਇੰਟਰਪਰੇਟੇਸ਼ਨ:\n"
@@ -1926,11 +1963,12 @@ msgstr "%s: ਸਾਵਧਾਨ: ਸਰੋਤ ਫਾਇਲ ਵਿੱਚ ਅਸਪ
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
@@ -2147,8 +2185,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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "ਸਾਵਧਾਨ: "
@@ -2340,25 +2378,16 @@ msgstr "msgstr ਵਿੱਚ ਕੀਬੋਰਡ ਐਕਸਰਲੇਟਰ ਮਾ�
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:785
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "ਹੈੱਡਰ ਵਿੱਚ `%s' ਹੈੱਡਰ ਖੇਤਰ ਗੁੰਮ ਹੈ\n"
-
-#: src/msgl-check.c:793
-#, fuzzy, 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
+#: src/msgl-check.c:801
 #, fuzzy, c-format
 msgid "header field '%s' still has the initial default value\n"
 msgstr "ਹੈੱਡਰ ਖੇਤਰ `%s' ਹਾਲੇ ਵੀ ਮੁੱਢਲਾ ਮੁੱਲ ਰੱਖਦਾ ਹੈ\n"
 
+#: src/msgl-check.c:816
+#, 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"
@@ -2374,7 +2403,7 @@ 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:623 src/xgettext.c:693
+#: 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 "
@@ -2388,8 +2417,8 @@ msgid ""
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2761,7 +2790,7 @@ msgstr ""
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr ""
@@ -3049,7 +3078,7 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: 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: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
@@ -3059,17 +3088,17 @@ msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹ�
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr ""
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-c.c: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 ""
 
-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:224 src/xgettext.c:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3101,7 +3130,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv ਫੇਲ੍ਹ"
@@ -3113,7 +3142,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr ""
@@ -3133,12 +3162,22 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3150,6 +3189,50 @@ 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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3185,13 +3268,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:236
+#: 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:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3199,7 +3282,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3207,7 +3290,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3215,7 +3298,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3223,7 +3306,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3231,7 +3314,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3258,50 +3341,55 @@ msgid ""
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
+
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext ਲੱਭਣ ਵਾਲੇ ਸ਼ਬਦ ਤੋਂ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰ ਸਕਦਾ"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:785
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਲੈਗੂਇਜ਼ ਦੀ ਚੋਣ:\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:870
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3310,44 +3398,45 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:880
+#: src/xgettext.c:896
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3357,33 +3446,34 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "ਲੈਗੂਇਜ਼ ਖਾਸ ਚੋਣਾਂ:\n"
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           ਸਭ ਲਾਇਨਾਂ ਕੱਢੋ\n"
 
-#: src/xgettext.c:890 src/xgettext.c:897
+#: 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"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3391,85 +3481,86 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:904
+#: src/xgettext.c:922
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: 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:916
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  ਆਉਟਪੁੱਟ ਵਿੱਚ ਪੈਕੇਜ ਨਾਂ ਦਿਓ\n"
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  ਆਉਟਪੁੱਟ ਵਿੱਚ ਪੈਕੇਜ ਵਰਜਨ ਦਿਓ\n"
 
-#: src/xgettext.c:972
+#: 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"
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3477,7 +3568,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3485,52 +3576,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "ਸਟੈਂਡਰਡ ਇੰਪੁੱਟ"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "%s%s ਉੱਤੇ ਗੈਰ-ASCII ਅੱਖਰ ਹੈ।"
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "%s%s ਉੱਤੇ ਜਾਂ ਤੋਂ ਪਹਿਲਾਂ ਉੱਤੇ ਗੈਰ-ASCII ਟਿੱਪਣੀ ਹੈ।"
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "%s%s ਉੱਤੇ ਗੈਰ-ASCII ਲਾਇਨ"
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: ਸਾਵਧਾਨ: "
 
-#: src/xgettext.c:2104
+#: 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 ""
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3539,7 +3630,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3549,27 +3640,27 @@ msgstr ""
 "gettext(\"\") ਖਾਲੀ ਲਾਈਨ ਮੋੜਨ ਦੀ ਬਜਾਏ\n"
 "ਹੈੱਡਰ ਐਂਟਰੀ ਨਾਲ ਮੇਟਾ ਜਾਣਕਾਰੀ ਮੋੜਦਾ ਹੈ।\n"
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "ਸਾਵਧਾਨ: ਸ਼ਬਦ '%.*s' ਲਈ ਪ੍ਰਸੰਗ (context) ਮੌਜੂਦ ਨਹੀਂ"
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3577,7 +3668,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "ਲੈਗੂਇਜ਼ `%s' ਅਣਜਾਣ"
@@ -3585,3 +3676,10 @@ msgstr "ਲੈਗੂਇਜ਼ `%s' ਅਣਜਾਣ"
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<ਬਿਨ-ਨਾਂ>"
+
+#, fuzzy
+#~ 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 66cf09e..cd8d7dc 100644
--- a/gettext-tools/po/pl.po
+++ b/gettext-tools/po/pl.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: 2013-06-25 17:48+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2013-06-25 17:00+0200\n"
 "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -17,7 +17,8 @@ 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"
 
 #: gnulib-lib/argmatch.c:133
 #, c-format
@@ -199,12 +200,15 @@ 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
@@ -330,8 +334,10 @@ 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
@@ -358,8 +364,12 @@ 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
@@ -369,7 +379,8 @@ 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
@@ -389,12 +400,16 @@ 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
@@ -403,8 +418,12 @@ 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
@@ -419,17 +438,25 @@ msgstr "Błędny 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
@@ -466,33 +493,53 @@ 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
@@ -501,8 +548,11 @@ 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
@@ -511,13 +561,18 @@ 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
@@ -526,13 +581,19 @@ 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
@@ -541,23 +602,35 @@ 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
@@ -587,8 +660,12 @@ 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
@@ -611,8 +688,12 @@ 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ą "
+"conwersji „%c”."
 
 #: src/format-perl-brace.c:199 src/format-python.c:471
 #: src/format-python-brace.c:374 src/format-python-brace.c:387
@@ -622,33 +703,48 @@ 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:136
 #, c-format
@@ -667,8 +763,11 @@ msgstr "W dyrektywie numer %u „%c” nie może być początkiem argumentu geti
 
 #: src/format-python-brace.c:184
 #, 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 byc więcej poziomów "
+"zagłębień."
 
 #: src/format-python-brace.c:210
 #, c-format
@@ -677,20 +776,34 @@ 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."
@@ -698,12 +811,16 @@ 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:344 src/msgcat.c:289 src/msgcmp.c:172
@@ -777,10 +894,12 @@ 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
@@ -869,8 +988,10 @@ msgstr ""
 #: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
 #: src/msguniq.c:341
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Argumenty obowiązkowe dla opcji długich są obowiązkowe także dla krótkich.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Argumenty obowiązkowe dla opcji długich są obowiązkowe także dla krótkich.\n"
 
 #: src/msgattrib.c: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
@@ -890,8 +1011,10 @@ msgstr "  PLIK-WEJŚCIOWY              wczytanie pliku PO\n"
 #: 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=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: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
@@ -924,7 +1047,8 @@ 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:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
@@ -934,14 +1058,16 @@ msgstr "Wybór komunikatów:\n"
 
 #: src/msgattrib.c:445
 #, 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"
 
 #: src/msgattrib.c:447
 #, c-format
-msgid "      --untranslated          keep untranslated, remove translated messages\n"
+msgid ""
+"      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          zachowanie nie przetłumaczonych, usunięcie\n"
 "                                przetłumaczonych\n"
@@ -949,22 +1075,26 @@ msgstr ""
 #: src/msgattrib.c:449
 #, 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:451
 #, 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:453
 #, 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:455
 #, 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:458
 #, c-format
@@ -974,7 +1104,9 @@ msgstr "Manipulowanie atrybutami:\n"
 #: src/msgattrib.c:460
 #, 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:462
 #, c-format
@@ -1009,18 +1141,27 @@ msgstr ""
 
 #: src/msgattrib.c:471
 #, 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:473
 #, 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:475
 #, 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 nie obecnych w PLIKU."
+"po\n"
 
 #: src/msgattrib.c:477
 #, c-format
@@ -1029,8 +1170,10 @@ msgstr "      --fuzzy                 synonim dla --only-fuzzy --clear-fuzzy\n"
 
 #: src/msgattrib.c:479
 #, 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: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
@@ -1043,13 +1186,17 @@ msgstr "Składnia pliku wejściowego:\n"
 #: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
 #: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, 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: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     plik wejściowy ma składnię .string z\n"
 "                                NeXTstep/GNUstep\n"
@@ -1069,12 +1216,15 @@ 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:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
@@ -1082,34 +1232,43 @@ msgstr ""
 #: 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=PLIKSTYLU       podanie pliku reguł CSS dla opcji --color\n"
+msgstr ""
+"      --style=PLIKSTYLU       podanie pliku reguł CSS dla opcji --color\n"
 
 #: src/msgattrib.c:497 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
 #: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
 #: src/xgettext.c:954
 #, 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: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                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: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              zapisanie pliku PO nawet jeśli jest pusty\n"
+msgstr ""
+"      --force-po              zapisanie pliku PO nawet jeśli jest pusty\n"
 
 #: 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                zapisanie pliku .po w stylu z wcięciami\n"
+msgstr ""
+"  -i, --indent                zapisanie pliku .po w stylu z wcięciami\n"
 
 #: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
 #: src/xgettext.c:962
@@ -1120,14 +1279,19 @@ msgstr "      --no-location           nie zapisywanie linii „#: plik:linia”\
 #: 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          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: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                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: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
@@ -1140,15 +1304,18 @@ msgstr "  -p, --properties-output     zapisanie pliku .properties Javy\n"
 #: 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    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: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=LICZBA          ustawienie szerokości strony dla wyjścia\n"
+msgstr ""
+"  -w, --width=LICZBA          ustawienie szerokości strony dla wyjścia\n"
 
 #: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
 #: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
@@ -1158,7 +1325,8 @@ 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:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
@@ -1173,7 +1341,8 @@ msgstr "  -s, --sort-output           generowanie posortowanego wyjścia\n"
 #: src/xgettext.c:979
 #, 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:321 src/msgcomm.c:326
 #, c-format
@@ -1215,7 +1384,8 @@ msgstr "  PLIK-WEJŚCIOWY ...          pliki wejściowe\n"
 #: 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=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:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
 #: src/xgettext.c:854
@@ -1230,7 +1400,8 @@ 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:410
 #, c-format
@@ -1253,8 +1424,11 @@ msgstr ""
 #: 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      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:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
 #: src/msgmerge.c:559
@@ -1282,7 +1456,8 @@ msgstr ""
 
 #: 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=NAZWA_KATALOGU   ustawienie pola „Language” w nagłówku\n"
 
 #. This is a proper name. See the gettext manual, section Names.
@@ -1340,8 +1515,12 @@ msgstr "Modyfikatory operacji:\n"
 
 #: 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          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:550
 #, c-format
@@ -1351,12 +1530,15 @@ 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 nie przetłumaczonych komunikatów\n"
 
 #: src/msgcmp.c:324
 #, c-format
@@ -1432,8 +1614,11 @@ msgstr ""
 
 #: src/msgcomm.c:451 src/xgettext.c:981
 #, 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:306
 #, c-format
@@ -1453,7 +1638,8 @@ msgstr "Domyślnym kodowaniem jest kodowanie dla aktualnej lokalizacji.\n"
 #: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
 #, c-format
 msgid "  -i, --indent                indented output style\n"
-msgstr "  -i, --indent                zapisanie pliku .po w stylu z wcięciami\n"
+msgstr ""
+"  -i, --indent                zapisanie pliku .po w stylu z wcięciami\n"
 
 #: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
 #: src/msgmerge.c:581
@@ -1464,14 +1650,18 @@ msgstr "      --no-location           pominięcie linii „#: plik:linia”\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 "  -n, --add-location          zachowanie linii „#: plik:linia” (domyślne)\n"
+msgid ""
+"      --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"  -n, --add-location          zachowanie linii „#: plik:linia” (domyślne)\n"
 
 #: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
 #: src/msgmerge.c:585
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
-msgstr "      --strict                zapisanie pliku .po ściśle zgodnego z Uniforum\n"
+msgstr ""
+"      --strict                zapisanie pliku .po ściśle zgodnego z "
+"Uniforum\n"
 
 #: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
@@ -1568,7 +1758,8 @@ msgstr "Składnia: %s [OPCJA] FILTR [OPCJA-FILTRA]\n"
 #: src/msgfilter.c:392
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr "Zastosowanie filtru na wszystkich tłumaczeniach z katalogu tłumaczeń.\n"
+msgstr ""
+"Zastosowanie filtru na wszystkich tłumaczeniach z katalogu tłumaczeń.\n"
 
 #: src/msgfilter.c:416
 #, c-format
@@ -1586,27 +1777,35 @@ msgstr "Przydatne OPCJE-FILTRA jeśli FILTREM jest „sed”:\n"
 
 #: src/msgfilter.c:423
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr "  -e, --expresion=SKRYPT      dodanie SKRYPTU do wykonywanych poleceń\n"
+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: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=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: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       nie wypisywanie zawartości wzorca\n"
 
 #: 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             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:452 src/msggrep.c:601
 #, c-format
@@ -1615,8 +1814,10 @@ msgstr "      --indent                zapisanie pliku w stylu z wcięciami\n"
 
 #: src/msgfilter.c:454
 #, c-format
-msgid "      --keep-header           keep header entry unmodified, don't filter it\n"
-msgstr "      --keep-header           zachowanie nagłówka z pominięciem filtra\n"
+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:304
 #, c-format
@@ -1693,7 +1894,8 @@ msgstr "Składnia: %s [OPCJA] nazwa-pliku.po ...\n"
 #: src/msgfmt.c:658
 #, 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:663 src/xgettext.c:841
 #, c-format, no-wrap
@@ -1716,13 +1918,20 @@ msgstr "Tryb działania:\n"
 
 #: src/msgfmt.c:679
 #, 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:681
 #, 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:683
 #, c-format
@@ -1731,28 +1940,38 @@ msgstr "      --csharp                tryb C#: generowanie pliku .dll .NET\n"
 
 #: src/msgfmt.c:685
 #, 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:687
 #, 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:689
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
-msgstr "      --qt                    tryb Qt: generowanie pliku .qm formatu Qt\n"
+msgstr ""
+"      --qt                    tryb Qt: generowanie pliku .qm formatu Qt\n"
 
 #: src/msgfmt.c:696
 #, 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:698 src/xgettext.c:865
 #, 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:701
 #, c-format
@@ -1767,23 +1986,30 @@ msgstr "  -r, --resource=ZASÓB        nazwa zasobu\n"
 #: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
 #: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, 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:707
 #, 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: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 ""
 "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:715
@@ -1793,8 +2019,12 @@ msgstr "Położenie pliku wyjściowego w trybie C#:\n"
 
 #: src/msgfmt.c:721 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:723
 #, c-format
@@ -1802,7 +2032,8 @@ 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:727
@@ -1813,14 +2044,16 @@ msgstr "Położenie pliku wyjściowego w trybie Tcl:\n"
 #: src/msgfmt.c:731 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:733
 #, 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:745 src/xgettext.c:882
 #, c-format
@@ -1831,10 +2064,12 @@ 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:750
 #, c-format
@@ -1845,8 +2080,12 @@ msgstr ""
 
 #: src/msgfmt.c:752
 #, 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:754
 #, c-format
@@ -1859,54 +2098,71 @@ msgstr ""
 
 #: src/msgfmt.c:757
 #, 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: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]  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:762
 #, 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: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=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: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=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:772
 #, 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:781
 #, 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:783 src/msgmerge.c:607 src/msgunfmt.c:533
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
-msgstr "  -v, --verbose               zwiększenie ilości podawanych informacji\n"
+msgstr ""
+"  -v, --verbose               zwiększenie ilości podawanych informacji\n"
 
 #: src/msgfmt.c:897
 #, c-format
@@ -1936,7 +2192,8 @@ msgstr "nazwa domeny \"%s\" nie jest odpowiednią nazwa pliku"
 #: src/msgfmt.c:941
 #, 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:955
 #, c-format
@@ -1972,8 +2229,11 @@ msgstr "błąd w czasie czytania \"%s\""
 
 #: 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 "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:516
 #, c-format, no-wrap
@@ -2061,8 +2321,11 @@ msgstr ""
 
 #: src/msggrep.c:597
 #, 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:618
 #, c-format
@@ -2072,7 +2335,8 @@ msgstr "      --sort-output           generowanie posortowanego wyjścia\n"
 #: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr "      --sort-by-file          sortowanie wyjścia według położenia pliku\n"
+msgstr ""
+"      --sort-by-file          sortowanie wyjścia według położenia pliku\n"
 
 #: src/msginit.c:297
 msgid ""
@@ -2117,10 +2381,12 @@ 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
@@ -2145,8 +2411,11 @@ 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 ""
@@ -2178,12 +2447,15 @@ 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.
@@ -2206,13 +2478,19 @@ 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
@@ -2238,7 +2516,8 @@ 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 ""
@@ -2320,19 +2599,26 @@ 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
@@ -2381,8 +2667,12 @@ 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'"
@@ -2446,24 +2736,37 @@ 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:708
 #, 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:715
 #, 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:383 src/msgmerge.c:389
 #, c-format
@@ -2499,7 +2802,8 @@ msgstr ""
 #: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      tłumaczenia odnoszące się do starych źródeł\n"
+msgstr ""
+"  def.po                      tłumaczenia odnoszące się do starych źródeł\n"
 
 #: src/msgmerge.c:504
 #, c-format
@@ -2542,21 +2846,25 @@ msgstr "      --backup=KONTROLA       utworzenie kopii zapasowej def.po\n"
 #: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr "      --suffix=KOŃCÓWKA       zmiana domyślnej końcówki kopii zapasowej\n"
+msgstr ""
+"      --suffix=KOŃCÓWKA       zmiana domyślnej końcówki kopii zapasowej\n"
 
 #: 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 ""
-"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"
@@ -2564,7 +2872,8 @@ msgstr ""
 #: 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 ""
 "Końcówka nazwy kopii zapasowej to „~”, o ile nie ustawiono przez --suffix\n"
@@ -2572,7 +2881,8 @@ msgstr ""
 
 #: 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              zachowanie poprzednich identyfikatorów\n"
 "                                przetłumaczonych komunikatów\n"
@@ -2594,8 +2904,12 @@ msgstr "ten komunikat nie powinien definiować form mnogich"
 
 #: src/msgmerge.c:2030
 #, 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:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2616,12 +2930,18 @@ 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
@@ -2630,13 +2950,20 @@ 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
@@ -2651,11 +2978,13 @@ 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
@@ -2682,7 +3011,8 @@ 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
@@ -2692,7 +3022,8 @@ 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:330
 #, c-format, no-wrap
@@ -2723,8 +3054,11 @@ msgstr "  -d, --repeated              wypisanie tylko duplikatów\n"
 
 #: src/msguniq.c:365
 #, 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
@@ -3005,24 +3339,45 @@ 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 formy mnogie, 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
@@ -3056,7 +3411,8 @@ msgstr "niepoprawna nazwa klasy Javy: %s"
 #: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr "kompilacja klasy Javy nie udała się, proszę użyć --verbose lub ustawić $JAVAC"
+msgstr ""
+"kompilacja klasy Javy nie udała się, proszę użyć --verbose lub ustawić $JAVAC"
 
 #: src/write-java.c:1168
 #, c-format
@@ -3070,7 +3426,8 @@ msgstr "błąd otwarcia \"%s\" do pisania"
 
 #: 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 "umiędzynaradawiane komunikaty nie powinny zawierać sekwencji „\\%c”"
 
 #: src/write-po.c:1254 src/write-po.c:1383
@@ -3109,7 +3466,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 ""
@@ -3403,7 +3761,8 @@ 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
@@ -3414,7 +3773,8 @@ 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
@@ -3425,7 +3785,8 @@ 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
@@ -3436,7 +3797,8 @@ 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
@@ -3461,8 +3823,12 @@ 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:558
 #, c-format
@@ -3487,12 +3853,16 @@ msgstr "uwaga: typ pliku „%s” z rozszerzeniem „%s” jest nieznany; sprób
 #: src/xgettext.c:836
 #, 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:859
 #, 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:861
 #, c-format
@@ -3501,8 +3871,10 @@ msgstr "  -o, --output=PLIK           zapisanie wyniku do podanego pliku\n"
 
 #: src/xgettext.c:863
 #, 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:868
 #, c-format
@@ -3513,16 +3885,20 @@ 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)\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)\n"
 
@@ -3533,8 +3909,11 @@ msgstr "  -C, --c++                   skrót dla --language=C++\n"
 
 #: src/xgettext.c:879
 #, 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:884
 #, c-format
@@ -3553,7 +3932,8 @@ msgstr "Domyślnie zakłada się, że pliki wejściowe są w ASCII.\n"
 #: src/xgettext.c:892
 #, 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:894
 #, c-format
@@ -3565,14 +3945,19 @@ 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:902
@@ -3589,12 +3974,14 @@ 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"
 
@@ -3610,29 +3997,34 @@ msgstr ""
 #: 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=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: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 ""
 "                                (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:927
 #, 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:929
 #, c-format
@@ -3661,7 +4053,8 @@ msgstr "      --boost                 rozpoznawanie napisów w formacie Boost\n"
 
 #: src/xgettext.c:943
 #, 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"
@@ -3674,11 +4067,13 @@ msgstr "      --properties-output     zapisanie pliku .properties Javy\n"
 #: src/xgettext.c:983
 #, 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: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          pominięcie na wyjściu copyrightu FSF dla\n"
 "                                zewnętrznych projektów\n"
@@ -3695,13 +4090,16 @@ msgstr "      --package-version=WERSJA    podanie na wyjściu WERSJI pakietu\n"
 
 #: src/xgettext.c:991
 #, 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: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[NAPIS], --msgstr-prefix[=NAPIS]    użycie NAPISU lub \"\" jako\n"
@@ -3710,16 +4108,21 @@ msgstr ""
 #: 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[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:1817
 #, 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:1916
 msgid "standard input"
@@ -3747,13 +4150,21 @@ msgstr "%s%s: uwaga: "
 
 #: 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 "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:2139
 #, 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:2170
 #, c-format
@@ -3763,7 +4174,8 @@ 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"
diff --git a/gettext-tools/po/pt.po b/gettext-tools/po/pt.po
index fe9abbb..1903a4f 100644
--- a/gettext-tools/po/pt.po
+++ b/gettext-tools/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.23\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\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"
@@ -53,32 +53,32 @@ msgstr "imposs�vel criar o ficheiro de sa�da \"%s\""
 msgid "write error"
 msgstr ""
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: 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:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "erro durante a abertura de \"%s\" para escrita"
 
-#: gnulib-lib/copy-file.c:201
+#: 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:205
+#: 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:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "erro durante a leitura de \"%s\""
@@ -210,7 +210,7 @@ msgstr ""
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, fuzzy, c-format
 msgid "memory exhausted"
 msgstr "mem�ria exausta"
@@ -275,7 +275,7 @@ msgstr ""
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -308,19 +308,19 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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 "erro durante a abertura de \"%s\" para leitura"
 
-#: src/format.c:148
+#: 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-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
@@ -329,7 +329,7 @@ msgid ""
 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-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
@@ -338,9 +338,10 @@ 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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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"
@@ -368,7 +369,8 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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"
@@ -645,7 +647,9 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: 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"
@@ -685,6 +689,32 @@ 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:136
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr ""
+
+#: src/format-python-brace.c:149
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+
+#: src/format-python-brace.c:164
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
+
+#: src/format-python-brace.c:184
+#, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+
+#: src/format-python-brace.c:210
+#, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr ""
+
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -726,11 +756,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -739,17 +769,17 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: src/xgettext.c:605
 #, 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -761,11 +791,11 @@ msgstr ""
 msgid "too many arguments"
 msgstr "demasiados argumentos"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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 "Tente `%s --help' para mais informa��o\n"
@@ -803,29 +833,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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 ""
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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 ""
@@ -834,11 +864,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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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 ""
 
@@ -847,37 +877,37 @@ msgstr ""
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "s�o necess�rios exactamente 2 ficheiros"
 
-#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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 s�o mutuamente exclusivas"
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 ""
 
-#: src/msgattrib.c:412
+#: 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 ""
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -886,50 +916,50 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "nenhum ficheiro de entrada fornecido"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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 ""
 
-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/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 ""
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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 ""
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -938,99 +968,106 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+
+#: src/msgattrib.c:471
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/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
@@ -1038,14 +1075,14 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1053,17 +1090,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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"
@@ -1072,87 +1109,87 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/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:939
+#: 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 ""
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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 ""
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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 ""
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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 ""
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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 ""
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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 ""
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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 ""
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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 ""
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1174,16 +1211,16 @@ msgstr ""
 "  -V, --version               mostra a informa��o de vers�o e sai\n"
 "  -w, --width=N�MERO          especifica a largura de p�gina na sa�da\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1193,7 +1230,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
@@ -1212,18 +1249,18 @@ msgid ""
 "to define them.\n"
 msgstr ""
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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 ""
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
@@ -1427,7 +1464,7 @@ msgid ""
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1472,7 +1509,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "nenhum ficheiro de entrada fornecido"
@@ -1618,7 +1655,7 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr ""
 
@@ -1678,7 +1715,7 @@ msgstr ""
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1690,7 +1727,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
@@ -1737,7 +1774,7 @@ msgstr ""
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -1811,7 +1848,7 @@ msgid ""
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
@@ -1948,11 +1985,12 @@ msgstr "CUIDADO: o ficheiro fonte cont�m tradu��es aproximadas"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "erro durante a leitura de \"%s\""
@@ -2160,8 +2198,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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr ""
@@ -2349,25 +2387,15 @@ msgstr ""
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:785
+#: src/msgl-check.c:801
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "o campo `%s' falta no cabe�alho"
-
-#: src/msgl-check.c:793
-#, fuzzy, c-format
-msgid "header field '%s' should start at beginning of line\n"
-msgstr "o campo `%s' do cabe�alho deve come�ar no in�cio da linha"
-
-#: src/msgl-check.c:818
-#, fuzzy
-msgid "some header fields still have the initial default value\n"
+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:835
+#: src/msgl-check.c:816
 #, 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"
+msgid "header field '%s' missing in header\n"
+msgstr "o campo `%s' falta no cabe�alho"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2384,7 +2412,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:623 src/xgettext.c:693
+#: 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 "
@@ -2398,8 +2426,8 @@ msgid ""
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2785,7 +2813,7 @@ msgstr "fim-de-linha dentro da cadeia"
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "este ficheiro n�o pode conter directivas de dom�nio"
@@ -3081,7 +3109,7 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: src/x-awk.c:341 src/x-javascript.c:988 src/x-python.c:1128
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
@@ -3091,17 +3119,17 @@ msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:762
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
-#: src/x-csharp.c:224 src/xgettext.c:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
@@ -3133,7 +3161,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
@@ -3145,7 +3173,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
@@ -3165,12 +3193,22 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3182,6 +3220,50 @@ msgstr ""
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
 
+#: 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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3217,13 +3299,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:236
+#: 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:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3231,7 +3313,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3239,7 +3321,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3247,7 +3329,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3255,7 +3337,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3263,7 +3345,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3290,54 +3372,59 @@ msgid ""
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "o ficheiro \"%s\" n�o est� no formato .mo GNU"
+
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing n�o pode ser usada quando a sa�da\n"
 "� escrita no stdout"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:770
+#: src/xgettext.c:785
 #, fuzzy, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr ""
 "cuidado: o tipo do ficheiro `%s' com a extens�o `%s' � desconhecido;\n"
 "ser� tentado C"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "nenhum ficheiro de entrada fornecido"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:870
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3346,44 +3433,45 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:880
+#: src/xgettext.c:896
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3393,33 +3481,34 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:890 src/xgettext.c:897
+#: 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"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3427,84 +3516,85 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:904
+#: src/xgettext.c:922
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3512,7 +3602,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3520,52 +3610,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "entrada standard"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:2104
+#: 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 ""
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3574,34 +3664,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3609,7 +3699,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, c-format
 msgid "language '%s' unknown"
 msgstr ""
@@ -3618,6 +3708,14 @@ msgstr ""
 msgid "<unnamed>"
 msgstr ""
 
+#, fuzzy
+#~ msgid "header field '%s' should start at beginning of line\n"
+#~ msgstr "o campo `%s' do cabe�alho deve come�ar no in�cio da linha"
+
+#, fuzzy
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr "alguns campos do cabe�alho ainda t�m o valor inicial por defeito"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: op��o ilegal -- %c\n"
 
diff --git a/gettext-tools/po/pt_BR.po b/gettext-tools/po/pt_BR.po
index 11d3d57..61ea8cf 100644
--- a/gettext-tools/po/pt_BR.po
+++ b/gettext-tools/po/pt_BR.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.18.3\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-06-25 17:48+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2013-06-25 14:30-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"
@@ -38,7 +39,8 @@ 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
@@ -201,12 +203,14 @@ 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
@@ -323,15 +327,20 @@ 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
@@ -349,7 +358,9 @@ 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
@@ -358,8 +369,13 @@ 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
@@ -369,7 +385,8 @@ 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
@@ -381,7 +398,8 @@ 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
@@ -389,22 +407,33 @@ 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
@@ -423,13 +452,21 @@ msgstr "Na diretiva de número %u, a precisão não é permitida antes \"%c\"."
 
 #: src/format-gcc-internal.c:334
 #, c-format
-msgid "In the directive number %u, the argument number for the precision must be equal to %u."
-msgstr "Na diretiva de número %u, o número do argumento da precisão deve ser igual a %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"Na diretiva de número %u, o número do argumento da precisão deve ser igual a "
+"%u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "Na diretiva de número %u, uma especificação de precisão não é permitida antes de \"%c\"."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"Na diretiva de número %u, uma especificação de precisão não é permitida "
+"antes de \"%c\"."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -466,43 +503,70 @@ 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
@@ -511,13 +575,20 @@ 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
@@ -526,36 +597,59 @@ 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
@@ -585,8 +679,12 @@ 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
@@ -605,48 +703,71 @@ 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: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 "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:136
 #, c-format
@@ -665,8 +786,11 @@ msgstr "Na diretiva número %u, \"%c\" não pode iniciar um argumento getitem."
 
 #: src/format-python-brace.c:184
 #, 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:210
 #, c-format
@@ -675,20 +799,32 @@ 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."
@@ -696,13 +832,19 @@ 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: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
@@ -775,7 +917,8 @@ 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"
@@ -867,8 +1010,10 @@ msgstr ""
 #: 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 "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: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
@@ -888,7 +1033,8 @@ msgstr "  ARQUIVO-ENTRADA             arquivo PO de entrada\n"
 #: 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=DIRETÓRIO   adiciona DIRETÓRIO à lista de arquivos de\n"
 "                              entrada para pesquisar\n"
@@ -897,7 +1043,9 @@ msgstr ""
 #: 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 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: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
@@ -912,7 +1060,8 @@ msgstr "Localização do arquivo de saída:\n"
 #: 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=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: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
@@ -922,7 +1071,8 @@ 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:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
@@ -932,14 +1082,16 @@ msgstr "Seleção de mensagem:\n"
 
 #: src/msgattrib.c:445
 #, 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:447
 #, 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"
@@ -947,12 +1099,14 @@ msgstr ""
 #: src/msgattrib.c:449
 #, 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:451
 #, 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:453
 #, c-format
@@ -982,12 +1136,14 @@ msgstr "      --clear-fuzzy           apaga \"fuzzy\" de todas as mensagens\n"
 #: src/msgattrib.c:464
 #, 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:466
 #, 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:468
 #, c-format
@@ -995,24 +1151,31 @@ 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:471
 #, 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:473
 #, 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: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=ARQUIVO.po\n"
 "                              manipula apenas entradas não listadas no\n"
@@ -1025,8 +1188,10 @@ msgstr "      --fuzzy                 sinônimo de --only-fuzzy --clear-fuzzy\n"
 
 #: src/msgattrib.c:479
 #, 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: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
@@ -1039,7 +1204,8 @@ msgstr "Sintaxe do arquivo de entrada:\n"
 #: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
 #: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, 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"
@@ -1047,7 +1213,9 @@ msgstr ""
 #: 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     arquivo de entrada está em sintaxe de\n"
 "                              .strings de NeXTstep/GNUstep\n"
@@ -1067,11 +1235,15 @@ 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:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
@@ -1080,21 +1252,24 @@ 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: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             não usa escapes de C na saída (padrão)\n"
 
 #: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
 #: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
 #: src/msguniq.c:390 src/xgettext.c:956
 #, 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"
@@ -1110,24 +1285,31 @@ msgstr "      --force-po              escreve um arquivo PO mesmo se vazio\n"
 #: src/xgettext.c:960
 #, 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: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ão escreve linhas \"#: nome-de-arquivo:linha\"\n"
+msgstr ""
+"      --no-location           não escreve linhas \"#: nome-de-arquivo:linha"
+"\"\n"
 
 #: 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          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: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"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                escreve um arquivo .po em conformidade com\n"
 "                              com Uniforum estrito\n"
@@ -1143,8 +1325,11 @@ msgstr "  -p, --properties-output     escreve em arquivo .properties de Java\n"
 #: 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    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: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
@@ -1161,8 +1346,10 @@ 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:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
@@ -1177,7 +1364,8 @@ msgstr "  -s, --sort-output           gera uma saída ordenada\n"
 #: src/xgettext.c:979
 #, 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:321 src/msgcomm.c:326
 #, c-format
@@ -1220,7 +1408,8 @@ msgstr "  ARQUIVO-ENTRADA ...         arquivos de entrada\n"
 #: 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=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:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
 #: src/xgettext.c:854
@@ -1258,7 +1447,8 @@ msgstr ""
 #: 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      arquivos de entrada estão em sintaxe \n"
 "                              .properties do Java\n"
@@ -1289,7 +1479,8 @@ msgstr ""
 
 #: 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=NOME-CATÁLOGO    define o campo \"Language\" na mensagem de \n"
 "                              cabeçalho\n"
@@ -1349,8 +1540,12 @@ msgstr "Modificadores de operação:\n"
 
 #: src/msgcmp.c:241 src/msgmerge.c:548
 #, c-format
-msgid "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
-msgstr "  -m, --multi-domain          aplica ref.pot a 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:550
 #, c-format
@@ -1436,18 +1631,24 @@ 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:451 src/xgettext.c:981
 #, 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:306
 #, 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:330
 #, c-format
@@ -1468,14 +1669,18 @@ msgstr "  -i, --indent                estilo de saída com recuo\n"
 #: src/msgmerge.c:581
 #, 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: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"
+msgid ""
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"      --add-location          preserva as linhas \"#: nome-de-arquivo:linha\"\n"
+"      --add-location          preserva as linhas \"#: nome-de-arquivo:linha"
+"\"\n"
 "                              (padrão)\n"
 
 #: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
@@ -1596,13 +1801,17 @@ msgstr "Lista de OPÇÃO-DE-FILTROs úteis para quando o FILTRO é \"sed\":\n"
 
 #: src/msgfilter.c:423
 #, 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: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=ARQUIVO-SCRIPT\n"
@@ -1611,12 +1820,16 @@ msgstr ""
 
 #: src/msgfilter.c:428
 #, 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: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             não usa escapes de C na saída (padrão)\n"
 
 #: src/msgfilter.c:452 src/msggrep.c:601
@@ -1626,7 +1839,8 @@ msgstr "      --indent                estilo de saída com recuo\n"
 
 #: 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           mantém mensagem de cabeçalho não modificada,\n"
 "                              não a filtra\n"
@@ -1703,7 +1917,9 @@ msgstr "Uso: %s [OPÇÕES] arquivo.po ...\n"
 #: src/msgfmt.c:658
 #, 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:663 src/xgettext.c:841
 #, c-format, no-wrap
@@ -1726,13 +1942,21 @@ msgstr "Modo de operação:\n"
 
 #: src/msgfmt.c:679
 #, 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:681
 #, 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:683
 #, c-format
@@ -1741,13 +1965,19 @@ msgstr "      --csharp                modo C#: gera um arquivo .dll de .NET\n"
 
 #: src/msgfmt.c:685
 #, 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:687
 #, 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:689
 #, c-format
@@ -1777,14 +2007,17 @@ msgstr "  -r, --resource=RECURSO      nome do recurso\n"
 #: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
 #: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, 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: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 DIRETÓRIO                diretório base de hierarquia de diretório de\n"
 "                              classes\n"
@@ -1792,7 +2025,8 @@ msgstr ""
 #: 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 ""
@@ -1807,7 +2041,9 @@ msgstr "Localização do arquivo de saída em modo C#:\n"
 
 #: 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 DIRETÓRIO                diretório base para arquivos .dll dependentes\n"
 "                              da localização\n"
@@ -1829,7 +2065,8 @@ msgstr "Localização do arquivo de saída em modo Tcl:\n"
 #: src/msgfmt.c:731 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:733
 #, c-format
@@ -1849,10 +2086,12 @@ 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:750
 #, c-format
@@ -1863,7 +2102,9 @@ msgstr ""
 
 #: 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 presença e conteúdo da mensagem\n"
 "                              de cabeçalho\n"
@@ -1874,12 +2115,15 @@ 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: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   verifica se o GNU msgfmt se comporta como\n"
 "                              X/Open msgfmt\n"
@@ -1887,7 +2131,8 @@ msgstr ""
 #: 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"
@@ -1901,25 +2146,32 @@ msgstr "  -f, --use-fuzzy             usa entradas aproximadas na saída\n"
 
 #: src/msgfmt.c:767
 #, 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: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=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:772
 #, 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:781
 #, c-format
@@ -1959,7 +2211,9 @@ msgstr "nome do domínio \"%s\" não é válido como nome de arquivo"
 #: src/msgfmt.c:941
 #, 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:955
 #, c-format
@@ -1995,8 +2249,12 @@ msgstr "erro ao ler \"%s\""
 
 #: 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 "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:516
 #, c-format, no-wrap
@@ -2091,7 +2349,8 @@ msgstr ""
 
 #: 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 escapes de C na saída, nenhum caractere\n"
 "                              estendido\n"
@@ -2104,7 +2363,8 @@ msgstr "      --sort-output           gera uma saída ordenada\n"
 #: src/msggrep.c:620
 #, 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 ""
@@ -2151,7 +2411,8 @@ 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"
@@ -2161,7 +2422,9 @@ 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
@@ -2169,8 +2432,10 @@ 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
@@ -2180,8 +2445,11 @@ 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 ""
@@ -2213,8 +2481,10 @@ 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"
@@ -2232,27 +2502,39 @@ 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
@@ -2267,17 +2549,20 @@ 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"
 
@@ -2291,7 +2576,8 @@ 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"
 
@@ -2356,7 +2642,9 @@ 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"
@@ -2367,8 +2655,12 @@ 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
@@ -2415,8 +2707,12 @@ 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'"
@@ -2480,24 +2776,38 @@ 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:708
 #, 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:715
 #, 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:383 src/msgmerge.c:389
 #, c-format
@@ -2547,7 +2857,8 @@ 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:514
@@ -2582,14 +2893,16 @@ msgstr "      --suffix=SUFIXO         sobrescreve o sufixo padrão do backup\n"
 #: 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 ""
-"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"
@@ -2599,7 +2912,8 @@ msgstr ""
 #: 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 ""
 "O sufixo de backup é '~', a menos que seja definido com --suffix ou com a\n"
@@ -2607,8 +2921,11 @@ msgstr ""
 
 #: src/msgmerge.c:552
 #, 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:609 src/urlget.c:192
 #, c-format
@@ -2627,8 +2944,12 @@ msgstr "esta mensagem não deveria definir formas de plural"
 
 #: src/msgmerge.c:2030
 #, 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:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2649,11 +2970,14 @@ 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"
@@ -2661,19 +2985,25 @@ 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
@@ -2688,7 +3018,8 @@ 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"
@@ -2763,7 +3094,9 @@ msgstr "  -d, --repeated              exibe apenas duplicados\n"
 
 #: 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                exibe apenas mensagens únicas, descarta\n"
 "                              duplicatas\n"
@@ -3047,24 +3380,47 @@ 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
@@ -3098,7 +3454,9 @@ msgstr "não é um nome de classe Java válido: %s"
 #: src/write-java.c:1165
 #, 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:1168
 #, c-format
@@ -3112,8 +3470,10 @@ msgstr "erro ao abrir o arquivo \"%s\" para gravação"
 
 #: src/write-po.c:803
 #, 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:1254 src/write-po.c:1383
 #, c-format
@@ -3147,15 +3507,18 @@ msgid ""
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
 "catálogo de mensagens possui traduções em forma de plural,\n"
-"mas o formato de catálogo de mensagens Qt não tem suporte a manipular plural\n"
+"mas o formato de catálogo de mensagens Qt não tem suporte a manipular "
+"plural\n"
 
 #: src/write-qt.c: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"
 
@@ -3204,7 +3567,8 @@ 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:988 src/x-python.c:1128
 #, c-format
@@ -3386,7 +3750,9 @@ msgstr "%s:%d: aviso: RegExp literal terminada muito cedo"
 #: 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
@@ -3508,8 +3874,12 @@ 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:558
 #, c-format
@@ -3519,7 +3889,8 @@ msgstr "%s:%d: aviso: expressão regular literal terminada muito cedo"
 #: src/xgettext.c:636
 #, 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:641
 #, c-format
@@ -3539,17 +3910,23 @@ 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: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 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:861
 #, 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: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        saída de arquivos serão colocados no\n"
 "                              diretório DIR\n"
@@ -3564,17 +3941,23 @@ 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)\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)\n"
 
 #: src/xgettext.c:877
@@ -3584,7 +3967,9 @@ msgstr "  -C, --c++                   abreviação para --language=C++\n"
 
 #: 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 ""
 "Por padrão, a linguagem é adivinhada dependendo da extensão do nome do\n"
 "arquivo de entrada.\n"
@@ -3620,14 +4005,19 @@ 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:902
 #, c-format
@@ -3643,12 +4033,15 @@ 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"
 
@@ -3666,23 +4059,28 @@ msgstr ""
 #: 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=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: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 ""
-"                                (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"
 
@@ -3690,12 +4088,14 @@ msgstr ""
 #: src/xgettext.c:927
 #, 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:929
 #, 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:931
 #, c-format
@@ -3719,7 +4119,8 @@ msgstr "      --boost                 reconhece strings no formato Boost\n"
 
 #: src/xgettext.c:943
 #, 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"
@@ -3727,7 +4128,8 @@ msgstr ""
 #: src/xgettext.c:968
 #, 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:983
 #, c-format
@@ -3739,7 +4141,8 @@ msgstr ""
 
 #: 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          omite direitos autorais da FSF na saída para\n"
 "                              usuários de fora\n"
@@ -3758,7 +4161,8 @@ msgstr ""
 
 #: 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=E-MAIL@ENDEREÇO\n"
 "                              define o endereço para relatar erros de\n"
@@ -3767,27 +4171,35 @@ msgstr ""
 #: 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]\n"
-"                              usa STRING ou \"\" como prefixo para valores de\n"
+"                              usa STRING ou \"\" como prefixo para valores "
+"de\n"
 "                              msgstr\n"
 
 #: 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]\n"
-"                              usa STRING ou \"\" como sufixo para valores de\n"
+"                              usa STRING ou \"\" como sufixo para valores "
+"de\n"
 "                              msgstr\n"
 
 #: src/xgettext.c:1817
 #, 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:1916
 msgid "standard input"
@@ -3815,13 +4227,21 @@ msgstr "%s%s: aviso: "
 
 #: 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 "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:2139
 #, 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:2170
 #, c-format
@@ -3831,7 +4251,8 @@ 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"
@@ -3860,7 +4281,8 @@ msgstr "aviso: faltando contexto para palavra-chave \"%.*s\""
 #: src/xgettext.c:2921
 #, 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:2942
 #, c-format
@@ -3892,7 +4314,8 @@ 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"
@@ -3903,12 +4326,16 @@ 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"
@@ -3922,10 +4349,12 @@ 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"
@@ -3933,15 +4362,18 @@ 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"
 
@@ -3961,32 +4393,43 @@ 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"
 
@@ -3998,17 +4441,21 @@ 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
@@ -4044,12 +4491,16 @@ 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"
@@ -4062,34 +4513,46 @@ 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"
@@ -4097,24 +4560,29 @@ 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 ce0b4e3..ba02001 100644
--- a/gettext-tools/po/ro.po
+++ b/gettext-tools/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.13-pre1\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\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"
@@ -57,32 +57,32 @@ msgstr ""
 msgid "write error"
 msgstr "eroare de scriere"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "eroare �n timpul deschiderii \"%s\" pentru citire"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, 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:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "eroare �n citirea lui \"%s\""
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "eroare �n scrierea lui \"%s\""
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "eroare dup� citirea lui \"%s\""
@@ -222,7 +222,7 @@ msgstr "eroare I/O a subprocesului %s"
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "memorie plin�"
@@ -289,7 +289,7 @@ msgstr ""
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -322,20 +322,20 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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 "eroare �n timpul deschiderii \"%s\" pentru citire"
 
-#: src/format.c:148
+#: 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-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
@@ -346,7 +346,7 @@ msgstr ""
 "'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-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
@@ -355,9 +355,10 @@ 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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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 ""
@@ -392,7 +393,8 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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"
@@ -710,7 +712,9 @@ 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-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-sh.c:308
 #, 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'"
@@ -760,6 +764,33 @@ msgstr ""
 "specifica�iile de formatare din 'msgid' �i '%s' pentru argumentul '%s' nu "
 "sunt la fel"
 
+#: src/format-python-brace.c:136
+#, 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:149
+#, 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-brace.c:164
+#, 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-brace.c:184
+#, 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-brace.c:210
+#, 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-qt.c:152
 #, c-format
 msgid ""
@@ -807,11 +838,11 @@ msgid ""
 msgstr ""
 "Caracterul care termin� directiva num�rul %u nu este un digit �ntre 1 �i 9."
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -820,17 +851,17 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: src/xgettext.c:605
 #, 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -842,11 +873,11 @@ msgstr ""
 msgid "too many arguments"
 msgstr "prea mul�i parametri"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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 "�ncerca�i `%s --help' pentru mai multe informa�ii.\n"
@@ -887,29 +918,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address      adresele pentru numele de host\n"
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Ie�ire(output) informativ�:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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                  afi�eaz� acest ajutor �i iese\n"
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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               afi�eaz� informa�ii despre versiune �i iese\n"
@@ -918,11 +949,11 @@ msgstr "  -V, --version               afi�eaz� informa�ii despre versiune �i ies
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/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:992
+#: 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 "Raporta�i bug-urile la <bug-gnu-gettext@gnu.org>.\n"
 
@@ -931,30 +962,30 @@ msgstr "Raporta�i bug-urile la <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "nu s-a putut afla numele de host"
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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 "cel mult un fi�ier de intrare(input) este permis"
 
-#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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 �i %s se exclud reciproc"
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 "Folosire: %s [OP�IUNE] [FI�IER_INTRARE]\n"
 
-#: src/msgattrib.c:412
+#: src/msgattrib.c:419
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -963,7 +994,7 @@ msgstr ""
 "Filtreaz� mesajele unui catalog de traduceri potrivit atributelor lor,\n"
 "�i manipuleaz� atributele.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -974,23 +1005,23 @@ msgstr ""
 "Parametrii obligatorii la op�iunile lungi sunt obligatorii �i la op�iunile "
 "scurte.\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, c-format
 msgid "Input file location:\n"
 msgstr "Loca�ie fi�ier intrare(input):\n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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 "  FI�IER_INTRARE                   fi�ier de intrare(input) PO\n"
 
-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -998,7 +1029,7 @@ msgstr ""
 "  -D, --directory=DIRECTOR   adaug� DIRECTOR �n lista de c�utare a "
 "fi�ierelor de intrare\n"
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: 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"
@@ -1006,15 +1037,15 @@ msgstr ""
 "Dac� nu este dat nici un fi�ier de intrare sau este -, se va citi "
 "intrarea(input) standard.\n"
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr "Loca�ie fi�ier ie�ire(output):\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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
@@ -1022,7 +1053,7 @@ msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 "  -o, --output-file=FI�IER      scrie output-ul �n fi�ierul specificat\n"
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -1034,12 +1065,12 @@ msgstr ""
 "fi�ier\n"
 "de ie�ire(output) sau dac� acesta este -.\n"
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "Selec�ie mesaje:\n"
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1047,7 +1078,7 @@ msgstr ""
 "      --translated            p�streaz� pe cele traduse, �terge mesajele "
 "netraduse\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1055,59 +1086,68 @@ msgstr ""
 "      --untranslated          p�streaz� pe cele netraduse, �terge mesajele "
 "traduse\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              �terge mesajele marcate 'fuzzy'\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            p�streaz� mesajele marcate 'fuzzy'\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           �terge mesajele �nvechite #~ \n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         p�streaz� mesajele �nvechite #~ \n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Manipulare de atribute:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             seteaz� toate mesajele 'fuzzy'\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           seteaz� toate mesajele non-'fuzzy'\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          seteaz� toate mesajele �nvechite\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        seteaz� toate mesajele non-�nvechite\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, fuzzy, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+"      --translated            p�streaz� pe cele traduse, �terge mesajele "
+"netraduse\n"
+
+#: src/msgattrib.c:471
 #, 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:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1115,7 +1155,7 @@ msgstr ""
 "      --only-file=FI�IER.po     manipuleaz� doar intr�rile listate �n FI�IER."
 "po\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1123,13 +1163,13 @@ msgstr ""
 "      --ignore-file=FI�IER.po   manipuleaz� doar intr�rile nelistate �n "
 "FI�IER.po\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 sinonim pentru --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
@@ -1137,7 +1177,7 @@ msgstr ""
 "      --obsolete              sinonim pentru --only-obsolete --clear-"
 "obsolete\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: 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
@@ -1145,7 +1185,7 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr "Sintax� fi�ier de intrare(input:\n"
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
@@ -1154,7 +1194,7 @@ msgstr ""
 "  -P, --properties-input     fi�ierul de intrare(input) este �n sintax� "
 "Java .properties\n"
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1164,17 +1204,17 @@ msgstr ""
 "      --stringtable-input     fi�ierul de intrare(input) este �n sintax� \n"
 "NeXTstep/GNUstep .strings\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr "Detalii de output:\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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"
@@ -1183,24 +1223,24 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr "  -e, --no-escape             nu folose�te escape-uri C �n output\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: 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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1208,28 +1248,28 @@ msgstr ""
 "  -E, --escape                folose�te escape-uri C �n output, f�r� "
 "caractere extinse\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: 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:939
+#: 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              scrie fi�ierul PO chiar dac� e gol\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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                scrie fi�ierul .po folosind stil indentat\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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           nu scrie liniile '#: filename:line'\n"
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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"
@@ -1237,39 +1277,39 @@ msgstr ""
 "  -n, --add-location          genereaz� liniile '#: filename:"
 "line' (implicit)\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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                scrie strict fi�iere conforme Uniforum\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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     scrie un fi�ier .properties Java\n"
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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     scrie un fi�ier .strings NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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=NUM�R          setare l��ime output pagin�\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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"
@@ -1280,16 +1320,16 @@ msgstr ""
 "                              dec�t l��imea paginii de output,�n c�teva "
 "linii\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           genereaz� output sortat\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: 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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1300,7 +1340,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "criteriu de selec�ie specificat imposibil (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Folosire: %s [OP�IUNE] [FI�IER_INTRARE]...\n"
@@ -1329,12 +1369,12 @@ 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:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  FI�IER_INTRARE ...                  fi�iere de intrare(input)\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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 ""
@@ -1342,7 +1382,7 @@ msgstr ""
 "FI�IER\n"
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
@@ -1574,7 +1614,7 @@ msgstr ""
 "                                 defini�ii, dac� nu este setat implicit este "
 "1\n"
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, fuzzy, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1628,7 +1668,7 @@ msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict                   scrie strict fi�iere conforme Uniforum\n"
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "nu este furnizat nici un fi�ier de intrare"
@@ -1801,7 +1841,7 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr ""
 
@@ -1865,7 +1905,7 @@ msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Genereaz� un catalog binar de mesaje din descriere de traducere textual�\n"
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1879,7 +1919,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  numefi�ier.po ...             fi�iere de intrare(input)\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mod de operare:\n"
@@ -1931,7 +1971,7 @@ msgstr "      --qt                   Mod Qt: genereaz� un fi�ier .qm Qt\n"
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                activeaz� modul strict Uniforum\n"
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -2023,7 +2063,7 @@ msgstr ""
 "directorul\n"
 "specificat\n"
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretare fi�ier de intrarea(input):\n"
@@ -2179,11 +2219,12 @@ msgstr "%s: avertisment: fi�ierul surs� con�ine traduceri aproximative(fuzzy)"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "eroare �n timpul citirii \"%s\""
@@ -2460,8 +2501,8 @@ 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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "avertisment: "
@@ -2677,26 +2718,16 @@ msgstr "msgstr nu are marcaj de accelerator de tastatur� '%c'"
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr are prea multe marcaje de acceleratoare tastatur� '%c'"
 
-#: src/msgl-check.c:785
+#: src/msgl-check.c:801
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "c�mpul header '%s' lipse�te din header\n"
-
-#: src/msgl-check.c:793
-#, fuzzy, c-format
-msgid "header field '%s' should start at beginning of line\n"
-msgstr "c�mpul header `%s' ar trebui s� �nceap� la �nceputul liniei\n"
-
-#: src/msgl-check.c:818
-msgid "some header fields still have the initial default value\n"
+msgid "header field '%s' still has the initial default value\n"
 msgstr ""
 "c�teva c�mpuri de header ar trebui s� aib� valoare implicit� ini�ial�\n"
 
-#: src/msgl-check.c:835
+#: src/msgl-check.c:816
 #, 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"
+msgid "header field '%s' missing in header\n"
+msgstr "c�mpul header '%s' lipse�te din header\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2715,7 +2746,7 @@ msgstr ""
 "caractere"
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:623 src/xgettext.c:693
+#: 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 "
@@ -2733,8 +2764,8 @@ msgstr ""
 "Conversia din \"%s\" �n \"%s\" introduce duplicate: anumite msgid-uri "
 "diferite devin egale."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3179,7 +3210,7 @@ msgstr "sf�r�it de linie �n �ir"
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "acest fi�ier poate s� nu con�in� directive de domeniu"
@@ -3536,7 +3567,7 @@ 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-python.c:1075
+#: 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: avertisment: �ir neterminat"
@@ -3546,17 +3577,17 @@ msgstr "%s:%d: avertisment: �ir neterminat"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: avertisment: expresie regulat� neterminat�"
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: 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: avertisment: constant� caracter neterminat�"
 
-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: avertisment: �ir literal neterminat"
 
-#: src/x-csharp.c:224 src/xgettext.c:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3599,7 +3630,7 @@ msgstr ""
 "�ir non-ASCII la %s%s.\n"
 "V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: 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"
@@ -3613,7 +3644,7 @@ msgstr ""
 "�ir non-ASCII la %s%s.\n"
 "V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: avertisment: caracter Unicode invalid"
@@ -3633,12 +3664,22 @@ msgstr "%s:%d: avertisment: s-a g�sit ')' unde se a�tepta '}'"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: avertisment: s-a g�sit '}' unde se a�tepta ')'"
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3652,6 +3693,63 @@ msgstr ""
 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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: avertisment: �ir literal neterminat"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3688,7 +3786,7 @@ msgstr "%s:%d: interpolare invalid� (\"\\L\") a caracterului pe 8bi�i  \"%c\""
 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:236
+#: src/x-python.c:278
 #, fuzzy
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
@@ -3697,7 +3795,7 @@ msgstr ""
 "�ir non-ASCII la %s%s.\n"
 "V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:324
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3707,7 +3805,7 @@ msgstr ""
 "�ir non-ASCII la %s%s.\n"
 "V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3717,7 +3815,7 @@ msgstr ""
 "�ir non-ASCII la %s%s.\n"
 "V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3727,7 +3825,7 @@ msgstr ""
 "�ir non-ASCII la %s%s.\n"
 "V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3737,7 +3835,7 @@ msgstr ""
 "�ir non-ASCII la %s%s.\n"
 "V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3747,7 +3845,7 @@ msgstr ""
 "�ir non-ASCII la %s%s.\n"
 "V� rug�m specifica�i sursa cod�rii(encoding) prin --from-code.\n"
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3776,30 +3874,35 @@ msgstr ""
 "%s:%lu: avertisment: sintaxa $\"...\" nu se mai folose�te din motive de "
 "securitate; �nlocui�i cu eval_gettext"
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: avertisment: �ir literal neterminat"
+
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing nu poate fi folosit c�nd output-ul este scris la stdout"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, 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:770
+#: src/xgettext.c:785
 #, 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:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Extrage �irurile traductibile din fi�ierele de intrare(input) specificate.\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3808,13 +3911,13 @@ msgstr ""
 "  -d, --default-domain=NUME      folose�te NUME.po pentru output \n"
 "(�n loc de messages.po)\n"
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=FI�IER              scrie output-ul �n fi�ierul specificat\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3823,12 +3926,12 @@ msgstr ""
 "�n \n"
 "directorul DIR\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Alegerea limbajul fi�ierelor de intrare(input):\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:870
 #, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3837,7 +3940,8 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 "  -L, --language=NUME            recunoa�te limbajul specificat\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3846,12 +3950,12 @@ msgstr ""
 "                                JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                      scurt�tur� pentru --language=C++\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3861,7 +3965,7 @@ msgstr ""
 "intrare \n"
 "(input)\n"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3870,25 +3974,25 @@ msgstr ""
 "      --from-code=NUME        codare pentru fi�ierele de intrare(input)\n"
 "                                (except�nd Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, 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:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing            al�tur� mesajele fi�ierului existent\n"
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=FI�IER.po     intr�rile din FI�IER.po nu vor fi "
 "extrase\n"
 
-#: src/xgettext.c:880
+#: src/xgettext.c:896
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3903,29 +4007,30 @@ msgstr ""
 "                                 cuvinte cheie) �n fi�ierul de "
 "ie�ire(output)\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Op�iuni specifice limbajului:\n"
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all              extrage toate �irurile\n"
 
-#: src/xgettext.c:890 src/xgettext.c:897
+#: src/xgettext.c:906 src/xgettext.c:914
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (doar limbajele C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
 "                                Tcl, Perl, PHP, GCC-surs�, Glade)\n"
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3936,7 +4041,7 @@ msgstr ""
 "cuvintelor_cheie\n"
 "                                  implicite)\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3947,19 +4052,20 @@ msgstr ""
 "argumentul\n"
 "                              num�rul ARG al cuv�ntului cheie CUV�NT\n"
 
-#: src/xgettext.c:904
+#: src/xgettext.c:922
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (doar limbajele C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Java, awk,\n"
 "                                YCP, Tcl, Perl, PHP, GCC-surs�)\n"
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
@@ -3967,32 +4073,32 @@ msgstr ""
 "pentru intrare\n"
 "                                     (input)\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (doar limbajele C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    recunoa�te formatul �irurilor Qt\n"
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (doar limbajul C++)\n"
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    recunoa�te formatul �irurilor Qt\n"
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --qt                    recunoa�te formatul �irurilor Qt\n"
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -4000,19 +4106,19 @@ msgstr ""
 "      --debug                    rezultat mai detaliat al recunoa�terii "
 "formatstring\n"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, 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:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=�IR  seteaz� de�in�torul copyright-ului la "
 "ie�ire(output)\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -4020,19 +4126,19 @@ msgstr ""
 "      --foreign-user          omite copyright FSF la ie�ire pentru user "
 "str�in(foreign)\n"
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, 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:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4040,7 +4146,7 @@ msgstr ""
 "      --msgid-bugs-address=EMAIL@ADRES�  seteaz� adresa de reportare a\n"
 "bug-urilor msgid\n"
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -4050,7 +4156,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=�IR]  folose�te �IR sau \"\" ca prefix pentru "
 "intr�rile msgstr\n"
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -4060,7 +4166,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=�IR]  folose�te �IR sau \"\" ca suefix pentru "
 "intr�rile msgstr\n"
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4068,31 +4174,31 @@ msgid ""
 msgstr ""
 "Un argument --flag nu are sintaxa <keyword>:<argnum>:[pass-]<flag> : %s"
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "intrare(input) standard"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: avertisment: "
 
-#: src/xgettext.c:2104
+#: src/xgettext.c:2138
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4101,7 +4207,7 @@ 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:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4110,7 +4216,7 @@ msgstr ""
 "De�i este declarat astfel, %s nu este un format al �irului valid %s: Motiv:\n"
 "%s\n"
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4119,7 +4225,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4129,27 +4235,27 @@ msgstr ""
 "gettext(\"\") returneaz� header-ul cu informa�ii\n"
 "meta, nu cu �irul vid.\n"
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "parametru ambiguu `%s' pentru `%s'"
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "parametru ambiguu `%s' pentru `%s'"
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "parametru ambiguu `%s' pentru `%s'"
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 #, fuzzy
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
@@ -4162,7 +4268,7 @@ msgstr ""
 "aici variabila MSGID_BUGS_ADDRESS; �n caz contrar\n"
 "v� rug�m specifica�i optiunea --msgid-bugs-address �n linia de comand�.\n"
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "limbajul `%s' este necunoscut"
@@ -4171,6 +4277,14 @@ msgstr "limbajul `%s' este necunoscut"
 msgid "<unnamed>"
 msgstr ""
 
+#, fuzzy
+#~ 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 "some header fields still have the initial default value\n"
+#~ msgstr ""
+#~ "c�teva c�mpuri de header ar trebui s� aib� valoare implicit� ini�ial�\n"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: op�iune ilegal� -- %c\n"
 
diff --git a/gettext-tools/po/ru.po b/gettext-tools/po/ru.po
index 4e474f8..a4faa98 100644
--- a/gettext-tools/po/ru.po
+++ b/gettext-tools/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2007-06-14 10:41+0400\n"
 "Last-Translator: Oleg S. Tihonov <ost@tatnipi.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -55,32 +55,32 @@ msgstr "���������� ������� ��������� ������� %s"
 msgid "write error"
 msgstr "������ ������"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "������ �������� ����� \"%s\" ��� ������"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "������ �������� ���������� ����� \"%s\" ��� ������"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "������ ������ \"%s\""
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "������ ������ \"%s\""
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "������ ����� ������ \"%s\""
@@ -215,7 +215,7 @@ msgstr "������ �����/������ � �������� �������� %s"
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "����������� ������ ���������"
@@ -281,7 +281,7 @@ msgstr ""
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -314,13 +314,13 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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\" ��� ������"
 
-#: src/format.c:148
+#: src/format.c:151
 #, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
 "�������: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-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
@@ -337,7 +337,7 @@ msgid ""
 msgstr "� 'msgid' ��� ������������ ������� ��� ��������� '%u' ��� � '%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-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
@@ -346,9 +346,10 @@ 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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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"
@@ -381,7 +382,8 @@ msgstr ""
 "������ ��������� �� �������� ����� %u, �� ���������� �������� ����� %u."
 
 #: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
-#: src/format-python.c:515 src/format-qt-plural.c:110
+#: 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 "�� ��������� ����� ������������ ������� ������ � `msgid' � `%s'"
@@ -678,7 +680,9 @@ msgstr ""
 "� ��������� ����� %u ������������ ������� ����������� �� �������������� "
 "�������������� '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: 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'"
@@ -720,6 +724,32 @@ msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "� 'msgid' � '%s' �� ��������� ������������ ������� ��� ��������� %s"
 
+#: src/format-python-brace.c:136
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "� ��������� ����� %u ����� '%c' �� ����� �����."
+
+#: src/format-python-brace.c:149
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr "� ��������� ����� %u ����� '{' �� ����� ����� ���������."
+
+#: src/format-python-brace.c:164
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "� ��������� ����� %u ����� '%c' �� ����� �����."
+
+#: src/format-python-brace.c:184
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr "� ��������� ����� %u ����� '%c' ������ ��������� ��������."
+
+#: src/format-python-brace.c:210
+#, 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 ""
@@ -767,11 +797,11 @@ msgid ""
 "1 and 9."
 msgstr "����, ����������� ��������� ����� %u �� �������� ������ ����� 1 � 9."
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -780,17 +810,17 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -802,11 +832,11 @@ msgstr "����� ������"
 msgid "too many arguments"
 msgstr "������� ����� ����������"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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"
@@ -847,29 +877,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            ������ ��� ��������� ����� ������\n"
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/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:981
+#: 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:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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"
@@ -878,11 +908,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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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"
 
@@ -891,30 +921,30 @@ msgstr "�� ������� ��������� �� ������ <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "���������� �������� ��� ������"
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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:412
+#: src/msgattrib.c:419
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -923,7 +953,7 @@ msgstr ""
 "��������� ��������� �������� ��������� � ������������ � �� ����������\n"
 "� ������������ ����� ����������.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -933,52 +963,52 @@ msgid ""
 msgstr ""
 "���������, ������������ ��� ������� ������, ����������� � ��� ��������.\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, c-format
 msgid "Input file location:\n"
 msgstr "���������� �������� �����:\n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:428 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:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=�������     �������� ������� � ���� ������ ������� ������\n"
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: 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:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr "���������� ��������� �����:\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/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:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -989,12 +1019,12 @@ msgstr ""
 "���������� ��������� �� ����������� �����, ���� �������� ���� �� �����\n"
 "��� ����� ��� -.\n"
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: 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:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1002,7 +1032,7 @@ msgstr ""
 "      --translated            ��������� ������������, ������� "
 "��������������\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1010,63 +1040,72 @@ msgstr ""
 "      --untranslated          ��������� ��������������, ������� "
 "������������\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 "      --no-fuzzy              ������� ��������� ���������� ��� '��������'\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 "      --only-fuzzy            ��������� ��������� ���������� ��� '��������'\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 "      --no-obsolete           ������� ���������, ���������� ��� '������'\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 "      --only-obsolete         ��������� ���������, ���������� ��� '������'\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "����������� ����������:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             �������� ��� ��������� ��� '��������'\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           ����� ��� ������� '��������'\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          �������� ��� ��������� ��� '������'\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        ����� ��� ������� '������'\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, fuzzy, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+"      --previous              ��������� ���������� msgid ������������ "
+"���������\n"
+
+#: src/msgattrib.c:471
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr "      --clear-previous        ����� ��� ������� '���������� msgid'\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
@@ -1074,7 +1113,7 @@ msgstr ""
 "      --only-file=����.po     ���������� ���������, ������������� � �����."
 "po\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1082,19 +1121,19 @@ msgstr ""
 "      --ignore-file=����.po   ���������� ���������, �� ������������� � �����."
 "po\n"
 
-#: src/msgattrib.c:467
+#: 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:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              ������� ��� --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: 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
@@ -1102,7 +1141,7 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr "��������� �������� �����:\n"
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
@@ -1110,7 +1149,7 @@ msgid ""
 msgstr ""
 "  -P, --properties-input      ������� ���� ����� ��������� Java .properties\n"
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1120,17 +1159,17 @@ msgstr ""
 "      --stringtable-input     ������� ���� ����� ��������� NeXTstep/GNUstep ."
 "strings\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr "����������� ��������� �������:\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/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:929
+#: 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"
@@ -1139,16 +1178,16 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1157,9 +1196,9 @@ msgstr ""
 "                                escape-������������������ ����� C (�� "
 "���������)\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: 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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1167,28 +1206,28 @@ msgstr ""
 "  -E, --escape                ������������ escape-������������������, � ��\n"
 "                                ����������� �����\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: 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:939
+#: 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:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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"
@@ -1196,8 +1235,8 @@ msgstr ""
 "  -n, --add-location          ������������ ������ '#: ����:������' (�� "
 "���������)\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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"
@@ -1206,32 +1245,32 @@ msgstr ""
 "���������\n"
 "                                Uniforum\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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     �������� .properties-���� Java\n"
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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    �������� .strings-���� NeXTstep/GNUstep\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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=�����           ������ ������ �������� ��������\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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"
@@ -1240,16 +1279,16 @@ msgstr ""
 "      --no-wrap               �� ��������� ������� ������, ������� ������\n"
 "                              ������ �������� ��������\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: 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:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: 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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          ����������� ����� �� ������ ������\n"
@@ -1259,7 +1298,7 @@ msgstr "  -F, --sort-by-file          ����������� ����� �� ������ ������\n"
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "����� ������������ �������� ������ (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "�������������: %s [����] [�������-����]...\n"
@@ -1288,19 +1327,19 @@ msgstr ""
 "���� ����������.  �����������, ���������� ��� ����� � ����� ������\n"
 "����������� ��� ���� PO-������.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  �������-����...             ������� �����\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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=����       �������� ������ ������� ������ �� �����\n"
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "���� ������� ���� ����� ��� -, �������� ����������� ����.\n"
@@ -1527,7 +1566,7 @@ msgstr ""
 "���������\n"
 "                              ������ ������)\n"
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, fuzzy, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1577,7 +1616,7 @@ msgstr ""
 "      --strict                �������� � ������� ������������ ��������� "
 "Uniforum\n"
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "�� ����� ������� ����"
@@ -1745,7 +1784,7 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr "������ �������"
 
@@ -1811,7 +1850,7 @@ msgstr "�������������: %s [����] ���-�����.po ...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "������� �������� ������� ��������� �� ���������� �������� ���������.\n"
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1825,7 +1864,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  ���-����.po ...             ������� �����\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "����� ������:\n"
@@ -1879,7 +1918,7 @@ msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                ������ ��������������� ��������� Uniforum\n"
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
@@ -1967,7 +2006,7 @@ msgstr ""
 "����� -l � -d �����������.  �������� .msg-���� ������������ � ��������� "
 "�������.\n"
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "������������� �������� �����:\n"
@@ -2124,11 +2163,12 @@ msgstr "%s: ��������������: �������� ���� �������� �������� ��������"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "������ ������ \"%s\""
@@ -2414,8 +2454,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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "��������������: "
@@ -2644,26 +2684,16 @@ msgstr "� msgstr ��������� ������� ������������� ����������� '%c'"
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "� msgstr ������� ����� ������� ������������ ������������ '%c'"
 
-#: src/msgl-check.c:785
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "� ��������� ��������� ���� `%s'\n"
-
-#: src/msgl-check.c:793
+#: src/msgl-check.c:801
 #, fuzzy, 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"
+msgid "header field '%s' still has the initial default value\n"
 msgstr ""
 "��������� ���� ��������� ��� ��� ����� �������������� ��������� ��������\n"
 
-#: src/msgl-check.c:835
+#: src/msgl-check.c:816
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr ""
-"��������� ���� ��������� ��� ��� ����� �������������� ��������� ��������\n"
+msgid "header field '%s' missing in header\n"
+msgstr "� ��������� ��������� ���� `%s'\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2680,7 +2710,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "������� ���� �� �������� ���� ��������� � ��������� ���������"
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:623 src/xgettext.c:693
+#: 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 "
@@ -2698,8 +2728,8 @@ msgstr ""
 "�������������� �� \"%s\" � \"%s\" ��������� ���������: ��������� "
 "������������� ��������� ��������� ���������� �����������."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3138,7 +3168,7 @@ msgid "context separator <EOT> within string"
 msgstr "����������� ��������� <EOT> ������ ������"
 
 # ��� ��������� ���� �� ������������
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "���� ���� �� ����� ��������� ��������� ������"
@@ -3473,7 +3503,7 @@ msgstr ""
 "��������� ��������� ��� Tcl �� ������������ ��������� ��������������\n"
 "�����\n"
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: 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: ��������������: ������������� ������"
@@ -3483,17 +3513,17 @@ msgstr "%s:%d: ��������������: ������������� ������"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: ��������������: ������������� ���������� ���������"
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-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:1247
+#: 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:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3536,7 +3566,7 @@ msgstr ""
 "%s:%d: �������� ������������� ������������������ � ����� ������.\n"
 "����������, ������� ������� ��������� � ������� ����� --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: ����� iconv ���������� ���������"
@@ -3550,7 +3580,7 @@ msgstr ""
 "%s:%d: �������� ������������� ������������������.\n"
 "����������, ������� ������� ��������� � ������� ����� --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: ��������������: �������� Unicode-����"
@@ -3570,12 +3600,22 @@ msgstr "%s:%d: ��������������: ��������� ')', ��� ��������� '}'"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: ��������������: ��������� '}', ��� ��������� ')'"
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3589,6 +3629,63 @@ msgstr ""
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: ��������������: ������������� ������"
 
+#: src/x-javascript.c:230
+#, fuzzy
+msgid "Please specify the source encoding through --from-code\n"
+msgstr ""
+"��-ASCII-������ � %s%s.\n"
+"����������, ������� ������� ��������� � ������� ����� --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 ""
+"%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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: ��������������: ������������� ������"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3625,7 +3722,7 @@ msgstr "%s:%d: �������� ������������ (\"\\L\") ������������� ����� \"%c\""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: �������� ������������ (\"\\U\") ������������� ����� \"%c\""
 
-#: src/x-python.c:236
+#: src/x-python.c:278
 #, fuzzy
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
@@ -3636,7 +3733,7 @@ msgstr ""
 "�������\n"
 "����������� ��� ������� �� http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3648,7 +3745,7 @@ msgstr ""
 "�������\n"
 "����������� ��� ������� �� http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3660,7 +3757,7 @@ msgstr ""
 "�������\n"
 "����������� ��� ������� �� http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3672,7 +3769,7 @@ msgstr ""
 "�������\n"
 "����������� ��� ������� �� http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3684,7 +3781,7 @@ msgstr ""
 "�������\n"
 "����������� ��� ������� �� http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3696,7 +3793,7 @@ msgstr ""
 "�������\n"
 "����������� ��� ������� �� http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "��������� \"%s\" ����������.  ����������� ������ � ASCII."
@@ -3725,29 +3822,34 @@ msgstr ""
 "%s:%lu: ��������������: ��������� $\"...\" �������� �� ������������ "
 "������������; ����������� eval_gettext"
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: ��������������: ������������� ������"
+
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "���� --join-existing �� ����� ���� ����������� ��� ������ � ����������� �����"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext �� ����� ��������, �� ���� ������� �������� ����"
 
-#: src/xgettext.c:770
+#: 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:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "��������� ����������� ������ �� ��������� ������� ������.\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3755,24 +3857,24 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=���    �������� � ���� ���.po (������ messages.po)\n"
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=����           �������� ����� � ��������� ����\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=���        ��������� �������� ����� � ������� ���\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "����� ����� �������� �����:\n"
 
-#: src/xgettext.c:855
-#, c-format
+#: src/xgettext.c:870
+#, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3780,7 +3882,8 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 "  -L, --language=���          ������������ ��������� ����\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3790,19 +3893,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   ������� --language=C++\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "�� ��������� ���� ������������ �� ���������� �������� �����.\n"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3811,22 +3914,22 @@ msgstr ""
 "      --from-code=���            ��������� ������� ������\n"
 "                                   (����� Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:871
+#: 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:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         ����� ��������� � ������������ ������\n"
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, 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:880
+#: src/xgettext.c:896
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3839,30 +3942,31 @@ msgstr ""
 "                              ����� (��� � �������������, ���������������\n"
 "                              �������� ������)\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "����� ��� ���������� ������:\n"
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           ������� ��� ������\n"
 
-#: src/xgettext.c:890 src/xgettext.c:897
-#, c-format
+#: src/xgettext.c:906 src/xgettext.c:914
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (������ ����� C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3872,7 +3976,7 @@ msgstr ""
 "                              ������� ����� ����������, ��� �� ����� \n"
 "                              ������������ �������� ����� �� ���������)\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3883,50 +3987,51 @@ msgstr ""
 "���������\n"
 "                              ����� ��� ��������� ����� �����\n"
 
-#: src/xgettext.c:904
-#, c-format
+#: src/xgettext.c:922
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (������ ����� C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             �������� �� ����� �������� ANSI C\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (������ ����� C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    ������������ ��������� ������ Qt\n"
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: 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:916
+#: src/xgettext.c:935
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    ������������ ��������� ������ Qt\n"
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 ������������ ��������� ������ Boost\n"
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -3934,19 +4039,19 @@ msgstr ""
 "      --debug                 ����� ��������� ��������� ������� ��������� "
 "������\n"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     �������� .properties-���� Java\n"
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=������\n"
 "                      ������ ������������ ���������� ��������� ����\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3954,19 +4059,19 @@ msgstr ""
 "      --foreign-user          �� �������� ����������� �� ��������� ������ "
 "FSF\n"
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --copyright-holder=������\n"
 "                      ������ ������������ ���������� ��������� ����\n"
 
-#: src/xgettext.c:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3975,7 +4080,7 @@ msgstr ""
 "                      ������ �����, ���� ������� ���������� ����� �� "
 "�������\n"
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3986,7 +4091,7 @@ msgstr ""
 "                      ������������ ������ ��� \"\" ��� ������� � ���������� "
 "msgstr\n"
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3997,7 +4102,7 @@ msgstr ""
 "                      ������������ ������ ��� \"\" ��� ������� � ���������� "
 "msgstr\n"
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4006,31 +4111,31 @@ msgstr ""
 "�������� --flag �� ������������� ���������� <��������-�����>:<�����-���>:"
 "[pass-]<����>: %s"
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "����������� ����"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: ��������������: "
 
-#: src/xgettext.c:2104
+#: src/xgettext.c:2138
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4039,7 +4144,7 @@ msgstr ""
 "�������� �� ������������� � �����, ��� �������������� ��������� ������, %s "
 "�� �������� ������ ��������� ������� %s.  �������: %s\n"
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4048,7 +4153,7 @@ msgstr ""
 "������ %s �� �������� ������ ��������� ������� %s, ���� � ��������� ��� "
 "�������.  �������: %s\n"
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4062,7 +4167,7 @@ msgstr ""
 "����������, ����������� ��������� ������ � ������������ ����������� �\n"
 "����������� ������ ������� ��� ����������.\n"
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4072,29 +4177,29 @@ msgstr ""
 "gettext(\"\") ���������� ����� ��������� � ���������������,\n"
 "� �� ������ ������.\n"
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "������������� ������������ ��������� ��� ��������� ����� '%.*s'"
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "��������������: �� ������ �������� ��� ��������� ����� '%.*s'"
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 "��������������: �� ������ �������� ��� ��������� �� ������������� ����� � "
 "��������� ����� '%.*s'"
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "�� ��������� ��������� � ���� � ������������ � ������������� �����"
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 #, fuzzy
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
@@ -4106,7 +4211,7 @@ msgstr ""
 "`Makevars', ���������� � ��� ���������� MSGID_BUGS_ADDRESS, �\n"
 "��������� ������ ������� � ��������� ������ ���� --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "���� `%s' ����������"
@@ -4115,6 +4220,14 @@ msgstr "���� `%s' ����������"
 msgid "<unnamed>"
 msgstr "<��� �����>"
 
+#, fuzzy
+#~ 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"
 
diff --git a/gettext-tools/po/sk.po b/gettext-tools/po/sk.po
index a8d3736..556a612 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.18.3\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-06-25 17:48+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2013-07-04 10:55+0200\n"
 "Last-Translator: Marcel Telka <marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -198,12 +198,15 @@ 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
@@ -320,14 +323,16 @@ 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
@@ -355,8 +360,12 @@ 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
@@ -366,7 +375,8 @@ 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
@@ -386,12 +396,14 @@ 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
@@ -400,8 +412,11 @@ 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
@@ -420,12 +435,16 @@ msgstr "V direktíve číslo %u nie je povolená presnosť pred '%c'."
 
 #: src/format-gcc-internal.c:334
 #, c-format
-msgid "In the directive number %u, the argument number for the precision must be equal to %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
 msgstr "V direktíve číslo %u sa musí číslo parametra pre presnosť rovnať %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
 msgstr "V direktíve číslo %u nie je povolené špecifikovať presnosť pred '%c'."
 
 #: src/format-gcc-internal.c:406
@@ -463,33 +482,47 @@ 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
@@ -498,8 +531,11 @@ 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
@@ -508,13 +544,18 @@ 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
@@ -523,12 +564,17 @@ 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
@@ -538,22 +584,37 @@ 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
@@ -583,8 +644,12 @@ 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
@@ -607,8 +672,12 @@ 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:374 src/format-python-brace.c:387
@@ -618,32 +687,45 @@ 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:136
@@ -663,8 +745,10 @@ msgstr "V direktíve číslo %u, '%c' nemôže byť na začiatku parametra getit
 
 #: 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 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:210
 #, c-format
@@ -673,20 +757,34 @@ 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."
@@ -694,12 +792,16 @@ 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:344 src/msgcat.c:289 src/msgcmp.c:172
@@ -773,10 +875,12 @@ 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
@@ -822,8 +926,10 @@ msgstr "  -V, --version               zobraziť informáciu o verzii a skončiť
 #: 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 ""
-"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
@@ -867,7 +973,8 @@ msgstr ""
 #: 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 "Povinné parametre pre dlhé voľby sú povinnými aj pre skrátené voľby.\n"
 
 #: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
@@ -888,7 +995,8 @@ msgstr "  VSTUPNÝSÚBOR                vstupný PO súbor\n"
 #: 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=ADRESÁR     pridať ADRESÁR do zoznamu pre vyhľadávané\n"
 "                              vstupné súbory\n"
@@ -897,7 +1005,8 @@ msgstr ""
 #: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
-msgstr "Ak nie je zadaný vstupný súbor alebo je -, je načítaný štandardný vstup.\n"
+msgstr ""
+"Ak nie je zadaný vstupný súbor alebo je -, je načítaný štandardný vstup.\n"
 
 #: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
 #: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
@@ -932,13 +1041,19 @@ msgstr "Výber správy:\n"
 
 #: src/msgattrib.c:445
 #, 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:447
 #, 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:449
 #, c-format
@@ -973,7 +1088,8 @@ msgstr "      --set-fuzzy             nastaviť všetky správy ako nepresné\n"
 #: src/msgattrib.c:462
 #, 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:464
 #, c-format
@@ -983,7 +1099,8 @@ msgstr "      --set-obsolete          nastaviť všetky správy ako zastarané\n
 #: src/msgattrib.c:466
 #, 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:468
 #, c-format
@@ -991,33 +1108,46 @@ 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:471
 #, 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"
 
 #: src/msgattrib.c:473
 #, 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:475
 #, 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:477
 #, 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:479
 #, 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: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
@@ -1030,14 +1160,20 @@ msgstr "Syntax vstupného súboru:\n"
 #: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
 #: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, 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: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     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: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
@@ -1054,11 +1190,13 @@ 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:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
@@ -1072,7 +1210,8 @@ msgstr "      --style=SÚBORŠTÝLU      zadať pravidlo štýlu CSS pre --color
 #: 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             nepoužiť na výstupe riadiace sekvencie\n"
 "                              jazyka C (predvolené)\n"
@@ -1081,9 +1220,11 @@ msgstr ""
 #: 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                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:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
@@ -1097,18 +1238,21 @@ msgstr "      --force-po              zapísať súbor PO, aj keď bude prázdny
 #: src/xgettext.c:960
 #, 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: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           nezapisovať riadky '#: meno_súboru:riadok'\n"
+msgstr ""
+"      --no-location           nezapisovať riadky '#: meno_súboru:riadok'\n"
 
 #: 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          generovať riadky '#: meno_súboru:riadok'\n"
 "                              (predvolené)\n"
@@ -1116,7 +1260,8 @@ msgstr ""
 #: 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"
+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"
@@ -1132,8 +1277,10 @@ msgstr "  -p, --properties-output     zapísať Java súbor .properties\n"
 #: 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    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: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
@@ -1165,7 +1312,8 @@ msgstr "  -s, --sort-output           generovať utriedený výstup\n"
 #: src/xgettext.c:979
 #, 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:321 src/msgcomm.c:326
 #, c-format
@@ -1208,7 +1356,8 @@ msgstr "  VSTUPNÝSÚBOR ...            vstupné súbory\n"
 #: 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=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:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
 #: src/xgettext.c:854
@@ -1246,8 +1395,10 @@ msgstr ""
 #: 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      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:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
 #: src/msgmerge.c:559
@@ -1270,13 +1421,16 @@ 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:432 src/msgen.c:339 src/msgmerge.c:565
 #, 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:286 src/msgmerge.c:350
@@ -1332,8 +1486,11 @@ msgstr "Modifikátory operácie:\n"
 
 #: 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          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:550
 #, c-format
@@ -1426,8 +1583,10 @@ msgstr ""
 
 #: src/msgcomm.c:451 src/xgettext.c:981
 #, 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:306
 #, c-format
@@ -1453,12 +1612,14 @@ msgstr "  -i, --indent                výstup s použitím odsadzovania\n"
 #: src/msgmerge.c:581
 #, 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: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"
+msgid ""
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "      --add-location          zachovať riadky '#: meno_súboru:riadok'\n"
 "                              (predvolené)\n"
@@ -1572,7 +1733,8 @@ 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:421
@@ -1582,26 +1744,32 @@ msgstr "Užitočné VOĽBY-FILTRA keď je použitý FILTER 'sed':\n"
 
 #: 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     pridať SKRIPT k vykonávaným príkazom\n"
 
 #: 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=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:428
 #, c-format
-msgid "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
-msgstr "  -n, --quiet, --silent       potlačiť automatickú tlač priestoru vzorov\n"
+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: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             nepoužiť na výstupe riadiace sekvencie\n"
 "                              jazyka C (predvolené)\n"
@@ -1613,7 +1781,8 @@ msgstr "      --indent                výstup s použitím odsadzovania\n"
 
 #: 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           zachovať položku hlavičky nezmenenú,\n"
 "                              neodfiltrovať ju\n"
@@ -1716,14 +1885,21 @@ msgstr "Mód činnosti:\n"
 
 #: src/msgfmt.c:679
 #, c-format
-msgid "  -j, --java                  Java mode: generate a Java ResourceBundle class\n"
-msgstr "  -j, --java                  mód Java: generovať triedu Java ResourceBundle\n"
+msgid ""
+"  -j, --java                  Java mode: generate a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  mód Java: generovať triedu Java "
+"ResourceBundle\n"
 
 #: 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                 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:683
@@ -1733,13 +1909,19 @@ msgstr "      --csharp                mód C#: generovať .dll súbor pre .NET\n
 
 #: src/msgfmt.c:685
 #, 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:687
 #, c-format
-msgid "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
-msgstr "      --tcl                   mód Tcl: generovať súbor .msg tcl/msgcat\n"
+msgid ""
+"      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   mód Tcl: generovať súbor .msg tcl/msgcat\n"
 
 #: src/msgfmt.c:689
 #, c-format
@@ -1769,20 +1951,25 @@ msgstr "  -r, --resource=ZDROJ        názov zdroja\n"
 #: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
 #: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, 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:707
 #, 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: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 ""
@@ -1797,8 +1984,12 @@ msgstr "Umiestnenie výstupného súboru v režime C#:\n"
 
 #: src/msgfmt.c:721 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:723
 #, c-format
@@ -1806,7 +1997,8 @@ 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:727
@@ -1824,7 +2016,8 @@ 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:745 src/xgettext.c:882
 #, c-format
@@ -1835,20 +2028,27 @@ 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:750
 #, 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:752
 #, 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:754
 #, c-format
@@ -1856,12 +2056,15 @@ 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: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   kontrolovať, či sa GNU msgfmt správa tak ako\n"
 "                                X/Open msgfmt\n"
@@ -1869,10 +2072,12 @@ msgstr ""
 #: 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]  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:762
@@ -1882,22 +2087,32 @@ msgstr "  -f, --use-fuzzy             použiť nepresné preklady vo výstupe\n"
 
 #: src/msgfmt.c:767
 #, 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: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=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:772
 #, 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:781
 #, c-format
@@ -1937,7 +2152,8 @@ msgstr "meno domény \"%s\" nie je použitelné ako meno súboru"
 #: src/msgfmt.c:941
 #, 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:955
 #, c-format
@@ -1973,8 +2189,12 @@ msgstr "chyba pri čítaní súboru \"%s\""
 
 #: 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 "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:516
 #, c-format, no-wrap
@@ -2064,9 +2284,11 @@ msgstr ""
 
 #: 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                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:618
@@ -2077,7 +2299,8 @@ msgstr "      --sort-output           generovať utriedený výstup\n"
 #: src/msggrep.c:620
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr "      --sort-by-file          utriediť výstup podľa umiestnenia v súboroch\n"
+msgstr ""
+"      --sort-by-file          utriediť výstup podľa umiestnenia v súboroch\n"
 
 #: src/msginit.c:297
 msgid ""
@@ -2123,10 +2346,12 @@ 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
@@ -2151,8 +2376,11 @@ 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 ""
@@ -2184,12 +2412,16 @@ 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.
@@ -2212,13 +2444,17 @@ 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
@@ -2238,17 +2474,20 @@ 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"
 
@@ -2326,7 +2565,9 @@ 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"
@@ -2337,8 +2578,12 @@ msgid "plural expression can produce integer overflow"
 msgstr "výraz pre množné číslo môže spôsobiť celočíselné pretečenie"
 
 #: src/msgl-check.c: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
@@ -2387,8 +2632,12 @@ 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'"
@@ -2457,19 +2706,31 @@ 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:708
 #, 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:715
 #, 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:383 src/msgmerge.c:389
 #, c-format
@@ -2507,7 +2768,8 @@ msgstr ""
 #: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      preklady podľa starých zdrojových súborov\n"
+msgstr ""
+"  def.po                      preklady podľa starých zdrojových súborov\n"
 
 #: src/msgmerge.c:504
 #, c-format
@@ -2555,7 +2817,8 @@ msgstr "      --suffix=PRÍPONA        prekryť obvyklú príponu zálohy\n"
 #: 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"
@@ -2572,7 +2835,8 @@ msgstr ""
 #: 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 ""
 "Prípona zálohy je '~', pokiaľ nie je zadaná voľba --suffix alebo nastavená\n"
@@ -2580,8 +2844,11 @@ msgstr ""
 
 #: src/msgmerge.c:552
 #, 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:609 src/urlget.c:192
 #, c-format
@@ -2600,8 +2867,12 @@ msgstr "táto správa by nemala definovať tvary množného čísla"
 
 #: src/msgmerge.c:2030
 #, 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:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2626,8 +2897,11 @@ 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                  mód Java: vstup je trieda Java ResourceBundle\n"
+msgid ""
+"  -j, --java                  Java mode: input is a Java ResourceBundle "
+"class\n"
+msgstr ""
+"  -j, --java                  mód Java: vstup je trieda Java ResourceBundle\n"
 
 #: src/msgunfmt.c:442
 #, c-format
@@ -2636,13 +2910,19 @@ 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                   mód Tcl: vstup je súbor .msg tcl/msgcat\n"
+msgid ""
+"      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
+msgstr ""
+"      --tcl                   mód Tcl: vstup je súbor .msg tcl/msgcat\n"
 
 #: src/msgunfmt.c:451
 #, c-format
@@ -2657,7 +2937,8 @@ msgstr "Umiestnenie vstupného súboru v móde 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"
@@ -2687,17 +2968,21 @@ msgstr "Umiestnenie vstupného súboru v móde 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:330
 #, c-format, no-wrap
@@ -2727,8 +3012,12 @@ msgstr "  -d, --repeated              zobraziť len duplikáty\n"
 
 #: src/msguniq.c:365
 #, 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
@@ -3009,24 +3298,46 @@ 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
@@ -3060,7 +3371,8 @@ msgstr "nie je platným názvom triedy Java: %s"
 #: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr "kompilácia triedy Java zlyhala, prosím skúste --verbose alebo nastavte $JAVAC"
+msgstr ""
+"kompilácia triedy Java zlyhala, prosím skúste --verbose alebo nastavte $JAVAC"
 
 #: src/write-java.c:1168
 #, c-format
@@ -3074,7 +3386,8 @@ msgstr "chyba pri otváraní súboru  \"%s\" na zápis"
 
 #: 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 "internacionalizované správy nesmú obsahovať riadiacu sekvenciu '\\%c'"
 
 #: src/write-po.c:1254 src/write-po.c:1383
@@ -3113,7 +3426,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 ""
@@ -3465,18 +3779,24 @@ 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:558
 #, 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:636
 #, 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:641
 #, c-format
@@ -3495,8 +3815,12 @@ msgstr "Extrahovať preložiteľné reťazce zo zadaných vstupných súborov.\n
 
 #: 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=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:861
 #, c-format
@@ -3505,8 +3829,11 @@ msgstr "  -o, --output=SÚBOR          zapísať výstup do zadaného súboru\n"
 
 #: src/xgettext.c:863
 #, 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:868
 #, c-format
@@ -3517,16 +3844,20 @@ 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)\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)\n"
 
@@ -3537,7 +3868,9 @@ msgstr "  -C, --c++                   skratka pre --language=C++\n"
 
 #: 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 "Štandardne je jazyk odhadnutý podľa prípony vstupného súboru\n"
 
 #: src/xgettext.c:884
@@ -3562,17 +3895,21 @@ msgstr "  -j, --join-existing         spojiť správy s existujúcim súborom\n"
 #: src/xgettext.c:894
 #, 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: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 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"
@@ -3593,12 +3930,14 @@ 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"
 
@@ -3614,22 +3953,26 @@ msgstr ""
 #: 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=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: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 ""
 "                                (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"
 
@@ -3665,9 +4008,11 @@ msgstr "      --boost                 rozoznať formát reťazcov Boost\n"
 
 #: src/xgettext.c:943
 #, 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:968
@@ -3678,11 +4023,14 @@ msgstr "      --properties-output     zapísať Java súbor .properties\n"
 #: src/xgettext.c:983
 #, 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: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          vynechať informáciu o autorských právach FSF\n"
 "                              pre cudzieho používateľa\n"
@@ -3699,33 +4047,42 @@ msgstr "      --package-version=VERZIA   nastaviť verziu balíka vo výstupe\n"
 
 #: 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@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: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[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: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[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:1817
 #, 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:1916
 msgid "standard input"
@@ -3753,13 +4110,21 @@ msgstr "%s%s: upozornenie: "
 
 #: 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 "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:2139
 #, 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:2170
 #, c-format
@@ -3798,7 +4163,9 @@ msgstr "upozornenie: chýbajúci kontext pre kľúčové slovo '%.*s'"
 #: src/xgettext.c:2921
 #, 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:2942
 #, c-format
diff --git a/gettext-tools/po/sl.po b/gettext-tools/po/sl.po
index 79bc956..c5f5268 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.2\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2013-03-09 13:26+0100\n"
 "Last-Translator: Primoz PETERLIN <primozz.peterlin@gmail.com>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -17,7 +17,8 @@ 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
@@ -57,32 +58,32 @@ msgstr "začasnega imenika %s ni mogoče odstraniti"
 msgid "write error"
 msgstr "napaka pri pisanju"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "ohranjamo dovoljenja za %s"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:194
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "datoteke %s ni moč odpreti za branje"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "varnostne kopije %s ni mogoče odpreti za pisanje"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, c-format
 msgid "error reading %s"
 msgstr "napaka pri branju %s"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, c-format
 msgid "error writing %s"
 msgstr "napaka pri pisanju na %s"
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, c-format
 msgid "error after reading %s"
 msgstr "napaka po branju %s"
@@ -204,7 +205,8 @@ 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,7 +217,7 @@ msgstr "V/I napaka v podprocesu %s"
 #  Morda ,,Zmanjkalo pomnilnika''?
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "zmanjkalo pomnilnika"
@@ -280,7 +282,7 @@ msgstr "»"
 msgid "'"
 msgstr "«"
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr "nastavljamo dovoljenja za %s"
@@ -313,27 +315,28 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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"
 
-#: src/format.c:148
+#: src/format.c:151
 #, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "»%s« ni veljaven formatni niz %s, za razliko od »%s« . Razlog: %s"
 
 #: src/format-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-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 "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
-#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: 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
@@ -342,9 +345,10 @@ msgstr "formatno določilo za argument %u ne obstaja v »%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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "formatni določili v »%s« in »%s« za argument %u nista enaki"
@@ -356,8 +360,12 @@ 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
@@ -367,10 +375,12 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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 "števili formatnih določil v »%s« in »%s« se ne ujemata"
@@ -386,22 +396,30 @@ 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
@@ -420,12 +438,17 @@ msgstr "V direktivi številka %u natančnost pred »%c« ni dovoljena."
 
 #: src/format-gcc-internal.c:334
 #, c-format
-msgid "In the directive number %u, the argument number for the precision must be equal to %u."
-msgstr "V direktivi številka %u mora biti številka argumenta za natančnost enaka %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"V direktivi številka %u mora biti številka argumenta za natančnost enaka %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
 msgstr "V direktivi številka %u določitev natančnosti pred »%c« ni dovoljena."
 
 #: src/format-gcc-internal.c:406
@@ -463,33 +486,51 @@ 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
@@ -498,7 +539,9 @@ 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
@@ -508,13 +551,18 @@ 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
@@ -523,12 +571,17 @@ 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
@@ -538,23 +591,40 @@ 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
@@ -584,7 +654,9 @@ 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
@@ -608,17 +680,27 @@ 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-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-sh.c:308
 #, 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
@@ -627,40 +709,89 @@ 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:136
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "V direktivi številka %u, »%c« ne sledi števka."
+
+#: src/format-python-brace.c:149
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr "V direktivi števika %u oklepaju »{« ne sledi število argumentov."
+
+#: src/format-python-brace.c:164
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "V direktivi številka %u, »%c« ne sledi števka."
+
+#: src/format-python-brace.c:184
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr "V direktivi številka %u natančnost pred »%c« ni dovoljena."
+
+#: src/format-python-brace.c:210
+#, fuzzy, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr "V direktivi številka %u je argument %d negativen."
+
 #: 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."
@@ -668,19 +799,23 @@ 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:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -693,17 +828,17 @@ 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:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -715,11 +850,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "preveč argumentov"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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"
@@ -747,10 +882,12 @@ 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
@@ -758,29 +895,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:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: 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:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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"
@@ -789,11 +926,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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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"
 
@@ -802,30 +939,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:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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:412
+#: src/msgattrib.c:419
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -834,59 +971,64 @@ msgstr ""
 "Filtriranje sporočil iz kataloga prevodov glede na njihova določila\n"
 "in rokovanje z njimi.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: 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:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: 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:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: 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:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr "Izbira izhodne datoteke:\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -894,95 +1036,127 @@ 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:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: 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:438
+#: 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:440
+#: 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:442
+#: 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:444
+#: 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:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           brez zastarelih (#~) sporočil\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         zgolj zastarela (#~) sporočila\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Rokovanje z določili:\n"
 
-#: src/msgattrib.c:453
+#: 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:455
+#: 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:457
+#: 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:459
+#: 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:461
+#: src/msgattrib.c:468
+#, fuzzy, 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"
+
+#: 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"
+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:463
+#: 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:465
+#: 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:467
+#: 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:469
+#: 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:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: 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
@@ -990,144 +1164,170 @@ msgstr "      --obsolete              isto kot --only-obsolete --clear-obsolete\
 msgid "Input file syntax:\n"
 msgstr "Skladnja vhodne datoteke:\n"
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr "Podrobnosti izpisa:\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: 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:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: 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:937
+#: 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:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: 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:939
+#: 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:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: 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:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: 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:960
+#: 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: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:366 src/msgcomm.c:358 src/xgettext.c:817
+#: 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"
@@ -1154,18 +1354,21 @@ 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:388 src/msgcomm.c:379 src/xgettext.c:833
+#: 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:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: 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"
@@ -1176,7 +1379,8 @@ 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:410
@@ -1185,7 +1389,8 @@ 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:413 src/msgcomm.c:404
@@ -1200,8 +1405,11 @@ msgstr ""
 #: 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:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
 #: src/msgmerge.c:559
@@ -1229,7 +1437,8 @@ msgstr ""
 
 #: 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.
@@ -1286,8 +1495,11 @@ msgstr "Modifikatorji delovanja:\n"
 
 #: 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:550
 #, c-format
@@ -1297,7 +1509,8 @@ 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
@@ -1373,12 +1586,14 @@ 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:451 src/xgettext.c:962
+#: 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:306
@@ -1405,21 +1620,27 @@ msgstr "  -i, --indent                izpis datoteke PO z zamiki\n"
 #: 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: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"
+msgid ""
+"      --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"      --add-location          z vrsticami »#: datoteka:vrstica« v izpisu "
+"(privzeto)\n"
 
 #: 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:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "vhodna datoteka ni podana"
@@ -1531,13 +1752,15 @@ msgstr "Uporabne IZBIRE FILTRA, kadar je FILTER »sed«:\n"
 
 #: 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: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"
@@ -1545,13 +1768,18 @@ msgstr ""
 
 #: 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: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:452 src/msggrep.c:601
 #, c-format
@@ -1560,8 +1788,10 @@ msgstr "      --indent             izpis datoteke PO z zamiki\n"
 
 #: 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:304
 #, c-format
@@ -1574,7 +1804,7 @@ msgid "invalid endianness: %s"
 msgstr "neveljaven vrstni red bajtov: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -1643,7 +1873,7 @@ msgstr "Uporaba: %s [IZBIRA] datoteka.po ...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Besedilni opis prevodov pretvorimo v binarni katalog sporočil.\n"
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1657,22 +1887,28 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  datoteka.po ...             vhodne datoteke\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: 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: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: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:683
 #, c-format
@@ -1681,13 +1917,18 @@ msgstr "      --csharp                način C#: ustvarimo .NET-datoteko .dll\n"
 
 #: 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: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:689
 #, c-format
@@ -1697,12 +1938,15 @@ msgstr "      --qt                    način Qt: ustvarimo datoteko .qm za Qt\n"
 #: 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:698 src/xgettext.c:850
+#: 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:701
 #, c-format
@@ -1717,23 +1961,30 @@ msgstr "  -r, --resource=SREDSTVO     ime sredstva\n"
 #: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
 #: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
-msgid "  -l, --locale=LOCALE         locale name, either language or language_COUNTRY\n"
-msgstr "  -l, --locale=JJ_DD          jezikovno okolje (jezik ali jezik_država)\n"
+msgid ""
+"  -l, --locale=LOCALE         locale name, either language or "
+"language_COUNTRY\n"
+msgstr ""
+"  -l, --locale=JJ_DD          jezikovno okolje (jezik ali jezik_država)\n"
 
 #: src/msgfmt.c: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: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:715
@@ -1743,8 +1994,12 @@ msgstr "Položaj izhodne datoteke v načinu C#:\n"
 
 #: 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:723
 #, c-format
@@ -1770,9 +2025,10 @@ msgstr "  -d IMENIK                   korenski imenik hierarhije razredov\n"
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
-msgstr "Izbiri -l in  -d sta obvezni. Datoteka .msg se zapiše v podani imenik.\n"
+msgstr ""
+"Izbiri -l in  -d sta obvezni. Datoteka .msg se zapiše v podani imenik.\n"
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretacija vhodne datoteke:\n"
@@ -1781,19 +2037,24 @@ msgstr "Interpretacija vhodne datoteke:\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                 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: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: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:754
@@ -1807,13 +2068,18 @@ msgstr ""
 
 #: 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: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"
@@ -1822,27 +2088,38 @@ msgstr ""
 #: 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: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: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: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:781
 #, c-format
@@ -1906,19 +2183,23 @@ msgstr "%s: opozorilo: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "napaka pri branju \"%s\""
 
 #: 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:516
 #, c-format, no-wrap
@@ -2012,7 +2293,8 @@ msgstr ""
 
 #: 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"
@@ -2025,7 +2307,8 @@ msgstr "      --sort-output        izhod abecedno urejen po sporočilih\n"
 #: 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 ""
@@ -2070,10 +2353,12 @@ 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
@@ -2098,8 +2383,11 @@ 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 ""
@@ -2131,8 +2419,10 @@ 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"
@@ -2159,13 +2449,18 @@ 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
@@ -2173,8 +2468,8 @@ msgid "target charset \"%s\" is not a portable encoding name."
 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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "opozorilo: "
@@ -2185,17 +2480,20 @@ 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"
 
@@ -2209,8 +2507,10 @@ 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
@@ -2272,7 +2572,8 @@ 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"
@@ -2283,7 +2584,9 @@ 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č"
@@ -2347,7 +2650,9 @@ 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;\""
@@ -2392,25 +2697,16 @@ msgstr "v msgstr manjka oznaka bližnjice »%c«"
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "v msgstr je preveč oznak bližnjic »%c«"
 
-#: src/msgl-check.c:785
-#, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "v glavi manjka polje »%s«\n"
-
-#: src/msgl-check.c:793
-#, c-format
-msgid "header field '%s' should start at beginning of line\n"
-msgstr "polje »%s« v glavi se mora začeti na začetku vrstice\n"
-
-#: src/msgl-check.c:818
-msgid "some header fields still have the initial default value\n"
-msgstr "nekatera polja v glavi imajo še vedno začetne privzete vrednosti\n"
-
-#: src/msgl-check.c:835
+#: 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:816
+#, c-format
+msgid "header field '%s' missing in header\n"
+msgstr "v glavi manjka polje »%s«\n"
+
 #: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
@@ -2426,21 +2722,33 @@ 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:623 src/xgettext.c:693
+#: 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:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: 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:383 src/msgmerge.c:389
 #, c-format
@@ -2490,7 +2798,8 @@ 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:514
@@ -2515,17 +2824,20 @@ msgstr "Rezultat se zapiše nazaj v datoteko def.po.\n"
 #: 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: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: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"
@@ -2543,7 +2855,8 @@ msgstr ""
 #: 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"
@@ -2551,8 +2864,11 @@ msgstr ""
 
 #: 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:609 src/urlget.c:192
 #, c-format
@@ -2571,8 +2887,12 @@ msgstr "pri tem sporočilu ne bi smele biti določene množinske oblike"
 
 #: 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:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2593,11 +2913,14 @@ 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"
@@ -2609,13 +2932,19 @@ 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
@@ -2630,10 +2959,12 @@ 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
@@ -2660,7 +2991,8 @@ 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
@@ -2670,7 +3002,8 @@ 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:330
 #, c-format, no-wrap
@@ -2700,7 +3033,9 @@ msgstr "  -d, --repeated                 izpišemo le podvojena sporočila\n"
 
 #: 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"
@@ -2840,7 +3175,7 @@ msgstr "znak za konec vrstice sredi niza"
 msgid "context separator <EOT> within string"
 msgstr "razmejilnik konteksta <EOT> znotraj niza"
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: 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"
@@ -2984,24 +3319,46 @@ 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
@@ -3035,7 +3392,9 @@ msgstr "ni veljavno javansko ime razreda: %s"
 #: 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:1168
 #, c-format
@@ -3049,8 +3408,10 @@ msgstr "napaka pri odpiranju \"%s\" za pisanje"
 
 #: 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:1254 src/write-po.c:1383
 #, c-format
@@ -3061,7 +3422,8 @@ 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"
 
@@ -3073,8 +3435,10 @@ msgid ""
 "different from yours. Consider using a pure ASCII msgid instead.\n"
 "%s\n"
 msgstr ""
-"Naslednje izvorno sporočilo (msgid) vsebuje znake, ki niso del nabora ASCII.\n"
-"To bo povzročilo težave prevajalcem, ki uporabljajo drugačen nabor znakov kot\n"
+"Naslednje izvorno sporočilo (msgid) vsebuje znake, ki niso del nabora "
+"ASCII.\n"
+"To bo povzročilo težave prevajalcem, ki uporabljajo drugačen nabor znakov "
+"kot\n"
 "vi. Razmislite o uporabi sporočil v naboru znakov ASCII.\n"
 "%s\n"
 
@@ -3088,11 +3452,13 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"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"
 
@@ -3143,7 +3509,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-python.c:1075
+#: 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"
@@ -3153,17 +3519,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:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: 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:1247
+#: 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:2021
+#: 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."
 
@@ -3203,7 +3569,7 @@ msgstr ""
 "%s:%d: Nezaključeno večbajtno zaporedje na koncu vrstice.\n"
 "Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: napaka v iconv"
@@ -3217,7 +3583,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:1282
+#: 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"
@@ -3230,19 +3596,31 @@ 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:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3256,6 +3634,61 @@ msgstr ""
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: opozorilo: osamljen surogat U+%04X"
 
+#: src/x-javascript.c:230
+#, fuzzy
+msgid "Please specify the source encoding through --from-code\n"
+msgstr "Prosim, določite vhodni nabor znakov z izbiro --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: Neveljavno večbajtno zaporedje.\n"
+"Prosim, določite vhodni nabor znakov z izbiro --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: Nepopolno dolgo večbajtno zaporedje.\n"
+"Prosim, določite vhodni nabor znakov z izbiro --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: Nezaključeno večbajtno zaporedje na koncu datoteke.\n"
+"Prosim, določite vhodni nabor znakov z izbiro --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: Nezaključeno večbajtno zaporedje na koncu vrstice.\n"
+"Prosim, določite vhodni nabor znakov z izbiro --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: Neveljavno večbajtno zaporedje.\n"
+"Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
+
+#: src/x-javascript.c:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+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"
@@ -3291,15 +3724,16 @@ msgstr "%s:%d: neveljavna interpolacija (\"\\L\") osembitnega znaka \"%c\""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: neveljavna interpolacija (\"\\U\") osembitnega znaka \"%c\""
 
-#: src/x-python.c:236
+#: 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 ""
-"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:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3307,10 +3741,11 @@ 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:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3318,10 +3753,11 @@ 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:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3329,10 +3765,11 @@ 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:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3340,10 +3777,11 @@ 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:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3351,10 +3789,11 @@ 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:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Neznani nabor znakov »%s«. Nadaljujemo z ASCII."
@@ -3376,76 +3815,100 @@ 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/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: opozorilo: nezaključen niz"
+
+#: 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:626
+#: 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:770
+#: 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:821
+#: 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:844
+#: 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:846
+#: 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:848
+#: 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:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Izbira vhodnega jezika:\n"
 
-#: src/xgettext.c:855
-#, c-format
+#: 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"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\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)\n"
 
-#: src/xgettext.c:861
+#: 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:863
+#: 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:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3454,27 +3917,30 @@ msgstr ""
 "      --from-code=NABOR          nabor znakov vhodnih datotek\n"
 "                                   (razen za Python, Tcl in Glade)\n"
 
-#: src/xgettext.c:871
+#: 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:876
+#: 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:878
+#: 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:880
+#: 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"
@@ -3483,28 +3949,32 @@ msgstr ""
 "  -c, --add-comments          postavi vse komentarje pred vrsticami s \n"
 "                                ključnimi besedami v izhodno datoteko\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Izbire, specifične za jezik:\n"
 
-#: src/xgettext.c:888
+#: 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:890 src/xgettext.c:897
-#, c-format
+#: src/xgettext.c:906 src/xgettext.c:914
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                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"
+"                                (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)\n"
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3513,147 +3983,178 @@ msgstr ""
 "  -kBESEDA, --keyword=BESEDA  uporabi BESEDO kot dodatno ključo besedo\n"
 "  -k, --keyword[=BESEDA]      ne uporabljaj privzetih ključnih besed\n"
 
-#: src/xgettext.c:901
+#: 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:904
-#, c-format
+#: src/xgettext.c:922
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                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)\n"
 
-#: src/xgettext.c:908
+#: 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:910
+#: 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:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    prepoznaj oblikovne nize Qt\n"
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: 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:916
+#: 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:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 prepoznaj oblikovne nize Boost\n"
 
-#: src/xgettext.c:924
+#: 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:949
+#: 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:964
+#: 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:966
+#: 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:968
+#: 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:970
+#: 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:972
+#: 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:974
+#: 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:977
+#: 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:1783
+#: 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:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "standardni vhod"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "Ne-ASCII znak pri %s%s."
 
-#: src/xgettext.c:1990
+#: 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:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "Ne-ASCII niz pri %s%s."
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: 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:2104
+#: 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:2105
+#: 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:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3666,7 +4167,7 @@ msgstr ""
 "Prosimo, razmislite o uporabi oblikovnega niza s poimenovanimi argumenti\n"
 "ter preslikave namesto n-terčka argumentov.\n"
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3676,27 +4177,28 @@ msgstr ""
 "gettext(\"\") vrne glavo z metapodatki, ne pa\n"
 "praznega niza.\n"
 
-#: src/xgettext.c:2835
+#: 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:2862
+#: 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:2887
+#: 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:2908
+#: 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:3017
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3708,7 +4210,7 @@ msgstr ""
 "spremenljivko MSGID_BUGS_ADDRESS tam, sicer pa \n"
 "z izbiro --msgid-bugs-address v ukazni vrstici.\n"
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, c-format
 msgid "language '%s' unknown"
 msgstr "jezik »%s« ni poznan"
@@ -3717,6 +4219,12 @@ msgstr "jezik »%s« ni poznan"
 msgid "<unnamed>"
 msgstr "<nepoimenovano>"
 
+#~ msgid "header field '%s' should start at beginning of line\n"
+#~ msgstr "polje »%s« v glavi se mora začeti na začetku vrstice\n"
+
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr "nekatera polja v glavi imajo še vedno začetne privzete vrednosti\n"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: nedovoljena izbira -- %c\n"
 
@@ -3734,8 +4242,10 @@ 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"
@@ -3789,8 +4299,10 @@ 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č @"
@@ -3799,7 +4311,8 @@ 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."
@@ -3813,39 +4326,49 @@ 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"
 
@@ -3856,17 +4379,22 @@ 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"
 
@@ -3877,23 +4405,29 @@ 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"
@@ -3903,58 +4437,76 @@ 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 ""
@@ -3962,14 +4514,17 @@ 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"
@@ -3988,17 +4543,20 @@ 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"
@@ -4006,38 +4564,51 @@ 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"
@@ -4051,23 +4622,28 @@ 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"
@@ -4076,35 +4652,42 @@ 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"
 
@@ -4114,25 +4697,31 @@ 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"
@@ -4141,25 +4730,31 @@ 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"
@@ -4169,12 +4764,14 @@ 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"
@@ -4187,27 +4784,37 @@ 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"
@@ -4229,23 +4836,28 @@ 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"
@@ -4255,20 +4867,25 @@ 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"
@@ -4290,7 +4907,8 @@ 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"
@@ -4318,7 +4936,8 @@ 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"
@@ -4336,29 +4955,37 @@ 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"
@@ -4366,42 +4993,59 @@ 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"
 
@@ -4430,23 +5074,31 @@ 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"
@@ -4458,10 +5110,12 @@ 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 ""
@@ -4471,26 +5125,34 @@ 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"
@@ -4520,10 +5182,14 @@ 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"
@@ -4532,11 +5198,15 @@ 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"
@@ -4545,26 +5215,35 @@ 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 ""
@@ -4572,12 +5251,16 @@ 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"
@@ -4593,7 +5276,8 @@ 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"
@@ -4607,8 +5291,10 @@ 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"
@@ -4631,7 +5317,8 @@ 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
@@ -4644,31 +5331,44 @@ 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"
 
@@ -4676,21 +5376,30 @@ 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"
@@ -4698,12 +5407,17 @@ 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"
@@ -4711,12 +5425,14 @@ 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"
@@ -4728,7 +5444,9 @@ 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 7e95dce..28ee09e 100644
--- a/gettext-tools/po/sr.po
+++ b/gettext-tools/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.14\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2004-02-16 16:00+0100\n"
 "Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
 "Language-Team: Serbian <gnu@prevod.org>\n"
@@ -55,32 +55,32 @@ msgstr "не могу да направим привремени директо�
 msgid "write error"
 msgstr "грешка уписа"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "грешка приликом отварања „%s“ за читање"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "не могу да отворим резервну датотеку „%s“ ради уписа"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "грешка при читању „%s“"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "грешка при упису „%s“"
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "грешка након читања „%s“"
@@ -220,7 +220,7 @@ msgstr "У/И грешка подпроцеса %s"
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "меморија исцрпљена"
@@ -286,7 +286,7 @@ msgstr ""
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -319,19 +319,19 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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“ за читање"
 
-#: src/format.c:148
+#: src/format.c:151
 #, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "„%s“ није исправна ниска формата %s, за разлику од „msgid“. Разлог: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: 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
@@ -341,7 +341,7 @@ 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-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
@@ -350,9 +350,10 @@ 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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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. аргумент нису исте"
@@ -382,7 +383,8 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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 "не поклапа се број спецификација формата у „msgid“ и „%s“"
@@ -675,7 +677,9 @@ msgid ""
 msgstr ""
 "У %u. директиви, ознака величине је несагласна са ознаком претварања „%c“."
 
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: 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“"
@@ -722,6 +726,32 @@ msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "нису исте спецификације формата у „msgid“ и „%s“ за аргумент „%s“"
 
+#: src/format-python-brace.c:136
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "У %u. директиви, „%c“ није праћено цифром."
+
+#: src/format-python-brace.c:149
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr "У %u. директиви, „{“ није праћено бројем аргумента."
+
+#: src/format-python-brace.c:164
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "У %u. директиви, „%c“ није праћено цифром."
+
+#: src/format-python-brace.c:184
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr "У %u. директиви, нису дозвољене назнаке пре „%c“."
+
+#: src/format-python-brace.c:210
+#, 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 ""
@@ -767,11 +797,11 @@ msgid ""
 "1 and 9."
 msgstr "Знак који завршава %u. директиву није цифра између 1 и 9."
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -780,17 +810,17 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -802,11 +832,11 @@ msgstr ""
 msgid "too many arguments"
 msgstr "превише аргумената"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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"
@@ -846,29 +876,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            адресе за име рачунара\n"
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/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:981
+#: 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:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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 +907,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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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,30 +920,30 @@ msgstr "Пријавите грешке на <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "не могу да сазнам име домаћина"
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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:412
+#: src/msgattrib.c:419
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -922,7 +952,7 @@ msgstr ""
 "Филтрира поруке каталога превода према њиховим особинама, и барата\n"
 "тим особинама.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -931,23 +961,23 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Обавезни аргументи дугих опција су обавезни и за кратке опције.\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, c-format
 msgid "Input file location:\n"
 msgstr "Путања до улазне датотеке:\n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:428 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:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -955,29 +985,29 @@ msgstr ""
 "  -D, --directory=ДИР         додај ДИР у списак за тражење улазних "
 "датотека\n"
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: 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:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr "Путања излазне датотеке:\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/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:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -989,85 +1019,93 @@ msgstr ""
 "или\n"
 "ако је она „-“.\n"
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: 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:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 "      --translated            задржи преведене, уклони непреведене поруке\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          задржи непреведене, уклони преведене поруке\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              уклони поруке означене као „нејасне“\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            задржи поруке означене као „нејасне“\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           уклони застареле поруке #~\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         задржи застареле поруке #~\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Баратање особинама:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             означи све поруке као „нејасне“\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           означи све поруке као не-„нејасне“\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          означи све поруке као застареле\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        означи све поруке као не-застареле\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, fuzzy, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+"      --translated            задржи преведене, уклони непреведене поруке\n"
+
+#: src/msgattrib.c:471
 #, fuzzy, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr "      --clear-fuzzy           означи све поруке као не-„нејасне“\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=ДАТОТЕКА.po  баратај једино пољима уписаним у ДАТОТЕКА.po\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1075,19 +1113,19 @@ msgstr ""
 "      --ignore-file=ДАТОТЕКА.po  баратај једино пољима која нису у ДАТОТЕКА."
 "po\n"
 
-#: src/msgattrib.c:467
+#: 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:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              исто што и --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: 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
@@ -1095,7 +1133,7 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr "Синтакса улазне датотеке:\n"
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
@@ -1104,7 +1142,7 @@ msgstr ""
 "  -P, --properties-input      улазна датотека је у синтакси Јава ."
 "properties\n"
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1115,17 +1153,17 @@ msgstr ""
 "GNUstep\n"
 "                              .strings\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr "Детаљи излаза:\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/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:929
+#: 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"
@@ -1134,16 +1172,16 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1151,9 +1189,9 @@ msgstr ""
 "  -e, --no-escape             не користи C истицање у излазу "
 "(подразумевано)\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: 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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1161,28 +1199,28 @@ msgstr ""
 "  -E, --escape                користи C истицање у излазу, без проширених \n"
 "                              знакова\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: 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:939
+#: 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              испиши ПО датотеку чак и ако је празна\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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                испиши ПО датотеку користећи стил увлачења\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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"
@@ -1190,8 +1228,8 @@ msgstr ""
 "  -n, --add-location          образуј редове „#: датотека:"
 "ред“ (подразумевано)\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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"
@@ -1199,32 +1237,32 @@ msgstr ""
 "      --strict                испиши ПО датотеку строго сагласну са "
 "Унифорумом\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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     испиши Јава .properties датотеку\n"
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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    испиши NeXTstep/GNUstep .strings датотеку\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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=БРОЈ            постави ширину излазне странице\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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"
@@ -1234,16 +1272,16 @@ msgstr ""
 "ширине \n"
 "                              излазне странице, у више редова\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: 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:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: 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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          поређај излаз по положају у датотеци\n"
@@ -1253,7 +1291,7 @@ msgstr "  -F, --sort-by-file          поређај излаз по полож�
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "дат је немогућ критеријум избора (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Употреба: %s [ОПЦИЈА] [УЛАЗНА-ДАТОТЕКА]...\n"
@@ -1280,19 +1318,19 @@ msgstr ""
 "осим ако се користи --use-first, када се узимају из прве ПО датотеке \n"
 "која их дефинише. Положаји у датотекама из свих ПО датотека се гомилају.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  УЛАЗНА-ДАТОТЕКА ...         улазне датотеке\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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=ДАТОТЕКА   преузми списак улазних датотека из ДАТОТЕКА\n"
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Уколико је улазна датотека „-“, чита се стандардни улаз.\n"
@@ -1511,7 +1549,7 @@ msgstr ""
 "  ->, --more-than=БРОЈ        испиши поруке са више од оволико дефиниција,\n"
 "                              уобичајено је 1 ако није постављено\n"
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, fuzzy, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1559,7 +1597,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                строги Унифорум стил исписа\n"
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "није наведена улазна датотека"
@@ -1723,7 +1761,7 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr ""
 
@@ -1789,7 +1827,7 @@ msgstr "Употреба: %s [ОПЦИЈА] датотека.po ...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Образуј бинарни каталог порука из текстуалног описа превода.\n"
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1803,7 +1841,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  датотека.po ...             улазне датотеке\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Режим рада:\n"
@@ -1856,7 +1894,7 @@ msgstr "      --qt                    Qt режим: образуј Qt .qm да�
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                омогући строг Унифорум режим\n"
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Уколико је излазна датотека „-“, испис се врши на стандардни излаз.\n"
@@ -1941,7 +1979,7 @@ msgid ""
 msgstr ""
 "Опције -l и -d су обавезне.  Датотека .msg се уписује у дати директоријум.\n"
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Обрада улазне датотеке:\n"
@@ -2089,11 +2127,12 @@ msgstr "%s: упозорење: изворна датотека садржи н�
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "грешка при читању „%s“"
@@ -2358,8 +2397,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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "упозорење: "
@@ -2573,24 +2612,15 @@ msgstr "У msgstr недостаје ознака пречице са таста
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "У msgstr има превише ознака пречица са тастатуре „%c“"
 
-#: src/msgl-check.c:785
+#: src/msgl-check.c:801
 #, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "недостаје поље „%s“ у заглављу\n"
-
-#: src/msgl-check.c:793
-#, fuzzy, 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"
+msgid "header field '%s' still has the initial default value\n"
 msgstr "нека поља заглавља и даље садрже почетне подразумеване вредности\n"
 
-#: src/msgl-check.c:835
+#: src/msgl-check.c:816
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "нека поља заглавља и даље садрже почетне подразумеване вредности\n"
+msgid "header field '%s' missing in header\n"
+msgstr "недостаје поље „%s“ у заглављу\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2607,7 +2637,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "улазна датотека не садржи поље заглавља са ознаком скупа знакова"
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:623 src/xgettext.c:693
+#: 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 "
@@ -2625,8 +2655,8 @@ msgstr ""
 "Претварање из „%s“ у „%s“ уводи понављања: неки различити msgid-ови постају "
 "једнаки."
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3053,7 +3083,7 @@ msgstr "крај реда унутар ниске"
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "ова датотека не сме садржати директиве за домен"
@@ -3399,7 +3429,7 @@ msgstr ""
 "али облик Tcl каталога порука не подржава баратање множинама\n"
 
 # bug: there are similar messages with "%s:%lu: warning:"
-#: src/x-awk.c:341 src/x-python.c:1075
+#: 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: упозорење: неокончана ниска"
@@ -3409,17 +3439,17 @@ msgstr "%s:%d: упозорење: неокончана ниска"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: упозорење: неокончан регуларни израз"
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-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:1247
+#: 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:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3462,7 +3492,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, fuzzy, c-format
 msgid "%s:%d: iconv failure"
 msgstr "неуспех iconv-а"
@@ -3476,7 +3506,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: упозорење: неисправан Уникод знак"
@@ -3497,12 +3527,22 @@ msgstr "%s:%d: упозорење: нађох „)“ где очекивах �
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: упозорење: нађох „}“ где очекивах „)“"
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3517,6 +3557,63 @@ msgstr ""
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: упозорење: неокончана ниска"
 
+#: src/x-javascript.c:230
+#, fuzzy
+msgid "Please specify the source encoding through --from-code\n"
+msgstr ""
+"Не-АСКРИ ниска на %s%s.\n"
+"Наведите кодирање извора помоћу --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 ""
+"Не-АСКРИ ниска на %s%s.\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%s.\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%s.\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%s.\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%s.\n"
+"Наведите кодирање извора помоћу --from-code.\n"
+
+#: src/x-javascript.c:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: упозорење: неокончана дословна ниска"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3553,7 +3650,7 @@ msgstr "%s:%d: неисправна интерполација („\\L“) 8-б�
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: неисправна интерполација („\\U“) 8-битног знака „%c“"
 
-#: src/x-python.c:236
+#: src/x-python.c:278
 #, fuzzy
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
@@ -3562,7 +3659,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:324
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3572,7 +3669,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3582,7 +3679,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3592,7 +3689,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3602,7 +3699,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3612,7 +3709,7 @@ msgstr ""
 "Не-АСКРИ ниска на %s%s.\n"
 "Наведите кодирање извора помоћу --from-code.\n"
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3641,29 +3738,34 @@ msgstr ""
 "%s:%lu: упозорење: синтакса $\"...\" је превазиђена из безбедносних разлога; "
 "уместо тога користите eval_gettext"
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: упозорење: неокончана дословна ниска"
+
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing се не може користити када се излаз исписује на стандардни "
 "излаз"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext не може да ради без кључних речи које тражи"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:785
 #, fuzzy, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "упозорење: екстензија „%2$s“ датотеке „%1$s“ је непозната; пробаћу C"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Извуци преводиве ниске из датих улазних датотека.\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3671,12 +3773,12 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=ИМЕ    користи ИМЕ.po за излаз (уместо messages.po)\n"
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=ДАТОТЕКА       испиши излаз у наведену датотеку\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3684,12 +3786,12 @@ msgstr ""
 "  -p, --output-dir=ДИР        излазне датотеке се смештају у директоријум "
 "ДИР\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Избор језика улазне датотеке:\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:870
 #, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3698,7 +3800,8 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 "  -L, --language=ИМЕ          препознавање наведеног језика\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Питон, "
@@ -3708,19 +3811,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-извор, NXStringTable, RST, Глејд)\n"
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   пречица за --language=C++\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Подразумева се погађање језика на основу проширења имена датотеке.\n"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3729,22 +3832,22 @@ msgstr ""
 "      --from-code=ИМЕ         кодирање улазних датотека\n"
 "                                (осим за Питон, Tcl, Глејд)\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Подразумева се да су улазне датотеке у АСКРИ запису.\n"
 
-#: src/xgettext.c:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         споји поруке са постојећом датотеком\n"
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, 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:880
+#: src/xgettext.c:896
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3758,29 +3861,30 @@ msgstr ""
 "излазној \n"
 "                              датотеци\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Посебне опције за језик:\n"
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           извуци све ниске\n"
 
-#: src/xgettext.c:890 src/xgettext.c:897
+#: src/xgettext.c:906 src/xgettext.c:914
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (само језици C, C++, ObjectiveC, Shell,\n"
 "                                Питон, Лисп, ЕмаксЛисп, librep, Јава, C#,\n"
 "                                awk, Tcl, Перл, PHP, GCC-извор, Глејд)\n"
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3791,7 +3895,7 @@ msgstr ""
 "                              РЕЧ означава употребу подразумеваних кључних \n"
 "                              речи)\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3802,67 +3906,68 @@ msgstr ""
 "бројем \n"
 "                              АРГ кључне речи РЕЧ\n"
 
-#: src/xgettext.c:904
+#: src/xgettext.c:922
 #, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (само језици C, C++, ObjectiveC, Shell,\n"
 "                                Питон, Лисп, ЕмаксЛисп, librep, Јава, C#,\n"
 "                                awk, YCP, Tcl, Перл, PHP, GCC-извор)\n"
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             разумевање АНСИ C триграфа за улаз\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (једино језици C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    препознај Qt ниске формата\n"
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: 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:916
+#: src/xgettext.c:935
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    препознај Qt ниске формата\n"
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --qt                    препознај Qt ниске формата\n"
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 детаљнији резултат препознавања ниске формата\n"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     испиши Јава .properties датотеку\n"
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=НИСКА   постави носиоца ауторских права у излазу\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3870,18 +3975,18 @@ msgstr ""
 "      --foreign-user          избаци FSF ауторска права у излазу за стране \n"
 "                              кориснике\n"
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, fuzzy, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --copyright-holder=НИСКА   постави носиоца ауторских права у излазу\n"
 
-#: src/xgettext.c:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3889,7 +3994,7 @@ msgstr ""
 "      --msgid-bugs-address=АДРЕСА@Е-ПОШТЕ  постави адресу за пријављивање \n"
 "                                           грешака у msgid-има\n"
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3898,7 +4003,7 @@ msgid ""
 msgstr ""
 "  -m, --msgstr-prefix[=НИСКА]   користи НИСКА или „“ за префикс msgstr поља\n"
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3907,7 +4012,7 @@ msgid ""
 msgstr ""
 "  -M, --msgstr-suffix[=НИСКА]   користи НИСКА или „“ за суфикс msgstr поља\n"
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -3916,31 +4021,31 @@ msgstr ""
 "A --flag аргумент не користи синтаксу <кључна-реч>:<брарг>:"
 "[пролаз-]<ознака>: %s"
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "стандардни улаз"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: упозорење: "
 
-#: src/xgettext.c:2104
+#: src/xgettext.c:2138
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3949,7 +4054,7 @@ msgstr ""
 "Иако се користи на месту ниске формата, %s не представља исправну ниску "
 "формата %s. Разлог: %s\n"
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -3958,7 +4063,7 @@ msgstr ""
 "Иако је објављена као таква, %s не представља исправну ниску формата %s. "
 "Разлог: %s\n"
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3967,7 +4072,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3977,27 +4082,27 @@ msgstr ""
 "gettext(\"\") враћа поље заглавља са мета-подацима, а не \n"
 "празну ниску.\n"
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "неједнозначан аргумент „%s“ за  %s"
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "неједнозначан аргумент „%s“ за  %s"
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "неједнозначан аргумент „%s“ за  %s"
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 #, fuzzy
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
@@ -4010,7 +4115,7 @@ msgstr ""
 "променљиву MSGID_BUGS_ADDRESS; иначе, наведите опцију\n"
 "--msgid-bugs-address у наредби.\n"
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "језик „%s“ није познат"
@@ -4019,6 +4124,13 @@ msgstr "језик „%s“ није познат"
 msgid "<unnamed>"
 msgstr ""
 
+#, fuzzy
+#~ 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"
 
diff --git a/gettext-tools/po/sv.po b/gettext-tools/po/sv.po
index 33ae37d..42e1b7b 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.18.3\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-06-25 17:48+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2013-07-01 19:25+0200\n"
 "Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -202,7 +202,8 @@ 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
@@ -328,8 +329,10 @@ 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
@@ -347,7 +350,8 @@ 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
@@ -356,8 +360,13 @@ 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
@@ -367,7 +376,8 @@ 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
@@ -387,22 +397,31 @@ 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
@@ -421,13 +440,19 @@ msgstr "I direktiv nummer %u: en precision är inte tillåten före \"%c\"."
 
 #: src/format-gcc-internal.c:334
 #, c-format
-msgid "In the directive number %u, the argument number for the precision must be equal to %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
 msgstr "I direktiv nummer %u: argumentnumret för precisionen måste vara %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "I direktiv nummer %u: en precisionsspecifikation är inte tillåten före \"%c\"."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"I direktiv nummer %u: en precisionsspecifikation är inte tillåten före \"%c"
+"\"."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -464,33 +489,50 @@ 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
@@ -499,8 +541,11 @@ 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
@@ -509,13 +554,18 @@ 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 argumentnummret 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 argumentnummret av ett komma och en av \"%s"
+"\", \"%s\", \"%s\", \"%s\"."
 
 #: src/format-java.c:572
 #, c-format
@@ -524,13 +574,19 @@ 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
@@ -539,21 +595,35 @@ 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
@@ -583,8 +653,11 @@ 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
@@ -607,8 +680,12 @@ 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:374 src/format-python-brace.c:387
@@ -618,8 +695,12 @@ 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
@@ -628,23 +709,31 @@ 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:136
 #, c-format
@@ -663,8 +752,11 @@ msgstr "I direktiv nummer %u kan inte \"%c\" inleda ett getitem-argument."
 
 #: src/format-python-brace.c:184
 #, 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:210
 #, c-format
@@ -673,20 +765,32 @@ 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."
@@ -694,13 +798,18 @@ 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: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
@@ -773,7 +882,8 @@ 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"
@@ -823,7 +933,8 @@ 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
@@ -867,8 +978,10 @@ msgstr ""
 #: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
 #: src/msguniq.c:341
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Obligatoriska argument för långa flaggor är obligatoriska även för korta.\n"
+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: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
@@ -888,7 +1001,8 @@ msgstr "  INFIL                       PO-infil\n"
 #: 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=KATALOG     sök infiler även i KATALOG\n"
 
 #: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
@@ -919,7 +1033,8 @@ 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:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
@@ -928,23 +1043,31 @@ msgstr "Meddelandeval:\n"
 
 #: src/msgattrib.c:445
 #, 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:447
 #, 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:449
 #, 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:451
 #, 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:453
 #, c-format
@@ -969,17 +1092,22 @@ msgstr "      --set-fuzzy             markera alla meddelanden som \"fuzzy\"\n"
 #: src/msgattrib.c:462
 #, 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:464
 #, 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:466
 #, 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:468
 #, c-format
@@ -992,18 +1120,26 @@ msgstr ""
 
 #: src/msgattrib.c:471
 #, 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:473
 #, 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:475
 #, 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:477
 #, c-format
@@ -1012,8 +1148,10 @@ msgstr "      --fuzzy                 samma som --only-fuzzy --clear-fuzzy\n"
 
 #: src/msgattrib.c:479
 #, 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: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
@@ -1026,14 +1164,19 @@ msgstr "Syntax på infil:\n"
 #: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
 #: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, 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: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     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: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
@@ -1050,11 +1193,14 @@ 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:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
@@ -1068,7 +1214,8 @@ msgstr "      --style=STILMALL        ange CSS stillmallsfil för --color\n"
 #: 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             använd inte C-kontrollsekvenser i resultatet\n"
 "                                (normalläge)\n"
@@ -1077,7 +1224,8 @@ msgstr ""
 #: 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                använd C-kontrollsekvenser i resultatet, men\n"
 "                              inte \\v aller \\a\n"
@@ -1099,18 +1247,23 @@ msgstr "  -i, --indent                indentera resultatet\n"
 #: src/xgettext.c:962
 #, 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: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          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: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"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
 msgstr "      --strict                strikt Uniforum-format på resultatet\n"
 
 #: src/msgattrib.c:511 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
@@ -1124,8 +1277,10 @@ msgstr "  -p, --properties-output     skriv en \"Java .properties\"-fil\n"
 #: 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    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: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
@@ -1238,8 +1393,10 @@ msgstr ""
 #: 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      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:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
 #: src/msgmerge.c:559
@@ -1247,7 +1404,9 @@ msgstr "  -P, --properties-input      infiler har \"Java .properties\"-syntax\n"
 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:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
@@ -1265,7 +1424,8 @@ msgstr ""
 
 #: 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=KATALOGNAMN      sätt \"Language\"-fältet i huvudet\n"
 
 #. This is a proper name. See the gettext manual, section Names.
@@ -1323,8 +1483,11 @@ msgstr "Bearbetningsvarianter:\n"
 
 #: 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          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:550
 #, c-format
@@ -1415,7 +1578,8 @@ msgstr ""
 
 #: 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           skriv inte ut huvudet med `msgid \"\"'\n"
 
 #: src/msgconv.c:306
@@ -1442,13 +1606,17 @@ msgstr "  -i, --indent                indentera resultatet\n"
 #: src/msgmerge.c:581
 #, 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: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          skriv rader med \"#: filnamn:rad\" (normalläge)\n"
+msgid ""
+"      --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"      --add-location          skriv rader med \"#: filnamn:rad"
+"\" (normalläge)\n"
 
 #: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
 #: src/msgmerge.c:585
@@ -1569,26 +1737,34 @@ msgstr "Användbara FILTERFLAGGOR när FILTER är \"sed\":\n"
 
 #: src/msgfilter.c:423
 #, c-format
-msgid "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr "  -e, --expression=SKRIPT     lägg till SKRIPT till kommandon att exekvera\n"
+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: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        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:428
 #, 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: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             använd inte C-kontrollsekvenser i resultatet\n"
 "                                (normalläge)\n"
@@ -1600,8 +1776,11 @@ msgstr "      --indent                indentera resultatet\n"
 
 #: src/msgfilter.c:454
 #, 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:304
 #, c-format
@@ -1675,7 +1854,8 @@ msgstr "Användning: %s [FLAGGA] filnamn.po ...\n"
 #: src/msgfmt.c:658
 #, 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:663 src/xgettext.c:841
 #, c-format, no-wrap
@@ -1698,13 +1878,21 @@ msgstr "Körläge:\n"
 
 #: src/msgfmt.c:679
 #, 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:681
 #, 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:683
 #, c-format
@@ -1713,13 +1901,20 @@ msgstr "      --csharp                C#-läge: generera en .NET .dll-fil\n"
 
 #: src/msgfmt.c:685
 #, 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:687
 #, 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:689
 #, c-format
@@ -1749,18 +1944,23 @@ msgstr "  -r, --resource=RESURS       resursnamn\n"
 #: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
 #: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, 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: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 KATALOG                  startkatalog för klassers katalogträd\n"
 
 #: 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 ""
@@ -1775,8 +1975,11 @@ msgstr "Plats för utfil i C#-läge:\n"
 
 #: src/msgfmt.c:721 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:723
 #, c-format
@@ -1784,7 +1987,8 @@ 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:727
@@ -1795,7 +1999,8 @@ msgstr "Plats för utfil i Tcl-läge:\n"
 #: src/msgfmt.c:731 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:733
 #, c-format
@@ -1815,20 +2020,26 @@ 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:750
 #, 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:752
 #, 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:754
 #, c-format
@@ -1841,7 +2052,9 @@ msgstr ""
 
 #: 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   kontrollera att GNU msgfmt uppför sig som\n"
 "                                X/Open msgfmt\n"
@@ -1849,10 +2062,12 @@ msgstr ""
 #: 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[=TKN]   kontrollera närvaron av tangentkortkommandon\n"
+"      --check-accelerators[=TKN]   kontrollera närvaron av "
+"tangentkortkommandon\n"
 "                                för menyer\n"
 
 #: src/msgfmt.c:762
@@ -1862,21 +2077,27 @@ msgstr "  -f, --use-fuzzy             använd luddiga poster i resultatet\n"
 
 #: src/msgfmt.c:767
 #, 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: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=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: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               binärfil innehåller inte hashtabellen\n"
 
 #: src/msgfmt.c:781
@@ -1897,7 +2118,9 @@ msgstr "varning: PO-filens huvudrader saknas eller är ogiltiga\n"
 #: src/msgfmt.c:900
 #, 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:910
 #, c-format
@@ -1953,8 +2176,12 @@ msgstr "fel uppstod då \"%s\" lästes"
 
 #: 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 "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:516
 #, c-format, no-wrap
@@ -2043,7 +2270,8 @@ msgstr ""
 
 #: 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                använd C-kontrollsekvenser i resultatet, men\n"
 "                                inte \\v eller \\a\n"
@@ -2101,7 +2329,8 @@ 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"
@@ -2110,7 +2339,8 @@ 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
@@ -2128,7 +2358,8 @@ 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
@@ -2161,8 +2392,10 @@ 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-postaddress så att\n"
@@ -2189,13 +2422,17 @@ 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
@@ -2221,7 +2458,8 @@ 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 ""
@@ -2314,7 +2552,9 @@ 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
@@ -2362,8 +2602,12 @@ 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'"
@@ -2423,7 +2667,9 @@ 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"
@@ -2432,20 +2678,28 @@ 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:708
 #, 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:715
 #, 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()."
@@ -2485,7 +2739,9 @@ msgstr ""
 #: src/msgmerge.c:502
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      översättningar som refererar till gamla källkoden\n"
+msgstr ""
+"  def.po                      översättningar som refererar till gamla "
+"källkoden\n"
 
 #: src/msgmerge.c:504
 #, c-format
@@ -2533,7 +2789,8 @@ msgstr "      --suffix=SUFFIX         använd ett annat suffix än det vanliga\n
 #: 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"
@@ -2544,13 +2801,15 @@ 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: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 för säkerhetskopior är \"~\", om den inte sätts med --suffix eller\n"
@@ -2558,8 +2817,11 @@ msgstr ""
 
 #: src/msgmerge.c:552
 #, 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:609 src/urlget.c:192
 #, c-format
@@ -2578,8 +2840,12 @@ msgstr "detta meddelande ska inte definiera pluralformer"
 
 #: 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 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:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2600,12 +2866,17 @@ 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
@@ -2614,13 +2885,20 @@ 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
@@ -2635,7 +2913,8 @@ 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"
@@ -2652,7 +2931,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 ""
-"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
@@ -2708,8 +2988,11 @@ msgstr "  -d, --repeated              skriv bara duplicerade meddelanden\n"
 
 #: src/msguniq.c:365
 #, 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
@@ -2765,7 +3048,8 @@ 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
@@ -2877,7 +3161,8 @@ 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"
@@ -2938,7 +3223,9 @@ 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
@@ -2990,27 +3277,46 @@ 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ödjer 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ödjer 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ödjer 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
@@ -3044,7 +3350,8 @@ msgstr "inte ett giltigt Javaklassnamn: %s"
 #: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr "kompilering av Javaklass misslyckades, försök med --verbose eller sätt $JAVAC"
+msgstr ""
+"kompilering av Javaklass misslyckades, försök med --verbose eller sätt $JAVAC"
 
 #: src/write-java.c:1168
 #, c-format
@@ -3058,8 +3365,10 @@ msgstr "fel uppstod när \"%s\" öppnades för skrivning"
 
 #: src/write-po.c:803
 #, 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:1254 src/write-po.c:1383
 #, c-format
@@ -3097,7 +3406,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 ""
@@ -3452,8 +3762,12 @@ 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:558
 #, c-format
@@ -3463,7 +3777,8 @@ msgstr "%s:%d: varning: reguljärt uttryck avlutas för tidigt"
 #: src/xgettext.c:636
 #, 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:641
 #, c-format
@@ -3482,8 +3797,12 @@ msgstr "Extrahera översättbara strängar från givna infiler.\n"
 
 #: 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=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:861
 #, c-format
@@ -3492,7 +3811,8 @@ msgstr "  -o, --output=FIL            skriv resultatet till FIL\n"
 
 #: 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=KATALOG    utfiler placeras i katalogen KATALOG\n"
 
 #: src/xgettext.c:868
@@ -3504,16 +3824,20 @@ 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)\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)\n"
 
@@ -3524,7 +3848,9 @@ msgstr "  -C, --c++                   samma som --language=C++\n"
 
 #: 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 "I normalläge gissas språket från filändelsen på infilen.\n"
 
 #: src/xgettext.c:884
@@ -3544,7 +3870,8 @@ msgstr "Normalt antas att filer är i ASCII-format.\n"
 #: src/xgettext.c:892
 #, 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:894
 #, c-format
@@ -3556,12 +3883,15 @@ 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:902
@@ -3578,12 +3908,14 @@ 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"
 
@@ -3599,7 +3931,8 @@ msgstr ""
 #: 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=ORD:NR:FLAGGA    extra FLAGGA för strängar inne i argument\n"
@@ -3609,19 +3942,22 @@ 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:927
 #, 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:929
 #, c-format
@@ -3650,8 +3986,10 @@ msgstr "      --boost                 känn igen Boost-formatsträngar\n"
 
 #: src/xgettext.c:943
 #, 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:968
 #, c-format
@@ -3661,12 +3999,15 @@ msgstr "      --properties-output     skriv en \"Java .properties\"-fil\n"
 #: src/xgettext.c:983
 #, 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:985
 #, 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:987
 #, c-format
@@ -3680,27 +4021,39 @@ msgstr "      --package-version=VERSION  sätt paketversion i utdata\n"
 
 #: src/xgettext.c:991
 #, 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: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[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: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[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:1817
 #, 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:1916
 msgid "standard input"
@@ -3728,13 +4081,21 @@ msgstr "%s%s: varning: "
 
 #: 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 "%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:2139
 #, 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:2170
 #, c-format
@@ -3744,7 +4105,8 @@ 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 95ff365..3139d56 100644
--- a/gettext-tools/po/tr.po
+++ b/gettext-tools/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.16\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\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"
@@ -55,32 +55,32 @@ msgstr "geçici dizin %s silinemiyor"
 msgid "write error"
 msgstr "yazma hatası"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: 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:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "\"%s\" okunmak için açılırken hata"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, 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:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "\"%s\" okunurken hata"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "\"%s\" yazılırken hata"
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "\"%s\" okunduktan sonra hata"
@@ -215,7 +215,7 @@ msgstr "%s alt süreci G/Ç hatası"
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "bellek tükendi"
@@ -280,7 +280,7 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -313,19 +313,19 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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\" okunmak için açılırken hata"
 
-#: src/format.c:148
+#: src/format.c:151
 #, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "'%s', 'msgid' gibi geçerli bir %s biçem dizgesi değil. Sebebi: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: 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
@@ -335,7 +335,7 @@ 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-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
@@ -344,9 +344,10 @@ 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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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' ve '%s' girdilerindeki biçem belirteçleri %u için aynı değil"
@@ -380,7 +381,8 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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 "`msgid' ve '%s' girdilerindeki biçem belirteçleri farklı sayıda"
@@ -689,7 +691,9 @@ 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-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-sh.c:308
 #, 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"
@@ -735,6 +739,33 @@ msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "'%2$s' için biçem belirteci 'msgid' ve '%1$s' içinde aynı değil"
 
+#: src/format-python-brace.c:136
+#, 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:149
+#, 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:164
+#, 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:184
+#, 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:210
+#, 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
 #, c-format
 msgid ""
@@ -782,11 +813,11 @@ msgid ""
 msgstr ""
 "%u numaralı yönergeyi sonlandıran karakter 1 ile 9 arasında bir rakam değil."
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -795,17 +826,17 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: src/xgettext.c:605
 #, 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -817,11 +848,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "çok fazla argüman"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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 "Daha fazla bilgilendirilmek için `%s --help' yazınız.\n"
@@ -861,29 +892,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            konak adresleri\n"
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Bilgilendirme çıktısı:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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                  bu yardım iletisini gösterir ve çıkar\n"
 
-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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               Sürüm bilgilerini gösterir ve çıkar\n"
@@ -892,11 +923,11 @@ msgstr "  -V, --version               Sürüm bilgilerini gösterir ve çıkar\n
 #. for this package.  Please add _another line_ saying
 #. "Report translation bugs to <...>\n" with the address for translation
 #. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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 ""
 "Yazılım hatalarını <bug-gnu-utils@gnu.org> adresine,\n"
@@ -907,30 +938,30 @@ msgstr ""
 msgid "could not get host name"
 msgstr "makina ismi alınamadı"
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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 "en fazla bir girdi dosyasına izin var"
 
-#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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 ile %s bağdaşmıyor"
 
-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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 "Kullanımı: %s [SEÇENEK] [GİRDİDOSYASI]\n"
 
-#: src/msgattrib.c:412
+#: src/msgattrib.c:419
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -939,7 +970,7 @@ msgstr ""
 "Çeviri kataloğundaki iletileri belirtilen özelliklere göre süzer,\n"
 "ve özellikleri uygular.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -949,23 +980,23 @@ msgid ""
 msgstr ""
 "Uzun seçeneklerdeki zorunlu argümanlar kısa seçenekler için de zorunludur.\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, c-format
 msgid "Input file location:\n"
 msgstr "Girdi dosyasının yeri:\n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: 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 "  GİRDİDOSYASI                girdi olan PO dosyası\n"
 
-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -973,28 +1004,28 @@ msgstr ""
 "  -D, --directory=DİZİN       girdi dosyasının arandığı listeye DİZİNi "
 "ekler\n"
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: 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 "Bir DOSYA verilmemişse ya da - verilmişse standart girdi okunur.\n"
 
-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr "Çıktı dosyasının yeri:\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: 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=DOSYA     çıktıyı DOSYAya yazar\n"
 
-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -1004,12 +1035,12 @@ msgid ""
 msgstr ""
 "Sonuçlar DOSYA verilmezse ya da - verilirse standart çıktıya yazılır.\n"
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
 #, c-format
 msgid "Message selection:\n"
 msgstr "İleti seçimi:\n"
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
@@ -1017,7 +1048,7 @@ msgstr ""
 "      --translated            çevrilmiş iletileri tutar çevrilmemişleri "
 "siler\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
@@ -1025,54 +1056,62 @@ msgstr ""
 "      --untranslated          çevrilmemiş iletileri tutar çevrilmişleri "
 "siler\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              'fuzzy' imli iletileri siler\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            'fuzzy' imli iletileri tutar\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           kullanımdışı olan #~ iletilerini siler\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         kullanımdışı olan #~ iletilerini tutar\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Nitelik değiştirme:\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             tüm iletileri 'fuzzy' olarak imler\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, 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:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          tüm iletileri kullanımdışı yapar\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, 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:461
+#: src/msgattrib.c:468
+#, 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"
+
+#: src/msgattrib.c:471
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
@@ -1080,14 +1119,14 @@ msgid ""
 msgstr ""
 "      --clear-previous        tüm iletilerden eski msgid'ler kaldırılır\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=DOSYA.po    sadece DOSYA.po içindeki girdileri değiştirir\n"
 
-#: src/msgattrib.c:465
+#: src/msgattrib.c:475
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
@@ -1095,20 +1134,20 @@ msgstr ""
 "      --ignore-file=DOSYA.po  sadece DOSYA.po içinde bulunmayan girdileri\n"
 "                              değiştirir\n"
 
-#: src/msgattrib.c:467
+#: src/msgattrib.c:477
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 "      --fuzzy                 --only-fuzzy --clear-fuzzy ile eşanlamlı\n"
 
-#: src/msgattrib.c:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete             --only-obsolete --clear-obsolete ile eşanlamlı\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: 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
@@ -1116,7 +1155,7 @@ msgstr ""
 msgid "Input file syntax:\n"
 msgstr "Girdi dosyası sözdizimi:\n"
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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 ""
@@ -1125,7 +1164,7 @@ msgstr ""
 "  -P, --properties-input      girdi dosyası Java .properties "
 "sözdizimindedir\n"
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1135,17 +1174,17 @@ msgstr ""
 "      --stringtable-input     NeXTstep/GNUstep .strings sözdizimli girdi "
 "dosyası\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr "Çıktı ayrıntıları:\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: 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:929
+#: 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"
@@ -1154,16 +1193,16 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1171,9 +1210,9 @@ msgstr ""
 "  -e, --no-escape             çıktıda C öncelemeleri kullanılmaz "
 "(öntanımlı)\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: 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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1182,28 +1221,28 @@ msgstr ""
 "karakterler\n"
 "                              yorumlanmaz\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: 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:939
+#: 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              boş bile olsa PO dosyasını yazar\n"
 
-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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 dosyasını girintili tarzda yazar\n"
 
-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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           '#: dosyaismi:satır' satırları yazılmaz\n"
 
-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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"
@@ -1211,15 +1250,15 @@ msgstr ""
 "  -n, --add-location          '#: dosyaismi:satır' satırları üretilir\n"
 "                              (öntanımlı\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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 dosyasının bilinen biçeminde yazar.\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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
@@ -1227,9 +1266,9 @@ msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 "  -p, --properties-output     çıktıyı bir Java .properties dosyasına yazar\n"
 
-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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"
@@ -1237,16 +1276,16 @@ msgstr ""
 "      --stringtable-output    çıktıyı bir NeXTstep/GNUstep .strings\n"
 "                              dosyasına yazar\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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=SAYI            sayfa genişliğini SAYIya ayarlar\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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"
@@ -1255,16 +1294,16 @@ 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:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: src/msguniq.c:411 src/xgettext.c:977
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           sıralı çıktı üretir\n"
 
-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: 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:960
+#: src/xgettext.c:979
 #, 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"
@@ -1274,7 +1313,7 @@ msgstr "  -F, --sort-by-file          çıktıyı dosyadaki yerine göre sırala
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "belirtilen seçim kriteri mümkün değil (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Kullanımı: %s [SEÇENEK] [GİRDİDOSYASI]...\n"
@@ -1303,19 +1342,19 @@ msgstr ""
 "korunur, belirtildiğinde bunlar ilk PO dosyasında belirtildiği şekliyle\n"
 "alınır.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  GİRDİDOSYASI ...            girdi dosyaları\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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=DOSYA      girdi dosyalarının listesi DOSYAdan alınır\n"
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Girdi dosyası - ise, standart girdi okunur.\n"
@@ -1534,7 +1573,7 @@ msgstr ""
 "  ->, --more-than=SAYI        SAYIdan daha fazla olan iletileri basar,\n"
 "                              verilmezse öntanımlı 1 dir\n"
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, fuzzy, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1583,7 +1622,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                çıktı bilinen biçemde yazılır\n"
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "hiç girdi dosyası verilmemiş"
@@ -1747,7 +1786,7 @@ msgid "invalid endianness: %s"
 msgstr "bayt sırası geçersiz: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -1810,7 +1849,7 @@ msgstr "Kullanımı: %s [SEÇENEK] dosyaismi.po ...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Çevirilerin bulunduğu dosyadan ikilik ileti kataloğunu üretir.\n"
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1824,7 +1863,7 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  DOSYAİSMİ.po ...            girdi dosyaları\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "İşlem kipi:\n"
@@ -1880,7 +1919,7 @@ msgstr "      --qt                    Qt kipi: bir Qt .qm dosyası üretir\n"
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                bilinen kip etkinleştirilir\n"
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, 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"
@@ -1961,7 +2000,7 @@ msgid ""
 msgstr ""
 "-l ve -d seçenekleri zorunludur. .msg dosyası belirtilen dizine yazılır.\n"
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Girdi dosyası yorumlaması:\n"
@@ -2110,11 +2149,12 @@ msgstr "%s: uyarı: kaynak dosya fuzzy çeviriler içeriyor"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" okunurken hata"
@@ -2389,8 +2429,8 @@ 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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "uyarı: "
@@ -2604,24 +2644,15 @@ msgstr "içinde '%c' tuş kısayolu eksik"
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "çok fazla '%c' tuş kısayolu içeriyor"
 
-#: src/msgl-check.c:785
-#, 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:793
+#: src/msgl-check.c:801
 #, fuzzy, 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:818
-msgid "some header fields still have the initial default value\n"
+msgid "header field '%s' still has the initial default value\n"
 msgstr "bazı başlık alanları hala öntanımlı ilk değere sahip\n"
 
-#: src/msgl-check.c:835
+#: src/msgl-check.c:816
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "bazı başlık alanları hala öntanımlı ilk değere sahip\n"
+msgid "header field '%s' missing in header\n"
+msgstr "başlıkta `%s' başlık alanı yok\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2638,7 +2669,7 @@ 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:623 src/xgettext.c:693
+#: 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 "
@@ -2656,8 +2687,8 @@ 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:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -3086,7 +3117,7 @@ msgstr "dizge içinde satır sonu"
 msgid "context separator <EOT> within string"
 msgstr "dizge içinde <EOT> bağlam ayracı"
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "bu dosya paket yönergelerini içermeyebilir"
@@ -3419,7 +3450,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-python.c:1075
+#: 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: uyarı: sonlandırılmamış dizge"
@@ -3429,17 +3460,17 @@ 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:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: 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: uyarı: sonlandırılmamış karakter sabiti"
 
-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832
 #, 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:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3482,7 +3513,7 @@ 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-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv başarısızlığı"
@@ -3496,7 +3527,7 @@ 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:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: uyarı: Unicode karakter geçersiz"
@@ -3516,12 +3547,22 @@ msgstr "%s:%d: uyarı: '}' umulan yerde ')' var"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: uyarı: ')' umulan yerde '}' var"
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3535,6 +3576,63 @@ msgstr ""
 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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3571,7 +3669,7 @@ msgstr "%s:%d: 8 bitlik \"%c\" karakterinin (\"\\L\") aradeğerlemesi geçersiz"
 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:236
+#: src/x-python.c:278
 #, fuzzy
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
@@ -3582,7 +3680,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:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3594,7 +3692,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:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3606,7 +3704,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:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3618,7 +3716,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:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3630,7 +3728,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:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3642,7 +3740,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:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "\"%s\" kodlaması bilinmiyor. Onun yerine ASCII ile işlem yapılacak."
@@ -3671,27 +3769,32 @@ msgstr ""
 "%s:%lu: uyarı: güvenlikle ilgili sebeplerden dolayı $\"...\" sözdizimi artık "
 "kullanılmayacak; yerine eval_gettext kullanın"
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, 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:636
 #, 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:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext anahtar sözcükler olmaksızın bulamaz"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:785
 #, fuzzy, 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:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Belirtilen girdi dosyalarından çevrilebilir dizgeleri çıkartır.\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3699,24 +3802,24 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=İSİM   çıktıda messages.po yerine İSİM.po kullanılır\n"
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, 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:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=DİZİN      çıktı dosyaları DİZİNe yazılır\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Girdi dosyası dilinin seçimi:\n"
 
-#: src/xgettext.c:855
-#, c-format
+#: src/xgettext.c:870
+#, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3724,7 +3827,8 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 "  -L, --language=İSİM         belirtilen dil tanınır:\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3734,19 +3838,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ ile aynı\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "Öntanımlı olarak dil, girdi dosyasının uzantısına bakarak saptanır.\n"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3755,24 +3859,24 @@ msgstr ""
 "      --from-code=İSİM        girdi dosyası için yerel kodlaması\n"
 "                              (Python, Tcl, Glade dışında)\n"
 
-#: src/xgettext.c:871
+#: src/xgettext.c:887
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 "Öntanımlı olarak, girdi dosyalarının yerel kodlaması ASCII kabul edilir.\n"
 
-#: src/xgettext.c:876
+#: src/xgettext.c:892
 #, 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:878
+#: src/xgettext.c:894
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=DOSYA.po girdiler DOSYA.po dosyasından elde edilir\n"
 
-#: src/xgettext.c:880
+#: src/xgettext.c:896
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3783,30 +3887,31 @@ msgid ""
 msgstr ""
 "  -c, --add-comments[=ETİTET] ETİKETli yorum bloğunu çıktı dosyasına yazar\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Dile özel seçenekler:\n"
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           tüm dizgeler çıkarılır\n"
 
-#: src/xgettext.c:890 src/xgettext.c:897
-#, c-format
+#: src/xgettext.c:906 src/xgettext.c:914
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                              (sadece bu diller: C, C++, ObjectiveC, Shell,\n"
 "                              Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
 "                              C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3816,7 +3921,7 @@ msgstr ""
 "öntanımlı\n"
 "                              anahtar sözcükler kullanılmamalıdır)\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3826,13 +3931,14 @@ 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:904
-#, c-format
+#: src/xgettext.c:922
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                               (sadece bu diller: C, C++, ObjectiveC, "
 "Shell,\n"
@@ -3840,56 +3946,56 @@ msgstr ""
 "Java,\n"
 "                               C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, 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:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 "                                (sadece bu diller: C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt biçim dizgeleri tanınır\n"
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (sadece C++)\n"
 
-#: src/xgettext.c:916
+#: src/xgettext.c:935
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    Qt biçim dizgeleri tanınır\n"
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost biçim dizgeleri tanınır\n"
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 biçemdizgesi tanıma sonuçları ayrıntılı olur\n"
 
-#: src/xgettext.c:949
+#: src/xgettext.c:968
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output     çıktı bir Java .properties dosyasına yazılır\n"
 
-#: src/xgettext.c:964
+#: src/xgettext.c:983
 #, 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:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3897,17 +4003,17 @@ msgstr ""
 "      --foreign-user          yabancı kullanıcılar için FSF telif hakkı\n"
 "                              çıktıda atlanır\n"
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, 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:972
+#: src/xgettext.c:991
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3915,7 +4021,7 @@ msgstr ""
 "      --msgid-bugs-address=EPOSTA@ADRESİ\n"
 "                              msgid hatalarının bildirileceği adres\n"
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3925,7 +4031,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=DİZGE]  msgstr girdilerinde önek olarak \"\" yerine\n"
 "                               DİZGE kullanılır\n"
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3935,7 +4041,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=DİZGE]  msgstr girdilerinde sonek olarak \"\" yerine\n"
 "                               DİZGE kullanılır\n"
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -3943,31 +4049,31 @@ msgid ""
 msgstr ""
 "Bir --flag argümanı <sözcük>:<argnum>:[pass-]<im> sözdiziminde olmaz: %s"
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "standart girdi"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: uyarı: "
 
-#: src/xgettext.c:2104
+#: src/xgettext.c:2138
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3976,7 +4082,7 @@ 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:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -3985,7 +4091,7 @@ msgstr ""
 "Böyle bildirilebilirse de %s, %s biçim dizgesi içinde geçerli değil. Sebebi: "
 "%s\n"
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3998,7 +4104,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:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4008,27 +4114,27 @@ msgstr ""
 "gettext(\"\") ile başlık girdilerindeki bilgileri\n"
 "döndürür. Boş dizge değildir.\n"
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, 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:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "uyarı: anahtar sözcük '%.*s' için bağlam eksik"
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, 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:2908
+#: src/xgettext.c:2942
 #, 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:3017
+#: src/xgettext.c:3052
 #, fuzzy
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
@@ -4041,7 +4147,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS değişkenini belirtin; ya da\n"
 "bir --msgid-bugs-address seçeneği kullanın.\n"
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "dil `%s' bilinmiyor"
@@ -4050,6 +4156,13 @@ msgstr "dil `%s' bilinmiyor"
 msgid "<unnamed>"
 msgstr "<isimsiz>"
 
+#, fuzzy
+#~ 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 "some header fields still have the initial default value\n"
+#~ msgstr "bazı başlık alanları hala öntanımlı ilk değere sahip\n"
+
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: kuraldışı seçenek -- %c\n"
 
diff --git a/gettext-tools/po/uk.po b/gettext-tools/po/uk.po
index 2e4864d..fff8403 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.18.3\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-06-25 17:48+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2013-06-25 16:16+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -16,7 +16,8 @@ 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
@@ -199,12 +200,15 @@ 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
@@ -238,7 +242,8 @@ 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
@@ -321,14 +326,16 @@ 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
@@ -352,22 +359,32 @@ 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
@@ -387,13 +404,18 @@ 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
@@ -401,8 +423,12 @@ 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
@@ -417,17 +443,25 @@ msgstr "У директиві з номером %u, некоректна ком�
 #: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr "У директиві з номером %u, не допускається визначник точності перед «%c»."
+msgstr ""
+"У директиві з номером %u, не допускається визначник точності перед «%c»."
 
 #: src/format-gcc-internal.c:334
 #, c-format
-msgid "In the directive number %u, the argument number for the precision must be equal to %u."
-msgstr "В директиві з номером %u, номер аргументу для визначника точності має дорівнювати %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
+msgstr ""
+"В директиві з номером %u, номер аргументу для визначника точності має "
+"дорівнювати %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "У директиві з номером %u не допускається специфікація точності перед «%c»."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"У директиві з номером %u не допускається специфікація точності перед «%c»."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -464,33 +498,50 @@ 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
@@ -499,8 +550,11 @@ 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
@@ -509,13 +563,18 @@ msgstr "У директиві з номером %u, «%s» не завершує
 
 #: src/format-java.c:274
 #, c-format
-msgid "In the directive number %u, the substring \"%s\" is not a valid number style."
+msgid ""
+"In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr "У директиві з номером %u, рядок «%s» у неприпустимому форматі числа."
 
 #: src/format-java.c:323
 #, c-format
-msgid "In the directive number %u, the argument number is not followed by a comma and one of \"%s\", \"%s\", \"%s\", \"%s\"."
-msgstr "У директиві з номером %u, номер аргументу не завершується комою та одним з«%s», «%s», «%s», «%s»."
+msgid ""
+"In the directive number %u, the argument number is not followed by a comma "
+"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
+msgstr ""
+"У директиві з номером %u, номер аргументу не завершується комою та одним "
+"з«%s», «%s», «%s», «%s»."
 
 #: src/format-java.c:572
 #, c-format
@@ -524,12 +583,17 @@ msgstr "У директиві з номером %u, вибір не містит
 
 #: src/format-java.c:583
 #, c-format
-msgid "In the directive number %u, a choice contains a number that is not followed by '<', '#' or '%s'."
-msgstr "У директиві з номером %u, вибір містить число, яке не завершується '<', '#' чи «%s»."
+msgid ""
+"In the directive number %u, a choice contains a number that is not followed "
+"by '<', '#' or '%s'."
+msgstr ""
+"У директиві з номером %u, вибір містить число, яке не завершується '<', '#' "
+"чи «%s»."
 
 #: src/format-java.c:745
 #, c-format
-msgid "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgid ""
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "специфікація формату аргументу {%u}, тобто «%s», не існує у «%s»"
 
 #: src/format-java.c:756
@@ -539,22 +603,37 @@ 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
@@ -584,13 +663,18 @@ 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."
@@ -608,8 +692,12 @@ 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:374 src/format-python-brace.c:387
@@ -619,8 +707,11 @@ 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
@@ -629,22 +720,30 @@ 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:136
@@ -664,30 +763,46 @@ msgstr "У директиві з номером %u «%c» не може розп
 
 #: src/format-python-brace.c:184
 #, 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:210
 #, 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."
@@ -695,12 +810,16 @@ 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:344 src/msgcat.c:289 src/msgcmp.c:172
@@ -774,10 +893,12 @@ 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
@@ -866,8 +987,10 @@ msgstr ""
 #: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
 #: src/msguniq.c:341
 #, c-format
-msgid "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Аргументи, обов'язкові для довгих ключів, є обов'язковими й для коротких.\n"
+msgid ""
+"Mandatory arguments to long options are mandatory for short options too.\n"
+msgstr ""
+"Аргументи, обов'язкові для довгих ключів, є обов'язковими й для коротких.\n"
 
 #: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
 #: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
@@ -887,14 +1010,19 @@ msgstr "  ВХІДНИЙ_ФАЙЛ                вхідний файл PO\n"
 #: 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=КАТАЛОГ     додати КАТАЛОГ до списку вхідних файлів пошуку\n"
+msgid ""
+"  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
+msgstr ""
+"  -D, --directory=КАТАЛОГ     додати КАТАЛОГ до списку вхідних файлів "
+"пошуку\n"
 
 #: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
 #: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
-msgstr "Якщо вхідний файл не вказаний, або якщо вказано -, використовується стандартний ввід.\n"
+msgstr ""
+"Якщо вхідний файл не вказаний, або якщо вказано -, використовується "
+"стандартний ввід.\n"
 
 #: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
 #: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
@@ -919,7 +1047,8 @@ 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:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
@@ -929,23 +1058,29 @@ msgstr "Вибір повідомлень:\n"
 
 #: src/msgattrib.c:445
 #, 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:447
 #, 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:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy              видалити повідомлення, позначені як 'fuzzy'\n"
+msgstr ""
+"      --no-fuzzy              видалити повідомлення, позначені як 'fuzzy'\n"
 
 #: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            зберегти повідомлення, позначені як 'fuzzy'\n"
+msgstr ""
+"      --only-fuzzy            зберегти повідомлення, позначені як 'fuzzy'\n"
 
 #: src/msgattrib.c:453
 #, c-format
@@ -970,7 +1105,8 @@ msgstr "      --set-fuzzy             позначити всі повідомл
 #: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr "      --clear-fuzzy           позначити всі повідомлення як не 'fuzzy'\n"
+msgstr ""
+"      --clear-fuzzy           позначити всі повідомлення як не 'fuzzy'\n"
 
 #: src/msgattrib.c:464
 #, c-format
@@ -980,7 +1116,8 @@ msgstr "      --set-obsolete          позначити всі повідомл
 #: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
-msgstr "      --clear-obsolete        позначити всі повідомлення не застарілими\n"
+msgstr ""
+"      --clear-obsolete        позначити всі повідомлення не застарілими\n"
 
 #: src/msgattrib.c:468
 #, c-format
@@ -988,23 +1125,33 @@ 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:471
 #, 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:473
 #, 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:475
 #, 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:477
 #, c-format
@@ -1013,8 +1160,10 @@ msgstr "      --fuzzy                 синонім для --only-fuzzy --clear
 
 #: src/msgattrib.c:479
 #, 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: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
@@ -1027,14 +1176,20 @@ msgstr "Синтаксис вхідного файлу:\n"
 #: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
 #: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, 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: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: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
@@ -1051,33 +1206,41 @@ 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: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=ФАЙЛ_СТИЛЮ      вказати файл правил стилю CSS для --color\n"
+msgstr ""
+"      --style=ФАЙЛ_СТИЛЮ      вказати файл правил стилю CSS для --color\n"
 
 #: src/msgattrib.c:497 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
 #: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
 #: src/xgettext.c:954
 #, 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: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                використовувати у виводі символи екранування\n"
 "                              мови C, без розширених символів\n"
@@ -1093,25 +1256,34 @@ msgstr "      --force-po              записувати файл PO, наві
 #: src/xgettext.c:960
 #, 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: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"
+msgstr ""
+"      --no-location           не записувати рядки '#: назва_файлу:рядок'\n"
 
 #: 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: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: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
@@ -1124,8 +1296,10 @@ msgstr "  -p, --properties-output     записати файл Java .properties
 #: 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    записати файл 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: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
@@ -1157,7 +1331,8 @@ msgstr "  -s, --sort-output           сортувати вивід\n"
 #: src/xgettext.c:979
 #, 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:321 src/msgcomm.c:326
 #, c-format
@@ -1214,7 +1389,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"
+"  -<, --less-than=ЧИСЛО       виводить повідомлення визначені менш ніж "
+"вказану\n"
 "                              кількість разів, якщо значення не вказано,\n"
 "                              типове значення - нескінченість\n"
 
@@ -1224,7 +1400,8 @@ 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"
 
@@ -1240,8 +1417,10 @@ msgstr ""
 #: 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      вхідні файли мають синтаксис 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:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
 #: src/msgmerge.c:559
@@ -1270,8 +1449,11 @@ msgstr ""
 
 #: 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=НАЗВА_КАТАЛОГУ   встановити значення поля «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:286 src/msgmerge.c:350
@@ -1327,13 +1509,18 @@ msgstr "Модифікатори режиму роботи:\n"
 
 #: 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:550
 #, 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
@@ -1421,8 +1608,10 @@ msgstr ""
 
 #: src/msgcomm.c:451 src/xgettext.c:981
 #, 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:306
 #, c-format
@@ -1453,8 +1642,10 @@ msgstr "      --no-location           не виводити '#: filename:line' �
 #: 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"
+msgid ""
+"      --add-location          preserve '#: filename:line' lines (default)\n"
+msgstr ""
+"      --add-location          зберігати '#: filename:line' рядки (типово)\n"
 
 #: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
 #: src/msgmerge.c:585
@@ -1564,7 +1755,8 @@ msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
-"Фільтр може бути будь-якою програмою, що читає переклад зі стандартного вводу\n"
+"Фільтр може бути будь-якою програмою, що читає переклад зі стандартного "
+"вводу\n"
 "та записує змінений переклад у стандартний вивід.\n"
 
 #: src/msgfilter.c:421
@@ -1574,25 +1766,33 @@ msgstr "Корисні ПАРАМЕТРИ-ФІЛЬТРУ якщо ФІЛЬТР �
 
 #: 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: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"
+msgstr ""
+"  -f, --file=ФАЙЛ_СЦЕНАРІЮ    додати вміст ФАЙЛУ_СЦЕНАРІЮ до виконуваних "
+"команд\n"
 
 #: 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:446 src/msggrep.c:595
 #, 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:452 src/msggrep.c:601
 #, c-format
@@ -1601,8 +1801,11 @@ msgstr "      --indent                стиль виводу з відступ�
 
 #: src/msgfilter.c:454
 #, 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:304
 #, c-format
@@ -1702,13 +1905,20 @@ msgstr "Режим роботи:\n"
 
 #: src/msgfmt.c:679
 #, 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: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:683
 #, c-format
@@ -1717,13 +1927,19 @@ msgstr "      --csharp                режим C#: створює файли .
 
 #: src/msgfmt.c:685
 #, 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:687
 #, 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:689
 #, c-format
@@ -1733,12 +1949,14 @@ msgstr "      --qt                    режим Qt: створює файл Qt
 #: src/msgfmt.c:696
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
-msgstr "      --strict                перейти у режим відповідності до Uniforum\n"
+msgstr ""
+"      --strict                перейти у режим відповідності до Uniforum\n"
 
 #: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
-msgstr "Якщо як файл виводу вказано -, вивід відбуватиметься у стандартний вивід.\n"
+msgstr ""
+"Якщо як файл виводу вказано -, вивід відбуватиметься у стандартний вивід.\n"
 
 #: src/msgfmt.c:701
 #, c-format
@@ -1753,18 +1971,23 @@ msgstr "  -r, --resource=РЕСУРС       назва ресурсу\n"
 #: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
 #: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, 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:707
 #, 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: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 ""
@@ -1779,8 +2002,12 @@ msgstr "Розташування вхідного файлу у режимі C#:
 
 #: src/msgfmt.c:721 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:723
 #, c-format
@@ -1799,14 +2026,17 @@ msgstr "Розташування вхідного файлу у режимі Tcl
 #: src/msgfmt.c:731 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: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"
+msgstr ""
+"Параметри -l та -d є обов'язковими.  Файл .msg записується у вказаний "
+"каталог.\n"
 
 #: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
@@ -1817,20 +2047,27 @@ 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:750
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr "      --check-format          перевірити залежний від мови формат рядків\n"
+msgstr ""
+"      --check-format          перевірити залежний від мови формат рядків\n"
 
 #: src/msgfmt.c:752
 #, 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:754
 #, c-format
@@ -1838,21 +2075,28 @@ 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: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: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"
+"      --check-accelerators[=CHAR]  перевірити наявність клавіш-акселераторів "
+"у\n"
 "                                пунктах меню\n"
 
 #: src/msgfmt.c:762
@@ -1862,23 +2106,31 @@ msgstr "  -f, --use-fuzzy             виводити елементи нето
 
 #: 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: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=ПОРЯДОК    записувати 32-бітові числа з вказаним порядком байтів\n"
+"      --endianness=ПОРЯДОК    записувати 32-бітові числа з вказаним порядком "
+"байтів\n"
 "                                (зворотний (big) або прямий (little),\n"
 "                                 типовий залежить від платформи)\n"
 
 #: src/msgfmt.c:772
 #, 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:781
 #, c-format
@@ -1918,7 +2170,9 @@ msgstr "назва домену «%s» не може використовува�
 #: src/msgfmt.c:941
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "назва домену «%s» не може використовуватись як назва файлу: буде використано префікс"
+msgstr ""
+"назва домену «%s» не може використовуватись як назва файлу: буде використано "
+"префікс"
 
 #: src/msgfmt.c:955
 #, c-format
@@ -1954,8 +2208,12 @@ msgstr "помилка при читанні «%s»"
 
 #: 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 "параметр «%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:516
 #, c-format, no-wrap
@@ -2043,8 +2301,11 @@ msgstr ""
 
 #: src/msggrep.c:597
 #, 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:618
 #, c-format
@@ -2097,7 +2358,8 @@ 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"
@@ -2114,7 +2376,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 ""
-"Якщо не вказано вхідний файл, назва залежить від параметру --locale або локалі\n"
+"Якщо не вказано вхідний файл, назва залежить від параметру --locale або "
+"локалі\n"
 "користувача. Якщо вказано знак -, результат виводиться у стандартний вивід.\n"
 
 #: src/msginit.c:400
@@ -2124,8 +2387,10 @@ 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 ""
@@ -2157,11 +2422,14 @@ 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"
@@ -2186,13 +2454,18 @@ 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
@@ -2218,7 +2491,8 @@ 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 ""
@@ -2236,7 +2510,8 @@ 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
@@ -2299,7 +2574,9 @@ 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"
@@ -2307,11 +2584,16 @@ 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
@@ -2360,17 +2642,23 @@ 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'"
@@ -2430,19 +2718,31 @@ msgstr "вхідний файл не містить заголовок, що в�
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
 #: src/x-python.c:665 src/xgettext.c:708
 #, 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: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:383 src/msgmerge.c:389
 #, c-format
@@ -2522,12 +2822,15 @@ msgstr "      --backup=КОНТРОЛЬ       зробити резервну к
 #: src/msgmerge.c:532
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
-msgstr "      --suffix=СУФІКС         перевизначити звичайний суфікс резервної копії\n"
+msgstr ""
+"      --suffix=СУФІКС         перевизначити звичайний суфікс резервної "
+"копії\n"
 
 #: 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"
@@ -2538,22 +2841,28 @@ msgstr ""
 "середовища VERSION_CONTROL.  Ось можливі значення:\n"
 "  none, off       не робити резервних копій (навіть якщо вказано --backup)\n"
 "  numbered, t     робити резервні копії з номерами\n"
-"  existing, nil   нумеровані, якщо є нумеровані резервні копії, інакше - прості\n"
+"  existing, nil   нумеровані, якщо є нумеровані резервні копії, інакше - "
+"прості\n"
 "  simple, never   завжди використовувати прості резервні копії\n"
 
 #: 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\n"
+"Суфіксом резервної копії є «~», якщо він не перевизначений параметром --"
+"suffix\n"
 "або змінною середовища SIMPLE_BACKUP_SUFFIX.\n"
 
 #: src/msgmerge.c:552
 #, 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:609 src/urlget.c:192
 #, c-format
@@ -2572,8 +2881,12 @@ msgstr "це повідомлення не повинно визначати м�
 
 #: 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:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2598,23 +2911,34 @@ 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
@@ -2629,11 +2953,13 @@ 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
@@ -2666,12 +2992,14 @@ 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:330
 #, c-format, no-wrap
@@ -2701,8 +3029,12 @@ msgstr "  -d, --repeated              виводити лише дублікат
 
 #: 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
@@ -2758,7 +3090,8 @@ msgid ""
 "Message conversion to user's charset will not work.\n"
 msgstr ""
 "Кодування у заголовку відсутнє.\n"
-"Перетворення повідомлення у вказане користувачем кодування може не працювати.\n"
+"Перетворення повідомлення у вказане користувачем кодування може не "
+"працювати.\n"
 
 #: src/po-gram-gen.y:93
 #, c-format
@@ -2983,24 +3316,46 @@ 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
@@ -3034,12 +3389,14 @@ msgstr "не є правильною назвою класу Java: %s"
 #: src/write-java.c:1165
 #, 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:1168
 #, 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
@@ -3048,8 +3405,11 @@ msgstr "помилка при відкриванні «%s» для запису"
 
 #: src/write-po.c:803
 #, 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:1254 src/write-po.c:1383
 #, c-format
@@ -3087,12 +3447,15 @@ 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
@@ -3101,8 +3464,10 @@ 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
@@ -3243,7 +3608,8 @@ msgstr "Для рядка, видобутого з елемента «%s», не
 #: src/x-glade.c:686
 #, 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:841 src/x-glade.c:848
 #, c-format
@@ -3438,8 +3804,12 @@ 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:558
 #, c-format
@@ -3449,7 +3819,9 @@ msgstr "%s:%d: попередження: літерал формального �
 #: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
-msgstr "--join-existing не може використовуватись, якщо вивід направляється у стандартний вивід"
+msgstr ""
+"--join-existing не може використовуватись, якщо вивід направляється у "
+"стандартний вивід"
 
 #: src/xgettext.c:641
 #, c-format
@@ -3459,7 +3831,8 @@ msgstr "xgettext не може працювати без вказаних клю
 #: src/xgettext.c:785
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr "попередження: у файлі «%s» невідоме розширення «%s»; спроба використати C"
+msgstr ""
+"попередження: у файлі «%s» невідоме розширення «%s»; спроба використати C"
 
 #: src/xgettext.c:836
 #, c-format
@@ -3468,8 +3841,12 @@ msgstr "Витягує рядки для перекладу з вказаних
 
 #: 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=НАЗВА  виводити у файл НАЗВА.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:861
 #, c-format
@@ -3478,8 +3855,11 @@ msgstr "  -o, --output=ФАЙЛ           записувати вивід у в�
 
 #: src/xgettext.c:863
 #, 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:868
 #, c-format
@@ -3490,16 +3870,20 @@ 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)\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)\n"
 
@@ -3510,7 +3894,9 @@ msgstr "  -C, --c++                   скорочення для --language=C++
 
 #: 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:884
@@ -3530,24 +3916,30 @@ msgstr "Типово, вважається, що вхідні файли у ко
 #: src/xgettext.c:892
 #, 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:894
 #, 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: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 ""
-"  -cТЕҐ, --add-comments[=ТЕҐ] вставляє блок коментарів з ТЕҐ-ом і попередніми\n"
-"                               рядками ключових слів у файлі виведених даних\n"
-"  -c, --add-comments          вставляє всі блоки коментарів, яким передують рядки\n"
+"  -cТЕҐ, --add-comments[=ТЕҐ] вставляє блок коментарів з ТЕҐ-ом і "
+"попередніми\n"
+"                               рядками ключових слів у файлі виведених "
+"даних\n"
+"  -c, --add-comments          вставляє всі блоки коментарів, яким передують "
+"рядки\n"
 "                               ключових слів у файлі виведених даних\n"
 
 #: src/xgettext.c:902
@@ -3564,12 +3956,14 @@ 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"
 
@@ -3585,7 +3979,8 @@ msgstr ""
 #: 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=СЛОВО:АРГ:ОЗНАКА додаткова ознака для рядків посеред номера\n"
@@ -3595,19 +3990,22 @@ 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:927
 #, 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:929
 #, c-format
@@ -3636,8 +4034,10 @@ msgstr "      --boost                 розпізнавати рядки у ф�
 
 #: src/xgettext.c:943
 #, 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:968
 #, c-format
@@ -3651,46 +4051,63 @@ msgstr "      --copyright-holder=РЯДОК  встановити власник
 
 #: src/xgettext.c:985
 #, 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:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr "      --package-name=ПАКУНОК  встановити назву пакунка у виведених даних\n"
+msgstr ""
+"      --package-name=ПАКУНОК  встановити назву пакунка у виведених даних\n"
 
 #: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
-msgstr "      --package-version=ВЕРСІЯ   встановити версію пакунка у виведених даних\n"
+msgstr ""
+"      --package-version=ВЕРСІЯ   встановити версію пакунка у виведених "
+"даних\n"
 
 #: src/xgettext.c:991
 #, c-format
-msgid "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
-msgstr "      --msgid-bugs-address=EMAIL@АДРЕСА   адреса звітування про помилки у 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: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[РЯДОК], --msgstr-prefix[=РЯДОК]    вживати РЯДОК або \"\" як префікс елементів\n"
+"  -m[РЯДОК], --msgstr-prefix[=РЯДОК]    вживати РЯДОК або \"\" як префікс "
+"елементів\n"
 "                                msgstr\n"
 
 #: 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[РЯДОК], --msgstr-suffix[=РЯДОК]    вживати РЯДОК або \"\" як суфікс елементів\n"
+"  -M[РЯДОК], --msgstr-suffix[=РЯДОК]    вживати РЯДОК або \"\" як суфікс "
+"елементів\n"
 "                                msgstr\n"
 
 #: src/xgettext.c:1817
 #, 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:1916
 msgid "standard input"
@@ -3718,13 +4135,21 @@ msgstr "%s%s: попередження: "
 
 #: src/xgettext.c:2138
 #, c-format
-msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Хоча й використовується у позиції рядку формату, %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:2139
 #, c-format
-msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
-msgstr "Хоча й заявлений як такий, %s не є правильним %s рядком формату. Причина: %s\n"
+msgid ""
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
+msgstr ""
+"Хоча й заявлений як такий, %s не є правильним %s рядком формату. Причина: "
+"%s\n"
 
 #: src/xgettext.c:2170
 #, c-format
@@ -3762,7 +4187,9 @@ msgstr "попередження: відсутній контекст для к�
 #: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "попередження: відсутній контекст для множинного аргументу ключового слова '%.*s'"
+msgstr ""
+"попередження: відсутній контекст для множинного аргументу ключового слова "
+"'%.*s'"
 
 #: src/xgettext.c:2942
 #, c-format
@@ -3807,12 +4234,16 @@ 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 ae88786..52fb2c6 100644
--- a/gettext-tools/po/vi.po
+++ b/gettext-tools/po/vi.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: 2013-06-25 17:48+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2013-06-26 07:49+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -178,12 +178,16 @@ 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:1131
 #: src/write-java.c:1143
@@ -201,7 +205,8 @@ 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
@@ -323,15 +328,19 @@ 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
@@ -349,17 +358,24 @@ 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
@@ -369,7 +385,8 @@ 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
@@ -389,21 +406,29 @@ 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
@@ -423,13 +448,18 @@ msgstr "Trong chỉ thị số %u, không cho phép độ chính xác nằm trư
 
 #: src/format-gcc-internal.c:334
 #, c-format
-msgid "In the directive number %u, the argument number for the precision must be equal to %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
 msgstr "Trong chỉ thị số %u, số đối số cho độ chính xác phải bằng %u."
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
-msgstr "Trong chỉ thị số %u, không cho phép đặc tả độ chính xác nằm trước “%c”."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
+msgstr ""
+"Trong chỉ thị số %u, không cho phép đặc tả độ chính xác nằm trước “%c”."
 
 #: src/format-gcc-internal.c:406
 #, c-format
@@ -466,42 +496,61 @@ 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
@@ -511,13 +560,18 @@ 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
@@ -526,13 +580,19 @@ 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
@@ -541,20 +601,31 @@ 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
@@ -584,8 +655,11 @@ 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
@@ -594,7 +668,9 @@ 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
@@ -604,12 +680,17 @@ 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:374 src/format-python-brace.c:387
@@ -619,33 +700,49 @@ 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:136
 #, c-format
@@ -655,7 +752,9 @@ msgstr "Trong chỉ thị số %u, “%c” không thể bắt đầu bằng m�
 #: src/format-python-brace.c:149
 #, 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:164
 #, c-format
@@ -664,8 +763,11 @@ msgstr "Trong chỉ thị số %u, “%c” không thể bắt đầu bằng m�
 
 #: src/format-python-brace.c:184
 #, 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:210
 #, c-format
@@ -674,20 +776,31 @@ 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."
@@ -695,12 +808,16 @@ 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:344 src/msgcat.c:289 src/msgcmp.c:172
@@ -775,7 +892,8 @@ 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"
@@ -825,7 +943,8 @@ 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
@@ -869,8 +988,11 @@ msgstr ""
 #: 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 "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: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
@@ -890,7 +1012,8 @@ msgstr "  TẬP_TIN_ĐẦU_VÀO             tập tin PO đầu vào\n"
 #: 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=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"
@@ -899,7 +1022,8 @@ msgstr ""
 #: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
-msgstr "Không đưa ra tập tin đầ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: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
@@ -934,12 +1058,15 @@ msgstr "Chọn chuỗi:\n"
 
 #: src/msgattrib.c:445
 #, 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:447
 #, 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"
@@ -979,7 +1106,8 @@ msgstr "      --set-fuzzy             đặt mọi chuỗi là “fuzzy” (tạ
 #: src/msgattrib.c:462
 #, 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:464
 #, c-format
@@ -997,24 +1125,30 @@ 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:471
 #, 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: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=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: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=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"
@@ -1022,12 +1156,16 @@ msgstr ""
 #: src/msgattrib.c:477
 #, 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:479
 #, 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: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
@@ -1040,7 +1178,8 @@ msgstr "Cú pháp tập tin đầu vào:\n"
 #: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
 #: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, 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"
@@ -1048,7 +1187,9 @@ msgstr ""
 #: 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     tập tin đầu vào có cú pháp .strings kiểu\n"
 "                              NeXTstep/GNUstep\n"
@@ -1068,11 +1209,13 @@ 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"
@@ -1092,14 +1235,18 @@ msgstr ""
 #: 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             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: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                dùng ký tự thoát C trong kết xuất,\n"
 "                              không dùng ký tự mở rộng\n"
@@ -1109,7 +1256,8 @@ msgstr ""
 #: 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              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:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
 #: src/xgettext.c:960
@@ -1121,34 +1269,43 @@ msgstr "  -i, --indent                ghi ra tập tin PO có thụt lề\n"
 #: src/xgettext.c:962
 #, 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: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          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: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                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: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     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: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    ghi ra tập tin .strings (chuỗi)\n"
 "                              kiểu NeXTstep/GNUstep\n"
@@ -1168,7 +1325,8 @@ 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:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
@@ -1228,7 +1386,9 @@ msgstr "  TẬP_TIN_ĐẦU_VÀO ...         những tập tin đầu vào\n"
 #: 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=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:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
 #: src/xgettext.c:854
@@ -1260,13 +1420,15 @@ 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: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      tập tin đầu vào có cú pháp kiểu .properties\n"
 "                              (thuộc tính) của Java\n"
@@ -1297,8 +1459,11 @@ msgstr ""
 
 #: 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=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.
@@ -1347,7 +1512,9 @@ 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:546
 #, c-format
@@ -1356,8 +1523,12 @@ msgstr "Sửa đổi thao tác:\n"
 
 #: 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          á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:550
 #, c-format
@@ -1447,7 +1618,8 @@ msgstr ""
 
 #: 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          không ghi dòng đầu có mục “msgid \"\"” \n"
 
 #: src/msgconv.c:306
@@ -1474,12 +1646,14 @@ msgstr "  -i, --indent                thụt lề cho kết xuất\n"
 #: src/msgmerge.c:581
 #, 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: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"
+msgid ""
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 "      --add-location          giữ lại dòng kiểu “#: tên_tập_tin:số_dòng”\n"
 "                              (mặc định)\n"
@@ -1594,7 +1768,8 @@ 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:421
@@ -1604,13 +1779,17 @@ msgstr "TÙY CHỌN LỌC hữu ích khi BỘ LỌC là “sed”:\n"
 
 #: src/msgfilter.c:423
 #, 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: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=TẬP_TIN_VĂN_LỆNH\n"
@@ -1619,12 +1798,14 @@ msgstr ""
 
 #: 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       thu hồi khả năng tự động in miền mẫu\n"
 
 #: 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             không dùng ký tự thoát C trong kết xuất\n"
 "                              (mặc định)\n"
@@ -1636,8 +1817,11 @@ msgstr "      --indent                kiểu dáng kết xuất đã thụt lề
 
 #: src/msgfilter.c:454
 #, 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:304
 #, c-format
@@ -1732,14 +1916,18 @@ msgstr "Chế độ thao tác:\n"
 
 #: 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                  chế độ Java: tạo ra lớp ResourceBundle\n"
 "                               (bó tài nguyên) kiểu Java\n"
 
 #: 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                 giống như --java, và coi là Java2\n"
 "                               (JDK 1.2 hay sau)\n"
@@ -1747,29 +1935,38 @@ msgstr ""
 #: src/msgfmt.c:683
 #, 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: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      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:687
 #, 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:689
 #, 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:696
 #, 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:698 src/xgettext.c:865
 #, c-format
@@ -1789,20 +1986,24 @@ msgstr "  -r, --resource=TÀI_NGUYÊN   tên của tài nguyên\n"
 #: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
 #: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, 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: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 THƯ_MỤC                 thư mục cơ sở của phân cấp thư mục lớp\n"
 
 #: 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 ""
@@ -1817,7 +2018,9 @@ msgstr "Vị trí của tập tin xuất trong chế độ C#:\n"
 
 #: 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 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"
@@ -1840,7 +2043,8 @@ msgstr "Vị trí của tập tin xuất trong chế độ Tcl:\n"
 #: src/msgfmt.c:731 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:733
 #, c-format
@@ -1860,7 +2064,8 @@ 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"
@@ -1876,7 +2081,9 @@ msgstr ""
 
 #: 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          kiểm tra có mục nhập phần đầu đúng\n"
 
 #: src/msgfmt.c:754
@@ -1890,7 +2097,9 @@ msgstr ""
 
 #: 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   kiểm tra msgfmt của GNU ứng xử\n"
 "                              giống như msgfmt của X/Open\n"
@@ -1898,7 +2107,8 @@ msgstr ""
 #: 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[=K.TỰ] kiểm tra có ký tự tâng tốc bàn phím\n"
@@ -1911,23 +2121,33 @@ msgstr "  -f, --use-fuzzy             dùng mục nhập tạm dịch trong kế
 
 #: src/msgfmt.c:767
 #, 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: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=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:772
 #, 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 duy nhất\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 duy "
+"nhất\n"
 
 #: src/msgfmt.c:781
 #, c-format
@@ -1957,7 +2177,8 @@ msgstr "cảnh báo: phần đầu tập tin PO thiếu thông tin\n"
 #: src/msgfmt.c:912
 #, 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:936
 #, c-format
@@ -2003,8 +2224,12 @@ msgstr "gặp lỗi khi đọc “%s”"
 
 #: 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 "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:516
 #, c-format, no-wrap
@@ -2100,7 +2325,8 @@ msgstr ""
 
 #: 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                dùng ký tự thoát dạng C trong kết xuất,\n"
 "                              không có ký tự đã mở rộng\n"
@@ -2113,7 +2339,8 @@ msgstr "      --sort-output           tạo ra kết xuất được sắp xếp
 #: src/msggrep.c:620
 #, 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 ""
@@ -2159,10 +2386,12 @@ 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
@@ -2187,7 +2416,8 @@ 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
@@ -2220,8 +2450,10 @@ msgstr "tiến trình phụ %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"
@@ -2248,13 +2480,17 @@ 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 nhập 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
@@ -2280,13 +2516,16 @@ 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
@@ -2373,8 +2612,12 @@ msgid "plural expression can produce integer overflow"
 msgstr "biểu 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 "biểu 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 ""
+"biểu 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
@@ -2387,11 +2630,15 @@ 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 nhập 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 nhập 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 nhập 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 nhập 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"
@@ -2420,9 +2667,12 @@ 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 nhập 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 nhập 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;\""
@@ -2455,7 +2705,9 @@ msgstr "cả hai mục nhập “msgid” và “msgstr” đều không kết t
 
 #: 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
@@ -2485,7 +2737,8 @@ 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"
@@ -2494,19 +2747,31 @@ msgstr "tập tin đầu vào không chứa mục nhập phần đầu xác đ�
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
 #: src/x-python.c:665 src/xgettext.c:708
 #, 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:715
 #, 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:383 src/msgmerge.c:389
 #, c-format
@@ -2557,7 +2822,8 @@ 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:514
@@ -2587,12 +2853,14 @@ msgstr "      --backup=ĐIỀU_KHIỂN     sao lưu tập tin cũ.po (_sao lưu_
 #: src/msgmerge.c:532
 #, 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: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"
@@ -2615,7 +2883,8 @@ msgstr ""
 #: 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 ""
 "Hậu tố sao lưu là “~” trừ khi được đặt bằng tùy chọn “--suffix” (hậu tố)\n"
@@ -2623,8 +2892,11 @@ msgstr ""
 
 #: src/msgmerge.c:552
 #, 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:609 src/urlget.c:192
 #, c-format
@@ -2643,8 +2915,12 @@ msgstr "chuỗi này không nên dùng ở dạng thức số nhiều"
 
 #: src/msgmerge.c:2030
 #, 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:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2665,11 +2941,14 @@ 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"
@@ -2683,14 +2962,17 @@ 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"
@@ -2708,7 +2990,8 @@ 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"
@@ -2752,7 +3035,8 @@ 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:330
 #, c-format, no-wrap
@@ -2783,7 +3067,9 @@ msgstr "  -d, --repeated              in ra chỉ bản sao (trùng nhau)\n"
 
 #: 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                chỉ in ra chuỗi duy nhất, hủy các bản sao\n"
 "                              (trùng nhau)\n"
@@ -2980,7 +3266,8 @@ 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
@@ -3070,24 +3357,46 @@ 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
@@ -3121,7 +3430,9 @@ msgstr "không phải tên lớp Java hợp lệ: %s"
 #: src/write-java.c:1165
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
-msgstr "lỗi biên dịch 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:1168
 #, c-format
@@ -3135,7 +3446,8 @@ msgstr "gặp lỗi khi mở “%s” để ghi"
 
 #: 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 "chuỗi đã quốc tế hóa không nên chứa dãy thoát “\\%c”"
 
 #: src/write-po.c:1254 src/write-po.c:1383
@@ -3175,7 +3487,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 ""
@@ -3323,12 +3636,14 @@ 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:561
 #, c-format
@@ -3420,7 +3735,9 @@ msgstr "%s:%d: cảnh báo: Gặp kết thúc BTCQ quá sớm"
 #: 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
@@ -3544,8 +3861,12 @@ msgstr "%s:%d: biểu 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:558
 #, c-format
@@ -3555,7 +3876,9 @@ msgstr "%s:%d: cảnh báo: gặp kết thúc biểu thức chính quy quá sớ
 #: src/xgettext.c:636
 #, 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:641
 #, c-format
@@ -3574,7 +3897,9 @@ msgstr "Trích các chuỗi có thể dịch ra những tập tin đầu vào đ
 
 #: src/xgettext.c:859
 #, 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"
@@ -3586,8 +3911,10 @@ msgstr "  -o, --output=TẬP_TIN        ghi kết xuất vào tập tin này\n"
 
 #: src/xgettext.c:863
 #, 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:868
 #, c-format
@@ -3598,28 +3925,37 @@ 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)\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)\n"
 
 #: src/xgettext.c:877
 #, 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:879
 #, 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:884
 #, c-format
@@ -3643,14 +3979,17 @@ msgstr "  -j, --join-existing         nối lại các chuỗi với tập tin �
 #: src/xgettext.c:894
 #, 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 nhập từ tập tin này sẽ không được trích ra\n"
+msgstr ""
+"  -x, --exclude-file=TẬP_TIN.po mục nhập từ tập tin này sẽ không được trích "
+"ra\n"
 
 #: 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 ""
 "  -cTHẺ, --add-comments=THẺ   để vào tập tin kết xuất các khối ghi chú\n"
@@ -3672,12 +4011,14 @@ 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"
 
@@ -3693,7 +4034,8 @@ msgstr ""
 #: 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=TỪ:ĐỐI_SỐ:CỜ    cờ phụ thêm cho chuỗi nằm bên trong đối số\n"
@@ -3703,12 +4045,14 @@ 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"
 
@@ -3720,7 +4064,8 @@ msgstr "  -T, --trigraphs             hiểu chữ ba C kiểu ANSI để nhập
 #: src/xgettext.c:929
 #, 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:931
 #, c-format
@@ -3744,8 +4089,11 @@ msgstr "      --boost                 chấp nhận chuỗi định dạng Boost
 
 #: src/xgettext.c:943
 #, 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:968
 #, c-format
@@ -3757,11 +4105,13 @@ msgstr ""
 #: src/xgettext.c:983
 #, 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: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          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"
@@ -3774,19 +4124,23 @@ msgstr "      --package-name=GÓI      đặt tên gói trong kết xuất\n"
 #: src/xgettext.c:989
 #, 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: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=ĐỊ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: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[CHUỖI], --msgstr-prefix[=CHUỖI]    dùng CHUỖI này hay \"\"\n"
@@ -3795,7 +4149,8 @@ msgstr ""
 #: 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[CHUỖI],  --msgstr-suffix[=CHUỖI]   dùng chuỗi này hay \"\" làm hậu tố\n"
@@ -3803,8 +4158,11 @@ msgstr ""
 
 #: src/xgettext.c:1817
 #, 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:1916
 msgid "standard input"
@@ -3832,13 +4190,21 @@ msgstr "%s%s: cảnh báo: "
 
 #: 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 "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:2139
 #, 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:2170
 #, c-format
@@ -3910,4 +4276,5 @@ 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 7238b60..566f52d 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: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+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:611 gnulib-lib/copy-file.c:216
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
 #, c-format
 msgid "preserving permissions for %s"
 msgstr "保存 %s 的权限"
 
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:194
 #, c-format
 msgid "error while opening %s for reading"
 msgstr "读取 %s 时出错"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "无法写入备份文件 %s"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, c-format
 msgid "error reading %s"
 msgstr "读取 %s 出错"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, c-format
 msgid "error writing %s"
 msgstr "写入 %s 出错"
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, c-format
 msgid "error after reading %s"
 msgstr "读取 %s 后出错"
@@ -212,7 +212,7 @@ msgstr "%s 子进程 I/O 错误"
 
 #: gnulib-lib/obstack.c:413 gnulib-lib/obstack.c:415 gnulib-lib/xmalloc.c:37
 #: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "内存耗尽"
@@ -277,7 +277,7 @@ msgstr "“"
 msgid "'"
 msgstr "”"
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr "设置 %s 的权限"
@@ -310,27 +310,28 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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”读取时出错"
 
-#: src/format.c:148
+#: 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"
 
 #: 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-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
-#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: 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
@@ -339,9 +340,10 @@ 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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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
 #, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "参数 %3$u 的指定格式在“%1$s”和“%2$s”中不同"
@@ -353,8 +355,12 @@ 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
@@ -367,7 +373,8 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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 "“%s”和“%s”中的指定格式数量不匹配"
@@ -383,12 +390,14 @@ 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
@@ -397,7 +406,9 @@ 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
@@ -417,12 +428,16 @@ msgstr "第 %u 条指令中，“%c”前不允许有精度。"
 
 #: src/format-gcc-internal.c:334
 #, c-format
-msgid "In the directive number %u, the argument number for the precision must be equal to %u."
+msgid ""
+"In the directive number %u, the argument number for the precision must be "
+"equal to %u."
 msgstr "第 %u 条指令中，精度的参数个数必须是 %u 个。"
 
 #: src/format-gcc-internal.c:398
 #, c-format
-msgid "In the directive number %u, a precision specification is not allowed before '%c'."
+msgid ""
+"In the directive number %u, a precision specification is not allowed before "
+"'%c'."
 msgstr "第 %u 条指令中，‘%c’前不允许指定精度。"
 
 #: src/format-gcc-internal.c:406
@@ -460,32 +475,43 @@ msgid "The string ends in the middle of a directive."
 msgstr "字符串于指令中间结束。"
 
 #: src/format-invalid.h:25
-msgid "The string refers to arguments both through absolute argument numbers and through unnumbered argument specifications."
+msgid ""
+"The string refers to arguments both through absolute argument numbers and "
+"through unnumbered argument specifications."
 msgstr "字符串同时使用两种方式引用了参数：绝对参数编号和未编号参数指定符。"
 
 #: src/format-invalid.h:28
 #, c-format
-msgid "In the directive number %u, the argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the argument number 0 is not a positive integer."
 msgstr "第 %u 条指令中，第 0 个参数不是正整数。"
 
 #: src/format-invalid.h:30
 #, c-format
-msgid "In the directive number %u, the width's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the width's argument number 0 is not a positive "
+"integer."
 msgstr "第 %u 条指令中，宽度的第 0 个参数不是正整数。"
 
 #: src/format-invalid.h:32
 #, c-format
-msgid "In the directive number %u, the precision's argument number 0 is not a positive integer."
+msgid ""
+"In the directive number %u, the precision's argument number 0 is not a "
+"positive integer."
 msgstr "第 %u 条指令中，精度的第 0 个参数不是正整数。"
 
 #: src/format-invalid.h:36
 #, c-format
-msgid "In the directive number %u, the character '%c' is not a valid conversion specifier."
+msgid ""
+"In the directive number %u, the character '%c' is not a valid conversion "
+"specifier."
 msgstr "第 %u 条指令中，字符“%c”不是有效的对话指定符。"
 
 #: src/format-invalid.h:37
 #, c-format
-msgid "The character that terminates the directive number %u is not a valid conversion specifier."
+msgid ""
+"The character that terminates the directive number %u is not a valid "
+"conversion specifier."
 msgstr "终止第 %u 条指令的字符不是有效的转换指示符。"
 
 #: src/format-invalid.h:40
@@ -495,7 +521,9 @@ 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
@@ -505,12 +533,15 @@ 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
@@ -520,12 +551,15 @@ 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
@@ -535,19 +569,26 @@ 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
@@ -578,7 +619,9 @@ 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
@@ -602,16 +645,22 @@ 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-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-sh.c:308
 #, 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
@@ -621,39 +670,77 @@ 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:136
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "第 %u 条指令中，“%c”后面没有数字。"
+
+#: src/format-python-brace.c:149
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr "第 %u 条指令中，“{”后没有参数编号。"
+
+#: src/format-python-brace.c:164
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "第 %u 条指令中，“%c”后面没有数字。"
+
+#: src/format-python-brace.c:184
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr "第 %u 条指令中，“%c”前不允许有精度。"
+
+#: src/format-python-brace.c:210
+#, 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
@@ -662,19 +749,23 @@ 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:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -687,17 +778,17 @@ 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:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -709,11 +800,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "参数太多"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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 "试试“%s --help”查看帮助信息。\n"
@@ -741,7 +832,8 @@ 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"
 
@@ -750,29 +842,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:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: 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:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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"
@@ -781,11 +873,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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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"
 
@@ -794,87 +886,89 @@ msgstr "将错误报告至 <bug-gnu-gettext@gnu.org>。\n"
 msgid "could not get host name"
 msgstr "无法获得主机名"
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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:412
+#: 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:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, c-format
 msgid "Input file location:\n"
 msgstr "输入文件的位置：\n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:428 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:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: 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:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: 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:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr "输出文件位置：\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/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:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -883,92 +977,106 @@ msgid ""
 "or if it is -.\n"
 msgstr "如果没有指定输出文件或输出文件是 -，则将结果写入至标准输出。\n"
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: 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:438
+#: 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:440
+#: 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:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              删除标为模糊的消息\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            保留标为模糊的消息\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           移除过时 #~ 的消息\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         保留过时 #~ 的消息\n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "属性操纵：\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             全部消息设为“模糊”\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           全部消息清除“模糊”属性\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          全部消息设为过时\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        全部消息清除过时属性\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, fuzzy, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr "      --previous              保留已翻译条目的 msgids\n"
+
+#: src/msgattrib.c:471
 #, 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:463
+#: 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=文件.po     只处理列在 文件.po 中的项\n"
 
-#: src/msgattrib.c:465
+#: 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=文件.po   只处理未列在 文件.po 中的项\n"
 
-#: src/msgattrib.c:467
+#: 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:469
+#: 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:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: 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
@@ -976,131 +1084,143 @@ msgstr "      --obsolete              等于 --only-obsolete --clear-obsolete\n"
 msgid "Input file syntax:\n"
 msgstr "输入文件的语法：\n"
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr "输出细节：\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/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:929
+#: 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                 总是使用颜色及其它文本属性\n"
 "      --color=WHEN            如果符合 WHEN，就使用颜色及其它文本属性。\n"
-"                              WHEN 可以是‘always’，‘never’，‘auto’或‘html’。\n"
+"                              WHEN 可以"
+"是‘always’，‘never’，‘auto’或‘html’。\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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=STYLEFILE       为 --color 参数指定 CSS 样式文件\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: 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"
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: 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:937
+#: 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 转码序列，没有扩展字符\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: 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:939
+#: 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:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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          生成“#: 文件名:行号”位置行(默认)\n"
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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                写入极为严格的 Uniforum 使 .po 文件保持一致\n"
+msgid ""
+"      --strict                write out strict Uniforum conforming .po file\n"
+msgstr ""
+"      --strict                写入极为严格的 Uniforum 使 .po 文件保持一致\n"
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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=数字            设置输出页面宽度\n"
 
-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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"
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: 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:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: 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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          按文件位置排序输出\n"
@@ -1110,7 +1230,7 @@ msgstr "  -F, --sort-by-file          按文件位置排序输出\n"
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "不可能出现的选择条件 (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "用法：%s [选项] [输入文件]...\n"
@@ -1138,18 +1258,18 @@ msgstr ""
 "翻译内容、自行加上的批注和源程序代码批注，以及文件中的位置等都会累积，\n"
 "除非使用了 --use-first选项，那样则会由第一个包含该翻译条目的文件获取数据。\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  输入文件 ...                输入文件\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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=文件       由<文件>读入输入文件的列表\n"
 
 #: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "如果输入文件为 -，则将读取标准输入。\n"
@@ -1184,7 +1304,8 @@ msgstr ""
 #: 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:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
@@ -1193,7 +1314,8 @@ msgstr "  -P, --properties-input      输入文件以 Java .properties 语法给
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
-msgstr "      --stringtable-input     输入文件以 NeXTstep/GNUstep .strings 语法给出\n"
+msgstr ""
+"      --stringtable-input     输入文件以 NeXTstep/GNUstep .strings 语法给出\n"
 
 #: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
 #, c-format
@@ -1211,7 +1333,8 @@ msgstr ""
 
 #: 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.
@@ -1267,7 +1390,9 @@ msgstr "操作修饰：\n"
 
 #: 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:550
@@ -1355,9 +1480,10 @@ msgstr ""
 "  ->, --more-than=数字        只打印出现次数多于指定次数的消息，若没有\n"
 "                              指定次数则默认值为 1\n"
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: 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           不写入带有“msgid \"\"”项的文件头项\n"
 
 #: src/msgconv.c:306
@@ -1389,7 +1515,8 @@ msgstr "      --no-location           排除“#: filename:line”行\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"
+msgid ""
+"      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr "      --add-location          保留“#: filename:line”行(默认)\n"
 
 #: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
@@ -1398,7 +1525,7 @@ msgstr "      --add-location          保留“#: filename:line”行(默认)\n"
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                严格的 Uniforum 输出风格\n"
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "没有给出输入文件"
@@ -1510,24 +1637,28 @@ msgstr "当过滤器是“sed”时可用的过滤选项：\n"
 
 #: 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: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: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: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:452 src/msggrep.c:601
@@ -1537,7 +1668,8 @@ msgstr "      --indent                缩进的输出风格\n"
 
 #: 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:304
@@ -1551,7 +1683,7 @@ msgid "invalid endianness: %s"
 msgstr "无效的 endianness：%s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
@@ -1611,7 +1743,7 @@ msgstr "用法：%s [选项] 文件名.po ...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "由文字模式描述生成二进制消息文件。\n"
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1625,19 +1757,23 @@ msgstr ""
 msgid "  filename.po ...             input files\n"
 msgstr "  文件名.po ...               输入文件\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: 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: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: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"
@@ -1649,12 +1785,15 @@ msgstr "      --csharp                C# 模式：生成 .NET .dll 文件\n"
 
 #: 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: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:689
@@ -1667,7 +1806,7 @@ msgstr "      --qt                    Qt 模式：生成 Qt .qm 文件\n"
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                使用严格的 Uniforum 模式\n"
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "如果输出文件是 -，则会将结果写入至标准输出。\n"
@@ -1685,18 +1824,23 @@ msgstr "  -r, --resource=资源         资源名称\n"
 #: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
 #: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, 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: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: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 ""
@@ -1710,7 +1854,9 @@ msgstr "以 C# 模式输出文件位置：\n"
 
 #: 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:723
@@ -1718,7 +1864,9 @@ 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:727
 #, c-format
@@ -1737,7 +1885,7 @@ msgid ""
 "specified directory.\n"
 msgstr "-l 和 -d 选项是必要的。所生成的 .msg 文件会存放在指定的目录。\n"
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "输入文件的解释：\n"
@@ -1746,7 +1894,8 @@ 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"
@@ -1758,7 +1907,9 @@ msgstr "      --check-format          检查和语言有关的格式字符串\n"
 
 #: 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:754
@@ -1772,15 +1923,20 @@ msgstr ""
 
 #: 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: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:762
 #, c-format
@@ -1789,21 +1945,26 @@ msgstr "  -f, --use-fuzzy             在输出中使用模糊的翻译条目\n"
 
 #: 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: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: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:781
@@ -1868,18 +2029,21 @@ msgstr "%s：警告：源文件包含模糊的翻译条目"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "读取“%s”出错"
 
 #: 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:516
@@ -1965,7 +2129,8 @@ msgstr ""
 
 #: 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:618
@@ -2018,7 +2183,8 @@ 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"
@@ -2035,7 +2201,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 ""
-"如果没有指定输出文件，输出文件的名称将会由 --locale 选项或者用户的语系决定。\n"
+"如果没有指定输出文件，输出文件的名称将会由 --locale 选项或者用户的语系决"
+"定。\n"
 "如果输出文件是“-”，则会将结果写入至标准输出。\n"
 
 #: src/msginit.c:400
@@ -2045,7 +2212,8 @@ 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
@@ -2078,8 +2246,10 @@ 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"
@@ -2105,12 +2275,15 @@ 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
@@ -2119,8 +2292,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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "警告："
@@ -2137,7 +2310,8 @@ 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 ""
@@ -2225,7 +2399,9 @@ 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
@@ -2271,7 +2447,9 @@ 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=<表达式>;”"
@@ -2316,25 +2494,16 @@ msgstr "msgstr 缺少快捷键标记“%c”"
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr 包含过多的快捷键标记“%c”"
 
-#: 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
+#: 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:816
+#, 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"
@@ -2350,20 +2519,26 @@ 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:623 src/xgettext.c:693
+#: 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."
+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:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, 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:383 src/msgmerge.c:389
@@ -2445,7 +2620,8 @@ msgstr "      --suffix=后缀           覆盖默认备份后缀\n"
 #: 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"
@@ -2462,13 +2638,16 @@ msgstr ""
 #: 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: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:609 src/urlget.c:192
@@ -2488,8 +2667,12 @@ msgstr "此消息不应定义复数形式"
 
 #: 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:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
 #: src/urlget.c:437
@@ -2514,7 +2697,9 @@ 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
@@ -2524,12 +2709,16 @@ 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
@@ -2545,7 +2734,8 @@ msgstr "以 Java 模式输入文件位置：\n"
 #: src/msgunfmt.c:462
 #, c-format
 msgid ""
-"The class name is determined by appending the locale name to the resource name,\n"
+"The class name is determined by appending the locale name to the resource "
+"name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 "类名称是由资源名称连同语系名称共同决定的，两者之间会用下划线分隔。\n"
@@ -2561,7 +2751,9 @@ 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
@@ -2611,7 +2803,9 @@ msgstr "  -d, --repeated              只打印重复项\n"
 
 #: 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
@@ -2747,7 +2941,7 @@ msgstr "字符串内遇到行尾"
 msgid "context separator <EOT> within string"
 msgstr "上下文分隔符 <EOT> 出现于字符串中"
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "此文件可能不包含域指令"
@@ -2888,23 +3082,37 @@ 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
@@ -2953,7 +3161,8 @@ msgstr "打开“%s”写入出错"
 
 #: 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:1254 src/write-po.c:1383
@@ -2992,11 +3201,13 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"消息库中的 msgctxt 字符串包含超出 ISO-8859-1 的字符，但 Qt 消息库格式仅在翻译\n"
+"消息库中的 msgctxt 字符串包含超出 ISO-8859-1 的字符，但 Qt 消息库格式仅在翻"
+"译\n"
 "后的字符串中支持 Unicode，在翻译前的字符串中不支持\n"
 
 #: src/write-qt.c:717
@@ -3045,7 +3256,7 @@ msgstr ""
 "消息库有复数翻译\n"
 "但是 Tcl 消息库不支持复数处理\n"
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: 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：警告：未结束的字符串"
@@ -3055,17 +3266,17 @@ msgstr "%s:%d：警告：未结束的字符串"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d：警告：未结束的正规表达式"
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-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:1247
+#: 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:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 msgid "Please specify the source encoding through --from-code."
 msgstr "请用 --from-code 指定源编码"
 
@@ -3105,7 +3316,7 @@ msgstr ""
 "%s:%d：文件结尾处出现了不完整的多字节序列。\n"
 "请通过 --from-code 指定源文件的编码。\n"
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d：iconv 失败"
@@ -3119,7 +3330,7 @@ msgstr ""
 "%s:%d：无效的多字节序列。\n"
 "请通过 --from-code 指定源文件的编码。\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d：警告：无效的 Unicode 字符"
@@ -3139,12 +3350,22 @@ msgstr "%s:%d：警告：期待“}”却发现了“)”"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d：警告：期待“)”却发现了“}”"
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu：%s"
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3158,6 +3379,61 @@ 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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d：警告：未结束的字符串字面"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3193,7 +3469,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:236
+#: 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"
@@ -3201,7 +3477,7 @@ msgstr ""
 "请通过 --from-code 或是注释指定源文件的编码，\n"
 "如 http://www.python.org/peps/pep-0263.html 中所指定的那样。\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:324
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3212,7 +3488,7 @@ msgstr ""
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3223,7 +3499,7 @@ msgstr ""
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3234,7 +3510,7 @@ msgstr ""
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3245,7 +3521,7 @@ msgstr ""
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3256,7 +3532,7 @@ msgstr ""
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "未知编码“%s”。先按照 ASCII 处理。"
@@ -3278,75 +3554,92 @@ 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/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d：警告：未结束的字符串字面"
+
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "输出写到 stdout 时无法使用 --join-existing"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "没有指定关键字 xgettext 将无法工作"
 
-#: src/xgettext.c:770
+#: src/xgettext.c:785
 #, c-format
 msgid "warning: file '%s' extension '%s' is unknown; will try C"
 msgstr "警告：文件“%s”扩展名“%s”未知; 将试试 C"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "从给定的输入文件中提取可翻译的字符串。\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, 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:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=文件           将输出写入指定文件\n"
 
-#: src/xgettext.c:848
+#: 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=目录       输出文件将会存放在<目录>中\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "选择输入文件所用的语言：\n"
 
-#: src/xgettext.c:855
-#, c-format
+#: 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"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 "  -L, --language=名称         识别指定语言\n"
-"                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+"                                (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:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ 的简写\n"
 
-#: src/xgettext.c:863
+#: 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:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3355,27 +3648,28 @@ msgstr ""
 "      --from-code=名称        输入文件的编码\n"
 "                                (除了 Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:871
+#: 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:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         将消息加入已有文件\n"
 
-#: src/xgettext.c:878
+#: src/xgettext.c:894
 #, 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:880
+#: 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   以 TAG 开始放置注释块\n"
@@ -3383,28 +3677,32 @@ msgstr ""
 "  -c, --add-comments          在输出文件中以关键词开启一行，\n"
 "                              并放置所有注释块\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "语言特定选项：\n"
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           提取所有字符串\n"
 
-#: src/xgettext.c:890 src/xgettext.c:897
-#, c-format
+#: src/xgettext.c:906 src/xgettext.c:914
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
-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"
+"                                Lua, JavaScript, Vala)\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:894
+#: src/xgettext.c:911
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3413,147 +3711,167 @@ msgstr ""
 "  -kWORD, --keyword=WORD      查找 WORD 作为一个额外的关键字\n"
 "  -k, --keyword               不使用默认关键字\n"
 
-#: src/xgettext.c:901
+#: 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=单词:参数:标志   在关键字<单词>的指定次序的<参数>中，添加额外的标\n"
+"      --flag=单词:参数:标志   在关键字<单词>的指定次序的<参数>中，添加额外的"
+"标\n"
 "                              志\n"
 
-#: src/xgettext.c:904
-#, c-format
+#: src/xgettext.c:922
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
-"                                Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
-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"
+"                                Lua, JavaScript, Vala)\n"
+msgstr ""
+"                                (仅 C, C++, ObjectiveC, Shell, Python, "
+"Lisp,\n"
+"                                EmacsLisp, librep, Scheme, Java, C#, awk, "
+"Tcl,\n"
 "                                Perl, PHP, GCC-源语言)\n"
 
-#: src/xgettext.c:908
+#: src/xgettext.c:927
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             理解输入时的 ANSI C 分段\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (仅 C, C++, ObjectiveC 语言)\n"
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    识别 Qt 格式字符串\n"
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: 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:916
+#: src/xgettext.c:935
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   识别 KDE 4 格式字符串\n"
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 识别 Boost 格式字符串\n"
 
-#: src/xgettext.c:924
+#: 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:949
+#: 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:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=字符串  在输出中设置版权占位符\n"
 
-#: src/xgettext.c:966
+#: 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          为外语用户省略 FSF 版权\n"
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  输出时设定软件包名字\n"
 
-#: src/xgettext.c:970
+#: src/xgettext.c:989
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  输出时设定软件包版本\n"
 
-#: src/xgettext.c:972
+#: 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@ADDRESS  设置报告 msgid 错误的地址\n"
 
-#: src/xgettext.c:974
+#: 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]  使用 STRING 或 \"\" 作为\n"
 "                                         msgstr 内容的前缀\n"
 
-#: src/xgettext.c:977
+#: 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[=字符串]  使用<字符串>或\"\"作为 msgstr 项的后缀\n"
+msgstr ""
+"  -M[STRING], --msgstr-suffix[=字符串]  使用<字符串>或\"\"作为 msgstr 项的后"
+"缀\n"
 
-#: src/xgettext.c:1783
+#: 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 "--flag 参数并非以 <关键字>:<参数编号>:[遍数-]<标志> 的语法给出：%s"
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "标准输入"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr "%s%s 处有非 ASCII 码字符。"
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr "%s%s 处或之前位置有非 ASCII 码注释。"
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr "%s%s 处有非 ASCII 字符串。"
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s：警告："
 
-#: src/xgettext.c:2104
+#: 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 "尽管在格式字符串的位置使用，但 %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:2105
+#: 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 "以所声明的语言 %2$s 来看，%1$s 不是有效的格式字符串。原因：%3$s\n"
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3565,7 +3883,7 @@ msgstr ""
 "翻译者无法重新编排参数的顺序。\n"
 "请考虑使用带有命名参数和映射的格式字符串，而不是使用参数数组。\n"
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3575,27 +3893,27 @@ msgstr ""
 "gettext(\"\") 将返回文件头项，而不\n"
 "是空字符串。\n"
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "关键字“%.*s”的参数指定含糊"
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "警告：关键字“%.*s”缺少上下文"
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "警告：关键字“%.*s”缺少复数参数上下文"
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "单数和复数的上下文不匹配"
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a 'Makevars' file, please specify\n"
@@ -3607,7 +3925,7 @@ msgstr ""
 " MSGID_BUGS_ADDRESS 变量；\n"
 "否则，请指定 --msgid-bugs-address 命令行选项。\n"
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, c-format
 msgid "language '%s' unknown"
 msgstr "语言“%s”未知"
@@ -3616,6 +3934,12 @@ 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"
 
@@ -3633,11 +3957,14 @@ msgstr "<未命名>"
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+#~ "This is free software; see the source for copying conditions.  There is "
+#~ "NO\n"
+#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
+#~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "版权 (C) %s Free Software Foundation, Inc.\n"
-#~ "本软件是自由软件；请参看源代码中的复制条件。不提供任何形式的担保；对于特定\n"
+#~ "本软件是自由软件；请参看源代码中的复制条件。不提供任何形式的担保；对于特"
+#~ "定\n"
 #~ "用途也没有商用性或任何保全。\n"
 
 #~ msgid ""
diff --git a/gettext-tools/po/zh_TW.po b/gettext-tools/po/zh_TW.po
index dc5226b..d32723c 100644
--- a/gettext-tools/po/zh_TW.po
+++ b/gettext-tools/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools 0.14.5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:22+0900\n"
+"POT-Creation-Date: 2013-07-07 18:21+0900\n"
 "PO-Revision-Date: 2005-12-06 08:31+0800\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -56,33 +56,33 @@ msgstr "無法根據目錄名稱樣式 “%s” 建立暫存檔目錄"
 msgid "write error"
 msgstr "寫入時發生錯誤"
 
-#: gnulib-lib/copy-acl.c:611 gnulib-lib/copy-file.c:216
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
 #, c-format
 msgid "preserving permissions for %s"
 msgstr ""
 
 # lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171 src/urlget.c:204 src/xgettext.c:823 src/xgettext.c:836 src/xgettext.c:846 #, c-format
-#: gnulib-lib/copy-file.c:193
+#: gnulib-lib/copy-file.c:194
 #, fuzzy, c-format
 msgid "error while opening %s for reading"
 msgstr "當開啟檔案 “%s” 準備讀取時發生錯誤"
 
-#: gnulib-lib/copy-file.c:197
+#: gnulib-lib/copy-file.c:198
 #, fuzzy, c-format
 msgid "cannot open backup file %s for writing"
 msgstr "無法開啟備份檔 “%s” 來寫入內容"
 
-#: gnulib-lib/copy-file.c:201
+#: gnulib-lib/copy-file.c:202
 #, fuzzy, c-format
 msgid "error reading %s"
 msgstr "讀取 “%s” 時發生錯誤"
 
-#: gnulib-lib/copy-file.c:205
+#: gnulib-lib/copy-file.c:206
 #, fuzzy, c-format
 msgid "error writing %s"
 msgstr "寫入 “%s” 時發生錯誤"
 
-#: gnulib-lib/copy-file.c:209
+#: gnulib-lib/copy-file.c:210
 #, fuzzy, c-format
 msgid "error after reading %s"
 msgstr "完成讀取 “%s” 後發生錯誤"
@@ -214,7 +214,7 @@ msgstr "%s 副進程輸出/輸入錯誤"
 
 #: 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:600 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "記憶體耗盡"
@@ -279,7 +279,7 @@ msgstr ""
 msgid "'"
 msgstr ""
 
-#: gnulib-lib/set-mode-acl.c:697
+#: gnulib-lib/set-acl.c:46
 #, c-format
 msgid "setting permissions for %s"
 msgstr ""
@@ -313,19 +313,19 @@ 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:1891
-#: src/xgettext.c:1904 src/xgettext.c:1914
+#: 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” 準備讀取時發生錯誤"
 
-#: src/format.c:148
+#: src/format.c:151
 #, fuzzy, c-format
 msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "和 ‘msgid’ 不同，‘%s’ 的 %s 格式字串無效。原因：%s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:627 src/format-librep.c:312
+#: src/format-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
@@ -334,7 +334,7 @@ msgid ""
 msgstr "‘%2$s’ 中第 %1$u 個參數的規格在 ‘msgid’ 中並不存在"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
-#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-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
@@ -343,9 +343,10 @@ 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-librep.c:343
-#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381
-#: src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c: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 個參數的規格並不相同"
@@ -375,7 +376,8 @@ 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-python.c:515 src/format-qt-plural.c:110
+#: 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 "‘msgid’ 和 ‘%s’ 的參數數目不符"
@@ -652,7 +654,9 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: 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’ 中並不存在"
@@ -694,6 +698,32 @@ msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "‘msgid’和‘%s’的參數‘%s’的格式並不相同"
 
+#: src/format-python-brace.c:136
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr "在第 %u 個參數，‘,’ 後面的不是數字。"
+
+#: src/format-python-brace.c:149
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr "在第 %u 個參數，‘,’ 後面的不是數字。"
+
+#: src/format-python-brace.c:164
+#, fuzzy, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr "在第 %u 個參數，‘,’ 後面的不是數字。"
+
+#: src/format-python-brace.c:184
+#, fuzzy, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr "第 %u 個參數的 “%s” 後面缺少了逗號。"
+
+#: src/format-python-brace.c:210
+#, fuzzy, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr "第 %u 個參數的子字串 “%s” 是無效的數字格式。"
+
 #: src/format-qt.c:152
 #, c-format
 msgid ""
@@ -736,11 +766,11 @@ msgid ""
 "1 and 9."
 msgstr "第 %u 個參數最後一個字元不是 1 至 9 之間的整數。"
 
-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: 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:584
+#: 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"
@@ -749,17 +779,17 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: 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:590
+#: 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:343 src/msgcat.c:295 src/msgconv.c:241
+#: 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
@@ -771,11 +801,11 @@ msgstr ""
 msgid "too many arguments"
 msgstr "參數過多"
 
-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: 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:813
+#: 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"
@@ -814,29 +844,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            主機的 IP 地址\n"
 
-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: 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:981
+#: 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:517 src/msgcat.c:470 src/msgcmp.c:260
+#: 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:983
+#: 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:519 src/msgcat.c:472 src/msgcmp.c:262
+#: 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:985
+#: 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"
@@ -845,11 +875,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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: 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:992
+#: 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"
 
@@ -858,37 +888,37 @@ msgstr "請向 <bug-gnu-gettext@gnu.org> 匯報錯誤。\n"
 msgid "could not get host name"
 msgstr "無法取得主機名稱"
 
-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: 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:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: 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:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: 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:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: 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:412
+#: 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:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: 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
@@ -897,50 +927,50 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "長選項必須用的參數在使用短選項時也是必須的。\n"
 
-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: 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:831
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
 #, c-format
 msgid "Input file location:\n"
 msgstr "輸入檔位置：\n"
 
-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c: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:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: 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:837
+#: src/xgettext.c:852
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr "  -D, --directory=目錄        搜尋輸入檔時加入指定<目錄>\n"
 
-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: 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:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: 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:842
+#: src/xgettext.c:857
 #, c-format
 msgid "Output file location:\n"
 msgstr "輸出檔位置：\n"
 
-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/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:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: 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
@@ -949,99 +979,106 @@ msgid ""
 "or if it is -.\n"
 msgstr "如果沒有指定<輸出檔>或<輸出檔>是 ‘-’，則會在標準輸出顯示結果。\n"
 
-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: 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:438
+#: src/msgattrib.c:445
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr "      --translated            只保留已翻譯條目，刪除未翻譯條目\n"
 
-#: src/msgattrib.c:440
+#: src/msgattrib.c:447
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr "      --untranslated          只保留未翻譯條目，刪除已翻譯條目\n"
 
-#: src/msgattrib.c:442
+#: src/msgattrib.c:449
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              刪除加上 'fuzzy' 標記的條目\n"
 
-#: src/msgattrib.c:444
+#: src/msgattrib.c:451
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            只保留加上 'fuzzy' 標記的條目\n"
 
-#: src/msgattrib.c:446
+#: src/msgattrib.c:453
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           刪除過時的條目 (#~)\n"
 
-#: src/msgattrib.c:448
+#: src/msgattrib.c:455
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         只保留過時的條目 (#~) \n"
 
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "處理屬性：\n"
 
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             將所有條目標記為 'fuzzy'\n"
 
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           移除所有條目的 'fuzzy' 狀態\n"
 
-#: src/msgattrib.c:457
+#: src/msgattrib.c:464
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          將所有條目標記為過時\n"
 
-#: src/msgattrib.c:459
+#: src/msgattrib.c:466
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        清除所有條目的過時標記\n"
 
-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, fuzzy, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr "      --translated            只保留已翻譯條目，刪除未翻譯條目\n"
+
+#: src/msgattrib.c:471
 #, fuzzy, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr "      --clear-fuzzy           移除所有條目的 'fuzzy' 狀態\n"
 
-#: src/msgattrib.c:463
+#: src/msgattrib.c:473
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr "      --only-file=FILE.po     只處理 FILE.po 裡已經有的條目\n"
 
-#: src/msgattrib.c:465
+#: 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   只處理 FILE.po 裡沒有的條目\n"
 
-#: src/msgattrib.c:467
+#: 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:469
+#: src/msgattrib.c:479
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr "      --obsolete              等於 --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: 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
@@ -1049,14 +1086,14 @@ msgstr "      --obsolete              等於 --only-obsolete --clear-obsolete\n"
 msgid "Input file syntax:\n"
 msgstr "輸入檔格式：\n"
 
-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: 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      以 Java .properties 格式處理輸入檔\n"
 
-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: 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 ""
@@ -1065,17 +1102,17 @@ msgid ""
 msgstr ""
 "      --stringtable-input     以 NeXTstep/GNUstep .strings 格式處理輸入檔\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: 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:927
+#: src/xgettext.c:946
 #, c-format
 msgid "Output details:\n"
 msgstr "輸出內容細節：\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/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:929
+#: 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"
@@ -1084,16 +1121,16 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: 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:933
+#: 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:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: 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:935
+#: src/xgettext.c:954
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1101,9 +1138,9 @@ msgstr ""
 "  -e, --no-escape             輸出結果不使用 C 轉義控制序列\n"
 "                              (escape sequence)，這是預設運作方式\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: 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:937
+#: src/msguniq.c:390 src/xgettext.c:956
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1112,66 +1149,66 @@ msgstr ""
 "sequence)\n"
 "                              ，而不使用非 ASCII 字元\n"
 
-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: 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:939
+#: 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:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:941
+#: 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:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:943
+#: 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:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:945
+#: 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"
 
-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:947
+#: 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"
 
-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: 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:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: 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:951
+#: 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    產生 NeXTstep/GNUstep .strings 檔案\n"
 
-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: 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:953
+#: 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:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: 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:955
+#: 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"
@@ -1179,16 +1216,16 @@ msgid ""
 msgstr ""
 "      --no-wrap               即使輸出的訊息超出頁寬，也不將輸出的訊息斷行\n"
 
-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: 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:958
+#: 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:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: 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:960
+#: src/xgettext.c:979
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          根據檔案位置排列輸出結果\n"
@@ -1198,7 +1235,7 @@ msgstr "  -F, --sort-by-file          根據檔案位置排列輸出結果\n"
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "不可能出現的選擇條件 (%d < n <%d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "用法：%s [選項] [輸入檔]...\n"
@@ -1224,18 +1261,18 @@ msgstr ""
 "--use-first 選項，那樣則會由第一個含有該翻譯條目的檔案取得資料。\n"
 "所有 PO 檔中的翻譯條目的檔案位置都會累積下來。\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833
+#: 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:390 src/msgcomm.c:381 src/xgettext.c:835
+#: 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:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:839
+#: src/xgettext.c:854
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "如果輸入檔是 - 的話，會由標準輸入讀取資料。\n"
@@ -1444,7 +1481,7 @@ msgid ""
 msgstr ""
 "  ->, --more-than=NUMBER      顯示出現多於指定次數的字句，預設為 1 次\n"
 
-#: src/msgcomm.c:451 src/xgettext.c:962
+#: src/msgcomm.c:451 src/xgettext.c:981
 #, fuzzy, c-format
 msgid ""
 "      --omit-header           don't write header with 'msgid \"\"' entry\n"
@@ -1489,7 +1526,7 @@ msgstr "      --add-location          保留源代碼位置 (預設)\n"
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                嚴格遵從 Uniforum 格式\n"
 
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
 #, c-format
 msgid "no input file given"
 msgstr "未指定輸入檔"
@@ -1648,7 +1685,7 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
 msgid "Ulrich Drepper"
 msgstr ""
 
@@ -1708,7 +1745,7 @@ msgstr "用法：%s [選項] filename.po ...\n"
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "由文字模式翻譯檔產生二元碼翻譯檔。\n"
 
-#: src/msgfmt.c:663 src/xgettext.c:826
+#: 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"
@@ -1720,7 +1757,7 @@ msgstr "長選項必要的參數在使用短選項時也是必要的。對於選
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             輸入檔\n"
 
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
 #, c-format
 msgid "Operation mode:\n"
 msgstr "操作模式：\n"
@@ -1772,7 +1809,7 @@ msgstr "      --qt                    Qt 模式：產生 Qt .qm 檔\n"
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                強制使用 Uniforum 格式翻譯檔\n"
 
-#: src/msgfmt.c:698 src/xgettext.c:850
+#: src/msgfmt.c:698 src/xgettext.c:865
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "如果輸出檔是 - 的話，則會在標準輸出顯示結果。\n"
@@ -1850,7 +1887,7 @@ msgid ""
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:745 src/xgettext.c:866
+#: src/msgfmt.c:745 src/xgettext.c:882
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "輸入檔處理：\n"
@@ -1994,11 +2031,12 @@ msgstr "%s：警告：原始檔包含模糊翻譯條目"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
-#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
-#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91
-#: src/x-tcl.c:150 src/x-ycp.c:91
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "讀取 “%s” 時出現錯誤"
@@ -2253,8 +2291,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:121 src/po-xerror.c:146
-#: src/xgettext.c:3016
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3051
 #, c-format
 msgid "warning: "
 msgstr "警告："
@@ -2459,24 +2497,15 @@ msgstr "msgstr 缺少了捷徑鍵標記‘%c’"
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr 含有過多的捷徑鍵標記‘%c’"
 
-#: src/msgl-check.c:785
-#, fuzzy, c-format
-msgid "header field '%s' missing in header\n"
-msgstr "缺少了標頭欄位‘%s’\n"
-
-#: src/msgl-check.c:793
+#: src/msgl-check.c:801
 #, fuzzy, 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"
+msgid "header field '%s' still has the initial default value\n"
 msgstr "某些標頭欄位仍然是預設值\n"
 
-#: src/msgl-check.c:835
+#: src/msgl-check.c:816
 #, fuzzy, c-format
-msgid "header field '%s' still has the initial default value\n"
-msgstr "某些標頭欄位仍然是預設值\n"
+msgid "header field '%s' missing in header\n"
+msgstr "缺少了標頭欄位‘%s’\n"
 
 #: src/msgl-iconv.c:65
 #, c-format
@@ -2494,7 +2523,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "輸入檔沒有指定字元集的標頭欄位"
 
 #: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:623 src/xgettext.c:693
+#: 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 "
@@ -2511,8 +2540,8 @@ msgid ""
 msgstr ""
 "由 “%s” 轉換至 “%s” 會產生重複訊息：有些本來不同的 msgid 轉換後會變成相同。"
 
-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630
-#: src/xgettext.c:700
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2923,7 +2952,7 @@ msgstr "字串中間突然斷行"
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:332 src/xgettext.c:1004
+#: src/read-catalog.c:332 src/xgettext.c:1023
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "此檔案不能含有 domain 指令"
@@ -3244,7 +3273,7 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr "翻譯檔含有複數型態的翻譯，但 Tcl 的翻譯檔不能處理複數型態\n"
 
-#: src/x-awk.c:341 src/x-python.c:1075
+#: 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: 警告：字串未完結"
@@ -3254,17 +3283,17 @@ msgstr "%s:%d: 警告：字串未完結"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: 警告：正規表示式不完整"
 
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-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:1247
+#: 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:2021
+#: src/x-csharp.c:224 src/xgettext.c:2055
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3307,7 +3336,7 @@ msgstr ""
 "%s:%d: 該行末端出現不完整的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv 失敗"
@@ -3321,7 +3350,7 @@ msgstr ""
 "%s:%d: 出現無效的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1282
+#: src/x-csharp.c:1390 src/x-python.c:1335
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: 警告：Unicode 字元無效"
@@ -3341,12 +3370,22 @@ msgstr "%s:%d: 應該有 ‘)’ 的地方出現了 ‘}’"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: 應該有 ‘}’ 的地方出現了 ‘)’"
 
-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: 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:841 src/x-glade.c:848
 #, fuzzy, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%d:%d: %s"
 
-#: src/x-glade.c:657
+#: src/x-glade.c:875
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3360,6 +3399,63 @@ msgstr ""
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: 警告：字串未完結"
 
+#: src/x-javascript.c:230
+#, fuzzy
+msgid "Please specify the source encoding through --from-code\n"
+msgstr ""
+"%s%s 出現不屬於 ASCII 字元的字串。\n"
+"請使用 --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 ""
+"%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:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: 警告：字串未完結"
+
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3395,7 +3491,7 @@ msgstr "%s:%d: 8bit 字元 “%c” 的轉換 (“\\L”) 無效"
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: 8bit 字元 “%c” 的轉換 (“\\U”) 無效"
 
-#: src/x-python.c:236
+#: src/x-python.c:278
 #, fuzzy
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
@@ -3404,7 +3500,7 @@ msgstr ""
 "%s%s 出現不屬於 ASCII 字元的字串。\n"
 "請使用 --from-code 選項指定源代碼的文字編碼。\n"
 
-#: src/x-python.c:282
+#: src/x-python.c:324
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3414,7 +3510,7 @@ msgstr ""
 "%s:%d: 出現無效的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:299
+#: src/x-python.c:341
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3424,7 +3520,7 @@ msgstr ""
 "%s:%d: 出現無效而且十分長的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:312
+#: src/x-python.c:354
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3434,7 +3530,7 @@ msgstr ""
 "%s:%d: 檔案末端出現不完整的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:322
+#: src/x-python.c:364
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3444,7 +3540,7 @@ msgstr ""
 "%s:%d: 該行末端出現不完整的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:355
+#: src/x-python.c:397
 #, fuzzy, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3454,7 +3550,7 @@ msgstr ""
 "%s:%d: 出現無效的位元組序列。\n"
 "請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
 
-#: src/x-python.c:680
+#: src/x-python.c:722
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
@@ -3482,27 +3578,32 @@ msgid ""
 msgstr ""
 "%s:%lu: 警告：$\"...\" 這種格式因為安全理由已經過時；請改用 eval_gettext"
 
-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: 警告：字串未完結"
+
+#: src/xgettext.c:636
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "當結果被導向至標準輸出時，不可以用 --join-existing 選項"
 
-#: src/xgettext.c:626
+#: src/xgettext.c:641
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "若無關鍵字，xgettext 將無法運作"
 
-#: src/xgettext.c:770
+#: 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:821
+#: src/xgettext.c:836
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "由指定的輸入檔抽取可翻譯的字串。\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:859
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3510,24 +3611,24 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=NAME   使用 NAME.po 作為輸出檔 (而不是 messages.po)\n"
 
-#: src/xgettext.c:846
+#: src/xgettext.c:861
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           將輸出內容寫入至指定檔案\n"
 
-#: src/xgettext.c:848
+#: src/xgettext.c:863
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=DIR        輸出檔會存取在指定目錄\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:868
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "輸入檔的語言選擇：\n"
 
-#: src/xgettext.c:855
-#, c-format
+#: src/xgettext.c:870
+#, fuzzy, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3535,7 +3636,8 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"
 msgstr ""
 "  -L, --language=語言         辨認指定的程式語言\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3545,19 +3647,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:861
+#: src/xgettext.c:877
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ 的簡寫\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "預設的語言是由輸入檔的延伸檔名決定的。\n"
 
-#: src/xgettext.c:868
+#: src/xgettext.c:884
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3566,22 +3668,22 @@ msgstr ""
 "      --from-code=NAME        輸入檔的文字編碼\n"
 "                                (Python, Tcl, Glade 例外)\n"
 
-#: src/xgettext.c:871
+#: 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:876
+#: src/xgettext.c:892
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         合併已存在的訊息檔\n"
 
-#: src/xgettext.c:878
+#: 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:880
+#: src/xgettext.c:896
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3591,30 +3693,31 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:902
 #, c-format
 msgid "Language specific options:\n"
 msgstr "個別語言特殊選項：\n"
 
-#: src/xgettext.c:888
+#: src/xgettext.c:904
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           抽取所有字串\n"
 
-#: src/xgettext.c:890 src/xgettext.c:897
-#, c-format
+#: src/xgettext.c:906 src/xgettext.c:914
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (只適用於 C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:894
+#: src/xgettext.c:911
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3623,7 +3726,7 @@ msgstr ""
 "  -k, --keyword[=WORD]        要留意的額外關鍵字 (如果沒有指定，\n"
 "                              表示不使用預設的關鍵字)\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:919
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3631,66 +3734,67 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:904
-#, c-format
+#: src/xgettext.c:922
+#, fuzzy, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"
 msgstr ""
 "                                (只適用於 C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:908
+#: 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:910
+#: src/xgettext.c:929
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (只適用於 C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:912
+#: src/xgettext.c:931
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    辨認 Qt 格式的字串\n"
 
-#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922
+#: 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:916
+#: src/xgettext.c:935
 #, fuzzy, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --qt                    辨認 Qt 格式的字串\n"
 
-#: src/xgettext.c:920
+#: src/xgettext.c:939
 #, fuzzy, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --qt                    辨認 Qt 格式的字串\n"
 
-#: src/xgettext.c:924
+#: src/xgettext.c:943
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 顯示較詳細的格式字串辨認結果\n"
 
-#: src/xgettext.c:949
+#: 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:964
+#: src/xgettext.c:983
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=STRING  設定輸出檔的版權所有者\n"
 
-#: src/xgettext.c:966
+#: src/xgettext.c:985
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3698,24 +3802,24 @@ msgstr ""
 "      --foreign-user          輸出檔不加上 FSF 的版權宣告，適用於 FSF 以外的"
 "專案\n"
 
-#: src/xgettext.c:968
+#: src/xgettext.c:987
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:970
+#: 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:972
+#: 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"
 
-#: src/xgettext.c:974
+#: src/xgettext.c:993
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3723,7 +3827,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:977
+#: src/xgettext.c:996
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3731,52 +3835,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1783
+#: src/xgettext.c:1817
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
-#: src/xgettext.c:1882
+#: src/xgettext.c:1916
 msgid "standard input"
 msgstr "標準輸入"
 
-#: src/xgettext.c:1986
+#: src/xgettext.c:2020
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1990
+#: src/xgettext.c:2024
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1995
+#: src/xgettext.c:2029
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: 警告："
 
-#: src/xgettext.c:2104
+#: 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 ""
 
-#: src/xgettext.c:2105
+#: src/xgettext.c:2139
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr "縱使表面上 %s 宣告了是 %s 格式字串，但實際上不是。原因為：%s\n"
 
-#: src/xgettext.c:2136
+#: src/xgettext.c:2170
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3785,7 +3889,7 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2198
+#: src/xgettext.c:2232
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3795,27 +3899,27 @@ msgstr ""
 "gettext(\"\") 會回傳檔案開始部份的資訊，\n"
 "並非空白字串。\n"
 
-#: src/xgettext.c:2835
+#: src/xgettext.c:2869
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "%2$s 的參數 %1$s 不明確"
 
-#: src/xgettext.c:2862
+#: src/xgettext.c:2896
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2921
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2908
+#: src/xgettext.c:2942
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:3017
+#: src/xgettext.c:3052
 #, fuzzy
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
@@ -3828,7 +3932,7 @@ msgstr ""
 "MSGID_BUGS_ADDRESS 變數；否則請在指令中\n"
 "使用 --msgid-bugs-address 選項。\n"
 
-#: src/xgettext.c:3227
+#: src/xgettext.c:3267
 #, fuzzy, c-format
 msgid "language '%s' unknown"
 msgstr "不明的語言 ‘%s’"
@@ -3837,6 +3941,13 @@ msgstr "不明的語言 ‘%s’"
 msgid "<unnamed>"
 msgstr "<未命名>"
 
+#, fuzzy
+#~ 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"