summaryrefslogtreecommitdiffstats
path: root/gettext-tools/po/gettext-tools.pot
diff options
context:
space:
mode:
Diffstat (limited to 'gettext-tools/po/gettext-tools.pot')
-rw-r--r--gettext-tools/po/gettext-tools.pot902
1 files changed, 501 insertions, 401 deletions
diff --git a/gettext-tools/po/gettext-tools.pot b/gettext-tools/po/gettext-tools.pot
index 0df02f7..b729aa9 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.3\n"
+"Project-Id-Version: gettext-tools 0.19\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-07-07 18:21+0900\n"
+"POT-Creation-Date: 2014-06-01 11:19+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"
@@ -182,15 +182,15 @@ msgstr ""
msgid "invalid target_version argument to compile_java_class"
msgstr ""
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
-#: src/write-java.c:1143
+#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
#, c-format
msgid "failed to create \"%s\""
msgstr ""
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
+#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr ""
@@ -211,9 +211,9 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr ""
-#: gnulib-lib/obstack.c:413 gnulib-lib/obstack.c:415 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
#, c-format
msgid "memory exhausted"
msgstr ""
@@ -224,7 +224,7 @@ msgid "creation of threads failed"
msgstr ""
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr ""
@@ -311,8 +311,8 @@ 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:1925
-#: src/xgettext.c:1938 src/xgettext.c:1948
+#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
+#: src/xgettext.c:1987 src/xgettext.c:1997
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr ""
@@ -651,7 +651,7 @@ msgid ""
msgstr ""
#: 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-python-brace.c:434 src/format-python-brace.c:447
#: src/format-sh.c:308
#, c-format
msgid "a format specification for argument '%s' doesn't exist in '%s'"
@@ -692,28 +692,28 @@ msgid ""
"format specifications in '%s' and '%s' for argument '%s' are not the same"
msgstr ""
-#: src/format-python-brace.c:136
+#: src/format-python-brace.c:137
#, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
msgstr ""
-#: src/format-python-brace.c:149
+#: src/format-python-brace.c:150
#, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
msgstr ""
-#: src/format-python-brace.c:164
+#: src/format-python-brace.c:165
#, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
msgstr ""
-#: src/format-python-brace.c:184
+#: src/format-python-brace.c:185
#, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
msgstr ""
-#: src/format-python-brace.c:210
+#: src/format-python-brace.c:270
#, c-format
msgid "In the directive number %u, there is an unterminated format directive."
msgstr ""
@@ -759,11 +759,11 @@ msgid ""
"1 and 9."
msgstr ""
-#: src/hostname.c:178 src/msgattrib.c:344 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
-#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
-#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:599
+#: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
+#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
+#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:268
+#: src/msgmerge.c:353 src/msgunfmt.c:262 src/msguniq.c:264
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -772,19 +772,19 @@ msgid ""
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: src/hostname.c:184 src/msgattrib.c:350 src/msgcat.c:295 src/msgcmp.c:178
-#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
-#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
-#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
-#: src/xgettext.c:605
+#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
+#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
+#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:274
+#: src/msgmerge.c:359 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
+#: src/xgettext.c:621
#, c-format
msgid "Written by %s.\n"
msgstr ""
#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:350 src/msgcat.c:295 src/msgconv.c:241
-#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
-#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
+#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:121
#: src/urlget.c:149
msgid "Bruno Haible"
msgstr ""
@@ -794,11 +794,11 @@ msgstr ""
msgid "too many arguments"
msgstr ""
-#: src/hostname.c:207 src/msgattrib.c:410 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
-#: src/msgfilter.c:384 src/msgfmt.c:650 src/msggrep.c:507 src/msginit.c:358
-#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:828
+#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
+#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr ""
@@ -836,29 +836,29 @@ msgstr ""
msgid " -i, --ip-address addresses for the hostname\n"
msgstr ""
-#: src/hostname.c:228 src/msgattrib.c:525 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
-#: src/msgfilter.c:476 src/msgfmt.c:775 src/msggrep.c:623 src/msginit.c:420
-#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
+#: src/hostname.c:228 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
+#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
+#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:420
+#: src/msgmerge.c:606 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
#, c-format, no-wrap
msgid "Informative output:\n"
msgstr ""
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr ""
-#: src/hostname.c:232 src/msgattrib.c:529 src/msgcat.c:472 src/msgcmp.c:262
-#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
-#: src/msgfilter.c:480 src/msgfmt.c:779 src/msggrep.c:627 src/msginit.c:424
-#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1004
+#: src/hostname.c:232 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
+#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
+#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:424
+#: src/msgmerge.c:610 src/msgunfmt.c:531 src/msguniq.c:421
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
#, c-format, no-wrap
msgid " -V, --version output version information and exit\n"
msgstr ""
@@ -867,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:536 src/msgcat.c:479 src/msgcmp.c:269
-#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
-#: src/msgfilter.c:487 src/msgfmt.c:790 src/msggrep.c:634 src/msginit.c:431
-#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1011
+#: src/hostname.c:239 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
+#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
+#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:431
+#: src/msgmerge.c:621 src/msgunfmt.c:540 src/msguniq.c:428
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr ""
@@ -880,230 +880,233 @@ msgstr ""
msgid "could not get host name"
msgstr ""
-#: src/msgattrib.c:365 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
#, c-format
msgid "at most one input file allowed"
msgstr ""
-#: src/msgattrib.c:371 src/msgattrib.c:375 src/msgcat.c:311 src/msgcat.c:315
-#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
-#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
-#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
-#: src/xgettext.c:615 src/xgettext.c:619 src/xgettext.c:626 src/xgettext.c:629
-#: src/xgettext.c:632
+#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
+#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:384
+#: src/msgmerge.c:405 src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:631
+#: src/xgettext.c:638 src/xgettext.c:641 src/xgettext.c:644
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr ""
-#: src/msgattrib.c:414 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
"and manipulates the attributes.\n"
msgstr ""
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
+#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msguniq.c:342
#, c-format
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
-#: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
-#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
-#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
-#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
+#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
+#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:375 src/msgmerge.c:505
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
#, c-format
msgid "Input file location:\n"
msgstr ""
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr ""
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
+#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
+#: src/xgettext.c:875
#, c-format
msgid ""
" -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr ""
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-#: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
-#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
-#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
-#: src/xgettext.c:857
+#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
+#: src/msginit.c:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:880
#, c-format
msgid "Output file location:\n"
msgstr ""
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
+#: src/msggrep.c:540 src/msgmerge.c:525 src/msgunfmt.c:491 src/msguniq.c:356
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr ""
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:527
+#: src/msgunfmt.c:493 src/msguniq.c:358
#, c-format
msgid ""
"The results are written to standard output if no output file is specified\n"
"or if it is -.\n"
msgstr ""
-#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
#, c-format
msgid "Message selection:\n"
msgstr ""
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
msgstr ""
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
msgstr ""
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr ""
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr ""
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr ""
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr ""
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr ""
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr ""
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr ""
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr ""
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr ""
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
" of translated messages.\n"
msgstr ""
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
"messages\n"
msgstr ""
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
msgstr ""
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
msgstr ""
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr ""
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
msgstr ""
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
+#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:391 src/msgmerge.c:560
+#: src/msguniq.c:369
#, c-format
msgid "Input file syntax:\n"
msgstr ""
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
-#: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
-#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
#, c-format
msgid ""
" --stringtable-input input file is in NeXTstep/GNUstep .strings "
"syntax\n"
msgstr ""
-#: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
-#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
-#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
-#: src/xgettext.c:946
+#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
+#: src/msginit.c:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:969
#, c-format
msgid "Output details:\n"
msgstr ""
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:404
+#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
#, c-format
msgid ""
" --color use colors and other text attributes always\n"
@@ -1112,118 +1115,118 @@ msgid ""
"'html'.\n"
msgstr ""
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr ""
-#: src/msgattrib.c:497 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
-#: src/xgettext.c:954
+#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:977
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
msgstr ""
-#: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
-#: src/msguniq.c:390 src/xgettext.c:956
+#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
msgstr ""
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
-#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:964
+#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
+#: src/xgettext.c:987
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr ""
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
+#: src/xgettext.c:989
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
-#: src/msgattrib.c:511 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
-#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
-#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
+#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
+#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr ""
-#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
-#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
-#: src/msgattrib.c:515 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
-#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
-#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:972
+#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
+#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr ""
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:416
+#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
" the output page width, into several lines\n"
msgstr ""
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:601 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1000
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr ""
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:603 src/msguniq.c:414
+#: src/xgettext.c:1002
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
msgstr ""
-#: src/msgcat.c:321 src/msgcomm.c:326
+#: src/msgcat.c:322 src/msgcomm.c:327
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr ""
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr ""
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1237,92 +1240,92 @@ msgid ""
"to define them.\n"
msgstr ""
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr ""
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:850
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
#, c-format
msgid " -f, --files-from=FILE get list of input files from FILE\n"
msgstr ""
-#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:854
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
+#: src/xgettext.c:877
#, c-format
msgid "If input file is -, standard input is read.\n"
msgstr ""
-#: src/msgcat.c:407 src/msgcomm.c:398
+#: src/msgcat.c:408 src/msgcomm.c:399
#, c-format
msgid ""
" -<, --less-than=NUMBER print messages with less than this many\n"
" definitions, defaults to infinite if not set\n"
msgstr ""
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
" definitions, defaults to 0 if not set\n"
msgstr ""
-#: src/msgcat.c:413 src/msgcomm.c:404
+#: src/msgcat.c:414 src/msgcomm.c:405
#, c-format
msgid ""
" -u, --unique shorthand for --less-than=2, requests\n"
" that only unique messages be printed\n"
msgstr ""
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:739
-#: src/msgmerge.c:557
+#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
+#: src/msgmerge.c:562
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
-#: src/msgmerge.c:559
+#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
+#: src/msgmerge.c:564
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
" syntax\n"
msgstr ""
-#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
+#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
#, c-format
msgid " -t, --to-code=NAME encoding for output\n"
msgstr ""
-#: src/msgcat.c:429 src/msguniq.c:379
+#: src/msgcat.c:430 src/msguniq.c:380
#, c-format
msgid ""
" --use-first use first available translation for each\n"
" message, don't merge several translations\n"
msgstr ""
-#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
+#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
#, c-format
msgid ""
" --lang=CATALOGNAME set 'Language' field in the header entry\n"
msgstr ""
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
msgstr ""
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr ""
-#: src/msgcmp.c:194 src/msgmerge.c:366
+#: src/msgcmp.c:194 src/msgmerge.c:375
#, c-format
msgid "exactly 2 input files required"
msgstr ""
-#: src/msgcmp.c:213 src/msgmerge.c:480
+#: src/msgcmp.c:213 src/msgmerge.c:485
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr ""
@@ -1348,19 +1351,19 @@ msgstr ""
msgid " ref.pot references to the sources\n"
msgstr ""
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr ""
-#: src/msgcmp.c:241 src/msgmerge.c:548
+#: src/msgcmp.c:241 src/msgmerge.c:553
#, c-format
msgid ""
" -m, --multi-domain apply ref.pot to each of the domains in def."
"po\n"
msgstr ""
-#: src/msgcmp.c:243 src/msgmerge.c:550
+#: src/msgcmp.c:243 src/msgmerge.c:555
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr ""
@@ -1385,17 +1388,17 @@ msgstr ""
msgid "this message needs to be reviewed by the translator"
msgstr ""
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1505
#, c-format
msgid "this message is used but not defined..."
msgstr ""
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1508
#, c-format
msgid "...but this definition is similar"
msgstr ""
-#: src/msgcmp.c:377 src/msgmerge.c:1531
+#: src/msgcmp.c:377 src/msgmerge.c:1536
#, c-format
msgid "this message is used but not defined in %s"
msgstr ""
@@ -1405,19 +1408,19 @@ msgstr ""
msgid "warning: this message is not used"
msgstr ""
-#: src/msgcmp.c:553 src/msgfmt.c:545
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] ""
msgstr[1] ""
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr ""
-#: src/msgcomm.c:363
+#: src/msgcomm.c:364
#, c-format, no-wrap
msgid ""
"Find messages which are common to two or more of the specified PO files.\n"
@@ -1430,74 +1433,74 @@ msgid ""
"cumulated.\n"
msgstr ""
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
" definitions, defaults to 1 if not set\n"
msgstr ""
-#: src/msgcomm.c:451 src/xgettext.c:981
+#: src/msgcomm.c:452 src/xgettext.c:1004
#, c-format
msgid ""
" --omit-header don't write header with 'msgid \"\"' entry\n"
msgstr ""
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr ""
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr ""
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr ""
-#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
#, c-format
msgid " -i, --indent indented output style\n"
msgstr ""
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
-#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
-#: src/msgmerge.c:583
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
+#: src/msgmerge.c:588
#, c-format
msgid ""
-" --add-location preserve '#: filename:line' lines (default)\n"
+" -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
+#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
#, c-format
msgid "no input file given"
msgstr ""
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr ""
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr ""
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1506,7 +1509,7 @@ msgid ""
"identical to the msgid.\n"
msgstr ""
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr ""
@@ -1538,7 +1541,7 @@ msgid ""
"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
msgstr ""
-#: src/msgexec.c:281 src/msgfilter.c:401
+#: src/msgexec.c:281 src/msgfilter.c:420
#, c-format
msgid " -i, --input=INPUTFILE input PO file\n"
msgstr ""
@@ -1548,45 +1551,45 @@ msgstr ""
msgid "write to stdout failed"
msgstr ""
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr ""
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr ""
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr ""
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr ""
-#: src/msgfilter.c:416
+#: src/msgfilter.c:435
#, c-format
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
"and writes a modified translation to standard output.\n"
msgstr ""
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr ""
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
msgstr ""
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1594,192 +1597,226 @@ msgid ""
" to be executed\n"
msgstr ""
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-#: src/msgfilter.c:446 src/msggrep.c:595
+#: src/msgfilter.c:465 src/msggrep.c:600
#, c-format
msgid ""
" --no-escape do not use C escapes in output (default)\n"
msgstr ""
-#: src/msgfilter.c:452 src/msggrep.c:601
+#: src/msgfilter.c:471 src/msggrep.c:606
#, c-format
msgid " --indent indented output style\n"
msgstr ""
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
msgstr ""
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr ""
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
msgstr ""
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
+#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
msgid "Ulrich Drepper"
msgstr ""
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:439
+#, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr ""
+
+#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
#: src/msgunfmt.c:353
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr ""
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
+#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
+#: src/msgunfmt.c:346
#, c-format
msgid "%s requires a \"-l locale\" specification"
msgstr ""
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:538
+#, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr ""
+
+#: src/msgfmt.c:545
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr ""
+
+#: src/msgfmt.c:551
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr ""
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr ""
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:571 src/msgfmt.c:577
#, c-format
msgid "%s is only valid with %s, %s or %s"
msgstr ""
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
msgstr ""
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ""
msgstr[1] ""
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr ""
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-#: src/msgfmt.c:663 src/xgettext.c:841
+#: src/msgfmt.c:783 src/xgettext.c:864
#, c-format, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
"Similarly for optional arguments.\n"
msgstr ""
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
msgid " filename.po ... input files\n"
msgstr ""
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
+#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr ""
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
"class\n"
msgstr ""
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
"higher)\n"
msgstr ""
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr ""
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
"file\n"
msgstr ""
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr ""
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
-#: src/msgfmt.c:698 src/xgettext.c:865
+#: src/msgfmt.c:820 src/xgettext.c:888
#, c-format
msgid "If output file is -, output is written to standard output.\n"
msgstr ""
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr ""
-#: src/msgfmt.c:703 src/msgfmt.c:717 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr ""
-#: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
-#: src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
+#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr ""
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1788,48 +1825,78 @@ msgid ""
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr ""
-#: src/msgfmt.c:721 src/msgunfmt.c:473
+#: src/msgfmt.c:845 src/msgunfmt.c:473
#, c-format
msgid ""
" -d DIRECTORY base directory for locale dependent .dll "
"files\n"
msgstr ""
-#: src/msgfmt.c:723
+#: src/msgfmt.c:847
#, c-format
msgid ""
"The -l and -d options are mandatory. The .dll file is written in a\n"
"subdirectory of the specified directory whose name depends on the locale.\n"
msgstr ""
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr ""
-#: src/msgfmt.c:731 src/msgunfmt.c:483
+#: src/msgfmt.c:855 src/msgunfmt.c:483
#, c-format
msgid " -d DIRECTORY base directory of .msg message catalogs\n"
msgstr ""
-#: src/msgfmt.c:733
+#: src/msgfmt.c:857
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is written in the\n"
"specified directory.\n"
msgstr ""
-#: src/msgfmt.c:745 src/xgettext.c:882
+#: src/msgfmt.c:861
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr ""
+
+#: src/msgfmt.c:867
+#, c-format
+msgid " --template=TEMPLATE a .desktop file used as a template\n"
+msgstr ""
+
+#: src/msgfmt.c:869
+#, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr ""
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr ""
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1837,33 +1904,33 @@ msgid ""
"domain\n"
msgstr ""
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
msgstr ""
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
" and the --output-file option\n"
msgstr ""
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
"msgfmt\n"
msgstr ""
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -1871,18 +1938,18 @@ msgid ""
" menu items\n"
msgstr ""
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -1891,99 +1958,109 @@ msgid ""
"platform)\n"
msgstr ""
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
-#: src/msgfmt.c:783 src/msgmerge.c:607 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr ""
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr ""
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr ""
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr ""
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr ""
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, c-format
msgid "'domain %s' directive ignored"
msgstr ""
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, c-format
msgid "empty 'msgstr' entry ignored"
msgstr ""
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr ""
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr ""
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
-#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:176
#: src/x-ycp.c:91
#, c-format
msgid "error while reading \"%s\""
msgstr ""
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
"specified"
msgstr ""
-#: src/msggrep.c:516
+#: src/msggrep.c:521
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2023,18 +2100,18 @@ msgid ""
" selection criterion\n"
msgstr ""
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
msgstr ""
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr ""
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
@@ -2173,7 +2250,7 @@ msgstr ""
#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:3051
+#: src/xgettext.c:544 src/xgettext.c:3418
#, c-format
msgid "warning: "
msgstr ""
@@ -2350,17 +2427,17 @@ msgstr ""
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr ""
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr ""
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, c-format
msgid "header field '%s' missing in header\n"
msgstr ""
@@ -2380,7 +2457,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:665 src/xgettext.c:708
+#: src/x-python.c:665 src/xgettext.c:720
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2395,23 +2472,23 @@ msgid ""
msgstr ""
#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:715
+#: src/xgettext.c:727
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"built without iconv()."
msgstr ""
-#: src/msgmerge.c:383 src/msgmerge.c:389
+#: src/msgmerge.c:392 src/msgmerge.c:398
#, c-format
msgid "%s is only valid with %s"
msgstr ""
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:485
+#: src/msgmerge.c:490
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2425,51 +2502,51 @@ msgid ""
"cannot be found, fuzzy matching is used to produce better results.\n"
msgstr ""
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr ""
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
" may be specified more than once\n"
msgstr ""
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
" do nothing if def.po already up to date\n"
msgstr ""
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr ""
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr ""
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr ""
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2481,7 +2558,7 @@ msgid ""
" simple, never always make simple backups\n"
msgstr ""
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2489,35 +2566,35 @@ msgid ""
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
msgstr ""
-#: src/msgmerge.c:609 src/urlget.c:192
+#: src/msgmerge.c:614 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr ""
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
msgstr ""
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
msgstr ""
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
"obsolete %ld.\n"
msgstr ""
-#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2615,7 +2692,7 @@ msgstr ""
msgid " --strict write strict uniforum style\n"
msgstr ""
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -2628,12 +2705,12 @@ msgid ""
"will be cumulated. When using the --unique option, duplicates are discarded.\n"
msgstr ""
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr ""
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -2691,27 +2768,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr ""
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, c-format
msgid "missing 'msgstr[]' section"
msgstr ""
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, c-format
msgid "missing 'msgid_plural' section"
msgstr ""
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, c-format
msgid "missing 'msgstr' section"
msgstr ""
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr ""
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr ""
@@ -2721,7 +2798,7 @@ msgstr ""
msgid "too many errors, aborting"
msgstr ""
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:740 src/write-po.c:869
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
#, c-format
msgid "invalid multibyte sequence"
msgstr ""
@@ -2765,16 +2842,16 @@ msgstr ""
msgid "context separator <EOT> within string"
msgstr ""
-#: src/read-catalog.c:332 src/xgettext.c:1023
+#: src/read-catalog.c:318 src/xgettext.c:1046
#, c-format
msgid "this file may not contain domain directives"
msgstr ""
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr ""
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr ""
@@ -2959,17 +3036,17 @@ msgstr ""
msgid "compilation of C# class failed"
msgstr ""
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr ""
-#: src/write-java.c:1165
+#: src/write-java.c:1210
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr ""
@@ -2979,13 +3056,13 @@ msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr ""
-#: src/write-po.c:803
+#: src/write-po.c:875
#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr ""
-#: src/write-po.c:1254 src/write-po.c:1383
+#: src/write-po.c:1326 src/write-po.c:1450
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -2994,7 +3071,7 @@ msgid ""
"%s\n"
msgstr ""
-#: src/write-po.c:1266 src/write-po.c:1395
+#: src/write-po.c:1338 src/write-po.c:1462
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3053,7 +3130,7 @@ msgid ""
"but the Tcl message catalog format doesn't support plural handling\n"
msgstr ""
-#: src/x-awk.c:341 src/x-javascript.c:988 src/x-python.c:1128
+#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
#, c-format
msgid "%s:%d: warning: unterminated string"
msgstr ""
@@ -3063,17 +3140,22 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, c-format
+msgid "warning: invalid Unicode character"
+msgstr ""
+
+#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr ""
-#: src/x-c.c:1247 src/x-vala.c:832
+#: src/x-c.c:1345 src/x-vala.c:752
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr ""
-#: src/x-csharp.c:224 src/xgettext.c:2055
+#: src/x-csharp.c:224 src/xgettext.c:2106
msgid "Please specify the source encoding through --from-code."
msgstr ""
@@ -3117,7 +3199,7 @@ msgid ""
"Please specify the source encoding through --from-code.\n"
msgstr ""
-#: src/x-csharp.c:1390 src/x-python.c:1335
+#: src/x-csharp.c:1390 src/x-python.c:1138
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr ""
@@ -3137,22 +3219,22 @@ msgstr ""
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr ""
-#: src/x-glade.c:561
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
msgstr ""
-#: src/x-glade.c:686
+#: src/x-glade.c:417
#, c-format
msgid "The root element <%s> is not allowed in a valid Glade file"
msgstr ""
-#: src/x-glade.c:841 src/x-glade.c:848
+#: src/x-glade.c:572 src/x-glade.c:579
#, c-format
msgid "%s:%lu:%lu: %s"
msgstr ""
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3203,11 +3285,21 @@ msgid ""
"Please specify the source encoding through --from-code\n"
msgstr ""
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr ""
+#: src/x-javascript.c:1055
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr ""
+
+#: src/x-javascript.c:1069
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr ""
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3316,55 +3408,60 @@ msgid ""
"use eval_gettext instead"
msgstr ""
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr ""
-#: src/xgettext.c:636
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr ""
+
+#: src/xgettext.c:648
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr ""
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr ""
-#: src/xgettext.c:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
"po)\n"
msgstr ""
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
-#: src/xgettext.c:863
+#: src/xgettext.c:886
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr ""
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr ""
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3374,44 +3471,44 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr ""
-#: src/xgettext.c:879
+#: src/xgettext.c:902
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
"extension.\n"
msgstr ""
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
" (except for Python, Tcl, Glade)\n"
msgstr ""
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr ""
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
-#: src/xgettext.c:894
+#: src/xgettext.c:917
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr ""
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -3421,17 +3518,17 @@ msgid ""
" in output file\n"
msgstr ""
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr ""
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr ""
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3441,14 +3538,17 @@ msgid ""
" Lua, JavaScript, Vala)\n"
msgstr ""
-#: src/xgettext.c:911
+#: src/xgettext.c:937
#, c-format
msgid ""
-" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
-" -k, --keyword do not to use default keywords\n"
+" (only languages C, C++, ObjectiveC, Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+" Lua, JavaScript, Vala, Desktop)\n"
msgstr ""
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3456,7 +3556,7 @@ msgid ""
" number ARG of keyword WORD\n"
msgstr ""
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3466,75 +3566,75 @@ msgid ""
" Lua, JavaScript, Vala)\n"
msgstr ""
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr ""
-#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
+#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
#, c-format
msgid " (only language C++)\n"
msgstr ""
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr ""
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr ""
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr ""
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
msgstr ""
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, c-format
msgid " --package-name=PACKAGE set package name in output\n"
msgstr ""
-#: src/xgettext.c:989
+#: src/xgettext.c:1012
#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr ""
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -3542,7 +3642,7 @@ msgid ""
" values\n"
msgstr ""
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -3550,52 +3650,52 @@ msgid ""
" values\n"
msgstr ""
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
"%s"
msgstr ""
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr ""
-#: src/xgettext.c:2020
+#: src/xgettext.c:2071
#, c-format
msgid "Non-ASCII character at %s%s."
msgstr ""
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr ""
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr ""
-#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
+#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
#, c-format
msgid "%s%s: warning: "
msgstr ""
-#: src/xgettext.c:2138
+#: src/xgettext.c:2189
#, c-format
msgid ""
"Although being used in a format string position, the %s is not a valid %s "
"format string. Reason: %s\n"
msgstr ""
-#: src/xgettext.c:2139
+#: src/xgettext.c:2190
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: "
"%s\n"
msgstr ""
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3604,34 +3704,34 @@ msgid ""
"and a mapping instead of a tuple for the arguments.\n"
msgstr ""
-#: src/xgettext.c:2232
+#: src/xgettext.c:2283
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
"meta information, not the empty string.\n"
msgstr ""
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr ""
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr ""
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr ""
-#: src/xgettext.c:2942
+#: src/xgettext.c:3052
#, c-format
msgid "context mismatch between singular and plural form"
msgstr ""
-#: src/xgettext.c:3052
+#: src/xgettext.c:3419
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a 'Makevars' file, please specify\n"
@@ -3639,7 +3739,7 @@ msgid ""
"specify an --msgid-bugs-address command line option.\n"
msgstr ""
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, c-format
msgid "language '%s' unknown"
msgstr ""