summaryrefslogtreecommitdiffstats
path: root/gettext-tools/po
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2014-06-01 11:22:52 +0900
committerDaiki Ueno <ueno@gnu.org>2014-06-02 08:07:29 +0900
commit55bd9da83790ed5a464d9ba99b501d61be7fc7e0 (patch)
treee4402bea962e64f19345bb05752b874129b58b63 /gettext-tools/po
parent688b4fd209de606c4cbabeffdf86dc6882307960 (diff)
downloadexternal_gettext-55bd9da83790ed5a464d9ba99b501d61be7fc7e0.zip
external_gettext-55bd9da83790ed5a464d9ba99b501d61be7fc7e0.tar.gz
external_gettext-55bd9da83790ed5a464d9ba99b501d61be7fc7e0.tar.bz2
Regenerate files for 0.19
Diffstat (limited to 'gettext-tools/po')
-rw-r--r--gettext-tools/po/be.po1671
-rw-r--r--gettext-tools/po/bg.po931
-rw-r--r--gettext-tools/po/ca.po1425
-rw-r--r--gettext-tools/po/cs.po1647
-rw-r--r--gettext-tools/po/da.po921
-rw-r--r--gettext-tools/po/de.po1566
-rw-r--r--gettext-tools/po/el.po917
-rw-r--r--gettext-tools/po/es.po2912
-rw-r--r--gettext-tools/po/et.po913
-rw-r--r--gettext-tools/po/eu.po941
-rw-r--r--gettext-tools/po/fi.po1010
-rw-r--r--gettext-tools/po/fr.po924
-rw-r--r--gettext-tools/po/gettext-tools.pot902
-rw-r--r--gettext-tools/po/gl.po1012
-rw-r--r--gettext-tools/po/id.po920
-rw-r--r--gettext-tools/po/it.po919
-rw-r--r--gettext-tools/po/ja.po926
-rw-r--r--gettext-tools/po/ko.po1041
-rw-r--r--gettext-tools/po/nb.po912
-rw-r--r--gettext-tools/po/nl.po1242
-rw-r--r--gettext-tools/po/nn.po922
-rw-r--r--gettext-tools/po/pa.po903
-rw-r--r--gettext-tools/po/pl.po929
-rw-r--r--gettext-tools/po/pt.po1582
-rw-r--r--gettext-tools/po/pt_BR.po937
-rw-r--r--gettext-tools/po/ro.po1049
-rw-r--r--gettext-tools/po/ru.po3012
-rw-r--r--gettext-tools/po/sk.po956
-rw-r--r--gettext-tools/po/sl.po994
-rw-r--r--gettext-tools/po/sr.po2871
-rw-r--r--gettext-tools/po/sv.po966
-rw-r--r--gettext-tools/po/tr.po939
-rw-r--r--gettext-tools/po/uk.po930
-rw-r--r--gettext-tools/po/vi.po1055
-rw-r--r--gettext-tools/po/zh_CN.po913
-rw-r--r--gettext-tools/po/zh_TW.po1214
36 files changed, 23864 insertions, 19960 deletions
diff --git a/gettext-tools/po/be.po b/gettext-tools/po/be.po
index aa8c336..11d8824 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: 2013-07-07 18:21+0900\n"
+"POT-Creation-Date: 2014-06-01 11:19+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"
@@ -186,15 +186,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 "немагчыма стварыць \"%s\""
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: 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 "памылка ў час запісу файла \"%s\""
@@ -216,22 +216,20 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr "падпрацэс %s, памылка ўводу-вываду"
-#: 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 "памяць вычарпана"
#: gnulib-lib/pipe-filter-ii.c:192
-#, fuzzy, c-format
+#, c-format
msgid "creation of threads failed"
msgstr ""
-"памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
-"ці ўсталяваць пераменную асяроддзя $JAVAC"
#: 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 "памылка запісу ў падпрацэс %s"
@@ -318,8 +316,8 @@ 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: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 "памылка ў час чытаньня файла \"%s\""
@@ -598,6 +596,7 @@ msgid_plural ""
"%u parameters."
msgstr[0] ""
msgstr[1] ""
+msgstr[2] ""
#: src/format-lisp.c:2496 src/format-scheme.c:2499
#, c-format
@@ -660,7 +659,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'"
@@ -681,7 +680,8 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "спэцыфікацыі фармата ў 'msgid' і '%s' нераўназначныя"
+msgstr ""
+"спэцыфікацыі фармата ў '%s' не з'яўляюцца падмноствам спэцыфікацый у 'msgid'"
#: src/format-python.c:437
#, fuzzy, c-format
@@ -703,28 +703,28 @@ msgid ""
"format specifications in '%s' and '%s' for argument '%s' are not the same"
msgstr "спэцыфікацыі фармату ў 'msgid' і '%s' для аргумэнта '%s' неаднолькавыя"
-#: 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 ""
@@ -770,11 +770,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"
@@ -783,19 +783,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 "Аўтар %s.\n"
#. 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 ""
@@ -805,11 +805,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
#, fuzzy, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Паспрабуйце \"%s --help\" для больш падрабязных зьвестак.\n"
@@ -852,29 +852,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
#, fuzzy, c-format, no-wrap
msgid " -V, --version output version information and exit\n"
msgstr ""
@@ -886,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: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 "Паведамляйце аб памылках на адрас <bug-gnu-gettext@gnu.org>.\n"
@@ -899,30 +899,27 @@ msgstr "Паведамляйце аб памылках на адрас <bug-gnu-
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 "%s і %s узаема выключны"
-#: src/msgattrib.c:414 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -931,40 +928,40 @@ msgstr ""
"Фільтруе паведамленьні каталёга перакладаў суадносна іх атрыбутам, а так сама,\n"
"узьдзейнічае на іх\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
+#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msguniq.c:342
#, c-format
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
"Аргумэнты, абавязковыя для доўгіх выбараў, абавязковы й для кароткіх.\n"
-#: src/msgattrib.c: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
#, fuzzy, 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
#, fuzzy, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
@@ -972,24 +969,24 @@ msgstr ""
" ФАЙЛ ... .mo файлы\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
-#: 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
#, fuzzy, c-format
msgid ""
"The results are written to standard output if no output file is specified\n"
@@ -1000,142 +997,145 @@ msgstr ""
"Вынікі запісваюцца ў стандартны вывад, калі ймя файла для вываду не\n"
"зададзена, ці замест яго -.\n"
-#: 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
-#, fuzzy, c-format
+#: src/msgattrib.c:475
+#, 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
+#: 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"
@@ -1144,132 +1144,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
-#, fuzzy, c-format
+#: 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 ""
-"Дэталі вываду:\n"
-" -e, --no-escape не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
-" вывадзе (звычайна)\n"
-" -E, --escape выкарыстоўваць Сі ESC пасьлядоўнасьці ў вывадзе,\n"
-" без дадатковых сімвалаў\n"
-" --force-po запісваць PO-файл, нават калі ён пусты\n"
-" -i, --indent запісваць .po файл, выкарыстоўвываючы водступы\n"
-" --strict запісваць .po файл, жорстка адпавядаючы\n"
-" пагадненьню Uniforum\n"
-" -w, --width=ШЫРЫНЯ усталёўваць шырыню вывадзімай старонкі\n"
-" --no-wrap не разьбіваць доўгія радкі з паведамлеьнямі,\n"
-"\n"
-" даўжэй чым шырыня, на некалькі радкоў\n"
-" -s, --sort-output ствараць упарадкаваны вывад\n"
-#: src/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 "зададзен немагчымы крытэрый выбару (%d < n < %d)"
-#: 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 "Выкарыстаньне: %s [ВЫБАР] [УВАХОДЗЯЧЫ_ФАЙЛ]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, fuzzy, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1293,92 +1279,92 @@ msgstr ""
"будуць узяты з першага PO-файла.\n"
"Пазіцыі з усіх PO-файлаў будуць аб'яднаны ў кучу\n"
-#: 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 "патрабуецца менавіта 2 уводзячых файла"
-#: 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 "Выкарыстаньне: %s [ВЫБАР] def.po ref.pot\n"
@@ -1411,12 +1397,12 @@ 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
#, fuzzy, c-format
msgid ""
" -m, --multi-domain apply ref.pot to each of the domains in def."
@@ -1426,18 +1412,15 @@ msgstr ""
" -m, --multi-domain прымяніць ref.pot для кожнага маёнтка з def."
"po\n"
-#: 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 ""
#: src/msgcmp.c:245
-#, fuzzy, c-format
+#, c-format
msgid " --use-fuzzy consider fuzzy entries\n"
msgstr ""
-"Рэжым дзеяньня:\n"
-" -j, --java Java рэжым: увод гэта ResourceBundle кляс\n"
-" --tcl Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
#: src/msgcmp.c:247
#, c-format
@@ -1454,17 +1437,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 "гэта паведамленьне выкарыстоўваецца, але не вызначана ў %s"
@@ -1474,7 +1457,7 @@ 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"
@@ -1482,12 +1465,12 @@ msgstr[0] "знойдзена %d фатальная памылка"
msgstr[1] "знойдзена %d фатальныя памылкі"
msgstr[2] "знойдзена %d фатальных памылак"
-#: 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
#, fuzzy, c-format, no-wrap
msgid ""
"Find messages which are common to two or more of the specified PO files.\n"
@@ -1508,30 +1491,30 @@ msgstr ""
"камэнтары будуць захаваны, але толькі зь першага PO файла, у якім яны былі\n"
"вызначаны. Каментары становішчаў у файлах з усіх PO файлаў будуць аб'яднаны.\n"
-#: 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 "Пераўтварае каталёг з перакладамі ў розныя сімвальныя кадзіроўкі.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, fuzzy, c-format
msgid "Conversion target:\n"
msgstr "памылка пераўтварэньня"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, fuzzy, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr ""
@@ -1539,46 +1522,46 @@ msgstr ""
" -t, --to-code=НАЗВА перакаўтварае кадзіроўку для вываду\n"
"Звычайна выкарыстоўвываецца бягучая кадзіроўка лакалі\n"
-#: 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 "Выкарыстаньне: %s [ВЫБАР] УВАХОДЗЯЧЫ_ФАЙЛ\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, fuzzy, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1591,7 +1574,7 @@ msgstr ""
"Неперакладзеныя уваходжаньні прымаюцца як пераклады, аднолькавыя msgid, і\n"
"пазначаюцца як недакладныя (fuzzy).\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr ""
@@ -1629,7 +1612,7 @@ msgstr ""
"Асабісты ўбудаваны загад, завецца '0', выводзіць пераклад й нулявы байт за ім.\n"
"Вывад каманды \"msgexec 0\" падыходзіць для ўваходу каманды \"xargs -0\".\n"
-#: 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 ""
@@ -1639,27 +1622,27 @@ msgstr ""
msgid "write to stdout failed"
msgstr "памылка запісу ў stdout"
-#: 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 "па меншай меры адзін sed-скрыпт павінен быць зададзены"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Выкарыстаньне: %s [ВЫБАР] ФІЛЬТР [ВЫБАРЫ_ФІЛЬТРА]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "Прымае фільтар да ўсіх перакладаў зь каталёгу перакладаў.\n"
-#: 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"
@@ -1669,18 +1652,18 @@ msgstr ""
"ўводу\n"
"й запісвае зьмененыя пераклады ў стандартны вывад.\n"
-#: 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 "
@@ -1688,73 +1671,94 @@ 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 "аргумэнт %s павінен быць адзіночным знакам прыпынку"
-#: 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 "%s патрабуе \"-d дырэкторыя\" спэцыфікацыі"
-#: 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 "%s патрабуе \"-l locale\" спэцыфікацыі"
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:538
+#, fuzzy, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s патрабуе \"-l locale\" спэцыфікацыі"
+
+#: src/msgfmt.c:545
+#, fuzzy, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s патрабуе \"-l locale\" спэцыфікацыі"
+
+#: src/msgfmt.c:551
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s і %s узаема выключны"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s рэчаісны толькі з %s ці %s"
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:571 src/msgfmt.c:577
#, fuzzy, c-format
msgid "%s is only valid with %s, %s or %s"
msgstr "%s рэчаісны толькі з %s ці %s"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c: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"
@@ -1762,7 +1766,7 @@ msgstr[0] "%d паведамленьне перакладзена"
msgstr[1] "%d паведамленьні перакладзена"
msgstr[2] "%d паведамленьняў перакладзена"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
@@ -1776,7 +1780,7 @@ msgstr[2] ""
",\n"
"%d недакладных перакладаў"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
@@ -1790,17 +1794,17 @@ msgstr[2] ""
",\n"
"%d неперакладзеных паведамленьняў"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Выкарыстаньне: %s [ВЫБАР] файл.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "Стварае дваічны каталёг паведамленьняў зь іх тэкставага апісаньня.\n"
-#: 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"
@@ -1809,97 +1813,101 @@ msgstr ""
"Аргумэнты, абавязковыя для доўгх выбараў, абавязковы так сама\n"
"і для кароткі. Тое саме-ж і для выбарачных аргумэнтаў.\n"
-#: 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
-#, fuzzy, c-format
+#: src/msgfmt.c:803
+#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr ""
-"Рэжым дзеяньня:\n"
-" -j, --java Java рэжым: увод гэта ResourceBundle кляс\n"
-" --tcl Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
-#: src/msgfmt.c:685
-#, fuzzy, c-format
+#: src/msgfmt.c:805
+#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
"file\n"
msgstr ""
-"Рэжым дзеяньня:\n"
-" -j, --java Java рэжым: увод гэта ResourceBundle кляс\n"
-" --tcl Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
-#: 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
-#, fuzzy, c-format
+#: src/msgfmt.c:809
+#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr ""
-"Рэжым дзеяньня:\n"
-" -j, --java Java рэжым: увод гэта ResourceBundle кляс\n"
-" --tcl Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
-#: 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
#, fuzzy, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1917,48 +1925,78 @@ msgstr ""
"абмежаваным падкрэсьліваньнем. Выбар -d абавязковы. Кляс запісваецца ў\n"
"зададзеную дырэкторыю.\n"
-#: src/msgfmt.c:715
-#, fuzzy, c-format
+#: src/msgfmt.c:839
+#, c-format
msgid "Output file location in C# mode:\n"
-msgstr "невызначан уваходзячы файл"
+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"
@@ -1966,33 +2004,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 "
@@ -2000,12 +2038,12 @@ 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
#, fuzzy, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
@@ -2015,7 +2053,7 @@ msgstr ""
"%d)\n"
" --no-hash дваічны файл не зьмяшчае хэш табліцы\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2024,7 +2062,7 @@ msgid ""
"platform)\n"
msgstr ""
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, fuzzy, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
@@ -2034,81 +2072,91 @@ msgstr ""
"%d)\n"
" --no-hash дваічны файл не зьмяшчае хэш табліцы\n"
-#: 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 "увага: загаловак PO-файла прапушчан ці нерэчаісны\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "увага: пераўтварэньне кадзіровак не будзе працаваць\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "увага: загаловак PO-файла мае недакладны пераклад\n"
-#: 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 "даменная назва \"%s\" не падыходзіць у якасці назвы файла"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"даменная назва \"%s\" не падыходзіць у якасці назвы файла;\n"
"будзе выкарыстаны прэфікс"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "'domain %s' directive ignored"
msgstr "дырэктыва `domain %s' ігнаруецца"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, fuzzy, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "парожняе уваходжаньне `msgstr' прапушчана"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, fuzzy, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "недакладнае уваходжаньне `msgstr' прапушчана"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: увага: ізыходны файл змяшчае недакладны пераклад"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c: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 "памылка ў час чытаньня \"%s\""
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, fuzzy, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2116,14 +2164,14 @@ msgid ""
msgstr ""
"выбар '%c' не можа быць выкарыстаны раней чым 'K' ці 'T' будуць зададзены"
-#: 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"
@@ -2163,18 +2211,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 ""
@@ -2217,15 +2265,12 @@ msgid " -i, --input=INPUTFILE input POT file\n"
msgstr ""
#: src/msginit.c:379
-#, fuzzy, c-format
+#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT "
"file.\n"
"If it is -, standard input is read.\n"
msgstr ""
-"Файл уводу:\n"
-" ФАЙЛ ... .mo файлы\n"
-"Калі ўваходзячы файл не зададзен, ці замест яго -, чытае стандартны ўвод.\n"
#: src/msginit.c:385
#, c-format
@@ -2233,15 +2278,11 @@ msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr ""
#: src/msginit.c:387
-#, fuzzy, c-format
+#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-"Файл вываду:\n"
-" -o, --output-file=ФАЙЛ запісвае вывад у зададзены файл\n"
-" --strict уключае рэжым жорсткага адпавяданьня Uniforum\n"
-"Калі замест назвы файла вываду -, вывад запісваецца ў стандартны вывад.\n"
#: src/msginit.c:400
#, c-format
@@ -2278,9 +2319,9 @@ msgstr ""
#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
-#, fuzzy, c-format
+#, c-format
msgid "%s subprocess failed with exit code %d"
-msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
+msgstr ""
#: src/msginit.c:1118
msgid ""
@@ -2333,7 +2374,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 "увага: "
@@ -2465,8 +2506,7 @@ msgstr "nplurals = %lu..."
#, fuzzy, c-format
msgid "but some messages have only one plural form"
msgid_plural "but some messages have only %lu plural forms"
-msgstr[0] ""
-"...але некаторыя паведамленьні маюць толькі адну форму множнага ліку"
+msgstr[0] "...але некаторыя паведамленьні маюць толькі %lu форму множнага ліку"
msgstr[1] "...але некаторыя паведамленьні маюць толькі %lu формы множнага ліку"
msgstr[2] ""
"...але некаторыя паведамленьні маюць толькі %lu формаў множнага ліку"
@@ -2475,16 +2515,15 @@ msgstr[2] ""
#, fuzzy, c-format
msgid "but some messages have one plural form"
msgid_plural "but some messages have %lu plural forms"
-msgstr[0] "...але некаторыя паведамленьні маюць адну форму множнага ліку"
+msgstr[0] "...але некаторыя паведамленьні маюць %lu форму множнага ліку"
msgstr[1] "...але некаторыя паведамленьні маюць %lu формы множнага ліку"
msgstr[2] "...але некаторыя паведамленьні маюць %lu формаў множнага ліку"
#: src/msgl-check.c:514
-#, fuzzy
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
-msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
+msgstr ""
#: src/msgl-check.c:611
#, fuzzy
@@ -2525,17 +2564,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
#, fuzzy, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "некаторыя палі загалока ўсё яшчэ маюць пачатковае значэньне\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, fuzzy, c-format
msgid "header field '%s' missing in header\n"
msgstr "поле загалоку `%s' прапушчана ў загалоўку\n"
@@ -2555,14 +2594,12 @@ 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
-#, fuzzy, c-format
+#: src/x-python.c:665 src/xgettext.c:720
+#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
"not support this conversion."
msgstr ""
-"Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv(),\n"
-"але iconv() не падтрымлівае \"%s\".\n"
#: src/msgl-iconv.c:335
#, c-format
@@ -2572,26 +2609,24 @@ msgid ""
msgstr ""
#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:715
-#, fuzzy, c-format
+#: src/xgettext.c:727
+#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
"built without iconv()."
msgstr ""
-"Кадзіроўка \"%s\" не падтрымліваецца. %s спадзяецца на iconv().\n"
-"Гэта вэрсія пабудавана без iconv().\n"
-#: 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 "%s рэчаісны толькі з %s"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr ""
-#: src/msgmerge.c:485
-#, fuzzy, c-format, no-wrap
+#: src/msgmerge.c:490
+#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
"existing PO file with translations which will be taken over to the newly\n"
@@ -2603,59 +2638,52 @@ msgid ""
"comments and file positions will be preserved. Where an exact match\n"
"cannot be found, fuzzy matching is used to produce better results.\n"
msgstr ""
-"Параўноўвае два Uniforum .po файла, каб удакладніць, што абодва зьмяшчаюць\n"
-"аднолькавыя мноствы радкоў msgid. Файл def.po - гэта існуючы PO файл зь\n"
-"перакладамі. Файл ref.po - гэта апошні створаны PO файл, ці PO шаблён\n"
-"(звычайна створаны праграмай xgettext). Гэта карысна для праверкі, што ў\n"
-"вас перакладзена кожнае паведамленьне з вашае праграмы. Там, дзе дакладнае\n"
-"супадзеньне ня будзе знойдзена, выкарыстоўвываецца недакладае - для\n"
-"лепшай праверкі.\n"
-#: 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 "
@@ -2667,7 +2695,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 "
@@ -2675,31 +2703,28 @@ msgid ""
"environment variable.\n"
msgstr ""
-#: src/msgmerge.c:552
-#, fuzzy, c-format
+#: src/msgmerge.c:557
+#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
msgstr ""
-"Рэжым дзеяньня:\n"
-" -j, --java Java рэжым: увод гэта ResourceBundle кляс\n"
-" --tcl Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
-#: 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, "
@@ -2708,7 +2733,7 @@ msgstr ""
"%sПрачытана %ld старых + %ld новых, аб'яднаных %ld, недакладных %ld;\n"
"прапушчана %ld, састарэлых %ld.\n"
-#: 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"
@@ -2740,22 +2765,16 @@ msgstr ""
" --tcl Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
#: src/msgunfmt.c:442
-#, fuzzy, c-format
+#, c-format
msgid " --csharp C# mode: input is a .NET .dll file\n"
msgstr ""
-"Рэжым дзеяньня:\n"
-" -j, --java Java рэжым: увод гэта ResourceBundle кляс\n"
-" --tcl Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
#: src/msgunfmt.c:444
-#, fuzzy, c-format
+#, c-format
msgid ""
" --csharp-resources C# resources mode: input is a .NET .resources "
"file\n"
msgstr ""
-"Рэжым дзеяньня:\n"
-" -j, --java Java рэжым: увод гэта ResourceBundle кляс\n"
-" --tcl Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
#: src/msgunfmt.c:446
#, fuzzy, c-format
@@ -2777,26 +2796,17 @@ msgid "Input file location in Java mode:\n"
msgstr ""
#: src/msgunfmt.c:462
-#, fuzzy, c-format
+#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
"name,\n"
"separated with an underscore. The class is located using the CLASSPATH.\n"
msgstr ""
-"Файл вываду ў рэжыме Java:\n"
-" -r, --resource=СРОДАК назва сродка\n"
-" -l, --locale=МЯСЦОВАСЬЦЬ назва мясцовасьці, ці мова ці мова_КРАІНА\n"
-" -d ДЫРЭКТОРЫЯ асноўная дырэкторыя гіэрархіі дырэкторый "
-"клясаў\n"
-"Назва кляса вызначаецца шляхам дапасаваньня назвы мясцовасьці да назвы "
-"сродка\n"
-"абмежаваным падкрэсьліваньнем. Выбар -d абавязковы. Кляс запісваецца ў\n"
-"зададзеную дырэкторыю.\n"
#: src/msgunfmt.c:467
-#, fuzzy, c-format
+#, c-format
msgid "Input file location in C# mode:\n"
-msgstr "невызначан уваходзячы файл"
+msgstr ""
#: src/msgunfmt.c:475
#, c-format
@@ -2827,7 +2837,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"
@@ -2840,12 +2850,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
#, fuzzy, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -2917,27 +2927,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "несумяшчальнае ўжываньне #~"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, fuzzy, c-format
msgid "missing 'msgstr[]' section"
msgstr "прапушчана секцыя \"msgstr[]\""
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, fuzzy, c-format
msgid "missing 'msgid_plural' section"
msgstr "прапушчана секцыя \"msgid_plural\""
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, fuzzy, c-format
msgid "missing 'msgstr' section"
msgstr "прапушчана секцыя \"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 "формы множнага ліку маюць дрэнныі індэкс"
@@ -2947,7 +2957,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 "нерэчаісная шматсімвальная паслядоўнасць"
@@ -2991,16 +3001,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
#, fuzzy
msgid "this is the location of the first definition"
msgstr "...гэта месцазнаходжаньне першага вызначэньня"
@@ -3026,9 +3036,8 @@ msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr "файл \"%s\" зьмяшчае радок не завершаны нулём, ля %s"
#: src/read-properties.c:227
-#, fuzzy
msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
+msgstr ""
#: src/read-stringtable.c:802
#, fuzzy
@@ -3038,7 +3047,7 @@ msgstr "%s:%d: увага: незавершаны радок"
#: src/read-stringtable.c:810
#, fuzzy
msgid "warning: syntax error"
-msgstr "%s: увага: "
+msgstr "увага: "
#: src/read-stringtable.c:871 src/read-stringtable.c:893
#, fuzzy
@@ -3046,14 +3055,12 @@ msgid "warning: unterminated key/value pair"
msgstr "%s:%d: увага: незавершаны радок"
#: src/read-stringtable.c:939
-#, fuzzy
msgid "warning: syntax error, expected ';' after string"
-msgstr "%s:%d: увага: незавершаны радок"
+msgstr ""
#: src/read-stringtable.c:948
-#, fuzzy
msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "%s:%d: увага: незавершаны радок"
+msgstr ""
#: src/recode-sr-latin.c:116
#, fuzzy, c-format
@@ -3150,11 +3157,10 @@ msgid ""
msgstr ""
#: src/write-catalog.c:162
-#, fuzzy
msgid ""
"message catalog has context dependent translations, but the output format "
"does not support them."
-msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
+msgstr ""
#: src/write-catalog.c:197
msgid ""
@@ -3194,23 +3200,21 @@ msgstr ""
#: src/write-csharp.c:768
#, fuzzy, c-format
msgid "compilation of C# class failed"
-msgstr ""
-"памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
-"ці ўсталяваць пераменную асяроддзя $JAVAC"
+msgstr "памылка ўзаемадзеяньня з падпрацэсам %s"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "нерэчаісная назва Java-класа: %s"
-#: 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 ""
"памылка кампіляцыі Java кляса, калі ласка паспрабуйце --verbose,\n"
"ці ўсталяваць пераменную асяроддзя $JAVAC"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, fuzzy, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr ""
@@ -3222,14 +3226,14 @@ msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "памылка ў час адкрыцця \"%s\" для запісу"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, fuzzy, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr ""
"перакладзеныя паведамленьні не павінны зьмяшчаць \"\\%c\" ESC-пасьлядоўнасьці"
-#: src/write-po.c:1254 src/write-po.c:1383
+#: src/write-po.c:1326 src/write-po.c:1450
#, fuzzy, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3243,7 +3247,7 @@ msgstr ""
"выкарыстаньня толькі ASCII сымбаляў у msgid\n"
"%s\n"
-#: 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"
@@ -3284,25 +3288,22 @@ msgid "error while writing to %s subprocess"
msgstr "памылка ў час запісу файла \"%s\""
#: src/write-resources.c:131
-#, fuzzy
msgid ""
"message catalog has context dependent translations\n"
"but the C# .resources format doesn't support contexts\n"
-msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
+msgstr ""
#: src/write-resources.c:150
-#, fuzzy
msgid ""
"message catalog has plural form translations\n"
"but the C# .resources format doesn't support plural handling\n"
-msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
+msgstr ""
#: src/write-tcl.c:157
-#, fuzzy
msgid ""
"message catalog has context dependent translations\n"
"but the Tcl message catalog format doesn't support contexts\n"
-msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
+msgstr ""
#: src/write-tcl.c:176
msgid ""
@@ -3310,7 +3311,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
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "%s:%d: увага: незавершаны радок"
@@ -3320,17 +3321,22 @@ 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-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 "%s:%d: увага: незавершаная сімвальная канстанта"
-#: 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 "%s:%d: увага: незавершаны радок"
-#: 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 ""
@@ -3374,7 +3380,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
#, fuzzy, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
@@ -3382,7 +3388,7 @@ msgstr "%s:%d: увага: незавершаная сімвальная кан
#: src/x-csharp.c:1512 src/x-java.c:875
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: увага: незавершаны радок"
+msgstr "%s:%d: увага: незавершаная сімвальная канстанта"
#: src/x-csharp.c:2020 src/x-java.c:1369
#, c-format
@@ -3394,22 +3400,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
#, fuzzy, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3462,11 +3468,21 @@ msgid ""
"Please specify the source encoding through --from-code\n"
msgstr ""
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, fuzzy, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: увага: незавершаны радок"
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "увага: гэта паведамленьне не выкарыстоўваецца"
+
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: увага: незавершаны радок"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3575,55 +3591,60 @@ msgid ""
"use eval_gettext instead"
msgstr ""
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, fuzzy, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: увага: незавершаны радок"
-#: 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 "--joun-existing не можа быць выкарастаны пры запісы ў stdout"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext не можа працаваць без ключавых слоў для пошуку"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, fuzzy, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr "увага: файл \"%s\" суфікс \"%s\" невядомы; паспрабуйце C"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "Атрымлівае перакладаемыя радкі з дадзеных уваходзячых файлаў.\n"
-#: 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
#, fuzzy, 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"
@@ -3633,44 +3654,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"
@@ -3680,17 +3701,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"
@@ -3700,14 +3721,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 "
@@ -3715,7 +3739,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"
@@ -3725,84 +3749,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
-#, fuzzy, c-format
+#: src/xgettext.c:954
+#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr ""
-"Рэжым дзеяньня:\n"
-" -j, --java Java рэжым: увод гэта ResourceBundle кляс\n"
-" --tcl Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
-#: 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
-#, fuzzy, c-format
+#: src/xgettext.c:958
+#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr ""
-"Рэжым дзеяньня:\n"
-" -j, --java Java рэжым: увод гэта ResourceBundle кляс\n"
-" --tcl Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
-#: src/xgettext.c:939
-#, fuzzy, c-format
+#: src/xgettext.c:962
+#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr ""
-"Рэжым дзеяньня:\n"
-" -j, --java Java рэжым: увод гэта ResourceBundle кляс\n"
-" --tcl Tcl рэжым: увод гэта tcl/msgcat .msg файл\n"
-#: 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 "
@@ -3810,7 +3825,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 "
@@ -3818,52 +3833,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
#, fuzzy, c-format
msgid "%s%s: warning: "
msgstr "%s: увага: "
-#: 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
-#, fuzzy, c-format
+#: src/xgettext.c:2190
+#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: "
"%s\n"
-msgstr "'%s' - гэта нерэчаісны %s фармат радку, у адрозьненьне ад 'msgid'"
+msgstr ""
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3872,7 +3887,7 @@ 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"
@@ -3882,27 +3897,27 @@ msgstr ""
"gettext(\"\") вяртае загаловак зь\n"
"метададзенымі, а ня пусты радок.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, fuzzy, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "неадназначны аргумэнт `%s' для `%s'"
-#: src/xgettext.c:2896
-#, fuzzy, c-format
+#: src/xgettext.c:3006
+#, c-format
msgid "warning: missing context for keyword '%.*s'"
-msgstr "неадназначны аргумэнт `%s' для `%s'"
+msgstr ""
-#: src/xgettext.c:2921
-#, fuzzy, c-format
+#: src/xgettext.c:3031
+#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "неадназначны аргумэнт `%s' для `%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"
@@ -3910,7 +3925,7 @@ msgid ""
"specify an --msgid-bugs-address command line option.\n"
msgstr ""
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, fuzzy, c-format
msgid "language '%s' unknown"
msgstr "невядомая мова `%s'"
@@ -3919,23 +3934,9 @@ 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"
-#, fuzzy
-#~ msgid "DuplicateHandle failed with error code 0x%08x"
-#~ msgstr "падпрацэс %s завершыўся з кодам выхаду %d"
-
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "поле `%s' усё яшчэ мае пачатковае значэньне\n"
-
#~ msgid ""
#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
#~ "This is free software; see the source for copying conditions. There is "
@@ -3948,33 +3949,64 @@ msgstr ""
#~ "пагадненьня аб распаўсюджваньні. Ня йснуе НІЯКАЙ гарантыі; нават аб\n"
#~ "магчымасьці выкарыстньня зь якой небудзь мэтай.\n"
-#, fuzzy
-#~ msgid ""
-#~ "message catalog has context dependent translations\n"
-#~ "but the C# .dll format doesn't support contexts\n"
-#~ msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
+#~ msgid "missing arguments"
+#~ msgstr "прапушчаны аргумэнты"
-#, fuzzy
#~ msgid ""
-#~ "message catalog has context dependent translations\n"
-#~ "but the Java ResourceBundle format doesn't support contexts\n"
-#~ msgstr "каталёг паведамленьня мае пераклады форм множнага ліку..."
-
-#~ msgid "%s: warning: "
-#~ msgstr "%s: увага: "
-
-#~ msgid "%s\n"
-#~ msgstr "%s\n"
+#~ "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
+#~ "or: %s [OPTION] -s [MSGID]...\n"
+#~ msgstr ""
+#~ "Выкарыстаньне: %s [ВЫБАР] [[TEXTDOMAIN] MSGID]\n"
+#~ " ці: %s [ВЫБАР] -s [MSGID]...\n"
-#, fuzzy
-#~ msgid "%s:%lu: warning: unterminated string"
-#~ msgstr "%s:%d: увага: незавершаны радок"
+#~ msgid "Display native language translation of a textual message.\n"
+#~ msgstr "Адлюстроўвае пераклады на родную мову тэкставых паведамленьняў.\n"
-#~ msgid "conversion failure"
-#~ msgstr "памылка пераўтварэньня"
+#~ msgid ""
+#~ " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
+#~ " -e enable expansion of some escape sequences\n"
+#~ " -E (ignored for compatibility)\n"
+#~ " -h, --help display this help and exit\n"
+#~ " -n suppress trailing newline\n"
+#~ " -V, --version display version information and exit\n"
+#~ " [TEXTDOMAIN] MSGID retrieve translated message corresponding\n"
+#~ " to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ " -d, --domain=TEXTDOMAIN вяртае перакладзеныя паведамленьні з "
+#~ "TEXTDOMAIN\n"
+#~ " -e выкарыстоўваць некаторыя ESC-пасьлядоўнасьці\n"
+#~ " -E (ігнаруецца для сумяшчальнасьці)\n"
+#~ " -h, --help адлюстроўвае гэту дапамогу й выходзіць\n"
+#~ " -n стрымлівае цягнучыеся новыя радкі\n"
+#~ " -V, --version адлюстроўвае зьветскі аб версіі й выходзіць\n"
+#~ " [TEXTDOMAIN] MSGID вяртае перакладзеныя паведамленьні суадносна\n"
+#~ " MSGID з TEXTDOMAIN\n"
-#~ msgid "write to grep subprocess failed"
-#~ msgstr "памылка запісу ў падпрацэс grep"
+#~ msgid ""
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
+#~ "the\n"
+#~ "environment variable TEXTDOMAIN. If the message catalog is not found in "
+#~ "the\n"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
+#~ "variable TEXTDOMAINDIR.\n"
+#~ "When used with the -s option the program behaves like the `echo' "
+#~ "command.\n"
+#~ "But it does not simply copy its arguments to stdout. Instead those "
+#~ "messages\n"
+#~ "found in the selected catalog are translated.\n"
+#~ "Standard search directory: %s\n"
+#~ msgstr ""
+#~ "Калі параметар TEXTDOMAIN не зададзен, маёнтак вызначаецца з пераменнай\n"
+#~ "асяроддзя TEXTDOMAIN. Калі каталёг з паведамленьнямі ня знойдзен у "
+#~ "звычайнай\n"
+#~ "дырэкторыі, іншае месцазнаходжаньне можа быць зададзена ў пераменнай\n"
+#~ "асяроддзя TEXTDOMAINDIR.\n"
+#~ "Калі выкарыстоўвываецца разам з выбарам -s, праграма паводзіць сабе як\n"
+#~ "каманда `echo', але яна ня проста капіруе свае аргумэнты ў stdout, яна\n"
+#~ "замест існуючых паведамленьняў знаходзіць у азначаным каталёгу "
+#~ "перакладзеныя.\n"
+#~ "Стандартная дырэкторыя для пошуку: %s\n"
#~ msgid ""
#~ "Input file location:\n"
@@ -3992,27 +4024,35 @@ msgstr ""
#~ "ўвод.\n"
#~ msgid ""
-#~ "Output file location:\n"
-#~ " -o, --output-file=FILE write output to specified file\n"
-#~ "The results are written to standard output if no output file is "
-#~ "specified\n"
-#~ "or if it is -.\n"
+#~ "Message selection:\n"
+#~ " --translated keep translated, remove untranslated "
+#~ "messages\n"
+#~ " --untranslated keep untranslated, remove translated "
+#~ "messages\n"
+#~ " --no-fuzzy remove 'fuzzy' marked messages\n"
+#~ " --only-fuzzy keep 'fuzzy' marked messages\n"
+#~ " --no-obsolete remove obsolete #~ messages\n"
+#~ " --only-obsolete keep obsolete #~ messages\n"
#~ msgstr ""
-#~ "Файл вываду:\n"
-#~ " -o, --output-file=ФАЙЛ запісваць вывад у зададзены файл\n"
-#~ "Вынікі запісваюцца ў стандартны вывад, калі ймя файла для вываду не\n"
-#~ "зададзена, ці замест яго -.\n"
+#~ "Выбар паведамленьня:\n"
+#~ " --translated пакідае перакладзеныя, прымае "
+#~ "неперакладзеныя\n"
+#~ " паведамленьні\n"
+#~ " --untranslated пакідае неперакладзеныя, прымае "
+#~ "перакладзеныя\n"
+#~ " паведамленьні\n"
+#~ " --no-fuzzy прымае паведамленьні, азначаныя як 'fuzzy'\n"
+#~ " --only-fuzzy пакідае паведамленьні, азначаныя як "
+#~ "'fuzzy'\n"
+#~ " --no-obsolete прымае састарэлыя #~ паведамленьні\n"
+#~ " --only-obsolete пакіде састарэлыя #~ паведамленьні\n"
-#, fuzzy
#~ msgid ""
#~ "Attribute manipulation:\n"
#~ " --set-fuzzy set all messages 'fuzzy'\n"
#~ " --clear-fuzzy set all messages non-'fuzzy'\n"
#~ " --set-obsolete set all messages obsolete\n"
#~ " --clear-obsolete set all messages non-obsolete\n"
-#~ " --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"
#~ " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
#~ " --obsolete synonym for --only-obsolete --clear-"
#~ "obsolete\n"
@@ -4028,6 +4068,61 @@ msgstr ""
#~ "obsolete\n"
#~ msgid ""
+#~ "Output details:\n"
+#~ " -e, --no-escape do not use C escapes in output (default)\n"
+#~ " -E, --escape use C escapes in output, no extended chars\n"
+#~ " --force-po write PO file even if empty\n"
+#~ " -i, --indent write the .po file using indented style\n"
+#~ " --no-location do not write '#: filename:line' lines\n"
+#~ " -n, --add-location generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ " --strict write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ " -w, --width=NUMBER set output page width\n"
+#~ " --no-wrap do not break long message lines, longer "
+#~ "than\n"
+#~ " the output page width, into several lines\n"
+#~ " -s, --sort-output generate sorted output\n"
+#~ " -F, --sort-by-file sort output by file location\n"
+#~ msgstr ""
+#~ "Дэталі вываду:\n"
+#~ " -e, --no-escape не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
+#~ " вывадзе (звычайна)\n"
+#~ " -E, --escape выкарыстоўваць Сі ESC пасьлядоўнасьці ў "
+#~ "вывадзе;\n"
+#~ " без дадатковых сімвалаў\n"
+#~ " --force-po запісваць PO-файл, нават калі ён пусты\n"
+#~ " -i, --indent запісваць .po файл, выкарыстоўвываючы "
+#~ "водступы\n"
+#~ " --no-location не запісваць радкі '#: імя_файла:радок'\n"
+#~ " -n, --add-location ствараць радкі '#: імя_файла:радок' радкі "
+#~ "(гэты\n"
+#~ " выбар выкарыстоўваецца паўмаўчаньню)\n"
+#~ " --strict запісваць .po файл, жорстка адпавядаючы\n"
+#~ " пагадненьню Uniforum\n"
+#~ " -w, --width=ШЫРЫНЯ усталёўваць шырыню вывадзімай старонкі\n"
+#~ " -s, --sort-output ствараць упарадкаваны вывад\n"
+#~ " -F, --sort-by-file упарадкоўваць вывад па месцазнаходжаньню "
+#~ "файла\n"
+
+#~ msgid ""
+#~ "Input file location:\n"
+#~ " INPUTFILE ... input files\n"
+#~ " -f, --files-from=FILE get list of input files from FILE\n"
+#~ " -D, --directory=DIRECTORY add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "If input file is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Файл уводу:\n"
+#~ " УВАХОДЗЯЧЫ_ФАЙЛ ... уваходзячыя файлы\n"
+#~ " -f, --files-from=ФАЙЛ атрымліваць сьпіс уваходзячый файлаў з "
+#~ "ФАЙЛА\n"
+#~ " -D, --directory=ДЫРЭКТОРЫЯ дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку "
+#~ "ўваходзячых\n"
+#~ " файлаў\n"
+#~ "Калі файл уводу гэта -, чытаецца стандартны ўвод.\n"
+
+#~ msgid ""
#~ "Output file location:\n"
#~ " -o, --output-file=FILE write output to specified file\n"
#~ "The results are written to standard output if no output file is "
@@ -4040,6 +4135,76 @@ msgstr ""
#~ "замест яго -.\n"
#~ msgid ""
+#~ "Message selection:\n"
+#~ " -<, --less-than=NUMBER print messages with less than this many\n"
+#~ " definitions, defaults to infinite if "
+#~ "not\n"
+#~ " set\n"
+#~ " ->, --more-than=NUMBER print messages with more than this many\n"
+#~ " definitions, defaults to 0 if not set\n"
+#~ " -u, --unique shorthand for --less-than=2, requests\n"
+#~ " that only unique messages be printed\n"
+#~ msgstr ""
+#~ "Выбар паведамленьняў:\n"
+#~ " -<, --less-than=ЛІК друкаваць паведамленьні, якія маюць "
+#~ "меньш\n"
+#~ " вызначэньняў, чым зададзена; звычайна "
+#~ "не\n"
+#~ " абмежавана\n"
+#~ " ->, --more-than=ЛІК друкаваць паведамленьні, якія маюць "
+#~ "больш\n"
+#~ " вызначэньняў, чым зададзена; звычайна 0\n"
+#~ " -u, --unique скарачэньне для --less-than=2, толькі\n"
+#~ " непаўторныя паведамленьні будуць "
+#~ "надрукаваны\n"
+
+#~ msgid ""
+#~ "Output details:\n"
+#~ " -t, --to-code=NAME encoding for output\n"
+#~ " --use-first use first available translation for "
+#~ "each\n"
+#~ " message, don't merge several "
+#~ "translations\n"
+#~ " -e, --no-escape do not use C escapes in output "
+#~ "(default)\n"
+#~ " -E, --escape use C escapes in output, no extended "
+#~ "chars\n"
+#~ " --force-po write PO file even if empty\n"
+#~ " -i, --indent write the .po file using indented style\n"
+#~ " --no-location do not write '#: filename:line' lines\n"
+#~ " -n, --add-location generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ " --strict write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ " -w, --width=NUMBER set output page width\n"
+#~ " --no-wrap do not break long message lines, longer "
+#~ "than\n"
+#~ " the output page width, into several "
+#~ "lines\n"
+#~ " -s, --sort-output generate sorted output\n"
+#~ " -F, --sort-by-file sort output by file location\n"
+#~ msgstr ""
+#~ "Дэталі вываду:\n"
+#~ " -e, --no-escape не выкарыстоўваць ESC-пасьлядоўнасьці ў\n"
+#~ " вывадзе (звычайна)\n"
+#~ " -E, --escape выкарыстоўваць ESC пасьлядоўнасьці ў "
+#~ "вывадзе,\n"
+#~ " без дадатковых сімвалаў\n"
+#~ " --force-po запісваць PO-файл, нават калі ён пусты\n"
+#~ " -i, --indent запісваць .po файл, выкарыстоўвываючы "
+#~ "водступы\n"
+#~ " --no-location не запісваць радкі '#: імя_файла:радок'\n"
+#~ " -n, --add-location ствараць радкі '#: імя_файла:радок' "
+#~ "радкі (гэты\n"
+#~ " выбар выкарыстоўваецца паўмаўчаньню)\n"
+#~ " --strict запісваць .po файл, жорстка адпавядаючы\n"
+#~ " пагадненьню Uniforum\n"
+#~ " -w, --width=ШЫРЫНЯ усталёўваць шырыню вывадзімай старонкі\n"
+#~ " -s, --sort-output ствараць упарадкаваны вывад\n"
+#~ " -F, --sort-by-file упарадкоўваць вывад па месцазнаходжаньню "
+#~ "файла\n"
+
+#~ msgid ""
#~ "Informative output:\n"
#~ " -h, --help display this help and exit\n"
#~ " -V, --version output version information and exit\n"
@@ -4063,6 +4228,115 @@ msgstr ""
#~ "ўводу\n"
#~ msgid ""
+#~ "Message selection:\n"
+#~ " -<, --less-than=NUMBER print messages with less than this many\n"
+#~ " definitions, defaults to infinite if "
+#~ "not\n"
+#~ " set\n"
+#~ " ->, --more-than=NUMBER print messages with more than this many\n"
+#~ " definitions, defaults to 1 if not set\n"
+#~ " -u, --unique shorthand for --less-than=2, requests\n"
+#~ " that only unique messages be printed\n"
+#~ msgstr ""
+#~ "Выбар паведамленьняў:\n"
+#~ " -<, --less-than=ЛІК друкаваць паведамленьні, якія маюць "
+#~ "меньш\n"
+#~ " вызначэньняў, чым зададзена; звычайна "
+#~ "не\n"
+#~ " абмежавана\n"
+#~ " ->, --more-than=ЛІК друкаваць паведамленьні, якія маюць "
+#~ "больш\n"
+#~ " вызначэньняў, чым зададзена; звычайна 1\n"
+#~ " -u, --unique скарачэньне для --less-than=2, толькі\n"
+#~ " непаўторныя паведамленьні будуць "
+#~ "надрукаваны\n"
+
+#~ msgid ""
+#~ "Output details:\n"
+#~ " -e, --no-escape do not use C escapes in output "
+#~ "(default)\n"
+#~ " -E, --escape use C escapes in output, no extended "
+#~ "chars\n"
+#~ " --force-po write PO file even if empty\n"
+#~ " -i, --indent write the .po file using indented style\n"
+#~ " --no-location do not write '#: filename:line' lines\n"
+#~ " -n, --add-location generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ " --strict write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ " -w, --width=NUMBER set output page width\n"
+#~ " --no-wrap do not break long message lines, longer "
+#~ "than\n"
+#~ " the output page width, into several "
+#~ "lines\n"
+#~ " -s, --sort-output generate sorted output\n"
+#~ " -F, --sort-by-file sort output by file location\n"
+#~ " --omit-header don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ msgstr ""
+#~ "Падрабязнасьці вываду:n -e, --no-escape не выкарыстоўваць "
+#~ "Сі ESC-пасьлядоўнасьці ў\n"
+#~ " вывадзе (звычайна)\n"
+#~ " -E, --escape выкарыстоўваць Сі ESC-пасьлядоўнасьці ў\n"
+#~ " вывадзе замест дадатковых сымбаляў\n"
+#~ " --force-po запісваць PO файл, нават калі ён "
+#~ "парожні\n"
+#~ " -i, --indent запісваць .po f файл з водступамі\n"
+#~ " --no-location не запісваць радкі '#: імя_файла:радок'\n"
+#~ " -n, --add-location ствараць радкі '#: імя_файла:радок' "
+#~ "радкі\n"
+#~ " (гэты выбар выкарыстоўваецца "
+#~ "неабумоўленым)\n"
+#~ " --strict запісваць .po файл, жорстка адпавядаючы\n"
+#~ " пагадненьню Uniforum\n"
+#~ " -w, --width=ШЫРЫНЯ усталёўваць шырыню вывадзімай старонкі\n"
+#~ " --no-wrap не разьбіваць радкі доўгіх "
+#~ "паведамленьняў,\n"
+#~ " даўжэйшыя за шырыню старонкі вываду, на\n"
+#~ " некалькі радкоў\n"
+#~ " -s, --sort-output ствараць упарадкаваны вывад\n"
+#~ " -F, --sort-by-file упарадкоўваць вывад па шляху да файлу\n"
+#~ " --omit-header не запісваць загаловак з `msgid \"\"' "
+#~ "запісам\n"
+
+#~ msgid ""
+#~ "Output details:\n"
+#~ " -e, --no-escape do not use C escapes in output (default)\n"
+#~ " -E, --escape use C escapes in output, no extended chars\n"
+#~ " --force-po write PO file even if empty\n"
+#~ " -i, --indent indented output style\n"
+#~ " --no-location suppress '#: filename:line' lines\n"
+#~ " --add-location preserve '#: filename:line' lines "
+#~ "(default)\n"
+#~ " --strict strict Uniforum output style\n"
+#~ " -w, --width=NUMBER set output page width\n"
+#~ " --no-wrap do not break long message lines, longer "
+#~ "than\n"
+#~ " the output page width, into several lines\n"
+#~ " -s, --sort-output generate sorted output\n"
+#~ " -F, --sort-by-file sort output by file location\n"
+#~ msgstr ""
+#~ "Дэталі вываду:\n"
+#~ " -e, --no-escape не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
+#~ " вывадзе (звычайна)\n"
+#~ " -E, --escape выкарыстоўваць Сі ESC пасьлядоўнасьці ў "
+#~ "вывадзе,\n"
+#~ " без дадатковых сімвалаў\n"
+#~ " --force-po запісваць PO-файл, нават калі ён пусты\n"
+#~ " -i, --indent запісваць .po файл, выкарыстоўвываючы "
+#~ "водступы\n"
+#~ " --no-location не запісваць радкі '#: імя_файла:радок'\n"
+#~ " -n, --add-location ствараць радкі '#: імя_файла:радок' радкі "
+#~ "(гэты\n"
+#~ " выбар выкарыстоўваецца паўмаўчаньню)\n"
+#~ " --strict запісваць .po файл, жорстка адпавядаючы\n"
+#~ " пагадненьню Uniforum\n"
+#~ " -w, --width=ШЫРЫНЯ усталёўваць шырыню вывадзімай старонкі\n"
+#~ " -s, --sort-output ствараць упарадкаваны вывад\n"
+#~ " -F, --sort-by-file упарадкоўваць вывад па месцазнаходжаньню "
+#~ "файла\n"
+
+#~ msgid ""
#~ "Input file location:\n"
#~ " INPUTFILE input PO or POT file\n"
#~ " -D, --directory=DIRECTORY add DIRECTORY to list for input files "
@@ -4145,6 +4419,20 @@ msgstr ""
#~ " -F, --sort-by-file упарадкоўваць вывад па назьве файла\n"
#~ msgid ""
+#~ "Input file location:\n"
+#~ " filename.po ... input files\n"
+#~ " -D, --directory=DIRECTORY add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "If input file is -, standard input is read.\n"
+#~ msgstr ""
+#~ "Файл уводу:\n"
+#~ " файл.po ... файл уводу\n"
+#~ " -D, --directory=ДЫРЭКТОРЫЯ дадаць ДЫРЭКТОРЫЮ ў сьпіс пошуку "
+#~ "ўваходзячых\n"
+#~ " файлаў\n"
+#~ "Калі замест назвы файлу уводу -, чытаецца стандартны ўвод.\n"
+
+#~ msgid ""
#~ "Operation mode:\n"
#~ " -j, --java Java mode: generate a Java ResourceBundle "
#~ "class\n"
@@ -4187,16 +4475,62 @@ msgstr ""
#~ "Выбары -l і -d абавязковыя. Файл .msg запісваецца ў зададзеную "
#~ "дырэкторыю.\n"
-#, fuzzy
#~ msgid ""
-#~ "Operation modifiers:\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"
+#~ "Input file interpretation:\n"
+#~ " -c, --check perform all the checks implied by\n"
+#~ " --check-format, --check-header, --check-"
+#~ "domain\n"
+#~ " --check-format check language dependent format strings\n"
+#~ " --check-header verify presence and contents of the header "
+#~ "entry\n"
+#~ " --check-domain check for conflicts between domain "
+#~ "directives\n"
+#~ " and the --output-file option\n"
+#~ " -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
+#~ "msgfmt\n"
+#~ " --check-accelerators[=CHAR] check presence of keyboard "
+#~ "accelerators for\n"
+#~ " menu items\n"
+#~ " -f, --use-fuzzy use fuzzy entries in output\n"
+#~ msgstr ""
+#~ "Успрыняцьце файла ўводу:\n"
+#~ " -c, --check perform all the checks implied by\n"
+#~ " --check-format, --check-header, --check-"
+#~ "domain\n"
+#~ " --check-format check language dependent format strings\n"
+#~ " --check-header verify presence and contents of the header "
+#~ "entry\n"
+#~ " --check-domain check for conflicts between domain "
+#~ "directives\n"
+#~ " and the --output-file option\n"
+#~ " -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
+#~ "msgfmt\n"
+#~ " --check-accelerators[=CHAR] check presence of keyboard "
+#~ "accelerators for\n"
+#~ " menu items\n"
+#~ " -f, --use-fuzzy use fuzzy entries in output\n"
+
+#~ msgid ""
+#~ "Informative output:\n"
+#~ " -h, --help display this help and exit\n"
+#~ " -V, --version output version information and exit\n"
+#~ " --statistics print statistics about translations\n"
+#~ " -v, --verbose increase verbosity level\n"
#~ msgstr ""
-#~ "Зьмяняльнікі:\n"
-#~ " -m, --multi-domain прымяніць ref.pot для кожнага маёнтка з def."
-#~ "po\n"
+#~ "Інфармацыйны вывад:\n"
+#~ " -h, --help адлюстроўвае гэтую дапамогу й выходзіць\n"
+#~ " -V, --version выводзіць зьвесткі аб вэрсіі й выходзіць\n"
+#~ " --statistics друкуе статыстыку аб перакладах\n"
+#~ " -v, --verbose павялічвае ўзровень шматслоўнасьці\n"
+
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "поле загалоку `%s' павінна пачынацца на пачатку радка\n"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "поле `%s' усё яшчэ мае пачатковае значэньне\n"
+
+#~ msgid "write to grep subprocess failed"
+#~ msgstr "памылка запісу ў падпрацэс grep"
#~ msgid ""
#~ "Informative output:\n"
@@ -4212,6 +4546,35 @@ msgstr ""
#~ " -q, --quiet, --silent забараняць паказальнікі дасягненьняў\n"
#~ msgid ""
+#~ "Output details:\n"
+#~ " -e, --no-escape do not use C escapes in output (default)\n"
+#~ " -E, --escape use C escapes in output, no extended chars\n"
+#~ " --force-po write PO file even if empty\n"
+#~ " -i, --indent write indented output style\n"
+#~ " --strict write strict uniforum style\n"
+#~ " -w, --width=NUMBER set output page width\n"
+#~ " --no-wrap do not break long message lines, longer than\n"
+#~ " the output page width, into several lines\n"
+#~ " -s, --sort-output generate sorted output\n"
+#~ msgstr ""
+#~ "Дэталі вываду:\n"
+#~ " -e, --no-escape не выкарыстоўваць Сі ESC-паслядоўнасьці ў\n"
+#~ " вывадзе (звычайна)\n"
+#~ " -E, --escape выкарыстоўваць Сі ESC пасьлядоўнасьці ў "
+#~ "вывадзе,\n"
+#~ " без дадатковых сімвалаў\n"
+#~ " --force-po запісваць PO-файл, нават калі ён пусты\n"
+#~ " -i, --indent запісваць .po файл, выкарыстоўвываючы "
+#~ "водступы\n"
+#~ " --strict запісваць .po файл, жорстка адпавядаючы\n"
+#~ " пагадненьню Uniforum\n"
+#~ " -w, --width=ШЫРЫНЯ усталёўваць шырыню вывадзімай старонкі\n"
+#~ " --no-wrap не разьбіваць доўгія радкі з паведамлеьнямі,\n"
+#~ "\n"
+#~ " даўжэй чым шырыня, на некалькі радкоў\n"
+#~ " -s, --sort-output ствараць упарадкаваны вывад\n"
+
+#~ msgid ""
#~ "Informative output:\n"
#~ " -h, --help display this help and exit\n"
#~ " -V, --version output version information and exit\n"
@@ -4222,21 +4585,36 @@ msgstr ""
#~ " -V, --version выводзіць зьвесткі аб версіі й выходзіць\n"
#~ " -v, --verbose павялічыць узровень шматслоўнасьці\n"
-#, fuzzy
+#~ msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
+#~ msgstr "Выкарыстаньне %s [ВЫБАР] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
+
#~ msgid ""
-#~ "Output file location:\n"
-#~ " -d, --default-domain=NAME use NAME.po for output (instead of "
-#~ "messages.po)\n"
-#~ " -o, --output=FILE write output to specified file\n"
-#~ " -p, --output-dir=DIR output files will be placed in directory "
-#~ "DIR\n"
-#~ "If output file is -, output is written to standard output.\n"
+#~ "Display native language translation of a textual message whose "
+#~ "grammatical\n"
+#~ "form depends on a number.\n"
#~ msgstr ""
-#~ "Файл вываду:\n"
-#~ " -o, --output-file=ФАЙЛ запісвае вывад у зададзены файл\n"
-#~ " --strict уключае рэжым жорсткага адпавяданьня "
-#~ "Uniforum\n"
-#~ "Калі замест назвы файла вываду -, вывад запісваецца ў стандартны вывад.\n"
+#~ "Адлюстроўвае пераклады тэкставых паведамленьняў на родную мову, чыя\n"
+#~ "граматычная хорма патрабуе ліку (множнага ці адзіночнага).\n"
+
+#~ msgid ""
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
+#~ "the\n"
+#~ "environment variable TEXTDOMAIN. If the message catalog is not found in "
+#~ "the\n"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
+#~ "variable TEXTDOMAINDIR.\n"
+#~ "Standard search directory: %s\n"
+#~ msgstr ""
+#~ "Калі парамэтар TEXTDOMAIN не зададзен, маёнтак вызначаецца зь пераменнай\n"
+#~ "асяродзьдзя TEXTDOMAIN. Калі каталёг з паведамленьнямі ня знойдзен у "
+#~ "звычайнай\n"
+#~ "дырэкторыі, іншае месцазнаходжаньне можа быць зададзена ў пераменнай\n"
+#~ "асяроддзя TEXTDOMAINDIR.\n"
+#~ "Стандартная дырэкторыя для пошуку: %s\n"
+
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
#~ msgid ""
#~ "Language=C/C++ specific options:\n"
@@ -4285,8 +4663,6 @@ msgstr ""
#~ " --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 "
@@ -4321,90 +4697,3 @@ msgstr ""
#~ "entries\n"
#~ " -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr "
#~ "entries\n"
-
-#~ msgid "missing arguments"
-#~ msgstr "прапушчаны аргумэнты"
-
-#~ msgid ""
-#~ "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
-#~ "or: %s [OPTION] -s [MSGID]...\n"
-#~ msgstr ""
-#~ "Выкарыстаньне: %s [ВЫБАР] [[TEXTDOMAIN] MSGID]\n"
-#~ " ці: %s [ВЫБАР] -s [MSGID]...\n"
-
-#~ msgid "Display native language translation of a textual message.\n"
-#~ msgstr "Адлюстроўвае пераклады на родную мову тэкставых паведамленьняў.\n"
-
-#~ msgid ""
-#~ " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
-#~ " -e enable expansion of some escape sequences\n"
-#~ " -E (ignored for compatibility)\n"
-#~ " -h, --help display this help and exit\n"
-#~ " -n suppress trailing newline\n"
-#~ " -V, --version display version information and exit\n"
-#~ " [TEXTDOMAIN] MSGID retrieve translated message corresponding\n"
-#~ " to MSGID from TEXTDOMAIN\n"
-#~ msgstr ""
-#~ " -d, --domain=TEXTDOMAIN вяртае перакладзеныя паведамленьні з "
-#~ "TEXTDOMAIN\n"
-#~ " -e выкарыстоўваць некаторыя ESC-пасьлядоўнасьці\n"
-#~ " -E (ігнаруецца для сумяшчальнасьці)\n"
-#~ " -h, --help адлюстроўвае гэту дапамогу й выходзіць\n"
-#~ " -n стрымлівае цягнучыеся новыя радкі\n"
-#~ " -V, --version адлюстроўвае зьветскі аб версіі й выходзіць\n"
-#~ " [TEXTDOMAIN] MSGID вяртае перакладзеныя паведамленьні суадносна\n"
-#~ " MSGID з TEXTDOMAIN\n"
-
-#~ msgid ""
-#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
-#~ "the\n"
-#~ "environment variable TEXTDOMAIN. If the message catalog is not found in "
-#~ "the\n"
-#~ "regular directory, another location can be specified with the "
-#~ "environment\n"
-#~ "variable TEXTDOMAINDIR.\n"
-#~ "When used with the -s option the program behaves like the `echo' "
-#~ "command.\n"
-#~ "But it does not simply copy its arguments to stdout. Instead those "
-#~ "messages\n"
-#~ "found in the selected catalog are translated.\n"
-#~ "Standard search directory: %s\n"
-#~ msgstr ""
-#~ "Калі параметар TEXTDOMAIN не зададзен, маёнтак вызначаецца з пераменнай\n"
-#~ "асяроддзя TEXTDOMAIN. Калі каталёг з паведамленьнямі ня знойдзен у "
-#~ "звычайнай\n"
-#~ "дырэкторыі, іншае месцазнаходжаньне можа быць зададзена ў пераменнай\n"
-#~ "асяроддзя TEXTDOMAINDIR.\n"
-#~ "Калі выкарыстоўвываецца разам з выбарам -s, праграма паводзіць сабе як\n"
-#~ "каманда `echo', але яна ня проста капіруе свае аргумэнты ў stdout, яна\n"
-#~ "замест існуючых паведамленьняў знаходзіць у азначаным каталёгу "
-#~ "перакладзеныя.\n"
-#~ "Стандартная дырэкторыя для пошуку: %s\n"
-
-#~ msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-#~ msgstr "Выкарыстаньне %s [ВЫБАР] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-
-#~ msgid ""
-#~ "Display native language translation of a textual message whose "
-#~ "grammatical\n"
-#~ "form depends on a number.\n"
-#~ msgstr ""
-#~ "Адлюстроўвае пераклады тэкставых паведамленьняў на родную мову, чыя\n"
-#~ "граматычная хорма патрабуе ліку (множнага ці адзіночнага).\n"
-
-#~ msgid ""
-#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
-#~ "the\n"
-#~ "environment variable TEXTDOMAIN. If the message catalog is not found in "
-#~ "the\n"
-#~ "regular directory, another location can be specified with the "
-#~ "environment\n"
-#~ "variable TEXTDOMAINDIR.\n"
-#~ "Standard search directory: %s\n"
-#~ msgstr ""
-#~ "Калі парамэтар TEXTDOMAIN не зададзен, маёнтак вызначаецца зь пераменнай\n"
-#~ "асяродзьдзя TEXTDOMAIN. Калі каталёг з паведамленьнямі ня знойдзен у "
-#~ "звычайнай\n"
-#~ "дырэкторыі, іншае месцазнаходжаньне можа быць зададзена ў пераменнай\n"
-#~ "асяроддзя TEXTDOMAINDIR.\n"
-#~ "Стандартная дырэкторыя для пошуку: %s\n"
diff --git a/gettext-tools/po/bg.po b/gettext-tools/po/bg.po
index 7bf7371..a269e42 100644
--- a/gettext-tools/po/bg.po
+++ b/gettext-tools/po/bg.po
@@ -1,16 +1,16 @@
# Bulgarian translations for gettext-tools package.
# Copyright (C) 2010 Free Software Foundation, Inc.
# This file is distributed under the same license as the gettext package.
-# Roumen Petrov <transl@roumenpetrov.info>, 2010,2012.
+# Roumen Petrov <transl@roumenpetrov.info>, 2010,2012,2014.
#
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.18.3\n"
+"Project-Id-Version: gettext-tools 0.19-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-07-07 18:21+0900\n"
-"PO-Revision-Date: 2013-06-25 23:33+0300\n"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2014-05-11 14:09+0300\n"
"Last-Translator: Roumen Petrov <transl@roumenpetrov.info>\n"
-"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"Language-Team: Bulgarian <dict@ludost.net>\n"
"Language: bg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -182,15 +182,15 @@ msgstr "неправилен аргумент за \"версия на изто
msgid "invalid target_version argument to compile_java_class"
msgstr "неправилен аргумент за \"версия на резултат\" за compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
-#: src/write-java.c:1143
+#: gnulib-lib/javacomp.c: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 "пропадна създаването на \"%s\""
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: 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 "грешка при записване на файл \"%s\""
@@ -215,9 +215,9 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr "%s В/И грешка при подпроцес"
-#: 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 "паметта е изчерпана"
@@ -228,7 +228,7 @@ msgid "creation of threads failed"
msgstr "пропадна създаването на клас нишки(threads)"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "пропадна записването към подпроцес %s "
@@ -312,11 +312,11 @@ msgstr "подпроцес %s"
#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
#, c-format
msgid "%s subprocess got fatal signal %d"
-msgstr "подпроцес %s получи смъртоносен сигнал %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: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 "грешка при отваряне за четене на \"%s\""
@@ -679,7 +679,7 @@ msgid ""
msgstr "При директива номер %u, размерът не е съвместим с превръщането '%c'."
#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-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'"
@@ -727,22 +727,22 @@ msgid ""
"format specifications in '%s' and '%s' for argument '%s' are not the same"
msgstr "не са еднакви указаните формати при '%s' и при '%s' за аргумент %s"
-#: 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 "При директива номер %u, с '%c' не може да се започне име на поле."
-#: 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 "При директива номер %u, с '%c' не може да се започне getattr аргумент."
-#: 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 "При директива номер %u, с '%c' не може да се започне getitem аргумент."
-#: 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."
@@ -750,7 +750,7 @@ msgstr ""
"При директива номер %u, не са разререни повече влагания при указание за "
"формат."
-#: 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 "При директива номер %u, не е завършено указанието за форматиране."
@@ -802,11 +802,11 @@ msgid ""
"1 and 9."
msgstr "Знакът, който прекратява директива номер %u, не е число между 1 и 9."
-#: src/hostname.c:178 src/msgattrib.c:344 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
-#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
-#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:599
+#: 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"
@@ -819,19 +819,19 @@ msgstr ""
"Това е свободен програмен продукт: свободни сте да го променяте и разпространявате.\n"
"Не се дават НИКАКВИ ГАРАНЦИИ до степента позволена от закона.\n"
-#: 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 "Създадена от %s.\n"
#. 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 "Бруно Хаибле"
@@ -841,11 +841,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 "За повече сведения, опитайте '%s --help'.\n"
@@ -886,29 +886,29 @@ msgstr ""
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address адреси за мрежово име\n"
-#: src/hostname.c:228 src/msgattrib.c:525 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
-#: src/msgfilter.c:476 src/msgfmt.c:775 src/msggrep.c:623 src/msginit.c:420
-#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
+#: src/hostname.c: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 "Осведомително извеждане:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help извеждане на тази помощ и изход\n"
-#: 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 " -V, --version извеждане на сведение за версия и изход\n"
@@ -917,11 +917,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: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 ""
"Подавайте доклади за грешки на <bug-gnu-gettext@gnu.org>,\n"
@@ -932,30 +932,27 @@ 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 "%s и %s са взаимоизключващи се"
-#: src/msgattrib.c:414 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Употреба: %s [ОПЦИЯ] [ВХФАЙЛ]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -964,10 +961,10 @@ msgstr ""
"Прецежда съобщенията от каталога с преводи според техните атрибути и \n"
"обработва атрибутите.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c: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"
@@ -975,23 +972,23 @@ msgstr ""
"Задължителни аргументи за \"дълги\" опции са също задължителни за \"къси\" "
"опции.\n"
-#: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
-#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
-#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
-#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
+#: src/msgattrib.c:433 src/msgcat.c: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 "Местоположение на входящ файл:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " ВХФАЙЛ входящ PO файл\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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"
@@ -999,33 +996,33 @@ msgstr ""
" -D, --directory=ДИР добавя директория ДИР към списъка за търсене "
"на входящи файлове\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
"Ако не е зададено име на входящ файл или то е -, ще се чете от стандартния "
"вход.\n"
-#: 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 "Местоположение на резултатата:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 ""
" -o, --output-file=ФАЙЛ записване на резултата в зададения файл\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1034,12 +1031,12 @@ msgstr ""
"Резултатите се извеждат на стандартния изход, ако не е зададен файл за запис "
"или той е -\n"
-#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
#, c-format
msgid "Message selection:\n"
msgstr "Избор на съобщения:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
@@ -1047,7 +1044,7 @@ msgstr ""
" --translated запазване на преведените, изтриване на "
"непреведените съобщения\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
@@ -1055,64 +1052,64 @@ msgstr ""
" --untranslated запазване на непреведените, изтриване на "
"преведените съобщения\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr ""
" --no-fuzzy изтриване на съобщенията отбелязани като "
"мъгляви('fuzzy')\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr ""
" --only-fuzzy запазване на на съобщенията отбелязани като "
"мъгляви('fuzzy')\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete изтриване на остарялите #~ съобщения\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete запазване на остарялите #~ съобщения\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Управление на атрибутите:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr ""
" --set-fuzzy установяване на всички съобщения като "
"мъгляви('fuzzy')\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr ""
" --clear-fuzzy установяване на всички съобщения да не са "
"мъгляви('fuzzy')\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr ""
" --set-obsolete установяване на всички съобщения като "
"остаряли\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr ""
" --clear-obsolete установяване на всички съобщения да не са "
"остаряли\n"
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
@@ -1122,7 +1119,7 @@ msgstr ""
" предишните msgid-та, на преведените "
"съобщения.\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
@@ -1131,14 +1128,22 @@ msgstr ""
" --clear-previous изтрива \"предишния\" msgid от всички "
"съобщения\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+" --empty при изтриване на мъгляви('fuzzy'), да се "
+"зададе празен \"msgstr\"\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
msgstr ""
" --only-file=ФАЙЛ.po управлява само записите изброени в ФАЙЛ.po\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
@@ -1146,28 +1151,28 @@ msgstr ""
" --ignore-file=ФАЙЛ.po управлява само записите, които не са изброени "
"в ФАЙЛ.po\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr " --fuzzy синоним за --only-fuzzy --clear-fuzzy\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
msgstr ""
" --obsolete синоним за --only-obsolete --clear-obsolete\n"
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c: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 "Синтаксис на входящия файл:\n"
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c: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"
@@ -1175,8 +1180,8 @@ msgstr ""
" -P, --properties-input входящия файл е със синтаксис на Java ."
"properties\n"
-#: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
-#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c: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 "
@@ -1185,17 +1190,17 @@ 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
-#: 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 "Подробности за извеждане:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1210,16 +1215,16 @@ msgstr ""
" КОГА може да бъде 'always', 'never', 'auto', "
"или 'html'.\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=СТИЛФАЙЛ задава CSS правила за --color\n"
-#: 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"
@@ -1227,9 +1232,9 @@ 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
+#: 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"
@@ -1237,30 +1242,30 @@ 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
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
" --force-po записване на PO файл, дори ако е празен\n"
-#: 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 ""
" -i, --indent записване на .po файл в стил с отмествания\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
" --no-location без записване на редове '#: filename:line'\n"
-#: 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"
@@ -1268,8 +1273,8 @@ 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
+#: 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"
@@ -1277,34 +1282,34 @@ 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
-#: 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 " -p, --properties-output записване на Java .properties файл\n"
-#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
-#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
" --stringtable-output записване на NeXTstep/GNUstep .strings файл\n"
-#: 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 ""
" -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
-#: 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"
@@ -1313,32 +1318,32 @@ msgstr ""
" --no-wrap без разделяне на няколко реда на съобщения,\n"
" по-дълги от ширината на изходящата страница\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output резултатът да е подреден\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 ""
" -F, --sort-by-file подреждане на резултата по място на файла\n"
-#: 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 "избран е невъзможен критерии за избор (%d < n < %d)"
-#: 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 "Употреба: %s [ОПЦИЯ] [ВХФАЙЛ]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1361,25 +1366,25 @@ msgstr ""
"ще се натрупат, освен ако е зададено --use-first, като тогава ще се вземат\n"
"от първия PO файл, който ги определя.\n"
-#: 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 " ВХФАЙЛ ... входящи файлове\n"
-#: 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 ""
" -f, --files-from=ФАЙЛ получаване на списъка с входящи файлове от "
"ФАЙЛ\n"
-#: 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 "Ако входящия файл е -, се чете от стандартния вход.\n"
-#: 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"
@@ -1390,7 +1395,7 @@ msgstr ""
" По-поразбиране безкрайност, ако не е "
"установено\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1400,7 +1405,7 @@ msgstr ""
"това\n"
" По-поразбиране 0, ако не е установено\n"
-#: 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"
@@ -1409,8 +1414,8 @@ msgstr ""
" -u, --unique съкращения за --less-than=2, поисква се\n"
" извеждане на неповтарящите се съобщения\n"
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:739
-#: src/msgmerge.c:557
+#: src/msgcat.c: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"
@@ -1418,8 +1423,8 @@ msgstr ""
" -P, --properties-input входящите файлове са с Java .properties "
"синтаксис\n"
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
-#: src/msgmerge.c:559
+#: src/msgcat.c: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"
@@ -1429,12 +1434,12 @@ msgstr ""
"strings\n"
" синтаксис\n"
-#: 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 " -t, --to-code=ИМЕ кодировка при извеждане\n"
-#: 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"
@@ -1443,7 +1448,7 @@ msgstr ""
" --use-first използване на първия наличен превод за всяко\n"
" съобщение, без сливане на отделни преводи\n"
-#: 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"
@@ -1451,21 +1456,21 @@ 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
+#: 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 "точно 2 входящи файла са необходими"
-#: 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 "Употреба: %s [ОПЦИЯ] def.po ref.pot\n"
@@ -1497,12 +1502,12 @@ msgstr " def.po преводи\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot препратки към източници\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "Уточняване на операциите:\n"
-#: 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."
@@ -1511,7 +1516,7 @@ msgstr ""
" -m, --multi-domain приложи ref.pot за всяка от областите в def."
"po\n"
-#: 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 " -N, --no-fuzzy-matching да не се използва размито съвпадение\n"
@@ -1536,17 +1541,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 "съобщението се използва, но не е определено в %s"
@@ -1556,19 +1561,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] "открита е %d пагубна грешка"
msgstr[1] "открити са %d пагубни грешки"
-#: 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"
@@ -1589,7 +1594,7 @@ msgstr ""
"първия PO файл, който ги определя. От всички PO файлове ще се натрупат\n"
"местоположенията във файловете.\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1599,71 +1604,71 @@ msgstr ""
"това\n"
" По-поразбиране 1, ако не е установено\n"
-#: 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 ""
" --omit-header без записване на заглавен 'msgid \"\"' запис\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr "Преобразува каталог с преводи в различна кодировка за знаци.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Цел за преобразуване:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Кодировка по подразбиране е текущата кодировка на локала.\n"
-#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent резултат в стил с отместване\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\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
+#: 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 ""
-" --add-location запазване на редове '#: filename:line' (по "
+" -n, --add-location запазване на редове '#: файл:ред' (по "
"подразбиране)\n"
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict строг уеднаквен стил за резултат\n"
-#: 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 "Употреба: %s [ОПЦИЯ] ВХФАЙЛ\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1676,7 +1681,7 @@ msgstr ""
"създаден от xgettext). На непреведените записи се присвоява превод,\n"
"който е еднакъв с msgid.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " ВХФАЙЛ входящ PO или POT файл\n"
@@ -1715,7 +1720,7 @@ msgstr ""
"Специална вградена команда наречена '0' извежда преводите последвани от \n"
"<NULL> байт. Резултата от \"msgexec 0\" е подходящ като входящ за \"xargs -0\".\n"
-#: 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 " -i, --input=ВХФАЙЛ входящ PO файл\n"
@@ -1725,27 +1730,27 @@ msgstr " -i, --input=ВХФАЙЛ входящ PO файл\n"
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 "трябва да се зададе най-малко един sed скрипт"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Употреба: %s [ОПЦИЯ] ФИЛТЪР [ФИЛТЪРНА-ОПЦИЯ]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "Прилагане на филтър към всички преводи от каталога с преводи.\n"
-#: 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"
@@ -1754,19 +1759,19 @@ msgstr ""
"ФИЛТЪР може е всяка програма, която чете превод от стандартния вход\n"
"и записва променения превод на стандартния изход.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "Полезни ФИЛТЪР-ОПЦИИ, когато ФИЛТЪР е 'sed':\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
msgstr ""
" -e, --expression=СКРИПТ добавя СКРИПТ към командите за изпълнение\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1777,7 +1782,7 @@ msgstr ""
"командите\n"
" за изпълнение\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
@@ -1785,7 +1790,7 @@ msgstr ""
" -n, --quiet, --silent подтискане на автоматичното извеждане на "
"пространството от образи\n"
-#: 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"
@@ -1793,12 +1798,12 @@ msgstr ""
" --no-escape без използване на Си освобождаващи "
"последователности в резултата (по подразбиране)\n"
-#: 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 " --indent резултат в стил с отместване\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
@@ -1806,83 +1811,104 @@ msgstr ""
" --keep-header запазване на заглавни записи без промяна, да "
"не се филтрират\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "аргумента на %s трябва да е единичен препинателен знак"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
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: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 "не са задава входящ файл, ако са зададени %s и %s"
+
+#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
#: src/msgunfmt.c:353
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s изисква указване на \"-d директория\""
-#: 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 "%s изисква указване на \"-l локал\""
-#: 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 "%s изисква указване на \"\"--template пример\""
+
+#: src/msgfmt.c:545
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s изисква указване на \"-o файл\""
+
+#: src/msgfmt.c:551
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s и %s са взаимоизключващи се при %s"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s е правилен само с %s или %s"
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:571 src/msgfmt.c:577
#, c-format
msgid "%s is only valid with %s, %s or %s"
msgstr "%s е правилен само с %s, %s или %s"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d преведено съобщение"
msgstr[1] "%d преведени съобщения"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d мъгляв превод"
msgstr[1] ", %d мъгляви преводи"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d непреведено съобщение"
msgstr[1] ", %d непреведени съобщения"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Употреба: %s [ОПЦИЯ] имефайл.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
"Създаване на двоичен каталог със съобщения от текстово описание на "
"преводите.\n"
-#: 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"
@@ -1891,17 +1917,17 @@ msgstr ""
"Задължителни аргументи за \"дълги\" опции са също задължителни за \"къси\" опции.\n"
"Също така за незадължителните аргументи.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
msgid " filename.po ... input files\n"
msgstr " имефайл.po ... входящи файлове\n"
-#: 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 "Режими на работа:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1910,7 +1936,7 @@ msgstr ""
" -j, --java Java режим: създаване на клас за Java "
"ResourceBundle\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1919,12 +1945,12 @@ msgstr ""
" --java2 като --java и се подразбира Java2 (JDK 1.2 или "
"по-нова)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr " --csharp C# режим: създаване на .NET .dll файл\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -1933,40 +1959,48 @@ msgstr ""
" --csharp-resources C# ресурс режим: създаване на .NET .resources "
"файл\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
" --tcl Tcl режим: създаване на tcl/msgcat .msg файл\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt Qt режим: създаване на Qt .qm файл\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+" --desktop Режим \"Работен плот\": създаване на .desktop "
+"файл\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict разрешава стриктен уеднаквен режим\n"
-#: 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 "Ако изходящия файл е -, резултатът се записва на стандартния изход.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Местоположение на резултата при Java режим:\n"
-#: src/msgfmt.c:703 src/msgfmt.c:717 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr " -r, --resource=РЕСУРС име на ресурс\n"
-#: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
-#: src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c: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 "
@@ -1974,14 +2008,21 @@ msgid ""
msgstr ""
" -l, --locale=ЛОКАЛ име на локал, или език, или език_ДЪРЖАВА\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr " --source създава .java файл, вместо .class файл\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
" -d ДИРЕКТОРИЯ основна директория с йерархията на класовете\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1994,12 +2035,12 @@ msgstr ""
"разделени с долна черта. Опцията -d е задължителна. Класът се записва в\n"
"зададената директория.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "Местоположение на резултата при C# режим:\n"
-#: 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 "
@@ -2008,7 +2049,7 @@ msgstr ""
" -d ДИРЕКТОРИЯ основна директория за зависими от локал .dll "
"файлове\n"
-#: 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"
@@ -2017,19 +2058,19 @@ msgstr ""
"Опциите -l и -d са задължителни. .dll файла се записва в поддиректория\n"
"на указаната, чието име зависи от локала.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Местоположение на резултата при Tcl режим:\n"
-#: 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 ""
" -d ДИРЕКТОРИЯ основна директория за каталози с .msg "
"съобщения\n"
-#: 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"
@@ -2038,12 +2079,47 @@ msgstr ""
"Опциите -l и -d са задължителни. .msg файла се записва в указаната\n"
"директория.\n"
-#: src/msgfmt.c:745 src/xgettext.c:882
+#: src/msgfmt.c:861
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr "Опции за режим \"Работен плот\":\n"
+
+#: src/msgfmt.c:867
+#, c-format
+msgid " --template=TEMPLATE a .desktop file used as a template\n"
+msgstr " --template=ПРИМЕР .desktop-файл използван като пример\n"
+
+#: src/msgfmt.c:869
+#, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr " -d ДИРЕКТОРИЯ основна директория от .po-фаилове\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -kДУМА, --keyword=ДУМА търсене по ДУМА като допълнителен ключ\n"
+" -k, --keyword да не се използва ключ по подразбиране\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+"Опциите -l, -o, и --template са задължителни. Ако е зададено -D, то "
+"входящите\n"
+"файлове се четат от тази директория, вместо от командния ред.\n"
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "Тълкувания за входящия файл:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -2055,14 +2131,14 @@ msgstr ""
" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format проверка на езиково зависимите форматиращи "
"низове\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -2071,7 +2147,7 @@ msgstr ""
" --check-header проверка на наличието и съдържанието на "
"заглавни записи\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -2081,7 +2157,7 @@ msgstr ""
"област\n"
" и опцията --output-file\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2090,7 +2166,7 @@ msgstr ""
" -C, --check-compatibility проверка дали ГНУ msgfmt се държи като X/Open "
"msgfmt\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -2101,14 +2177,14 @@ msgstr ""
"клавиши\n"
" за елементи на меню\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
" -f, --use-fuzzy използване на мъгляви(fuzzy) записи при "
"извеждане\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
@@ -2116,7 +2192,7 @@ msgstr ""
" -a, --alignment=БРОЙ подравнява низовете до БРОЙ байтове (по "
"подразбиране: %d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2129,88 +2205,98 @@ msgstr ""
" (старши или младши, по подразбиране зависи "
"от процесора)\n"
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
" --no-hash двоичният файл няма да съдържа хеш-таблица\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics извежда статистика за преводите\n"
-#: src/msgfmt.c:783 src/msgmerge.c:607 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose увеличава нивото на подробност\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "предупреждение: заглавието на PO файла липсва или не е правилно\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "предупреждение: няма да работи превръщането м/у кодировки\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "предупреждение: заглавието на PO файла е мъгляво\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "предупреждение: стари версии на msgfmt ще дадат грешка за това\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "името на област \"%s\" не е подходящо за име на файл"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"името на област \"%s\" не е подходящо за име на файл: ще се използва "
"представка"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, c-format
msgid "'domain %s' directive ignored"
msgstr "пренебрегната директива 'област %s'"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "пренебрегнат празен 'msgstr' запис"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "пренебрегнат мъгляв(fuzzy) 'msgstr' запис"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: предупреждение: файла източник съдържа мъгляви преводи"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr "%s не съществува"
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr "%s съществува, но е нечетим"
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-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 "грешка при четене на \"%s\""
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2219,7 +2305,7 @@ msgstr ""
"опцията '%c' не може да се използва преди да се зададе 'J', 'K', 'T', 'C', "
"или 'X'"
-#: 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"
@@ -2228,7 +2314,7 @@ msgstr ""
"Извличане на всички съобщения от каталога с преводи, които съвпадат с даден образ\n"
"или принадлежат на дадени файлове източници.\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2303,7 +2389,7 @@ msgstr ""
" -v, --invert-match извеждане на съобщенията, които не съвпадат със никой\n"
" от критериите за избор\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2311,12 +2397,12 @@ msgstr ""
" --escape резултат с използване на Си освобождаващи "
"последователности, без разширени знаци\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output резултатът да е подреден\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
@@ -2483,7 +2569,7 @@ msgstr "целевата кодировка, \"%s\", не е с преносим
#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:3051
+#: src/xgettext.c:544 src/xgettext.c:3418
#, c-format
msgid "warning: "
msgstr "предупреждение: "
@@ -2692,17 +2778,17 @@ msgstr "поддръжката на множествено число е доп
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr е без отбелязване за ускорена клавишна комбинация '%c'"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr е отбелязан с твърде много отметки за клавишни комбинации '%c'"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "все още заглавното поле '%s' е с началната стойност по подразбиране\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "в заглавния блок липсва поле '%s'\n"
@@ -2722,7 +2808,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 "
@@ -2741,7 +2827,7 @@ 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 "
@@ -2750,16 +2836,16 @@ msgstr ""
"Не може да се превърне от \"%s\" към \"%s\". %s използва iconv(). Тази "
"версия е създадена без iconv()."
-#: 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 "%s е правилно само с %s"
-#: 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"
@@ -2783,18 +2869,18 @@ msgstr ""
"съвпадение, за получаван на по-добри резултати ще се използват размити\n"
"(fuzzy) съвпадения\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
" def.po преводи препращащи към на старите източници\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot препратки към новите източници\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2804,7 +2890,7 @@ msgstr ""
"съобщения,\n"
" може да се укаже повече от веднъж\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2813,27 +2899,27 @@ msgstr ""
" -U, --update обнови def.po,\n"
" не прави нищо, ако def.po е осъвременен\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Място на изходящия файл при обновяване:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Резултата се записва обратно в def.po.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=КОНТРОЛ създаване на резервно копие на def.po\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=НАСТ задава наставка за резервно копие\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2851,7 +2937,7 @@ msgstr ""
" existing, nil номериран, ако съществува такъв, иначе обикновен\n"
" simple, never винаги се създава обикновено резервно копие\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2861,7 +2947,7 @@ msgstr ""
"Наставката за резервно копие е `~', освен ако е зададена с --suffix или с\n"
"променливата на обкръжението SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
@@ -2869,23 +2955,23 @@ msgstr ""
" --previous запазване на предишните msgid-ита на "
"преведените съобщения\n"
-#: 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 ""
" -q, --quiet, --silent подтискане на показването ход на процеса\n"
-#: 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, "
@@ -2894,7 +2980,7 @@ 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/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -3007,7 +3093,7 @@ msgstr ""
msgid " --strict write strict uniforum style\n"
msgstr " --strict записване в стриктен уеднаквен стил\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -3028,12 +3114,12 @@ msgstr ""
"като тогава ще се вземат от първия превод. Позициите във файловете ще се натрупат.\n"
"Ако се използва --unique, повторенията ще се отхвърлят.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated извежда само повторенията\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -3104,27 +3190,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 "липсва дял 'msgstr[]'"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, c-format
msgid "missing 'msgid_plural' section"
msgstr "липсва дял 'msgid_plural'"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, c-format
msgid "missing 'msgstr' section"
msgstr "липсва дял '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 "формата за множествено число с грешен индекс"
@@ -3134,7 +3220,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 "неправилно многобайтова последователност"
@@ -3178,16 +3264,16 @@ msgstr "край-на-ред в низ"
msgid "context separator <EOT> within string"
msgstr "разделител на съдържание <EOT> в низ"
-#: 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 "това е мястото на първото определение"
@@ -3387,19 +3473,19 @@ msgstr "пропадна компилирането на клас на C#, да
msgid "compilation of C# class failed"
msgstr "пропадна компилирането на клас на C#"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "неправилно име за клас на Java: %s"
-#: 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 ""
"пропадна компилирането на клас на Java, да се опита --verbose или да се "
"установи $JAVAC"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr ""
@@ -3410,7 +3496,7 @@ msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "грешка при отваряне на \"%s\" за запис"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
@@ -3418,7 +3504,7 @@ msgstr ""
"съобщения за превод не трябва да съдържат освобождаваща последователност '\\"
"%c'"
-#: 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"
@@ -3431,7 +3517,7 @@ msgstr ""
"кодировка. Да се обмисли използването на чисто ASCII msgid.\n"
"%s\n"
-#: 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"
@@ -3511,7 +3597,7 @@ msgstr ""
"каталогът със съобщенията съдържа преводи в множествено число,\n"
"но те не се поддържат от Tcl каталог със съобщения\n"
-#: 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 "%s:%d: предупреждение: незавършен низ"
@@ -3521,17 +3607,22 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, c-format
+msgid "warning: invalid Unicode character"
+msgstr "предупреждение: неправилен знак на Uникод"
+
+#: 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 "%s:%d: предупреждение: незавършена константа за буква"
-#: 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 "%s:%d: предупреждение: незавършен заместител на низ"
-#: 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 "Да се зададе кодировка на източника чрез --from-code."
@@ -3585,7 +3676,7 @@ msgstr ""
"%s:%d: Неправилна многобайтова последователност.\n"
"Да се зададе кодировка на източника чрез --from-code.\n"
-#: 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 "%s:%d: предупреждение: неправилен знак на уникод"
@@ -3605,22 +3696,22 @@ msgstr "%s:%d: предупреждение: намерено е ')', къдет
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: предупреждение: намерено е '}', където се очаква ')'"
-#: src/x-glade.c:561
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
msgstr "Липсва обкръжение за низ извлечен от елемент '%s'"
-#: 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 "Главният елемент <%s> не е разрешен в правилен Glade файл"
-#: 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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3683,11 +3774,21 @@ msgstr ""
"%s:%d: Неправилна многобайтова последователност.\n"
"Да се зададе кодировка на източника чрез --from-code\n"
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: предупреждение: предсрочно прекъснат регулярен израз"
+#: src/x-javascript.c:1055
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: предупреждение: %s не е допустим"
+
+#: src/x-javascript.c:1069
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: предупреждение: незавършено XML изразяване"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3817,35 +3918,41 @@ msgstr ""
"%s:%lu: предупреждение: синтаксиса $\"...\" е забранен от съображения за "
"сигурност, вместо това да се използва eval_gettext"
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: предупреждение: предсрочно прекъснат регулярен израз"
-#: src/xgettext.c:636
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr ""
+"'%s' не е правилно име на кодировка. Използване на ASCII по подразбиране.\n"
+
+#: src/xgettext.c:648
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"--join-existing не може да се използва, когато резултата се записва на "
"стандартния изход"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext не може да работи без ключове за търсене"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr ""
"предупреждение: файлът '%s' с окончание '%s' е непознат, ще се опита Си"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "Извличане на низовете за превод от зададените входящи файлове.\n"
-#: src/xgettext.c:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3854,13 +3961,13 @@ msgstr ""
" -d, --default-domain=ИМЕ използване на ИМЕ.po за изходящ (вместо "
"messages.po)\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
" -o, --output=ФАЙЛ записване на изходните данни в указания файл\n"
-#: src/xgettext.c:863
+#: src/xgettext.c:886
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
@@ -3868,12 +3975,12 @@ msgstr ""
" -p, --output-dir=ДИР изходящите файлове да се запишат в директория "
"ДИР\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Избиране на език на входящия файл:\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3883,7 +3990,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=ИМЕ приемане на указания език\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3892,14 +3999,14 @@ msgstr ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua)\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ за краткост на --language=C++\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:902
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
@@ -3908,7 +4015,7 @@ msgstr ""
"По подразбиране езикът се отгатва в зависимост от окончанието на входящия "
"файл.\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3917,23 +4024,23 @@ msgstr ""
" --from-code=NAME кодиране на входящите файлове\n"
" (без Python, Tcl, Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr "По подразбиране входящите файлове са в ASCII.\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
" -j, --join-existing добавя съобщенията към съществуващ файл\n"
-#: 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 " -x, --exclude-file=ФАЙЛ.po да не се извличат записите от FILE.po\n"
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -3947,17 +4054,17 @@ msgstr ""
" -c, --add-comments в резултата се поставят всички блокове с\n"
" коментар от редовете преди ключа\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Опции за определен език:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all извличане на всички низове\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3972,16 +4079,22 @@ msgstr ""
" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
" Lua, JavaScript, Vala)\n"
-#: 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 ""
-" -kДУМА, --keyword=ДУМА търсене по ДУМА като допълнителен ключ\n"
-" -k, --keyword да не се използва ключ по подразбиране\n"
+" (само езиците C, C++, ObjectiveC, Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+" Lua, JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3991,7 +4104,7 @@ msgstr ""
" --flag=ДУМА:АРГ:ФЛАГ допълнителен флаг за низове при номер на\n"
" аргумент АРГ за ключ ДУМА\n"
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4006,39 +4119,39 @@ msgstr ""
" C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
" Lua, JavaScript, Vala)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
" -T, --trigraphs разпознаване на ANSI Си тризнаци в входните "
"данни\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr " (само езици C, C++, ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt разпознава Qt формат за низове\n"
-#: 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 " (само език C++)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --kde разпознава KDE 4 формат за низове\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --boost разпознава Boost формат за низове\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
@@ -4046,19 +4159,19 @@ msgstr ""
" --debug по-подробен резултат как е разпознато "
"съобщението като вид формат\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output записва Java .properties файл\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
" --copyright-holder=НИЗ задава носител на авторско право в "
"резултата\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -4066,17 +4179,17 @@ msgstr ""
" --foreign-user резултат без авторско право на ФСС за\n"
" чуждестранни потребители\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, c-format
msgid " --package-name=PACKAGE set package name in output\n"
msgstr " --package-name=ПАКЕТ задава име на пакет в резултата\n"
-#: src/xgettext.c:989
+#: src/xgettext.c:1012
#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr " --package-version=ВЕРСИЯ задава версия на пакета в резултата\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
@@ -4084,7 +4197,7 @@ msgstr ""
" --msgid-bugs-address=ПОЩА@АДРЕС задава адрес за рапортуване на "
"грешки при msgid\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -4095,7 +4208,7 @@ msgstr ""
"представка за\n"
" стойностите на msgstr\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -4106,38 +4219,38 @@ msgstr ""
"за\n"
" стойности на msgstr\n"
-#: 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 "Аргумента --flag не е с <ключ>:<ном_арг>:[pass-]<флаг> синтаксис: %s"
-#: 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 "Знак извън ASCII кодиране при %s%s."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr "Коментар, който е извън ASCII кодиране, при или преди %s%s."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr "Низ извън ASCII кодиране при %s%s."
-#: 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 "%s%s: предупреждение: "
-#: 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 "
@@ -4146,7 +4259,7 @@ msgstr ""
"Макар че е използван в място за низове за формат, %s не е правилен низ за %s "
"формат. Причина: %s\n"
-#: 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: "
@@ -4155,7 +4268,7 @@ msgstr ""
"Макар че е обявен като такъв, %s не е правилен низ за %s формат. Причина: "
"%s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4168,7 +4281,7 @@ msgstr ""
"Да се обмисли използването на низ за формат с именувани аргументи и \n"
"привързване, вместо последователност за аргументите.\n"
-#: 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"
@@ -4178,27 +4291,27 @@ msgstr ""
"gettext(\"\") връща заглавен запис с метаинформация,\n"
"а не празен низ.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "двусмислено зададен аргумент за ключ '%.*s'"
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "предупреждение: липсва съдържание за ключ '%.*s'"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr "предупреждение: липсва съдържание за множествено число на ключ '%.*s'"
-#: 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"
@@ -4210,7 +4323,7 @@ msgstr ""
"MSGID_BUGS_ADDRESS променлива, иначе се задава\n"
", на командния ред, опция --msgid-bugs-address.\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, c-format
msgid "language '%s' unknown"
msgstr "непознат език '%s'"
diff --git a/gettext-tools/po/ca.po b/gettext-tools/po/ca.po
index 38c0576..719de68 100644
--- a/gettext-tools/po/ca.po
+++ b/gettext-tools/po/ca.po
@@ -1,57 +1,59 @@
# Catalan messages for GNU gettext-tools.
-# Copyright (C) 2001, 2002, 2003, 2007 Free Software Foundation, Inc.
-# Ivan Vilata i Balaguer <ivan@selidor.net>, 2001, 2002, 2003, 2004, 2005, 2006, 2007.
+# Copyright (C) 2001, 2002, 2003, 2007, 2014 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gettext package.
#
-# Sóc Ivan, aquestes són les convencions que adopte per a la 0.15-pre5:
-# * Sempre que es puga s’usaran els caràcters adequats per al text en català:
-# l’apòstrof (’), ela geminada (ŀ, Ŀ), cometes («, », “, ”, ‘, ’, en aquest
-# ordre de d’aparició), guionet (‐), guionet dur (‑), guió (—) i punts
-# suspensius (…). Compte, perquè *cap*, repetesc, *CAP* dels anteriors és
-# el caràcter que s’obté teclejant directament; vegeu
-# http://www.selidor.net/~ivan/blog/bits/20060304T0023-ortotipografia.html.
-# * Use 2 espais després d’un punt.
-# * Missatges d’ajuda:
-# * Forma d’ús: …
-# o bé: …
-# * ARGUMENT_COMPOST, però ARGCOMP
-# * FILE(s) -> cada FITXER (si és possible)
-# * Cada línia de descripció d’una opció comença en la columna 24, i
-# sempre es manté com a mínim a 4 espais del nom de l’opció. Quan
-# l’opció arriba a la columna 24, la descripció comença en la línia
-# inferior. Les descripcions que no caben en una línia es parteixen i
-# continuen en la columna 24 de la línia següent.
-# * Les descripcions d’ítems que no són opcions es mantenen alineades a
-# 4 espais de l’ítem més llarg del bloc. Les que no caben en una línia
-# es parteixen i continuen en la mateixa columna on comencen.
-# o Excepció: ajudes de «pr», quin format vos agrada més?
-# * Errors i avisos:
-# * no és igual «no es pot obrir» que «no s’ha pogut obrir»
-# * no és igual «s’està obrint X» que «en obrir X» (error)
-# * «avís:» comença amb minúscula, la cadena següent també
-# * sempre van en una sola línia, a no ser que els retorns importen; en
-# aquest cas, les noves línies comencen amb un caràcter de tabulació
-# * VARIABLE_ENTORN, però «valor de variable»
-# * Noms de funció: printf()
-# * Noms de fitxer: «fitxer»
-# * Noms d’opcions: «--opció=ARGUMENT»
-# * El text com a molt arriba a la columna 78, amb el caràcter de nova línia
-# en la 79. Les línies es parteixen de forma automàtica (no per a que quede
-# bonic, excepte quan quede realment horrend o porte a confusió).
-# * Els missatges marcats com a multilínia només arriben fins a la columna
-# 70. A sovint contenen marques de format; en aquest cas s’hi inserta una
-# nova línia perquè no hi ha forma de saber com serà de llarga la línia.
+# Ivan Vilata i Balaguer <ivan@selidor.net>, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2013, 2014.
#
-# FIXME: Lots of strings should be marked «no-wrap», not only those which
-# are split between lines in English, but also those which would need to
-# be splitted in its translation into other languages (this includes lines
-# describing single options). Also strings used in multiline error and
-# warning messages. ivb
+# Sóc Ivan, aquestes són les convencions que adopte per a la 0.19-rc1:
+#
+# - Sempre que es puga s’usaran els caràcters adequats per al text en català:
+# l’apòstrof (’), ela geminada (l·l, L·L), cometes («, », “, ”, ‘, ’, en
+# aquest ordre de d’aparició), guionet (‐), guionet dur (‑), guió (—) i punts
+# suspensius (…). Compte, perquè alguns dels caràcters anteriors no són els
+# que s’obtenen teclejant directament; vegeu
+# https://elvil.net/blog/ca/ortotipografia
+# - Use 2 espais després d’un punt.
+# - Missatges d’ajuda:
+# - Forma d’ús: …
+# o bé: …
+# - ARGUMENT_COMPOST, però ARGCOMP
+# - FILE(s) -> cada FITXER (si és possible)
+# - Cada línia de descripció d’una opció comença en la columna 24, i sempre es
+# manté com a mínim a 4 espais del nom de l’opció. Quan l’opció arriba a la
+# columna 24, la descripció comença en la línia inferior. Les descripcions
+# que no caben en una línia es parteixen i continuen en la columna 24 de la
+# línia següent.
+# - Les descripcions d’ítems que no són opcions es mantenen alineades a 4
+# espais de l’ítem més llarg del bloc. Les que no caben en una línia es
+# parteixen i continuen en la mateixa columna on comencen.
+# - Excepció: ajudes de «pr», quin format vos agrada més?
+# - Errors i avisos:
+# - no és igual «no es pot obrir» que «no s’ha pogut obrir»
+# - no és igual «s’està obrint X» que «en obrir X» (error)
+# - «avís:» comença amb minúscula, la cadena següent també
+# - sempre van en una sola línia, a no ser que els retorns importen; en
+# aquest cas, les noves línies comencen amb un caràcter de tabulació
+# - VARIABLE_ENTORN, però «valor de variable»
+# - Noms de funció: printf()
+# - Noms de fitxer: «fitxer»
+# - Noms d’opcions: «--opció=ARGUMENT»
+# - El text com a molt arriba a la columna 78, amb el caràcter de nova línia en
+# la 79. Les línies es parteixen de forma automàtica (no per a que quede
+# bonic, excepte quan quede realment horrend o porte a confusió).
+# - Els missatges marcats com a multilínia només arriben fins a la columna 70.
+# A sovint contenen marques de format; en aquest cas s’hi inserta una nova
+# línia perquè no hi ha forma de saber com serà de llarga la línia.
+#
+# FIXME: Lots of strings should be marked «no-wrap», not only those which are
+# split between lines in English, but also those which would need to be splitted
+# in its translation into other languages (this includes lines describing single
+# options). Also strings used in multiline error and warning messages. ivb
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.16.2-pre5\n"
+"Project-Id-Version: gettext-tools 0.19-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-07-07 18:21+0900\n"
-"PO-Revision-Date: 2007-10-28 18:06+0100\n"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2014-05-11 21:36+0200\n"
"Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
"Language: ca\n"
@@ -105,35 +107,41 @@ msgstr "no s’ha pogut eliminar el directori temporal «%s»"
msgid "write error"
msgstr "error d’escriptura"
+# Condició d’error. Usa quote(). ivb
#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
#, c-format
msgid "preserving permissions for %s"
-msgstr ""
+msgstr "en preservar els permissos de %s"
+# Usa quote(). ivb
#: gnulib-lib/copy-file.c:194
-#, fuzzy, c-format
+#, c-format
msgid "error while opening %s for reading"
-msgstr "error en obrir «%s» per a llegir"
+msgstr "error en obrir %s per a llegir"
+# Usa quote(). ivb
#: gnulib-lib/copy-file.c:198
-#, fuzzy, c-format
+#, 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"
+msgstr "no s’ha pogut obrir el fitxer còpia de seguretat %s per a escriure"
+# Usa quote(). ivb
#: gnulib-lib/copy-file.c:202
-#, fuzzy, c-format
+#, c-format
msgid "error reading %s"
-msgstr "error en llegir «%s»"
+msgstr "error en llegir %s"
+# Usa quote(). ivb
#: gnulib-lib/copy-file.c:206
-#, fuzzy, c-format
+#, c-format
msgid "error writing %s"
-msgstr "error en escriure «%s»"
+msgstr "error en escriure %s"
+# Usa quote(). ivb
#: gnulib-lib/copy-file.c:210
-#, fuzzy, c-format
+#, c-format
msgid "error after reading %s"
-msgstr "error després d’haver llegit «%s»"
+msgstr "error després d’haver llegit %s"
#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
@@ -146,12 +154,12 @@ msgstr "ha fallat fdopen()"
#: gnulib-lib/csharpcomp.c:571
#, c-format
msgid "C# compiler not found, try installing pnet"
-msgstr "no s’ha trobat cap compiŀlador de C#, instaŀleu «pnet»"
+msgstr "no s’ha trobat cap compil·lador de C#, instal·leu «pnet»"
#: gnulib-lib/csharpexec.c:343
#, c-format
msgid "C# virtual machine not found, try installing pnet"
-msgstr "no s’ha trobat cap màquina virtual de C#, instaŀleu «pnet»"
+msgstr "no s’ha trobat cap màquina virtual de C#, instal·leu «pnet»"
# Amb el mateix format que els errors de la libc. ivb
#: gnulib-lib/error.c:188
@@ -166,60 +174,60 @@ msgid "%s subprocess failed"
msgstr "el subprocés «%s» ha fallat"
#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: l’opció «%s» és ambígua\n"
+msgstr "%s: l’opció «%s» és ambígua; possibilitats:"
#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr "%s: l’opció «--%s» no admet arguments\n"
#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr "%s: l’opció «%c%s» no admet arguments\n"
#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: l’opció «%s» necessita un argument\n"
+msgstr "%s: l’opció «--%s» necessita un argument\n"
#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '--%s'\n"
msgstr "%s: l’opció «--%s» no és reconeguda\n"
#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%c%s'\n"
msgstr "%s: l’opció «%c%s» no és reconeguda\n"
#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
+#, c-format
msgid "%s: invalid option -- '%c'\n"
msgstr "%s: l’opció «%c» no és vàlida\n"
#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
+#, c-format
msgid "%s: option requires an argument -- '%c'\n"
msgstr "%s: l’opció «%c» necessita un argument\n"
#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '-W %s' is ambiguous\n"
msgstr "%s: l’opció «-W %s» és ambígua\n"
#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr "%s: l’opció «-W %s» no admet arguments\n"
#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: l’opció «%s» necessita un argument\n"
+msgstr "%s: l’opció «-W %s» necessita un argument\n"
#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
#: gnulib-lib/javacomp.c:156
@@ -232,15 +240,15 @@ msgstr "l’argument «source_version» passat a compile_java_class() no és và
msgid "invalid target_version argument to compile_java_class"
msgstr "l’argument «target_version» passat a compile_java_class() no és vàlid"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c: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 "no s’ha pogut crear «%s»"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c: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 "error en escriure el fitxer «%s»"
@@ -249,14 +257,14 @@ msgstr "error en escriure el fitxer «%s»"
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-"no s’ha trobat cap compiŀlador de Java, instaŀleu «gcj» o establiu la "
+"no s’ha trobat cap compil·lador de Java, instal·leu «gcj» o establiu la "
"variable d’entorn JAVAC"
#: gnulib-lib/javaexec.c:417
#, c-format
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
-"no s’ha trobat cap màquina virtual de Java, instaŀleu «gij» o establiu la "
+"no s’ha trobat cap màquina virtual de Java, instal·leu «gij» o establiu la "
"variable d’entorn JAVA"
#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
@@ -265,20 +273,20 @@ msgstr ""
msgid "%s subprocess I/O error"
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/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 "la memòria s’ha exhaurit"
#: gnulib-lib/pipe-filter-ii.c:192
-#, fuzzy, c-format
+#, c-format
msgid "creation of threads failed"
-msgstr "no s’ha pogut compiŀlar la classe C#"
+msgstr "la creació de fils ha fallat"
#: 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 "no s’ha pogut escriure al subprocés «%s»"
@@ -332,10 +340,11 @@ msgstr "«"
msgid "'"
msgstr "»"
+# Condició d’error. Usa quote(). ivb
#: gnulib-lib/set-acl.c:46
#, c-format
msgid "setting permissions for %s"
-msgstr ""
+msgstr "en establir els permissos de %s"
#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
@@ -349,9 +358,9 @@ msgid "_open_osfhandle failed"
msgstr "ha fallat _open_osfhandle()"
#: gnulib-lib/w32spawn.h:84
-#, fuzzy, c-format
+#, c-format
msgid "cannot restore fd %d: dup2 failed"
-msgstr "no s’ha pogut crear el fitxer d’eixida «%s»"
+msgstr "no s’ha pogut restaurar el descriptor %d: ha fallat dup2()"
#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
#: gnulib-lib/wait-process.c:317
@@ -365,8 +374,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: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 "error en obrir «%s» per a llegir"
@@ -376,24 +385,22 @@ msgstr "error en obrir «%s» per a llegir"
# El primer és «msgstr» o «msgstr[n]». ivb
# El motiu està traduït. ivb
#: src/format.c:151
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
msgstr ""
-"«%s» no és una cadena vàlida de format de %s, com la de «msgid». Motiu: %s"
+"«%s» no és una cadena vàlida de format de %s, com la de «%s». Motiu: %s"
-# «%s» és «msgstr». ivb
#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
#: src/format-gcc-internal.c: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
+#, c-format
msgid ""
"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
msgstr ""
"no existeix, com en «%2$s», una especificació de format de l’argument %1$u "
-"en «msgid»"
+"en «%3$s»"
-# «%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-lua.c:235
#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361
@@ -408,10 +415,10 @@ msgstr "no existeix una especificació de format de l’argument %u en «%s»"
#: 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
+#, c-format
msgid "format specifications in '%s' and '%s' for argument %u are not the same"
msgstr ""
-"les especificacions de format en «msgid» i «%s» de l’argument %u no són les "
+"les especificacions de format en «%s» i «%s» de l’argument %u no són les "
"mateixes"
#: src/format-boost.c:449
@@ -445,9 +452,9 @@ msgstr ""
#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
#: src/format-javascript.c:215 src/format-python.c:515
#: src/format-qt-plural.c:110
-#, fuzzy, c-format
+#, 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"
+msgstr "el nombre d’especificacions de format en «%s» i «%s» no coincideix"
#: src/format-csharp.c:88 src/format-java.c:205
#, c-format
@@ -530,24 +537,24 @@ msgid "In the directive number %u, flags are not allowed before '%c'."
msgstr "A la directiva número %u, no es permeten indicadors abans de «%c»."
#: src/format-gcc-internal.c:677
-#, fuzzy, c-format
+#, c-format
msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "«msgid» empra %%m però «%s» no ho fa"
+msgstr "«%s» empra «%%m» però «%s» no ho fa"
#: src/format-gcc-internal.c:680
-#, fuzzy, c-format
+#, c-format
msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "«msgid» no empra %%m però «%s» empra %%m"
+msgstr "«%s» no empra «%%m» però «%s» empra «%%m»"
#: src/format-gfc-internal.c:383
-#, fuzzy, c-format
+#, c-format
msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "«msgid» empra %%m però «%s» no ho fa"
+msgstr "«%s» empra «%%C» però «%s» no ho fa"
#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
+#, c-format
msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "«msgid» no empra %%m però «%s» empra %%m"
+msgstr "«%s» no empra «%%m» però «%s» empra «%%m»"
#: src/format-invalid.h:22
msgid "The string ends in the middle of a directive."
@@ -592,8 +599,8 @@ msgid ""
"In the directive number %u, the character '%c' is not a valid conversion "
"specifier."
msgstr ""
-"A la directiva número %u, el caràcter «%c» no és un especificador de "
-"conversió vàlid."
+"A la directiva número %u, el caràcter «%c» no és una especificació de "
+"conversió vàlida."
#: src/format-invalid.h:37
#, c-format
@@ -601,8 +608,8 @@ msgid ""
"The character that terminates the directive number %u is not a valid "
"conversion specifier."
msgstr ""
-"El caràcter que termina la directiva número %u no és un especificador de "
-"conversió vàlid."
+"El caràcter que termina la directiva número %u no és una especificació de "
+"conversió vàlida."
#: src/format-invalid.h:40
#, c-format
@@ -655,12 +662,12 @@ msgstr ""
"està seguit per «<», «#» o «%s»."
#: src/format-java.c:745
-#, fuzzy, c-format
+#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
msgstr ""
-"no existeix una especificació de format de l’argument {%u} en «msgid», com "
-"en «%s»"
+"no existeix, com en «%2$s», una especificació de format de l’argument {%1$u} "
+"en «%3$s»"
#: src/format-java.c:756
#, c-format
@@ -668,12 +675,12 @@ msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "no existeix una especificació de format de l’argument {%u} en «%s»"
#: src/format-java.c:776
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' and '%s' for argument {%u} are not the same"
msgstr ""
-"les especificacions de format de l’argument {%2$u} en «msgid» i «%1$s» no "
-"són les mateixes"
+"les especificacions de format de l’argument {%3$u} en «%1$s» i «%2$s» no són "
+"les mateixes"
#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
#: src/format-scheme.c:2375
@@ -748,15 +755,15 @@ msgid "The string refers to some argument in incompatible ways."
msgstr "La cadena es refereix a algun argument de formes incompatibles."
#: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, fuzzy, c-format
+#, c-format
msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "les especificacions de format en «msgid» i «%s» no són equivalents"
+msgstr "les especificacions de format en «%s» i «%s» no són equivalents"
#: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, fuzzy, c-format
+#, c-format
msgid "format specifications in '%s' are not a subset of those in '%s'"
msgstr ""
-"les especificacions de format de «%s» no són un subconjunt de les de «msgid»"
+"les especificacions de format de «%s» no són un subconjunt de les de «%s»"
#: src/format-perl.c:433
#, c-format
@@ -764,11 +771,11 @@ msgid ""
"In the directive number %u, the size specifier is incompatible with the "
"conversion specifier '%c'."
msgstr ""
-"A la directiva número %u, l’especificador de mida no és compatible amb "
-"l’especificador de conversió «%c»."
+"A la directiva número %u, l’especificació de mida no és compatible amb "
+"l’especificació de conversió «%c»."
#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c: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'"
@@ -789,72 +796,76 @@ msgstr ""
"La cadena es refereix a l’argument anomenat «%s» de formes incompatibles."
#: src/format-python.c:430
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
msgstr ""
-"les especificacions de format de «msgid» necessiten un mapa, les de «%s» una "
+"les especificacions de format de «%s» necessiten un mapa, les de «%s» una "
"tupla"
#: src/format-python.c:437
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
msgstr ""
-"les especificacions de format de «msgid» necessiten una tupla, les de «%s» "
-"un mapa"
+"les especificacions de format de «%s» necessiten una tupla, les de «%s» un "
+"mapa"
#: src/format-python.c:460 src/format-sh.c:297
-#, fuzzy, c-format
+#, c-format
msgid ""
"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
msgstr ""
-"no existeix una especificació de format de l’argument «%s» en «msgid», com "
-"en «%s»"
+"no existeix, com en «%2$s», una especificació de format de l’argument «%1$s» "
+"en «%3$s»"
#: src/format-python.c:494
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' and '%s' for argument '%s' are not the same"
msgstr ""
-"les especificacions de format de l’argument «%2$s» en «msgid» i «%1$s» no "
-"són les mateixes"
+"les especificacions de format de l’argument «%3$s» en «%1$s» i «%2$s» no són "
+"les mateixes"
-#: src/format-python-brace.c:136
-#, fuzzy, c-format
+#: src/format-python-brace.c:137
+#, 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."
+msgstr "A la directiva número %u, «%c» no pot començar un nom de camp."
-#: src/format-python-brace.c:149
-#, fuzzy, c-format
+#: src/format-python-brace.c:150
+#, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "A la directiva número %u, «{» no està seguit d’un número d’argument."
+msgstr ""
+"A la directiva número %u, «%c» no pot començar un argument per a «getattr()»."
-#: src/format-python-brace.c:164
-#, fuzzy, c-format
+#: src/format-python-brace.c:165
+#, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "A la directiva número %u, «%c» no està seguit d’un dígit."
+msgstr ""
+"A la directiva número %u, «%c» no pot començar un argument per a «getitem()»."
-#: src/format-python-brace.c:184
-#, fuzzy, c-format
+#: src/format-python-brace.c:185
+#, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
msgstr ""
-"A la directiva número %u, no es pot especificar la precisió abans de «%c»."
+"A la directiva número %u, no s’admet més niament en l’especificació de "
+"format."
-#: src/format-python-brace.c:210
-#, fuzzy, c-format
+#: src/format-python-brace.c:270
+#, c-format
msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "A la directiva número %u, l’argument %d és negatiu."
+msgstr ""
+"A la directiva número %u, hi ha una directiva de format sense terminar."
#: src/format-qt.c:152
-#, fuzzy, c-format
+#, c-format
msgid ""
"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
"a double-digit argument number"
msgstr ""
-"«msgid» és una cadena de format simple, però «%s» no ho és: conté un "
-"indicador «L» o un número d’argument amb un dígit doble"
+"«%s» és una cadena de format simple, però «%s» no ho és: conté un indicador "
+"«L» o un número d’argument amb un dígit doble"
#: src/format-sh.c:79
msgid "The string refers to a shell variable with a non-ASCII name."
@@ -895,11 +906,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: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"
@@ -912,19 +923,19 @@ 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: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 "Escrit per %s.\n"
#. 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 "Bruno Haible"
@@ -934,12 +945,12 @@ msgstr "Bruno Haible"
msgid "too many arguments"
msgstr "sobren arguments"
-#: src/hostname.c:207 src/msgattrib.c:410 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
-#: src/msgfilter.c:384 src/msgfmt.c:650 src/msggrep.c:507 src/msginit.c:358
-#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:828
-#, fuzzy, c-format
+#: 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 "Proveu «%s --help» per a obtenir més informació.\n"
@@ -978,29 +989,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: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 "Eixida informativa:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help Mostra aquesta ajuda i ix.\n"
-#: 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 " -V, --version Mostra informació sobre la versió i ix.\n"
@@ -1009,11 +1020,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: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 "Informeu dels errors a <bug-gnu-gettext@gnu.org>.\n"
@@ -1022,30 +1033,27 @@ 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: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 "es permet com a molt un fitxer d’entrada"
-#: 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 "«%s» i «%s» són mútuament excloents"
-#: 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 "Forma d’ús: %s [OPCIÓ] [FITXER_ENTRADA]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -1054,10 +1062,10 @@ msgstr ""
"Filtra els missatges d’un catàleg de traduccions segons els seus atributs, i\n"
"manipula aquests atributs.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c: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"
@@ -1065,23 +1073,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: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 "Ubicació del fitxer d’entrada:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " FITXER_ENTRADA Fitxer PO d’entrada.\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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"
@@ -1090,34 +1098,34 @@ msgstr ""
" Afegeix el DIRECTORI a la llista de cerca de fitxers\n"
" d’entrada.\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
"Si no s’especifica cap fitxer d’entrada, o si aquest és «-», es llegirà\n"
"l’entrada estàndard.\n"
-#: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
-#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
-#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
-#: src/xgettext.c:857
+#: src/msgattrib.c:442 src/msgcat.c: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 "Ubicació del fitxer d’eixida:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 ""
" -o, --output-file=FITXER\n"
" Escriu l’eixida al fitxer especificat.\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1127,12 +1135,12 @@ msgstr ""
"fitxer\n"
"d’eixida, o si aquest és «-».\n"
-#: 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 "Selecció dels missatges:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
@@ -1140,7 +1148,7 @@ msgstr ""
" --translated Manté els missatges traduïts, elimina els no "
"traduïts.\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
@@ -1148,61 +1156,62 @@ msgstr ""
" --untranslated Manté els missatges no traduïts, elimina els "
"traduïts.\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr " --no-fuzzy Elimina els missatges marcats com a «fuzzy».\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr " --only-fuzzy Manté els missatges marcats com a «fuzzy».\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete Elimina els missatges obsolets («#~»).\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete Manté els missatges obsolets («#~»).\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Manipulació dels atributs:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr " --set-fuzzy Marca tots els missatges com a «fuzzy».\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr " --clear-fuzzy Marca tots els missatges com a no‐«fuzzy».\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr " --set-obsolete Marca tots els missatges com a obsolets.\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr ""
" --clear-obsolete Marca tots els missatges com a no obsolets.\n"
-#: src/msgattrib.c:468
-#, fuzzy, c-format
+#: src/msgattrib.c:475
+#, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
" of translated messages.\n"
msgstr ""
-" --previous Manté els «msgid» anteriors dels missatges traduïts.\n"
+" --previous En marcar els missatges com a «fuzzy», manté els\n"
+" «msgid» anteriors dels missatges traduïts.\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
@@ -1211,7 +1220,15 @@ msgstr ""
" --clear-previous Elimina de tots els missatges el comentari amb el\n"
" «msgid» anterior.\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+" --empty En eliminar la marca «fuzzy» també deixa buit el\n"
+" «msgstr» corresponent.\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
@@ -1220,7 +1237,7 @@ msgstr ""
" Només manipula les entrades llistades al FITXER.po\n"
" indicat.\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
@@ -1230,27 +1247,27 @@ msgstr ""
"po\n"
" indicat.\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr " --fuzzy Equival a «--only-fuzzy --clear-fuzzy».\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
msgstr " --obsolete Equival a «--only-obsolete --clear-obsolete».\n"
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c: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 "Sintaxi del fitxer d’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
+#: 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"
@@ -1260,8 +1277,8 @@ msgstr ""
"de\n"
" Java.\n"
-#: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
-#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c: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 "
@@ -1271,17 +1288,17 @@ msgstr ""
" El fitxer d’entrada segueix la sintaxi «.strings» de\n"
" 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
-#: 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 "Detalls de l’eixida:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1296,18 +1313,18 @@ msgstr ""
"«html»\n"
" (sempre, mai, automàtic, HTML).\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr ""
" --style=FITXER Empra el fitxer indicat de full d’estil CSS per a\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
+#: 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"
@@ -1315,9 +1332,9 @@ msgstr ""
" -e, --no-escape No empra seqüències d’escapada de C a l’eixida (per\n"
" defecte).\n"
-#: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
-#: src/msguniq.c:390 src/xgettext.c:956
+#: src/msgattrib.c:508 src/msgcat.c: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"
@@ -1325,27 +1342,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: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 " --force-po Genera el fitxer PO encara que estiga buit.\n"
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr " -i, --indent Genera el fitxer PO emprant l’estil indentat.\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr " --no-location No escriu les línies «#: nom_fitxer:línia».\n"
-#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:964
+#: src/msgattrib.c:516 src/msgcat.c: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"
@@ -1353,8 +1370,8 @@ msgstr ""
" -n, --add-location Escriu les línies «#: nom_fitxer:línia» (per\n"
" defecte).\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c: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"
@@ -1362,18 +1379,18 @@ msgstr ""
" --strict Genera un fitxer PO estrictament conforme amb "
"Uniforum.\n"
-#: src/msgattrib.c:511 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
-#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
-#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
+#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
+#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr ""
" -p, --properties-output\n"
" Genera un fitxer amb sintaxi «.properties» de 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
+#: 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"
@@ -1382,16 +1399,16 @@ msgstr ""
" Genera un fitxer amb sintaxi «.strings» de\n"
" 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
+#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
+#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=AMPLADA Estableix l’amplada de pàgina de l’eixida.\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c: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"
@@ -1400,27 +1417,27 @@ msgstr ""
" --no-wrap No parteix les línies de missatge més llargues que\n"
" l’amplada de pàgina.\n"
-#: src/msgattrib.c: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 " -s, --sort-output Genera una eixida ordenada.\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 ""
" -F, --sort-by-file Ordena les eixides per llurs ubicacions en fitxer.\n"
-#: 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 "s’ha especificat un criteri de selecció impossible (%d < n < %d)"
-#: 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 "Forma d’ús: %s [OPCIÓ] [FITXER_ENTRADA]…\n"
@@ -1428,8 +1445,8 @@ msgstr "Forma d’ús: %s [OPCIÓ] [FITXER_ENTRADA]…\n"
# ivb (2001/12/24)
# ivb Aquesta traducció no és completament literal però queda més clar.
# ivb Amb «commonality» vol dir «nombre de coincidències».
-#: src/msgcat.c:371
-#, fuzzy, c-format, no-wrap
+#: src/msgcat.c:372
+#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
"Find messages which are common to two or more of the specified PO files.\n"
@@ -1446,30 +1463,29 @@ msgstr ""
"requerir un nombre mínim de coincidències per a escriure els missatges.\n"
"Inversament, podeu emprar l’opció «--less-than» per a limitar el nombre màxim\n"
"de coincidències per a escriure un missatge (i.e. «--less-than=2» només\n"
-"mostrarà els missatges únics). Les traduccions, comentaris i comentaris\n"
-"extrets s’acumularan, a no ser que especifiqueu «--use-first», al qual cas es\n"
-"treuran del primer fitxer PO que els definesca. Les posicions de fitxer de\n"
-"tots els fitxers PO s’acumularan.\n"
+"mostrarà els missatges únics). Les traduccions, comentaris, comentaris\n"
+"extrets i posicions de fitxer s’acumularan, a no ser que especifiqueu\n"
+"«--use-first», al qual cas es treuran del primer fitxer PO que els definesca.\n"
-#: src/msgcat.c: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 " FITXER_ENTRADA… Fitxers d’entrada.\n"
-#: 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 ""
" -f, --files-from=FITXER\n"
" 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: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 "Si el fitxer d’entrada és «-» es llegirà l’entrada estàndard.\n"
-#: 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"
@@ -1479,7 +1495,7 @@ msgstr ""
" Escriu els missatges amb menys de NÚMERO definicions\n"
" (per defecte infinites).\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1490,7 +1506,7 @@ msgstr ""
"(per\n"
" defecte 0).\n"
-#: 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"
@@ -1500,8 +1516,8 @@ msgstr ""
"s’escriguen\n"
" els missatges únics.\n"
-#: 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"
@@ -1511,8 +1527,8 @@ msgstr ""
"properties»\n"
" de Java.\n"
-#: 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"
@@ -1523,12 +1539,12 @@ msgstr ""
"de\n"
" NeXTstep/GNUstep.\n"
-#: 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 " -t, --to-code=NOM Codificació de l’eixida.\n"
-#: 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"
@@ -1538,28 +1554,31 @@ msgstr ""
"mescla\n"
" diverses traduccions.\n"
-#: 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 ""
+" --lang=NOM_DE_CATÀLEG\n"
+" Estableix el camp «Language» en l’entrada de "
+"capçalera.\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "no s’ha especificat cap fitxer d’entrada"
-#: 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 "cal que especifiqueu exactament dos fitxers d’entrada"
-#: 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 "Forma d’ús: %s [OPCIÓ] def.po ref.pot\n"
@@ -1592,12 +1611,12 @@ msgstr " def.po Traduccions.\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot Referències al codi font.\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "Modificadors del funcionament:\n"
-#: 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."
@@ -1606,7 +1625,7 @@ msgstr ""
" -m, --multi-domain Aplica «ref.pot» a cadascun dels dominis de «def."
"po».\n"
-#: 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 ""
@@ -1635,17 +1654,17 @@ msgstr "aquest missatge no està traduït"
msgid "this message needs to be reviewed by the translator"
msgstr "aquest missatge ha de ser revisat pel traductor"
-#: 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 "aquest missatge s’empra però no s’ha definit…"
-#: 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 "…però aquesta definició és similar"
-#: 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 "aquest missatge s’empra però no s’ha definit en «%s»"
@@ -1655,14 +1674,14 @@ msgstr "aquest missatge s’empra però no s’ha definit en «%s»"
msgid "warning: this message is not used"
msgstr "avís: aquest missatge no s’empra"
-#: src/msgcmp.c:553 src/msgfmt.c: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] "s’ha trobat %d error fatal"
msgstr[1] "s’han trobat %d errors fatals"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "cal que especifiqueu almenys dos fitxers"
@@ -1670,8 +1689,8 @@ msgstr "cal que especifiqueu almenys dos fitxers"
# ivb (2001/12/24)
# ivb Aquesta traducció no és completament literal però queda més clar.
# ivb Amb «commonality» vol dir «nombre de coincidències».
-#: src/msgcomm.c:363
-#, fuzzy, c-format, no-wrap
+#: src/msgcomm.c:364
+#, c-format, no-wrap
msgid ""
"Find messages which are common to two or more of the specified PO files.\n"
"By using the --more-than option, greater commonality may be requested\n"
@@ -1691,7 +1710,7 @@ msgstr ""
"que els definesca. Les posicions de fitxer de tots els fitxers PO\n"
"s’acumularan.\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1702,74 +1721,74 @@ msgstr ""
"(per\n"
" defecte 1).\n"
-#: src/msgcomm.c:451 src/xgettext.c:981
-#, fuzzy, c-format
+#: src/msgcomm.c:452 src/xgettext.c:1004
+#, c-format
msgid ""
" --omit-header don't write header with 'msgid \"\"' entry\n"
msgstr ""
" --omit-header No escriu la capçalera amb l’entrada «msgid \"\"».\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr ""
"Converteix un catàleg de traduccions a una codificació de caràcters "
"diferent.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Objectiu de la conversió:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "La codificació per defecte és la del locale actual.\n"
-#: src/msgconv.c: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 " -i, --indent Genera el fitxer PO emprant l’estil indentat.\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location No escriu les línies «#: nom_fitxer:línia».\n"
-#: src/msgconv.c: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 ""
-" --add-location Escriu les línies «#: nom_fitxer:línia» (per\n"
+" -n, --add-location Escriu les línies «#: nom_fitxer:línia» (per\n"
" defecte).\n"
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
" --strict Genera un fitxer PO estrictament conforme amb "
"Uniforum.\n"
-#: 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 "no s’ha especificat cap fitxer d’entrada"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "cal que especifiqueu exactament un fitxer d’entrada"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Forma d’ús: %s [OPCIÓ] FITXER_ENTRADA\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1782,7 +1801,7 @@ msgstr ""
"amb «xgettext»). S’assignarà a les entrades no traduïdes una traducció igual\n"
"al «msgid» corresponent.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " FITXER_ENTRADA Fitxer d’entrada PO o POT.\n"
@@ -1821,7 +1840,7 @@ msgstr ""
"L’ordre incorporada «0» genera la traducció seguida d’un octet nul. L’eixida\n"
"de «msgexec 0» és adequada com a entrada per a «xargs -0».\n"
-#: src/msgexec.c:281 src/msgfilter.c:401
+#: src/msgexec.c:281 src/msgfilter.c:420
#, c-format
msgid " -i, --input=INPUTFILE input PO file\n"
msgstr ""
@@ -1833,27 +1852,27 @@ msgstr ""
msgid "write to stdout failed"
msgstr "no s’ha pogut escriure a l’eixida estàndard"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "manca el nom d’un filtre"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr "cal que especifiqueu almenys un guió de «sed»"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Forma d’ús: %s [OPCIÓ] FILTRE [OPCIÓ_DE_FILTRE]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "Aplica un filtre a cada traducció d’un catàleg de traduccions.\n"
-#: src/msgfilter.c:416
+#: src/msgfilter.c:435
#, c-format
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
@@ -1862,18 +1881,18 @@ msgstr ""
"El FILTRE pot ser qualsevol programa que llija una traducció de l’entrada\n"
"estàndard i n’escriga una de modificada a l’eixida estàndard.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "OPCIONS_DE_FILTRE útils quan el FILTRE és «sed»:\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
msgstr " -e, --expression=GUIÓ Afegeix el GUIÓ a les ordres a executar.\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1885,7 +1904,7 @@ msgstr ""
"a\n"
" executar.\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
@@ -1893,7 +1912,7 @@ msgstr ""
" -n, --quiet, --silent Evita la impressió automàtica de l’espai de "
"patró.\n"
-#: 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"
@@ -1901,12 +1920,12 @@ msgstr ""
" --no-escape No empra seqüències d’escapada de C a l’eixida (per\n"
" defecte).\n"
-#: 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 " --indent Genera el fitxer PO emprant l’estil indentat.\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
@@ -1914,87 +1933,109 @@ msgstr ""
" --keep-header Manté intacta l’entrada de capçalera, sense filtrar‐"
"la.\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "l’argument de «%s» ha de ser un sol caràcter de puntuació"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
msgstr "l’ordenació d’octets «%s» no és vàlida"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c: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 "Ulrich Drepper"
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+# No empra quote(). ivb
+#: src/msgfmt.c:439
+#, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr "no s’ha d’indicar cap fitxer d’entrada si s’especifiquen «%s» i «%s»"
+
+#: src/msgfmt.c: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 "«%s» necessita una especificació «-d directori»"
+msgstr "«%s» necessita una especificació «-d DIRECTORI»"
-#: 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 "«%s» necessita una especificació «-l locale»"
+msgstr "«%s» necessita una especificació «-l LOCALE»"
+
+#: src/msgfmt.c:538
+#, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "«%s» necessita una especificació «--template PLANTILLA»"
+
+#: src/msgfmt.c:545
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "«%s» necessita una especificació «-o FITXER»"
+
+#: src/msgfmt.c:551
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "«%s» i «%s» són mútuament excloents en emprar «%s»"
# ivb (2001/12/26)
# ivb Els «%s» es refereixen a opcions -> femení.
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "«%s» només és vàlida amb «%s» o «%s»"
# ivb (2001/12/26)
# ivb Els «%s» es refereixen a opcions -> femení.
-#: src/msgfmt.c: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 "«%s» només és vàlida amb «%s», «%s» o «%s»"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
-msgstr ""
+msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d missatge traduït"
msgstr[1] "%d missatges traduïts"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d traducció difusa"
msgstr[1] ", %d traduccions difuses"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d missatge no traduït"
msgstr[1] ", %d missatges no traduïts"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Forma d’ús: %s [OPCIÓ] nom_fitxer.po…\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
"Genera un catàleg binari de missatges partint d’una descripció textual de\n"
"traduccions.\n"
-#: src/msgfmt.c: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"
@@ -2003,17 +2044,17 @@ msgstr ""
"Els arguments obligatoris per a les opcions llargues també ho són per a les\n"
"opcions curtes corresponents. El mateix ocorre amb els arguments opcionals.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
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:890
+#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Mode de funcionament:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -2022,7 +2063,7 @@ msgstr ""
" -j, --java Mode Java: genera una classe «ResourceBundle» de "
"Java.\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -2031,13 +2072,13 @@ msgstr ""
" --java2 Com «--java», però assumeix Java2 (JDK 1.2 o "
"superior).\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr " --csharp Mode C#: genera un fitxer «.dll» de .NET.\n"
# Els recursos són cosa de la plataforma .NET, no només de C#. ivb
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -2049,7 +2090,7 @@ msgstr ""
" .NET.\n"
# Amb «tcl/msgcat» es refereix al paquet «msgcat» de Tcl. ivb
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -2057,35 +2098,41 @@ msgstr ""
" --tcl Mode Tcl: genera un fitxer «.msg» per a «msgcat» de\n"
" Tcl.\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt Mode Qt: genera un fitxer «.qm» de Qt.\n"
+#: src/msgfmt.c:811
+#, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr " --desktop Mode Desktop: genera un fitxer «.desktop».\n"
+
# Ull! En aquest cas no és un fitxer PO! ivb
-#: src/msgfmt.c:696
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
" --strict Genera un fitxer estrictament conforme amb Uniforum.\n"
-#: 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 "Si el fitxer d’eixida és «-» s’escriurà a l’eixida estàndard.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Ubicació del fitxer d’eixida al mode Java:\n"
-#: 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 " -r, --resource=RECURS Nom del recurs.\n"
-#: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
-#: src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c: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 "
@@ -2093,7 +2140,15 @@ msgid ""
msgstr ""
" -l, --locale=LOCALE Nom del locale, bé «idioma» o bé «idioma_PAÍS».\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --source Produeix un fitxer «.java» en lloc d’un «.class».\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
@@ -2101,7 +2156,7 @@ msgstr ""
" -d DIRECTORI Directori base de la jerarquia de directoris de les\n"
" classes.\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2114,12 +2169,12 @@ msgstr ""
"separats per un caràcter de subratllat. L’opció «-d» és obligatòria. La\n"
"classe s’escriurà sota el directori especificat.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "Ubicació del fitxer d’eixida al mode C#:\n"
-#: 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 "
@@ -2128,7 +2183,7 @@ msgstr ""
" -d DIRECTORI Directori base dels fitxers «.dll» dependents del\n"
" locale.\n"
-#: 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"
@@ -2139,18 +2194,18 @@ msgstr ""
"subdirectori del directori especificat. El nom del subdirectori depén del\n"
"locale.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Ubicació del fitxer d’eixida al mode Tcl:\n"
-#: 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 ""
" -d DIRECTORI Directori base dels catàlegs «.msg» de missatges.\n"
-#: 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"
@@ -2160,12 +2215,50 @@ msgstr ""
"el\n"
"directori especificat.\n"
-#: src/msgfmt.c:745 src/xgettext.c:882
+#: src/msgfmt.c:861
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr "Opcions del mode Desktop:\n"
+
+#: src/msgfmt.c:867
+#, c-format
+msgid " --template=TEMPLATE a .desktop file used as a template\n"
+msgstr ""
+" --template=FITXER Empra un FITXER «.desktop» com a plantilla.\n"
+
+#: src/msgfmt.c:869
+#, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr " -d DIRECTORI Directori base dels fitxers PO.\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -kPARAULA, --keyword=PARAULA\n"
+" Cerca també la PARAULA clau indicada.\n"
+" -k, --keyword No cerca les paraules clau per defecte.\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+"Les opcions «-l», «-o» i «--template» són obligatòries. Si s’especifica «-"
+"D»\n"
+"es llegiran els fitxers d’entrada del directori indicat en lloc dels donats\n"
+"com a arguments de la línia d’ordres.\n"
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "Interpretació del fitxer d’entrada:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -2177,14 +2270,14 @@ msgstr ""
"domain».\n"
# Segons la doc, quan ací diu «language» es refereix a un de programació. ivb
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format Comprova les cadenes de format dependents del\n"
" llenguatge de programació.\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -2194,7 +2287,7 @@ msgstr ""
" capçalera.\n"
# La directiva s’anomena «domain». ivb
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -2203,7 +2296,7 @@ msgstr ""
" --check-domain Comprova si hi ha conflictes entre les directives\n"
" «domain» i l’opció «--output-file».\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2213,7 +2306,7 @@ msgstr ""
" Comprova si el «msgfmt» de GNU es comporta com el\n"
" «msgfmt» d’X/Open.\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -2224,12 +2317,12 @@ msgstr ""
" Comprova la presència d’acceleradors de teclat per a\n"
" ítems de menú.\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr " -f, --use-fuzzy Empra a l’eixida les entrades difuses.\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
@@ -2237,7 +2330,7 @@ msgstr ""
" -a, --alignment=NÚMERO\n"
" Alinea les cadenes a NÚMERO octets (%d per defecte).\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2245,8 +2338,13 @@ msgid ""
" (big or little, default depends on "
"platform)\n"
msgstr ""
+" --endianness=ORDENACIÓ\n"
+" Escriu els números de 32 bits amb l’ordenació "
+"d’octets\n"
+" indicada (big-endian o little-endian, el valor per\n"
+" defecte depèn de la plataforma).\n"
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
@@ -2254,81 +2352,93 @@ msgstr ""
" --no-hash Fa que el fitxer binari no incloga la taula de\n"
" dispersió.\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics Mostra estadístiques sobre les traduccions.\n"
-#: 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 " -v, --verbose Augmenta el nivell de descripció.\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "avís: la capçalera del fitxer PO manca o no és vàlida\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "avís: la conversió del joc de caràcters no funcionarà\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "avís: la capçalera del fitxer PO està marcada com a difusa\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "avís: les versions antigues de «msgfmt» ho indicaran com un error\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "el nom de domini «%s» no és adequat com a nom de fitxer"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"el nom de domini «%s» no és adequat com a nom de fitxer: se n’emprarà un "
"prefix"
-#: src/msgfmt.c:955
-#, fuzzy, c-format
+#: src/msgfmt.c:1095
+#, c-format
msgid "'domain %s' directive ignored"
msgstr "es descarta la directiva «domain %s»"
-#: src/msgfmt.c:1015
-#, fuzzy, c-format
+#: src/msgfmt.c:1155
+#, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "es descarta l’entrada «msgstr» buida"
-#: src/msgfmt.c:1016
-#, fuzzy, c-format
+#: src/msgfmt.c:1156
+#, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "es descarta l’entrada «msgstr» difusa"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: avís: el fitxer font conté una traducció difusa"
+# No empra quote(). ivb
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr "«%s» no existeix"
+
+# No empra quote(). ivb
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr "«%s» existeix però no s’ha pogut llegir"
+
#: 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 "error en llegir «%s»"
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2336,7 +2446,7 @@ msgid ""
msgstr ""
"no es pot emprar l’opció «%c» abans d’especificar «J», «K», «T», «C» o «X»"
-#: 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"
@@ -2345,7 +2455,7 @@ msgstr ""
"Extrau d’un catàleg de traduccions tots els missatges que concorden amb\n"
"un patró especificat o que pertanyen a uns fitxers font indicats.\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2426,7 +2536,7 @@ msgstr ""
" -v, --invert-match Només tria els missatges que no concorden amb cap\n"
" criteri de selecció.\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2435,12 +2545,12 @@ msgstr ""
"de\n"
" caràcters estesos.\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output Genera una eixida ordenada.\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
@@ -2599,7 +2709,7 @@ msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr "el fitxer d’entrada conté dos jocs de caràcters distints, «%s» i «%s»"
#: src/msgl-cat.c:203
-#, fuzzy, c-format
+#, c-format
msgid ""
"input file '%s' doesn't contain a header entry with a charset specification"
msgstr ""
@@ -2607,7 +2717,7 @@ msgstr ""
"especificació de joc de caràcters"
#: src/msgl-cat.c:207
-#, fuzzy, c-format
+#, c-format
msgid ""
"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
"charset specification"
@@ -2623,7 +2733,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 "avís: "
@@ -2812,32 +2922,28 @@ msgstr ""
"entrada de capçalera amb «Plural-Forms: nplurals=ENTER; plural=EXPRESSIÓ;»"
#: src/msgl-check.c:611
-#, fuzzy
msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
msgstr "ambdues entrades «msgid» i «msgid_plural» no comencen per «\\n»"
#: src/msgl-check.c:619
-#, fuzzy, c-format
+#, c-format
msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
msgstr "ambdues entrades «msgid» i «msgstr[%u]» no comencen per «\\n»"
#: src/msgl-check.c:634
-#, fuzzy
msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
msgstr "ambdues entrades «msgid» i «msgstr» no comencen per «\\n»"
#: src/msgl-check.c:652
-#, fuzzy
msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
msgstr "ambdues entrades «msgid» i «msgid_plural» no acaben en «\\n»"
#: src/msgl-check.c:660
-#, fuzzy, c-format
+#, c-format
msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
msgstr "ambdues entrades «msgid» i «msgstr[%u]» no acaben en «\\n»"
#: src/msgl-check.c:675
-#, fuzzy
msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
msgstr "ambdues entrades «msgid» i «msgstr» no acaben en «\\n»"
@@ -2850,19 +2956,18 @@ msgstr "el maneig de plurals és una extensió del «gettext» de GNU"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "manca la marca d’accelerador de teclat «%c» en «msgstr»"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "sobren marques d’accelerador de teclat «%c» en «msgstr»"
-#: src/msgl-check.c:801
-#, fuzzy, c-format
+#: src/msgl-check.c:804
+#, 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"
+msgstr "el camp de capçalera «%s» encara té el valor inicial per defecte\n"
-#: src/msgl-check.c:816
-#, fuzzy, c-format
+#: src/msgl-check.c:820
+#, c-format
msgid "header field '%s' missing in header\n"
msgstr "manca el camp de capçalera «%s» a la capçalera\n"
@@ -2883,7 +2988,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: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 "
@@ -2903,7 +3008,7 @@ msgstr ""
"iguals."
#: 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 "
@@ -2914,16 +3019,16 @@ msgstr ""
# ivb (2001/12/26)
# ivb Els «%s» es refereixen a opcions -> femení.
-#: 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 "«%s» només és vàlida amb «%s»"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr "tipus de còpia de seguretat"
-#: 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"
@@ -2947,17 +3052,17 @@ msgstr ""
"Quan no es puga trobar una coincidència exacta s’emprarà una comparació difusa\n"
"per a produir uns resultats millors.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po Traduccions referents al codi font antic.\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot Referències al nou codi font.\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2968,7 +3073,7 @@ msgstr ""
"es\n"
" pot especificar diverses voltes.\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2978,29 +3083,29 @@ msgstr ""
"troba\n"
" actualitzat.\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Ubicació del fitxer d’eixida al mode d’actualització:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "El resultat es torna a escriure sobre «def.po».\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTROL Crea una còpia de seguretat de «def.po».\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
" --suffix=SUFIX Substitueix el sufix habitual de còpia de "
"seguretat.\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -3021,8 +3126,8 @@ msgstr ""
" simples en cas contrari.\n"
" simple, never Fa còpies de seguretat simples sempre.\n"
-#: src/msgmerge.c:541
-#, fuzzy, c-format
+#: src/msgmerge.c:546
+#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
"SIMPLE_BACKUP_SUFFIX\n"
@@ -3032,24 +3137,24 @@ msgstr ""
"amb\n"
"la variable d’entorn SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
msgstr ""
" --previous Manté els «msgid» anteriors dels missatges traduïts.\n"
-#: 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 " -q, --quiet, --silent No mostra els indicadors de progrés.\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
msgstr "cal definir formes plurals d’aquest missatge"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
msgstr "no s’han de definir formes plurals d’aquest missatge"
@@ -3058,7 +3163,7 @@ msgstr "no s’han de definir formes plurals d’aquest missatge"
# ivb Pense que «aprofitades» queda més clar que «mesclades»; es refereix
# ivb a les traduccions obteses directament de «def.po». El primer «%s» és
# ivb (o no) una nova línia.
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -3069,7 +3174,7 @@ msgstr ""
# ivb (2002/01/08)
# ivb Indica el final del processament, el gènere i nombre no són importants.
-#: 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"
@@ -3194,7 +3299,7 @@ msgstr ""
" --strict Genera un fitxer PO estrictament conforme amb "
"Uniforum.\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -3216,12 +3321,12 @@ msgstr ""
"de la primera traducció. Les posicions de fitxer s’acumularan. Quan useu\n"
"l’opció «--unique» es descartaran els duplicats.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated Només mostra els missatges duplicats.\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -3263,7 +3368,7 @@ msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr ""
-"Instaŀlar «libiconv» de GNU i reinstaŀlar «gettext» de GNU resoldria\n"
+"Instal·lar «libiconv» de GNU i reinstal·lar «gettext» de GNU resoldria\n"
"aquest problema.\n"
#: src/po-charset.c:578 src/po-charset.c:616
@@ -3299,27 +3404,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "l’ús de «#~» no és consistent"
-#: src/po-gram-gen.y:240
-#, fuzzy, c-format
+#: src/po-gram-gen.y:243
+#, c-format
msgid "missing 'msgstr[]' section"
msgstr "manca la secció «msgstr[]»"
-#: src/po-gram-gen.y:249
-#, fuzzy, c-format
+#: src/po-gram-gen.y:252
+#, c-format
msgid "missing 'msgid_plural' section"
msgstr "manca la secció «msgid_plural»"
-#: src/po-gram-gen.y:257
-#, fuzzy, c-format
+#: src/po-gram-gen.y:260
+#, c-format
msgid "missing 'msgstr' section"
msgstr "manca la secció «msgstr»"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "la primera forma plural no té índex zero"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "la forma plural té un índex incorrecte"
@@ -3329,7 +3434,7 @@ msgstr "la forma plural té un índex incorrecte"
msgid "too many errors, aborting"
msgstr "hi ha massa errors, s’avorta"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c: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 "la seqüència multioctet no és vàlida"
@@ -3375,16 +3480,16 @@ 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:1023
+#: src/read-catalog.c:318 src/xgettext.c:1046
#, c-format
msgid "this file may not contain domain directives"
msgstr "aquest fitxer no ha de contenir directives «domain»"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "la definició del missatge és duplicada"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "aquesta és la ubicació de la primera definició"
@@ -3450,7 +3555,7 @@ msgstr "Danilo Šegan"
#: src/recode-sr-latin.c:153
#, c-format, no-wrap
msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr "Recodifica un text en serbi de l’alfabet ciríŀlic al llatí.\n"
+msgstr "Recodifica un text en serbi de l’alfabet ciríl·lic al llatí.\n"
# Missatge d’ajuda. ivb
#: src/recode-sr-latin.c:156
@@ -3506,20 +3611,21 @@ msgstr "error en escriure a l’eixida estàndard"
msgid "error after reading \"%s\""
msgstr "error després d’haver llegit «%s»"
+# És un URL.
#: src/urlget.c:264
#, c-format
msgid "Retrieving %s..."
-msgstr ""
+msgstr "S’està obtenint %s…"
#: src/urlget.c:308
#, c-format
msgid " timed out.\n"
-msgstr ""
+msgstr " ha expirat.\n"
#: src/urlget.c:445
#, c-format
msgid " failed.\n"
-msgstr ""
+msgstr " ha fallat.\n"
#: src/write-catalog.c:126
msgid ""
@@ -3580,30 +3686,30 @@ msgstr "no s’ha pogut crear el directori «%s»"
#: src/write-csharp.c:766
#, c-format
msgid "compilation of C# class failed, please try --verbose"
-msgstr "no s’ha pogut compiŀlar la classe C#, per favor useu «--verbose»"
+msgstr "no s’ha pogut compil·lar la classe C#, per favor useu «--verbose»"
#: src/write-csharp.c:768
#, c-format
msgid "compilation of C# class failed"
-msgstr "no s’ha pogut compiŀlar la classe C#"
+msgstr "no s’ha pogut compil·lar la classe C#"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "«%s» no és un nom vàlid de classe Java"
-#: src/write-java.c:1165
+#: src/write-java.c:1210
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
-"no s’ha pogut compiŀlar la classe Java, per favor useu «--verbose» o "
+"no s’ha pogut compil·lar la classe Java, per favor useu «--verbose» o "
"establiu la variable d’entorn JAVAC"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr ""
-"no s’ha pogut compiŀlar la classe Java, per favor establiu la variable "
+"no s’ha pogut compil·lar la classe Java, per favor establiu la variable "
"d’entorn JAVAC"
#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
@@ -3611,8 +3717,8 @@ msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "error en obrir «%s» per a escriure"
-#: src/write-po.c:803
-#, fuzzy, c-format
+#: src/write-po.c:875
+#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr ""
@@ -3620,7 +3726,7 @@ msgstr ""
"«%c»"
# Multilínia. ivb
-#: 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"
@@ -3634,7 +3740,7 @@ msgstr ""
"%s\n"
# Multilínia. ivb
-#: 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"
@@ -3723,7 +3829,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-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 "%s:%d: avís: la cadena no està terminada"
@@ -3733,24 +3839,25 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, c-format
+msgid "warning: invalid Unicode character"
+msgstr "avís: el caràcter Unicode no és vàlid"
+
+#: 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 "%s:%d: avís: la constant caràcter no està terminada"
-#: 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 "%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:2055
-#, fuzzy
+#: src/x-csharp.c:224 src/xgettext.c:2106
msgid "Please specify the source encoding through --from-code."
msgstr ""
-"Hi ha una cadena no‐ASCII en «%s%s».\n"
-"Per favor, especifiqueu la codificació d’origen correcta amb «--from-code».\n"
+"Per favor, especifiqueu la codificació d’origen correcta amb «--from-code»."
# Multilínia. ivb
#: src/x-csharp.c:269
@@ -3809,7 +3916,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:1335
+#: src/x-csharp.c:1390 src/x-python.c:1138
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: avís: el caràcter Unicode no és vàlid"
@@ -3829,24 +3936,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
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
+msgstr "manca el context de la cadena extreta de l’element «%s»"
-#: 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 ""
+msgstr "no es permet l’element arrel «%s» en un fitxer Glade vàlid"
# Crec que no hauria de tenir traducció. ivb
-#: 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 "%s:%lu:%lu: %s"
# Multilínia. L’argument és el nom del programa. ivb
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3860,18 +3967,14 @@ 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
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
@@ -3882,7 +3985,7 @@ msgstr ""
# Multilínia. ivb
# Hau! ivb
#: src/x-javascript.c:291
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
@@ -3892,7 +3995,7 @@ msgstr ""
# Multilínia. ivb
#: src/x-javascript.c:303
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of file.\n"
"Please specify the correct source encoding through --from-code\n"
@@ -3902,7 +4005,7 @@ msgstr ""
# Multilínia. ivb
#: src/x-javascript.c:312
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of line.\n"
"Please specify the correct source encoding through --from-code\n"
@@ -3912,7 +4015,7 @@ msgstr ""
# Multilínia. ivb
#: src/x-javascript.c:344
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the source encoding through --from-code\n"
@@ -3920,10 +4023,21 @@ 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
+#: src/x-javascript.c:954
+#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: avís: el literal cadena no està terminat"
+msgstr "%s:%d: avís: el literal expressió regular termina massa aviat"
+
+# No empra quote(). ivb
+#: src/x-javascript.c:1055
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: avís: no es permet «%s»"
+
+#: src/x-javascript.c:1069
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: avís: l’etiquetatge XML no està terminat"
#: src/x-perl.c:308
#, c-format
@@ -3969,12 +4083,10 @@ 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: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 ""
-"Hi ha una cadena no‐ASCII en «%s%s».\n"
"Per favor, especifiqueu la codificació d’origen correcta amb\n"
"«--from-code» o mitjançant un comentari com es descriu en\n"
"http://www.python.org/peps/pep-0263.html.\n"
@@ -4076,34 +4188,40 @@ msgstr ""
"%s:%lu: avís: la sintaxi «$\"…\"» està desaprovada per motius de seguretat; "
"useu «eval_gettext» al seu lloc"
-#: src/x-vala.c:558
-#, fuzzy, c-format
+#: src/x-vala.c:413
+#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: avís: el literal cadena no està terminat"
+msgstr "%s:%d: avís: el literal expressió regular termina massa aviat"
+
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr ""
+"«%s» no és nom de codificació vàlid, s’emprarà ASCII com a alternativa\n"
-#: src/xgettext.c:636
+#: src/xgettext.c:648
#, 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:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "«xgettext» no funciona sense paraules clau que cercar"
-#: src/xgettext.c:785
-#, fuzzy, c-format
+#: src/xgettext.c:808
+#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr ""
"avís: l’extensió «%2$s» del fitxer «%1$s» no és coneguda; es provarà amb el "
"llenguatge «C»"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, 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:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -4113,12 +4231,12 @@ msgstr ""
" Empra «NOM.po» com a eixida (en lloc de «messages."
"po»).\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, 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:863
+#: src/xgettext.c:886
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
@@ -4127,13 +4245,13 @@ msgstr ""
" Els fitxers d’eixida es desaran al DIRECTORI.\n"
# Es refereix al llenguatge de programació. ivb
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Selecció del llenguatge del fitxer d’entrada:\n"
-#: src/xgettext.c:870
-#, fuzzy, c-format
+#: src/xgettext.c:893
+#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -4142,7 +4260,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=NOM Reconeix el llenguatge especificat (C, C++,\n"
" ObjectiveC, PO, Shell, Python, Lisp, EmacsLisp, "
@@ -4150,14 +4268,15 @@ msgstr ""
" Scheme, Smalltalk, Java, JavaProperties, C#, awk, "
"YCP,\n"
" Tcl, Perl, PHP, GCC-source, NXStringTable, RST, "
-"Glade).\n"
+"Glade,\n"
+" Lua, JavaScript, Vala, Desktop).\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ Equival a «--language=C++».\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:902
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
@@ -4167,7 +4286,7 @@ msgstr ""
"fitxer\n"
"d’entrada.\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -4176,20 +4295,20 @@ msgstr ""
" --from-code=NOM Codificació dels fitxers d’entrada (excepte per a\n"
" Python, Tcl i Glade).\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr ""
"Per defecte s’assumeix que els fitxers d’entrada estan codificats en ASCII.\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, 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:894
+#: src/xgettext.c:917
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr ""
@@ -4197,8 +4316,8 @@ msgstr ""
" No extreu les entrades que ja es troben al FITXER.po\n"
" indicat.\n"
-#: src/xgettext.c:896
-#, fuzzy, c-format
+#: src/xgettext.c:919
+#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
" preceding keyword lines in output file\n"
@@ -4206,25 +4325,28 @@ msgid ""
"lines\n"
" in output file\n"
msgstr ""
-" -c, --add-comments[=ETIQUETA]\n"
-" Inclou els blocs de comentaris marcats amb "
-"l’ETIQUETA,\n"
-" o aquells que precedeixen les línies amb una paraula\n"
-" clau, al fitxer d’eixida.\n"
+" -cETIQUETA, --add-comments=ETIQUETA\n"
+" Inclou al fitxer d’eixida els blocs de comentaris "
+"que\n"
+" comencen amb l’ETIQUETA i que precedeixen les línies\n"
+" amb una paraula clau.\n"
+" -c, --add-comments Inclou al fitxer d’eixida tots els blocs de "
+"comentaris\n"
+" que precedeixen les línies amb una paraula clau.\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Opcions específiques del llenguatge:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, 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:906 src/xgettext.c:914
-#, fuzzy, c-format
+#: src/xgettext.c:929
+#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, "
@@ -4236,21 +4358,27 @@ msgstr ""
"Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, "
"awk,\n"
-" Tcl, Perl, PHP, GCC-source i Glade.)\n"
+" Tcl, Perl, PHP, GCC-source, Glade, Lua, JavaScript i\n"
+" Vala.)\n"
-#: src/xgettext.c:911
-#, fuzzy, c-format
+# No mola pq va darrere d’un punt… ivb
+#: 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 ""
-" -k, --keyword[=PARAULA]\n"
-" Paraula clau addicional a cercar (si no s’especifica "
-"la\n"
-" PARAULA no s’empraran les paraules clau per "
-"defecte).\n"
+" (Només per als llenguatges C, C++, ObjectiveC, "
+"Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, "
+"awk,\n"
+" Tcl, Perl, PHP, GCC-source, Glade, Lua, JavaScript i\n"
+" Vala, Desktop.)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -4263,8 +4391,8 @@ msgstr ""
" l’argument ARG de la paraula clau PARAULA.\n"
# No mola pq va darrere d’un punt… ivb
-#: src/xgettext.c:922
-#, fuzzy, c-format
+#: src/xgettext.c:945
+#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, "
@@ -4276,44 +4404,45 @@ msgstr ""
"Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, Java, C#, "
"awk,\n"
-" YCP, Tcl, Perl, PHP i GCC-source.)\n"
+" YCP, Tcl, Perl, PHP, GCC-source, Lua, JavaScript i\n"
+" Vala.)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
" -T, --trigraphs Interpreta els trígrafs del C ANSI a l’entrada.\n"
# No mola pq va darrere d’un punt… ivb
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
" (Només per als llenguatges C, C++ i ObjectiveC.)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, 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: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 " (Només per al llenguatge C++.)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --kde Reconeix les cadenes de format de KDE 4.\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, 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:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
@@ -4322,14 +4451,14 @@ msgstr ""
"de\n"
" cadenes de format.\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, 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:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
@@ -4337,7 +4466,7 @@ msgstr ""
" Estableix a l’eixida la propietària o propietari del\n"
" copyright.\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -4346,21 +4475,21 @@ msgstr ""
"a\n"
" uns usuaris diferents.\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, 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:989
+#: src/xgettext.c:1012
#, 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:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
@@ -4370,30 +4499,31 @@ msgstr ""
"cadenes\n"
" «msgid».\n"
-#: src/xgettext.c:993
-#, fuzzy, c-format
+#: src/xgettext.c:1016
+#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
"msgstr\n"
" values\n"
msgstr ""
-" -m, --msgstr-prefix[=CADENA]\n"
-" Empra la CADENA, o «», com a prefix de les entrades\n"
-" «msgstr».\n"
+" -m[CADENA], --msgstr-prefix[=CADENA]\n"
+" Empra la CADENA (o la cadena buida) com a prefix "
+"dels\n"
+" valors les entrades «msgstr».\n"
-#: src/xgettext.c:996
-#, fuzzy, c-format
+#: src/xgettext.c:1019
+#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
"msgstr\n"
" values\n"
msgstr ""
-" -M, --msgstr-suffix[=CADENA]\n"
-" Empra la CADENA, o «», com a sufix de les entrades\n"
-" «msgstr».\n"
+" -M[CADENA], --msgstr-suffix[=CADENA]\n"
+" Empra la CADENA (o la cadena buida) com a sufix dels\n"
+" valors les entrades «msgstr».\n"
# Missatge d’error. ivb
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4401,26 +4531,29 @@ msgid ""
msgstr ""
"Un argument de «--flag» no té la sintaxi «PARCLAU:NUMARG:[pass-]INDIC»: %s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr "entrada estàndard"
-#: src/xgettext.c:2020
+# Cadena amb format «nom_fitxer:línia». ivb
+#: src/xgettext.c:2071
#, c-format
msgid "Non-ASCII character at %s%s."
-msgstr ""
+msgstr "Hi ha un caràcter no‐ASCII en «%s%s»."
-#: src/xgettext.c:2024
+# Cadena amb format «nom_fitxer:línia». ivb
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
-msgstr ""
+msgstr "Hi ha un comentari no‐ASCII en o abans de «%s%s»."
-#: src/xgettext.c:2029
+# Cadena amb format «nom_fitxer:línia». ivb
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
-msgstr ""
+msgstr "Hi ha una cadena no‐ASCII en «%s%s»."
-#: 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 "%s%s: avís: "
@@ -4430,7 +4563,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:2138
+#: src/xgettext.c:2189
#, c-format
msgid ""
"Although being used in a format string position, the %s is not a valid %s "
@@ -4444,7 +4577,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:2139
+#: src/xgettext.c:2190
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4454,7 +4587,7 @@ msgstr ""
"Motiu: %s\n"
# Multilínia. ivb
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4468,7 +4601,7 @@ msgstr ""
"arguments amb nom, i un mapa en lloc d’una tupla per a aquests.\n"
# Multilínia. ivb
-#: 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"
@@ -4478,30 +4611,29 @@ msgstr ""
"«gettext(\"\")» retorna l’entrada de capçalera amb metainformació, no la\n"
"cadena buida.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, 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:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "avís: manca el context de la paraula clau «%.*s»"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr ""
"avís: manca el context de l’argument «plural» de la paraula clau «%.*s»"
-#: src/xgettext.c:2942
+#: src/xgettext.c:3052
#, 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:3052
-#, fuzzy
+#: src/xgettext.c:3419
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a 'Makevars' file, please specify\n"
@@ -4514,32 +4646,11 @@ msgstr ""
"d’ordres.\n"
# Llenguatge de programació. ivb
-#: src/xgettext.c:3267
-#, fuzzy, c-format
+#: src/xgettext.c:3638
+#, c-format
msgid "language '%s' unknown"
msgstr "el llenguatge «%s» no és conegut"
#: libgettextpo/gettext-po.c:84
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"
-
-#~ msgid "DuplicateHandle failed with error code 0x%08x"
-#~ msgstr "DuplicateHandle() ha fallat amb el codi d’error 0x%08x"
-
-#~ msgid "Not yet implemented."
-#~ msgstr "Encara no s’ha implementat."
-
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "el camp «%s» encara té el valor inicial per defecte\n"
diff --git a/gettext-tools/po/cs.po b/gettext-tools/po/cs.po
index 8cd95a1..661e140 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: 2013-07-07 18:21+0900\n"
+"POT-Creation-Date: 2014-06-01 11:19+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"
@@ -38,11 +38,10 @@ msgstr ""
msgid "Valid arguments are:"
msgstr ""
-# src/message.c:1115
#: gnulib-lib/clean-temp.c:332
-#, fuzzy, c-format
+#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "vstupn soubor \"%s\" nelze vytvoit"
+msgstr ""
# src/message.c:1115
#: gnulib-lib/clean-temp.c:346
@@ -56,11 +55,10 @@ msgstr "vstupn soubor \"%s\" nelze vytvoit"
msgid "cannot remove temporary file %s"
msgstr "vstupn soubor \"%s\" nelze vytvoit"
-# src/message.c:1115
#: gnulib-lib/clean-temp.c:457
-#, fuzzy, c-format
+#, c-format
msgid "cannot remove temporary directory %s"
-msgstr "vstupn soubor \"%s\" nelze vytvoit"
+msgstr ""
#: gnulib-lib/closeout.c:66
msgid "write error"
@@ -78,11 +76,10 @@ msgstr ""
msgid "error while opening %s for reading"
msgstr "chyba pi otevrn souboru \"%s\" pro ten"
-# src/msgfmt.c:321
#: gnulib-lib/copy-file.c:198
-#, fuzzy, c-format
+#, c-format
msgid "cannot open backup file %s for writing"
-msgstr "chyba pi otevrn souboru \"%s\" pro zpis"
+msgstr ""
# src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
#: gnulib-lib/copy-file.c:202
@@ -210,16 +207,16 @@ 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 ""
# src/message.c:1182
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c: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 "chyba pi zpisu do souboru \"%s\""
@@ -241,9 +238,9 @@ msgid "%s subprocess I/O error"
msgstr ""
# lib/xmalloc.c:82
-#: 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 "pam vyerpna"
@@ -254,7 +251,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 ""
@@ -345,8 +342,8 @@ 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: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 "chyba pi otevrn souboru \"%s\" pro ten"
@@ -631,6 +628,7 @@ msgid_plural ""
"%u parameters."
msgstr[0] ""
msgstr[1] ""
+msgstr[2] ""
#: src/format-lisp.c:2496 src/format-scheme.c:2499
#, c-format
@@ -674,11 +672,11 @@ msgstr ""
msgid "The string refers to some argument in incompatible ways."
msgstr ""
-# src/msgfmt.c:892
+# src/msgfmt.c:909
#: src/format-lisp.c:3474 src/format-scheme.c:3397
#, fuzzy, c-format
msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "poet formtovacch specifiktor v `msgid' a `msgstr' nen stejn"
+msgstr "formtovac specifiktory pro argument %lu nejsou stejn"
# src/msgfmt.c:909
#: src/format-lisp.c:3490 src/format-scheme.c:3413
@@ -695,7 +693,7 @@ msgstr ""
# src/msgfmt.c:909
#: 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
#, fuzzy, c-format
msgid "a format specification for argument '%s' doesn't exist in '%s'"
@@ -712,19 +710,17 @@ msgstr ""
msgid "The string refers to the argument named '%s' in incompatible ways."
msgstr ""
-# src/msgfmt.c:892
#: src/format-python.c:430
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "poet formtovacch specifiktor v `msgid' a `msgstr' nen stejn"
+msgstr ""
-# src/msgfmt.c:892
#: src/format-python.c:437
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "poet formtovacch specifiktor v `msgid' a `msgstr' nen stejn"
+msgstr ""
# src/msgfmt.c:909
#: src/format-python.c:460 src/format-sh.c:297
@@ -740,28 +736,28 @@ msgid ""
"format specifications in '%s' and '%s' for argument '%s' are not the same"
msgstr "formtovac specifiktory pro argument %lu nejsou stejn"
-#: 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 ""
@@ -807,11 +803,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"
@@ -822,19 +818,19 @@ 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: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 "Autor: %s\n"
#. 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 ""
@@ -847,11 +843,11 @@ msgstr "pli 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: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
#, fuzzy, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Vce informac zskte pkazem `%s --help'.\n"
@@ -889,29 +885,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 ""
@@ -922,11 +918,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
#, fuzzy
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr ""
@@ -939,233 +935,235 @@ msgstr ""
msgid "could not get host name"
msgstr ""
-# src/msgcmp.c:165 src/msgmerge.c:272
-#: 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
+#: 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 "jsou poadovny pesn 2 vstupn soubory"
+msgstr ""
# src/xgettext.c:378 src/xgettext.c:382
-#: 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 "%s a %s se vzjemn vyluuj"
-#: 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/msgfmt.c:273 src/xgettext.c:410
-#: 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
#, fuzzy, c-format
msgid "Input file location:\n"
msgstr "vstupn soubor nen zadn"
-#: 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"
@@ -1174,135 +1172,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/msgunfmt.c:215
-#: 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
-#, fuzzy, c-format
+#: 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 ""
-"Pouit: %s [PEPNA] [SOUBOR]...\n"
-" Argumenty povinn pro dlouh pepnae, jsou t povinn pro jejich "
-"krtk\n"
-"formy.\n"
-"\n"
-" -e, --no-escape nepouv C escape sekvence ve vstupu "
-"(implicitn)\n"
-" -E, --escape pouv C escape sekvence ve vstupu, bez\n"
-" rozench znak\n"
-" --force-po zape .po soubor, i kdy je przdn\n"
-" -h, --help vype tuto npovdu a ukon se\n"
-" -i, --indent odsazen vstupn styl\n"
-" -o, --output-file=SOUBOR vsledek bude zapsn do SOUBORu\n"
-" --strict zpsob psn dodrovn stylu Uniforum\n"
-" -V, --version vype oznaen verze a ukon se\n"
-" -w, --width=SLO nastav ku vstupn strnky\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 "zadno nemon vbrov kritrium (%d < n < %d)"
-#: 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
#, fuzzy, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1331,94 +1312,94 @@ msgstr ""
"ponechny, ale pouze z prvnho .po souboru, kter je definuje. Oznaen pozic\n"
"v souborech bude ponechno ze vech .po soubor.\n"
-#: 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:160 src/msgmerge.c:267
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "vstupn soubory nejsou zadny"
# src/msgcmp.c:165 src/msgmerge.c:272
-#: 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 "jsou poadovny pesn 2 vstupn soubory"
-#: 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 ""
@@ -1459,19 +1440,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 ""
@@ -1498,19 +1479,19 @@ msgid "this message needs to be reviewed by the translator"
msgstr ""
# src/msgcmp.c:259 src/msgmerge.c:711
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1505
#, c-format
msgid "this message is used but not defined..."
msgstr "tato zprva je pouita, ale nikoli definovna..."
# src/msgcmp.c:261 src/msgmerge.c:713
-#: 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 "...ale tato definice je podobn"
# src/msgcmp.c:267 src/msgmerge.c:740
-#: 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 "tato zprva je pouita, ale nikoli definovna v %s"
@@ -1522,7 +1503,7 @@ msgid "warning: this message is not used"
msgstr "upozornn: tato zprva nen pouita"
# src/po-lex.c:84
-#: 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"
@@ -1530,12 +1511,12 @@ msgstr[0] "nalezena %d zvan chyba"
msgstr[1] "nalezeny %d zvan chyby"
msgstr[2] "nalezeno %d zvanch chyb"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "mus bt zadny nejmn dva rzn soubory"
-#: src/msgcomm.c:363
+#: src/msgcomm.c:364
#, fuzzy, c-format, no-wrap
msgid ""
"Find messages which are common to two or more of the specified PO files.\n"
@@ -1563,76 +1544,76 @@ msgstr ""
"ponechny, ale pouze z prvnho .po souboru, kter je definuje. Oznaen pozic\n"
"v souborech bude ponechno ze vech .po soubor.\n"
-#: 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/msgfmt.c:273 src/xgettext.c:410
-#: 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 "vstupn soubor nen zadn"
# src/msgcmp.c:165 src/msgmerge.c:272
-#: src/msgen.c:253
+#: src/msgen.c:263
#, fuzzy, c-format
msgid "exactly one input file required"
msgstr "jsou poadovny pesn 2 vstupn soubory"
-#: 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"
@@ -1641,16 +1622,15 @@ 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 ""
-# src/gettextp.c:154
#: src/msgexec.c:196
-#, fuzzy, c-format
+#, c-format
msgid "missing command name"
-msgstr "chyb argumenty"
+msgstr ""
#: src/msgexec.c:257
#, c-format
@@ -1674,7 +1654,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 ""
@@ -1685,45 +1665,45 @@ msgid "write to stdout failed"
msgstr ""
# src/gettextp.c:154
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, fuzzy, c-format
msgid "missing filter name"
msgstr "chyb argumenty"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, fuzzy, c-format
msgid "at least one sed script must be specified"
msgstr "mus bt zadny nejmn dva rzn soubory"
-#: 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 "
@@ -1731,74 +1711,96 @@ 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/xgettext.c:378 src/xgettext.c:382
+#: src/msgfmt.c:551
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s a %s se vzjemn vyluuj"
+
+#: 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:343
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
@@ -1807,7 +1809,7 @@ msgstr[1] "%d peloen zprvy"
msgstr[2] "%d peloench zprv"
# src/msgfmt.c:345
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
@@ -1816,7 +1818,7 @@ msgstr[1] ", %d nepln peklady"
msgstr[2] ", %d neplnch peklad"
# src/msgfmt.c:347
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
@@ -1824,105 +1826,118 @@ msgstr[0] ", %d nepeloen zprva"
msgstr[1] ", %d nepeloen zprvy"
msgstr[2] ", %d nepeloench zprv"
-#: 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 "
@@ -1931,49 +1946,78 @@ msgid ""
"written under the specified directory.\n"
msgstr ""
-# src/msgfmt.c:273 src/xgettext.c:410
-#: src/msgfmt.c:715
-#, fuzzy, c-format
+#: src/msgfmt.c:839
+#, c-format
msgid "Output file location in C# mode:\n"
-msgstr "vstupn soubor nen zadn"
+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"
@@ -1981,33 +2025,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 "
@@ -2015,18 +2059,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 "
@@ -2035,56 +2079,52 @@ 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
-#, fuzzy, c-format
+#: src/msgfmt.c:1037
+#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr ""
-"%s: upozornn: chyb hlavika PO souboru (nepln nebo neplatn)\n"
-"%*s upozornn: pevod znakov sady nebude fungovat"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, fuzzy, c-format
msgid "warning: charset conversion will not work\n"
msgstr ""
"V hlavice chyb definice znakov sady.\n"
"Konverze zprv do uivatelovy znakov sady nen mon.\n"
-#: src/msgfmt.c:910
-#, fuzzy, c-format
+#: src/msgfmt.c:1050
+#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr ""
-"%s: upozornn: chyb hlavika PO souboru (nepln nebo neplatn)\n"
-"%*s upozornn: pevod znakov sady nebude fungovat"
-#: 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:471
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "jmno domny \"%s\" nen vhodn jako jmno souboru"
# src/msgfmt.c:476
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
@@ -2092,57 +2132,67 @@ msgstr ""
"pedpona"
# src/msgfmt.c:489
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "'domain %s' directive ignored"
msgstr "pkaz `domain %s' ignorovn"
# src/msgfmt.c:517
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, fuzzy, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "przdn poloka `msgstr' ignorovna"
# src/msgfmt.c:518
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, fuzzy, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "nepln poloka `msgstr' ignorovna"
# src/msgfmt.c:668
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: upozornn: zdrojov soubor obsahuje nepln peklad"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
# src/msgunfmt.c:266 src/msgunfmt.c:330 src/po-lex.c:185 src/xget-lex.c:254
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c: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 "chyba pi ten \"%s\""
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
"specified"
msgstr ""
-#: 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"
@@ -2182,18 +2232,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 ""
@@ -2332,7 +2382,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
#, fuzzy, c-format
msgid "warning: "
msgstr "%s: upozornn: "
@@ -2447,35 +2497,30 @@ msgstr ""
msgid "invalid nplurals value"
msgstr "neplatn dc sekvence"
-# src/po-lex.c:332
#: src/msgl-check.c:442
-#, fuzzy
msgid "invalid plural expression"
-msgstr "neplatn dc sekvence"
+msgstr ""
-# src/po-lex.c:332
#: src/msgl-check.c:472 src/msgl-check.c:488
-#, fuzzy, c-format
+#, c-format
msgid "nplurals = %lu"
-msgstr "neplatn dc sekvence"
+msgstr ""
-# src/msgcmp.c:267 src/msgmerge.c:740
#: src/msgl-check.c:474
-#, fuzzy, c-format
+#, c-format
msgid "but some messages have only one plural form"
msgid_plural "but some messages have only %lu plural forms"
-msgstr[0] "tato zprva je pouita, ale nikoli definovna v %s"
-msgstr[1] "tato zprva je pouita, ale nikoli definovna v %s"
-msgstr[2] "tato zprva je pouita, ale nikoli definovna v %s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-# src/msgcmp.c:267 src/msgmerge.c:740
#: src/msgl-check.c:490
-#, fuzzy, c-format
+#, c-format
msgid "but some messages have one plural form"
msgid_plural "but some messages have %lu plural forms"
-msgstr[0] "tato zprva je pouita, ale nikoli definovna v %s"
-msgstr[1] "tato zprva je pouita, ale nikoli definovna v %s"
-msgstr[2] "tato zprva je pouita, ale nikoli definovna v %s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: src/msgl-check.c:514
msgid ""
@@ -2528,19 +2573,19 @@ 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/msgfmt.c:573
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, fuzzy, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "nkter poloky hlaviky maj stle poten implicitn hodnotu"
# src/msgfmt.c:561
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, fuzzy, c-format
msgid "header field '%s' missing in header\n"
msgstr "poloka hlaviky `%s' v hlavice chyb"
@@ -2562,7 +2607,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
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2579,7 +2624,7 @@ 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
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2588,17 +2633,17 @@ msgstr ""
"Znakov sada \"%s\" nen podporovna. %s spolh na iconv().\n"
"Tato verze byla kompilovna bez iconv().\n"
-#: 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:321
-#: src/msgmerge.c:485
+#: src/msgmerge.c:490
#, fuzzy, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2623,51 +2668,51 @@ msgstr ""
"zklad podobnosti vzor. Tm je dosaeno lepho slit obou katalog.\n"
" Nen-li vstupn soubor uren, vsledek bude vypisovn na standardn vstup.\n"
-#: 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 "
@@ -2679,7 +2724,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 "
@@ -2687,31 +2732,31 @@ 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/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, fuzzy, c-format
msgid "this message should define plural forms"
msgstr "tato zprva je pouita, ale nikoli definovna v %s"
# src/msgcmp.c:267 src/msgmerge.c:740
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, fuzzy, c-format
msgid "this message should not define plural forms"
msgstr "tato zprva je pouita, ale nikoli definovna v %s"
# src/msgmerge.c:769
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2721,7 +2766,7 @@ msgstr ""
"chyb %ld, zastaralch %ld.\n"
# src/msgmerge.c:775
-#: 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"
@@ -2786,11 +2831,10 @@ msgid ""
"separated with an underscore. The class is located using the CLASSPATH.\n"
msgstr ""
-# src/msgfmt.c:273 src/xgettext.c:410
#: src/msgunfmt.c:467
-#, fuzzy, c-format
+#, c-format
msgid "Input file location in C# mode:\n"
-msgstr "vstupn soubor nen zadn"
+msgstr ""
#: src/msgunfmt.c:475
#, c-format
@@ -2821,7 +2865,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"
@@ -2834,12 +2878,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 "
@@ -2908,29 +2952,29 @@ msgid "inconsistent use of #~"
msgstr "nekonzistentn pouit #~"
# ../../src/po-gram.y:83
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, fuzzy, c-format
msgid "missing 'msgstr[]' section"
msgstr "chyb sekce `msgstr[]'"
# ../../src/po-gram.y:83
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, fuzzy, c-format
msgid "missing 'msgid_plural' section"
msgstr "chyb sekce `msgid_plural'"
# ../../src/po-gram.y:83
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, fuzzy, c-format
msgid "missing 'msgstr' section"
msgstr "chyb sekce `msgstr'"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "prvn mnon slo m nenulov index"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "mnon slo m chybn index"
@@ -2941,7 +2985,7 @@ msgstr "mnon slo m chybn index"
msgid "too many errors, aborting"
msgstr "pli mnoho chyb, konm"
-#: 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 "neplatn vceznakov sekvence"
@@ -2990,18 +3034,18 @@ msgid "context separator <EOT> within string"
msgstr ""
# src/xgettext.c:658 src/xgettext.c:968
-#: 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 "tento soubor neme obsahovat pkazy pro domnu"
# src/msgcmp.c:355 src/msgfmt.c:628 src/msgmerge.c:490 src/xgettext.c:1061
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "dvojnsobn definice zprvy"
# src/msgcmp.c:356 src/msgfmt.c:629 src/msgmerge.c:491 src/xgettext.c:1062
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
#, fuzzy
msgid "this is the location of the first definition"
msgstr "...toto je umstn prvn definice"
@@ -3030,11 +3074,9 @@ msgstr "soubor \"%s\" nen v GNU .mo formtu"
msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr "soubor \"%s\" obsahuje etzec, kter nen ukonen NUL"
-# src/xget-lex.c:892
#: src/read-properties.c:227
-#, fuzzy
msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "%s:%d: upozornn: neukonen znakov konstanta"
+msgstr ""
# src/xget-lex.c:914
#: src/read-stringtable.c:802
@@ -3042,11 +3084,9 @@ msgstr "%s:%d: upozornn: neukonen znakov konstanta"
msgid "warning: unterminated string"
msgstr "%s:%d: upozornn: neukonen etzec literl"
-# src/xget-lex.c:914
#: src/read-stringtable.c:810
-#, fuzzy
msgid "warning: syntax error"
-msgstr "%s:%d: upozornn: klov slovo uhnzdno v argumentu klovho slova"
+msgstr ""
# src/xget-lex.c:914
#: src/read-stringtable.c:871 src/read-stringtable.c:893
@@ -3054,17 +3094,13 @@ msgstr "%s:%d: upozornn: klov slovo uhnzdno v argumentu klovho slova"
msgid "warning: unterminated key/value pair"
msgstr "%s:%d: upozornn: neukonen etzec literl"
-# src/xget-lex.c:914
#: src/read-stringtable.c:939
-#, fuzzy
msgid "warning: syntax error, expected ';' after string"
-msgstr "%s:%d: upozornn: neukonen etzec literl"
+msgstr ""
-# src/xget-lex.c:914
#: src/read-stringtable.c:948
-#, fuzzy
msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "%s:%d: upozornn: klov slovo uhnzdno v argumentu klovho slova"
+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
@@ -3213,17 +3249,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 ""
@@ -3235,13 +3271,13 @@ msgid "error while opening \"%s\" for writing"
msgstr "chyba pi otevrn souboru \"%s\" pro zpis"
# src/message.c:784
-#: src/write-po.c:803
+#: src/write-po.c:875
#, fuzzy, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr "zprvy katalogu nesm obsahovat escape sekvenci `\\%c'"
-#: 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"
@@ -3250,7 +3286,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"
@@ -3311,7 +3347,7 @@ msgid ""
msgstr ""
# src/xget-lex.c:914
-#: 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
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "%s:%d: upozornn: neukonen etzec literl"
@@ -3322,19 +3358,24 @@ msgstr "%s:%d: upozornn: neukonen etzec literl"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: upozornn: neukonen etzec literl"
+#: src/x-c.c:1051
+#, c-format
+msgid "warning: invalid Unicode character"
+msgstr ""
+
# src/xget-lex.c:892
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:762
+#: 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 "%s:%d: upozornn: neukonen znakov konstanta"
# src/xget-lex.c:914
-#: 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 "%s:%d: upozornn: neukonen etzec literl"
-#: 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 ""
@@ -3379,16 +3420,16 @@ msgid ""
msgstr ""
# src/xget-lex.c:892
-#: src/x-csharp.c:1390 src/x-python.c:1335
+#: src/x-csharp.c:1390 src/x-python.c:1138
#, fuzzy, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: upozornn: neukonen znakov konstanta"
-# src/xget-lex.c:914
+# src/xget-lex.c:892
#: src/x-csharp.c:1512 src/x-java.c:875
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: upozornn: neukonen etzec literl"
+msgstr "%s:%d: upozornn: neukonen znakov konstanta"
#: src/x-csharp.c:2020 src/x-java.c:1369
#, c-format
@@ -3400,22 +3441,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
#, fuzzy, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3470,11 +3511,23 @@ msgid ""
msgstr ""
# src/xget-lex.c:914
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, fuzzy, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: upozornn: neukonen etzec literl"
+# src/msgcmp.c:281
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "upozornn: tato zprva nen pouita"
+
+# src/xget-lex.c:914
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: upozornn: neukonen etzec literl"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3572,11 +3625,10 @@ msgstr ""
msgid "%s:%d: missing number after #"
msgstr ""
-# src/xget-lex.c:914
#: src/x-rst.c:207
-#, fuzzy, c-format
+#, c-format
msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: upozornn: neukonen etzec literl"
+msgstr ""
#: src/x-sh.c:1074
#, c-format
@@ -3586,58 +3638,63 @@ msgid ""
msgstr ""
# src/xget-lex.c:914
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, fuzzy, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: upozornn: neukonen etzec literl"
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr ""
+
# src/xgettext.c:386
-#: src/xgettext.c:636
+#: src/xgettext.c:648
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-existing neme bt pouit, je-li vstup zapisovn do stdout"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext neme pracovat bez toho, ani by znal slova, kter m hledat"
# src/xgettext.c:501
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, fuzzy, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr "upozornn: ppona `%2$s' souboru `%1$s' nen znma; zkusm C"
-#: 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/msgfmt.c:273 src/xgettext.c:410
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, fuzzy, c-format
msgid "Choice of input file language:\n"
msgstr "vstupn soubor nen zadn"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3647,44 +3704,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"
@@ -3694,17 +3751,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"
@@ -3714,14 +3771,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 "
@@ -3729,7 +3789,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"
@@ -3739,75 +3799,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 "
@@ -3815,7 +3875,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 "
@@ -3823,7 +3883,7 @@ 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: "
@@ -3831,45 +3891,45 @@ msgid ""
msgstr ""
# src/xget-lex.c:150
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr "standardn vstup"
-#: 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
#, fuzzy, c-format
msgid "%s%s: warning: "
msgstr "%s: upozornn: "
-#: 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"
@@ -3878,34 +3938,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"
@@ -3914,7 +3974,7 @@ msgid ""
msgstr ""
# src/xgettext.c:1342
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, fuzzy, c-format
msgid "language '%s' unknown"
msgstr "jazyk `%s' nen znm"
@@ -3923,25 +3983,10 @@ msgstr "jazyk `%s' nen znm"
msgid "<unnamed>"
msgstr ""
-# src/msgfmt.c:564
-#, fuzzy
-#~ msgid "header field '%s' should start at beginning of line\n"
-#~ msgstr "poloka hlaviky `%s' by mla zanat na zatku dku"
-
-# src/msgfmt.c:573
-#, fuzzy
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr "nkter poloky hlaviky maj stle poten implicitn hodnotu"
-
# lib/getopt.c:733
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: neznm pepna -- %c\n"
-# src/msgfmt.c:583
-#, fuzzy
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "poloka `%s' m stle poten implicitn hodnotu"
-
# src/gettextp.c:134 src/msgcmp.c:144 src/msgfmt.c:257 src/msgmerge.c:251
# src/msgunfmt.c:175 src/xgettext.c:394
#~ msgid ""
@@ -3958,133 +4003,236 @@ msgstr ""
#~ "ZRUKY,\n"
#~ "a to i bez zruky PRODEJNOSTI nebo VHODNOSTI PRO NJAK KONKRTN EL.\n"
-#~ msgid "%s: warning: "
-#~ msgstr "%s: upozornn: "
+# src/gettextp.c:233
+#~ msgid ""
+#~ "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
+#~ " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
+#~ " -e enable expansion of some escape sequences\n"
+#~ " -E (ignored for compatibility)\n"
+#~ " -h, --help display this help and exit\n"
+#~ " -n suppress trailing newline\n"
+#~ " -V, --version display version information and exit\n"
+#~ " [TEXTDOMAIN] MSGID retrieve translated message corresponding\n"
+#~ " to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "Pouit: %s [PEPNA] [[[TEXTOVDOMNA] MSGID ] | [-s [MSGID]...]]\n"
+#~ " -d, --domain=TEXTOVDOMNA nastav textovou domnu, ze kter je MSGID\n"
+#~ " -e umon expanzi nkterch escape sekvenc\n"
+#~ " -E (ignorovn - kvli kompatibilit)\n"
+#~ " -h, --help vype tuto npovdu a ukon se\n"
+#~ " -n potla nov dky na konci zprvy\n"
+#~ " -V, --version vype oznaen verze a ukon se\n"
+#~ " [TEXTOVDOMNA] MSGID vype peloenou zprvu odpovdajc\n"
+#~ " MSGID z TEXTOVDOMNY\n"
-#~ msgid "%s\n"
-#~ msgstr "%s\n"
+# src/gettextp.c:245
+#~ msgid ""
+#~ "\n"
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
+#~ "the\n"
+#~ "environment variable TEXTDOMAIN. If the message catalog is not found in "
+#~ "the\n"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
+#~ "variable TEXTDOMAINDIR.\n"
+#~ "When used with the -s option the program behaves like the `echo' "
+#~ "command.\n"
+#~ "But it does not simply copy its arguments to stdout. Instead those "
+#~ "messages\n"
+#~ "found in the selected catalog are translated.\n"
+#~ "Standard search directory: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ " Nen-li zadn argument TEXTOVDOMNA, pak je domna zskna z promnn\n"
+#~ "prosted TEXTDOMAIN. Jestlie katalog se zprvami nen nalezen\n"
+#~ "v pedpokldanm adresi, pak je tento katalog hledn v adresi, "
+#~ "zadanm\n"
+#~ "v promnn prosted TEXTDOMAINDIR.\n"
+#~ " Je-li pouit argument -s, program se chov jako pkaz `echo'. Msto "
+#~ "toto,\n"
+#~ "aby pouze koproval svoje argumenty do stdout, vype peklad zprv ze\n"
+#~ "zvolenho katalogu. \n"
+#~ "\n"
+#~ " Standardn prohledvan adres: %s\n"
-# src/xget-lex.c:914
-#, fuzzy
-#~ msgid "%s:%lu: warning: unterminated string"
-#~ msgstr "%s:%d: upozornn: neukonen etzec literl"
+# src/msgcmp.c:396 src/msgmerge.c:539
+#~ msgid "this message has no definition in the \"%s\" domain"
+#~ msgstr "tato zprva nem dnou definici v domn \"%s\""
-# src/msgmerge.c:303
-#, fuzzy
+# src/xgettext.c:340 src/xgettext.c:1256
+#~ msgid "while preparing output"
+#~ msgstr "pi pprav vstupu"
+
+# src/xgettext.c:537
#~ msgid ""
-#~ "Output details:\n"
+#~ "Usage: %s [OPTION] INPUTFILE ...\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ " -d, --default-domain=NAME use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ " -D, --directory=DIRECTORY add DIRECTORY to list for input files "
+#~ "search\n"
#~ " -e, --no-escape do not use C escapes in output "
#~ "(default)\n"
#~ " -E, --escape use C escapes in output, no extended "
#~ "chars\n"
+#~ " -f, --files-from=FILE get list of input files from FILE\n"
#~ " --force-po write PO file even if empty\n"
+#~ " -F, --sort-by-file sort output by file location\n"
+#~ " -h, --help display this help and exit\n"
+#~ msgstr ""
+#~ "Pouit: %s [PEPNA] VSTUPNSOUBOR ...\n"
+#~ " Argumenty povinn pro dlouh pepnae, jsou t povinn pro jejich "
+#~ "krtk\n"
+#~ "formy.\n"
+#~ "\n"
+#~ " -d, --default-domain=JMNO zape vstup do JMNO.po (msto do "
+#~ "messages.po)\n"
+#~ " -D, --directory=ADRES pid ADRES do seznamu adres pro "
+#~ "hledn\n"
+#~ " vstupnch soubor\n"
+#~ " -e, --no-escape nepouv escape sekvence z C ve vstupu\n"
+#~ " (implicitn)\n"
+#~ " -E, --escape pouv C escape sekvence ve vstupu, bez\n"
+#~ " rozench znak\n"
+#~ " -f, --files-from=SOUBOR vezme seznam vstupnch soubor ze SOUBORu\n"
+#~ " --force-po vype .po soubor, i kdy je przdn\n"
+#~ " -F, --sort-by-file sead vstup podle umstn zprv ve "
+#~ "zdrojovch\n"
+#~ " souborech\n"
+#~ " -h, --help vype tuto npovdu a ukon se\n"
+
+# src/xgettext.c:569
+#~ msgid ""
#~ " -i, --indent write the .po file using indented style\n"
#~ " --no-location do not write '#: filename:line' lines\n"
#~ " -n, --add-location generate '#: filename:line' lines "
#~ "(default)\n"
-#~ " --strict write out strict Uniforum conforming .po "
-#~ "file\n"
-#~ " -w, --width=NUMBER set output page width\n"
-#~ " --no-wrap do not break long message lines, longer "
-#~ "than\n"
-#~ " the output page width, into several "
-#~ "lines\n"
-#~ " -s, --sort-output generate sorted output\n"
-#~ " -F, --sort-by-file sort output by file location\n"
#~ " --omit-header don't write header with `msgid \"\"' "
#~ "entry\n"
+#~ " -o, --output=FILE write output to specified file\n"
+#~ " -p, --output-dir=DIR output files will be placed in directory "
+#~ "DIR\n"
+#~ " -s, --sort-output generate sorted output and remove "
+#~ "duplicates\n"
+#~ " --strict write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ " -T, --trigraphs understand ANSI C trigraphs for input\n"
+#~ " -u, --unique shorthand for --less-than=2, requests\n"
+#~ " that only unique messages be printed\n"
#~ msgstr ""
-#~ "Pouit: %s [PEPNA] def.po ref.po\n"
-#~ " Argumenty povinn pro dlouh pepnae, jsou t povinn pro jejich "
-#~ "krtk\n"
-#~ "formy.\n"
+#~ " -i, --indent vype .po soubor odsazovacm stylem\n"
+#~ " --no-location nevytv dky '#: filename:line'\n"
+#~ " -n, --add-location vytv dky '#: jmno_souboru:dka' "
+#~ "dky\n"
+#~ " (implicitn)\n"
+#~ " --omit-header nevypisuje hlaviku s `msgid \"\"' "
+#~ "polokou\n"
+#~ " -o, --output=SOUBOR zape vstup do urenho souboru\n"
+#~ " -p, --output-dir=ADRES vstupn soubory budou umstny do tohoto\n"
+#~ " adrese\n"
+#~ " -s, --sort-output generuje seazen vstup bez duplicitnch "
+#~ "zprv\n"
+#~ " --strict vytvo vstupn soubor ve stylu Uniforum\n"
+#~ " -T, --trigraphs rozum ANSI C `trigraphs' na vstupu\n"
+#~ " -u, --unique zkratka pro --less-than=2, vstupem budou "
+#~ "pouze\n"
+#~ " zprvy obsaen v katalogch pouze jednou\n"
+
+# src/msgfmt.c:366
+#~ msgid ""
+#~ "Usage: %s [OPTION] filename.po ...\n"
+#~ "Generate binary message catalog from textual translation description.\n"
#~ "\n"
-#~ " -C, --compendium=SOUBOR pdavn knihovna peklad zprv. Me bt "
-#~ "zadna\n"
-#~ " vce ne jednou.\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ " -a, --alignment=NUMBER align strings to NUMBER bytes (default: "
+#~ "%d)\n"
+#~ " -c, --check perform language dependent checks on "
+#~ "strings\n"
+#~ " -D, --directory=DIRECTORY add DIRECTORY to list for input files "
+#~ "search\n"
+#~ " -f, --use-fuzzy use fuzzy entries in output\n"
+#~ " -h, --help display this help and exit\n"
+#~ " --no-hash binary file will not include the hash "
+#~ "table\n"
+#~ " -o, --output-file=FILE specify output file name as FILE\n"
+#~ " --statistics print statistics about translations\n"
+#~ " --strict enable strict Uniforum mode\n"
+#~ " -v, --verbose list input file anomalies\n"
+#~ " -V, --version output version information and exit\n"
+#~ "\n"
+#~ "Giving the -v option more than once increases the verbosity level.\n"
+#~ "\n"
+#~ "If input file is -, standard input is read. If output file is -,\n"
+#~ "output is written to standard output.\n"
+#~ msgstr ""
+#~ "Pouit: %s [PEPNA] soubor.po ...\n"
+#~ " Argumenty povinn pro dlouh pepnae, jsou t povinn pro "
+#~ "odpovdajc\n"
+#~ "krtk formy.\n"
+#~ "\n"
+#~ " -a, --alignment=SLO zarovn etzce do SLO bajt (implicitn: "
+#~ "%d)\n"
+#~ " -c, --check vykon jazykov zvisl kontroly etzc\n"
#~ " -D, --directory=ADRES pid ADRES do seznamu adres pro hledn\n"
#~ " vstupnch soubor\n"
-#~ " -e, --no-escape zake C escape sekvence ve vstupu "
-#~ "(implicitn)\n"
-#~ " -E, --escape pouije C escape sekvence ve vstupu, bez\n"
-#~ " rozench znak\n"
-#~ " --force-po zape .po soubor, i kdy je przdn\n"
+#~ " -f, --use-fuzzy ve vstupu pouije i nepln peklady\n"
#~ " -h, --help vype tuto npovdu a ukon se\n"
-#~ " -i, --indent odsazen vstupn styl\n"
-#~ " -o, --output-file=SOUBOR vsledek bude zapsn do SOUBORu\n"
-#~ " --no-location potla dky '#: jmno_souboru:dka'\n"
-#~ " --add-location zaad dky '#: jmno_souboru:"
-#~ "dka' (implicitn)\n"
+#~ " --no-hash binrn soubor nebude obsahovat haovac "
+#~ "tabulku\n"
+#~ " -o, --output-file=SOUBOR zape vstup do souboru SOUBOR\n"
+#~ " --statistics vype statistiky o pekladech\n"
#~ " --strict zpsob psn dodrovn stylu Uniforum\n"
-#~ " -v, --verbose zven mnostv vypisovanch informac\n"
+#~ " -v, --verbose vype seznam neobvyklost ve vstupnm "
+#~ "souboru\n"
#~ " -V, --version vype oznaen verze a ukon se\n"
-#~ " -w, --width=SLO nastav ku vstupn strnky\n"
+#~ "\n"
+#~ " Zadnm pepnae -v vce ne jednou, zvte podrobnost vpis.\n"
+#~ "\n"
+#~ " Bude-li vstupn soubor -, bude ten standardn vstup. Jestlie "
+#~ "vstupn\n"
+#~ "soubor bude -, vstup bude vypisovn do standardnho vstupu.\n"
+
+# src/msgfmt.c:407
+#~ msgid "while creating hash table"
+#~ msgstr "pi tvorb haovac tabulky"
-# src/msgmerge.c:303
-#, fuzzy
#~ msgid ""
-#~ "Output details:\n"
-#~ " --no-escape do not use C escapes in output (default)\n"
-#~ " -E, --escape use C escapes in output, no extended chars\n"
-#~ " --force-po write PO file even if empty\n"
-#~ " --indent indented output style\n"
-#~ " --keep-header keep header entry unmodified, don't filter "
-#~ "it\n"
-#~ " --no-location suppress '#: filename:line' lines\n"
-#~ " --add-location preserve '#: filename:line' lines "
-#~ "(default)\n"
-#~ " --strict strict Uniforum output style\n"
-#~ " -w, --width=NUMBER set output page width\n"
-#~ " --no-wrap do not break long message lines, longer "
-#~ "than\n"
-#~ " the output page width, into several lines\n"
-#~ " -s, --sort-output generate sorted output\n"
-#~ " -F, --sort-by-file sort output by file location\n"
+#~ "%s: warning: PO file header missing, fuzzy, or invalid\n"
+#~ "%*s warning: charset conversion will not work"
#~ msgstr ""
-#~ "Pouit: %s [PEPNA] def.po ref.po\n"
-#~ " Argumenty povinn pro dlouh pepnae, jsou t povinn pro jejich "
-#~ "krtk\n"
-#~ "formy.\n"
-#~ "\n"
-#~ " -C, --compendium=SOUBOR pdavn knihovna peklad zprv. Me bt "
-#~ "zadna\n"
-#~ " vce ne jednou.\n"
-#~ " -D, --directory=ADRES pid ADRES do seznamu adres pro hledn\n"
-#~ " vstupnch soubor\n"
-#~ " -e, --no-escape zake C escape sekvence ve vstupu "
-#~ "(implicitn)\n"
-#~ " -E, --escape pouije C escape sekvence ve vstupu, bez\n"
-#~ " rozench znak\n"
-#~ " --force-po zape .po soubor, i kdy je przdn\n"
-#~ " -h, --help vype tuto npovdu a ukon se\n"
-#~ " -i, --indent odsazen vstupn styl\n"
-#~ " -o, --output-file=SOUBOR vsledek bude zapsn do SOUBORu\n"
-#~ " --no-location potla dky '#: jmno_souboru:dka'\n"
-#~ " --add-location zaad dky '#: jmno_souboru:"
-#~ "dka' (implicitn)\n"
-#~ " --strict zpsob psn dodrovn stylu Uniforum\n"
-#~ " -v, --verbose zven mnostv vypisovanch informac\n"
-#~ " -V, --version vype oznaen verze a ukon se\n"
-#~ " -w, --width=SLO nastav ku vstupn strnky\n"
+#~ "%s: upozornn: chyb hlavika PO souboru (nepln nebo neplatn)\n"
+#~ "%*s upozornn: pevod znakov sady nebude fungovat"
+
+# src/msgfmt.c:564
+#~ msgid "header field `%s' should start at beginning of line"
+#~ msgstr "poloka hlaviky `%s' by mla zanat na zatku dku"
+
+# src/msgfmt.c:583
+#~ msgid "field `%s' still has initial default value"
+#~ msgstr "poloka `%s' m stle poten implicitn hodnotu"
# src/msgmerge.c:303
-#, fuzzy
#~ msgid ""
-#~ "Output details:\n"
-#~ " --no-escape do not use C escapes in output (default)\n"
-#~ " --escape use C escapes in output, no extended chars\n"
+#~ "Usage: %s [OPTION] def.po ref.po\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ " -C, --compendium=FILE additional library of message "
+#~ "translations,\n"
+#~ " may be specified more than once\n"
+#~ " -D, --directory=DIRECTORY add DIRECTORY to list for input files "
+#~ "search\n"
+#~ " -e, --no-escape do not use C escapes in output (default)\n"
+#~ " -E, --escape use C escapes in output, no extended chars\n"
#~ " --force-po write PO file even if empty\n"
-#~ " --indent indented output style\n"
+#~ " -h, --help display this help and exit\n"
+#~ " -i, --indent indented output style\n"
+#~ " -o, --output-file=FILE result will be written to FILE\n"
#~ " --no-location suppress '#: filename:line' lines\n"
#~ " --add-location preserve '#: filename:line' lines "
#~ "(default)\n"
#~ " --strict strict Uniforum output style\n"
+#~ " -v, --verbose increase verbosity level\n"
+#~ " -V, --version output version information and exit\n"
#~ " -w, --width=NUMBER set output page width\n"
-#~ " --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 ""
#~ "Pouit: %s [PEPNA] def.po ref.po\n"
#~ " Argumenty povinn pro dlouh pepnae, jsou t povinn pro jejich "
@@ -4113,18 +4261,19 @@ msgstr ""
#~ " -w, --width=SLO nastav ku vstupn strnky\n"
# src/msgunfmt.c:215
-#, fuzzy
#~ msgid ""
-#~ "Output details:\n"
+#~ "Usage: %s [OPTION] [FILE]...\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
#~ " -e, --no-escape do not use C escapes in output (default)\n"
#~ " -E, --escape use C escapes in output, no extended chars\n"
#~ " --force-po write PO file even if empty\n"
+#~ " -h, --help display this help and exit\n"
#~ " -i, --indent write indented output style\n"
+#~ " -o, --output-file=FILE write output into FILE instead of standard "
+#~ "output\n"
#~ " --strict write strict uniforum style\n"
+#~ " -V, --version output version information and exit\n"
#~ " -w, --width=NUMBER set output page width\n"
-#~ " --no-wrap do not break long message lines, longer than\n"
-#~ " the output page width, into several lines\n"
-#~ " -s, --sort-output generate sorted output\n"
#~ msgstr ""
#~ "Pouit: %s [PEPNA] [SOUBOR]...\n"
#~ " Argumenty povinn pro dlouh pepnae, jsou t povinn pro jejich "
@@ -4143,125 +4292,56 @@ msgstr ""
#~ " -V, --version vype oznaen verze a ukon se\n"
#~ " -w, --width=SLO nastav ku vstupn strnky\n"
-# src/msgmerge.c:303
-#, fuzzy
+# src/msgunfmt.c:229
#~ msgid ""
-#~ "Output details:\n"
-#~ " -e, --no-escape do not use C escapes in output "
-#~ "(default)\n"
-#~ " -E, --escape use C escapes in output, no extended "
-#~ "chars\n"
-#~ " --force-po write PO file even if empty\n"
-#~ " -i, --indent write the .po file using indented style\n"
-#~ " --no-location do not write '#: filename:line' lines\n"
-#~ " -n, --add-location generate '#: filename:line' lines "
-#~ "(default)\n"
-#~ " --strict write out strict Uniforum conforming .po "
-#~ "file\n"
-#~ " -w, --width=NUMBER set output page width\n"
-#~ " --no-wrap do not break long message lines, longer "
-#~ "than\n"
-#~ " the output page width, into several "
-#~ "lines\n"
-#~ " -s, --sort-output generate sorted output\n"
-#~ " -F, --sort-by-file sort output by file location\n"
-#~ " --omit-header don't write header with `msgid \"\"' "
-#~ "entry\n"
-#~ " --copyright-holder=STRING set copyright holder in output\n"
-#~ " --foreign-user omit FSF copyright in output for foreign "
-#~ "user\n"
-#~ " --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"
+#~ "\n"
+#~ "Convert binary .mo files to Uniforum style .po files.\n"
+#~ "Both little-endian and big-endian .mo files are handled.\n"
+#~ "If no input file is given or it is -, standard input is read.\n"
+#~ "By default the output is written to standard output.\n"
#~ msgstr ""
-#~ "Pouit: %s [PEPNA] def.po ref.po\n"
-#~ " Argumenty povinn pro dlouh pepnae, jsou t povinn pro jejich "
-#~ "krtk\n"
-#~ "formy.\n"
#~ "\n"
-#~ " -C, --compendium=SOUBOR pdavn knihovna peklad zprv. Me bt "
-#~ "zadna\n"
-#~ " vce ne jednou.\n"
-#~ " -D, --directory=ADRES pid ADRES do seznamu adres pro hledn\n"
-#~ " vstupnch soubor\n"
-#~ " -e, --no-escape zake C escape sekvence ve vstupu "
-#~ "(implicitn)\n"
-#~ " -E, --escape pouije C escape sekvence ve vstupu, bez\n"
-#~ " rozench znak\n"
-#~ " --force-po zape .po soubor, i kdy je przdn\n"
-#~ " -h, --help vype tuto npovdu a ukon se\n"
-#~ " -i, --indent odsazen vstupn styl\n"
-#~ " -o, --output-file=SOUBOR vsledek bude zapsn do SOUBORu\n"
-#~ " --no-location potla dky '#: jmno_souboru:dka'\n"
-#~ " --add-location zaad dky '#: jmno_souboru:"
-#~ "dka' (implicitn)\n"
-#~ " --strict zpsob psn dodrovn stylu Uniforum\n"
-#~ " -v, --verbose zven mnostv vypisovanch informac\n"
-#~ " -V, --version vype oznaen verze a ukon se\n"
-#~ " -w, --width=SLO nastav ku vstupn strnky\n"
+#~ " Pevd binrn .mo soubory do .po soubor stylu Uniforum. Oba typy ."
+#~ "mo\n"
+#~ "soubor little-endian a big-endian jsou akceptovny.\n"
+#~ " Nebude-li vstupn soubor zadn, nebo bude-li -, bude ten standardn "
+#~ "vstup.\n"
+#~ "Implicitn je vstup zapisovn do standardnho vstupu.\n"
-# src/gettextp.c:154
-#~ msgid "missing arguments"
-#~ msgstr "chyb argumenty"
+# src/msgunfmt.c:298
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "posun v souboru \"%s\" na pozici %ld selhal"
# src/gettextp.c:233
-#, fuzzy
#~ msgid ""
-#~ " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
+#~ "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
+#~ " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n"
#~ " -e enable expansion of some escape sequences\n"
#~ " -E (ignored for compatibility)\n"
#~ " -h, --help display this help and exit\n"
-#~ " -n suppress trailing newline\n"
#~ " -V, --version display version information and exit\n"
-#~ " [TEXTDOMAIN] MSGID retrieve translated message corresponding\n"
-#~ " to MSGID from TEXTDOMAIN\n"
+#~ " [TEXTDOMAIN] retrieve translated message from TEXTDOMAIN\n"
+#~ " MSGID MSGID-PLURAL translate MSGID (singular) / MSGID-PLURAL "
+#~ "(plural)\n"
+#~ " COUNT choose singular/plural form based on this "
+#~ "value\n"
#~ msgstr ""
-#~ "Pouit: %s [PEPNA] [[[TEXTOVDOMNA] MSGID ] | [-s [MSGID]...]]\n"
-#~ " -d, --domain=TEXTOVDOMNA nastav textovou domnu, ze kter je MSGID\n"
+#~ "Pouit: %s [PEPNA] [[[TEXTOVDOMNA] MSGID MSGID-PLURAL POET\n"
+#~ " -d, --domain=TEXTOVDOMNA peklady zskv z TEXTOVDOMNY\n"
#~ " -e umon expanzi nkterch escape sekvenc\n"
#~ " -E (ignorovn - kvli kompatibilit)\n"
#~ " -h, --help vype tuto npovdu a ukon se\n"
#~ " -n potla nov dky na konci zprvy\n"
#~ " -V, --version vype oznaen verze a ukon se\n"
-#~ " [TEXTOVDOMNA] MSGID vype peloenou zprvu odpovdajc\n"
-#~ " MSGID z TEXTOVDOMNY\n"
+#~ " [TEXTOVDOMNA] peklady zskv z TEXTOVDOMNY\n"
+#~ " MSGID MSGID-PLURAL vype peloenou zprvu odpovdajc\n"
+#~ " MSGID / MSGID-PLURAL\n"
+#~ " POET na zklad tto hodnoty vybere odpovdajc\n"
+#~ " peklad\n"
# src/gettextp.c:245
-#, 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"
-#~ "variable TEXTDOMAINDIR.\n"
-#~ "When used with the -s option the program behaves like the `echo' "
-#~ "command.\n"
-#~ "But it does not simply copy its arguments to stdout. Instead those "
-#~ "messages\n"
-#~ "found in the selected catalog are translated.\n"
-#~ "Standard search directory: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ " Nen-li zadn argument TEXTOVDOMNA, pak je domna zskna z promnn\n"
-#~ "prosted TEXTDOMAIN. Jestlie katalog se zprvami nen nalezen\n"
-#~ "v pedpokldanm adresi, pak je tento katalog hledn v adresi, "
-#~ "zadanm\n"
-#~ "v promnn prosted TEXTDOMAINDIR.\n"
-#~ " Je-li pouit argument -s, program se chov jako pkaz `echo'. Msto "
-#~ "toto,\n"
-#~ "aby pouze koproval svoje argumenty do stdout, vype peklad zprv ze\n"
-#~ "zvolenho katalogu. \n"
#~ "\n"
-#~ " Standardn prohledvan adres: %s\n"
-
-# src/gettextp.c:245
-#, 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 "
@@ -4279,44 +4359,147 @@ msgstr ""
#~ "v promnn prosted TEXTDOMAINDIR.\n"
#~ " Adres, ve kterm se hled: %s\n"
-# src/msgunfmt.c:373
-#, fuzzy
-#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment"
-#~ msgstr "soubor \"%s\" obsahuje etzec, kter nen ukonen NUL"
-
-# src/msgunfmt.c:298
-#~ msgid "seek \"%s\" offset %ld failed"
-#~ msgstr "posun v souboru \"%s\" na pozici %ld selhal"
-
-# src/msgfmt.c:909
-#, fuzzy
-#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
-#~ msgstr "formtovac specifiktory pro argument %lu nejsou stejn"
-
-# src/msgfmt.c:909
-#, fuzzy
-#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-#~ msgstr "formtovac specifiktory pro argument %lu nejsou stejn"
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
-# src/msgfmt.c:909
-#, fuzzy
-#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
-#~ msgstr "formtovac specifiktory pro argument %lu nejsou stejn"
+# src/xgettext.c:537
+#~ msgid ""
+#~ "Usage: %s [OPTION] INPUTFILE ...\n"
+#~ "Extract translatable string from given input files.\n"
+#~ "\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ " -a, --extract-all extract all strings\n"
+#~ " -c, --add-comments[=TAG] place comment block with TAG (or those\n"
+#~ " preceding keyword lines) in output file\n"
+#~ " -C, --c++ shorthand for --language=C++\n"
+#~ " --debug more detailed formatstring recognision "
+#~ "result\n"
+#~ " -d, --default-domain=NAME use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ " -D, --directory=DIRECTORY add DIRECTORY to list for input files "
+#~ "search\n"
+#~ " -e, --no-escape do not use C escapes in output "
+#~ "(default)\n"
+#~ " -E, --escape use C escapes in output, no extended "
+#~ "chars\n"
+#~ " -f, --files-from=FILE get list of input files from FILE\n"
+#~ " --force-po write PO file even if empty\n"
+#~ " --foreign-user omit FSF copyright in output for foreign "
+#~ "user\n"
+#~ " -F, --sort-by-file sort output by file location\n"
+#~ msgstr ""
+#~ "Pouit: %s [PEPNA] VSTUPNSOUBOR ...\n"
+#~ " Argumenty povinn pro dlouh pepnae, jsou t povinn pro jejich "
+#~ "krtk\n"
+#~ "formy.\n"
+#~ "\n"
+#~ " -a, --extract-all extrahuje vechny etzce\n"
+#~ " -c, --add-comments[=JMENOVKA] umst blok komente se JMENOVKOU (nebo "
+#~ "ty,\n"
+#~ " kter pedchzej dku s klovm "
+#~ "slovem)\n"
+#~ " do vstupnho souboru\n"
+#~ " -C, --c++ zkratka pro --language=C++\n"
+#~ " --debug detailnj informace o rozpoznvn\n"
+#~ " formtovacch etzc\n"
+#~ " -d, --default-domain=JMNO pouije JMNO.po pro vstup (msto "
+#~ "messages.po)\n"
+#~ " -D, --directory=ADRES pid ADRES do seznamu adres, ve "
+#~ "kterch\n"
+#~ " se hledaj vstupn soubory\n"
+#~ " -e, --no-escape nepouv C escape sekvence ve vstupu\n"
+#~ " (implicitn)\n"
+#~ " -E, --escape pouv C escape sekvence ve vstupu, "
+#~ "bez\n"
+#~ " rozench znak\n"
+#~ " -f, --files-from=SOUBOR seznam vstupnch soubor bude ten ze "
+#~ "SOUBORu\n"
+#~ " --force-po zape .po soubor, i kdy bude przdn\n"
+#~ " --foreign-user vynech copyright FSF ve vstupu \n"
+#~ " -F, --sort-by-file sead vstup podle umstn zprv\n"
+#~ " ve zdrojovch souborech\n"
+
+# src/xgettext.c:555
+#~ msgid ""
+#~ " -h, --help display this help and exit\n"
+#~ " -i, --indent write the .po file using indented style\n"
+#~ " -j, --join-existing join messages with existing file\n"
+#~ " -k, --keyword[=WORD] additonal keyword to be looked for "
+#~ "(without\n"
+#~ " WORD means not to use default keywords)\n"
+#~ " -L, --language=NAME recognise the specified language (C, C+"
+#~ "+, PO),\n"
+#~ " otherwise is guessed from file "
+#~ "extension\n"
+#~ " -m, --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr "
+#~ "entries\n"
+#~ " -M, --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr "
+#~ "entries\n"
+#~ " --no-location do not write '#: filename:line' lines\n"
+#~ msgstr ""
+#~ " -h, --help vype tuto npovdu a ukon se\n"
+#~ " -i, --indent ve vstupnm .po souboru pouije odsazen "
+#~ "styl\n"
+#~ " -j, --join-existing spoj zprvy z existujcch soubor\n"
+#~ " -k, --keyword[=SLOVO] dodaten klov slovo, kter bude "
+#~ "hledno\n"
+#~ " (bez SLOVA, znamen nepouit "
+#~ "implicitnch\n"
+#~ " klovch slov)\n"
+#~ " -L, --language=NZEV zadn jazyka (C, C++) \n"
+#~ " -m, --msgstr-prefix[=ETZEC] pouije ETZEC nebo \"\" jako pedponu "
+#~ "pro\n"
+#~ " poloky msgstr\n"
+#~ " -M, --msgstr-suffix[=ETZEC] pouije ETZEC nebo \"\" jako pponu "
+#~ "pro\n"
+#~ " poloky msgstr\n"
+#~ " --no-location potla dky '#: jmno_souboru:dek'\n"
+
+# src/xgettext.c:569
+#~ msgid ""
+#~ " -n, --add-location generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ " --omit-header don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ " -o, --output=FILE write output to specified file\n"
+#~ " -p, --output-dir=DIR output files will be placed in directory "
+#~ "DIR\n"
+#~ " -s, --sort-output generate sorted output and remove "
+#~ "duplicates\n"
+#~ " --strict write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ " -T, --trigraphs understand ANSI C trigraphs for input\n"
+#~ " -V, --version output version information and exit\n"
+#~ " -w, --width=NUMBER set output page width\n"
+#~ " -x, --exclude-file=FILE entries from FILE are not extracted\n"
+#~ "\n"
+#~ "If INPUTFILE is -, standard input is read.\n"
+#~ msgstr ""
+#~ " -n, --add-location vytv dky '#: jmno_souboru:"
+#~ "dek' (impl.)\n"
+#~ " --omit-header nezapisuje hlaviku s `msgid \"\"' "
+#~ "polokou\n"
+#~ " -o, --output=SOUBOR zape vstup do urenho souboru\n"
+#~ " -p, --output-dir=ADRES vstupn soubory budou umstny do "
+#~ "adrese\n"
+#~ " ADRES\n"
+#~ " -s, --sort-output generuje seazen vstup bez duplicitnch "
+#~ "zprv\n"
+#~ " --strict vstupn soubor bude stylu Uniforum\n"
+#~ " -T, --trigraphs zapne podporu ANSI C `trigraphs' na "
+#~ "vstupu\n"
+#~ " -V, --version vype oznaen verze a ukon se\n"
+#~ " -w, --width=SLO nastav vstupn ku strnky\n"
+#~ " -x, --exclude-file=SOUBOR soubory ze SOUBORu nebudou zpracovny \n"
+#~ "\n"
+#~ " Bude-li VSTUPNSOUBOR -, bude ten standardn vstup.\n"
-# src/msgfmt.c:407
-#~ msgid "while creating hash table"
-#~ msgstr "pi tvorb haovac tabulky"
+# src/xget-lex.c:914
+#~ msgid "%s:%d: warning: keyword nested in keyword arg"
+#~ msgstr ""
+#~ "%s:%d: upozornn: klov slovo uhnzdno v argumentu klovho slova"
-#, fuzzy
-#~ msgid "%s:%lu: warning: keyword between outer keyword and its arg"
+#~ msgid "%s:%d: warning: keyword between outer keyword and its arg"
#~ msgstr ""
#~ "%s:%d: upozornn: klov slovo mezi krajnm klovm slovem\n"
#~ "a jeho argumentem"
-
-# src/xgettext.c:340 src/xgettext.c:1256
-#~ msgid "while preparing output"
-#~ msgstr "pi pprav vstupu"
-
-# src/msgcmp.c:396 src/msgmerge.c:539
-#~ msgid "this message has no definition in the \"%s\" domain"
-#~ msgstr "tato zprva nem dnou definici v domn \"%s\""
diff --git a/gettext-tools/po/da.po b/gettext-tools/po/da.po
index 574ebc1..eacbdfb 100644
--- a/gettext-tools/po/da.po
+++ b/gettext-tools/po/da.po
@@ -9,14 +9,14 @@ msgid ""
msgstr ""
"Project-Id-Version: gettext-tools 0.18\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: 2011-01-10 23:48+0100\n"
"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8-bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: gnulib-lib/argmatch.c:133
@@ -183,15 +183,15 @@ msgstr "ugyldigt source_version argument til compile_java_class"
msgid "invalid target_version argument to compile_java_class"
msgstr "ugyldigt target_version argument til compile_java_clas"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c: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 "kunne ikke oprette '%s'"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c: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 "fejl ved skrivning til filen '%s'"
@@ -213,9 +213,9 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr "I/O-fejl i %s-underproces"
-#: 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 "ikke mere ledig hukommelse"
@@ -226,7 +226,7 @@ msgid "creation of threads failed"
msgstr "oversttelse af C#-klasse mislykkedes"
#: 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 "skrivning til %s-underproces mislykkedes"
@@ -313,8 +313,8 @@ msgid "%s subprocess got fatal signal %d"
msgstr "%s underproces fik et ddeligt 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: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 "fejl ved lse-bning af '%s'"
@@ -683,7 +683,7 @@ msgstr ""
"'%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-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'"
@@ -729,28 +729,28 @@ 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
+#: src/format-python-brace.c:137
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
msgstr "I direktiv nummer %u flges '%c' ikke af et ciffer."
-#: src/format-python-brace.c:149
+#: src/format-python-brace.c:150
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
msgstr "I direktiv nummer %u flges '{' ikke af et argumentnummer."
-#: src/format-python-brace.c:164
+#: src/format-python-brace.c:165
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
msgstr "I direktiv nummer %u flges '%c' ikke af et ciffer."
-#: src/format-python-brace.c:184
+#: src/format-python-brace.c:185
#, fuzzy, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
msgstr "I direktiv nummer %u: en precision er ikke tilladt fr '%c'."
-#: src/format-python-brace.c:210
+#: src/format-python-brace.c:270
#, fuzzy, c-format
msgid "In the directive number %u, there is an unterminated format directive."
msgstr "I direktiv nummer %u er argument %d negativt."
@@ -803,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: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"
@@ -820,19 +820,19 @@ msgstr ""
"Dette program er frit programmel. Du kan ndre og distribuere det.\n"
"Det er ikke NOGEN SOM HELST GARANTI, i det omfang som lov tillader.\n"
-#: src/hostname.c:184 src/msgattrib.c: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 "Skrevet af %s.\n"
#. 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 "Bruno Haible"
@@ -842,11 +842,11 @@ msgstr "Bruno Haible"
msgid "too many arguments"
msgstr "For mange argumenter"
-#: 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
#, fuzzy, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Prv '%s --help' for yderligere oplysninger.\n"
@@ -886,29 +886,29 @@ msgstr ""
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address adresser for vrtsnavnet\n"
-#: src/hostname.c:228 src/msgattrib.c:525 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
-#: src/msgfilter.c:476 src/msgfmt.c:775 src/msggrep.c:623 src/msginit.c:420
-#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
+#: src/hostname.c: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 "Informativt uddata:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help vis denne hjlp og afslut\n"
-#: 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 " -V, --version vis versionsinformation og afslut\n"
@@ -917,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: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 "Rapportr fejl p engelsk til <bug-gnu-gettext@gnu.org>.\n"
@@ -930,30 +930,27 @@ msgstr "Rapportr fejl p engelsk til <bug-gnu-gettext@gnu.org>.\n"
msgid "could not get host name"
msgstr "kunne ikke hente vrtsnavn"
-#: 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 "Hjst n inddatalinje tilladt"
-#: 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 "%s og %s udelukker hinanden"
-#: 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 "Brug: %s [TILVALG] [INDDATAFIL]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -962,10 +959,10 @@ msgstr ""
"Filtrerer beskederne i et beskedskatalog efter deres attributter og\n"
"manipulerer attributterne.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c: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"
@@ -974,52 +971,52 @@ msgstr ""
"tilsvarende\n"
"korte tilvalg.\n"
-#: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
-#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
-#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
-#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
+#: src/msgattrib.c:433 src/msgcat.c: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 "Placering for indfil:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " INFIL PO-indfil\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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 " -D, --directory=KATALOG sg ogs efter indfiler i KATALOG\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c: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 "Hvis ingen indfil er givet eller hvis den er -, lses standard-ind.\n"
-#: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
-#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
-#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
-#: src/xgettext.c:857
+#: src/msgattrib.c:442 src/msgcat.c: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 "Placering af uddatafil:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 " -o, --output-file=FIL uddata skrives til FIL\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1028,12 +1025,12 @@ msgstr ""
"Resultaterne udskrives til standard-uddata hvis ingen uddatafil er angivet,\n"
"eller hvis den er angivet til - .\n"
-#: 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 "Meddelelsevalg:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
@@ -1041,7 +1038,7 @@ msgstr ""
" --translated behold oversatte, fjern uoversatte "
"meddelelser\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
@@ -1049,57 +1046,57 @@ msgstr ""
" --translated behold uoversatte, fjern oversatte "
"meddelelser\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr ""
" --no-fuzzy fjern meddelelser markerede som 'fuzzy'\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr ""
" --only-fuzzy behold meddelelser markerede som 'fuzzy'\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete fjern forldede #~ meddelelser\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete behold forldede #~ meddelelsen\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Attributmanipulation:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr " --set-fuzzy markr alle meddelelser som 'fuzzy'\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr ""
" --clear-fuzzy fjern 'fuzzy'-markering fra alle meddelelser\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr " --set-obsolete markr alle meddelelser som forldede\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr ""
" --clear-obsolete fjern forldelsesmarkering fra alle "
"meddelelser\n"
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, fuzzy, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
@@ -1108,7 +1105,7 @@ msgstr ""
" --previous behold tidligere 'msgid' for oversatte "
"meddelelser\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
@@ -1116,49 +1113,56 @@ msgid ""
msgstr ""
" --clear-previous fjern 'previous msgid' fra alle meddelelser\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, fuzzy, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+" --no-fuzzy fjern meddelelser markerede som 'fuzzy'\n"
+
+#: src/msgattrib.c:482
#, 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:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
msgstr ""
" --ignore-file=FIL.po bearbejd kun poster som ikke findes i FIL.po\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr " --fuzzy samme som --only-fuzzy --clear-fuzzy\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
msgstr ""
" --obsolete samme 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
-#: 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 "Syntaks p indfil:\n"
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr " -P, --properties-input indfil har 'Java .properties'-syntaks\n"
-#: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
-#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c: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 "
@@ -1167,17 +1171,17 @@ msgstr ""
" --stringtable-input indfil har NeXTstep/GNUstep '.strings'-"
"syntaks\n"
-#: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
-#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
-#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
-#: src/xgettext.c:946
+#: src/msgattrib.c:498 src/msgcat.c: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 "Resultatdetaljer:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1192,16 +1196,16 @@ msgstr ""
"'auto'\n"
" eller 'html'.\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=STILSKABELON angiv CSS stilskabelnfil for --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
+#: 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"
@@ -1209,9 +1213,9 @@ msgstr ""
" -e, --no-escape brug ikke C-kontrolsekvenser i resultatet\n"
" (normaltilstand)\n"
-#: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
-#: src/msguniq.c:390 src/xgettext.c:956
+#: src/msgattrib.c:508 src/msgcat.c: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"
@@ -1219,28 +1223,28 @@ msgstr ""
" -E, --escape brug C-kontrolsekvenser i resultatet, men\n"
" ikke \\v eller \\a\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr " --force-po skriv PO-fil selv hvis den er tom\n"
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr " -i, --indent lav indrykningsstl i .po-fil\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
" --no-location skriv ikke linjer med '#: filnavn:linje'\n"
-#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:964
+#: src/msgattrib.c:516 src/msgcat.c: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"
@@ -1248,39 +1252,39 @@ msgstr ""
" -n, --add-location skriv linjer med '#: filnavn:"
"linje' (normaltilstand)\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
+#: src/xgettext.c:989
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr " --strict strikt Uniforum-format p resultatet\n"
-#: src/msgattrib.c:511 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
-#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
-#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
+#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
+#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output skriv en 'Java .properties'-fil\n"
-#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
-#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
" --stringtable-output 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
-#: 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 " -w, --width=ANTAL st sidebredde for uddata\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c: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"
@@ -1289,31 +1293,31 @@ msgstr ""
" --no-wrap ombryd ikke lange beskeder, lngere end\n"
" uddatasidens bredde, til flere linjer\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output sortr resultatet\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 " -F, --sort-by-file sortr resultatet efter filposition\n"
-#: 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 "Umuligt udvlgelseskriterium angivet (%d < n < %d)"
-#: 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 "Brug: %s [TILVALG] [INDDATAFIL]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, fuzzy, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1335,23 +1339,23 @@ msgstr ""
"men hvis --use-first er angivet, vil de blive taget fra den frste PO-fil,\n"
"der definerer dem. Filpositioner fra alle PO-filer sammenbringes.\n"
-#: 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 " INFIL ... indfiler\n"
-#: 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 " -f, --files-from=FIL ls 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: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 "Hvis indfil er -, lses standard ind.\n"
-#: 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"
@@ -1360,7 +1364,7 @@ msgstr ""
" -<, --less-than=ANTAL skriv meddelelser med mindre end ANTAL\n"
" definitioner. Standardvrdi: uendeligt\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1369,7 +1373,7 @@ msgstr ""
" ->, --more-than=ANTAL skriv meddelelser med mere end ANTAL\n"
" definitioner. Standardvrdi: 0\n"
-#: 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"
@@ -1378,16 +1382,16 @@ msgstr ""
" -u, --unique samme som --less-than=2, anfordrer at\n"
" kun unikke meddelelser skrives\n"
-#: 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 ""
" -P, --properties-input indfiler har 'Java .properties'-syntaks\n"
-#: 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"
@@ -1396,12 +1400,12 @@ msgstr ""
" --stringtable-input indfiler har NeXTstep/GNUstep '.strings'-"
"syntaks\n"
-#: 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 " -t, --to-code=NAVN kodning for resultatet\n"
-#: 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"
@@ -1410,28 +1414,28 @@ msgstr ""
" --use-first anvend frst fundne oversttelse for hver\n"
" meddelelse, sammenflet ikke oversttelser\n"
-#: 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 " --lang=KATALOGNAVN st 'Language'-feltet i hovedet\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "ingen filer angivet som inddata"
-#: 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 "der krves netop to inddatafiler"
-#: 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 "Brug: %s [TILVALG] gammel.po ny.pot\n"
@@ -1465,19 +1469,19 @@ msgstr " def.po oversttelser\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot referencer til kildetekst\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "Bearbejdningsvarianter:\n"
-#: 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 " -m, --multi-domain brug ref.pot til hvert domne i def.po\n"
-#: 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 " -N, --no-fuzzy-matching brug ikke uprcis sammenligning\n"
@@ -1502,17 +1506,17 @@ msgstr "advarsel: denne tekst er uoversat"
msgid "this message needs to be reviewed by the translator"
msgstr "denne meddelelse br gennemses af overstteren"
-#: 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 "denne tekst bruges, men er ikke erklret..."
-#: 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 "...men denne tekst ligner"
-#: 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 "denne tekst er brugt, men ikke erklret i %s"
@@ -1522,19 +1526,19 @@ msgstr "denne tekst er brugt, men ikke erklret i %s"
msgid "warning: this message is not used"
msgstr "advarsel: denne tekst bliver ikke brugt"
-#: 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] "fandt %d fatal fejl"
msgstr[1] "fandt %d fatale fejl"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "Mindst to filer skal angives"
-#: src/msgcomm.c:363
+#: src/msgcomm.c:364
#, fuzzy, c-format, no-wrap
msgid ""
"Find messages which are common to two or more of the specified PO files.\n"
@@ -1554,7 +1558,7 @@ msgstr ""
"men kun fra den frste PO-fil, der definerer dem. Filpositioner fra alle PO-filer\n"
"vil blive sammenbragt.\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1563,70 +1567,70 @@ msgstr ""
" ->, --more-than=ANTAL skriv meddelelser med mere end ANTAL\n"
" definitioner. Standardvrdi: 1\n"
-#: src/msgcomm.c:451 src/xgettext.c:981
+#: src/msgcomm.c:452 src/xgettext.c:1004
#, fuzzy, c-format
msgid ""
" --omit-header don't write header with 'msgid \"\"' entry\n"
msgstr " --omit-header udskriv ikke hovedet med 'msgid \"\"'\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr "Konverterer et beskedskatalog til en anden tegnkodning.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Konverteringsml:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Standardindkodning er nuvrende locales indkodning.\n"
-#: 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 " -i, --indent lav indrykningsstl i resultatet\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
" --no-location skriv ikke linjer med '#: filnavn:linje'\n"
-#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
-#: src/msgmerge.c:583
-#, c-format
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
+#: src/msgmerge.c:588
+#, fuzzy, c-format
msgid ""
-" --add-location preserve '#: filename:line' lines (default)\n"
+" -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
" --add-location bevar linjer med '#: filnavn:"
"linje' (normaltilstand)\n"
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
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:649
+#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
#, c-format
msgid "no input file given"
msgstr "ingen inddatafil angivet"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "der krves prcist n inddatafil"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Brug: %s [FLAG] INDFIL\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1638,7 +1642,7 @@ msgstr ""
"engelske PO-fil eller en PO-skabelonsfil (normalt lavet med xgettext).\n"
"Uoversatte poster gives en oversttelse som er identisk med msgid.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " INFIL PO- eller POT-indfil\n"
@@ -1678,7 +1682,7 @@ msgstr ""
"af et nultegn. Uddata for 'msgexec 0' er brugbart som inddata for\n"
"'xargs -O'\n"
-#: src/msgexec.c:281 src/msgfilter.c:401
+#: src/msgexec.c:281 src/msgfilter.c:420
#, c-format
msgid " -i, --input=INPUTFILE input PO file\n"
msgstr " -i, --input=INFIL PO-indfil\n"
@@ -1688,27 +1692,27 @@ msgstr " -i, --input=INFIL PO-indfil\n"
msgid "write to stdout failed"
msgstr "skrivning til standard ud mislykkedes"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "filternavn mangler"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr "mindst et sed-skript skal angives"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Brug: %s [FLAG] FILTER [FILTERFLAG]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "Udfrer et filter p alle oversttelser i et beskedskatalog.\n"
-#: 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"
@@ -1717,12 +1721,12 @@ msgstr ""
"FILTER kan vre hvilket som helst program som lser en oversttelse fra\n"
"standard ind og skriver den ndrede oversttelse til standard ud.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "Brugbare FILTERFLAG nr FILTER er 'sed':\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
@@ -1730,7 +1734,7 @@ msgstr ""
" -e, --expression=SKRIPT tilfj SKRIPT til kommandoerne som skal "
"udfres\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1741,7 +1745,7 @@ msgstr ""
"kommandoerne\n"
" som skal udfres\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
@@ -1749,7 +1753,7 @@ msgstr ""
" -n, --quiet, --silent undertryk automatisk udskrift af "
"mnsteromrdet\n"
-#: 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"
@@ -1757,94 +1761,115 @@ msgstr ""
" --no-escape brug ikke C-kontrolsekvenser i resultatet\n"
" (normaltilstand)\n"
-#: 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 " --indent lav indrykningsstl i resultatet\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
msgstr ""
" --keep-header bevar headerlinjer undrede, filtrr dem ikke\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "argumentet til %s br vre et enkelt skilletegn"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
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:605
+#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
msgid "Ulrich Drepper"
msgstr "Ulrich Drepper"
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:439
+#, fuzzy, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr "Hvis ingen indfil er givet eller hvis den er -, lses standard-ind.\n"
+
+#: 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 "%s krver at '-d katalog' angives"
-#: 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 "%s krver en '-l lokale'-angivelse"
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:538
+#, fuzzy, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s krver en '-l lokale'-angivelse"
+
+#: src/msgfmt.c:545
+#, fuzzy, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s krver en '-l lokale'-angivelse"
+
+#: src/msgfmt.c:551
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s og %s udelukker hinanden"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s er kun gyldig med %s eller %s"
-#: 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 "%s er kun gyldig med %s, %s eller %s"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d oversat tekst"
msgstr[1] "%d oversatte tekster"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d uafklaret oversttelse"
msgstr[1] ", %d uafklarede oversttelser"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d uoversat tekst"
msgstr[1] ", %d uoversatte tekster"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Brug: %s [FLAG] filnavn.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
"Generr binrt tekstkatalog fra oversttelsebeskrivelse i kildetekst.\n"
-#: 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"
@@ -1854,17 +1879,17 @@ msgstr ""
"korte tilvalg.\n"
"Tilvarende glder for valgfri argumenter.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
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:890
+#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Krselstilstand:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1873,7 +1898,7 @@ msgstr ""
" -j, --java Javatilstand: generr en Java ResourceBundle-"
"klasse\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1882,12 +1907,12 @@ msgstr ""
" --java2 som --java, og antag Java2 (JDK 1.2 eller "
"hjere)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr " --csharp C#-tilstand: generr en .NET .dll-fil\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -1896,7 +1921,7 @@ msgstr ""
" --csharp-resources C#-ressurcetilstand: generr en .NET ."
"resources-fil\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -1904,33 +1929,39 @@ msgstr ""
" --tcl Tcl-tilstand: generr en .msg-fil af tcl/"
"msgcat-type\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt Qt-tilstand: generr en Qt .qm-fil\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, fuzzy, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr " --qt Qt-tilstand: generr en Qt .qm-fil\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict strikt Uniforum-format p resultatet\n"
-#: 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 "Hvis UDFIL er -, skrives resultatet til standard ud.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Placering af uddatafil i Javatilstand:\n"
-#: 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 " -r, --resource=RESSOURCE ressourcenavn\n"
-#: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
-#: src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c: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 "
@@ -1938,13 +1969,22 @@ msgid ""
msgstr ""
" -l, --locale=LOCALE localenavn, enten sprog eller sprog_LAND\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, fuzzy, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --tcl Tcl-tilstand: inddata er en tcl/msgcat .msg-"
+"fil\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr " -d KATALOG startkatalog for klassers katalogtr\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1956,12 +1996,12 @@ msgstr ""
"adskilt med en understreg. Flaget -d er obligatorisk. Klassen skrives\n"
"i det opgivne katalog.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "Placering for udfil i C#-tilstand:\n"
-#: 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 "
@@ -1969,7 +2009,7 @@ msgid ""
msgstr ""
" -d KATALOG startkatalog for localeafhngige .dll-filer\n"
-#: 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"
@@ -1978,18 +2018,18 @@ msgstr ""
"Flagene -l og -d er obligatoriske. .dll filen bliver skrevet i et\n"
"underkatalog af det angivne katalog, hvis navn afhnger af localet.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Placering for udfil i Tcl-tilstand:\n"
-#: 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 ""
" -d KATALOG startkatalog for .msg-meddelelsekataloger\n"
-#: 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"
@@ -1998,12 +2038,45 @@ msgstr ""
"Flagene -l og -d er obligatoriske. .msg filen bliver skrevet i det\n"
"angivne katalog.\n"
-#: 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
+#, fuzzy, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr ""
+" -d KATALOG startkatalog for .msg-meddelelsekataloger\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -kORD, --keyword[=ORD] sg efter ORD som et ekstra ngleord\n"
+" -k, --keyword brug ikke standardngleord\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "Tolkning af indfil:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -2014,13 +2087,13 @@ msgstr ""
" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format kontrollr sprogafhngige formatstrenge\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -2029,7 +2102,7 @@ msgstr ""
" --check-header verificr tilstedevrelse og indhold af "
"headerlinjen\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -2039,7 +2112,7 @@ msgstr ""
"domnedirektiver\n"
" og flaget --output-file\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2048,7 +2121,7 @@ msgstr ""
" -C, --check-compatibility kontrollr at GNU msgfmt opfrer sig som\n"
" X/Open msgfmt\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -2059,19 +2132,19 @@ msgstr ""
"kortvejskommandoer\n"
" for menuer\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr " -f, --use-fuzzy brug uprcise poster i resultatet\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
" -a, --alignment=TAL lg strenge p lige TAL byte (normalt: %d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2080,87 +2153,97 @@ 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 " --no-hash binrfil indholder ikke hashtabellen\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics udskriv statistik om oversttelserne\n"
-#: 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 ""
" -v, --verbose g mngden af information i meddelelsen\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "advarsel: PO-filhoved mangler eller ugyldigt\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "advarsel: tegnstskonvertering vil ikke virke\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "advarsel: PO-filhoved er uafklaret\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "advarsel: ldre versioner af msgfmt vil give en fejl for dette\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domnet '%s' kan ikke bruges som filnavn"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domnet '%s' er ikke brugbart som filnavn. Vil bruge prfiks istedet"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "'domain %s' directive ignored"
msgstr "'domain %s'-kommando ignoreres"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, fuzzy, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "tom 'msgstr'-kommando ignoreret"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, fuzzy, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "'fuzzy' 'msgstr'-tekst ignoreret"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr ""
"%s: advarsel: kildetekstfilen indeholder uafklarede oversttelser (fuzzy)"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c: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 "fejl ved lsning af '%s'"
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2169,7 +2252,7 @@ msgstr ""
"flaget '%c' kan ikke bruges frend 'J' eller 'K' eller 'T' eller 'C' eller "
"'X' er blevet angivet"
-#: 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"
@@ -2178,7 +2261,7 @@ msgstr ""
"Udtrkker alle beskeder i et beskedskatalog som matcher et vist\n"
"mnster eller hrer til en given kildetekstfil.\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2254,7 +2337,7 @@ msgstr ""
" -v, --invert-match udskriv kun de beskeder som ikke matcher\n"
" noget udvlgelseskriterium.\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2262,12 +2345,12 @@ msgstr ""
" --escape brug C-kontrolsekvenser i resultatet, men\n"
" ikke \\v eller \\a\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output sortr resultatet\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file sortr resultatet efter filposition\n"
@@ -2428,7 +2511,7 @@ msgstr "mltegnst '%s' er ikke et portabelt kodningsnavn"
#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:3051
+#: src/xgettext.c:544 src/xgettext.c:3418
#, c-format
msgid "warning: "
msgstr "advarsel: "
@@ -2636,17 +2719,17 @@ msgstr "flertalsbehandling er en GNU gettext-udvidelse"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr mangler mrket '%c' for tastaturgenvej"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr har for mange mrker '%c' for tastaturgenveje"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, fuzzy, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "feltet '%s' i hovedet har stadig den oprindelige standardvrdi\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, fuzzy, c-format
msgid "header field '%s' missing in header\n"
msgstr "feltet '%s' mangler i hovedet\n"
@@ -2667,7 +2750,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
msgstr "indfilen mangler en indgang i hovedet med angivelse af tegnst"
#: 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 "
@@ -2686,7 +2769,7 @@ msgstr ""
"forskellige bliver ens."
#: 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 "
@@ -2695,16 +2778,16 @@ msgstr ""
"Kan ikke konvertere fra '%s' til '%s'. %s bygger p iconv(). Denne version "
"er bygget uden iconv()."
-#: 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 "%s er kun gyldig med %s"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr "sikkerhedskopitype"
-#: 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"
@@ -2728,19 +2811,19 @@ msgstr ""
"overensstemmelse, vil 'ls sgning' (fuzzy matching) blive brugt til at give\n"
"bedre resultater.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
" def.po oversttelser som refererer til gamle "
"kildetekster\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot referencer til ny kildetekst\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2749,7 +2832,7 @@ msgstr ""
" -C, --compendium=FIL yderligere kataloger med oversttelser,\n"
" kan angives flere gange\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2759,27 +2842,27 @@ msgstr ""
" gr ingenting hvis def.po allerede er "
"opdateret\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Placering af udfil i opdateringstilstand:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Resultatet skrives tilbage til def.po.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=KONTROL lav en sikkerhedskopi af def.po\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=ENDELSE brug en anden endelse end den normale\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2798,7 +2881,7 @@ msgstr ""
"ellers simple\n"
" simple, never lav altid simple sikkerhedskopier\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, fuzzy, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2809,7 +2892,7 @@ msgstr ""
"eller\n"
"miljvariablen SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
@@ -2817,22 +2900,22 @@ msgstr ""
" --previous behold tidligere 'msgid' for oversatte "
"meddelelser\n"
-#: 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 " -q, --quiet, --silent vis ikke forlbsindikatorer\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
msgstr "denne tekst burde definere flertalsformer"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
msgstr "denne tekst burde ikke definere flertalsformer"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2841,7 +2924,7 @@ msgstr ""
"%sLste %ld gamle + %ld reference, flettede %ld, uafklarede %ld, mangler "
"%ld, forldede %ld.\n"
-#: 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"
@@ -2952,7 +3035,7 @@ msgstr " -i, --indent lav indrykningsstl i resultatet\n"
msgid " --strict write strict uniforum style\n"
msgstr " --strict strikt Uniforum-format p resultatet\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -2974,12 +3057,12 @@ msgstr ""
"oversttelse. Filpositioner samles sammen.\n"
"Nr flaget --unique angives fjernes alle gentagede.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated skriv kun gentagede beskeder\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -3048,27 +3131,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "inkonsistent brug af #~"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, fuzzy, c-format
msgid "missing 'msgstr[]' section"
msgstr "'msgstr[]'-afsnit mangler"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, fuzzy, c-format
msgid "missing 'msgid_plural' section"
msgstr "'msgstr_plural'-afsnit mangler"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, fuzzy, c-format
msgid "missing 'msgstr' section"
msgstr "'msgstr'-afsnit mangler"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "frste flertalsform har indeks, der ikke er nul"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "flertalsform har forkert indeks"
@@ -3078,7 +3161,7 @@ msgstr "flertalsform har forkert indeks"
msgid "too many errors, aborting"
msgstr "afbryder krslen p grund af for mange fejl"
-#: 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 "Ugyldig multibytesekvens"
@@ -3122,16 +3205,16 @@ 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:1023
+#: src/read-catalog.c:318 src/xgettext.c:1046
#, c-format
msgid "this file may not contain domain directives"
msgstr "denne fil m ikke indeholde 'domain'-kommandoer"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "tekst erklret mere end en gang"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "dette er placeringen af den frste erklring"
@@ -3333,19 +3416,19 @@ msgstr "oversttelse af C?-klasse mislykkedes, prv gerne --verbose"
msgid "compilation of C# class failed"
msgstr "oversttelse af C#-klasse mislykkedes"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "ikke et gyldigt Java-klassenavn: %s"
-#: 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 ""
"oversttelse af Java-klasse mislykkedes, prv gerne --verbose eller st "
"$JAVAC"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr "oversttelse af Java-klasse mislykkedes, prv gerne at stte $JAVAC"
@@ -3355,13 +3438,13 @@ msgstr "oversttelse af Java-klasse mislykkedes, prv gerne at stte $JAVAC"
msgid "error while opening \"%s\" for writing"
msgstr "fejl opstet ved skrive-bning af '%s'"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, fuzzy, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr "oversttelige tekster m ikke indeholde `\\%c'-escapesekvensen"
-#: 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"
@@ -3374,7 +3457,7 @@ msgstr ""
"som er et andet end dit. Forsg at bruge en ren ASCII-msgctxt i stedet.\n"
"%s\n"
-#: 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"
@@ -3453,7 +3536,7 @@ msgstr ""
"beskedkatalog har oversttelser med flertalsformer,\n"
"men Tcl-formatet for beskedskataloger understtter ikke flertalsformer\n"
-#: 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 "%s:%d: advarsel: streng ikke afsluttet"
@@ -3463,17 +3546,22 @@ msgstr "%s:%d: advarsel: streng ikke afsluttet"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: advarsel: regulrt udtryk ikke afsluttet"
-#: 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
+#, fuzzy, c-format
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: advarsel: ugyldigt UCS-tegn"
+
+#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: advarsel: tegnkonstant ikke afsluttet korrekt"
-#: 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 "%s:%d: advarsel: strengkonstant ikke afsluttet"
-#: 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 "Angiv venligst indkodning af kildetekst via --from-code."
@@ -3527,7 +3615,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:1335
+#: src/x-csharp.c:1390 src/x-python.c:1138
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: advarsel: ugyldigt UCS-tegn"
@@ -3547,22 +3635,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: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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3626,11 +3714,21 @@ msgstr ""
"%s:%d: Ugyldig multibyte-sekvens.\n"
"Angiv venligst indkodning af kildetekst via --from-code.\n"
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, fuzzy, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: advarsel: ugyldigt UCS-tegn"
+
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: advarsel: streng ikke afsluttet"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3758,34 +3856,39 @@ msgstr ""
"%s:%lu: advarsel: syntaksen $\"...\" vil fremover blive fjernet af "
"sikkerhedsrsager; brug eval_gettext i stedet"
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, fuzzy, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: advarsel: strengkonstant ikke afsluttet"
-#: src/xgettext.c: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 ""
"--join-existing kan ikke benyttes nr uddata sendes til standard-uddata"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext kan ikke arbejde uden nogen ngleord at kigge efter"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, fuzzy, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr ""
"advarsel: ukendt type for fil `%s' med endelse `%s'; C benyttes i stedet"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "Udtrk oversttelige strenge fra givne indfiler.\n"
-#: src/xgettext.c:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3793,23 +3896,23 @@ msgid ""
msgstr ""
" -d, --default-domain=NAVN brug NAVN.po som udfil (i st.f. messages.po) \n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr " -o, --output=FIL skriv resultatet til FIL\n"
-#: 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 " -p, --output-dir=KATALOG udfiler placeres i kataloget KATALOG\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Valg af sprog for indfil\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, fuzzy, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3819,7 +3922,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=NAVN genkend det angivne sprog\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3829,19 +3932,19 @@ msgstr ""
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ kort skrivemde for --language=C++\n"
-#: 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 "Som standard antages sproget ud fra endelsen p inddatafilen.\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3850,23 +3953,23 @@ msgstr ""
" --from-code=NAVN kodning af inddatafiler\n"
" (undtagen for Python, Tcl, Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr "Som standard antages inddatafilerne at vre i ASCII.\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
" -j, --join-existing sammenflet meddelelser med eksisterende fil\n"
-#: 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 " -x, --exclude-file=FIL.po linjer fra FIL tages ikke ud\n"
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -3883,17 +3986,17 @@ msgstr ""
"ngleordslinjer\n"
" til resultatfilen\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Sprogspecifikke valg:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all uddrag alle strenge\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3907,16 +4010,21 @@ msgstr ""
"Java,\n"
" C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:937
+#, fuzzy, 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 ""
-" -kORD, --keyword[=ORD] sg efter ORD som et ekstra ngleord\n"
-" -k, --keyword brug ikke standardngleord\n"
+" (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:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3926,7 +4034,7 @@ msgstr ""
" --flag=ORD:NR:FLAG ekstra FLAG for strenge inde i argument\n"
" nummer NR for ngleord ORD\n"
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3940,71 +4048,71 @@ msgstr ""
"Java,\n"
" C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
" -T, --trigraphs behandl ISO C tretegnssekvenser i indfiler\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr " (kun sprogene C, C++, ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt genkend Qt-formatstrenge\n"
-#: 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 " (kun sproget C++)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --kde genkend KDE 4-formatstrenge\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --boost genkend Boost-formatstrenge\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
" --debug mere detaljeret genkendelse af formatstrenge\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output skriv en 'Java .properties'-fil\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr " --copyright-holder=STRENG st copyrightindehaver i resultatet\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
msgstr " --foreign-user udelad FSF-copyrighttekst i resultatet\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, c-format
msgid " --package-name=PACKAGE set package name in output\n"
msgstr " --package-name=PAKKE st pakkenavn i uddata\n"
-#: src/xgettext.c:989
+#: src/xgettext.c:1012
#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr " --package-version=VERSION st pakkeversion i uddata\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
@@ -4012,7 +4120,7 @@ msgstr ""
" --msgid-bugs-address=EPOST@ADRESSE st modtager for msgid-"
"fejlrapporter\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -4022,7 +4130,7 @@ msgstr ""
" -m[STRENG], --msgstr-prefix[=STRENG] indled oversatte strenge med STRENG "
"eller \"\"\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -4032,7 +4140,7 @@ msgstr ""
" -M[STRENG], --msgstr-suffix[=STRENG] afslut oversatte strenge med STRENG "
"eller \"\"\n"
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4040,31 +4148,31 @@ msgid ""
msgstr ""
"Et '--flag'-argument har ikke <ngleord>:<nummer>:[pass-]<flag> syntaks: %s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr "standard-inddata"
-#: src/xgettext.c:2020
+#: src/xgettext.c:2071
#, c-format
msgid "Non-ASCII character at %s%s."
msgstr "Ikke-ASCII-tegn ved %s%s."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr "Ikke-ASCII-kommentar ved eller fr %s%s."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr "Ikke-ASCII-streng ved %s%s."
-#: 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 "%s%s: advarsel: "
-#: 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 "
@@ -4073,7 +4181,7 @@ msgstr ""
"%s er ikke en gyldig formatstreng for %s selvom den bruges i en "
"formatstrengsposition. rsag: %s\n"
-#: 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: "
@@ -4082,7 +4190,7 @@ msgstr ""
"%s er ikke en gyldig formatstreng for %s selvom den er deklareret som en. "
"rsag: %s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4096,7 +4204,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:2232
+#: src/xgettext.c:2283
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
@@ -4106,28 +4214,28 @@ msgstr ""
"gettext(\"\") returnerer hovedet med metainformation,\n"
"ikke den tomme streng.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "flertydig argumentangivelse for ngleord '%.*s'"
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "advarsel: kontekst mangles for ngleordet '%.*s'"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr ""
"advarsel: kontekst mangles for flertalsargumentet til ngleordet '%.*s'"
-#: src/xgettext.c:2942
+#: src/xgettext.c:3052
#, c-format
msgid "context mismatch between singular and plural form"
msgstr "kontekst passer ikke mellem entals- og flertalsformen"
-#: src/xgettext.c:3052
+#: src/xgettext.c:3419
#, fuzzy
msgid ""
"The option --msgid-bugs-address was not specified.\n"
@@ -4140,7 +4248,7 @@ msgstr ""
"variablen MSGID_BUGS_ADDRESS dr; ellers angiv\n"
"tilvalget --msgid-bugs-address p kommandolinjen.\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, fuzzy, c-format
msgid "language '%s' unknown"
msgstr "ukendt sprog '%s'"
@@ -4149,8 +4257,7 @@ msgstr "ukendt sprog '%s'"
msgid "<unnamed>"
msgstr "<uden navn>"
-#, fuzzy
-#~ msgid "header field '%s' should start at beginning of line\n"
+#~ msgid "header field `%s' should start at beginning of line\n"
#~ msgstr "feltet '%s' i hovedet br starte ved linjens begyndelse\n"
#~ msgid "some header fields still have the initial default value\n"
diff --git a/gettext-tools/po/de.po b/gettext-tools/po/de.po
index 4063e6a..2f418e8 100644
--- a/gettext-tools/po/de.po
+++ b/gettext-tools/po/de.po
@@ -5,6 +5,7 @@
# Philipp Thomas <pth@suse.de>, 2012
# Ulrich Drepper <drepper@gnu.org>, 1995-1997.
# Jakob Kramer <jakob.kramer@gmx.de>, 2013.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
#
#
# Wörterbuch:
@@ -30,7 +31,9 @@
# accelerator: Accelerator (oder: Beschleuniger?)
# keyboard accelerator: Tastatur-Accelerator (oder T.-Beschleuniger,
# Tastenkürzel, Tastatur-Kürzel)
-#
+# Bitte *nicht* Beschleuniger! Ein »keyboard accelerator«
+# beschleunigt nichts, sondern stellt einen Schnellzugriff
+# bereit. -mb
# Host name/hostname - Rechnername
#
# I/O error - Ein/Ausgabefehler
@@ -45,7 +48,7 @@
# INPUTFILE - EINGABEDATEI (EINGABE_DATEI?)
# OUTPUTFILE - AUSGABEDATEI (AUSGABE_DATEI?)
# SOURCEFILE - QUELLDATEI (QUELL_DATEI?)
-# BACKUP - Sicherungskopie (-datei, Sicherheitsdatei, etc....)
+# BACKUP - Sicherungskopie (-datei, Sicherheitsdatei, etc....)
# CHAR - ZEICHEN
# SUFFIX - SUFFIX
# CONTROL - KONTROLLE (vgl. 'cp', Art der Sicherung); besser ART?
@@ -64,7 +67,7 @@
# PATTERN - MUSTER
# STRING - ZEICHENKETTE (KETTE oder ZKETTE?)
# WORD - WORT
-# DATE - DATUM
+# DATE - DATUM
# DOMAIN - BEREICH
# TEXTDOMAIN - TEXTBEREICH
# MSGID - SCHLÜSSEL (oder KENNUNG)
@@ -80,17 +83,18 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.18.2\n"
+"Project-Id-Version: GNU gettext-tools 0.19-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2014-05-10 18:01+0100\n"
+"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
#: gnulib-lib/argmatch.c:133
#, c-format
@@ -258,15 +262,15 @@ msgstr "ungültiges Argument source_version für compile_java_class"
msgid "invalid target_version argument to compile_java_class"
msgstr "ungültiges Argument target_version für compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c: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 "Fehler beim Anlegen von »%s«"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: 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 "Fehler beim Schreiben von Datei »%s«"
@@ -290,12 +294,12 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr "Subprozess %s mit Ein-/Ausgabefehler"
-#: 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 "virtueller Speicher aufgebraucht"
+msgstr "Speicher aufgebraucht"
#: gnulib-lib/pipe-filter-ii.c:192
#, c-format
@@ -303,7 +307,7 @@ msgid "creation of threads failed"
msgstr "Erstellung der Threads fehlgeschlagen"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "Schreiben zum Subprozess %s fehlgeschlagen"
@@ -311,7 +315,7 @@ msgstr "Schreiben zum Subprozess %s fehlgeschlagen"
#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
#, c-format
msgid "read from %s subprocess failed"
-msgstr "Lesen vorm Subprozess %s fehlgeschlagen"
+msgstr "Lesen vom Subprozess %s fehlgeschlagen"
#: gnulib-lib/pipe-filter-ii.c:298
#, c-format
@@ -328,7 +332,7 @@ msgstr "Kommunikation mit dem Subprozess %s fehlgeschlagen"
#: gnulib-lib/pipe-filter-ii.c:449
#, c-format
msgid "%s subprocess terminated with exit code %d"
-msgstr "Subprozess %s wurde mit dem Exitcode %d beendet"
+msgstr "Subprozess %s wurde mit dem Exit-Code %d beendet"
#. TRANSLATORS:
#. Get translations for open and closing quotation marks.
@@ -368,7 +372,7 @@ msgstr "Festlegung der Berechtigungen für %s"
#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
#, c-format
msgid "cannot create pipe"
-msgstr "Es ist nicht möglich, eine Pipe zu einzurichten"
+msgstr "Es ist nicht möglich, eine Pipe einzurichten"
#: gnulib-lib/w32spawn.h:43
#, c-format
@@ -393,8 +397,8 @@ 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: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 "Öffnen der Datei »%s« zum Lesen fehlgeschlagen"
@@ -491,14 +495,14 @@ msgstr ""
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"
-"'}'."
+"Die %u. Formatanweisung endet mit dem ungültigen Zeichen »%c« anstatt einer\n"
+"»}«."
#: 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 '}'."
+"Die %u. Formatanweisung endet mit einem ungültigen Zeichen anstatt einer »}«."
#: src/format-csharp.c:161 src/format-java.c:346
msgid ""
@@ -512,7 +516,7 @@ msgstr ""
#, c-format
msgid "The string contains a lone '}' after directive number %u."
msgstr ""
-"Die Zeichenkette beinhaltet eine einzelne '}' nach der %u. Formatanweisung."
+"Die Zeichenkette beinhaltet eine einzelne »}« nach der %u. Formatanweisung."
#: src/format-gcc-internal.c:255
#, c-format
@@ -669,7 +673,7 @@ msgstr ""
#: src/format-java.c:572
#, c-format
msgid "In the directive number %u, a choice contains no number."
-msgstr "In der %u. Formatanweisung beinhaltet eine Choice keine Zahl."
+msgstr "In der %u. Formatanweisung beinhaltet eine Auswahl keine Zahl."
#: src/format-java.c:583
#, c-format
@@ -677,8 +681,8 @@ 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."
+"In der %u. Formatanweisung beinhaltet eine Auswahl eine Zahl, der weder »<«, "
+"»#« noch »%s« folgt."
#: src/format-java.c:745
#, c-format
@@ -705,8 +709,8 @@ 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."
+"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
@@ -717,16 +721,16 @@ 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 "
+"In der %u. Formatanweisung sind zu viele Parameter angegeben; es wird "
"höchstens %u Parameter erwartet."
msgstr[1] ""
-"In der %u. Formatanweisung sind zo viele Parameter angegeben; es werden "
+"In der %u. Formatanweisung sind zu viele Parameter angegeben; es werden "
"höchstens %u Parameter erwartet."
#: src/format-lisp.c:2496 src/format-scheme.c:2499
#, c-format
msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr "In der %u. Formatanweisung folgt dem '%c' keine Ziffer."
+msgstr "In der %u. Formatanweisung folgt dem »%c« keine Ziffer."
#: src/format-lisp.c:2736 src/format-scheme.c:2754
#, c-format
@@ -737,13 +741,13 @@ msgstr "In der %u. Formatanweisung ist das %d. Argument negativ."
msgid "The string ends in the middle of a ~/.../ directive."
msgstr "Die Zeichenkette endet mitten in einer ~/.../-Anweisung."
-# Bezieht sich auf Klammenpaare -ke-
+# Bezieht sich auf Klammernpaare -ke-
#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
#, c-format
msgid "Found '~%c' without matching '~%c'."
-msgstr "'~%c' ohne zugehörige '~%c' gefunden."
+msgstr "»~%c« ohne zugehörige »~%c« gefunden."
#: src/format-lisp.c:2863 src/format-scheme.c:2860
#, c-format
@@ -756,14 +760,14 @@ 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 '~;'."
+"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."
+"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."
@@ -779,7 +783,7 @@ msgstr "die Formatspezifikationen in »%s« und »%s« sind nicht gleichbedeuten
#, 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«"
+"die Formatspezifikationen in »%s« sind keine Untermenge von denen in »%s«"
#: src/format-perl.c:433
#, c-format
@@ -791,7 +795,7 @@ msgstr ""
"Konvertierungsspezifikation »%c« nicht kompatibel."
#: 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'"
@@ -819,14 +823,14 @@ 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"
+"Tupel"
#: src/format-python.c:437
#, c-format
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 "
+"die Formatspezifikationen in »%s« erwarten ein Tupel, die in »%s« jedoch "
"ein\n"
"Mapping"
@@ -844,32 +848,39 @@ msgstr ""
"Formatspezifikationen in »%s« und »%s« für Argument »%s« stimmen nicht "
"überein"
-#: src/format-python-brace.c:136
-#, fuzzy, c-format
+#: src/format-python-brace.c:137
+#, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "In der %u. Formatanweisung folgt dem '%c' keine Ziffer."
+msgstr ""
+"In der %u. Formatanweisung darf »%c« nicht mit einem Feldnamen beginnen."
-#: src/format-python-brace.c:149
-#, fuzzy, c-format
+#: src/format-python-brace.c:150
+#, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "In der %u. Formatanweisung folgt der »{« kein nummeriertes Argument."
+msgstr ""
+"In der %u. Formatanweisung darf »%c« nicht mit einem getattr-Argument "
+"beginnen."
-#: src/format-python-brace.c:164
-#, fuzzy, c-format
+#: src/format-python-brace.c:165
+#, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "In der %u. Formatanweisung folgt dem '%c' keine Ziffer."
+msgstr ""
+"In der %u. Formatanweisung darf »%c« nicht mit einem getitem-Argument "
+"beginnen."
-#: src/format-python-brace.c:184
-#, fuzzy, c-format
+#: src/format-python-brace.c:185
+#, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
msgstr ""
-"In der %u. Formatanweisung ist eine Genauigkeit vor »%c« nicht erlaubt."
+"In der %u. Formatanweisung ist in einem Formatbezeichner keine weitere "
+"Verschachtelung erlaubt."
-#: src/format-python-brace.c:210
-#, fuzzy, c-format
+#: src/format-python-brace.c:270
+#, c-format
msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "In der %u. Formatanweisung ist das %d. Argument negativ."
+msgstr ""
+"In der %u. Formatanweisung gibt es eine nicht terminierte Formatanweisung."
#: src/format-qt.c:152
#, c-format
@@ -878,13 +889,13 @@ msgid ""
"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"
+"»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."
+"Die Zeichenkette bezieht sich auf eine Shell-Variable mit einem Namen, der "
+"nicht ASCII-kodiert ist."
#: src/format-sh.c:81
msgid ""
@@ -914,8 +925,8 @@ 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."
+"In der %u. Formatanweisung ist das Zeichen »%c« keine Ziffer zwischen 1 und "
+"9."
#: src/format-ycp.c:91
#, c-format
@@ -926,11 +937,11 @@ msgstr ""
"Das Zeichen, das die %u. Formatanweisung terminiert, ist keine Ziffer "
"zwischen 1 und 9."
-#: src/hostname.c:178 src/msgattrib.c:344 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
-#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
-#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:599
+#: 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"
@@ -939,25 +950,25 @@ msgid ""
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
"Copyright © %s Free Software Foundation, Inc.\n"
-"Lizenz GPLv3: GNU GPL Version 3 oder später <http://gnu.org/licenses/gpl.html>\n"
+"Lizenz GPLv3: GNU GPL Version 3 oder neuer <http://gnu.org/licenses/gpl.html>\n"
"\n"
"Dies ist freie Software; es steht Ihnen frei, sie zu verändern und\n"
"weiterzugeben.\n"
-"Es gibt KEINE GARANTIE, soweit als vom Gesetz erlaubt.\n"
+"Es gibt KEINE GARANTIE, soweit gesetzlich zulässig.\n"
-#: 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 "Geschrieben von %s.\n"
#. 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 "Bruno Haible"
@@ -967,11 +978,11 @@ msgstr "Bruno Haible"
msgid "too many arguments"
msgstr "zu viele Argumente"
-#: 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 "»%s --help« gibt weitere Informationen.\n"
@@ -1011,29 +1022,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: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 "Informative Ausgabe:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help diese Hilfe anzeigen und beenden\n"
-#: 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 " -V, --version Versionsnummer anzeigen und beenden\n"
@@ -1042,11 +1053,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: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 ""
"Fehler bitte auf Englisch an <bug-gnu-gettext@gnu.org> melden.\n"
@@ -1057,32 +1068,29 @@ msgstr ""
#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
#, c-format
msgid "could not get host name"
-msgstr "es ist nicht möglich, den Rechnernamen (Hostname) herauszufinden"
+msgstr "es ist nicht möglich, den Rechnernamen (Hostname) zu ermitteln"
-#: 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 "höchstens eine Eingabedatei erlaubt"
-#: 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 "%s und %s schließen sich gegenseitig aus"
-#: 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 "Aufruf: %s [OPTION] [EINGABEDATEI]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -1091,10 +1099,10 @@ msgstr ""
"Meldungen eines Katalogs mit Übersetzungen anhand von Attributen filtern und\n"
"Attribute der Meldungen bearbeiten.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c: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"
@@ -1102,56 +1110,56 @@ msgstr ""
"Notwendige Argumente für Optionen in Langform sind auch für die Kurzform\n"
"notwendig.\n"
-#: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
-#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
-#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
-#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
+#: src/msgattrib.c:433 src/msgcat.c: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 "Angaben zu Eingabedateien:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " EINGABEDATEI PO-Eingabedatei\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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 ""
" -D, --directory=VERZ VERZ der Liste der Eingabedateien hinzufügen\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c: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 ""
"Wenn keine Eingabedatei oder »-« angegeben ist, wird die Standardeingabe\n"
"gelesen.\n"
-#: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
-#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
-#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
-#: src/xgettext.c:857
+#: src/msgattrib.c:442 src/msgcat.c: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 "Angaben zu Ausgabedateien:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 ""
" -o, --output-file=DATEI Ausgabe in die angegebene DATEI schreiben\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1161,133 +1169,141 @@ msgstr ""
"oder\n"
"»-« angegeben ist.\n"
-#: 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 "Auswahl der Meldungen:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
msgstr ""
" --translated übersetzte übernehmen, unübersetzte verwerfen\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
msgstr ""
" --untranslated unübersetzte übernehmen, übersetzte verwerfen\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr " --no-fuzzy mit »fuzzy« markierte verwerfen\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr " --only-fuzzy mit »fuzzy« markierte übernehmen\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete obsolete Meldungen (#~) verwerfen\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete obsolete Meldungen (#~) übernehmen\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Attribute verändern:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
-msgstr " --set-fuzzy alle Meldungen auf 'fuzzy' setzen\n"
+msgstr " --set-fuzzy alle Meldungen auf »fuzzy« setzen\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr ""
-" --clear-fuzzy »fuzzy«-Markierung von allen Meldungen "
+" --clear-fuzzy »fuzzy«-Markierung von allen Meldungen "
"entfernen\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
-msgstr " --set-obsolete alle Meldungen obsolet machen\n"
+msgstr " --set-obsolete alle Meldungen obsolet machen\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
-msgstr " --clear-obsolete alle Meldungen nicht-obsolet machen\n"
+msgstr " --clear-obsolete alle Meldungen nicht-obsolet machen\n"
-#: src/msgattrib.c:468
-#, fuzzy, c-format
+#: src/msgattrib.c:475
+#, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
" of translated messages.\n"
msgstr ""
-" --previous die vorherigen Schlüssel der übersetzten "
-"Meldungen\n"
-" beibehalten\n"
+" --previous wenn auf »fuzzy« gesetzt, die vorherigen "
+"Schlüssel\n"
+" der übersetzten Meldungen beibehalten\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
"messages\n"
msgstr ""
-" --clear-previous »previous msgid« von allen Meldungen "
+" --clear-previous »previous msgid« von allen Meldungen "
"entfernen\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+" --empty beim Entfernen der »fuzzy«-Markierung auch\n"
+" »msgstr« leeren\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
msgstr ""
-" --only-file=DATEI.po nur die Einträge manipulieren, die in DATEI."
+" --only-file=DATEI.po nur die Einträge manipulieren, die in DATEI."
"po\n"
" gelistet sind\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
msgstr ""
-" --ignore-file=DATEI.po nur die Einträge manipulieren, die in DATEI."
+" --ignore-file=DATEI.po nur die Einträge manipulieren, die in DATEI."
"po\n"
" nicht gelistet sind\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr ""
-" --fuzzy Synonym für »--only-fuzzy --clear-fuzzy«\n"
+" --fuzzy Synonym für »--only-fuzzy --clear-fuzzy«\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
msgstr ""
-" --obsolete Synonym für »--only-obsolete --clear-"
+" --obsolete Synonym für »--only-obsolete --clear-"
"obsolete«\n"
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c: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 "Syntax der Eingabedatei:\n"
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c: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"
@@ -1295,8 +1311,8 @@ msgstr ""
" -P, --properties-input Eingabedatei folgt der .properties-Syntax von\n"
" Java\n"
-#: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
-#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c: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 "
@@ -1305,17 +1321,17 @@ msgstr ""
" --stringtable-input Eingabedatei folgt der .strings-Syntax von\n"
" 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
-#: 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 "Details zur Ausgabe:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1327,140 +1343,143 @@ msgstr ""
"verwenden\n"
" --color=BEI Farben und andere Text-Attribute verwenden, "
"wenn BEI.\n"
-" Bei kann 'always', 'never', 'auto' oder 'html' "
+" Bei kann »always«, »never«, »auto« oder »html« "
"sein.\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr ""
-" --style=STYLEDATEI CSS-Datei mit Style-Regel für --color angeben\n"
+" --style=STILDATEI CSS-Datei mit Stil-Regel für --color angeben\n"
-#: src/msgattrib.c:497 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
-#: src/xgettext.c:954
+#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:977
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
msgstr ""
-" -e, --no-escape keine C-Escape-Sequenzen in Ausgabe verwenden\n"
+" -e, --no-escape keine C-Escape-Sequenzen in Ausgabe verwenden\n"
" (Vorgabe)\n"
-#: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
-#: src/msguniq.c:390 src/xgettext.c:956
+#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
msgstr ""
-" -E, --escape C-Escape-Sequenzen und keine erweiterten\n"
+" -E, --escape C-Escape-Sequenzen und keine erweiterten\n"
" Zeichen in Ausgabe verwenden\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
-" --force-po PO-Datei erstellen, auch wenn sie leer ist\n"
+" --force-po PO-Datei erstellen, auch wenn sie leer ist\n"
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
-msgstr " -i, --indent Ausgabe eingerückt darstellen\n"
+msgstr " -i, --indent Ausgabe eingerückt darstellen\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
-" --no-location Zeilen mit »#: Datei:Zeilennr.« nicht schreiben\n"
+" --no-location Zeilen mit »#: Datei:Zeilennr.« nicht "
+"schreiben\n"
-#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:964
+#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
+#: src/xgettext.c:987
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr ""
-" -n, --add-location Zeilen mit »#: Datei:Zeilennr.« erhalten "
+" -n, --add-location Zeilen mit »#: Datei:Zeilennr.« erhalten "
"(Vorgabe)\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
+#: src/xgettext.c:989
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
-" --strict .po-Datei streng nach Uniforum-Format erstellen\n"
+" --strict .po-Datei streng nach Uniforum-Format "
+"erstellen\n"
-#: src/msgattrib.c:511 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
-#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
-#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
+#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
+#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr ""
-" -p, --properties-output Datei in der .properties-Syntax von Java\n"
+" -p, --properties-output Datei in der .properties-Syntax von Java\n"
" ausgeben\n"
-#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
-#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
-" --stringtable-output eine ».strings«-Datei von Nextstep/Gnustep\n"
+" --stringtable-output eine ».strings«-Datei von Nextstep/Gnustep\n"
" erstellen\n"
-#: src/msgattrib.c:515 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
-#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
-#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:972
+#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
+#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr ""
-" -w, --width=ANZAHL Breite der Ausgabe auf ANZAHL Spalten festlegen\n"
+" -w, --width=ANZAHL Breite der Ausgabe auf ANZAHL Spalten "
+"festlegen\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c: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 ""
-" --no-wrap lange Zeilen in Meldungen, die länger als die\n"
-" Breite der Ausgabe sind, nicht auf mehrere\n"
-" Zeilen umbrechen\n"
+" --no-wrap lange Zeilen in Meldungen, die länger als die\n"
+" Breite der Ausgabe sind, nicht auf mehrere\n"
+" Zeilen umbrechen\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output sortierte Ausgabe erstellen\n"
+msgstr " -s, --sort-output sortierte Ausgabe erstellen\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 ""
-" -F, --sort-by-file Ausgabe gemäß Vorkommen in Dateien erstellen\n"
+" -F, --sort-by-file Ausgabe gemäß Vorkommen in Dateien erstellen\n"
-#: 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 "Auswahlkriterium nicht möglich (%d < n < %d)"
-#: 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 "Aufruf: %s [OPTION] [EINGABEDATEI]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1475,33 +1494,33 @@ msgid ""
msgstr ""
"PO-Dateien aneinanderfügen und zusammenziehen.\n"
"Meldungen suchen, die in zwei oder mehr der angegebenen PO-Dateien vorkommen.\n"
-"Wenn die Option »--more-than« verwendet wird, kann höheres Vorkommen gefordert\n"
+"Wenn die Option »--more-than« verwendet wird, kann häufigeres Vorkommen gefordert\n"
"werden, bevor Meldungen ausgegeben werden. Andererseits können mit\n"
-"»--less-than« nur Meldungen mit niedrigerem Vorkommen berücksichtigt werden\n"
+"»--less-than« nur Meldungen mit seltenerem Vorkommen berücksichtigt werden\n"
"(z. B. wird »--less-than=2« nur Meldungen ausgeben, die nur einmal vorkommen).\n"
"Übersetzungen, Kommentare, extrahierte Kommentare und Stellenangaben werden\n"
"kumuliert, außer wenn --use-first angegeben ist; in diesem Fall wird der\n"
"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:848
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr " EINGABEDATEI... Eingabedateien\n"
-#: 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 ""
" -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: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 "Wenn die Eingabedatei »-« ist, wird die Standardeingabe gelesen.\n"
-#: 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"
@@ -1510,7 +1529,7 @@ msgstr ""
" -<, --less-than=ANZAHL Meldungen mit weniger als ANZAHL Definitionen\n"
" anzeigen (Vorgabe: unendlich)\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1519,7 +1538,7 @@ msgstr ""
" ->, --more-than=ANZAHL Meldungen mit mehr als ANZAHL Definitionen\n"
" anzeigen (Vorgabe: 0)\n"
-#: 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"
@@ -1528,8 +1547,8 @@ msgstr ""
" -u, --unique Abkürzung für »--less-than=2«; Meldungen\n"
" anfordern, die nur einmal vorkommen\n"
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c: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"
@@ -1538,8 +1557,8 @@ msgstr ""
"von\n"
" Java\n"
-#: 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"
@@ -1549,44 +1568,44 @@ msgstr ""
"Syntax\n"
" für .strings\n"
-#: 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 " -t, --to-code=NAME Kodierung für die Ausgabe\n"
-#: 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 ""
-" --use-first die zuerst vorkommende Übersetzung für jede\n"
-" Meldung verwenden, nicht mehrere\n"
-" Übersetzungen zusammenziehen\n"
+" --use-first die zuerst vorkommende Übersetzung für jede\n"
+" Meldung verwenden, nicht mehrere\n"
+" Übersetzungen zusammenziehen\n"
-#: 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 ""
-" --lang=CATALOGNAME 'Language'-Feld in dem Kopfeintrag setzen\n"
+" --lang=KATALOGNAME »Language«-Feld in dem Kopfeintrag setzen\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "keine Eingabedateien angegeben"
-#: 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 "es werden genau zwei Eingabedateien benötigt"
-#: 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 "Aufruf: %s [OPTION] Def.po Ref.pot\n"
@@ -1601,14 +1620,14 @@ msgid ""
"you have translated each and every message in your program. Where an exact\n"
"match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
msgstr ""
-"Zwei .po-Dateien im Uniforum-Format vergleichen um zu sicherzustellen, dass\n"
+"Zwei .po-Dateien im Uniforum-Format vergleichen, um sicherzustellen, dass\n"
"beide die gleichen »msgid«-Einträge enthalten.\n"
-"Die Datei Def.po ist eine bereits vorhandene PO-Dateien mit den Übersetzungen.\n"
+"Die Datei Def.po ist eine bereits vorhandene PO-Datei mit den Übersetzungen.\n"
"Die Datei Ref.po ist die zuletzt erstellte PO- oder POT-Datei (Vorlage, i. A.\n"
-"von xgettext erstellt). Hiermit lässt sich also überprüfen, ob für das Programm\n"
-"notwendige Meldung übersetzt wurde. Wenn keine exakte Übereinstimmung gefunden\n"
-"wurde, wird mittels nicht-exakter Suche versucht, eine bessere Hilfestellung zu\n"
-"geben.\n"
+"von xgettext erstellt). Hiermit lässt sich also überprüfen, ob die für das\n"
+"Programm notwendigen Meldungen übersetzt wurden. Wenn keine exakte Überein-\n"
+"stimmung gefunden wurde, wird mittels nicht-exakter Suche versucht, eine bessere\n"
+"Hilfestellung zu geben.\n"
"\n"
#: src/msgcmp.c:232
@@ -1621,12 +1640,12 @@ msgstr " Def.po Übersetzungen\n"
msgid " ref.pot references to the sources\n"
msgstr " Ref.pot Referenzen auf die Quelldateien\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "Optionen, die Verarbeitungen modifizieren:\n"
-#: 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."
@@ -1634,7 +1653,7 @@ msgid ""
msgstr ""
" -m, --multi-domain Ref.pot auf jeden Bereich in Def.po anwenden\n"
-#: 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 " -N, --no-fuzzy-matching fuzzy-Übereinstimmung nicht verwenden\n"
@@ -1659,17 +1678,17 @@ msgstr "diese Meldung ist unübersetzt"
msgid "this message needs to be reviewed by the translator"
msgstr "diese Meldung muss vom Übersetzer geprüft werden"
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1505
#, c-format
msgid "this message is used but not defined..."
msgstr "diese Meldung kommt vor, ist aber nicht definiert..."
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1508
#, c-format
msgid "...but this definition is similar"
msgstr "...diese Definition ist ähnlich"
-#: 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 "diese Meldung kommt vor, ist aber in %s nicht definiert"
@@ -1679,19 +1698,19 @@ msgstr "diese Meldung kommt vor, ist aber in %s nicht definiert"
msgid "warning: this message is not used"
msgstr "Warnung: diese Meldung kommt nicht vor"
-#: src/msgcmp.c:553 src/msgfmt.c: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] "es ist %d fataler Fehler aufgetreten"
msgstr[1] "es sind %d fatale Fehler aufgetreten"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "es müssen mindestens zwei Dateien angegeben werden"
-#: 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"
@@ -1704,96 +1723,97 @@ msgid ""
"cumulated.\n"
msgstr ""
"Meldungen suchen, die in zwei oder mehr der PO-Dateien vorkommen.\n"
-"Wenn die Option »--more-than« verwendet wird, kann höheres Vorkommen gefordert\n"
-"werden, bevor Meldungen ausgegeben werden. Andererseits können mit\n"
-"»--less-than« nur Meldungen mit niedrigerem Vorkommen berücksichtigt werden\n"
+"Wenn die Option »--more-than« verwendet wird, kann häufigeres Vorkommen gefordert\n"
+"werden, bevor Meldungen ausgegeben werden. Andererseits können mit\n"
+"»--less-than« nur Meldungen mit seltenerem Vorkommen berücksichtigt werden\n"
"(z. B. wird »--less-than=2« nur Meldungen ausgeben, die nur einmal vorkommen).\n"
"Übersetzungen, Kommentare und extrahierte Kommentare werden beibehalten, aber\n"
"nur von der ersten PO-Datei, in der der entsprechende Eintrag vorkommt.\n"
"Stellenangaben der Meldungen in den Quellen werden für alle PO-Dateien\n"
"kumuliert.\n"
-#: 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 ""
-" ->, --more-than=ANZAHL Meldungen mit mehr als ANZAHL Definitionen\n"
+" ->, --more-than=ANZAHL Meldungen mit mehr als ANZAHL Definitionen\n"
" anzeigen (Vorgabe: 1)\n"
-#: 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 ""
-" --omit-header »msgid \"\"«-Eintrag im Kopfteil nicht "
+" --omit-header »msgid \"\"«-Eintrag im Kopfteil nicht "
"erstellen\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr ""
"Einen Katalog mit Übersetzungen in eine andere Zeichensatz-Kodierung\n"
"konvertieren.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Zielformat der Konvertierung:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr ""
-"Die Vorgabe für die Kodierung ist die Kodierung der aktuellen Lokale.\n"
+"Die Vorgabe für die Kodierung ist die Kodierung der aktuellen\n"
+"Spracheinstellung.\n"
-#: 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 " -i, --indent Ausgabe eingerückt darstellen\n"
+msgstr " -i, --indent Ausgabe eingerückt darstellen\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
-" --no-location Zeilen mit »#: Datei:Zeilennr.« nicht "
+" --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
+#: 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 ""
-" --add-location Zeilen mit »#: Datei:Zeilennr.« erhalten\n"
+" --add-location Zeilen mit »#: Dateiname:Zeilennr.« erhalten\n"
" (Vorgabe)\n"
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
-" --strict .po-Datei streng nach Uniforum-Format "
+" --strict .po-Datei streng nach Uniforum-Format "
"erstellen\n"
-#: 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 "Eingabedatei fehlt"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "es wird genau eine Eingabedatei benötigt"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Aufruf: %s [OPTION] EINGABEDATEI\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1806,7 +1826,7 @@ msgstr ""
"i. A. von xgettext erstellt). Unübersetzte Einträge bekommen eine Übersetzung\n"
"zugewiesen, die mit der msgid identisch ist.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " EINGABEDATEI PO- oder POT-Eingabedatei\n"
@@ -1843,11 +1863,11 @@ msgid ""
"A special builtin command called '0' outputs the translation, followed by a\n"
"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
msgstr ""
-"Der besondere eingebaute Befehl '0' gibt die Übersetzung aus, jeweils beendet\n"
+"Der besondere eingebaute Befehl »0« gibt die Übersetzung aus, jeweils beendet\n"
"von einem Nullbyte-Zeichen. Die Ausgabe von »msgexec 0« ist geeignet als\n"
"Eingabe für »xargs -0«.\n"
-#: 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 " -i, --input=EINGABEDATEI PO-Eingabedatei\n"
@@ -1857,29 +1877,29 @@ msgstr " -i, --input=EINGABEDATEI PO-Eingabedatei\n"
msgid "write to stdout failed"
msgstr "Schreiben nach Standardausgabe fehlgeschlagen"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "Name des Filters fehlt"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr "es muss mindestens ein sed-Skript angegeben werden"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Aufruf: %s [OPTION] FILTER [FILTER-OPTION]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr ""
"Einen Filter auf alle Übersetzungen eines Katalogs mit Übersetzungen "
"anwenden.\n"
-#: 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"
@@ -1890,19 +1910,19 @@ msgstr ""
"Standardausgabe\n"
"schreibt.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "Nützliche FILTER-OPTIONen, wenn »sed« der FILTER ist:\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
msgstr ""
" -e, --expression=SKRIPT SKRIPT den auszuführenden Befehlen hinzufügen\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1912,153 +1932,176 @@ msgstr ""
" -f, --file=SKRIPT_DATEI Inhalt der SKRIPT_DATEI den auszuführenden\n"
" Befehlen hinzufügen\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-" -n, --quiet, --silent \"Pattern-Space\" nicht automatisch ausgeben\n"
+" -n, --quiet, --silent »Pattern-Space« nicht automatisch ausgeben\n"
-#: 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 ""
-" --no-escape keine C-Escape-Sequenzen in Ausgabe\n"
-" verwenden (Vorgabe)\n"
+" --no-escape keine C-Escape-Sequenzen in Ausgabe\n"
+" verwenden (Vorgabe)\n"
-#: 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 " --indent Ausgabe eingerückt darstellen\n"
+msgstr " --indent Ausgabe eingerückt darstellen\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
msgstr ""
-" --keep-header Kopfeintrag unverändert übernehmen, nicht "
+" --keep-header Kopfeintrag unverändert übernehmen, nicht "
"filtern\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
-msgstr "das Argument für %s sollte ein einfaches Punktzeichen sein"
+msgstr "das Argument für %s sollte ein einzelnes Interpunktionszeichen sein"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
msgstr "ungültiger Endian-Wert: %s"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c: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 "Ulrich Drepper"
-#: 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 ""
+"Wenn %s und %s angegeben sind, sollte keine Eingabedatei angegeben werden"
+
+#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
#: src/msgunfmt.c:353
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s erfordert eine Angabe in der Art »-d Verzeichnis«"
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c: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 "%s erfordert eine Angabe in der Art »-l Lokale«"
+msgstr "%s erfordert eine Angabe in der Art »-l Spracheinstellung«"
+
+#: src/msgfmt.c:538
+#, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s erfordert eine Angabe in der Art »--template Vorlage«"
+
+#: src/msgfmt.c:545
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s erfordert eine Angabe in der Art »-o Datei«"
+
+#: src/msgfmt.c:551
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s und %s schließen sich in %s gegenseitig aus"
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s ist nur mit %s oder %s gültig"
-#: src/msgfmt.c: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 "%s ist nur mit %s, %s oder %s gültig"
#. 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 "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d übersetzte Meldung"
msgstr[1] "%d übersetzte Meldungen"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d ungenaue Übersetzung"
msgstr[1] ", %d ungenaue Übersetzungen"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d unübersetzte Meldung"
msgstr[1] ", %d unübersetzte Meldungen"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Aufruf: %s [OPTION] Datei.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
"Binären Katalog mit Meldungen aus der textuellen Übersetzung erstellen.\n"
-#: 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 ""
"Notwendige Argumente für Optionen in Langform sind auch für die Kurzform\n"
-"notwendig. Dies gilt in gleicher Weise für optionale Argumente.\n"
+"notwendig. Dies gilt in gleicher Weise für optionale Argumente.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
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:890
+#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Art der Verarbeitung:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
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"
+" -j, --java Java-Modus: eine ResourceBundle-Klasse für "
+"Java\n"
+" erstellen\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
"higher)\n"
msgstr ""
-" --java2 wie --java, aber Java2 (JDK 1.2 oder höher) "
+" --java2 wie --java, aber Java2 (JDK 1.2 oder höher) "
"annehmen\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr ""
" --qt C#-Modus: eine .dll-Datei für .NET erstellen\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -2067,63 +2110,82 @@ msgstr ""
" --csharp-resources C#-Ressourcenmodus: eine .resources-Datei für\n"
" .NET erstellen\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
-" --tcl Tcl-Modus: eine .msg-Datei für tcl/msgcat "
+" --tcl Tcl-Modus: eine .msg-Datei für tcl/msgcat "
"erstellen\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
-msgstr " --qt Qt-Modus: eine .qm-Datei für Qt erstellen\n"
+msgstr ""
+" --qt Qt-Modus: eine .qm-Datei für Qt erstellen\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+" --desktop Desktopeintrag-Modus: erzeugt eine .desktop-"
+"Datei\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
" --strict Datei streng nach Uniforum-Format erstellen\n"
-#: 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 ""
"Ergebnisse werden nach der Standardausgabe geschrieben, wenn »-« angegeben "
"ist.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Angaben zu Ausgabedateien im Java-Modus:\n"
-#: 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 " -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
+#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
+#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr ""
-" -l, --locale=LOKALE Name der Lokale, entweder »sprache« (z. B. "
-"»de«)\n"
-" oder »sprache_LAND\" (z. B. »de_DE«)\n"
+" -l, --locale=LOKALE Name der Spracheinstellung, entweder "
+"»Sprache«\n"
+" (z. B. »de«) oder »Sprache_LAND\" (z. B. "
+"»de_DE«)\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --source erstellt eine .java-Datei anstelle einer ."
+"class-Datei\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
" -d VERZEICHNIS Basis-Verzeichnis der Verzeichnis-Hierarchie "
"mit\n"
-" den Klassen\n"
+" den Klassen\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2131,29 +2193,30 @@ msgid ""
"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"
-"»-d« ist notwendig. Die Klasse wird unter dem angegebenen Verzeichnis\n"
+"Der Name der Klasse wird durch das Anhängen des Namens der Spracheinstellung "
+"an\n"
+"den Namen der Ressource festgelegt, abgetrennt durch einen Unterstrich "
+"(»_«).\n"
+"Die Option »-d« ist notwendig. Die Klasse wird unter dem angegebenen "
+"Verzeichnis\n"
"geschrieben.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "Angaben zu Ausgabedateien im C#-Modus:\n"
-#: 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 ""
-" -d VERZEICHNIS Basis-Verzeichnis der von der Lokale "
-"abhängigen\n"
-" .dll-Dateien\n"
+" -d VERZEICHNIS Basis-Verzeichnis der von der "
+"Spracheinstellung\n"
+" abhängigen .dll-Dateien\n"
-#: 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"
@@ -2162,21 +2225,21 @@ msgstr ""
"Die Optionen »-l« und »-d« sind notwendig. Die .dll-Datei wird in ein\n"
"Unterverzeichnis des angegebenen Verzeichnisses geschrieben, dessen Name "
"von\n"
-"der Lokale abhängig ist.\n"
+"der Spracheinstellung abhängig ist.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Angaben zu Ausgabedateien im Tcl-Modus:\n"
-#: 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 ""
" -d VERZEICHNIS Basis-Verzeichnis der .msg-Kataloge mit "
"Meldungen\n"
-#: 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"
@@ -2185,12 +2248,52 @@ 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:882
+#: src/msgfmt.c:861
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr "Optionen für Desktopeintrag-Modus:\n"
+
+#: src/msgfmt.c:867
+#, c-format
+msgid " --template=TEMPLATE a .desktop file used as a template\n"
+msgstr ""
+" --template=VORLAGE eine als Vorlage zu verwendende .desktop-"
+"Datei\n"
+
+#: src/msgfmt.c:869
+#, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr " -d VERZEICHNIS Basisverzeichnis der .po-Dateien\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -kWORD, --keyword=WORT zusätzliches Schlüsselwort, nach dem gesucht\n"
+" wird.\n"
+" -k, --keyword es wird nicht nach den vorgegebenen\n"
+" Schlüsselwörtern gesucht\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+"Die Optionen -l, -o und --template sind obligatorisch. Falls -D angegeben "
+"ist,\n"
+"werden Dateien aus dem Verzeichnis anstelle der Befehlszeilenargumente "
+"gelesen.\n"
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "Überprüfung der Eingabedatei:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -2201,13 +2304,13 @@ msgstr ""
" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format sprachabhängige Formatelemente überprüfen\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -2216,7 +2319,7 @@ msgstr ""
" --check-header Existenz und Inhalt des Kopfeintrags "
"verifizieren\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -2226,7 +2329,7 @@ msgstr ""
"die\n"
" Option --output-file hin überprüfen\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2236,33 +2339,33 @@ msgstr ""
"Open\n"
" msgfmt verhält\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
"for\n"
" menu items\n"
msgstr ""
-" --check-accelerators[=ZEICHEN] Vorhandensein des Tastatur-"
-"Accelerators\n"
-" für Menüeinträge überprüfen\n"
+" --check-accelerators[=ZEICHEN]\n"
+" Vorhandensein des Tastatur-Accelerators\n"
+" für Menüeinträge überprüfen\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
" -f, --use-fuzzy auch ungenaue Übersetzungen (»fuzzy«) "
"verwenden\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
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"
+" -a, --alignment=ZAHL Ausgaben an ZAHL (Vorgabe: %d) Bytegrenze\n"
+" ausrichten\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2270,98 +2373,107 @@ msgid ""
" (big or little, default depends on "
"platform)\n"
msgstr ""
-" --endianness=BYTEFOLGE 32-Bit-Zahlen in der angegebenen Byte-"
-"Reihenfolge\n"
+" --endianness=BYTEFOLGE 32-Bit-Zahlen in der angegebenen "
+"Bytereihenfolge\n"
" (»big« oder »little«, Standard von Plattform "
"abhängig)\n"
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
-" --no-hash Binärdatei soll keine Hash-Tabelle "
-"enthalten\n"
+" --no-hash Binärdatei soll keine Hash-Tabelle enthalten\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
-" --statistics Statistik zu den Übersetzungen anzeigen\n"
+" --statistics Statistik zu den Übersetzungen anzeigen\n"
-#: 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 ""
-" -v, --verbose mehr Hinweise während der Verarbeitung geben\n"
+" -v, --verbose mehr Hinweise während der Verarbeitung geben\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "Warnung: Kopfteil der PO-Datei fehlt oder ist ungültig\n"
# = Konvertierung der Meldung in Hinblick auf den Zeichensatz
# 2001-03-11 20:56:03 CET -ke-
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "Warnung: Konvertierung des Zeichensatzes wird fehlschlagen.\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "Warnung: Kopfteil der PO-Datei ist ungenau (fuzzy)\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
"Warnung: ältere Versionen von »msgfmt« werden hierbei einen Fehler melden\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "Bereichsname »%s« ist nicht als Dateiname geeignet"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"Bereichsname »%s« ist nicht als Dateiname geeignet; Präfix wird verwendet."
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, c-format
msgid "'domain %s' directive ignored"
msgstr "»domain %s«-Anweisung wird ignoriert"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "leerer »msgstr«-Eintrag wird ignoriert"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "ungenauer »msgstr«-Eintrag wird ignoriert"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: Warnung: Quelldatei enthält ungenaue Übersetzungen"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr "%s existiert nicht"
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr "%s existiert, aber kann nicht gelesen werden"
+
#: 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 "Fehler beim Lesen von »%s«"
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2370,7 +2482,7 @@ msgstr ""
"Option »%c« kann nicht verwendet werden, bevor »J«, »K«, »T«, »C« oder »X« "
"festgelegt ist"
-#: 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"
@@ -2381,7 +2493,7 @@ msgstr ""
# To avoid confusion, let msgid and msgstr untranslated here!
# 2001-11-04 11:16:55 CET -ke-
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2464,24 +2576,24 @@ msgstr ""
" -v, --invert-match Nur die Meldungen ausgeben, die nicht mit einem\n"
" Auswahlkriterium übereinstimmen\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
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"
+" --escape C-Escape-Sequenzen und keine erweiterten\n"
+" Zeichen in Ausgabe verwenden\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
-msgstr " --sort-output sortierte Ausgabe erstellen\n"
+msgstr " --sort-output sortierte Ausgabe erstellen\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
-" --sort-by-file Ausgabe gemäß Vorkommen in Dateien erstellen\n"
+" --sort-by-file Ausgabe gemäß Vorkommen in Dateien erstellen\n"
#: src/msginit.c:297
msgid ""
@@ -2491,7 +2603,7 @@ msgid ""
msgstr ""
"Ihre Sprachumgebung ist nicht bestimmt.\n"
"Bitte setzen Sie die Umgebungsvariable LANG, wie in der Datei ABOUT-NLS\n"
-"beschrieben. Dies ist notwendig, damit Sie Ihre Übersetzungen testen "
+"beschrieben. Dies ist notwendig, damit Sie Ihre Übersetzungen testen "
"können.\n"
#: src/msginit.c:321
@@ -2501,9 +2613,10 @@ msgid ""
"Please specify the locale through the --locale option or\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-"Ausgabedateien »%s« ist bereits vorhanden.\n"
-"Bitte legen Sie die Lokale mit der Option »--locale« oder\n"
-"die .po-Datei für die Ausgabe mit der Option »--output-file« fest.\n"
+"Ausgabedatei »%s« ist bereits vorhanden.\n"
+"Bitte legen Sie die Spracheinstellung mit der Option »--locale«\n"
+"oder die .po-Datei für die Ausgabe mit der Option »--output-file«\n"
+"fest.\n"
#: src/msginit.c:347
#, c-format
@@ -2591,7 +2704,7 @@ msgstr ""
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
-msgstr "Subprozess %s mit dem Exitcode %d fehlgeschlagen"
+msgstr "Subprozess %s mit dem Exit-Code %d fehlgeschlagen"
#: src/msginit.c:1118
msgid ""
@@ -2601,7 +2714,7 @@ msgid ""
"contact\n"
"you in case of unexpected technical problems.\n"
msgstr ""
-"Der neue Katalog mit den Meldungen soll Ihre E-Mail-Adresse enthalten, "
+"Der neue Katalog mit den Meldungen sollte Ihre E-Mail-Adresse enthalten, "
"damit\n"
"Benutzer Ihnen Rückmeldungen zur Übersetzung schicken oder Programmautoren "
"im\n"
@@ -2613,7 +2726,7 @@ msgstr ""
#: src/msginit.c:1534
#, c-format
msgid "English translations for %s package"
-msgstr "German messages for %s"
+msgstr "German translation for %s"
#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
#, c-format
@@ -2648,7 +2761,7 @@ 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:122 src/po-xerror.c:147
-#: src/xgettext.c:3051
+#: src/xgettext.c:544 src/xgettext.c:3418
#, c-format
msgid "warning: "
msgstr "Warnung: "
@@ -2700,13 +2813,13 @@ msgid ""
msgstr ""
"Zeichensatz »%s« der Lokale weicht vom\n"
"Zeichensatz »%s« der Eingabedatei ab.\n"
-"Ausgabe von '%s' könnte nicht korrekt sein.\n"
+"Ausgabe von »%s« könnte nicht korrekt sein.\n"
"Mögliche Abhilfen:\n"
#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr "· LC_ALL auf eine Lokale mit der Kodierung »%s« setzen.\n"
+msgstr "· LC_ALL auf eine Spracheinstellung mit der Kodierung »%s« setzen.\n"
#: src/msgl-charset.c:105
#, c-format
@@ -2715,9 +2828,9 @@ msgid ""
" then apply '%s',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-"· Katalog mit den Übersetzungen nach »%s« mittels 'msgconv' konvertieren,\n"
-" dann '%s' anwenden,\n"
-" dann nach »%s« mittels 'msgconv' zurück konvertieren.\n"
+"· Katalog mit den Übersetzungen nach »%s« mittels »msgconv« konvertieren,\n"
+" dann »%s« anwenden,\n"
+" dann nach »%s« mittels »msgconv« zurück konvertieren.\n"
#: src/msgl-charset.c:114
#, c-format
@@ -2727,10 +2840,10 @@ msgid ""
" then apply '%s',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-"· LC_ALL auf eine Lokale mit der Kodierung »%s« setzen,\n"
-" Katalog mit den Übersetzungen nach »%s« mittels 'msgconv' konvertieren,\n"
-" dann '%s' anwenden,\n"
-" dann nach »%s« mittels 'msgconv' zurück konvertieren.\n"
+"· LC_ALL auf eine Spracheinstellung mit der Kodierung »%s« setzen,\n"
+" Katalog mit den Übersetzungen nach »%s« mittels »msgconv« konvertieren,\n"
+" dann »%s« anwenden,\n"
+" dann nach »%s« mittels »msgconv« zurück konvertieren.\n"
#: src/msgl-charset.c:128
#, c-format
@@ -2739,8 +2852,8 @@ msgid ""
"Output of '%s' might be incorrect.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-"Zeichensatz »%s« der Lokale ist kein Name für eine portable Kodierung\n"
-"Ausgabe von '%s' könnte nicht korrekt sein.\n"
+"Zeichensatz »%s« der Spracheinstellung ist kein Name für eine\n"
+"portable Kodierung. Die Ausgabe von »%s« könnte nicht korrekt sein.\n"
"Eine mögliche Abhilfe ist, LC_ALL=C zu setzen.\n"
#: src/msgl-check.c:130
@@ -2855,21 +2968,22 @@ msgstr "Die Plural-Behandlung ist eine Erweiterung von GNU gettext"
#: src/msgl-check.c:729
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr "bei »msgstr« fehlt die Markierung »%c« für den Tastatur-Accelerator"
+msgstr "bei »msgstr« fehlt die Markierung »%c« für den Tastatur-Schnellzugriff"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, 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"
+"»msgstr« weist mehr als eine Markierung »%c« für den Tastatur-Schnellzugriff "
+"auf"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, 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"
+"Das Feld »%s« im Kopfeintrag hat immer noch den anfänglichen Vorgabewert\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "Im Kopfeintrag fehlt das Feld »%s«\n"
@@ -2877,7 +2991,7 @@ msgstr "Im Kopfeintrag fehlt das Feld »%s«\n"
#: src/msgl-iconv.c:65
#, c-format
msgid "%s: input is not valid in \"%s\" encoding"
-msgstr "%s: Eingabe ist nicht gültig in der Kodierung »%s«"
+msgstr "%s: Eingabe ist in der Kodierung »%s« nicht gültig"
#: src/msgl-iconv.c:69
#, c-format
@@ -2892,7 +3006,7 @@ msgstr ""
"bei der Eingabedatei fehlt der Kopfeintrag mit der Angabe des Zeichensatzes"
#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c: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 "
@@ -2911,7 +3025,7 @@ msgstr ""
"msgids werden gleich."
#: 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 "
@@ -2920,16 +3034,16 @@ msgstr ""
"Es ist nicht möglich, von »%s« nach »%s« zu konvertieren.\n"
"%s hängt von iconv() ab. Diese Version wurde ohne iconv() erstellt."
-#: src/msgmerge.c:383 src/msgmerge.c:389
+#: src/msgmerge.c:392 src/msgmerge.c:398
#, c-format
msgid "%s is only valid with %s"
msgstr "%s ist nur mit %s gültig"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr "Art der Sicherung"
-#: 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"
@@ -2943,70 +3057,70 @@ msgid ""
"cannot be found, fuzzy matching is used to produce better results.\n"
msgstr ""
"Zwei Uniforum-konforme .po-Dateien zusammenziehen.\n"
-"Die Datei Def.po ist eine PO-Datei mit alten Übersetzungen, die - solange sie\n"
-"immer noch passen - in die neu zu erstellende Datei übernommen werden;\n"
+"Die Datei Def.po ist eine PO-Datei mit alten Übersetzungen, die – solange sie\n"
+"immer noch passen – in die neu zu erstellende Datei übernommen werden.\n"
"Kommentare des Übersetzers werden übernommen, aber extrahierte Kommentare und\n"
-"Stellenangaben werden verworfen. Die Datei Ref.pot ist die zuletzt erstellte\n"
+"Stellenangaben werden verworfen. Die Datei Ref.pot ist die zuletzt erstellte\n"
"PO- oder POT-Datei mit Verweisen auf die Quellen (Vorlage, i. A. von xgettext\n"
-"erstellt). Übersetzungen und Übersetzerkommentare werden verworfen, die mit\n"
-"#. und #: gekennzeichneten Kommentare werden aber übernommen. Wo es keine\n"
+"erstellt). Übersetzungen und Übersetzerkommentare werden verworfen, die mit\n"
+"#. und #: gekennzeichneten Kommentare werden aber übernommen. Wo es keine\n"
"exakte Übereinstimmung bei Meldungen gibt, wird mittels nicht-exakter Suche\n"
"versucht, ein besseres Ergebnis zu erzielen.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
-" Def.po Übersetzungen, die sich auf die alten Quellen\n"
-" beziehen\n"
+" Def.po Übersetzungen, die sich auf die alten Quellen\n"
+" beziehen\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
-msgstr " Ref.pot Referenzen aus den neuen Quellen\n"
+msgstr " Ref.pot Referenzen aus den neuen Quellen\n"
-#: 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 ""
-" -C, --compendium=DATEI zusätzliche Bibliothek mit Übersetzungen, es\n"
-" können mehrere angegeben werden\n"
+" -C, --compendium=DATEI zusätzliche Bibliothek mit Übersetzungen, es\n"
+" können mehrere angegeben werden\n"
-#: 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 ""
" -U, --update Def.po aktualisieren; nichts unternehmen,\n"
-" wenn Def.po bereits aktuell ist\n"
+" wenn Def.po bereits aktuell ist\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
-msgstr "Angaben zu Ausgabedateien beim Aktualisieren (Update):\n"
+msgstr "Angaben zu Ausgabedateien im Aktualisierungsmodus:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Das Ergebnis wird nach Def.po zurückgeschrieben.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr ""
" --backup=KONTROLLE Eine Sicherungskopie von Def.po anlegen\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
" --suffix=SUFFIX Das übliche Suffix der Sicherungskopie\n"
-" überschreiben\n"
+" überschreiben\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -3019,7 +3133,7 @@ msgid ""
msgstr ""
"Die Art der Versionskontrolle kann mit --backup oder mit der "
"Umgebungsvariablen\n"
-"VERSION_CONTROL gewählt werden. Mögliche Werte sind:\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"
@@ -3028,7 +3142,7 @@ msgstr ""
" andernfalls einfache.\n"
" simple, never immer einfache Sicherungskopien erstellen\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -3038,31 +3152,31 @@ msgstr ""
"Das Suffix für Sicherungskopien ist ~, außer wenn --suffix oder die\n"
"Umgebungsvariable SIMPLE_BACKUP_SUFFIX gesetzt ist.\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
msgstr ""
-" --previous die vorherigen Schlüssel der übersetzten "
+" --previous die vorherigen Schlüssel der übersetzten "
"Meldungen\n"
-" beibehalten\n"
+" beibehalten\n"
-#: 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 " -q, --quiet, --silent Fortschrittsanzeige unterdrücken\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
msgstr "diese Meldung sollte Pluralformen definieren"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
msgstr "diese Meldung sollte keine Pluralformen definieren"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -3071,7 +3185,7 @@ msgstr ""
"%s%ld alte + %ld Referenzeinträge gelesen,\n"
"%ld stimmen überein, %ld ungenau, %ld fehlen, %ld veraltet.\n"
-#: 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"
@@ -3100,9 +3214,9 @@ msgid ""
" -j, --java Java mode: input is a Java ResourceBundle "
"class\n"
msgstr ""
-" -j, --java Java-Modus: Eingabe ist eine ResourceBundle-"
+" -j, --java Java-Modus: Eingabe ist eine ResourceBundle-"
"Klasse\n"
-" für Java erstellen\n"
+" für Java\n"
#: src/msgunfmt.c:442
#, c-format
@@ -3115,21 +3229,21 @@ 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"
+" --csharp-resources C#-Ressourcenmodus: Eingabedatei ist\n"
+" eine .NET-.resources-Datei\n"
#: src/msgunfmt.c:446
#, c-format
msgid ""
" --tcl Tcl mode: input is a tcl/msgcat .msg file\n"
msgstr ""
-" --tcl Tcl-Modus: Eingabe ist eine tcl/msgcat .msg-"
+" --tcl Tcl-Modus: Eingabe ist eine tcl/msgcat .msg-"
"Datei\n"
#: src/msgunfmt.c:451
#, c-format
msgid " FILE ... input .mo files\n"
-msgstr " DATEI ... .mo-Eingabedateien\n"
+msgstr " DATEI ... .mo-Eingabedateien\n"
#: src/msgunfmt.c:456
#, c-format
@@ -3143,11 +3257,11 @@ msgid ""
"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"
-"»-d« ist notwendig. Die Klasse mittels CLASSPATH gesucht.\n"
+"Der Name der Klasse wird durch das Anhängen des Namens der "
+"Spracheinstellung\n"
+"an den Namen der Ressource festgelegt, abgetrennt durch einen Unterstrich "
+"(»_«).\n"
+"Die Option »-d« ist notwendig. Die Klasse wird mittels CLASSPATH gesucht.\n"
#: src/msgunfmt.c:467
#, c-format
@@ -3160,10 +3274,9 @@ 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 ""
-"Die Optionen »-l« und »-d« sind notwendig. Die .dll-Datei ist in einem\n"
-"Unterverzeichnis des angegebenen Verzeichnisses geschrieben plaziert, "
-"dessen\n"
-"Name von der Lokale abhängig ist.\n"
+"Die Optionen »-l« und »-d« sind notwendig. Die .dll-Datei ist in einem\n"
+"Unterverzeichnis des angegebenen Verzeichnisses platziert, dessen\n"
+"Name von der Spracheinstellung abhängig ist.\n"
#: src/msgunfmt.c:479
#, c-format
@@ -3176,21 +3289,22 @@ msgid ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
"specified directory.\n"
msgstr ""
-"Die Optionen »-l« und »-d« sind notwendig. Die .msg-Datei wird in das\n"
+"Die Optionen »-l« und »-d« sind notwendig. Die .msg-Datei wird in das\n"
"angegebene Verzeichnis geschrieben.\n"
#: src/msgunfmt.c:511
#, c-format
msgid " -i, --indent write indented output style\n"
-msgstr " -i, --indent Ausgabe eingerückt darstellen\n"
+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"
+" --strict .po-Datei streng nach Uniforum-Format "
+"erstellen\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -3203,30 +3317,30 @@ msgid ""
"will be cumulated. When using the --unique option, duplicates are discarded.\n"
msgstr ""
"Doppelte Einträge in einem Katalog mit Übersetzungen beseitigen.\n"
-"msguniq findet doppelte Übersetzungen derselben Kennung (msgid). Doppelte\n"
+"msguniq findet doppelte Übersetzungen derselben Kennung (msgid). Doppelte\n"
"Einträge stellen eine ungültige Eingabe für andere Programme wie msgfmt,\n"
-"msgmerge oder msgcat dar. Gemäß Voreinstellung werden doppelte Einträge\n"
-"zusammengezogen. Bei Verwendung der Option --repeated werden doppelte Einträge\n"
-"ausgegeben, alle anderen Meldungen werden verworfen. Kommentare und\n"
+"msgmerge oder msgcat dar. Gemäß Voreinstellung werden doppelte Einträge\n"
+"zusammengezogen. Bei Verwendung der Option --repeated werden doppelte Einträge\n"
+"ausgegeben, alle anderen Meldungen werden verworfen. Kommentare und\n"
"extrahierte Kommentare werden kumuliert, außer wenn --use-first angegeben ist;\n"
"bei --use-first wird jeweils nur die zuerst vorkommende Übersetzung genommen.\n"
-"Stellenangaben der Meldungen in den Quellen werden kumuliert. Bei Verwendung\n"
+"Stellenangaben der Meldungen in den Quellen werden kumuliert. Bei Verwendung\n"
"der Option --unique werden doppelte Einträge verworfen.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
-msgstr " -d, --repeated nur doppelte Einträge ausgeben\n"
+msgstr " -d, --repeated nur doppelte Einträge ausgeben\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
"duplicates\n"
msgstr ""
-" -u, --unique nur nicht-doppelte Einträge ausgeben, "
+" -u, --unique nur nicht-doppelte Einträge ausgeben, "
"doppelte\n"
-" verwerfen\n"
+" verwerfen\n"
#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
@@ -3249,7 +3363,7 @@ msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"and iconv() does not support \"%s\".\n"
msgstr ""
-"Zeichensatz »%s« wird nicht unterstützt. %s hängt von iconv() ab,\n"
+"Zeichensatz »%s« wird nicht unterstützt. %s hängt von iconv() ab,\n"
"und iconv() unterstützt »%s« nicht.\n"
#: src/po-charset.c:564 src/po-charset.c:612
@@ -3262,7 +3376,7 @@ msgstr ""
#: src/po-charset.c:578 src/po-charset.c:616
msgid "Continuing anyway, expect parse errors."
-msgstr "Gleichwohl Fortsetzung; Parsing-Fehler sind zu erwarten."
+msgstr "Gleichwohl Fortsetzung; Verarbeitungsfehler sind zu erwarten."
#: src/po-charset.c:580
msgid "Continuing anyway."
@@ -3274,7 +3388,7 @@ msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
msgstr ""
-"Zeichensatz »%s« wird nicht unterstützt. %s hängt von iconv() ab.\n"
+"Zeichensatz »%s« wird nicht unterstützt. %s hängt von iconv() ab.\n"
"Diese Version wurde ohne iconv() erstellt.\n"
#: src/po-charset.c:644
@@ -3291,27 +3405,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "Nicht konsistente Verwendung von #~"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, c-format
msgid "missing 'msgstr[]' section"
msgstr "»msgstr[]«-Abschnitt fehlt"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, c-format
msgid "missing 'msgid_plural' section"
-msgstr "»msgstr[]«-Abschnitt fehlt"
+msgstr "»msgid_plural«-Abschnitt fehlt"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, c-format
msgid "missing 'msgstr' section"
msgstr "»msgstr«-Abschnitt fehlt"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "erste Pluralform hat einen Index ungleich Null"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "Pluralform hat einen falschen Index"
@@ -3321,7 +3435,7 @@ msgstr "Pluralform hat einen falschen Index"
msgid "too many errors, aborting"
msgstr "zu viele Fehler: Abbruch"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:740 src/write-po.c:869
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
#, c-format
msgid "invalid multibyte sequence"
msgstr "ungültige Multibyte-Sequenz"
@@ -3365,16 +3479,16 @@ 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:1023
+#: src/read-catalog.c:318 src/xgettext.c:1046
#, c-format
msgid "this file may not contain domain directives"
msgstr "diese Datei darf keine »domain«-Anweisung enthalten"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "Mehrfachdefinition der Meldung"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "dies ist die Stelle der ersten Definition"
@@ -3416,11 +3530,11 @@ msgstr "Warnung: nicht terminiertes Schlüssel/Wert-Paar"
#: src/read-stringtable.c:939
msgid "warning: syntax error, expected ';' after string"
-msgstr "Warnung: Syntaxfehler, ';' nach der Zeichenkette erwartet"
+msgstr "Warnung: Syntaxfehler, »;« nach der Zeichenkette erwartet"
#: src/read-stringtable.c:948
msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "Warnung: Syntaxfehler, '=' or ';' nach der Zeichenkette erwartet"
+msgstr "Warnung: Syntaxfehler, »=« oder »;« nach der Zeichenkette erwartet"
#: src/recode-sr-latin.c:116
#, c-format
@@ -3438,7 +3552,7 @@ msgstr "Danilo Šegan"
#: src/recode-sr-latin.c:153
#, c-format, no-wrap
msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr "Serbischen Text von kyrillischer nach lateinischer Schreibart umkodieren.\n"
+msgstr "Serbischen Text von kyrillischer nach lateinischer Schreibweise umkodieren.\n"
#: src/recode-sr-latin.c:156
#, c-format, no-wrap
@@ -3446,13 +3560,13 @@ msgid ""
"The input text is read from standard input. The converted text is output to\n"
"standard output.\n"
msgstr ""
-"Der Eingabetext wird von der Standardeingabe gelesen. Der umgewandelte Text\n"
+"Der Eingabetext wird von der Standardeingabe gelesen Der umgewandelte Text\n"
"wird nach der Standardausgabe ausgegeben.\n"
#: src/recode-sr-latin.c:339
#, c-format
msgid "input is not valid in \"%s\" encoding"
-msgstr "Eingabe ist nicht gültig in der Kodierung »%s«"
+msgstr "Eingabe ist in der Kodierung »%s« nicht gültig"
#: src/recode-sr-latin.c:367
#, c-format
@@ -3476,7 +3590,7 @@ msgid ""
"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
"the locally accessible FILE is used instead.\n"
msgstr ""
-"URL holen und Inhalt ausgeben. Wenn auf den URL nicht zugegriffen werden kann,\n"
+"URL holen und Inhalt ausgeben. Wenn auf den URL nicht zugegriffen werden kann,\n"
"wird die lokal zugängliche Datei stattdessen verwendet.\n"
#: src/urlget.c:228
@@ -3487,7 +3601,7 @@ msgstr "Fehler beim Lesen von »%s«"
#: src/urlget.c:234
#, c-format
msgid "error writing stdout"
-msgstr "Fehler beim Schreiben von Standardausgabe"
+msgstr "Fehler beim Schreiben in die Standardausgabe"
#: src/urlget.c:238
#, c-format
@@ -3515,7 +3629,7 @@ msgid ""
"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-"
+"angegebenen Ausgabeformat auszugeben. Versuchen Sie als Ersatz auf die PO-"
"Dateien-Syntax auszuweichen."
#: src/write-catalog.c:129
@@ -3540,8 +3654,8 @@ msgid ""
"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 "
+"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
@@ -3564,7 +3678,7 @@ msgstr "Standardausgabe"
#: src/write-csharp.c:703
#, c-format
msgid "failed to create directory \"%s\""
-msgstr "Fehler beim Anlegen von Verzeichnis »%s«"
+msgstr "Fehler beim Anlegen des Verzeichnisses »%s«"
#: src/write-csharp.c:766
#, c-format
@@ -3577,19 +3691,19 @@ msgstr ""
msgid "compilation of C# class failed"
msgstr "Kompilierung der C#-Klasse ist fehlgeschlagen"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "kein gültiger Name einer Java-Klasse: %s"
-#: 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 ""
"Kompilierung der Java-Klasse ist fehlgeschlagen; bitte versuchen Sie\n"
"--verbose oder setzen Sie $JAVAC"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr ""
@@ -3600,16 +3714,16 @@ msgstr ""
#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
#, c-format
msgid "error while opening \"%s\" for writing"
-msgstr "Fehler beim Öffnen von »%s« zum Schreiben"
+msgstr "Fehler beim Öffnen von »%s« zum Schreiben"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr ""
"Zu übersetzende Meldungen sollten nicht die Escape-Sequenz »\\%c« enthalten"
-#: 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"
@@ -3618,12 +3732,12 @@ msgid ""
"%s\n"
msgstr ""
"Der folgende msgctxt enthält Zeichen, die nicht ASCII-kodiert sind.\n"
-"Dies kann Übersetzer Schwierigkeiten bereiten, wenn die eine andere\n"
-"Zeichen-Kodierung als Sie verwenden. Bitte auf einen msgctxt\n"
+"Dies kann Übersetzern Schwierigkeiten bereiten, wenn diese eine andere\n"
+"Zeichen-Kodierung als Sie verwenden. Bitte auf einen msgctxt\n"
"ausweichen, der stattdessen nur aus ASCII-kodierten Zeichen besteht.\n"
"%s\n"
-#: src/write-po.c:1266 src/write-po.c:1395
+#: src/write-po.c:1338 src/write-po.c:1462
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3634,7 +3748,7 @@ msgstr ""
"Die folgende msgid enthält Zeichen, die nicht ASCII-kodiert sind.\n"
"Dies kann bei den Übersetzungen Schwierigkeiten bereiten, wenn die "
"Übersetzer\n"
-"eine andere Zeichen-Kodierung als Sie verwenden. Bitte auf eine msgid\n"
+"eine andere Zeichen-Kodierung als Sie verwenden. Bitte auf eine msgid\n"
"ausweichen, die nur aus ASCII-kodierten Zeichen besteht.\n"
"%s\n"
@@ -3665,7 +3779,7 @@ 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 "
+"Katalog mit Meldungen weist msgid-Zeichenketten auf, deren Zeichen außerhalb "
"von\n"
"ISO-8859-1 liegen, aber das Qt-Format für Kataloge mit Meldungen "
"unterstützt\n"
@@ -3709,7 +3823,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-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 "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
@@ -3719,17 +3833,22 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, c-format
+msgid "warning: invalid Unicode character"
+msgstr "Warnung: ungültiges Unicode-Zeichen"
+
+#: 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 "%s:%d: Warnung: Zeichenkonstante nicht korrekt terminiert"
-#: 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 "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
-#: 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 "Bitte die Kodierung des Quelltextes mit --from-code angeben."
@@ -3783,7 +3902,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:1335
+#: src/x-csharp.c:1390 src/x-python.c:1138
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: Warnung: ungültiges Unicode-Zeichen"
@@ -3796,36 +3915,36 @@ msgstr "%s:%d: Warnung: nicht terminierte konstante Zeichenkette"
#: src/x-csharp.c:2020 src/x-java.c:1369
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: Warnung: ')' gefunden, wo '}' erwartet wurde"
+msgstr "%s:%d: Warnung: »)« gefunden, wo »}« erwartet wurde"
#: src/x-csharp.c:2054 src/x-java.c:1403
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: Warnung: '}' gefunden, wo ')' erwartet wurde"
+msgstr "%s:%d: Warnung: »}« gefunden, wo »)« erwartet wurde"
-#: src/x-glade.c:561
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
+msgstr "Kontext für die aus dem Element »%s« extrahierte Zeichenkette fehlt"
-#: 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 ""
+msgstr "Das Root-Element <%s> ist in einer Glade-Datei nicht zulässig"
# CHECKIT
-#: 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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
"This version was built without expat.\n"
msgstr ""
-"Die Sprache »glade« wird nicht unterstützt. %s hängt von expat ab.\n"
+"Die Sprache »glade« wird nicht unterstützt. %s hängt von expat ab.\n"
"Diese Version wurde ohne expat erstellt.\n"
#: src/x-java.c:494
@@ -3834,12 +3953,11 @@ 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."
+msgstr "Bitte die Kodierung des Quelltextes mit --from-code angeben.\n"
#: src/x-javascript.c:275
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
@@ -3848,7 +3966,7 @@ msgstr ""
"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
#: src/x-javascript.c:291
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
@@ -3857,7 +3975,7 @@ msgstr ""
"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
#: src/x-javascript.c:303
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of file.\n"
"Please specify the correct source encoding through --from-code\n"
@@ -3866,7 +3984,7 @@ msgstr ""
"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
#: src/x-javascript.c:312
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of line.\n"
"Please specify the correct source encoding through --from-code\n"
@@ -3875,7 +3993,7 @@ msgstr ""
"Bitte die korrekte Kodierung des Quelltextes mit --from-code angeben.\n"
#: src/x-javascript.c:344
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the source encoding through --from-code\n"
@@ -3883,10 +4001,20 @@ 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
+#: src/x-javascript.c:954
+#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
+msgstr "%s:%d: Warnung: RegExp-Literal wurde zu früh terminiert"
+
+#: src/x-javascript.c:1055
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: Warnung: %s ist nicht erlaubt"
+
+#: src/x-javascript.c:1069
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: Warnung: nicht geschlossene XML-Sequenz"
#: src/x-perl.c:308
#, c-format
@@ -3931,7 +4059,7 @@ msgid ""
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 "
+"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
"ist.\n"
#: src/x-python.c:324
@@ -3944,7 +4072,7 @@ 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 "
+"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
"ist.\n"
#: src/x-python.c:341
@@ -3957,7 +4085,7 @@ 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 "
+"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
"ist.\n"
#: src/x-python.c:354
@@ -3970,7 +4098,7 @@ 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 "
+"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
"ist.\n"
#: src/x-python.c:364
@@ -3983,7 +4111,7 @@ 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 "
+"angeben, wie er in http://www.python.org/peps/pep-0263.html spezifiziert "
"ist.\n"
#: src/x-python.c:397
@@ -4028,64 +4156,71 @@ 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
+#: src/x-vala.c:413
+#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
+msgstr "%s:%d: Warnung: Literal des regulären Ausdrucks zu früh terminiert"
+
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr ""
+"»%s« ist kein gültiger Name für eine Zeichenkodierung. ASCII wird "
+"ersatzweise verwendet.\n"
-#: src/xgettext.c:636
+#: src/xgettext.c:648
#, 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:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr ""
"ohne Angabe zu berücksichtigender Schlüsselwörter schlägt xgettext fehl"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr ""
"Warnung: Typ der Datei »%s« mit Suffix »%s« ist unbekannt; C wird versucht"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr ""
"Aus den Eingabedateien die zu übersetzenden Meldungen herausschreiben.\n"
-#: 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 ""
-" -d, --default-domain=NAME Ausgabe in NAME.po (anstatt in messages.po)\n"
+" -d, --default-domain=NAME Ausgabe in NAME.po (anstatt in messages.po)\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
-" -o, --output=DATEI Ausgabe in die angegebene DATEI schreiben\n"
+" -o, --output=DATEI Ausgabe in die angegebene DATEI schreiben\n"
-#: 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 ""
-" -p, --output-dir=VERZ Ausgabedateien in Verzeichnis VERZ ablegen\n"
+" -p, --output-dir=VERZ Ausgabedateien in Verzeichnis VERZ ablegen\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Wahl der Sprache für die Eingabedatei:\n"
-#: src/xgettext.c:870
-#, fuzzy, c-format
+#: src/xgettext.c:893
+#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -4094,21 +4229,23 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\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"
+" -L, --language=NAME erkennt die angegebene Programmiersprache\n"
+" (C, C++, ObjectiveC, PO, Shell, Python, "
+"Lisp,\n"
+" EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+" JavaProperties, C#, awk, YCP, Tcl, Perl, "
+"PHP,\n"
+" GCC-source, NXStringTable, RST, Glade, Lua,\n"
+" JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
-msgstr " -C, --c++ Abkürzung für --language=C++\n"
+msgstr " -C, --c++ Abkürzung für --language=C++\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:902
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
@@ -4118,33 +4255,33 @@ msgstr ""
"Eingabedatei\n"
"geraten.\n"
-#: 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 ""
-" --from-code=NAME Kodierung der Eingabedateien\n"
-" (außer für Python, Tcl, Glade)\n"
+" --from-code=NAME Kodierung der Eingabedateien\n"
+" (außer für Python, Tcl, Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, 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:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
-" -j, --join-existing Meldungen an existierende Datei anhängen\n"
+" -j, --join-existing Meldungen an existierende Datei anhängen\n"
-#: 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 ""
-" -x, --exclude-file=DATEI.po Einträge aus DATEI.po nicht herausholen\n"
+" -x, --exclude-file=DATEI.po Einträge aus DATEI.po nicht herausholen\n"
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -4153,28 +4290,28 @@ msgid ""
"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"
-" die Ausgabedatei schreiben.\n"
-" -c, --add-comments Alle Kommentarblöcke, die einer Zeile "
-"mit\n"
-" Schlüsselworten vorausgehen, in die\n"
-" Ausgabedatei schreiben.\n"
+" -cKENNUNG, --add-comments=KENNUNG\n"
+" Kommentare, die mit KENNUNG beginnen und "
+"welche\n"
+" einer Zeile mit Schlüsselworten vorausgehen "
+"in\n"
+" die Ausgabedatei schreiben.\n"
+" -c, --add-comments Alle Kommentarblöcke, die einer Zeile mit\n"
+" Schlüsselworten vorausgehen, in die\n"
+" Ausgabedatei schreiben.\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Besondere Optionen bei »Language«:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all alle Zeichenketten extrahieren\n"
-#: src/xgettext.c:906 src/xgettext.c:914
-#, fuzzy, c-format
+#: src/xgettext.c:929
+#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, "
@@ -4182,23 +4319,29 @@ msgid ""
" 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"
+" (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"
+" Lua, JavaScript, Vala)\n"
-#: 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 ""
-" -kWORD, --keyword=WORT zusätzliches Schlüsselwort, nach dem gesucht\n"
-" wird.\n"
-" -k, --keyword es wird nicht nach den vorgegebenen\n"
-" Schlüsselwörtern gesucht\n"
+" (nur die Sprachen C, C++, ObjectiveC, "
+"Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+" C#, awk, Tcl, Perl, PHP, GCC-Source, Glade\n"
+" Lua, JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -4207,11 +4350,10 @@ msgid ""
msgstr ""
" --flag=WORT:ARG:FLAG zusätzliches Flag für Zeichenketten innerhalb "
"der\n"
-" der Argumentzahl ARG des Schlüsselworts "
-"WORT\n"
+" Argumentzahl ARG des Schlüsselworts WORT\n"
-#: src/xgettext.c:922
-#, fuzzy, c-format
+#: src/xgettext.c:945
+#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, "
@@ -4219,116 +4361,116 @@ msgid ""
" 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"
-" librep, Scheme, Java, C#, awk, YCP, Tcl,\n"
-" Perl, PHP, GCC-source)\n"
+" (nur die Programmiersprachen C, C++,\n"
+" ObjectiveC, Shell, Python, Lisp, EmacsLisp,\n"
+" librep, Scheme, Java, C#, awk, YCP, Tcl,\n"
+" Perl, PHP, GCC-source\n"
+" Lua, JavaScript, Vala)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, 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"
+" erkennen\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
-" (nur die Programmiersprachen C, C++,\n"
-" ObjectiveC)\n"
+" (nur die Programmiersprachen C, C++,\n"
+" ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
-msgstr " --qt Zeichenketten im Qt-Format erkennen\n"
+msgstr " --qt Zeichenketten im Qt-Format erkennen\n"
-#: 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 " (nur die Programmiersprache C++)\n"
+msgstr " (nur die Programmiersprache C++)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, 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:939
+#: src/xgettext.c:962
#, 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:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
-" --debug detaillierteres Ergebnis bei Erkennung der\n"
+" --debug detaillierteres Ergebnis bei Erkennung der\n"
" Formatelemente\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr ""
" --properties-output eine ».properties«-Datei von Java erstellen\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
-" --copyright-holder=KETTE Halter des Copyrights in Ausgabe setzen\n"
+" --copyright-holder=KETTE Uhrheberrechtsinhaber in Ausgabe setzen\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
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"
+" --foreign-user keine Zeile mit FSF-Copyright in Ausgabe\n"
+" einfügen\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, 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:989
+#: src/xgettext.c:1012
#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr " --package-version=VERSION Paketversion in Ausgabe setzen\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
" --msgid-bugs-address=EMAIL@ADRESSE Adresse für msgid-Fehler angeben\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -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 "
+" -m[ZEICHENKETTE], --msgstr-prefix[=ZEICHENKETTE]\n"
+" ZEICHENKETTE oder \"\" als Präfix für "
"msgstr\n"
-" nehmen\n"
+" nehmen\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -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 "
+" -M[ZEICHENKETTE], --msgstr-suffix[=ZEICHENKETTE]\n"
+" ZEICHENKETTE oder \"\" als Suffix für "
"msgstr\n"
-" nehmen\n"
+" nehmen\n"
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4337,49 +4479,49 @@ msgstr ""
"Ein --flag-Argument folgt nicht der <keyword>:<argnum>:[pass-]<flag>-Syntax: "
"%s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr "Standardeingabe"
-#: src/xgettext.c:2020
+#: src/xgettext.c:2071
#, c-format
msgid "Non-ASCII character at %s%s."
msgstr "Nicht in ASCII kodiertes Zeichen bei %s%s."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, 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:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
-msgstr "Nich in ASCII kodierte Zeichenkette bei oder vor %s%s."
+msgstr "Nicht in ASCII kodierte Zeichenkette bei oder vor %s%s."
-#: 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 "%s%s: Warnung: "
-#: 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 ""
-"Obwohl das Formatelement an der Position eines Formatelements verwendet "
-"wird, ist %s kein gültiges %s Formatelement. Der Grund: %s\n"
+"Obwohl es an der Position eines Formatelements verwendet wird, ist %s kein "
+"gültiges %s Formatelement. Der Grund: %s\n"
-#: 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 ""
-"Obwohl es als Formatelement deklariert wurde, ist %s kein gültiges %s "
-"Formatelement. Der Grund: %s\n"
+"Obwohl es so deklariert wurde, ist %s kein gültiges %s Formatelement. Der "
+"Grund: %s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4391,9 +4533,9 @@ msgstr ""
"geeigneter Form lokalisiert werden:\n"
"Die Übersetzerin kann die Argumente nicht umsortieren.\n"
"Verwenden Sie besser ein Formatelement mit bezeichneten Argumenten\n"
-"und einem Mapping anstelle eines Tuples für die Argumente.\n"
+"und einem Mapping anstelle eines Tupels für die Argumente.\n"
-#: 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"
@@ -4403,28 +4545,28 @@ msgstr ""
"gettext(\"\") gibt den Kopfeintrag mit Meta-Informationen\n"
"zurück, keine leere Zeichenkette.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "mehrdeutige Argumentspezifikation für das Schlüsselwort »%.*s«"
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "Warnung: fehlender Kontext für das Schlüsselwort »%.*s«"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr ""
"Warnung: fehlender Kontext für das Plural-Argument des Schlüsselwortes »%.*s«"
-#: src/xgettext.c:2942
+#: src/xgettext.c:3052
#, c-format
msgid "context mismatch between singular and plural form"
msgstr "Abweichung beim Kontext zwischen Singular- und Pluralform"
-#: 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"
@@ -4436,7 +4578,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:3267
+#: src/xgettext.c:3638
#, c-format
msgid "language '%s' unknown"
msgstr "Programmiersprache »%s« unbekannt"
@@ -4457,7 +4599,7 @@ msgstr "<unbenannt>"
#~ msgstr "%s: unzulässige Option -- %c\n"
#~ msgid "DuplicateHandle failed with error code 0x%08x"
-#~ msgstr "DuplicateHandle ist mit dem Exitcode 0x%08x fehlgeschlagen"
+#~ msgstr "DuplicateHandle ist mit dem Exit-Code 0x%08x fehlgeschlagen"
#~ msgid "Not yet implemented."
#~ msgstr "Noch nicht implementiert."
diff --git a/gettext-tools/po/el.po b/gettext-tools/po/el.po
index c361cd1..8788998 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: 2013-07-07 18:21+0900\n"
+"POT-Creation-Date: 2014-06-01 11:19+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"
@@ -201,16 +201,16 @@ 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 " \"%s\""
@@ -232,9 +232,9 @@ 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
#, fuzzy, c-format
msgid "memory exhausted"
msgstr "H "
@@ -245,7 +245,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 ""
@@ -335,8 +335,8 @@ 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 " \"%s\" "
@@ -687,7 +687,7 @@ 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
#, fuzzy, c-format
msgid "a format specification for argument '%s' doesn't exist in '%s'"
@@ -734,28 +734,28 @@ msgid ""
"format specifications in '%s' and '%s' for argument '%s' are not the same"
msgstr " %u "
-#: 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 ""
@@ -801,11 +801,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"
@@ -815,19 +815,19 @@ msgid ""
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 " / %s.\n"
#. 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 ""
@@ -839,11 +839,11 @@ 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
#, fuzzy, c-format
msgid "Try '%s --help' for more information.\n"
msgstr " `%s --help' .\n"
@@ -881,29 +881,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 ""
@@ -913,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: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
#, fuzzy
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr " <bug-gnu-utils@gnu.org>.\n"
@@ -928,232 +928,235 @@ 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
#, fuzzy, 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 " %s %s "
-#: src/msgattrib.c:414 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr ""
-#: 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
#, fuzzy, 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"
@@ -1162,88 +1165,88 @@ 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
#, fuzzy, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1261,33 +1264,33 @@ msgstr ""
" -S, --strict Uniforum\n"
" -V, --version \n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " (%d < n < %d)"
-#: 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
#, fuzzy, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1317,94 +1320,94 @@ msgstr ""
" PO . PO\n"
" .\n"
-#: 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 ""
@@ -1446,19 +1449,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 ""
@@ -1485,19 +1488,19 @@ 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 " , %s"
@@ -1509,20 +1512,20 @@ 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
#, fuzzy, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] " %d "
#
-#: 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
#, fuzzy, c-format, no-wrap
msgid ""
"Find messages which are common to two or more of the specified PO files.\n"
@@ -1551,76 +1554,76 @@ msgstr ""
" PO . PO\n"
" .\n"
-#: 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
#, fuzzy, 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"
@@ -1629,7 +1632,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 ""
@@ -1662,7 +1665,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 ""
@@ -1673,46 +1676,46 @@ msgid "write to stdout failed"
msgstr ""
#
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, fuzzy, c-format
msgid "missing filter name"
msgstr " "
#
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, fuzzy, 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 "
@@ -1720,192 +1723,227 @@ 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
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr " %s %s "
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, 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
#, fuzzy, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d "
#
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, fuzzy, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d "
#
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, fuzzy, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d "
-#: 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 "
@@ -1915,48 +1953,78 @@ msgid ""
msgstr ""
#
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, fuzzy, 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"
@@ -1964,33 +2032,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 "
@@ -1998,18 +2066,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 "
@@ -2018,56 +2086,56 @@ 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
#, fuzzy, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr ""
"%s: : "
#
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, fuzzy, c-format
msgid "warning: charset conversion will not work\n"
msgstr ""
"%s: : "
#
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, fuzzy, c-format
msgid "warning: PO file header fuzzy\n"
msgstr ""
"%s: : "
-#: 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 " \"%s\" "
#
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
@@ -2075,58 +2143,68 @@ msgstr ""
" "
#
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "'domain %s' directive ignored"
msgstr " `domain %s' "
#
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, fuzzy, c-format
msgid "empty 'msgstr' entry ignored"
msgstr " `msgstr' "
#
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, fuzzy, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr " `msgstr' "
#
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr ""
"%s: : "
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
#
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c: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 " \"%s\""
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
"specified"
msgstr ""
-#: 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"
@@ -2166,18 +2244,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 ""
@@ -2316,7 +2394,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 ""
@@ -2510,19 +2588,19 @@ 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
#, fuzzy, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr " "
#
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, fuzzy, c-format
msgid "header field '%s' missing in header\n"
msgstr " `%s' "
@@ -2543,7 +2621,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 "
@@ -2558,24 +2636,24 @@ 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
#, fuzzy, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2601,51 +2679,51 @@ msgstr ""
" \n"
" .\n"
-#: 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 "
@@ -2657,7 +2735,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 "
@@ -2665,31 +2743,31 @@ 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
#, fuzzy, c-format
msgid "this message should define plural forms"
msgstr " , %s"
#
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, fuzzy, c-format
msgid "this message should not define plural forms"
msgstr " , %s"
#
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, fuzzy, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2699,7 +2777,7 @@ msgstr ""
" %d, %d.\n"
#
-#: 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"
@@ -2799,7 +2877,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"
@@ -2812,12 +2890,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 "
@@ -2881,29 +2959,29 @@ msgid "inconsistent use of #~"
msgstr ""
#
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, fuzzy, c-format
msgid "missing 'msgstr[]' section"
msgstr " `msgstr'"
#
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, fuzzy, c-format
msgid "missing 'msgid_plural' section"
msgstr " `msgstr'"
#
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, fuzzy, c-format
msgid "missing 'msgstr' section"
msgstr " `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 ""
@@ -2915,7 +2993,7 @@ 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
#, fuzzy, c-format
msgid "invalid multibyte sequence"
msgstr " "
@@ -2966,18 +3044,18 @@ 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 " "
@@ -3187,17 +3265,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 ""
@@ -3209,7 +3287,7 @@ msgid "error while opening \"%s\" for writing"
msgstr " \"%s\" "
#
-#: src/write-po.c:803
+#: src/write-po.c:875
#, fuzzy, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
@@ -3217,7 +3295,7 @@ msgstr ""
" `\\"
"%c'"
-#: 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"
@@ -3226,7 +3304,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"
@@ -3287,7 +3365,7 @@ msgid ""
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
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "%s:%d: : "
@@ -3299,18 +3377,24 @@ msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: : "
#
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:762
+#: src/x-c.c:1051
+#, fuzzy, c-format
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: : "
+
+#
+#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: : "
#
-#: 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 "%s:%d: : "
-#: 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 ""
@@ -3355,7 +3439,7 @@ msgid ""
msgstr ""
#
-#: src/x-csharp.c:1390 src/x-python.c:1335
+#: src/x-csharp.c:1390 src/x-python.c:1138
#, fuzzy, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: : "
@@ -3376,22 +3460,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"
@@ -3444,11 +3528,23 @@ msgid ""
msgstr ""
#
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, fuzzy, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: : "
+#
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: : "
+
+#
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: : "
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3560,61 +3656,66 @@ msgid ""
msgstr ""
#
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, fuzzy, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: : "
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr ""
+
#
-#: src/xgettext.c:636
+#: src/xgettext.c:648
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
" --join-existing "
" "
-#: 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
#, fuzzy, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr ""
": `%s' `%s' C"
-#: 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
#, fuzzy, 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"
@@ -3624,44 +3725,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"
@@ -3671,17 +3772,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"
@@ -3691,14 +3792,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 "
@@ -3706,7 +3810,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"
@@ -3716,75 +3820,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 "
@@ -3792,7 +3896,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 "
@@ -3800,7 +3904,7 @@ 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: "
@@ -3808,45 +3912,45 @@ msgid ""
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"
@@ -3855,34 +3959,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"
@@ -3891,7 +3995,7 @@ msgid ""
msgstr ""
#
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, fuzzy, c-format
msgid "language '%s' unknown"
msgstr " `%s' "
@@ -3901,18 +4005,13 @@ msgid "<unnamed>"
msgstr ""
#
-#, fuzzy
-#~ msgid "header field '%s' should start at beginning of line\n"
-#~ msgstr " `%s' "
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: -- %c\n"
#
#, fuzzy
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr " "
-
-#
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: -- %c\n"
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr " `%s' "
#
#, fuzzy
diff --git a/gettext-tools/po/es.po b/gettext-tools/po/es.po
index a23679a..0c4c1a8 100644
--- a/gettext-tools/po/es.po
+++ b/gettext-tools/po/es.po
@@ -1,26 +1,28 @@
-# Mensajes en espaol para GNU gettext.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-# Max de Mendizbal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000,
+# Mensajes en español para GNU gettext.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2013 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gettext package.
+# Max de Mendizábal <max@upn.mx>, 1996, 1997, 1998, 1999, 2000,
# 2001, 2002, 2003, 2004.
+# Antonio Ceballos <aceballos@gmail.com>, 2013
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.14.5\n"
+"Project-Id-Version: GNU gettext-tools 0.18.3\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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 Mendizbal <max@upn.mx>\n"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2013-12-06 23:55+0200\n"
+"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
"Language-Team: Spanish <es@li.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: gnulib-lib/argmatch.c:133
#, c-format
msgid "invalid argument %s for %s"
-msgstr "el argumento %s es invlido para %s"
+msgstr "el argumento %s es inválido para %s"
#: gnulib-lib/argmatch.c:134
#, c-format
@@ -29,7 +31,7 @@ msgstr "el argumento %s es ambiguo para %s"
#: gnulib-lib/argmatch.c:153
msgid "Valid arguments are:"
-msgstr "Los argumentos vlidos son:"
+msgstr "Los argumentos válidos son:"
#: gnulib-lib/clean-temp.c:332
#, c-format
@@ -42,14 +44,14 @@ msgid "cannot create a temporary directory using template \"%s\""
msgstr "no se puede crear un directorio temporal utilizando el formato \"%s\""
#: gnulib-lib/clean-temp.c:442
-#, fuzzy, c-format
+#, c-format
msgid "cannot remove temporary file %s"
-msgstr "no se puede crear el fichero de salida \"%s\""
+msgstr "no se puede borrar el fichero temporal %s"
#: gnulib-lib/clean-temp.c:457
-#, fuzzy, c-format
+#, c-format
msgid "cannot remove temporary directory %s"
-msgstr "no se puede crear un directorio temporal utilizando el formato \"%s\""
+msgstr "no se puede borrar el directory temporal %s"
#: gnulib-lib/closeout.c:66
msgid "write error"
@@ -58,32 +60,32 @@ msgstr "error de escritura"
#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
#, c-format
msgid "preserving permissions for %s"
-msgstr ""
+msgstr "preservando los permisos para %s"
#: gnulib-lib/copy-file.c:194
-#, fuzzy, c-format
+#, c-format
msgid "error while opening %s for reading"
-msgstr "error al abrir el fichero \"%s\" para lectura"
+msgstr "error al abrir el fichero %s para lectura"
#: gnulib-lib/copy-file.c:198
-#, fuzzy, c-format
+#, c-format
msgid "cannot open backup file %s for writing"
-msgstr "no se puede abrir el fichero de respaldo \"%s\" para escritura"
+msgstr "no se puede abrir el fichero de respaldo %s para escritura"
#: gnulib-lib/copy-file.c:202
-#, fuzzy, c-format
+#, c-format
msgid "error reading %s"
-msgstr "error al leer \"%s\""
+msgstr "error al leer %s"
#: gnulib-lib/copy-file.c:206
-#, fuzzy, c-format
+#, c-format
msgid "error writing %s"
-msgstr "error al escribir \"%s\""
+msgstr "error al escribir %s"
#: gnulib-lib/copy-file.c:210
-#, fuzzy, c-format
+#, c-format
msgid "error after reading %s"
-msgstr "error despus de leer \"%s\""
+msgstr "error después de leer %s"
#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
@@ -96,15 +98,15 @@ msgstr "fallo en fdopen()"
#: gnulib-lib/csharpcomp.c:571
#, c-format
msgid "C# compiler not found, try installing pnet"
-msgstr "No se encontr al compilador de C#, intente instalar pnet"
+msgstr "No se encontró el compilador de C#, intente instalar pnet"
#: gnulib-lib/csharpexec.c:343
#, c-format
msgid "C# virtual machine not found, try installing pnet"
-msgstr "No se encontr a la mquina virtual de C#, intente instalar pnet"
+msgstr "No se encontró la máquina virtual de C#, intente instalar pnet"
-# Nota: El error es del sistema, pero no se sabe cul es el error,
-# por eso es (adems) desconocido.
+# Nota: El error es del sistema, pero no se sabe cuál es el error,
+# por eso es (además) desconocido.
#: gnulib-lib/error.c:188
msgid "Unknown system error"
msgstr "Error del sistema desconocido"
@@ -117,81 +119,81 @@ msgid "%s subprocess failed"
msgstr "fallo en el subproceso %s"
#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: la opcin `%s' es ambigua\n"
+msgstr "%s: la opción '%s' es ambigua; posibilidades:"
#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: la opcin `--%s' no admite ningn argumento\n"
+msgstr "%s: la opción '--%s' no admite ningún argumento\n"
#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: la opcin `%c%s' no admite ningn argumento\n"
+msgstr "%s: la opción '%c%s' no admite ningún argumento\n"
#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: la opcin `%s' requiere un argumento\n"
+msgstr "%s: la opción '%s' requiere un argumento\n"
#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opcin no reconocida `--%s'\n"
+msgstr "%s: opción no reconocida '--%s'\n"
#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opcin no reconocida `%c%s'\n"
+msgstr "%s: opción no reconocida '%c%s'\n"
#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
+#, c-format
msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: opcin invlida -- %c\n"
+msgstr "%s: opción inválida -- '%c'\n"
#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
+#, c-format
msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: la opcin requiere un argumento -- %c\n"
+msgstr "%s: la opción requiere un argumento -- '%c'\n"
#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: la opcin `-W %s' es ambigua\n"
+msgstr "%s: la opción '-W %s' es ambigua\n"
#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: la opcin `-W %s' no admite ningn argumento\n"
+msgstr "%s: la opción '-W %s' no admite ningún argumento\n"
#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: la opcin `%s' requiere un argumento\n"
+msgstr "%s: la opción '%s' requiere un argumento\n"
#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
#: gnulib-lib/javacomp.c:156
#, c-format
msgid "invalid source_version argument to compile_java_class"
-msgstr ""
+msgstr "argumento source_version no válido para compile_java_class"
#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
#, c-format
msgid "invalid target_version argument to compile_java_class"
-msgstr ""
+msgstr "argumento target_version no válido para compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
-#: src/write-java.c:1143
+#: gnulib-lib/javacomp.c: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 "fallo al crear \"%s\""
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c: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 "hubo un error al escribir el fichero \"%s\""
@@ -200,13 +202,13 @@ msgstr "hubo un error al escribir el fichero \"%s\""
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-"No se encuentr al compilador de Java, intente instalar gcj o poner $JAVAC"
+"No se encuentró al compilador de Java, intente instalar gcj o poner $JAVAC"
#: gnulib-lib/javaexec.c:417
#, c-format
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
-"No se encontr a la mquina virtual de Java, intente instalar gij o poner "
+"No se encontró a la máquina virtual de Java, intente instalar gij o poner "
"$JAVA"
#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
@@ -215,20 +217,20 @@ msgstr ""
msgid "%s subprocess I/O error"
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/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 "Memoria agotada"
#: gnulib-lib/pipe-filter-ii.c:192
-#, fuzzy, c-format
+#, c-format
msgid "creation of threads failed"
-msgstr "fallo en la compilacin de la clase C#, intente --verbose"
+msgstr "fallo al crear hilos de ejecución"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "fallo en la escritura la subproceso %s"
@@ -246,12 +248,12 @@ msgstr "no se puede eliminar el bloqueo de la E/S del subproceso %s"
#: gnulib-lib/pipe-filter-ii.c:329
#, c-format
msgid "communication with %s subprocess failed"
-msgstr "fallo en la comunicacin con el subproceso %s"
+msgstr "fallo en la comunicación con el subproceso %s"
#: gnulib-lib/pipe-filter-ii.c:449
#, c-format
msgid "%s subprocess terminated with exit code %d"
-msgstr "el subproceso %s termin con un cdigo de salida %d"
+msgstr "el subproceso %s terminó con un código de salida %d"
#. TRANSLATORS:
#. Get translations for open and closing quotation marks.
@@ -276,22 +278,22 @@ msgstr "el subproceso %s termin con un cdigo de salida %d"
#. and use glyphs suitable for your language.
#: gnulib-lib/quotearg.c:312
msgid "`"
-msgstr ""
+msgstr "«"
#: gnulib-lib/quotearg.c:313
msgid "'"
-msgstr ""
+msgstr "»"
#: gnulib-lib/set-acl.c:46
#, c-format
msgid "setting permissions for %s"
-msgstr ""
+msgstr "configurando permisos para %s"
#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
#, c-format
msgid "cannot create pipe"
-msgstr "no se puede crear la tubera"
+msgstr "no se puede crear la tubería"
#: gnulib-lib/w32spawn.h:43
#, c-format
@@ -299,9 +301,9 @@ msgid "_open_osfhandle failed"
msgstr "fallo en _open_osfhandle"
#: gnulib-lib/w32spawn.h:84
-#, fuzzy, c-format
+#, c-format
msgid "cannot restore fd %d: dup2 failed"
-msgstr "no se puede crear el fichero de salida \"%s\""
+msgstr "no se puede restaurar fd %d: fallo en dup2"
#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
#: gnulib-lib/wait-process.c:317
@@ -312,31 +314,31 @@ msgstr "subproceso %s"
#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
#, c-format
msgid "%s subprocess got fatal signal %d"
-msgstr "el subproceso %s tiene una seal fatal %d"
+msgstr "el subproceso %s ha recibido 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: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 "error al abrir el fichero \"%s\" para lectura"
#: src/format.c:151
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
msgstr ""
-"'%s' no es un formato de cadena vlido %s, a diferencia de 'msgid'. Razn: %s"
+"'%s' no es un formato de cadena válido %s, a diferencia de '%s'. Motivo: %s"
#: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228
#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
-#, fuzzy, c-format
+#, c-format
msgid ""
"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
msgstr ""
-"una especificacin de formato para el argumento %u, como en '%s', no existe "
-"en 'msgid'"
+"una especificación de formato para el argumento %u, como en '%s', no existe "
+"en '%s'"
#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
@@ -344,7 +346,7 @@ msgstr ""
#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
#, c-format
msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "una especificacin de formato para el argumento %u no existe en '%s'"
+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
@@ -352,17 +354,16 @@ msgstr "una especificacin de formato para el argumento %u no existe en '%s'"
#: 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
+#, c-format
msgid "format specifications in '%s' and '%s' for argument %u are not the same"
msgstr ""
-"las especificaciones de formato en 'msgid' y '%s' para el argumento %u no "
-"son las mismas"
+"las especificaciones de formato en '%s' y '%s' para el argumento %u no son "
+"las mismas"
#: src/format-boost.c:449
-#, fuzzy, c-format
+#, c-format
msgid "The directive number %u starts with | but does not end with |."
-msgstr ""
-"La instruccin nmero %u termina con un carcter invlido en vez de un '}'."
+msgstr "La instrucción número %u comienza con | pero no ternina con |."
#: src/format-c.c:36
#, c-format
@@ -370,47 +371,47 @@ msgid ""
"In the directive number %u, the token after '<' is not the name of a format "
"specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
msgstr ""
-"En la instruccin nmero %u, el token posterior a '<' no es el nombre de un "
-"macro especificador de formato. Los nombres de macro vlidos estn listados "
-"en el ISO C 99 seccin 7.8.1."
+"En la instrucción número %u, el token posterior a '<' no es el nombre de un "
+"macro especificador de formato. Los nombres de macro válidos están listados "
+"en el ISO C 99 sección 7.8.1."
#: src/format-c.c:39
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
msgstr ""
-"En la instruccin nmero %u, el token posterior a '<' no est seguido por "
+"En la instrucción número %u, el token posterior a '<' no está seguido por "
"'>'."
#: src/format-c.c:42 src/format-gfc-internal.c:289
#, c-format
msgid "The string refers to argument number %u but ignores argument number %u."
msgstr ""
-"La cadena se refiere al argumento nmero %u, pero ignora el argumento nmero "
+"La cadena se refiere al argumento número %u, pero ignora el argumento número "
"%u."
#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
#: src/format-javascript.c:215 src/format-python.c:515
#: src/format-qt-plural.c:110
-#, fuzzy, c-format
+#, c-format
msgid "number of format specifications in '%s' and '%s' does not match"
-msgstr "el nmero de especificaciones de formato en `msgid' y '%s' no coincide"
+msgstr "el número de especificaciones de formato en `%s' y '%s' no coincide"
#: src/format-csharp.c:88 src/format-java.c:205
#, c-format
msgid "In the directive number %u, '{' is not followed by an argument number."
msgstr ""
-"En la instruccin nmero %u, '{' no est seguido de un nmero de argumento."
+"En la instrucción número %u, '{' no está seguido de un número de argumento."
#: src/format-csharp.c:109
#, c-format
msgid "In the directive number %u, ',' is not followed by a number."
-msgstr "En la instruccin nmero %u, ',' no est seguida de un nmero."
+msgstr "En la instrucción número %u, ',' no está seguida de un número."
#: src/format-csharp.c:130 src/format-java.c:191
msgid ""
"The string ends in the middle of a directive: found '{' without matching '}'."
msgstr ""
-"La cadena termina en medio de una instruccin: se encontr un '{' sin su '}' "
+"La cadena termina en medio de una instrucción: se encontró un '{' sin su '}' "
"correspondiente. "
#: src/format-csharp.c:139
@@ -418,105 +419,107 @@ msgstr ""
msgid ""
"The directive number %u ends with an invalid character '%c' instead of '}'."
msgstr ""
-"La instruccin nmero %u termina con un carcter invlido '%c' en vez de un "
+"La instrucción número %u termina con un carácter inválido '%c' en vez de un "
"'}'."
#: src/format-csharp.c:140
#, c-format
msgid "The directive number %u ends with an invalid character instead of '}'."
msgstr ""
-"La instruccin nmero %u termina con un carcter invlido en vez de un '}'."
+"La instrucción número %u termina con un carácter inválido en vez de un '}'."
#: src/format-csharp.c:161 src/format-java.c:346
msgid ""
"The string starts in the middle of a directive: found '}' without matching "
"'{'."
msgstr ""
-"La cadena comienza en medio de una instruccin: se encontr un '}' sin su "
+"La cadena comienza en medio de una instrucción: se encontró un '}' sin su "
"'{' correspondiente."
#: src/format-csharp.c:162
#, c-format
msgid "The string contains a lone '}' after directive number %u."
-msgstr "La cadena contiene un '}' solitario posterior a la instruccin %u."
+msgstr "La cadena contiene un '}' solitario posterior a la instrucción %u."
#: src/format-gcc-internal.c:255
-#, fuzzy, c-format
+#, c-format
msgid "In the directive number %u, the flags combination is invalid."
-msgstr "En la instruccin nmero %u, el argumento %d es negativo."
+msgstr "En la instrucción número %u, la combinación de banderas no es válida."
#: src/format-gcc-internal.c:292
-#, fuzzy, c-format
+#, c-format
msgid "In the directive number %u, a precision is not allowed before '%c'."
msgstr ""
-"En la instruccin nmero %u, las banderas no estn permitidas antes de '%c'."
+"En la instrucción número %u, la precisión no está permitida antes de '%c'."
#: src/format-gcc-internal.c:334
-#, fuzzy, c-format
+#, c-format
msgid ""
"In the directive number %u, the argument number for the precision must be "
"equal to %u."
msgstr ""
-"En la instruccin nmero %u, el nmero de argumento 0 no es un entero "
-"positivo."
+"En la instrucción número %u, el número de argumento de la precisión debe ser "
+"igual a %u."
#: src/format-gcc-internal.c:398
-#, fuzzy, c-format
+#, c-format
msgid ""
"In the directive number %u, a precision specification is not allowed before "
"'%c'."
msgstr ""
-"En la instruccin nmero %u, las banderas no estn permitidas antes de '%c'."
+"En la instrucción número %u, la especificación de la precisión no está "
+"permitida antes de '%c'."
#: src/format-gcc-internal.c:406
-#, fuzzy, c-format
+#, c-format
msgid "In the directive number %u, the precision specification is invalid."
-msgstr "En la instruccin nmero %u, el argumento %d es negativo."
+msgstr ""
+"En la instrucción número %u, la especificación de la precisión no es válida."
#: src/format-gcc-internal.c:463
#, c-format
msgid "In the directive number %u, flags are not allowed before '%c'."
msgstr ""
-"En la instruccin nmero %u, las banderas no estn permitidas antes de '%c'."
+"En la instrucción número %u, las banderas no están permitidas antes de '%c'."
#: src/format-gcc-internal.c:677
-#, fuzzy, c-format
+#, c-format
msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "'msgid' utiliza %%m pero '%s' no"
+msgstr "'%s' utiliza %%m pero '%s' no"
#: src/format-gcc-internal.c:680
-#, fuzzy, c-format
+#, c-format
msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "'msgid' no utiliza %%m pero '%s' utiliza %%m"
+msgstr "'%s' no utiliza %%m pero '%s' utiliza %%m"
#: src/format-gfc-internal.c:383
-#, fuzzy, c-format
+#, c-format
msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "'msgid' utiliza %%m pero '%s' no"
+msgstr "'%s' utiliza %%C pero '%s' no"
#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
+#, c-format
msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "'msgid' no utiliza %%m pero '%s' utiliza %%m"
+msgstr "'%s' no utiliza %%C pero '%s' utiliza %%C"
#: src/format-invalid.h:22
msgid "The string ends in the middle of a directive."
-msgstr "La cadena termina en medio de una instruccin."
+msgstr "La cadena termina en medio de una instrucción."
#: src/format-invalid.h:25
msgid ""
"The string refers to arguments both through absolute argument numbers and "
"through unnumbered argument specifications."
msgstr ""
-"La cadena se refiere a ambos argumentos a travs de nmeros de argumento "
-"absolutos y a travs de especificaciones de argumentos no numerados."
+"La cadena se refiere a ambos argumentos a través de números de argumento "
+"absolutos y a través de especificaciones de argumentos no numerados."
#: src/format-invalid.h:28
#, c-format
msgid ""
"In the directive number %u, the argument number 0 is not a positive integer."
msgstr ""
-"En la instruccin nmero %u, el nmero de argumento 0 no es un entero "
+"En la instrucción número %u, el número de argumento 0 no es un entero "
"positivo."
#: src/format-invalid.h:30
@@ -525,7 +528,7 @@ msgid ""
"In the directive number %u, the width's argument number 0 is not a positive "
"integer."
msgstr ""
-"En la instruccin nmero %u, la anchura del argumento nmero 0 no es un "
+"En la instrucción número %u, la anchura del argumento número 0 no es un "
"entero positivo."
#: src/format-invalid.h:32
@@ -534,7 +537,7 @@ msgid ""
"In the directive number %u, the precision's argument number 0 is not a "
"positive integer."
msgstr ""
-"En la instruccin nmero %u, la precisin del argumento nmero 0 no es un "
+"En la instrucción número %u, la precisión del argumento número 0 no es un "
"entero positivo."
#: src/format-invalid.h:36
@@ -543,8 +546,8 @@ msgid ""
"In the directive number %u, the character '%c' is not a valid conversion "
"specifier."
msgstr ""
-"En la instruccin nmero %u, el carcter '%c' no es un especificador de "
-"conversin vlido."
+"En la instrucción número %u, el carácter '%c' no es un especificador de "
+"conversión válido."
#: src/format-invalid.h:37
#, c-format
@@ -552,14 +555,14 @@ msgid ""
"The character that terminates the directive number %u is not a valid "
"conversion specifier."
msgstr ""
-"El carcter que termina la instruccin nmero %u no es un especificador de "
-"conversin vlido."
+"El carácter que termina la instrucción número %u no es un especificador de "
+"conversión válido."
#: src/format-invalid.h:40
#, c-format
msgid "The string refers to argument number %u in incompatible ways."
msgstr ""
-"La cadena se refiere al nmero de argumento %u de formas incompatibles."
+"La cadena se refiere al número de argumento %u de formas incompatibles."
#: src/format-java.c:240
#, c-format
@@ -567,21 +570,21 @@ msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
"style."
msgstr ""
-"En la instruccin nmero %u, la subcadena \"%s\" no est en un estilo de "
-"fecha/hora vlido."
+"En la instrucción número %u, la subcadena \"%s\" no está en un estilo de "
+"fecha/hora válido."
#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr "En la instruccin nmero %u, \"%s\" no est seguido de una coma."
+msgstr "En la instrucción número %u, \"%s\" no está seguido de una coma."
#: src/format-java.c:274
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
msgstr ""
-"En la instruccin nmero %u, la subcadena \"%s\" no es un estilo de nmero "
-"vlido."
+"En la instrucción número %u, la subcadena \"%s\" no es un estilo de número "
+"válido."
#: src/format-java.c:323
#, c-format
@@ -589,13 +592,13 @@ msgid ""
"In the directive number %u, the argument number is not followed by a comma "
"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
msgstr ""
-"En la instruccin nmero %u, el nmero de argumento no est seguido por una "
+"En la instrucción número %u, el número de argumento no está seguido por una "
"coma y uno de los siguientes \"%s\", \"%s\", \"%s\", \"%s\"."
#: src/format-java.c:572
#, c-format
msgid "In the directive number %u, a choice contains no number."
-msgstr "En la instruccin nmero %u, una opcin contiene un valor no numrico."
+msgstr "En la instrucción número %u, una opción contiene un valor no numérico."
#: src/format-java.c:583
#, c-format
@@ -603,29 +606,29 @@ msgid ""
"In the directive number %u, a choice contains a number that is not followed "
"by '<', '#' or '%s'."
msgstr ""
-"En la instruccin nmero %u, una opcin contiene un nmero que no est "
+"En la instrucción número %u, una opción contiene un número que no está "
"seguido por '<', '#' o '%s'."
#: src/format-java.c:745
-#, fuzzy, c-format
+#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
msgstr ""
-"una especificacin de formato para el argumento {%u}, como en '%s', no "
-"existe en 'msgid'"
+"una especificación de formato para el argumento {%u}, como en '%s', no "
+"existe en '%s'"
#: src/format-java.c:756
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "una especificacin de formato para el argumento {%u} no existe en '%s'"
+msgstr "una especificación de formato para el argumento {%u} no existe en '%s'"
#: src/format-java.c:776
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' and '%s' for argument {%u} are not the same"
msgstr ""
-"las especificaciones de formato en 'msgid' y '%s' para el argumento {%u} no "
-"son las mismas"
+"las especificaciones de formato en '%s' y '%s' para el argumento {%u} no son "
+"las mismas"
#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
#: src/format-scheme.c:2375
@@ -634,8 +637,8 @@ msgid ""
"In the directive number %u, parameter %u is of type '%s' but a parameter of "
"type '%s' is expected."
msgstr ""
-"En la instruccin nmero %u, el parmetro %u es de tipo '%s', pero se "
-"requiere de un parmetro de tipo '%s'."
+"En la instrucción número %u, el parámetro %u es de tipo '%s', pero se "
+"requiere de un parámetro de tipo '%s'."
#: src/format-lisp.c:2372 src/format-scheme.c:2398
#, c-format
@@ -646,37 +649,37 @@ msgid_plural ""
"In the directive number %u, too many parameters are given; expected at most "
"%u parameters."
msgstr[0] ""
-"En la instruccin nmero %u se dieron demasiados parmetros; se espera a lo "
-"ms %u parmetro."
+"En la instrucción número %u se dieron demasiados parámetros; se espera a lo "
+"más %u parámetro."
msgstr[1] ""
-"En la instruccin nmero %u se dieron demasiados parmetros; se esperan a lo "
-"ms %u parmetros."
+"En la instrucción número %u se dieron demasiados parámetros; se esperan a lo "
+"más %u parámetros."
#: src/format-lisp.c:2496 src/format-scheme.c:2499
#, c-format
msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr "En la instruccin nmero %u, '%c' no est seguida de un dgito."
+msgstr "En la instrucción número %u, '%c' no está seguida de un dígito."
#: src/format-lisp.c:2736 src/format-scheme.c:2754
#, c-format
msgid "In the directive number %u, the argument %d is negative."
-msgstr "En la instruccin nmero %u, el argumento %d es negativo."
+msgstr "En la instrucción número %u, el argumento %d es negativo."
#: src/format-lisp.c:2805
msgid "The string ends in the middle of a ~/.../ directive."
-msgstr "La cadena termina en medio de una instruccin ~/.../."
+msgstr "La cadena termina en medio de una instrucción ~/.../."
#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
#, c-format
msgid "Found '~%c' without matching '~%c'."
-msgstr "Se encontr '~%c' sin su '~%c' correspondiente."
+msgstr "Se encontró '~%c' sin su '~%c' correspondiente."
#: 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 "En la instruccin nmero %u, deben darse los modificadores @ y :."
+msgstr "En la instrucción número %u, deben darse los modificadores @ y :."
#: src/format-lisp.c:2976 src/format-scheme.c:2973
#, c-format
@@ -684,29 +687,29 @@ msgid ""
"In the directive number %u, '~:[' is not followed by two clauses, separated "
"by '~;'."
msgstr ""
-"En la instruccin nmero %u, '~:[' no est seguido de dos clusulas "
+"En la instrucción número %u, '~:[' no está seguido de dos cláusulas "
"separadas por '~;'."
#: src/format-lisp.c:3326 src/format-scheme.c:3263
#, c-format
msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr "En la instruccin nmero %u, '~;' se utiliz en una posicin invlida."
+msgstr "En la instrucción número %u, '~;' se utilizó en una posición inválida."
#: src/format-lisp.c:3432 src/format-scheme.c:3355
msgid "The string refers to some argument in incompatible ways."
-msgstr "La cadena se refiere a algn argumento de forma incompatible."
+msgstr "La cadena se refiere a algún argumento de forma incompatible."
#: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, fuzzy, c-format
+#, c-format
msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "las especificaciones de formato en `msgid' y '%s' no son equivalentes"
+msgstr "las especificaciones de formato en `%s' y '%s' no son equivalentes"
#: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, fuzzy, c-format
+#, c-format
msgid "format specifications in '%s' are not a subset of those in '%s'"
msgstr ""
-"las especificaciones de formato en '%s' no son un subconjunto de aquellas en "
-"'msgid'"
+"las especificaciones de formato en '%s' no son un subconjunto de las que hay "
+"en '%s'"
#: src/format-perl.c:433
#, c-format
@@ -714,23 +717,23 @@ msgid ""
"In the directive number %u, the size specifier is incompatible with the "
"conversion specifier '%c'."
msgstr ""
-"En la instruccin nmero %u, el tamao del especificador es incompatible "
-"con el especificador de conversin '%c'."
+"En la instrucción número %u, el tamaño del especificador es incompatible "
+"con el especificador de conversión '%c'."
#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c: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'"
-msgstr "una especificacin de formato para el argumento '%s' no existe en '%s'"
+msgstr "una especificación de formato para el argumento '%s' no existe en '%s'"
#: src/format-python.c:115
msgid ""
"The string refers to arguments both through argument names and through "
"unnamed argument specifications."
msgstr ""
-"La cadena se refiere a ambos argumentos a travs de nmeros de argumento "
-"absolutos y a travs de especificaciones de argumentos no numerados."
+"La cadena se refiere a ambos argumentos a través de números de argumento "
+"absolutos y a través de especificaciones de argumentos no numerados."
#: src/format-python.c:354
#, c-format
@@ -739,64 +742,66 @@ msgstr ""
"La cadena se refiere al argumento denominado '%s' en formas incompatibles."
#: src/format-python.c:430
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
msgstr ""
-"las especificaciones de formato en `msgid' requieren un mapeo, y aquellas en "
-"'%s' requieren una tupla"
+"las especificaciones de formato en '%s' requieren una asociación, y aquellas "
+"en '%s' requieren una tupla"
#: src/format-python.c:437
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
msgstr ""
-"las especificaciones de formato en `msgid' requieren una tupla y aquellas en "
-"'%s' requieren un mapeo"
+"las especificaciones de formato en '%s' requieren una tupla y aquellas en "
+"'%s' requieren una asociación"
#: src/format-python.c:460 src/format-sh.c:297
-#, fuzzy, c-format
+#, c-format
msgid ""
"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
msgstr ""
-"una especificacin de formato para el argumento '%s', como en '%s', no "
-"existe en 'msgid'"
+"una especificación de formato para el argumento '%s', como en '%s', no "
+"existe en '%s'"
#: src/format-python.c:494
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' and '%s' for argument '%s' are not the same"
msgstr ""
-"las especificaciones de formato en 'msgid' y '%s' para el argumento '%s' no "
-"son las mismas"
+"las especificaciones de formato en '%s' y '%s' para el argumento '%s' no son "
+"las mismas"
-#: src/format-python-brace.c:136
-#, fuzzy, c-format
+#: src/format-python-brace.c:137
+#, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "En la instruccin nmero %u, '%c' no est seguida de un dgito."
+msgstr "En la instrucción número %u, '%c' no puede iniciar un nombre de campo."
-#: src/format-python-brace.c:149
-#, fuzzy, c-format
+#: src/format-python-brace.c:150
+#, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
msgstr ""
-"En la instruccin nmero %u, '{' no est seguido de un nmero de argumento."
+"En la instrucción número %u, '%c' no puede iniciar un argumento de getattr."
-#: src/format-python-brace.c:164
-#, fuzzy, c-format
+#: src/format-python-brace.c:165
+#, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "En la instruccin nmero %u, '%c' no est seguida de un dgito."
+msgstr ""
+"En la instrucción número %u, '%c' no puede iniciar un argumento de getitem."
-#: src/format-python-brace.c:184
-#, fuzzy, c-format
+#: src/format-python-brace.c:185
+#, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
msgstr ""
-"En la instruccin nmero %u, las banderas no estn permitidas antes de '%c'."
+"En la instrucción número %u, no se permite más anidamiento en un "
+"especificador de formato."
-#: src/format-python-brace.c:210
-#, fuzzy, c-format
+#: src/format-python-brace.c:270
+#, c-format
msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "En la instruccin nmero %u, el argumento %d es negativo."
+msgstr "En la instrucción número %u, hay una instrucción de formato inacabada."
#: src/format-qt.c:152
#, c-format
@@ -804,6 +809,8 @@ msgid ""
"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
"a double-digit argument number"
msgstr ""
+"'%s' es una cadena de formato simple, pero '%s' no lo es: contiene una "
+"bandera 'L' o un número de argumentos de dos dígitos"
#: src/format-sh.c:79
msgid "The string refers to a shell variable with a non-ASCII name."
@@ -815,20 +822,20 @@ msgid ""
"The string refers to a shell variable with complex shell brace syntax. This "
"syntax is unsupported here due to security reasons."
msgstr ""
-"La cadena se refiere a una variable de entorno con una sintxis compleja. "
-"Esta sintxis no se admite aqu debido a potenciales problemas de seguridad."
+"La cadena se refiere a una variable de entorno con una sintaxis compleja. "
+"Esta sintaxis no se admite aquí debido a potenciales problemas de seguridad."
#: src/format-sh.c:83
msgid ""
"The string refers to a shell variable whose value may be different inside "
"shell functions."
msgstr ""
-"La cadena se refiere a una variable de entorno cuyo valor podra ser "
-"distinto dentro de las funciones del intrprete de comandos."
+"La cadena se refiere a una variable de entorno cuyo valor podría ser "
+"distinto dentro de las funciones del intérprete de comandos."
#: src/format-sh.c:85
msgid "The string refers to a shell variable with an empty name."
-msgstr "La cadena se refiere a una variable de entrono con un nombre vaco."
+msgstr "La cadena se refiere a una variable de entorno con un nombre vacío."
#: src/format-ycp.c:90
#, c-format
@@ -836,7 +843,7 @@ msgid ""
"In the directive number %u, the character '%c' is not a digit between 1 and "
"9."
msgstr ""
-"En la instruccin nmero %u, el carcter '%c' no es un dgito entre 1 y 9."
+"En la instrucción número %u, el carácter '%c' no es un dígito entre 1 y 9."
#: src/format-ycp.c:91
#, c-format
@@ -844,13 +851,13 @@ msgid ""
"The character that terminates the directive number %u is not a digit between "
"1 and 9."
msgstr ""
-"El carcter que termina la instruccin nmero %u no es un dgito entre 1 y 9."
+"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: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"
@@ -858,47 +865,51 @@ msgid ""
"This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Licencia GPLv3+: GNU GPL versión 3 o posterior <http://gnu.org/licenses/gpl.html>\n"
+"Esto es software libre: es usted libre de cambiarlo y redistribuirlo.\n"
+"SIN NINGUNA GARATÍA, dentro de los límites legales.\n"
-#: 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 "Escrito por %s.\n"
#. 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 ""
+msgstr "Bruno Haible"
#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
msgstr "demasiados argumentos"
-#: src/hostname.c:207 src/msgattrib.c:410 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
-#: src/msgfilter.c:384 src/msgfmt.c:650 src/msggrep.c:507 src/msginit.c:358
-#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:828
-#, fuzzy, c-format
+#: 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 "Pruebe `%s --help' para ms informacin.\n"
+msgstr "Pruebe '%s --help' para más información.\n"
#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
-msgstr "Modo de empleo: %s [OPCIN]\n"
+msgstr "Modo de empleo: %s [OPCIÓN]\n"
#: src/hostname.c:215
#, c-format
msgid "Print the machine's hostname.\n"
-msgstr "Muestra el nombre de la mquina.\n"
+msgstr "Muestra el nombre de la máquina.\n"
#: src/hostname.c:218
#, c-format
@@ -908,7 +919,7 @@ msgstr "Formato de salida:\n"
#: src/hostname.c:220
#, c-format
msgid " -s, --short short host name\n"
-msgstr " -s, --short nombre de corto de la mquina\n"
+msgstr " -s, --short nombre de corto de la máquina\n"
#: src/hostname.c:222
#, c-format
@@ -917,170 +928,167 @@ msgid ""
"domain\n"
" name, and aliases\n"
msgstr ""
-" -f, --fqdn, --long nombre largo de la mquina, incluye el "
+" -f, --fqdn, --long nombre largo de la máquina, incluye el "
"nombre\n"
-" completo del dominio calificado,\n"
+" completo del dominio y los alias,\n"
#: src/hostname.c:225
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
msgstr ""
-" -i, --ip-address direcciones para el nombre de la mquina\n"
+" -i, --ip-address direcciones para el nombre de la máquina\n"
-#: src/hostname.c:228 src/msgattrib.c:525 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
-#: src/msgfilter.c:476 src/msgfmt.c:775 src/msggrep.c:623 src/msginit.c:420
-#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
+#: src/hostname.c: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 "Salida informativa:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help muestra esta ayuda y finaliza\n"
-#: 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 " -V, --version muestra la versin y finaliza\n"
+msgstr " -V, --version muestra la versión y finaliza\n"
#. TRANSLATORS: The placeholder indicates the bug-reporting address
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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 "Comunicar los `bugs' a <bug-gnu-gettext@gnu.org>.\n"
#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
#, c-format
msgid "could not get host name"
-msgstr "no se pudo obtener el nombre de la mquina"
+msgstr "no se pudo obtener el nombre de la máquina"
-#: 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 "slo se permite un fichero de entrada mximo"
+msgstr "solo se permite un fichero de entrada máximo"
-#: 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 "%s y %s son mutuamente excluyentes"
-#: 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 "Modo de empleo: %s [OPCIN] [FICHEROENTRADA]\n"
+msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
"and manipulates the attributes.\n"
msgstr ""
-"Filtra los mensajes de un catlogo de traduccin de acuerdo con sus\n"
+"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: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 ""
-"Los argumentos obligatorios para las opciones largas tambin son "
+"Los argumentos obligatorios para las opciones largas también son "
"obligatorios para las opciones cortas.\n"
# acepto sugerencia de em pero agrego un "el". mm
-#: src/msgattrib.c: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 "Localizacin del fichero de entrada:\n"
+msgstr "Localización del fichero de entrada:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
-msgstr " FICHERODEENTRADA fichero PO de entrada\n"
+msgstr " FICHEROENTRADA fichero PO de entrada\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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 ""
-" -D, --directory=DIRECTORIO aade al DIRECTORIO a la lista de bsqueda de "
+" -D, --directory=DIRECTORIO añade al DIRECTORIO a la lista de búsqueda de "
"ficheros\n"
" de entrada\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
"Si no se especifica un fichero de entrada o si es -, se lee la entrada "
-"estndar.\n"
+"estándar.\n"
-#: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
-#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
-#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
-#: src/xgettext.c:857
+#: src/msgattrib.c:442 src/msgcat.c: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 "Localizacin del fichero de salida:\n"
+msgstr "Localización del fichero de salida:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 ""
" -o, --output-file=FICHERO escribe la salida al FICHERO 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
-#: 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 ""
-"Los resultados se escriben a la salida estndar si no se especifica ningn\n"
+"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: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 "Seleccin de mensaje:\n"
+msgstr "Selección de mensaje:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
@@ -1088,7 +1096,7 @@ msgstr ""
" --translated mantiene lo traducido, elimina los mensajes "
"sin traducir\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
@@ -1096,144 +1104,153 @@ msgstr ""
" --untranslated mantiene lo no traducido, elimina los mensajes "
"traducidos\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr ""
" --no-fuzzy elimina los mensajes difusos marcados como "
"'fuzzy'\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr ""
" --only-fuzzy mantiene los mensajes difusos marcados con "
"'fuzzy'\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete elimina los mensajes obsoletos #~\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete mantiene los mensajes obsoletos #~\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
-msgstr "Manipulacin de atributos:\n"
+msgstr "Manipulación de atributos:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr ""
" --set-fuzzy marca todos los mensajes como difusos 'fuzzy'\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr ""
" --clear-fuzzy marca todos los mensajes como no difusos "
"(no-'fuzzy')\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr ""
" --set-obsolete marca todos los mensajes como obsoletos\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr ""
" --clear-obsolete marca todos los mensajes como no-obsoletos\n"
-#: src/msgattrib.c:468
-#, fuzzy, c-format
+#: src/msgattrib.c:475
+#, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
" of translated messages.\n"
msgstr ""
-" --translated mantiene lo traducido, elimina los mensajes "
-"sin traducir\n"
+" --previous cuando se configura 'fuzzy', mantiene los "
+"msgids\n"
+" anteriores de los mensajes traducidos.\n"
-#: src/msgattrib.c:471
-#, fuzzy, c-format
+#: src/msgattrib.c:478
+#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
"messages\n"
msgstr ""
-" --clear-fuzzy marca todos los mensajes como no difusos "
-"(no-'fuzzy')\n"
+" --clear-previous elimina el \"msgid anterior\" de todos los "
+"mensajes\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, fuzzy, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+" --no-fuzzy elimina los mensajes difusos marcados como "
+"'fuzzy'\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
msgstr ""
-" --only-file=FICHERO.po manipula slo las entradas enlistadas en el "
-"FICHERO.po\n"
+" --only-file=FICHERO.po manipula solo las entradas que se encuentran "
+"en FICHERO.po\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
msgstr ""
-" --ignore-file=FICHERO.po manipula slo las entradas no listadas en "
+" --ignore-file=FICHERO.po manipula solo las entradas no listadas en "
"FICHERO.po\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr " --fuzzy sinnimo de --only-fuzzy --clear-fuzzy\n"
+msgstr " --fuzzy sinónimo de --only-fuzzy --clear-fuzzy\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
msgstr ""
-" --obsolete sinnimo de --only-obsolete --clean-obsolete\n"
+" --obsolete sinónimo de --only-obsolete --clean-obsolete\n"
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c: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 "Sintxis del fichero de entrada:\n"
+msgstr "Sintáxis del fichero 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
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
-" -P, --properties-input el fichero de entrada est en la sintxis de ."
-"properties de Java\n"
+" -P, --properties-input el fichero de entrada sigue la misma sintaxis "
+"que .properties de Java\n"
-#: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
-#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
#, c-format
msgid ""
" --stringtable-input input file is in NeXTstep/GNUstep .strings "
"syntax\n"
msgstr ""
-" --stringtable-input el fichero de entrada est en la sintxis de ."
+" --stringtable-input el fichero de entrada sigue la sintaxis de ."
"strings de 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
-#: 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 "Detalles de salida:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1241,83 +1258,89 @@ msgid ""
" WHEN may be 'always', 'never', 'auto', or "
"'html'.\n"
msgstr ""
+" --color utilizar siempre colores y otros atributos de "
+"texto\n"
+" --color=CUANDO utilizar colores y otros atributos de texto si "
+"se cumple CUANDO.\n"
-#: 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 ""
+" --stule=FICHEROESTILO especifica fichero de reglas de estilo CSS "
+"para --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
+#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:977
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
msgstr ""
" -e, --no-escape no utiliza escapes de C en la salida (por "
-"omisin)\n"
+"omisión)\n"
-#: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
-#: src/msguniq.c:390 src/xgettext.c:956
+#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
msgstr ""
" -E, --escape utiliza escapes de C en la salida, sin "
-"carcteres extendidos\n"
+"caracteres extendidos\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
-" --force-po escribe un fichero PO an si est vaco\n"
+" --force-po escribe un fichero PO aún si está vacío\n"
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
" -i, --indent escribe el fichero .po utilizando estilo con "
"sangrados\n"
-#: 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 ""
-" --no-location no escribe las lneas '#: fichero:lnea'\n"
+" --no-location no escribe las líneas '#: fichero:línea'\n"
-#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:964
+#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
+#: src/xgettext.c:987
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr ""
-" -n, --add-location genera lneas '#: fichero:lnea' (por omisin)\n"
+" -n, --add-location genera líneas '#: fichero:línea' (por omisión)\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
+#: src/xgettext.c:989
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
" --strict escribe un fichero .po con Uniforum estricto\n"
-#: 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 " -p, --properties-output escribe un fichero .properties de 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
+#: 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"
@@ -1325,53 +1348,53 @@ msgstr ""
" --stringtable-output escribe un fichero .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
-#: 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 " -w, --width=NMERO pone la anchura de la pgina de salida\n"
+msgstr " -w, --width=NÚMERO pone la anchura de la página de salida\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c: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 ""
-" --no-wrap no divide a las lneas de los mensajes, "
+" --no-wrap no divide a las líneas de los mensajes, "
"aunque\n"
-" sean mayores a la anchura de la pgina de "
+" sean mayores a la anchura de la página de "
"salida\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output genera una salida ordenada\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 ""
-" -F, --sort-by-file ordena la salida por ubicacin de fichero\n"
+" -F, --sort-by-file ordena la salida por ubicación de fichero\n"
-#: 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 "se especific un criterio de seleccin imposible (%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:832
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
-msgstr "Modo de empleo: %s [OPCIN] [FICHEROENTRADA]...\n"
+msgstr "Modo de empleo: %s [OPCIÓN] [FICHEROENTRADA]...\n"
-#: src/msgcat.c:371
-#, fuzzy, c-format, no-wrap
+#: src/msgcat.c:372
+#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
"Find messages which are common to two or more of the specified PO files.\n"
@@ -1384,124 +1407,123 @@ msgid ""
"to define them.\n"
msgstr ""
"Concatena y mezcla los ficheros PO especificados.\n"
-"Encuentra los mensajes que son comunes a dos o ms de los ficheros PO\n"
-"especificados.\n"
-"Si se utiliza la opcin --more-than, se pueden solicitar mayor nmero\n"
-"de elementos en comn antes de que los mensajes sean mostrados. De\n"
-"forma similar, la opcin --less-than puede ser utilizada para\n"
-"especificar el mnimo de mensajes en comn que sern mostrados (i.e.\n"
-"--less-than=2 slo mostr los mensajes nicos). Las traducciones, los\n"
-"comentarios y los comentarios extrados sern conservados, excepto si\n"
-"se especifica --use-first, en donde sern tomados desde el primer\n"
-"fichero PO para definirlos. Las posiciones dentro del fichero de todos\n"
-"los ficheros PO se conservarn. \n"
-
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
+"Encuentra los mensajes que son comunes a dos o más de los ficheros PO especificados.\n"
+"Si se utiliza la opción --more-than, se pueden solicitar mayor número\n"
+"de elementos en común antes de que los mensajes sean mostrados. De\n"
+"forma similar, la opción --less-than puede ser utilizada para\n"
+"especificar el mínimo de mensajes en común que serán mostrados (i.e.\n"
+"--less-than=2 solo mostrará los mensajes únicos). Las traducciones, los\n"
+"comentarios, los comentarios extraídos y la posición en los ficheros serán acumulados, excepto si\n"
+"se especifica --use-first, en cuyo caso serán tomados del primer\n"
+"fichero PO para definirlos.\n"
+
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
#, c-format
msgid " INPUTFILE ... input files\n"
-msgstr " FICHERODEENTRADA ... ficheros de entrada\n"
+msgstr " FICHEROENTRADA ... ficheros de entrada\n"
-#: 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 ""
" -f, --files-from=FICHERO obtiene una lista de ficheros de entrada del "
"FICHERO\n"
-#: 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 "Si el fichero de entrada es -, se lee la entrada estndar.\n"
+msgstr "Si el fichero de entrada es -, se lee la entrada estándar.\n"
-#: 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 ""
-" -<, --less-than=NMERO imprime los mensajes con menos que este NMERO "
+" -<, --less-than=NÚMERO imprime los mensajes con menos que este NÚMERO "
"de \n"
-" definiciones, si no se especifica, es "
+" definiciones; si no se especifica, es "
"infinito\n"
-#: 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 ""
-" ->, --more-than=NMERO imprime los mensajes con ms de este NMERO "
+" ->, --more-than=NÚMERO imprime los mensajes con más de este NÚMERO "
"de\n"
-" definiciones, si no se pone, utiliza 0\n"
+" definiciones; si no se pone, utiliza 0\n"
-#: 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 ""
" -u, --unique abreviatura de --less-than=2, solicita\n"
-" que slo se impriman los mensajes nicos\n"
+" que solo se impriman los mensajes únicos\n"
-#: 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 ""
-" -P, --properties-input los ficheros de entrada estn en la sintxis ."
-"properties de Java\n"
+" -P, --properties-input los ficheros de entrada siguen la misma "
+"sintaxis que .properties de Java\n"
-#: 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 ""
-" --stringtable-input los ficheros de entrada estn en la sintxis\n"
+" --stringtable-input los ficheros de entrada están en la sintaxis\n"
" .strings de NeXTstep/GNUstep.\n"
-#: 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 " -t, --to-code=NOMBRE codifica para la salida\n"
+msgstr " -t, --to-code=NOMBRE codificación de la salida\n"
-#: 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 ""
-" -use-first utiliza la primera traduccin disponible para\n"
+" -use-first utiliza la primera traducción disponible para\n"
" cada mensaje, no mezcla varias traducciones\n"
-#: 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 ""
+" --lang=NOMBRECATALOGO pone el campo 'Language' en la cabecera\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
-msgstr ""
+msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "no se especificaron ficheros de entrada"
-#: 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 "se requieren exactamente 2 ficheros de entrada"
-#: 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 "Modo de empleo: %s [OPCIN] def.po ref.pot\n"
+msgstr "Modo de empleo: %s [OPCIÓN] def.po ref.pot\n"
# Sugerencia: verificar -> comprobar
# Sugerencia: revisar -> comprobar
@@ -1510,8 +1532,8 @@ msgstr "Modo de empleo: %s [OPCIN] def.po ref.pot\n"
# primer "verificar". sv
# ok. aceptada.
#
-# Max, yo deca al revs, el primero, verificar, el segundo comprobar. sv
-# Pero bueno, no voy a discutir por algo tan pequeo. sv
+# Max, yo decía al revés, el primero, verificar, el segundo comprobar. sv
+# Pero bueno, no voy a discutir por algo tan pequeño. sv
# ok. mm
#
# sugerencia: concordancia -> coincidencia. sv
@@ -1519,8 +1541,8 @@ msgstr "Modo de empleo: %s [OPCIN] def.po ref.pot\n"
# coinciden. Creo que el programa quiere decir concordancia no
# coincidencia. mm
# A ver si te convenzo: concordancia se aplica a cosas distintas que deben
-# relacionarse de acuerdo con ciertas reglas, por ejemplo, el artculo y
-# el nombre deben concordar en gnero y nmero.
+# relacionarse de acuerdo con ciertas reglas, por ejemplo, el artículo y
+# el nombre deben concordar en género y número.
# Coincidencia se aplica a cosas de la misma especie que pueden ser iguales
# o no ser iguales.
# Todos los msgid son del mismo tipo. No los hay de tipo "nombre" o de tipo
@@ -1529,40 +1551,40 @@ msgstr "Modo de empleo: %s [OPCIN] def.po ref.pot\n"
# iguales. sv
#
# (uf, menuda parrafada). sv
-# Eres duro de pelar! tienes razn. mm
+# ¡Eres duro de pelar! tienes razón. mm
#
-# Otra vez lo mismo 'informa de la versin y ... " em
-# Y otra cosa ... si llamas una vez ficheros .po , sigue hacindolo as
-# siempre. y no una vez .po y otra PO . Ficheros PO me parece tan ptimo
-# como ficheros .po . Tambin he corregido un fallo de tecleo en la
-# ltima lnea ( .. el la precisin de diagnstico ... ) . em
-# tienes razn. Buscar uniformizar los ficheros a .po (es ms discreto)
-# No. Ya revis cul fue la razn de traducir as: el original
-# Esto es, respet la norma seguida del original en ingls. De todas
-# formas no me parece insensato modificar este extrao comportamiento
-# en el momento de traducir. Qu opinas? mm
+# Otra vez lo mismo 'informa de la versión y ... " em
+# Y otra cosa ... si llamas una vez ficheros .po , sigue haciéndolo así
+# siempre. y no una vez .po y otra PO . Ficheros PO me parece tan óptimo
+# como ficheros .po . También he corregido un fallo de tecleo en la
+# última línea ( .. el la precisión de diagnóstico ... ) . em
+# tienes razón. Buscaré uniformizar los ficheros a .po (es más discreto)
+# No. Ya revisé cuál fue la razón de traducir así: el original
+# Esto es, respeté la norma seguida del original en inglés. De todas
+# formas no me parece insensato modificar este extraño comportamiento
+# en el momento de traducir. ¿Qué opinas? mm
#
-# La terminologa en cuanto a los ficheros .po ha cambiado mucho. Al principio
-# eran ficheros .pot , as que imagnate. Ahora definitivamente son
-# ficheros .po , y as se nombran en los documentos. Acabo de ver la faq de
-# fr@es.li y as es como lo llaman tambien;
-# L'ensemble des fichiers .po dj ... em+
+# La terminología en cuanto a los ficheros .po ha cambiado mucho. Al principio
+# eran ficheros .pot , así que imagínate. Ahora definitivamente son
+# ficheros .po , y así se nombran en los documentos. Acabo de ver la faq de
+# fr@es.li y así es como lo llaman tambien;
+# L'ensemble des fichiers « .po » déjà ... em+
# ok. Modifico todos los PO por .po que es mas ligero y mejor. mm+
#
# Dos comentarios: Enrique debe andar algo despistado:
# Un fichero .pot es una "plantilla" (de "template") de un fichero .po
-# As que no es que cambie la nomenclatura, es que son dos cosas
-# distintas. De hecho, los ficheros .po vacos con los que comenzamos
-# una traduccin son casi idnticos a los ficheros .pot originales. sv
+# Así que no es que cambie la nomenclatura, es que son dos cosas
+# distintas. De hecho, los ficheros .po vacíos con los que comenzamos
+# una traducción son casi idénticos a los ficheros .pot originales. sv
#
-# Y otra cosa: Lo del .po .PO. Habr que respetar el original ingls, no?
+# Y otra cosa: Lo del .po .PO. Habrá que respetar el original inglés, ¿no?
#
-# Otra cosa: Se puede decir "tambin son" o "son tambin"
+# Otra cosa: Se puede decir "también son" o "son también"
# (lo tengo de una forma en recode y de otra en wdiff). Elige...
# (a ver si me aclaro). O a lo mejor en unos casos es mejor de una forma
# y en otros de otra (la frase no era exactamente igual).
-# 11061996mm: En particular en gettext el letrero es estndar, por lo que
-# prefiero "tambin son" que, creo suena mejor. Homogeinizo todo.
+# 11061996mm: En particular en gettext el letrero es estándar, por lo que
+# prefiero "también son" que, creo suena mejor. Homogeinizo todo.
#: src/msgcmp.c:218
#, c-format, no-wrap
msgid ""
@@ -1576,11 +1598,11 @@ msgstr ""
"Compara dos ficheros .po de estilo Uniforum para comprobar que ambos\n"
"contienen el mismo conjunto de cadenas de mensajes (msgid). El fichero\n"
"def.po es un fichero existente de tipo .po con las traducciones\n"
-"antiguas. El fichero ref.po es el ltimo fichero .po creado\n"
-"(generalmente por xgettext). Esto es til para verificar que se han\n"
+"antiguas. El fichero ref.po es el último fichero .po creado\n"
+"(generalmente por xgettext). Esto es útil para verificar que se han\n"
"traducido todos y cada uno de los mensajes del programa. Cuando no\n"
-"se encuentre un resultado exacto, se utilizar coincidencia difusa, de\n"
-"tal forma que la precisin del diagnstico sea mejor.\n"
+"se encuentre un resultado exacto, se utilizará coincidencia difusa, de\n"
+"tal forma que la precisión del diagnóstico sea mejor.\n"
#: src/msgcmp.c:232
#, c-format
@@ -1590,14 +1612,14 @@ msgstr " def.po traducciones\n"
#: src/msgcmp.c:234
#, c-format
msgid " ref.pot references to the sources\n"
-msgstr " ref.po referencias a las fuentes\n"
+msgstr " ref.pot referencias a las fuentes\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
-msgstr "Modificadores de operacin:\n"
+msgstr "Modificadores de operación:\n"
-#: 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."
@@ -1606,89 +1628,89 @@ msgstr ""
" -m, --multi-domain aplica ref.pot a cada uno de los dominios en\n"
" def.po\n"
-#: 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 " -N, --no-fuzzy-matching no utiliza la coincidencia difusa\n"
#: src/msgcmp.c:245
-#, fuzzy, c-format
+#, c-format
msgid " --use-fuzzy consider fuzzy entries\n"
msgstr ""
-" -f, --use-fuzzy utiliza entradas difusas para la salida\n"
+" --use-fuzzy utiliza entradas difusas para la salida\n"
#: src/msgcmp.c:247
-#, fuzzy, c-format
+#, c-format
msgid " --use-untranslated consider untranslated entries\n"
msgstr ""
-" --untranslated mantiene lo no traducido, elimina los mensajes "
+" --use-untranslated utiliza las entradas no traducidas\n"
"traducidos\n"
#: src/msgcmp.c:324
-#, fuzzy, c-format
+#, c-format
msgid "this message is untranslated"
-msgstr "atencin: este mensaje no se utiliza"
+msgstr "este mensaje no está traducido"
#: src/msgcmp.c:330
#, c-format
msgid "this message needs to be reviewed by the translator"
-msgstr ""
+msgstr "este mensaje debe ser revisado por el traductor"
-#: 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 "este mensaje se usa pero no est definido..."
+msgstr "este mensaje se usa pero no está definido..."
-#: 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 "...pero esta definicin es parecida"
+msgstr "...pero esta definición es parecida"
-#: 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 "este mensaje se usa pero no est definido en %s"
+msgstr "este mensaje se usa pero no está definido en %s"
#: src/msgcmp.c:546
#, c-format
msgid "warning: this message is not used"
-msgstr "atencin: este mensaje no se utiliza"
+msgstr "atención: este mensaje no se utiliza"
-# Jeje. Bueno , esto me recuerda a una cancin de Burning, digo lo
-# de fatal. Fatal en Castellano es muy malo, o peligrossimo ... creo que
-# habr que dejarlo as, es ms convincente. Perdona por estas 3 lineas em
+# Jeje. Bueno , esto me recuerda a una canción de Burning, digo lo
+# de fatal. Fatal en Castellano es muy malo, o peligrosísimo ... creo que
+# habrá que dejarlo así, es más convincente. Perdona por estas 3 lineas em
#
-# Burning? Mi incultura es grave quines son esos? mm
+# ¿Burning? Mi incultura es grave ¿quiénes son esos? mm
#
-# Son los que cantan lo de 'qu hace una chica como t en un sitio como este'
-# en una parte de la cancin repiten: 'mujer fatal ... ' :) em+
+# Son los que cantan lo de 'qué hace una chica como tú en un sitio como este'
+# en una parte de la canción repiten: 'mujer fatal ... ' :) em+
#
-# Ah! Dirn que soy pocho pero oigo muy poca msica en castellano, a lo
-# ms que llego es a Sabina y a Mecano y la Orquesta Mondragn cuando
-# exista. Volviendo a la discusin, prefiero lo de fatal: tiene mucho
-# peso. Aunque ... qu tal 'errores imperdonables'? mm+
+# ¡Ah! Dirán que soy pocho pero oigo muy poca música en castellano, a lo
+# más que llego es a Sabina y a Mecano y la Orquesta Mondragón cuando
+# existía. Volviendo a la discusión, prefiero lo de fatal: tiene mucho
+# peso. Aunque ... ¿qué tal 'errores imperdonables'? mm+
#
# Tal y como yo lo veo, "Error fatal" es el que obliga al programa a detenerse.
-# En ingls se utiliza esta palabra con ese significado.
-# A menos que veamos un libro en espaol que utilice una palabra distinta
-# para referirse a lo mismo, sugiero dejarlo como est. sv
+# En inglés se utiliza esta palabra con ese significado.
+# A menos que veamos un libro en español que utilice una palabra distinta
+# para referirse a lo mismo, sugiero dejarlo como está. sv
#
# 07061996mm: Mujer fatal es menos que mortal, menos que peligroso e incita a la
-# aventura. Quiz no sea tan malo como dice Enrique, a menos que...
-#: src/msgcmp.c:553 src/msgfmt.c:545
+# aventura. Quizá no sea tan malo como dice Enrique, a menos que...
+#: 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] "se encontr el error fatal %d"
+msgstr[0] "se encontró %d error fatal"
msgstr[1] "se encontraron %d errores fatales"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "se deben especificar por lo menos dos ficheros"
-#: src/msgcomm.c:363
-#, fuzzy, c-format, no-wrap
+#: src/msgcomm.c:364
+#, c-format, no-wrap
msgid ""
"Find messages which are common to two or more of the specified PO files.\n"
"By using the --more-than option, greater commonality may be requested\n"
@@ -1699,96 +1721,98 @@ msgid ""
"PO file to define them. File positions from all PO files will be\n"
"cumulated.\n"
msgstr ""
-"Busca los mensajes que son comunes a dos o ms de los ficheros PO\n"
-"especificados. Si se utiliza la opcin --more-than, se pueden\n"
-"solicitar mayor nmero de elementos en comn antes de que los mensajes\n"
-"sean mostrados. De forma similar, la opcin --less-than puede ser\n"
-"utilizada para especificar el mnimo de mensajes en comn que sern\n"
-"mostrados (i.e. --less-than=2 slo mostr los mensajes nicos). Las\n"
-"traducciones, los comentarios y los comentarios extrados sern\n"
-"conservados, pero slo los que provengan del primer fichero PO que los\n"
+"Busca los mensajes que son comunes a dos o más de los ficheros PO\n"
+"especificados. Si se utiliza la opción --more-than, se pueden\n"
+"solicitar mayor número de elementos en común antes de que los mensajes\n"
+"sean mostrados. De forma similar, la opción --less-than puede\n"
+"utilizarse para especificar el mínimo de mensajes en común que serán\n"
+"mostrados (i.e. --less-than=2 solo mostrará los mensajes únicos). Las\n"
+"traducciones, los comentarios y los comentarios extraídos serán\n"
+"conservados, pero solo los del primer fichero PO que los\n"
"defina. Las posiciones dentro del fichero de todos los ficheros PO se\n"
-"conservarn.\n"
+"acumularán.\n"
-#: 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 ""
-" ->, --more-than=NMERO muestra los mensajes con ms de este\n"
-" nmero de definiciones, si no se pone,\n"
-" el valor por omisin es 0\n"
+" ->, --more-than=NÚMERO muestra los mensajes cuyo número de "
+"definiciones\n"
+" sea mayor que NÚMERO; si no se pone,\n"
+" el valor por omisión es 1\n"
-#: src/msgcomm.c:451 src/xgettext.c:981
-#, fuzzy, c-format
+#: src/msgcomm.c:452 src/xgettext.c:1004
+#, c-format
msgid ""
" --omit-header don't write header with 'msgid \"\"' entry\n"
msgstr ""
-" --omit-header no escribe la lnea de encabezado `msgid \"\"'\n"
+" --omit-header no escribe la línea de encabezado con la entrada "
+"'msgid \"\"'\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr ""
-"Convierte un catlogo de traduccin a una codificacin de carcteres "
+"Convierte un catálogo de traducción a una codificación de caracteres "
"distinta.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
-msgstr "Blanco de conversin:\n"
+msgstr "Objetivo de conversión:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr ""
-"La codificacin por omisin es la que est en uso por la funcion locale.\n"
+"La codificación por omisión es la que está en uso por la funcion locale.\n"
-#: 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 " -i, --indent estilo de salida con sangras\n"
+msgstr " -i, --indent estilo de salida con sangrías\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
-" --no-location no escribe las lneas '#: fichero:lnea'\n"
+" --no-location no escribe las líneas '#: fichero:línea'\n"
-#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
-#: src/msgmerge.c:583
-#, c-format
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
+#: src/msgmerge.c:588
+#, fuzzy, c-format
msgid ""
-" --add-location preserve '#: filename:line' lines (default)\n"
+" -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
-" --add-location genera lneas '#: fichero:lnea' (por "
-"omisin)\n"
+" --add-location genera líneas '#: fichero:línea' (por "
+"omisión)\n"
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict escribe en estilo Uniforum estricto\n"
# acepto sugerencia de em pero agrego un "el". mm
-#: src/msgen.c: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 "no se especific el fichero de entrada"
+msgstr "no se especificó el fichero de entrada"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
-msgstr "se requieren exactamente un ficheros de entrada"
+msgstr "se requiere exactamente un fichero de entrada"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
-msgstr "Modo de empleo: %s [OPCIN] FICHEROENTRADA\n"
+msgstr "Modo de empleo: %s [OPCIÓN] FICHEROENTRADA\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1796,12 +1820,12 @@ msgid ""
"xgettext). Untranslated entries are assigned a translation that is\n"
"identical to the msgid.\n"
msgstr ""
-"Genera un catlogo de traduccin inglesa. El fichero de entrada es el\n"
-"ltimo fichero PO creado en ingls, o un fichero plantilla PO\n"
+"Genera un catálogo de traducción inglesa. El fichero de entrada es el\n"
+"último fichero PO creado en inglés, o un fichero plantilla PO\n"
"(generalmente creado por xgettext). Las entradas no traducidas son\n"
-"asignadas a una traduccin que es idntica a la del msgid.\n"
+"asignadas a una traducción que es idéntica a la del msgid.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " FICHEROENTRADA fichero de entrada PO o POT\n"
@@ -1809,12 +1833,12 @@ msgstr " FICHEROENTRADA fichero de entrada PO o POT\n"
#: src/msgexec.c:196
#, c-format
msgid "missing command name"
-msgstr "Se omiti el nombre de la instruccin"
+msgstr "Se omitió el nombre de la instrucción"
#: src/msgexec.c:257
#, c-format
msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-msgstr "Modo de empleo: %s [OPCIN] INSTRUCCIN [OPCIONES-DE-LA-INSTRUCCIN]\n"
+msgstr "Modo de empleo: %s [OPCIÓN] INSTRUCCIÓN [OPCIONES-DE-LA-INSTRUCCIÓN]\n"
#: src/msgexec.c:262
#, c-format, no-wrap
@@ -1825,11 +1849,11 @@ msgid ""
"msgexec's output. msgexec's return code is the maximum return code\n"
"across all invocations.\n"
msgstr ""
-"Aplica una instruccin a todas las traducciones de un catlogo de traduccin.\n"
-"La INSTRUCCIN puede ser cualquier programa que lea una traduccin de la\n"
-"entrada estndar. Se invoca una vez por cada traduccin. Su salida se \n"
-"convierte en la salida del programa msgexec. El cdigo de retorno del \n"
-"msgexec es el mximo de los cdigos de retornos obtenidos a lo largo de \n"
+"Aplica una instrucción a todas las traducciones de un catálogo de traducción.\n"
+"La INSTRUCCIÓN puede ser cualquier programa que lea una traducción de la\n"
+"entrada estándar. Se invoca una vez por cada traducción. Su salida se \n"
+"convierte en la salida del programa msgexec. El código de retorno del \n"
+"msgexec es el máximo de los códigos de retornos obtenidos a lo largo de \n"
"todas las invocaciones.\n"
#: src/msgexec.c:271
@@ -1838,11 +1862,10 @@ msgid ""
"A special builtin command called '0' outputs the translation, followed by a\n"
"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
msgstr ""
-"Una instruccin especial interconstruida llamada '0' genera la salida de la \n"
-"traduccin, seguido por un byte nulo. La salida de \"msgexec 0\" se puede \n"
-"utilizar como entrada para \"xargs -0\".\n"
+"Una instrucción especial llamada '0' genera la traducción, seguido de un byte nulo.\n"
+"La salida de \"msgexec 0\" se puede utilizar como entrada para \"xargs -0\".\n"
-#: src/msgexec.c:281 src/msgfilter.c:401
+#: src/msgexec.c:281 src/msgfilter.c:420
#, c-format
msgid " -i, --input=INPUTFILE input PO file\n"
msgstr " -i, --input=FICHEROENTRADA fichero PO de entrada\n"
@@ -1850,188 +1873,211 @@ msgstr " -i, --input=FICHEROENTRADA fichero PO de entrada\n"
#: src/msgexec.c:345
#, c-format
msgid "write to stdout failed"
-msgstr "fallo en la escritura a la salida estndar"
+msgstr "fallo en la escritura a la salida estándar"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "falta el nombre del filtro"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
-msgstr "se debe especificar al menos un guin de sed"
+msgstr "se debe especificar al menos un guión de sed"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr "Modo de empleo: %s [OPCIN] FILTRO [OPCIONES-DEL-FILTRO]\n"
+msgstr "Modo de empleo: %s [OPCIÓN] FILTRO [OPCIONES-DEL-FILTRO]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr ""
-"Aplica un filtro a todas las traducciones de un catlogo de traduccin.\n"
+"Aplica un filtro a todas las traducciones de un catálogo de traducción.\n"
-#: 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 ""
-"El FILTRO puede ser cualquier programa que lea una traduccin de la entrada\n"
-"estndar y escriba una traduccin modificada a la salida estndar.\n"
+"El FILTRO puede ser cualquier programa que lea una traducción de la entrada\n"
+"estándar y escriba una traducción modificada a la salida estándar.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "Algunas OPCIONES-DEL-FILTRO cuando el FILTRO es 'sed':\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
msgstr ""
-" -e, --expression=GUIN aade un GUIN a las instrucciones que sern\n"
-" ejecutadas\n"
+" -e, --expression=GUIÓN añade un GUIÓN a las instrucciones que serán\n"
+" ejecutadas\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
"commands\n"
" to be executed\n"
msgstr ""
-" -f, --file=FICHEROGUIN aade el contenido del FICHEROGUIN a las\n"
-" instrucciones que sern ejecutadas\n"
+" -f, --file=FICHEROGUIÓN añade el contenido del FICHEROGUIÓN a las\n"
+" instrucciones que serán ejecutadas\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-" -n, --quiet, --silent elimina la impresin automtica del espacio\n"
-" de patrones\n"
+" -n, --quiet, --silent elimina la impresión automática del espacio\n"
+" de patrones\n"
-#: 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 ""
" --no-escape no utiliza las secuencias de escape tipo C\n"
-" en la salida (por omisin)\n"
+" en la salida (por omisión)\n"
-#: 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 ""
-" --indent escribe el fichero .po utilizando sangras\n"
+" --indent escribe el fichero .po utilizando sangrías\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
msgstr ""
-" --keep-header conserva la lnea de encabezado sin "
-"modificacin,\n"
+" --keep-header conserva la línea de encabezado sin "
+"modificación,\n"
" es decir, no la filtra\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
-msgstr "el argumento a %s debe ser un solo carcter de puntuacin"
+msgstr "el argumento a %s debe ser un solo carácter de puntuación"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
-msgstr ""
+msgstr "«Endianness» no válida: %s"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
+#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
msgid "Ulrich Drepper"
+msgstr "Ulrich Drepper"
+
+#: src/msgfmt.c:439
+#, fuzzy, c-format
+msgid "no input file should be given if %s and %s are specified"
msgstr ""
+"Si no se especifica un fichero de entrada o si es -, se lee la entrada "
+"estándar.\n"
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: 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 "%s requiere que se especifique un \"-d directorio\""
-#: 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 "%s requiere que se especifique un \"-l local\""
+msgstr "%s requiere que se especifique un \"-l locale\""
+
+#: src/msgfmt.c:538
+#, fuzzy, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s requiere que se especifique un \"-l locale\""
+
+#: src/msgfmt.c:545
+#, fuzzy, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s requiere que se especifique un \"-l locale\""
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:551
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s y %s son mutuamente excluyentes"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
-msgstr "%s slo es vlido con %s o %s"
+msgstr "%s solo es válido con %s o %s"
-#: 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 "%s slo es vlido con %s, %s o %s"
+msgstr "%s solo es válido con %s, %s o %s"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
-msgstr ""
+msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d mensaje traducido"
msgstr[1] "%d mensajes traducidos"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
-msgstr[0] ", %d traduccin difusa"
+msgstr[0] ", %d traducción difusa"
msgstr[1] ", %d traducciones difusas"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d mensaje sin traducir"
msgstr[1] ", %d mensajes sin traducir"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
-msgstr "Modo de empleo: %s [OPCIN] fichero.po ...\n"
+msgstr "Modo de empleo: %s [OPCIÓN] fichero.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
-"Genera un catlogo binario de mensajes a partir de la descripcin de la "
-"traduccin textual.\n"
+"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: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 ""
-"Los argumentos obligatorios en las opciones largas tambin lo son para las \n"
+"Los argumentos obligatorios en las opciones largas también lo son para las \n"
"opciones cortas. De forma similar se comportan los argumentos opcionales.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
msgid " filename.po ... input files\n"
-msgstr " fichero.po ... ficheros de entrada\n"
+msgstr " fichero.po ... ficheros de entrada\n"
-#: 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 "Modo de operacin:\n"
+msgstr "Modo de operación:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -2040,7 +2086,7 @@ msgstr ""
" -j, --java Modo Java: la entrada es una clase de Java "
"ResourceBundle\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -2049,13 +2095,13 @@ msgstr ""
" --java2 como --java, y supone el uso de Java2\n"
" (JDK 1.2 o superior)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr ""
" --csharp Modo C#: genera un fichero .dll de .NET\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -2064,40 +2110,46 @@ msgstr ""
" --csharp-resources modo de recursos C#: genera un fichero ."
"resources de .NET\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
" --tcl Modo tcl: genera un fichero .msg tcl/msgcat\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt Modo Qt: genera un fichero .qm de Qt\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, fuzzy, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr " --qt Modo Qt: genera un fichero .qm de Qt\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict escribe en estilo Uniforum estricto\n"
-#: 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 "Si el fichero de salida es -, se escribe en la salida estndar.\n"
+msgstr "Si el fichero de salida es -, se escribe en la salida estándar.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
-msgstr "Localizacin del fichero de salida en modo Java:\n"
+msgstr "Localización del fichero de salida en modo Java:\n"
-#: 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 " -r, --resource=RECURSO nombre del 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
+#: 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 "
@@ -2105,14 +2157,23 @@ msgid ""
msgstr ""
" -l, --locale=LOCAL nombre local, ya sea idioma o idioma_PAIS\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, fuzzy, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --tcl Modo Tcl: la entrada es un fichero .msg tcl/"
+"msgcat\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
-" -d DIRECTORIO directorio base de la jerarqua de clases\n"
+" -d DIRECTORIO directorio base de la jerarquía de clases\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2120,16 +2181,16 @@ msgid ""
"separated with an underscore. The -d option is mandatory. The class is\n"
"written under the specified directory.\n"
msgstr ""
-"El nombre de la clase se determina aadiendo el nombre local al nombre del\n"
-"recurso, separados por un guin bajo. La opcin -d es obligatoria. La clase\n"
+"El nombre de la clase se determina añadiendo el nombre local al nombre del\n"
+"recurso, separados por un guión bajo. La opción -d es obligatoria. La clase\n"
"se escribe bajo el directorio especificado.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
-msgstr "Localizacin del fichero de salida en modo C#:\n"
+msgstr "Localización del fichero de salida en modo C#:\n"
-#: 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 "
@@ -2138,43 +2199,78 @@ msgstr ""
" -d DIRECTORIO directorio base de los ficheros .dll de "
"dependencias locales\n"
-#: 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 ""
-"Las opciones -l y -d son obligatorias. El fichero .dll ser escrito en\n"
-"un subdirectorio del directorio especificado cuyo nombre depender de la "
-"localizacin.\n"
+"Las opciones -l y -d son obligatorias. El fichero .dll será escrito en\n"
+"un subdirectorio del directorio especificado cuyo nombre dependerá de la "
+"localización.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
-msgstr "Localizacin del fichero de salida en modo Tcl:\n"
+msgstr "Localización del fichero de salida en modo Tcl:\n"
-#: 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 ""
-" -d DIRECTORIO directorio base de los catlogos de\n"
+" -d DIRECTORIO directorio base de los catálogos de\n"
" mensajes .msg\n"
-#: 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 ""
-"Las opciones -l y -d son obligatorias. El fichero .msg ser escrito en\n"
+"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: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
+#, fuzzy, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr ""
+" -d DIRECTORIO directorio base de los catálogos de\n"
+" mensajes .msg\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -kWORD, --keyword=PALABRA busca PALABRA a modo de palabra clave "
+"adicional\n"
+" -k, --keyword no usar las palabras clave por omisión\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"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 "Interpretacin del fichero de entrada:\n"
+msgstr "Interpretación del fichero de entrada:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -2185,7 +2281,7 @@ msgstr ""
" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
@@ -2193,16 +2289,16 @@ msgstr ""
"del\n"
" idioma\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
msgstr ""
" --check-header verifica la presencia y contenido de la\n"
-" lnea de encabezado\n"
+" línea de encabezado\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -2210,9 +2306,9 @@ msgid ""
msgstr ""
" --check-domain revisa si hay conflictos entre las "
"instrucciones\n"
-" del dominio y la opcin --output-file\n"
+" del dominio y la opción --output-file\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2222,31 +2318,31 @@ msgstr ""
"el\n"
" msgfmt de X/Open\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
"for\n"
" menu items\n"
msgstr ""
-" --check-accelerators[=CAR] revisa la presencia de aceleradores de\n"
-" teclado para los elementos del men\n"
+" --check-accelerators[=CAR] revisa la presencia de aceleradores de\n"
+" teclado para los elementos del menú\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
" -f, --use-fuzzy utiliza entradas difusas para la salida\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
-" -a, --alignment=NMERO alinea las cadenas al NMERO de bytes\n"
-" (por omisin es: %d)\n"
+" -a, --alignment=NÚMERO alinea las cadenas al NÚMERO de bytes\n"
+" (por omisión es: %d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2254,118 +2350,132 @@ msgid ""
" (big or little, default depends on "
"platform)\n"
msgstr ""
+" --endianness=ORDENBYTES escribe números de 32 bits en el orden de "
+"bytes especificado\n"
+" (que el «endianness» predefinido sea «big» o "
+"«little» depende de la plataforma)\n"
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
-" --no-hash el fichero binario no incluir la tabla de "
+" --no-hash el fichero binario no incluirá la tabla de "
"hash\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
-" --statistics muestra las estadsticas sobre las "
+" --statistics muestra las estadísticas sobre las "
"traducciones\n"
-#: 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 " -v, --verbose aumenta el cantidad de mensajes\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
-msgstr "atencin: el encabezado del fichero PO no existe o es invlido\n"
+msgstr "atención: el encabezado del fichero PO no existe o es inválido\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
-msgstr "atencin: la conversin del conjunto de caracteres no funcionar\n"
+msgstr "atención: la conversión del conjunto de caracteres no funcionará\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
-msgstr "atencin: el encabezado del fichero PO est difuso\n"
+msgstr "atención: el encabezado del fichero PO está difuso\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
-"atencin: las versiones anteriores de msgfmt producirn un error en esto\n"
+"atención: las versiones anteriores de msgfmt producirán un error en esto\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
-msgstr "el nombre de dominio \"%s\" no es vlido como nombre de fichero"
+msgstr "el nombre de dominio \"%s\" no es válido como nombre de fichero"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
-"el nombre del dominio \"%s\" no es vlido como nombre de fichero:\n"
-"se utilizar un prefijo"
+"el nombre del dominio \"%s\" no es válido como nombre de fichero:\n"
+"se utilizará un prefijo"
-#: src/msgfmt.c:955
-#, fuzzy, c-format
+#: src/msgfmt.c:1095
+#, c-format
msgid "'domain %s' directive ignored"
-msgstr "la instruccin `domain %s' no tiene efecto"
+msgstr "la instrucción 'domain %s' no tiene efecto"
-# Nunca me gust ignorar para "to ignore".
+# Nunca me gustó ignorar para "to ignore".
# Ignorar es no saber (not to know). "to ignore" es "no hacer caso".
# Sugerencia: Descartar. sv
# Excelente palabreja. Me gusta mucho. mm
-#: src/msgfmt.c:1015
-#, fuzzy, c-format
+#: src/msgfmt.c:1155
+#, c-format
msgid "empty 'msgstr' entry ignored"
-msgstr "se descarta la lnea vaca `msgstr'"
+msgstr "se descarta la línea vacía 'msgstr'"
# Lo mismo. sv
# Ok. mm
-#: src/msgfmt.c:1016
-#, fuzzy, c-format
+#: src/msgfmt.c:1156
+#, c-format
msgid "fuzzy 'msgstr' entry ignored"
-msgstr "se descarta la lnea difusa `msgstr'"
+msgstr "se descarta la línea difusa 'msgstr'"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s: atencin: el fichero fuente contiene una traduccin difusa"
+msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
+
+#: 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 "error al leer \"%s\""
-#: src/msggrep.c:496
-#, fuzzy, c-format
+#: src/msggrep.c:501
+#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
"specified"
msgstr ""
-"la opcin '%c' no se puede usar antes de que 'K', 'T' o 'C' hayan sido "
-"especificadas"
+"la opción '%c' no se puede usar antes de que 'J', 'K', 'T', 'C' o 'X' hayan "
+"sido especificadas"
-#: 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 ""
-"Extrae todos los mensajes de un catlogo de traduccin que coincidan con un\n"
-"patrn dado o pertenezcan a algunos de los ficheros fuente dados.\n"
+"Extrae todos los mensajes de un catálogo de traducción que coincidan con un\n"
+"patrón dado o pertenezcan a algunos de los ficheros fuente dados.\n"
-#: src/msggrep.c:542
-#, fuzzy, c-format, no-wrap
+#: src/msggrep.c:547
+#, c-format, no-wrap
msgid ""
"Message selection:\n"
" [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
@@ -2403,43 +2513,53 @@ msgid ""
" -v, --invert-match output only the messages that do not match any\n"
" selection criterion\n"
msgstr ""
-"Seleccin de mensaje:\n"
-" [-N FICHEROFUENTE]... [-M NOMBREDEDOMINIO]...\n"
-" [-K PATRN-MSGID] [-T PATRN-MSGSTR] [-C PATRN-COMENTARIO]\n"
-"Un mensaje es seleccionado si proviene de uno de los ficheros fuente especificados \n"
+"Selección de mensaje:\n"
+" [-N FICHEROFUENTE]... [-M NOMBREDEDOMINIO]...\n"
+" [-J PATRÓN-MSGCTCT] [-K PATRÓN-MSGID] [-T PATRÓN-MSGSTR]\n"
+" [-C PATRÓN-COMENTARIO] [-X PATRÓN-COMENTARIO-EXTRAÍDO]\n"
+"Un mensaje es seleccionado si proviene de uno de los ficheros fuente especificados,\n"
"o si proviene de uno de los dominios especificados,\n"
-"o si la opcin -K es seleccionada y su llave (msgid o msgid_plural) coincide\n"
-" con el PATRN-MSGID, \n"
-"o si la opcin -T es seleccionada y su traduccin (msgstr) coincide con el \n"
-" PATRN-MSGSTR, \n"
-"o si la opcin -C es seleccionada y el comentario del traductor coincide con \n"
-" el PATRN-COMENTARIO.\n"
+"o si la opción -J es seleccionada y su contexto (msgctxt) coincide con\n"
+" PATRÓN-MSGCTXT,\n"
+"o si la opción -K es seleccionada y su clave (msgid o msgid_plural) coincide\n"
+" con el PATRÓN-MSGID,\n"
+"o si la opción -T es seleccionada y su traducción (msgstr) coincide con el \n"
+" PATRÓN-MSGSTR,\n"
+"o si la opción -C es seleccionada y el comentario del traductor coincide con \n"
+" el PATRÓN-COMENTARIO,\n"
+"o si la opción -X es seleccionada y el comentario extraído coincide con \n"
+" el PATRÓN-COMENTARIO-EXTRAÍDO.\n"
"\n"
-"Cuando ms de un criterio de seleccin ha sido especificado, el conjunto de\n"
-"mensajes seleccionados es la unin de los mensajes seleccionados de cada \n"
+"Cuando se ha especificado más de un criterio de selección, el conjunto de\n"
+"mensajes seleccionados es la unión de los mensajes seleccionados de cada \n"
"criterio.\n"
"\n"
-"Sintxis de PATRN-MSGID o PATRN-MSGSTR o PATRN-COMENTARIO:\n"
-" [-E | -F] [-e PATRN | -f FICHERO]...\n"
-"Los PATRONes son, por omisin, expresiones regulares bsicas, o expresiones\n"
-"regulares extendidas si se especifica la opcin -E, o cadenas fijas si se\n"
-"especifica la opcin -F.\n"
+"Sintaxis de PATRÓN-MSGCTXT, PATRÓN-MSGID, PATRÓN-MSGSTR, PATRÓN-COMENTARIO o\n"
+"PATRÓN-COMENTARIO-EXTRAÍDO:\n"
+" [-E | -F] [-e PATRÓN | -f FICHERO]...\n"
+"Los PATRONes son, por omisión, expresiones regulares básicas, o expresiones\n"
+"regulares extendidas si se especifica la opción -E, o cadenas fijas si se\n"
+"especifica la opción -F.\n"
"\n"
-"-N, --location=FICHEROFUENTE selecciona los mensajes extraidos de FICHEROFUENTE\n"
-"-M, --domain=NOMBREDEDOMINIO selecciona los mensajes que pertenecen al dominio\n"
-" NOMBREDEDOMINIO\n"
-"-K, --msgid comienzo de los patrones para el msgid\n"
-"-T, --msgstr comienzo de los patrones para el msgstr\n"
-"-C, --comment comienzo de los patrones para el comentario del\n"
-" traductor\n"
-"-E, --extended-regexp el PATRN es una expresin regular extendida\n"
-"-F, --fixed-strings el PATRN es un conjunto de cadenas separadas\n"
-" por saltos de lnea\n"
-"-e, --regexp=PATRN utiliza el PATRN como una expresin regular\n"
-"-f, --file=FICHERO obtiene al PATRN del FICHERO\n"
-"-i, --ignore-case indistingue si es maysculas o minsculas\n"
-
-#: src/msggrep.c:597
+" -N, --location=FICHEROFUENTE selecciona los mensajes extraídos de FICHEROFUENTE\n"
+" -M, --domain=NOMBREDEDOMINIO selecciona los mensajes que pertenecen al dominio\n"
+" NOMBREDEDOMINIO\n"
+" -J, --msgctxt comienzo de los patrones para el msgctxt\n"
+" -K, --msgid comienzo de los patrones para el msgid\n"
+" -T, --msgstr comienzo de los patrones para el msgstr\n"
+" -C, --comment comienzo de los patrones para el comentario del\n"
+" traductor\n"
+" -X, --extracted-comment comienzo de los patrones para el comentario extraído\n"
+" -E, --extended-regexp el PATRÓN es una expresión regular extendida\n"
+" -F, --fixed-strings el PATRÓN es un conjunto de cadenas separadas\n"
+" por saltos de línea\n"
+" -e, --regexp=PATRÓN utiliza el PATRÓN como una expresión regular\n"
+" -f, --file=FICHERO obtiene al PATRÓN del FICHERO\n"
+" -i, --ignore-case indistingue si es mayúsculas o minúsculas\n"
+" -v, --invert-match mostrar solo quellos mensajes que no coinciden con\n"
+" ningún criterio de selección\n"
+
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2448,16 +2568,16 @@ msgstr ""
"caracteres\n"
" extendidos\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output genera una salida ordenada\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
-" --sort-by-file ordena la salida por localizacin de ficheros\n"
+" --sort-by-file ordena la salida por localización de ficheros\n"
#: src/msginit.c:297
msgid ""
@@ -2465,7 +2585,8 @@ msgid ""
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-"Ests en un entorno indiferente al idioma. Por favor pon tu variable\n"
+"Se encuentra en un entorno indiferente al idioma. Por favor ponga su "
+"variable\n"
"de entorno LANG, tal como se describe en el fichero ABOUT-NLS. Esto\n"
"es necesario para que se puedan probar las traducciones.\n"
@@ -2476,9 +2597,9 @@ msgid ""
"Please specify the locale through the --locale option or\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-"El fichero de salida %s existe.\n"
-"Favor de especificar el formato local a travs de la opcin --locale o\n"
-"el fichero de salida .po a travs de la opcin --output-file.\n"
+"El fichero de salida %s ya existe.\n"
+"Especifique el formato local a través de la opción --locale o\n"
+"el fichero de salida .po a través de la opción --output-file.\n"
#: src/msginit.c:347
#, c-format
@@ -2491,7 +2612,7 @@ msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-"Crea un nuevo fichero PO, inicializando la metainformacin con valores\n"
+"Crea un nuevo fichero PO, inicializando la metainformación con valores\n"
"tomados del entorno del usuario.\n"
#: src/msginit.c:377
@@ -2507,7 +2628,7 @@ msgid ""
"If it is -, standard input is read.\n"
msgstr ""
"Si no se da el fichero de entrada, el fichero POT se busca en el directorio\n"
-"actual. Si es -, se lee la entrada estndar.\n"
+"actual. Si es -, se lee la entrada estándar.\n"
#: src/msginit.c:385
#, c-format
@@ -2521,31 +2642,30 @@ msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
"locale setting. If it is -, the results are written to standard output.\n"
msgstr ""
-"Si no se especifica el fichero de salida, depender de la opcin --locale o\n"
-"de la seleccin local del usuario. Si es -, los resultados se escriben en\n"
-"la salida estndar.\n"
+"Si no se especifica el fichero de salida, dependerá de la opción --locale o\n"
+"de la selección local del usuario. Si es -, los resultados se escriben en\n"
+"la salida estándar.\n"
#: src/msginit.c:400
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
-msgstr ""
-" -o, --output-file=FICHERO escribe la salida al fichero PO especificado\n"
+msgstr " -l, --locale=LL_CC configura el locale de destino\n"
#: src/msginit.c:402
#, c-format
msgid ""
" --no-translator assume the PO file is automatically generated\n"
msgstr ""
-" --no-translator supone que el fichero PO ser generado\n"
-" automticamente\n"
+" --no-translator supone que el fichero PO será generado\n"
+" automáticamente\n"
#: src/msginit.c:468
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-"Se ha encontrado ms de un fichero .pot\n"
-"Favor de especificar el fichero .pot de entrada utilizando la opcin --"
+"Se ha encontrado más de un fichero .pot\n"
+"Favor de especificar el fichero .pot de entrada utilizando la opción --"
"input\n"
#: src/msginit.c:476 src/msginit.c:481
@@ -2559,7 +2679,7 @@ msgid ""
"Please specify the input .pot file through the --input option.\n"
msgstr ""
"No se encuentra el fichero .pot en el directorio actual.\n"
-"Favor de especificar el fichero .pot de entrada utilizando la opcin --"
+"Favor de especificar el fichero .pot de entrada utilizando la opción --"
"input\n"
#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
@@ -2567,7 +2687,7 @@ msgstr ""
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
-msgstr "fallo en el subproceso %s con cdigo de salida %d"
+msgstr "fallo en el subproceso %s con código de salida %d"
#: src/msginit.c:1118
msgid ""
@@ -2577,10 +2697,10 @@ msgid ""
"contact\n"
"you in case of unexpected technical problems.\n"
msgstr ""
-"El nuevo catlogo de mensajes debera contener su direccin de correo \n"
-"electrnico, de tal forma que los usuarios puedan retroalimentarlo sobre\n"
+"El nuevo catálogo de mensajes debería contener su dirección de correo \n"
+"electrónico, de tal forma que los usuarios puedan retroalimentarlo sobre\n"
"las traducciones, y el personal de mantenimiento pueda contactarlo \n"
-"en caso de tener problemas tcnicos inesperados.\n"
+"en caso de tener problemas técnicos inesperados.\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
@@ -2588,14 +2708,14 @@ msgstr ""
#: src/msginit.c:1534
#, c-format
msgid "English translations for %s package"
-msgstr "Traducciones al espaol para el paquete %s"
+msgstr "Traducciones al español para el paquete %s"
#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
msgstr ""
-"el conjunto de caracteres actual \"%s\" no es un nombre de codificacin "
-"porttil"
+"el conjunto de caracteres actual \"%s\" no es un nombre de codificación "
+"portátil"
#: src/msgl-cat.c:188 src/msgl-iconv.c:259
#, c-format
@@ -2605,35 +2725,35 @@ msgstr ""
"entrada"
#: src/msgl-cat.c:203
-#, fuzzy, c-format
+#, c-format
msgid ""
"input file '%s' doesn't contain a header entry with a charset specification"
msgstr ""
-"el fichero de entrada `%s' no contiene una lnea de encabezado con la "
-"especificacin del conjunto de caracteres"
+"el fichero de entrada '%s' no contiene una línea de encabezado con la "
+"especificación del conjunto de caracteres"
#: src/msgl-cat.c:207
-#, fuzzy, c-format
+#, c-format
msgid ""
"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-"el dominio \"%s\" en el fichero de entrada `%s' no contiene una lnea de\n"
-"encabezado con la especificacin del conjunto de caracteres"
+"el dominio \"%s\" en el fichero de entrada '%s' no contiene una línea de "
+"encabezado con la especificación del conjunto de caracteres"
#: src/msgl-cat.c:391 src/msgl-iconv.c:375
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
msgstr ""
-"el conjunto de caracteres destino \"%s\" no es un nombre de codificacin "
-"porttil."
+"el conjunto de caracteres destino \"%s\" no es un nombre de codificación "
+"portátil."
#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:3051
+#: src/xgettext.c:544 src/xgettext.c:3418
#, c-format
msgid "warning: "
-msgstr "atencin: "
+msgstr "atención: "
#: src/msgl-cat.c:443
#, c-format
@@ -2664,6 +2784,11 @@ msgid ""
"Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
"UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
msgstr ""
+"La conversión del fichero %s de la codificación %s a la codificación %s\n"
+"altera algunos msgids o msgctxts.\n"
+"Bien cambie todos los msgids y msgctxts a ASCII puro, bien asegúrese de que\n"
+"estén codificados en UTF-8 desde el principio, es decir, en sus ficheros de "
+"código fuente.\n"
#: src/msgl-charset.c:93
#, c-format
@@ -2675,13 +2800,13 @@ msgid ""
msgstr ""
"El conjunto de caracteres local \"%s\" es diferente del\n"
"conjunto de caracteres del fichero de entrada \"%s\".\n"
-"La salida de '%s' podra ser incorrecta.\n"
+"La salida de '%s' podría ser incorrecta.\n"
"Las posibles alternativas son:\n"
#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr "- Poner LC_ALL como local con la codificacin %s.\n"
+msgstr "- Poner LC_ALL como local con la codificación %s.\n"
#: src/msgl-charset.c:105
#, c-format
@@ -2690,7 +2815,7 @@ msgid ""
" then apply '%s',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-"- Convertir el catlogo de traducciones a %s utilizando 'msgconv',\n"
+"- Convertir el catálogo de traducciones a %s utilizando 'msgconv',\n"
" y luego aplicar '%s',\n"
" y luego reconvertirlo a %s utilizando 'msgconv'.\n"
@@ -2702,8 +2827,8 @@ msgid ""
" then apply '%s',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-"- Poner LC_ALL al formato local con la codificacin %s,\n"
-" convertir el catlogo de traduccin a %s utilizando 'msgconv',\n"
+"- Poner LC_ALL al formato local con la codificación %s,\n"
+" convertir el catálogo de traducción a %s utilizando 'msgconv',\n"
" y luego aplicar '%s',\n"
" y luego reconvertirlo a %s utilizando 'msgconv'.\n"
@@ -2714,14 +2839,14 @@ msgid ""
"Output of '%s' might be incorrect.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-"El conjunto de caracteres local \"%s\" no es un nombre de codificacin "
-"porttil.\n"
-"La salida de '%s' podra ser incorrecta.\n"
+"El conjunto de caracteres local \"%s\" no es un nombre de codificación "
+"portátil.\n"
+"La salida de '%s' podría ser incorrecta.\n"
"Una alternativa posible s poner LC_ALL=C.\n"
#: src/msgl-check.c:130
msgid "plural expression can produce negative values"
-msgstr "la expresin plural puede producir resultados negativos"
+msgstr "la expresión plural puede producir resultados negativos"
#: src/msgl-check.c:141
#, c-format
@@ -2732,211 +2857,202 @@ msgstr ""
#: src/msgl-check.c:187
msgid "plural expression can produce division by zero"
-msgstr "la expresin plural puede producir una divisin por cero"
+msgstr "la expresión plural puede producir una división por cero"
#: src/msgl-check.c:192
msgid "plural expression can produce integer overflow"
-msgstr "la expresin plural puede producir un sobreflujo entero"
+msgstr "la expresión plural puede producir desbordamiento de número entero"
#: src/msgl-check.c:197
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-"la expresin plural puede producir excepciones aritmticas, posiblemente una "
-"divisin por cero"
+"la expresión plural puede producir excepciones aritméticas, posiblemente una "
+"división por cero"
#: src/msgl-check.c:266
-#, fuzzy, c-format
+#, c-format
msgid "Try using the following, valid for %s:"
-msgstr "Pruebe utilizando lo siguiente, vlido para %s:\n"
+msgstr "Pruebe utilizando lo siguiente, válido para %s:"
#: src/msgl-check.c:358 src/msgl-check.c:382
-#, fuzzy
msgid "message catalog has plural form translations"
-msgstr "el catlogo de mensajes tiene formas plurales en las traducciones..."
+msgstr "el catálogo de mensajes tiene formas plurales en las traducciones"
#: src/msgl-check.c:360
-#, fuzzy
msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr "... pero el encabezado no tiene el atributo \"plural=EXPRESIN\""
+msgstr "pero el encabezado no tiene el atributo \"plural=EXPRESIÓN\""
#: src/msgl-check.c:384
-#, fuzzy
msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr "... pero el encabezado no tiene el atributo \"nplurals=ENTERO\""
+msgstr "pero el encabezado no tiene el atributo \"nplurals=ENTERO\""
#: src/msgl-check.c:420
msgid "invalid nplurals value"
-msgstr "valor invlido de nplurals"
+msgstr "valor inválido de nplurals"
#: src/msgl-check.c:442
msgid "invalid plural expression"
-msgstr "expresin plural invlida"
+msgstr "expresión plural inválida"
#: src/msgl-check.c:472 src/msgl-check.c:488
-#, fuzzy, c-format
+#, c-format
msgid "nplurals = %lu"
-msgstr "nplurals = %lu ..."
+msgstr "nplurals = %lu"
#: src/msgl-check.c:474
-#, fuzzy, c-format
+#, c-format
msgid "but some messages have only one plural form"
msgid_plural "but some messages have only %lu plural forms"
-msgstr[0] "... pero algunos mensajes slo tienen solo una forma plural"
-msgstr[1] "... pero algunos mensajes slo tienen %lu formas plurales"
+msgstr[0] "pero algunos mensajes solo tienen una forma plural"
+msgstr[1] "pero algunos mensajes solo tienen %lu formas plurales"
#: src/msgl-check.c:490
-#, fuzzy, c-format
+#, c-format
msgid "but some messages have one plural form"
msgid_plural "but some messages have %lu plural forms"
-msgstr[0] "... pero algunos mensajes tienen solo una forma plural"
-msgstr[1] "... pero algunos mensajes tienen %lu formas plurales"
+msgstr[0] "pero algunos mensajes tienen una forma plural"
+msgstr[1] "pero algunos mensajes tienen %lu formas plurales"
#: src/msgl-check.c:514
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-"el catlogo de mensajes tiene traducciones con formas plurales, pero no "
-"tiene un encabezado con \"Plural-Forms: nplurals=ENTERO; plural=EXPRESIN;\""
+"el catálogo de mensajes tiene traducciones con formas plurales, pero no "
+"tiene un encabezado con \"Plural-Forms: nplurals=ENTERO; plural=EXPRESIÓN;\""
-# qu les parece: "a `msgid' o `msgstr' les falta el `\\n' final"? cb
+# ¿qué les parece: "a `msgid' o `msgstr' les falta el `\\n' final"? cb
# Bien. Mejora. mm
#
#
-# Bien, antes deca "las lneas `msgid' y `msgstr' no comienzan con `\\n'"
-# No s qu es mejor pero no me acaba de gustar: La idea es que *no ambas*
+# Bien, antes decía "las líneas `msgid' y `msgstr' no comienzan con `\\n'"
+# No sé qué es mejor pero no me acaba de gustar: La idea es que *no ambas*
# comienzan por \\n, no que tengan que hacerlo las dos.
# Si una lo hace y la otra no, puede ser que falte en una o que sobre en la
-# otra. Yo podnra aqu algo ms parecido a lo de antes, pero aadiendo
-# "ambas", o algo as.
-# por ejemplo: "las lneas msgid y msgstr no comienzan ambas con \\n". sv
-# Que te parece a alguna de las lneas ... mm
+# otra. Yo podnría aquí algo más parecido a lo de antes, pero añadiendo
+# "ambas", o algo así.
+# por ejemplo: "las líneas msgid y msgstr no comienzan ambas con \\n". sv
+# Que te parece a alguna de las líneas ... mm
#
# Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
# Si no se te ocurre nada mejor, sugerencia:
-# "Una de las lneas msgid y msgstr comienza con `\\n' y la otra no" sv+
+# "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
#: src/msgl-check.c:611
-#, fuzzy
msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
-msgstr ""
-"a alguna de las lneas `msgid' y `msgid_plural' les falta el `\\n' inicial"
+msgstr "las líneas 'msgid' y 'msgid_plural' no comienzan ambas con '\\n'"
-# qu les parece: "a `msgid' o `msgstr' les falta el `\\n' final"? cb
+# ¿qué les parece: "a `msgid' o `msgstr' les falta el `\\n' final"? cb
# Bien. Mejora. mm
#
#
-# Bien, antes deca "las lneas `msgid' y `msgstr' no comienzan con `\\n'"
-# No s qu es mejor pero no me acaba de gustar: La idea es que *no ambas*
+# Bien, antes decía "las líneas `msgid' y `msgstr' no comienzan con `\\n'"
+# No sé qué es mejor pero no me acaba de gustar: La idea es que *no ambas*
# comienzan por \\n, no que tengan que hacerlo las dos.
# Si una lo hace y la otra no, puede ser que falte en una o que sobre en la
-# otra. Yo podnra aqu algo ms parecido a lo de antes, pero aadiendo
-# "ambas", o algo as.
-# por ejemplo: "las lneas msgid y msgstr no comienzan ambas con \\n". sv
-# Que te parece a alguna de las lneas ... mm
+# otra. Yo podnría aquí algo más parecido a lo de antes, pero añadiendo
+# "ambas", o algo así.
+# por ejemplo: "las líneas msgid y msgstr no comienzan ambas con \\n". sv
+# Que te parece a alguna de las líneas ... mm
#
# Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
# Si no se te ocurre nada mejor, sugerencia:
-# "Una de las lneas msgid y msgstr comienza con `\\n' y la otra no" sv+
+# "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
#: src/msgl-check.c:619
-#, fuzzy, c-format
+#, c-format
msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
-msgstr ""
-"a alguna de las lneas `msgid' y `msgstr[%u]' les falta el `\\n' inicial"
+msgstr "las líneas 'msgid' y 'msgstr[%u]' no comienzan ambas con '\\n'"
-# qu les parece: "a `msgid' o `msgstr' les falta el `\\n' final"? cb
+# ¿qué les parece: "a `msgid' o `msgstr' les falta el `\\n' final"? cb
# Bien. Mejora. mm
#
#
-# Bien, antes deca "las lneas `msgid' y `msgstr' no comienzan con `\\n'"
-# No s qu es mejor pero no me acaba de gustar: La idea es que *no ambas*
+# Bien, antes decía "las líneas `msgid' y `msgstr' no comienzan con `\\n'"
+# No sé qué es mejor pero no me acaba de gustar: La idea es que *no ambas*
# comienzan por \\n, no que tengan que hacerlo las dos.
# Si una lo hace y la otra no, puede ser que falte en una o que sobre en la
-# otra. Yo podnra aqu algo ms parecido a lo de antes, pero aadiendo
-# "ambas", o algo as.
-# por ejemplo: "las lneas msgid y msgstr no comienzan ambas con \\n". sv
-# Que te parece a alguna de las lneas ... mm
+# otra. Yo podnría aquí algo más parecido a lo de antes, pero añadiendo
+# "ambas", o algo así.
+# por ejemplo: "las líneas msgid y msgstr no comienzan ambas con \\n". sv
+# Que te parece a alguna de las líneas ... mm
#
# Sigue pareciendo que deben tenerlo las dos (y no es esa la idea).
# Si no se te ocurre nada mejor, sugerencia:
-# "Una de las lneas msgid y msgstr comienza con `\\n' y la otra no" sv+
+# "Una de las líneas msgid y msgstr comienza con `\\n' y la otra no" sv+
#: src/msgl-check.c:634
-#, fuzzy
msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
-msgstr "a alguna de las lneas `msgid' y `msgstr' les falta el `\\n' inicial"
+msgstr "las líneas 'msgid' y 'msgstr' no comienzan ambas con '\\n'"
# Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
-# y la otra no, as de sencillo. sv+
+# y la otra no, así de sencillo. sv+
#: src/msgl-check.c:652
-#, fuzzy
msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
-msgstr ""
-"a alguna de las lneas `msgid' y `msgid_plural' les falta el `\\n' final"
+msgstr "las líneas 'msgid' y 'msgid_plural' no terminan ambas con '\\n'"
# Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
-# y la otra no, as de sencillo. sv+
+# y la otra no, así de sencillo. sv+
#: src/msgl-check.c:660
-#, fuzzy, c-format
+#, c-format
msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
-msgstr "a alguna de las lneas `msgid' y `msgstr[%u]' les falta el `\\n' final"
+msgstr "las líneas 'msgid' y 'msgstr[%u]' no terminan ambas con '\\n'"
# Lo mismo, no es que a una de las dos le falte, sino que una lo tiene
-# y la otra no, as de sencillo. sv+
+# y la otra no, así de sencillo. sv+
#: src/msgl-check.c:675
-#, fuzzy
msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
-msgstr "a alguna de las lneas `msgid' y `msgstr' les falta el `\\n' final"
+msgstr "las líneas 'msgid' y 'msgstr' no terminan ambas con '\\n'"
#: src/msgl-check.c:687
msgid "plural handling is a GNU gettext extension"
-msgstr "el manejo del plural es una extensin del gettext de GNU"
+msgstr "el manejo del plural es una extensión del gettext de GNU"
#: src/msgl-check.c:729
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr no tiene la marca del acelerador de teclado '%c'"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr "msgstr tiene demasiadas marcas de aceleracin de teclado '%c'"
+msgstr "msgstr tiene demasiadas marcas de aceleración de teclado '%c'"
-#: src/msgl-check.c:801
-#, fuzzy, c-format
+#: src/msgl-check.c:804
+#, c-format
msgid "header field '%s' still has the initial default value\n"
-msgstr "algunos campos de cabecera an tienen el valor inicial por omisin\n"
+msgstr "el campo de cabecera '%s' aún tiene el valor inicial por omisión\n"
-#: src/msgl-check.c:816
-#, fuzzy, c-format
+#: src/msgl-check.c:820
+#, c-format
msgid "header field '%s' missing in header\n"
-msgstr "no existe el campo `%s' en la cabecera\n"
+msgstr "el campo '%s' no está presente en la cabecera\n"
#: src/msgl-iconv.c:65
#, c-format
msgid "%s: input is not valid in \"%s\" encoding"
-msgstr ""
+msgstr "%s: la entrada no es válida con la codificación \"%s\""
#: src/msgl-iconv.c:69
-#, fuzzy, c-format
+#, c-format
msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "error al abrir el fichero \"%s\" para lectura"
+msgstr ""
+"%s: error al convertir de la codificación \"%s\" a la codificación \"%s\""
#: src/msgl-iconv.c:290
msgid "input file doesn't contain a header entry with a charset specification"
msgstr ""
-"El fichero de entrada no contiene una lnea de encabezado que especifique el "
+"El fichero de entrada no contiene una línea de encabezado que especifique el "
"conjunto de caracteres"
#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c: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 "
"not support this conversion."
msgstr ""
-"No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(), e iconv()\n"
-"no soporta este tipo de conversin."
+"No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(), e iconv() "
+"no soporta este tipo de conversión."
#: src/msgl-iconv.c:335
#, c-format
@@ -2944,29 +3060,29 @@ msgid ""
"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
"msgids become equal."
msgstr ""
-"La conversin de \"%s\" a \"%s\" introduce duplicados: algunos msgid "
+"La conversión de \"%s\" a \"%s\" introduce duplicados: algunos msgid "
"distintos se vuelven iguales."
#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c: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 ""
-"No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv().\n"
-"Esta versin fue construida sin iconv()."
+"No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(). Esta "
+"versión fue construida sin iconv()."
-#: 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 "%s slo es vlido con %s"
+msgstr "%s solo es válido con %s"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr "tipo de respaldo"
-#: 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"
@@ -2981,66 +3097,66 @@ msgid ""
msgstr ""
"Mezcla dos ficheros .po de estilo Uniforum en uno solo. El fichero def.po\n"
"es un fichero existente de tipo .po con las traducciones anteriores que se\n"
-"conservarn siempre y cuando coincidan; los comentarios se conservarn,\n"
-"pero los comentarios extrados y las posiciones del fichero no lo sern.\n"
-"El fichero ref.pot es el ltimo fichero .po creado (generalmente con xgettext),\n"
-"cualquier traduccin o comentario se eliminar, sin embargo los comentarios\n"
-"puntuales y las posiciones dentro del fichero se conservarn. En donde no\n"
-"haya una coincidencia exacta, se utilizar el mtodo de comparacin difusa\n"
+"conservarán siempre y cuando coincidan; los comentarios se conservarán,\n"
+"pero los comentarios extraídos y las posiciones del fichero no lo serán.\n"
+"El fichero ref.pot es el último fichero .po creado (generalmente con xgettext),\n"
+"cualquier traducción o comentario se eliminará; sin embargo, los comentarios\n"
+"puntuales y las posiciones dentro del fichero se conservarán. En donde no\n"
+"haya una coincidencia exacta, se utilizará el método de comparación difusa\n"
"para obtener mejores resultados.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
" def.po traducciones que se refieren a las viejas "
"fuentes\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot referencias a las nuevas fuentes\n"
-#: 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 ""
-" -C, --compendium=FICHERO biblioteca adicional de traduccin de "
+" -C, --compendium=FICHERO biblioteca adicional de traducción de "
"mensajes,\n"
-" puede ser especificada ms de una vez\n"
+" puede ser especificada más de una vez\n"
-#: 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 ""
" -U, --update actualiza def.po,\n"
-" no hace nada si def.po ya est actualizado\n"
+" no hace nada si def.po ya está actualizado\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
-msgstr "Localizacin del fichero de salida en modo de actualizacin:\n"
+msgstr "Localización del fichero de salida en modo de actualización:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
-msgstr "El resultado se escribi sobre def.po.\n"
+msgstr "El resultado se escribió sobre def.po.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTROL hace un respado de def.po\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=SUFIJO sobreescribe el sufijo de respaldo\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -3051,60 +3167,60 @@ msgid ""
" existing, nil numbered if numbered backups exist, simple otherwise\n"
" simple, never always make simple backups\n"
msgstr ""
-"El mtodo de control de versiones puede ser seleccionado va la opcin\n"
-"--backup o a travs de la variable de entorno VERSION_CONTROL. \n"
+"El método de control de versiones puede ser seleccionado vía la opción\n"
+"--backup o a través de la variable de entorno VERSION_CONTROL. \n"
"Estos son los valores permitidos:\n"
-" none, off nunca hace respaldos (an si se especifica --backup)\n"
+" none, off nunca hace respaldos (aún si se especifica --backup)\n"
" numbered, t hace respaldos numerados\n"
" existing, nil numerados si existen los backups numerados, o sencillos "
"si\n"
-" no es as\n"
+" no es así\n"
" simple, never siempre hace backups sencillos\n"
-#: src/msgmerge.c:541
-#, fuzzy, c-format
+#: src/msgmerge.c:546
+#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
"SIMPLE_BACKUP_SUFFIX\n"
"environment variable.\n"
msgstr ""
-"El sufijo del respaldo es `~', a menos que se modifique con --suffix o con\n"
+"El sufijo del respaldo es '~', a menos que se modifique con --suffix o con\n"
"la variable de entorno SIMPLE_BACKUP_SUFFIX\n"
-#: src/msgmerge.c:552
-#, fuzzy, c-format
+#: src/msgmerge.c:557
+#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
msgstr ""
-" --translated mantiene lo traducido, elimina los mensajes "
-"sin traducir\n"
+" --previous conserva los msgids anteriores de los mensajes "
+"traducidos\n"
-#: 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 " -q, --quiet, --silent suprime los indicadores de progreso\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
-msgstr "este mensaje debera definir las formas plurales"
+msgstr "este mensaje debería definir las formas plurales"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
-msgstr "este mensaje no debera definir las formas plurales"
+msgstr "este mensaje no debería definir las formas plurales"
-#: 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 ""
-"%sledos %ld mensajes antiguos + %ld mensajes de referencia\n"
+"%sleídos %ld mensajes antiguos + %ld mensajes de referencia\n"
"incorporados %ld, convertidos en difusos %ld, faltan %ld, obsoletos %ld.\n"
# Porque no mejor poner simplemente 'fin'? mm++
-#: src/msgmerge.c: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"
@@ -3113,18 +3229,18 @@ msgstr " terminado.\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 "%s y los nombres de ficheros explcitos son mutuamente excluyentes"
+msgstr "%s y los nombres de ficheros explícitos son mutuamente excluyentes"
#: src/msgunfmt.c:427
#, c-format
msgid "Usage: %s [OPTION] [FILE]...\n"
-msgstr "Modo de empleo: %s [OPCIN] [FICHERO]...\n"
+msgstr "Modo de empleo: %s [OPCIÓN] [FICHERO]...\n"
#: src/msgunfmt.c:431
#, c-format
msgid "Convert binary message catalog to Uniforum style .po file.\n"
msgstr ""
-"Convierte el catlogo de mensajes binarios al fichero de estilo Uniforum ."
+"Convierte el catálogo de mensajes binarios al fichero de estilo Uniforum ."
"po.\n"
#: src/msgunfmt.c:440
@@ -3168,7 +3284,7 @@ msgstr " FICHERO ... ficheros .mo de entrada\n"
#: src/msgunfmt.c:456
#, c-format
msgid "Input file location in Java mode:\n"
-msgstr "Localizacin del fichero de entrada en modo Java:\n"
+msgstr "Localización del fichero de entrada en modo Java:\n"
#: src/msgunfmt.c:462
#, c-format
@@ -3177,14 +3293,14 @@ msgid ""
"name,\n"
"separated with an underscore. The class is located using the CLASSPATH.\n"
msgstr ""
-"El nombre de la clase se determina aadiendo el nombre local al nombre del\n"
-"recurso, separado por un guin bajo. La clase se localiza utilizando la\n"
+"El nombre de la clase se determina añadiendo el nombre local al nombre del\n"
+"recurso, separado por un guión bajo. La clase se localiza utilizando la\n"
"variable de entorno CLASSPATH.\n"
#: src/msgunfmt.c:467
#, c-format
msgid "Input file location in C# mode:\n"
-msgstr "Localizacin del fichero de entrada en modo C#:\n"
+msgstr "Localización del fichero de entrada en modo C#:\n"
#: src/msgunfmt.c:475
#, c-format
@@ -3192,14 +3308,14 @@ msgid ""
"The -l and -d options are mandatory. The .dll file is located in a\n"
"subdirectory of the specified directory whose name depends on the locale.\n"
msgstr ""
-"Las opciones -l y -d son obligatorias. El fichero .dll ser escrito en\n"
+"Las opciones -l y -d son obligatorias. El fichero .dll será escrito en\n"
"un subdirectorio del directorio especificado cuyo nombre depende de la "
-"configuracin local.\n"
+"configuración local.\n"
#: src/msgunfmt.c:479
#, c-format
msgid "Input file location in Tcl mode:\n"
-msgstr "Localizacin del fichero de entrada en modo Tcl:\n"
+msgstr "Localización del fichero de entrada en modo Tcl:\n"
#: src/msgunfmt.c:485
#, c-format
@@ -3207,21 +3323,21 @@ msgid ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
"specified directory.\n"
msgstr ""
-"Las opciones -l y -d son obligatorias. El fichero .msg ser escrito en\n"
+"Las opciones -l y -d son obligatorias. El fichero .msg será escrito en\n"
"el directorio especificado.\n"
#: src/msgunfmt.c:511
#, c-format
msgid " -i, --indent write indented output style\n"
msgstr ""
-" -i, --indent escribe el fichero .po utilizando sangras\n"
+" -i, --indent escribe el fichero .po utilizando sangrías\n"
#: src/msgunfmt.c:513
#, c-format
msgid " --strict write strict uniforum style\n"
msgstr " --strict escribe en estilo Uniforum estricto\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -3233,31 +3349,30 @@ msgid ""
"specified, they will be taken from the first translation. File positions\n"
"will be cumulated. When using the --unique option, duplicates are discarded.\n"
msgstr ""
-"Unifica las traducciones duplicadas en catlogo de traduccin.\n"
+"Unifica las traducciones duplicadas en catálogo de traducción.\n"
"Encuentra las traducciones duplicadas de el mismo identificador de mensajes.\n"
-"Dichos duplicados son una entrada invlida para otros programas tales como \n"
-"msgfmt, msgmerge o msgcat. Por omisin, los duplicados se mezclan juntos.\n"
-"Cuando se utiliza la opcin --repeated slo los duplicados conforman la salida\n"
+"Dichos duplicados son una entrada inválida para otros programas tales como \n"
+"msgfmt, msgmerge o msgcat. Por omisión, los duplicados se mezclan juntos.\n"
+"Cuando se utiliza la opción --repeated solo los duplicados conforman la salida\n"
"y los otros mensajes son descartados. Los comentarios y los comentarios \n"
-"extraidos sern acumulados, excepto si se especifica la opcin --use-first, en\n"
-"cuyo caso sern tomados de la primera traduccin. Las posiciones de los \n"
-"ficheros sern acumuladas. Cuando se utiliza la opcin --unique, los \n"
+"extraidos serán acumulados, excepto si se especifica la opción --use-first, en\n"
+"cuyo caso serán tomados de la primera traducción. Las posiciones de los \n"
+"ficheros serán acumuladas. Cuando se utiliza la opción --unique, los \n"
"duplicados se descartan.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
-msgstr " -d, --repeated muestra nicamente los duplicados\n"
+msgstr " -d, --repeated muestra únicamente los duplicados\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
"duplicates\n"
msgstr ""
-" -u, --unique muestra slo los mensajes nicos, descarta "
-"a\n"
-" los duplicados\n"
+" -u, --unique muestra solo los mensajes únicos, descarta los "
+"duplicados\n"
#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
@@ -3270,8 +3385,8 @@ msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Message conversion to user's charset might not work.\n"
msgstr ""
-"El conjunto de caracteres \"%s\" no es un nombre de codificacin porttil.\n"
-"La conversin de mensajes al conjunto de caracteres del usuario podra no "
+"El conjunto de caracteres \"%s\" no es un nombre de codificación portátil.\n"
+"La conversión de mensajes al conjunto de caracteres del usuario podría no "
"funcionar.\n"
#: src/po-charset.c:557
@@ -3280,7 +3395,7 @@ msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"and iconv() does not support \"%s\".\n"
msgstr ""
-"El conjunto de caracteres \"%s\" no est soportado. %s se basa en iconv(),\n"
+"El conjunto de caracteres \"%s\" no está soportado. %s se basa en iconv(),\n"
"e iconv() no soporta \"%s\".\n"
#: src/po-charset.c:564 src/po-charset.c:612
@@ -3288,16 +3403,16 @@ msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr ""
-"Instalando GNU libiconv y luego reinstalando GNU gettext\n"
-"podra arreglar este problema.\n"
+"Instalar GNU libiconv y luego reinstalar GNU gettext\n"
+"podría arreglar este problema.\n"
#: src/po-charset.c:578 src/po-charset.c:616
msgid "Continuing anyway, expect parse errors."
-msgstr "Se contina de todas formas, aunque habr errores de parseo."
+msgstr "Se continúa de todas formas, aunque habrá errores de parseo."
#: src/po-charset.c:580
msgid "Continuing anyway."
-msgstr "Se contina de todas formas."
+msgstr "Se continúa de todas formas."
#: src/po-charset.c:607
#, c-format
@@ -3305,8 +3420,8 @@ msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
msgstr ""
-"El conjunto de caracteres \"%s\" no est soportado. %s se basa en iconv().\n"
-"Esta versin fue construida sin iconv().\n"
+"El conjunto de caracteres \"%s\" no está soportado. %s se basa en iconv().\n"
+"Esta versión fue construida sin iconv().\n"
#: src/po-charset.c:644
msgid ""
@@ -3314,91 +3429,91 @@ msgid ""
"Message conversion to user's charset will not work.\n"
msgstr ""
"No hay un conjunto de caracteres especificado en el encabezado.\n"
-"La conversin de mensajes al conjunto de caracteres del usuario no "
-"funcionar.\n"
+"La conversión de mensajes al conjunto de caracteres del usuario no "
+"funcionará.\n"
#: src/po-gram-gen.y:93
#, c-format
msgid "inconsistent use of #~"
msgstr "uso inconsistente de #~"
-#: src/po-gram-gen.y:240
-#, fuzzy, c-format
+#: src/po-gram-gen.y:243
+#, c-format
msgid "missing 'msgstr[]' section"
-msgstr "no hay seccin `msgstr'"
+msgstr "la sección 'msgstr[]' no está presente"
-#: src/po-gram-gen.y:249
-#, fuzzy, c-format
+#: src/po-gram-gen.y:252
+#, c-format
msgid "missing 'msgid_plural' section"
-msgstr "no hay seccin `msgstr'"
+msgstr "la sección 'msgid_plural' no está presente"
-#: src/po-gram-gen.y:257
-#, fuzzy, c-format
+#: src/po-gram-gen.y:260
+#, c-format
msgid "missing 'msgstr' section"
-msgstr "no hay seccin `msgstr'"
+msgstr "la sección 'msgstr' no está presente"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
-msgstr "la primera forma del plural tiene un ndice distinto a cero"
+msgstr "la primera forma del plural tiene un índice distinto de cero"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
-msgstr "la primera forma del plural tiene un ndice incorrecto"
+msgstr "la primera forma del plural tiene un índice incorrecto"
-# Abortando queda un poco feo. qu se podra poner en su lugar?
+# Abortando queda un poco feo. ¿qué se podría poner en su lugar?
# Aterrizaje forzoso! el programa no puede continuar. Que te parece? mm.
#
# un poco exagerado... sv. A ver si a Enrique se le ocurre algo, y si no
# lo dejaremos en "abortado" sv
#
-# qu les parece `por exceso de errores, finaliza el programa'? mm
+# ¿qué les parece `por exceso de errores, finaliza el programa'? mm
#
-# a m abortando no me parece mal. Quiz 'programa interrumpido' em
+# a mí abortando no me parece mal. Quizá 'programa interrumpido' em
#
-# Qu tal `por exceso de errores el programa no puede continuar'? mm
+# ¿Qué tal `por exceso de errores el programa no puede continuar'? mm
#
# Perfecto em+
#
# ok. corregido. mm+
#
-# Vaya!, pues a m no me gusta nada, pero nada. Me explico:
-# No es fiel: El programa s puede continuar, pero *no quiere*, que es
-# distinto. Seguro que hay un parmetro de compilacin que especifica
-# el nmero de errores que deben aparecer para que el programa d el
-# mensaje en cuestin. Propongo: "demasiados errores: programa interrumpido"
-# o algo as. sv
+# ¡Vaya!, pues a mí no me gusta nada, pero nada. Me explico:
+# No es fiel: El programa sí puede continuar, pero *no quiere*, que es
+# distinto. Seguro que hay un parámetro de compilación que especifica
+# el número de errores que deben aparecer para que el programa dé el
+# mensaje en cuestión. Propongo: "demasiados errores: programa interrumpido"
+# o algo así. sv
#
# 07061996mm: Propongo "demasiados errores, no tiene caso continuar"
#
-# 08061996sv: Uf, eso en Espaa suena rarsimo. Podras proponer otra cosa?
+# 08061996sv: Uf, eso en España suena rarísimo. ¿Podrías proponer otra cosa?
#
-# 11061996mm: Ok. Hasta no pensar un poco ms, adopto como buena tu propuesta
+# 11061996mm: Ok. Hasta no pensar un poco más, adopto como buena tu propuesta
#
-# 19071996cb: "demasiados errores, abandono la ejecucin" cb
-# 20071996sv: Eso no seguira la regla implcita de que el programa no debe
+# 19071996cb: "demasiados errores, abandono la ejecución" cb
+# 20071996sv: Eso no seguiría la regla implícita de que el programa no debe
# hablar en primera persona sino en estilo impersonal.
-# (Esta regla estar en el manual de Enrique, con toda seguridad).
+# (Esta regla estará en el manual de Enrique, con toda seguridad).
#: src/po-lex.c:90 src/po-lex.c:109
#, c-format
msgid "too many errors, aborting"
msgstr "demasiados errores, programa interrumpido"
-#: src/po-lex.c: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 "sucesin de multibyte invlida"
+msgstr "sucesión de multibyte inválida"
#: src/po-lex.c:465
#, c-format
msgid "incomplete multibyte sequence at end of file"
-msgstr "sucesin de multibyte invlida al final del fichero"
+msgstr "sucesión de multibyte inválida al final del fichero"
#: src/po-lex.c:475
#, c-format
msgid "incomplete multibyte sequence at end of line"
-msgstr "sucesin de multibyte invlida al final de la lnea"
+msgstr "sucesión de multibyte inválida al final de la línea"
#: src/po-lex.c:487
msgid "iconv failure"
@@ -3422,20 +3537,20 @@ msgstr "fin de fichero dentro de una cadena"
#: src/po-lex.c:987
#, c-format
msgid "end-of-line within string"
-msgstr "fin de lnea dentro de una cadena"
+msgstr "fin de línea dentro de una cadena"
#: src/po-lex.c:1008
#, c-format
msgid "context separator <EOT> within string"
-msgstr ""
+msgstr "separador de contexto <EOT> dentro de una cadena"
# sospecho que lo que en realidad ocurre es que "no debe". sv
-# Miraremos el cdigo fuente. sv
+# Miraremos el código fuente. sv
#
-# ok. aqu est el fuente. Tengo la impresin de que estoy en
+# ok. aquí está el fuente. Tengo la impresión de que estoy en
# lo correcto: es decir que es necesario que tenga al menos
-# una instruccin de dominio.
-# por cierto traduje directive por instruccin aunque con las
+# una instrucción de dominio.
+# por cierto traduje directive por instrucción aunque con las
# series de TV gringas acostumbran mal traducir a "directivas". mm.
#
# exclude_directive_domain (pop, name)
@@ -3445,7 +3560,7 @@ msgstr ""
# po_gram_error (_("this file may not contain domain directives"));
# }
#
-# Me lo pones ms claro: el mensaje est dentro de una funcin llamada
+# Me lo pones más claro: el mensaje está dentro de una función llamada
# "exclude_directive_domain". Probablemente porque *no* debe haber
# "domain directives", no porque posiblemente no las haya.
#
@@ -3453,32 +3568,31 @@ msgstr ""
# significa "should not".
#
# Sigo pensando igual que antes, aunque no estoy seguro del todo. sv
-# Qu opinas Enrique? mm
-# Pues despus de ver los fuentes no consigo estar seguro. Pero
-# definitivamente no optara por 'no debera' , sino por 'no puede' , por
-# el nombre de la funcin est claro que es lo que se pretende. Afortunada-
-# mente el verbo poder en Castellano es mucho ms flexible que en otros
+# ¿Qué opinas Enrique? mm
+# Pues después de ver los fuentes no consigo estar seguro. Pero
+# definitivamente no optaría por 'no debería' , sino por 'no puede' , por
+# el nombre de la función está claro que es lo que se pretende. Afortunada-
+# 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:1023
+#: src/read-catalog.c:318 src/xgettext.c:1046
#, c-format
msgid "this file may not contain domain directives"
msgstr "este fichero no puede contener instrucciones de dominio"
-# Nota: es la definicin la que est duplicada.
-#: src/read-catalog.c:377
+# Nota: es la definición la que está duplicada.
+#: src/read-catalog.c:363
msgid "duplicate message definition"
-msgstr "definicin del mensaje duplicada"
+msgstr "definición del mensaje duplicada"
-#: src/read-catalog.c:379
-#, fuzzy
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
-msgstr "...aqu est la primera definicin"
+msgstr "esta es la localización de la primera definición"
#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
#, c-format
msgid "file \"%s\" is truncated"
-msgstr "el fichero \"%s\" est truncado"
+msgstr "el fichero \"%s\" está truncado"
#: src/read-mo.c:129
#, c-format
@@ -3488,7 +3602,7 @@ msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL"
#: src/read-mo.c:165 src/read-mo.c:274
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
-msgstr "el fichero \"%s\" no est en el formato .mo de GNU"
+msgstr "el fichero \"%s\" no está en el formato .mo de GNU"
#: src/read-mo.c:178
#, c-format
@@ -3496,42 +3610,34 @@ msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr "el fichero \"%s\" contiene una cadena no terminada en NUL en %s"
#: src/read-properties.c:227
-#, fuzzy
msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "%s:%lu: atencin: \\uxxxx sintxis no vlida para carcter Unicode"
+msgstr "atención: sintaxis \\uxxxx no válida para carácter Unicode"
#: src/read-stringtable.c:802
-#, fuzzy
msgid "warning: unterminated string"
-msgstr "%s:%d: atencin: cadena no finalizada"
+msgstr "atención: cadena no finalizada"
#: src/read-stringtable.c:810
-#, fuzzy
msgid "warning: syntax error"
-msgstr "%s%lu: atencin: error de sintxis"
+msgstr "atención: error de sintaxis"
#: src/read-stringtable.c:871 src/read-stringtable.c:893
-#, fuzzy
msgid "warning: unterminated key/value pair"
-msgstr "%s:%lu: atencin: par llave/valor no finalizado"
+msgstr "atención: par llave/valor no finalizado"
#: src/read-stringtable.c:939
-#, fuzzy
msgid "warning: syntax error, expected ';' after string"
-msgstr ""
-"%s:%lu: atencin: error de sintxis, se espera un ';' despus de la cadena"
+msgstr "atención: error de sintaxis; se espera un ';' después de la cadena"
#: src/read-stringtable.c:948
-#, fuzzy
msgid "warning: syntax error, expected '=' or ';' after string"
msgstr ""
-"%s:%lu: atencin: error de sintxis, se espera un '=' o un ';' despus de la "
-"cadena"
+"atención: error de sintaxis; se espera un '=' o un ';' después de la cadena"
#: src/recode-sr-latin.c:116
-#, fuzzy, c-format
+#, c-format
msgid "Written by %s and %s.\n"
-msgstr "Escrito por %s.\n"
+msgstr "Escrito por %s y %s.\n"
#. TRANSLATORS: This is a proper name. The last name is
#. (with Unicode escapes) "\u0160egan" or (with HTML entities)
@@ -3539,12 +3645,12 @@ msgstr "Escrito por %s.\n"
#. This is a proper name. See the gettext manual, section Names.
#: src/recode-sr-latin.c:120
msgid "Danilo Segan"
-msgstr ""
+msgstr "Danilo Segan"
#: src/recode-sr-latin.c:153
#, c-format, no-wrap
msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr ""
+msgstr "Recodifica el texto serbio de escritura cirílica a latina.\n"
#: src/recode-sr-latin.c:156
#, c-format, no-wrap
@@ -3552,16 +3658,18 @@ msgid ""
"The input text is read from standard input. The converted text is output to\n"
"standard output.\n"
msgstr ""
+"El fichero de entrada se lee de la entrada estándar. El texto convertido se saca por\n"
+"la salida estándar.\n"
#: src/recode-sr-latin.c:339
#, c-format
msgid "input is not valid in \"%s\" encoding"
-msgstr ""
+msgstr "la entrada no es válida con la codificación \"%s\""
#: src/recode-sr-latin.c:367
-#, fuzzy, c-format
+#, c-format
msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "error al abrir el fichero \"%s\" para lectura"
+msgstr "error al convertir de la codificación \"%s\" a la codificación \"%s\""
#: src/urlget.c:159
#, c-format
@@ -3571,7 +3679,7 @@ msgstr "se esperan dos argumentos"
#: src/urlget.c:176
#, c-format
msgid "Usage: %s [OPTION] URL FILE\n"
-msgstr "Modo de empleo: %s [OPCIN] URL FICHEROENTRADA\n"
+msgstr "Modo de empleo: %s [OPCIÓN] URL FICHEROENTRADA\n"
#: src/urlget.c:181
#, c-format, no-wrap
@@ -3590,54 +3698,51 @@ msgstr "error al leer \"%s\""
#: src/urlget.c:234
#, c-format
msgid "error writing stdout"
-msgstr "error al escribir la salida estndar"
+msgstr "error al escribir la salida estándar"
#: src/urlget.c:238
#, c-format
msgid "error after reading \"%s\""
-msgstr "error despus de leer \"%s\""
+msgstr "error después de leer \"%s\""
#: src/urlget.c:264
#, c-format
msgid "Retrieving %s..."
-msgstr ""
+msgstr "Recuperando %s..."
#: src/urlget.c:308
#, c-format
msgid " timed out.\n"
-msgstr ""
+msgstr " tiempo agotado.\n"
#: src/urlget.c:445
#, c-format
msgid " failed.\n"
-msgstr ""
+msgstr " ha fallado.\n"
#: src/write-catalog.c:126
-#, fuzzy
msgid ""
"Cannot output multiple translation domains into a single file with the "
"specified output format. Try using PO file syntax instead."
msgstr ""
-"No se pueden mostrar varios dominios de traduccin en un slo fichero en la\n"
-"sintxis .properties de Java. Intente usar la sintxis de los ficheros PO."
+"No se pueden mostrar varios dominios de traducción en un solo fichero con el "
+"formato de salida especificado. Intente usar la sintaxis de los ficheros PO."
#: src/write-catalog.c:129
-#, fuzzy
msgid ""
"Cannot output multiple translation domains into a single file with the "
"specified output format."
msgstr ""
-"No se pueden mostrar varios dominios de traduccin en un slo fichero en la\n"
-"sintxis .strings de NeXTstep/GNUstep."
+"No se pueden mostrar varios dominios de traducción en un solo fichero con el "
+"formato de salida especificado."
#: src/write-catalog.c:162
-#, fuzzy
msgid ""
"message catalog has context dependent translations, but the output format "
"does not support them."
msgstr ""
-"el catlogo de mensajes tiene traducciones con formas plurales, pero el "
-"catlogo de mensajes no admite el trato plural"
+"el catálogo de mensajes tiene traducciones que dependen del contexto, pero "
+"el formato de salida no las admite."
#: src/write-catalog.c:197
msgid ""
@@ -3645,7 +3750,7 @@ msgid ""
"support them. Try generating a Java class using \"msgfmt --java\", instead "
"of a properties file."
msgstr ""
-"el catlogo de mensajes tiene traducciones en forma plural, pero el formato "
+"el catálogo de mensajes tiene traducciones en forma plural, pero el formato "
"de salida no lo soporta. Se puede intentar generar una clase Java utilizando "
"\"msgfmt --java\" en vez del fichero de propiedades."
@@ -3654,8 +3759,8 @@ msgid ""
"message catalog has plural form translations, but the output format does not "
"support them."
msgstr ""
-"el catlogo de mensajes tiene traducciones con formas plurales, pero el "
-"catlogo de mensajes no admite el trato plural"
+"el catálogo de mensajes tiene traducciones con formas plurales, pero el "
+"catálogo de mensajes no admite el trato plural"
#: src/write-catalog.c:231 src/write-catalog.c:275
#, c-format
@@ -3664,7 +3769,7 @@ msgstr "no se puede crear el fichero de salida \"%s\""
#: src/write-catalog.c:239 src/write-catalog.c:283
msgid "standard output"
-msgstr "salida estndar"
+msgstr "salida estándar"
#: src/write-csharp.c:703
#, c-format
@@ -3674,57 +3779,56 @@ msgstr "fallo al crear el directorio \"%s\""
#: src/write-csharp.c:766
#, c-format
msgid "compilation of C# class failed, please try --verbose"
-msgstr "fallo en la compilacin de la clase C#, intente --verbose"
+msgstr "fallo en la compilación de la clase C#, intente --verbose"
#: src/write-csharp.c:768
-#, fuzzy, c-format
+#, c-format
msgid "compilation of C# class failed"
-msgstr "fallo en la compilacin de la clase C#, intente --verbose"
+msgstr "fallo en la compilación de la clase C#"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
-msgstr "no es un nombre de clase Java vlido: %s"
+msgstr "no es un nombre de clase Java válido: %s"
-#: 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 ""
-"fallo en la compilacin de la clase Java, intente --verbose o poner $JAVAC"
+"fallo en la compilación de la clase Java, intente --verbose o poner $JAVAC"
-#: src/write-java.c:1168
-#, fuzzy, c-format
+#: src/write-java.c:1213
+#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr ""
-"fallo en la compilacin de la clase Java, intente --verbose o poner $JAVAC"
+msgstr "fallo en la compilación de la clase Java, intente poner $JAVAC"
#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
#, c-format
msgid "error while opening \"%s\" for writing"
msgstr "error al abrir el fichero \"%s\" para escritura"
-#: src/write-po.c:803
-#, fuzzy, c-format
+#: src/write-po.c:875
+#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr ""
-"Los mensajes internacionalizados no deben contener la secuencia de escape `\\"
+"Los mensajes internacionalizados no deben contener la secuencia de escape '\\"
"%c'"
-#: src/write-po.c:1254 src/write-po.c:1383
-#, fuzzy, c-format
+#: src/write-po.c:1326 src/write-po.c:1450
+#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
"This will cause problems to translators who use a character encoding\n"
"different from yours. Consider using a pure ASCII msgctxt instead.\n"
"%s\n"
msgstr ""
-"El siguiente msgid contiene caracteres que no son ASCII.\n"
-"Esto causar problemas a los traductores que utlicen una codificacin de\n"
-"caracteres diferente a la suya. Considere la opcin de utilizar un msgid\n"
+"El siguiente msgctxt contiene caracteres que no son ASCII.\n"
+"Esto causará problemas a los traductores que utlicen una codificación de\n"
+"caracteres diferente a la suya. Considere la opción de utilizar un msgctxt\n"
"en ASCII puro. %s\n"
-#: 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"
@@ -3733,8 +3837,8 @@ msgid ""
"%s\n"
msgstr ""
"El siguiente msgid contiene caracteres que no son ASCII.\n"
-"Esto causar problemas a los traductores que utlicen una codificacin de\n"
-"caracteres diferente a la suya. Considere la opcin de utilizar un msgid\n"
+"Esto causará problemas a los traductores que utlicen una codificación de\n"
+"caracteres diferente a la suya. Considere la opción de utilizar un msgid\n"
"en ASCII puro. %s\n"
#: src/write-qt.c:667
@@ -3742,21 +3846,20 @@ msgid ""
"message catalog has plural form translations\n"
"but the Qt message catalog format doesn't support plural handling\n"
msgstr ""
-"el catlogo de mensajes tiene traducciones con formas plurales, pero el \n"
-"catlogo de mensajes de Qt no soporta el trato plural\n"
+"el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
+"catálogo de mensajes de Qt no soporta el trato plural\n"
#: src/write-qt.c:693
-#, fuzzy
msgid ""
"message catalog has msgctxt strings containing characters outside "
"ISO-8859-1\n"
"but the Qt message catalog format supports Unicode only in the translated\n"
"strings, not in the context strings\n"
msgstr ""
-"el catlogo de mensajes tiene cadenas msgid que contienen caracteres\n"
-"fuera del ISO-8859-1, pero el formato del catlogo de mensajes de Qt\n"
-"admite Unicode slo en las cadenas traducidas, pero no en las que an\n"
-"no lo estn\n"
+"el catálogo de mensajes tiene cadenas msgctxt que contienen caracteres fuera "
+"del ISO-8859-1,\n"
+"pero el formato del catálogo de mensajes de Qt admite Unicode\n"
+"solo en las cadenas traducidas, no en las cadenas del contexto\n"
#: src/write-qt.c:717
msgid ""
@@ -3764,10 +3867,10 @@ msgid ""
"but the Qt message catalog format supports Unicode only in the translated\n"
"strings, not in the untranslated strings\n"
msgstr ""
-"el catlogo de mensajes tiene cadenas msgid que contienen caracteres\n"
-"fuera del ISO-8859-1, pero el formato del catlogo de mensajes de Qt\n"
-"admite Unicode slo en las cadenas traducidas, pero no en las que an\n"
-"no lo estn\n"
+"el catálogo de mensajes tiene cadenas msgid que contienen caracteres\n"
+"fuera del ISO-8859-1, pero el formato del catálogo de mensajes de Qt\n"
+"admite Unicode solo en las cadenas traducidas, no en las que aún\n"
+"no lo están\n"
#: src/write-resources.c:94
#, c-format
@@ -3775,65 +3878,67 @@ msgid "error while writing to %s subprocess"
msgstr "hubo un error al escribir al subproceso %s"
#: src/write-resources.c:131
-#, fuzzy
msgid ""
"message catalog has context dependent translations\n"
"but the C# .resources format doesn't support contexts\n"
msgstr ""
-"el catlogo de mensajes tiene traducciones con formas plurales, pero el \n"
-"formato de los recursos de C# no tiene implementado el trato plural\n"
+"el catálogo de mensajes tiene traducciones que dependen del contexto, pero "
+"el \n"
+"formato de los recursos de C# no admite contextos\n"
#: src/write-resources.c:150
msgid ""
"message catalog has plural form translations\n"
"but the C# .resources format doesn't support plural handling\n"
msgstr ""
-"el catlogo de mensajes tiene traducciones con formas plurales, pero el \n"
+"el catálogo de mensajes tiene traducciones con formas plurales, pero el \n"
"formato de los recursos de C# no tiene implementado el trato plural\n"
#: src/write-tcl.c:157
-#, fuzzy
msgid ""
"message catalog has context dependent translations\n"
"but the Tcl message catalog format doesn't support contexts\n"
msgstr ""
-"el catlogo de mensajes tiene traducciones con formas plurales, pero el \n"
-"catlogo de mensajes de Tcl no soporta el trato plural\n"
+"el catálogo de mensajes tiene traducciones que dependen del contexto, pero "
+"el \n"
+"catálogo de mensajes de Tcl no admite contextos\n"
#: src/write-tcl.c:176
msgid ""
"message catalog has plural form translations\n"
"but the Tcl message catalog format doesn't support plural handling\n"
msgstr ""
-"el catlogo de mensajes tiene traducciones con formas plurales, pero el \n"
-"catlogo de mensajes de Tcl no soporta el trato plural\n"
+"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-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 "%s:%d: atencin: cadena no finalizada"
+msgstr "%s:%d: atención: cadena no finalizada"
#: src/x-awk.c:592
#, c-format
msgid "%s:%d: warning: unterminated regular expression"
-msgstr "%s:%d: atencin: expresin regular no finalizada"
+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-vala.c:762
+#: src/x-c.c:1051
+#, fuzzy, c-format
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: atención: carácter Unicode inválido"
+
+#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
#, c-format
msgid "%s:%d: warning: unterminated character constant"
-msgstr "%s:%d: atencin: constante de tipo carcter no finalizada"
+msgstr "%s:%d: atención: constante de tipo carácter no finalizada"
-#: 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 "%s:%d: atencin: literal de cadena no finalizada"
+msgstr "%s:%d: atención: literal de cadena no finalizada"
-#: src/x-csharp.c:224 src/xgettext.c:2055
-#, fuzzy
+#: src/x-csharp.c:224 src/xgettext.c:2106
msgid "Please specify the source encoding through --from-code."
-msgstr ""
-"Hay una cadena que no est en ASCII en %s%s.\n"
-"Especifique la codificacin del cdigo fuente utilizando --from-code.\n"
+msgstr "Especifique la codificación del código fuente utilizando --from-code."
#: src/x-csharp.c:269
#, c-format
@@ -3841,8 +3946,8 @@ msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the correct source encoding through --from-code.\n"
msgstr ""
-"%s:%d: Secuencia multibyte invlida.\n"
-"Especifique la codificacin del cdigo fuente utilizando --from-code.\n"
+"%s:%d: Secuencia multibyte inválida.\n"
+"Especifique la codificación del código fuente utilizando --from-code.\n"
#: src/x-csharp.c:285
#, c-format
@@ -3851,7 +3956,7 @@ msgid ""
"Please specify the correct source encoding through --from-code.\n"
msgstr ""
"%s:%d: Secuencia multibyte larga incompleta.\n"
-"Especifique la codificacin del cdigo fuente utilizando --from-code.\n"
+"Especifique la codificación del código fuente utilizando --from-code.\n"
#: src/x-csharp.c:297
#, c-format
@@ -3860,7 +3965,7 @@ msgid ""
"Please specify the correct source encoding through --from-code.\n"
msgstr ""
"%s:%d: Hay una secuencia multibyte incompleta al final del fichero.\n"
-"Especifique la codificacin del cdigo fuente utilizando --from-code.\n"
+"Especifique la codificación del código fuente utilizando --from-code.\n"
#: src/x-csharp.c:306
#, c-format
@@ -3868,8 +3973,8 @@ 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 lnea.\n"
-"Especifique la codificacin del cdigo fuente utilizando --from-code.\n"
+"%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-javascript.c:321 src/x-python.c:374
#, c-format
@@ -3882,230 +3987,251 @@ msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the source encoding through --from-code.\n"
msgstr ""
-"%s:%d: Hay una secuencia multibyte invlida.\n"
-"Especifique la codificacin del cdigo fuente utilizando --from-code.\n"
+"%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:1335
+#: src/x-csharp.c:1390 src/x-python.c:1138
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: atencin: carcter Unicode invlido"
+msgstr "%s:%d: atención: carácter Unicode inválido"
#: src/x-csharp.c:1512 src/x-java.c:875
#, c-format
msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: atencin: cadena constante no finalizada"
+msgstr "%s:%d: atención: cadena constante no finalizada"
#: src/x-csharp.c:2020 src/x-java.c:1369
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: cuidado: se encontr un ')' en donde se esperaba un '}'"
+msgstr "%s:%d: cuidado: se encontró un ')' en donde se esperaba un '}'"
#: src/x-csharp.c:2054 src/x-java.c:1403
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: cuidado: se encontr un '}' en donde se esperaba un ')'"
+msgstr "%s:%d: cuidado: se encontró un '}' en donde se esperaba un ')'"
-#: src/x-glade.c:561
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
+msgstr "No hay contexto para la cadena extraída del elemento '%s'"
-#: 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 ""
+msgstr "El elemento raíz <%s> no se permite en un fichero Glade válido"
-#: src/x-glade.c:841 src/x-glade.c:848
-#, fuzzy, c-format
+#: src/x-glade.c:572 src/x-glade.c:579
+#, c-format
msgid "%s:%lu:%lu: %s"
-msgstr "%s:%d:%d: %s"
+msgstr "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
"This version was built without expat.\n"
msgstr ""
-"El lenguaje \"glade\" no est soportado. %s se basa en expat.\n"
-"Esta versin fue construida sin expat.\n"
+"El lenguaje \"glade\" no está soportado. %s se basa en expat.\n"
+"Esta versión fue construida sin expat.\n"
#: src/x-java.c:494
-#, fuzzy, c-format
+#, c-format
msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: atencin: cadena no finalizada"
+msgstr "%s:%d: atención: sustitución aislada U+%04X"
#: 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 codificacin del cdigo fuente utilizando --from-code.\n"
+msgstr "Especifique la codificación del código fuente utilizando --from-code\n"
#: src/x-javascript.c:275
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
-"%s:%d: Secuencia multibyte invlida.\n"
-"Especifique la codificacin del cdigo fuente utilizando --from-code.\n"
+"%s:%d: Secuencia multibyte inválida.\n"
+"Especifique la codificación correcta del código fuente utilizando --from-"
+"code\n"
#: src/x-javascript.c:291
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
"%s:%d: Secuencia multibyte larga incompleta.\n"
-"Especifique la codificacin del cdigo fuente utilizando --from-code.\n"
+"Especifique la codificación correcta del código fuente utilizando --from-"
+"code\n"
#: src/x-javascript.c:303
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of file.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
"%s:%d: Hay una secuencia multibyte incompleta al final del fichero.\n"
-"Especifique la codificacin del cdigo fuente utilizando --from-code.\n"
+"Especifique la codificación correcta del código fuente utilizando --from-"
+"code\n"
#: src/x-javascript.c:312
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of line.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
-"%s:%d: Hay una secuencia multibyte incompleta al final de la lnea.\n"
-"Especifique la codificacin del cdigo fuente utilizando --from-code.\n"
+"%s:%d: Hay una secuencia multibyte incompleta al final de la línea.\n"
+"Especifique la codificación correcta del código fuente utilizando --from-"
+"code\n"
#: src/x-javascript.c:344
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the source encoding through --from-code\n"
msgstr ""
-"%s:%d: Hay una secuencia multibyte invlida.\n"
-"Especifique la codificacin del cdigo fuente utilizando --from-code.\n"
+"%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
+#: src/x-javascript.c:954
+#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: atencin: literal de cadena no finalizada"
+msgstr "%s:%d: atención: literal RegExp finalizada demasiado pronto"
+
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: atención: carácter Unicode inválido"
+
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: atención: cadena no finalizada"
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
msgstr ""
-"%s:%d: no se puede encontrar el terminador de cadena \"%s\" en ningn lugar "
+"%s:%d: no se puede encontrar el terminador de cadena \"%s\" en ningún lugar "
"antes del fin del fichero"
#: src/x-perl.c:1043
#, c-format
msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr "%s:%d: falta una llave derecha en \\x{NMEROHEX}"
+msgstr "%s:%d: falta una llave derecha en \\x{NÚMEROHEX}"
#: src/x-perl.c:1163
#, c-format
msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr "%s:%d: interpolacin no vlida (\"\\l\") del caracter de 8 bits \"%c\""
+msgstr "%s:%d: interpolación no válida (\"\\l\") del caracter de 8 bits \"%c\""
#: src/x-perl.c:1183
#, c-format
msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr "%s:%d: interpolacin no vlida (\"\\u\") del caracter de 8 bits \"%c\""
+msgstr "%s:%d: interpolación no válida (\"\\u\") del caracter de 8 bits \"%c\""
#: src/x-perl.c:1217
#, c-format
msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s:%d: interpolacin de variable no vlida en \"%c\""
+msgstr "%s:%d: interpolación de variable no válida en \"%c\""
#: src/x-perl.c:1230
#, c-format
msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr "%s%d: interpolacin no vlida (\"\\L\") del caracter de 8 bits \"%c\""
+msgstr "%s%d: interpolación no válida (\"\\L\") del caracter de 8 bits \"%c\""
#: src/x-perl.c:1247
#, c-format
msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
-msgstr "%s:%d: interpolacin no vlida (\"\\U\") del caracter de 8 bits \"%c\""
+msgstr "%s:%d: interpolación no válida (\"\\U\") del caracter de 8 bits \"%c\""
#: 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 ""
-"Hay una cadena que no est en ASCII en %s%s.\n"
-"Especifique la codificacin del cdigo fuente utilizando --from-code.\n"
+"Especifique la codificación del código fuente utilizando --from-code o "
+"mediante un comentario\n"
+"como se indica en http://www.python.org/peps/pep-0263.html.\n"
#: src/x-python.c:324
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"%s:%d: Secuencia multibyte invlida.\n"
-"Especifique la codificacin del cdigo fuente utilizando --from-code.\n"
+"%s:%d: Secuencia multibyte inválida.\n"
+"Especifique la codificación correcta del código fuente utilizando --from-"
+"code o mediante un comentario\n"
+"como se indica en http://www.python.org/peps/pep-0263.html.\n"
#: src/x-python.c:341
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
"%s:%d: Secuencia multibyte larga incompleta.\n"
-"Especifique la codificacin del cdigo fuente utilizando --from-code.\n"
+"Especifique la codificación correcta del código fuente utilizando --from-"
+"code o mediante un comentario\n"
+"como se indica en http://www.python.org/peps/pep-0263.html.\n"
#: src/x-python.c:354
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of file.\n"
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
"%s:%d: Hay una secuencia multibyte incompleta al final del fichero.\n"
-"Especifique la codificacin del cdigo fuente utilizando --from-code.\n"
+"Especifique la codificación correcta del código fuente utilizando --from-"
+"code o mediante un comentario\n"
+"como se indica en http://www.python.org/peps/pep-0263.html.\n"
#: src/x-python.c:364
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of line.\n"
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"%s:%d: Hay una secuencia multibyte incompleta al final de la lnea.\n"
-"Especifique la codificacin del cdigo fuente utilizando --from-code.\n"
+"%s:%d: Hay una secuencia multibyte incompleta al final de la línea.\n"
+"Especifique la codificación correcta del código fuente utilizando --from-"
+"code o mediante un comentario\n"
+"como se indica en http://www.python.org/peps/pep-0263.html.\n"
#: src/x-python.c:397
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the source encoding through --from-code or through a comment\n"
"as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"%s:%d: Hay una secuencia multibyte invlida.\n"
-"Especifique la codificacin del cdigo fuente utilizando --from-code.\n"
+"%s:%d: Hay una secuencia multibyte inválida.\n"
+"Especifique la codificación del código fuente utilizando --from-code o "
+"mediante un comentario\n"
+"como se indica en http://www.python.org/peps/pep-0263.html.\n"
#: src/x-python.c:722
#, c-format
msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr ""
+msgstr "Codificación desconocida \"%s\". Se procederá con ASCII en su lugar."
#: src/x-rst.c:108
#, c-format
msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: definicin de cadena invlida"
+msgstr "%s:%d: definición de cadena inválida"
#: src/x-rst.c:172
#, c-format
msgid "%s:%d: missing number after #"
-msgstr "%s:%d: falta un nmero despus del smbolo #"
+msgstr "%s:%d: falta un número después del símbolo #"
#: src/x-rst.c:207
#, c-format
msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: expresin de cadena invlida"
+msgstr "%s:%d: expresión de cadena inválida"
#: src/x-sh.c:1074
#, c-format
@@ -4113,69 +4239,75 @@ msgid ""
"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
"use eval_gettext instead"
msgstr ""
-"%s:%lu: cuidado: la sintxis $\"...\" se desaconseja debido a cuestiones de "
-"seguiridad; mejor utilice eval_gettext"
+"%s:%lu: cuidado: la sintaxis $\"...\" se desaconseja por razones de "
+"seguridad; mejor utilice eval_gettext"
-#: src/x-vala.c:558
-#, fuzzy, c-format
+#: src/x-vala.c:413
+#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: atencin: literal de cadena no finalizada"
+msgstr ""
+"%s:%d: atención: literal de expresión regular finalizada demasiado pronto"
+
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr ""
-#: src/xgettext.c:636
+#: src/xgettext.c:648
#, 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 estndar (stdout)"
+"salida estándar (stdout)"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext no puede funcionar sin palabras claves que buscar"
-#: src/xgettext.c:785
-#, fuzzy, c-format
+#: src/xgettext.c:808
+#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr ""
-"atencin: el fichero `%s' con extensin `%s'\n"
-"es desconocido; se intentar tipo C"
+"atención: el fichero '%s' con extensión '%s'\n"
+"es desconocido; se intentará tipo C"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr ""
"Extrae las cadenas traducibles a partir de un grupo de ficheros dados.\n"
-#: 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 ""
-" -d, --default-domain=NOMBRE utiliza NOMBRE.po para la salida (en vez de\n"
-" mensajes.po)\n"
+" -d, --default-domain=NOMBRE utiliza NOMBRE.po para la salida (en vez de\n"
+" mensajes.po)\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
" -o, --output=FICHERO escribe la salida al fichero especificado\n"
-#: 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 ""
-" -p, --output-dir=DIR los ficheros de salida se pondrn en el\n"
+" -p, --output-dir=DIR los ficheros de salida se pondrán en el\n"
" directorio DIR\n"
# acepto sugerencia de em pero agrego un "el". mm
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
-msgstr "Seleccin del lenguaje del fichero de entrada:\n"
+msgstr "Selección del lenguaje del fichero de entrada:\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, fuzzy, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -4185,32 +4317,32 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
-" -L, --language=NOMBRE reconoce el lenguaje especificado\n"
-" (C, C++, ObjectiveC, PO, Shell, Python, "
+" -L, --language=NOMBRE reconoce el lenguaje especificado\n"
+" (C, C++, ObjectiveC, PO, Shell, Python, "
"Lisp,\n"
-" EmacsLisp, librep, Scheme, Smalltalk, "
-"Java,\n"
-" JavaProperties, C#, awk, YCP, Tcl, Perl, "
+" EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
-" fuente-GCC, NXStringTable, RST, Glade)\n"
+" GCC-source, NXStringTable, RST, Glade, Lua,\n"
+" JavaScript, Vala)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ abreviatura de --language=C++\n"
-#: 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 ""
-"Por omisin, el lenguaje se adivina dependiendo de la extensin del fichero "
+"Por omisión, el lenguaje se adivina dependiendo de la extensión del fichero "
"de entrada.\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -4219,26 +4351,26 @@ msgstr ""
" --from-code=NOMBRE codifica a partir de los ficheros de entrada\n"
" (excepto para Python, Tcl y Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr ""
-"Por omisin, los ficheros de entrada se presupone que estn en ASCII.\n"
+"Por omisión, los ficheros de entrada se presupone que están en ASCII.\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
" -j, --join-existing une los mensajes con un fichero existente\n"
-#: 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 ""
-" -x, --exclude-file=FICHERO.po las lneas del FICHERO.po no son extraidas\n"
+" -x, --exclude-file=FICHERO.po las líneas del FICHERO.po no son extraidas\n"
-#: src/xgettext.c:896
-#, fuzzy, c-format
+#: src/xgettext.c:919
+#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
" preceding keyword lines in output file\n"
@@ -4246,22 +4378,25 @@ msgid ""
"lines\n"
" in output file\n"
msgstr ""
-" -c, --add-comments[=ETIQUETA] comenta un bloque con la ETIQUETA (o\n"
-" aquellas lneas que preceden a la palabra\n"
-" clave) en el fichero de salida\n"
+" -cTAG, --add-comments=ETIQUETA coloca los bloques de comentarios "
+"iniciándolos con ETIQUETA y \n"
+" delante de las líneas de palabras clave en "
+"el fichero de salida\n"
+" -c, --add-comments coloca todos los bloques de comentarios "
+"delante de las líneas de palabras clave\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
-msgstr "Opciones especficas del lenguaje:\n"
+msgstr "Opciones específicas del lenguaje:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all extrae todas las cadenas\n"
-#: src/xgettext.c:906 src/xgettext.c:914
-#, fuzzy, c-format
+#: src/xgettext.c:929
+#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, "
@@ -4269,25 +4404,30 @@ msgid ""
" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
" Lua, JavaScript, Vala)\n"
msgstr ""
-" (slo los lenguajes C, C++, ObjectiveC, "
+" (solo los lenguajes C, C++, ObjectiveC, "
"Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, "
"Java,\n"
-" C#, awk, Tcl, Perl, PHP, fuente-GCC, Glade)\n"
+" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+" Lua, JavaScript, Vala)\n"
-#: src/xgettext.c:911
+#: src/xgettext.c:937
#, fuzzy, 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 ""
-" -k, --keyword[=PALABRA] una palabra clabe adicional que se debe "
-"buscar \n"
-" (sin la PALABRA, significa que se deben "
-"utilizar \n"
-" las palabras clave por omisin)\n"
+" (solo los lenguajes C, C++, ObjectiveC, "
+"Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+" Lua, JavaScript, Vala)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -4295,13 +4435,13 @@ msgid ""
" number ARG of keyword WORD\n"
msgstr ""
" --flag=PALABRA:ARG:BANDERA bandera adicional para las cadenas que "
-"estn\n"
-" dentro del argumento nmero ARG de la "
+"están\n"
+" dentro del argumento número ARG de la "
"palabra\n"
" clave PALABRA\n"
-#: src/xgettext.c:922
-#, fuzzy, c-format
+#: src/xgettext.c:945
+#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, "
@@ -4309,65 +4449,67 @@ msgid ""
" C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
" Lua, JavaScript, Vala)\n"
msgstr ""
-" (Slo los lenguajes C, C++, ObjectiveC, "
+" (solo los lenguajes C, C++, ObjectiveC, "
"Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, "
"Java,\n"
-" C#, awk, YCP, Tcl, Perl, PHP, fuente-GCC)\n"
+" C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+" Lua, JavaScript, Vala)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
-" -T, --trigraphs entiende los trgrafos de ANSI C para la\n"
+" -T, --trigraphs entiende los trígrafos de ANSI C para la\n"
" entrada\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
-" (slo en lenguajes C, C++, ObjectiveC)\n"
+" (solo en lenguajes C, C++, ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt reconoce los formatos de cadena Qt\n"
-#: 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 " (slo lenguaje C++)\n"
+msgstr " (solo lenguaje C++)\n"
-#: src/xgettext.c:935
-#, fuzzy, c-format
+#: src/xgettext.c:958
+#, c-format
msgid " --kde recognize KDE 4 format strings\n"
-msgstr " --qt reconoce los formatos de cadena Qt\n"
+msgstr " --kde reconoce los 4 formatos de cadena KDE\n"
-#: src/xgettext.c:939
-#, fuzzy, c-format
+#: src/xgettext.c:962
+#, c-format
msgid " --boost recognize Boost format strings\n"
-msgstr " --qt reconoce los formatos de cadena Qt\n"
+msgstr " --boost reconoce los formatos de cadena Boost\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
-" --debug muestra con ms detalle el reconocimiento\n"
-" de las cadenas de formato\n"
+" --debug muestra con más detalle el resultado del "
+"reconocimiento\n"
+" de las cadenas de formato\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, 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:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
-" --copyright-holder=CADENA pone al dueo del copyright en la salida\n"
+" --copyright-holder=CADENA pone al dueño del copyright en la salida\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -4375,99 +4517,100 @@ msgstr ""
" --foreign-user omite el copyright de la FSF en la salida\n"
" para los usuarios extranjeros\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, c-format
msgid " --package-name=PACKAGE set package name in output\n"
msgstr ""
+" --package-name=PAQUETE pone el nombre del paquete en la salida\n"
-#: src/xgettext.c:989
-#, fuzzy, c-format
+#: src/xgettext.c:1012
+#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr ""
-" --copyright-holder=CADENA pone al dueo del copyright en la salida\n"
+" --package-version=VERSION pone la versión del paquete en la salida\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
-" --msgid-bugs-address=DIRECCION@DECORREO pone la direccin de correo \n"
+" --msgid-bugs-address=DIRECCION@DECORREO pone la dirección de correo \n"
" para reportar los errores\n"
-#: src/xgettext.c:993
-#, fuzzy, c-format
+#: src/xgettext.c:1016
+#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
"msgstr\n"
" values\n"
msgstr ""
-" -m, --msgstr-prefix[=CADENA] utiliza la CADENA o \"\" como prefijo para "
-"las\n"
-" lneas del msgstr\n"
+" -m[CADENA], --msgstr-prefix[=CADENA] utiliza CADENA o \"\" como prefijo "
+"para las\n"
+" líneas del msgstr\n"
-#: src/xgettext.c:996
-#, fuzzy, c-format
+#: src/xgettext.c:1019
+#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
"msgstr\n"
" values\n"
msgstr ""
-" -M, --msgstr-suffix[=CADENA] utiliza la CADENA o \"\" como sufijo para "
-"las\n"
-" lneas del msgstr\n"
+" -M[CADENA], --msgstr-suffix[=CADENA] utiliza CADENA o \"\" como sufijo "
+"para las\n"
+" líneas del msgstr\n"
-#: 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 ""
-"Un argumento --flag no tiene la sintxis <palabraclave>:<nmarg>:"
+"Un argumento --flag no tiene la sintaxis <palabraclave>:<númarg>:"
"[pass-]<bandera>: %s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
-msgstr "entrada estndar"
+msgstr "entrada estándar"
-#: src/xgettext.c:2020
+#: src/xgettext.c:2071
#, c-format
msgid "Non-ASCII character at %s%s."
-msgstr ""
+msgstr "Carácter no ASCII en %s%s."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
-msgstr ""
+msgstr "Comentario no ASCII en o precediendo %s%s."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
-msgstr ""
+msgstr "Cadena no ASCII en %s%s."
-#: 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 "%s%s: atencin: "
+msgstr "%s%s: atención: "
-#: 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 ""
-"Aunque se utiliz en una posicin de formato de cadena, el %s no se un "
-"formato de cadena vlido %s. La razn es: %s\n"
+"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: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 ""
-"Aunque as est declarado, '%s' no es un formato de cadena vlido %s. Razn: "
+"Aunque así esté declarado, '%s' no es un formato de cadena válido %s. Razón: "
"%s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4475,170 +4618,61 @@ msgid ""
"Please consider using a format string with named arguments,\n"
"and a mapping instead of a tuple for the arguments.\n"
msgstr ""
+"la cadena de formato '%s' con argumentos sin nombre no se puede localizar "
+"adecuadamente:\n"
+"El traductor no puede reordenar los argumentos.\n"
+"Considere la opción de usar una cadena de formato con argumentos con nombre\n"
+"y una asociación en lugar de una tupla para los argumentos.\n"
-#: 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 ""
-"msgid vaco. Est reservado por el gettext de GNU:\n"
-"gettext(\"\") regresa la lnea de encabezado con la\n"
-"metainformacin, no una cadena vaca.\n"
+"msgid vacío. Está reservado por el gettext de GNU:\n"
+"gettext(\"\") regresa la línea de encabezado con la\n"
+"metainformación, no una cadena vacía.\n"
-#: src/xgettext.c:2869
-#, fuzzy, c-format
+#: src/xgettext.c:2979
+#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "el argumento %s es ambiguo para %s"
+msgstr "la especificación de argumento es ambigua para la palabra clave '%.*s'"
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
-msgstr ""
+msgstr "atención: no está presente el contexto para la palabra clave '%.*s'"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr ""
+"atención: no está presente el contexto para el argumento plural de la "
+"palabra clave '%.*s'"
-#: src/xgettext.c:2942
+#: src/xgettext.c:3052
#, c-format
msgid "context mismatch between singular and plural form"
-msgstr ""
+msgstr "discordancia de contexto entre las formas de singular y plural"
-#: src/xgettext.c:3052
-#, fuzzy
+#: src/xgettext.c:3419
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a 'Makevars' file, please specify\n"
"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
"specify an --msgid-bugs-address command line option.\n"
msgstr ""
-"La opcin --msgid-bugs-address no se especific.\n"
-"Si se est usando un fichero `Makevars', especifique\n"
-"all la variable MSGID_BUGS_ADDRESS; si no lo hace,\n"
-"debe se poner la opcin --msgid-bugs-address\n"
+"La opción --msgid-bugs-address no se especificó.\n"
+"Si se está usando un fichero 'Makevars', especifique\n"
+"allí la variable MSGID_BUGS_ADDRESS; en caso contrario,\n"
+"debe especificar la opción de línea de órdenes --msgid-bugs-address\n"
-#: src/xgettext.c:3267
-#, fuzzy, c-format
+#: src/xgettext.c:3638
+#, c-format
msgid "language '%s' unknown"
-msgstr "idioma `%s' desconocido"
+msgstr "idioma '%s' desconocido"
#: libgettextpo/gettext-po.c:84
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 lnea\n"
-
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr ""
-#~ "algunos campos de cabecera an tienen el valor inicial por omisin\n"
-
-# acepto la sugerencia de em en cuanto a que invlida parece crcel
-# o intil pero mejor puse invlida
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: opcin invlida -- %c\n"
-
-#~ msgid "DuplicateHandle failed with error code 0x%08x"
-#~ msgstr ""
-#~ "fallo de duplicacin de manejador (DuplicateHandle) con cdigo de error 0x"
-#~ "%08x"
-
-#~ msgid "Not yet implemented."
-#~ msgstr "An no est implementado."
-
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "el campo `%s' an tiene el valor inicial por omisin\n"
-
-#~ msgid "Multiple references to %%%c."
-#~ msgstr "Referencias mltiples a %%%c."
-
-#~ msgid ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions. There is "
-#~ "NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
-#~ "PURPOSE.\n"
-#~ msgstr ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "Esto es software libre; vea el cdigo fuente para las condiciones de "
-#~ "copia.\n"
-#~ "No hay NINGUNA garanta; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA "
-#~ "UN\n"
-#~ "FIN DETERMINADO.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "message catalog has context dependent translations\n"
-#~ "but the C# .dll format doesn't support contexts\n"
-#~ msgstr ""
-#~ "el catlogo de mensajes tiene traducciones con formas plurales, pero el \n"
-#~ "formato de los recursos de C# no tiene implementado el trato plural\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "message catalog has context dependent translations\n"
-#~ "but the Java ResourceBundle format doesn't support contexts\n"
-#~ msgstr ""
-#~ "el catlogo de mensajes tiene traducciones con formas plurales, pero el \n"
-#~ "formato de los recursos de C# no tiene implementado el trato plural\n"
-
-#~ msgid "The %%J directive is only allowed at the beginning of the string."
-#~ msgstr "La instruccin %%J slo se permite al principio de la cadena."
-
-#~ msgid "The %%J directive does not support flags."
-#~ msgstr "La instruccin %%J no acepta ninguna bandera."
-
-#~ msgid "Which is your email address?"
-#~ msgstr "Cul es tu direccin de correo electrnico?"
-
-#~ msgid "Please choose the number, or enter your email address."
-#~ msgstr "Selecciona el nmero, o escribe tu direccin de correo electrnico."
-
-#~ msgid "Invalid email address: invalid character."
-#~ msgstr "Direccin de correo electrnico incorrecta: caracter invlido."
-
-#~ msgid ""
-#~ "Invalid email address: need a fully qualified host name or domain name."
-#~ msgstr ""
-#~ "Direccin de correo electrnico invlido: se necesita un nombre de "
-#~ "mquina o dominio totalmente calificado."
-
-#~ msgid "Invalid email address: missing @"
-#~ msgstr "Direccin de correo electrnico incorrecta: falta la @"
-
-#~ msgid "Is the following your email address?"
-#~ msgstr "Es sta tu direccin de correo electrnico?"
-
-#~ msgid "Please confirm by pressing Return, or enter your email address."
-#~ msgstr ""
-#~ "Confirma presionando Return, o escribe tu direccin de correo electrnico."
-
-#~ msgid "Couldn't find out about your email address."
-#~ msgstr "No se puede encontrar tu direccin de correo electrnico."
-
-#~ msgid "Please enter your email address."
-#~ msgstr "Por favor escribe tu direccin de correo electrnico."
-
-#~ msgid "conversion failure"
-#~ msgstr "falla de conversin"
-
-#~ msgid "%s: warning: "
-#~ msgstr "%s: atencin: "
-
-#~ msgid "%s\n"
-#~ msgstr "%s\n"
-
-#~ msgid "%s:%lu: warning: unterminated string"
-#~ msgstr "%s:%lu: atencin: cadena no finalizada"
-
-#~ msgid "%s:%d: fatal: plural message seen before singular message\n"
-#~ msgstr ""
-#~ "%s:%d: error grave: el mensaje en plural se vi antes del mensaje en "
-#~ "singular\n"
-
-#~ msgid "write to grep subprocess failed"
-#~ msgstr "fallo en la escritura al subproceso grep"
diff --git a/gettext-tools/po/et.po b/gettext-tools/po/et.po
index 992b236..b58b7f6 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: 2013-07-07 18:21+0900\n"
+"POT-Creation-Date: 2014-06-01 11:19+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"
@@ -179,15 +179,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 "viga faili \"%s\" kirjutamisel"
@@ -208,9 +208,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 "mlu sai otsa"
@@ -221,7 +221,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 ""
@@ -308,8 +308,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 "viga faili \"%s\" avamisel (lugemiseks)"
@@ -648,7 +648,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
#, fuzzy, c-format
msgid "a format specification for argument '%s' doesn't exist in '%s'"
@@ -689,28 +689,28 @@ 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
+#: 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 ""
@@ -756,11 +756,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"
@@ -769,19 +769,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 "Selle programmi on kirjutanud %s.\n"
#. 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 ""
@@ -791,11 +791,11 @@ msgstr ""
msgid "too many arguments"
msgstr "liiga palju argumente"
-#: 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
#, fuzzy, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Tiendava info saamiseks proovi `%s --help'.\n"
@@ -833,29 +833,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 ""
@@ -864,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: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
#, fuzzy
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Vigadest teata aadressile <bug-gnu-utils@gnu.org>.\n"
@@ -878,230 +878,233 @@ msgstr "Vigadest teata aadressile <bug-gnu-utils@gnu.org>.\n"
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
#, fuzzy, c-format
msgid "at most one input file allowed"
msgstr "vaja lheb tpselt kahte sisendfaili"
-#: 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 "%s ja %s on vastastikku vlistavad"
-#: 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
#, fuzzy, c-format
msgid "Input file location:\n"
msgstr "sisendfail on mramata"
-#: 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"
@@ -1110,87 +1113,87 @@ 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
#, fuzzy, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1211,31 +1214,31 @@ msgstr ""
" -V, --version vljastab versiooniinfo ja lpetab programmi t\n"
" -w, --width=NUMBER mrab vljastatava leheklje laiuse\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 "lubamatu valikukriteeriumi kirjeldus (%d < n < %d)"
-#: 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
#, fuzzy, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1263,92 +1266,92 @@ msgstr ""
"comments) jetakse alles ainult esimesena kirjeldatud PO failist.\n"
"Positsioonikirjeldused vetakse ja silitatakse kikidest PO failidest.\n"
-#: 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 "sisendfailid on mramata"
-#: 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 "vaja lheb tpselt kahte sisendfaili"
-#: 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 ""
@@ -1389,19 +1392,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 ""
@@ -1426,17 +1429,17 @@ msgstr "hoiatus: see teade on kasutamata"
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 "see teade on kasutusel, kuid kirjeldamata..."
-#: 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 "...kuid see kirjeldus on sarnane"
-#: 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 "see teade on kasutusel, kuid %s poolt kirjeldamata"
@@ -1446,19 +1449,19 @@ msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
msgid "warning: this message is not used"
msgstr "hoiatus: see teade on kasutamata"
-#: 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] "leitud %d tsine viga"
msgstr[1] "leitud %d tsist viga"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "vhemalt kaks faili peab olema ette antud"
-#: src/msgcomm.c:363
+#: src/msgcomm.c:364
#, fuzzy, c-format, no-wrap
msgid ""
"Find messages which are common to two or more of the specified PO files.\n"
@@ -1485,74 +1488,74 @@ msgstr ""
"comments) jetakse alles ainult esimesena kirjeldatud PO failist.\n"
"Positsioonikirjeldused vetakse ja silitatakse kikidest PO failidest.\n"
-#: 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 "sisendfail on mramata"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, fuzzy, c-format
msgid "exactly one input file required"
msgstr "vaja lheb tpselt kahte sisendfaili"
-#: 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"
@@ -1561,7 +1564,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 ""
@@ -1593,7 +1596,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 ""
@@ -1603,45 +1606,45 @@ msgstr ""
msgid "write to stdout failed"
msgstr ""
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, fuzzy, c-format
msgid "missing filter name"
msgstr "argumendid on puudu"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, fuzzy, c-format
msgid "at least one sed script must be specified"
msgstr "vhemalt kaks faili peab olema ette antud"
-#: 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 "
@@ -1649,192 +1652,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
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s ja %s on vastastikku vlistavad"
+
+#: 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] "%d tlgitud teade"
msgstr[1] "%d tlgitud teadet"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d kahtlane tlge"
msgstr[1] ", %d kahtlast tlget"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d tlkimata teade"
msgstr[1] ", %d tlkimata teadet"
-#: 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 "
@@ -1843,48 +1880,78 @@ msgid ""
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, fuzzy, c-format
msgid "Output file location in C# mode:\n"
msgstr "sisendfail on mramata"
-#: 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"
@@ -1892,33 +1959,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 "
@@ -1926,18 +1993,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 "
@@ -1946,105 +2013,115 @@ 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
#, fuzzy, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr ""
"%s: hoiatus: PO faili pis puudub, on kahtlane vi vigane\n"
"%*s hoiatus: charset conversion will not work"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, fuzzy, c-format
msgid "warning: charset conversion will not work\n"
msgstr ""
"Kooditabel on pises kirjeldamata.\n"
"Tlgete teisendamine kasutaja kooditabelisse ei toimi.\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, fuzzy, c-format
msgid "warning: PO file header fuzzy\n"
msgstr ""
"%s: hoiatus: PO faili pis puudub, on kahtlane vi vigane\n"
"%*s hoiatus: charset conversion will not work"
-#: 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 "domeeni nimi \"%s\" ei ole kasutatav failinimena"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domeeni nimi \"%s\" ei ole kasutatav failinimena: kasutan eesliidet"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "'domain %s' directive ignored"
msgstr "ignoreerin `domain %s' direktiivi"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, fuzzy, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "ignoreerin thja `msgstr' kirjet"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, fuzzy, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "ignoreerin kahtlast `msgstr' kirjet"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: hoiatus: lhtefail sisaldab kahtlast tlget"
+#: 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 "viga \"%s\" lugemisel"
-#: 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"
@@ -2084,18 +2161,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 ""
@@ -2234,7 +2311,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
#, fuzzy, c-format
msgid "warning: "
msgstr "%s: hoiatus: "
@@ -2417,17 +2494,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
#, fuzzy, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "mned pise kirjes olevad vljad sisaldavad ikka veel algseid vrtusi"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, fuzzy, c-format
msgid "header field '%s' missing in header\n"
msgstr "pise kirjest on puudu vli `%s'"
@@ -2447,7 +2524,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
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2464,7 +2541,7 @@ 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
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2473,16 +2550,16 @@ msgstr ""
"Kooditabel \"%s\" ei ole toetatud. %s asendatakse,\n"
"iconv() poolt. See versioon tehakse ilma iconv() kasutamata.\n"
-#: 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
#, fuzzy, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2509,51 +2586,51 @@ msgstr ""
"kahtlased. Kui vljundfaili ei ole kirjeldatud, saadetakse tulemus\n"
"standardvljunisse.\n"
-#: 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 "
@@ -2565,7 +2642,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 "
@@ -2573,28 +2650,28 @@ 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
#, fuzzy, c-format
msgid "this message should define plural forms"
msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, fuzzy, c-format
msgid "this message should not define plural forms"
msgstr "see teade on kasutusel, kuid %s poolt kirjeldamata"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2603,7 +2680,7 @@ msgstr ""
"%sLoetud %ld vana + %ld viidet, hendatud %ld, kahtlaseid %ld, puuduvaid "
"%ld, vananenuid %ld.\n"
-#: 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"
@@ -2701,7 +2778,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"
@@ -2714,12 +2791,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 "
@@ -2788,27 +2865,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "vastuoluline #~ kasutamine"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, fuzzy, c-format
msgid "missing 'msgstr[]' section"
msgstr "puudub `msgstr[]' sektsioon"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, fuzzy, c-format
msgid "missing 'msgid_plural' section"
msgstr "puudub `msgid_plural' sektsioon"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, fuzzy, c-format
msgid "missing 'msgstr' section"
msgstr "puudub `msgstr' sektsioon"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "esimene mitmuse vormi indeks erineb nullist"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "mitmuse vorm omab vale indeksit"
@@ -2818,7 +2895,7 @@ msgstr "mitmuse vorm omab vale indeksit"
msgid "too many errors, aborting"
msgstr "liiga palju vigu, katkestan t"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c: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 "vigane multibait jada"
@@ -2862,16 +2939,16 @@ msgstr "reavahetus asub stringi sees"
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 "see fail ei tohi sisaldada domeeni direktiive"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "teade on kirjeldatud kaks korda"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
#, fuzzy
msgid "this is the location of the first definition"
msgstr "...see on esimese kirjelduse asukoht"
@@ -3063,17 +3140,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 ""
@@ -3083,13 +3160,13 @@ msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "viga faili \"%s\" avamisel (kirjutamiseks)"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, fuzzy, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr "tlgitud teated peaksid mitte sisaldama `\\%c' erimrgijada"
-#: 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"
@@ -3098,7 +3175,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"
@@ -3157,7 +3234,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
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "%s:%d: hoiatus: lpetamata string"
@@ -3167,17 +3244,22 @@ msgstr "%s:%d: hoiatus: lpetamata string"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: hoiatus: lpetamata string"
-#: 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
+#, fuzzy, c-format
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: lpetamata smbolkonstant"
+
+#: 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 "%s:%d: lpetamata smbolkonstant"
-#: 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 "%s:%d: hoiatus: lpetamata string"
-#: 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 ""
@@ -3221,7 +3303,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
#, fuzzy, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: lpetamata smbolkonstant"
@@ -3241,22 +3323,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
#, fuzzy, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3309,11 +3391,21 @@ msgid ""
"Please specify the source encoding through --from-code\n"
msgstr ""
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, fuzzy, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: hoiatus: lpetamata string"
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: lpetamata smbolkonstant"
+
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: hoiatus: lpetamata string"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3422,57 +3514,62 @@ msgid ""
"use eval_gettext instead"
msgstr ""
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, fuzzy, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: hoiatus: lpetamata string"
-#: 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 ""
"vtit `--join-existing' ei ole vimalik pruukida kui vljunit kirjutatakse "
"standardvljundisse"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext ei tta ilma vajalike vtmesnadeta"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, 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: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
#, fuzzy, c-format
msgid "Choice of input file language:\n"
msgstr "sisendfail on mramata"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3482,44 +3579,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"
@@ -3529,17 +3626,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"
@@ -3549,14 +3646,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 "
@@ -3564,7 +3664,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"
@@ -3574,75 +3674,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 "
@@ -3650,7 +3750,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 "
@@ -3658,52 +3758,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 "standardsisend"
-#: 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
#, fuzzy, c-format
msgid "%s%s: warning: "
msgstr "%s: hoiatus: "
-#: 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"
@@ -3712,34 +3812,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"
@@ -3747,7 +3847,7 @@ msgid ""
"specify an --msgid-bugs-address command line option.\n"
msgstr ""
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, fuzzy, c-format
msgid "language '%s' unknown"
msgstr "tundmatu keel `%s'"
@@ -3756,19 +3856,14 @@ msgstr "tundmatu keel `%s'"
msgid "<unnamed>"
msgstr ""
-#, fuzzy
-#~ msgid "header field '%s' should start at beginning of line\n"
-#~ msgstr "pise kirjes peab vli `%s' algama rea algusest"
-
-#, fuzzy
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr ""
-#~ "mned pise kirjes olevad vljad sisaldavad ikka veel algseid vrtusi"
-
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: lubamatu vti -- %c\n"
#, fuzzy
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "pise kirjes peab vli `%s' algama rea algusest"
+
+#, fuzzy
#~ msgid "field `%s' still has initial default value\n"
#~ msgstr "vli `%s' sisaldab ikka veel algset vrtust"
diff --git a/gettext-tools/po/eu.po b/gettext-tools/po/eu.po
index b47c78f..9b16e40 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: 2013-07-07 18:21+0900\n"
+"POT-Creation-Date: 2014-06-01 11:19+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"
@@ -182,15 +182,15 @@ msgstr "source_version argumentu baliogabea compile_java_class-rentzat"
msgid "invalid target_version argument to compile_java_class"
msgstr "target_version argumentu baliogabea compile_java_class-rentzat"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c: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 "Huts \"%s\" sortzerakoan"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c: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 "errorea \"%s\" fitxategia idazterakoan"
@@ -214,20 +214,20 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr "%s azpiprozesu S/I errorea"
-#: 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 "memoria askieza"
#: gnulib-lib/pipe-filter-ii.c:192
-#, fuzzy, c-format
+#, c-format
msgid "creation of threads failed"
-msgstr "C# klase konpilazioak huts egin du, saiatu --verbose erabiliaz"
+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 "huts %s azpiprozesuan idaztean"
@@ -314,8 +314,8 @@ 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: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 "errorea \"%s\" irakurketarako irekitzerakoan"
@@ -687,7 +687,7 @@ msgid ""
msgstr "Handiagotu u tamaina da honekin k."
#: 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
#, fuzzy, c-format
msgid "a format specification for argument '%s' doesn't exist in '%s'"
@@ -729,29 +729,29 @@ 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
+#: src/format-python-brace.c:137
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
msgstr "Handiagotu u k da Bielorrusiarra a."
-#: src/format-python-brace.c:149
+#: src/format-python-brace.c:150
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
msgstr ""
"%u zenbakidun direktiban, '{' ez dago argumentu zenbaki batez jarraitua."
-#: src/format-python-brace.c:164
+#: src/format-python-brace.c:165
#, 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
+#: src/format-python-brace.c:185
#, fuzzy, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
msgstr "%u zenbakidun direktiban, zehatapena ez da onartze '%c' ondoren"
-#: src/format-python-brace.c:210
+#: src/format-python-brace.c:270
#, fuzzy, c-format
msgid "In the directive number %u, there is an unterminated format directive."
msgstr "Handiagotu u l da."
@@ -801,11 +801,11 @@ msgid ""
"1 and 9."
msgstr "u da a eta."
-#: 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"
@@ -814,19 +814,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 "%s-ek idatzia.\n"
#. 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 "Bruno Haible"
@@ -836,11 +836,11 @@ msgstr "Bruno Haible"
msgid "too many arguments"
msgstr "argumentu gehiegi"
-#: 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
#, fuzzy, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "`%s --help' erabili argibide gehiagorako.\n"
@@ -881,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: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 "Informazio irteera:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help laguntza hau bisarazi eta irten\n"
-#: 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 " -V, --version bertsio argibideak bistarazi eta irten\n"
@@ -912,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: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 "Programa erroreen berri emateko: <bug-gnu-gettext@gnu.org>.\n"
@@ -925,30 +925,27 @@ 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: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 "behintzat sarrera fitxategi bat onartu da"
-#: 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 "%s eta %s ez dira bateragarriak"
-#: 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 "Erabilera: %s [AUKERA] [SARFITXATEGIA]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -957,10 +954,10 @@ msgstr ""
"Itzulpen katalogko kateak beraien atributuen arabera iragazi,\n"
"eta beren atributuak eraldatu.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c: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"
@@ -968,23 +965,23 @@ msgstr ""
"Aukera luzeentzat beharrezko argumentuak beharrezkoak dira aukera "
"laburrentzat ere.\n"
-#: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
-#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
-#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
-#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
+#: src/msgattrib.c:433 src/msgcat.c: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 "Sarrera fitxategi kokapena:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " SARRERA_FITXATEGIA sarrera PO fitxatergia\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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"
@@ -992,32 +989,32 @@ msgstr ""
" -D, --directory=DIRECTORIOA Gehitu DIRECTORIOA sarrera fitxategiak "
"bilatzeko zerrendara\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c: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 ""
"Sarrera fitxategirik ematen ez bada edo berau - bada, sarrera estandarra "
"irakurriko da.\n"
-#: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
-#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
-#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
-#: src/xgettext.c:857
+#: src/msgattrib.c:442 src/msgcat.c: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 "Irteera fitxategi kokapena:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 " -o, --output-file=FITX idatzi irteera ezarritako fitxategian\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1027,12 +1024,12 @@ msgstr ""
"bada\n"
"edo berau - bada.\n"
-#: 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 "Mezu hautapena:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
@@ -1040,7 +1037,7 @@ msgstr ""
" --translated mantendu itzulitakoak, ezabatu itzuli gabeko "
"mezuak\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
@@ -1048,55 +1045,55 @@ msgstr ""
" --untranslated mantendu itzuli gabekoak, ezabatu itzulitako "
"mezuak\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr ""
" --no-fuzzy ezabatu zalantza bezala markaturiko kateak\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr ""
" --only-fuzzy mantendu zalantza bezala markaturiko kateka\n"
-#: 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 " --only-obsolete mantendu zaharkituriko #~ mezuak\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Atributu manipulazioa:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr " --set-fuzzy ezarri kate guztiak zalantza bezala\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr " --clear-fuzzy zalantza bandera kendu kate guztiei\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr " --set-obsolete ezarri mezu guztiak zaharkituak bezala\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr ""
" --clear-obsolete ezarri mezu guztiak ez-zaharkituk bezala\n"
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, fuzzy, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
@@ -1104,7 +1101,7 @@ msgid ""
msgstr ""
" --previous mantendu aurreko msgid-ak itzulitako mezuetan\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
@@ -1112,7 +1109,14 @@ msgid ""
msgstr ""
" --clear-previous ezabatu \"previous msgid\" mezu guztietatik\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, fuzzy, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+" --no-fuzzy ezabatu zalantza bezala markaturiko kateak\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
@@ -1120,7 +1124,7 @@ msgstr ""
" --only-file=FITX.po FITX.po fitxategian zerrendaturiko sarrerak "
"bakarrik eraldatu\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
@@ -1128,13 +1132,13 @@ msgstr ""
" --ignore-file=FILE.po FITX.po fitxategian ez zerrendaturiko sarrerak "
"bakarrik eraldatu\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr ""
" --fuzzy --only-fuzzy --clear-fuzzy -ren sinonimo\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
@@ -1142,16 +1146,16 @@ msgstr ""
" --obsolete --only-obsolete --clear-obsolete -ren "
"sinonimo\n"
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c: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 "Sarrera fitxategi sintaxia:\n"
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c: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"
@@ -1159,8 +1163,8 @@ msgstr ""
" -P, --properties-input sarrera fitxategia Java .properties sintaxian "
"dago\n"
-#: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
-#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c: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 "
@@ -1169,17 +1173,17 @@ msgstr ""
" --stringtable-input sarrera fitxategia NeXTstep/GNUstep .strings "
"sintaxian dago\n"
-#: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
-#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
-#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
-#: src/xgettext.c:946
+#: src/msgattrib.c:498 src/msgcat.c: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 "Irteera xehetasunak:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1188,25 +1192,25 @@ 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 ""
" -e, --no-escape ez erabili C ihesak irteeran (lehenetsia)\n"
-#: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
-#: src/msguniq.c:390 src/xgettext.c:956
+#: src/msgattrib.c:508 src/msgcat.c: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"
@@ -1214,97 +1218,97 @@ msgstr ""
" -E, --escape C ihesak erabili irteeran, ez hedatutako "
"karaktereak\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr " --force-po PO fitxategia idatzi nahiz hutsik egon\n"
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
" -i, --indent .po fitxategia koskadun estiloa erabiliaz "
"idatzi\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c: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 " -w, --width=ZENBAKIA irteera orri zabalera ezarri\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c: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 " -s, --sort-output ordenatutako irteera sortu\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 " -F, --sort-by-file irteera fixattegi kokapenaz ordenatu\n"
-#: 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 "ezinezko hatapen kriterio bat ezarri da (%d < n < %d)"
-#: 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 "Erabilera: %s [AUKERA] [SARRERA_FITX]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1318,47 +1322,47 @@ 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 " INPUTFILE ... sarrera fitxategiak\n"
-#: 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 ""
" -f, --files-from=FITXATEGI sarrera fitxategi zerrenda FITXATEGI-tik "
"eskuratu\n"
-#: 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 "Sarrera fitxategia - bada, sarrera estandarra irakurriko da.\n"
-#: 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"
@@ -1366,8 +1370,8 @@ msgstr ""
" -P, --properties-input sarrera fixtategiak Java .properties sintasian "
"daude\n"
-#: 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"
@@ -1376,40 +1380,40 @@ msgstr ""
" --stringtable-input sarrera fitxategiak NeXTstep/GNUstep .strings\n"
" sintaxian daude\n"
-#: 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 " -t, --to-code=IZENA irteeraren kodeketa\n"
-#: 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 "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "ez da sarrera fitxategirik eman"
-#: 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 "zehazki 2 sarrera fitxategi behar dira"
-#: 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 "Erabilera: %s [AUKERA] def.po ref.pot\n"
@@ -1435,12 +1439,12 @@ msgstr " def.po itzulpenak\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot iturburura erreferentziak\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "Operazio aldagaiak:\n"
-#: 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."
@@ -1448,7 +1452,7 @@ msgid ""
msgstr ""
" -m, --multi-domain ref.pot ezarri def.po-ko domeinu bakoitzean\n"
-#: 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 " -N, --no-fuzzy-matching ez erabili zalantza parekatzea\n"
@@ -1473,17 +1477,17 @@ msgstr "mezu hau itzuli gabe dago"
msgid "this message needs to be reviewed by the translator"
msgstr "mezu hau itzultzaile batek gainbegiratu behar du"
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1505
#, c-format
msgid "this message is used but not defined..."
msgstr "mezu hau erabilia baina definitu gabe daago..."
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1508
#, c-format
msgid "...but this definition is similar"
msgstr "...baina definizio hau oso antzekoa da"
-#: 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 "mezu hau erabilia dago baina ez dago %s-en ezarria"
@@ -1493,19 +1497,19 @@ msgstr "mezu hau erabilia dago baina ez dago %s-en ezarria"
msgid "warning: this message is not used"
msgstr "oharra: mezu hau ez da erabiltzen"
-#: 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] "errorea konponezin %d aurkitu da"
msgstr[1] "%d errorea konponezin aurkitu dira"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "behintza bi fitxategi ezarri behar dira"
-#: 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"
@@ -1518,78 +1522,78 @@ 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
#, fuzzy, c-format
msgid ""
" --omit-header don't write header with 'msgid \"\"' entry\n"
msgstr ""
" --keep-header utzi goiburua eraldatu gabe, ez berau iragazi\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr ""
"Itzulpen katalogo bat karaktere kodeketa ezberdin batera bihurtzen du.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Bihurtze helburua:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Lehenetsiriko kodeketa uneko lokalaren kodeketa da.\n"
-#: src/msgconv.c: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 " -i, --indent kokadun irteera estiloa\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location kendu '#: filename:line' lerroak\n"
-#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
-#: src/msgmerge.c:583
-#, c-format
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
+#: src/msgmerge.c:588
+#, fuzzy, c-format
msgid ""
-" --add-location preserve '#: filename:line' lines (default)\n"
+" -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
" --add-location mantendu '#: filename:line' lerroak "
"(lehenetsia)\n"
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
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:649
+#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
#, c-format
msgid "no input file given"
msgstr "ez da sarrera fitxategirik eman"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "zehazki sarrera fitxategi bat behar da"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Erabilera: %s [AUKERA] SAR_FITXATEGIA\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1598,7 +1602,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 " INPUTFILE sarrera PO edo POT fitxategia\n"
@@ -1630,7 +1634,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 " -i, --input=INPUTFILE sarrera PO fitxategia\n"
@@ -1640,45 +1644,45 @@ msgstr " -i, --input=INPUTFILE sarrera PO fitxategia\n"
msgid "write to stdout failed"
msgstr "huts irteera estandarrean idaztean"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "iragazki izena falta da"
-#: 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 "Erabilera: %s [AUKERA] IRAGAZKIA [IRAGAZKI-AUKERA]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "IRagazkia ezarri itzulpen guztiei edo itzulpen katalogo bati.\n"
-#: src/msgfilter.c: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 "
@@ -1686,106 +1690,129 @@ 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 ""
" --no-escape ez erabili C ihesak irteeran (lehenespena)\n"
-#: 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 ""
" --keep-header utzi goiburua eraldatu gabe, ez berau iragazi\n"
-#: 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 "Ulrich Drepper"
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:439
+#, fuzzy, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr ""
+"Sarrera fitxategirik ematen ez bada edo berau - bada, sarrera estandarra "
+"irakurriko da.\n"
+
+#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
#: src/msgunfmt.c:353
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s-ek \"-d directory\" ezarpen bat behar du"
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c: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 "%s-ek \"-l locale\" ezarpen bat behar du"
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:538
+#, fuzzy, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s-ek \"-l locale\" ezarpen bat behar du"
+
+#: src/msgfmt.c:545
+#, fuzzy, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s-ek \"-l locale\" ezarpen bat behar du"
+
+#: src/msgfmt.c:551
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s eta %s ez dira bateragarriak"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s bakarrik %s edo %s-rekin da erabilgarria"
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:571 src/msgfmt.c:577
#, c-format
msgid "%s is only valid with %s, %s or %s"
msgstr "%s bakarrik %s, %s edo %s-rekin da erabilgarria"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c: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] "itzulitako kate %d"
msgstr[1] "%d itzulitako kate"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", zalantzan kate %d"
msgstr[1] ", %d kate zalantzan"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", itzuli gabeko kate %d"
msgstr[1] ", %d itzuli gabeko kate"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Erabilera: %s [AUKERA] fitxategizena.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "Testu itzulpen deskribapen batetik mezu katalogo bitar bat sortu.\n"
-#: src/msgfmt.c: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"
@@ -1794,17 +1821,17 @@ msgstr ""
"Aukera luzeentzat beharrezko argumentuak beharrezkoak dira aukera laburrentzat ere.\n"
"Antzekoa aukerako argumentuentzat.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
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:890
+#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Funtzionamendu modua:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1813,7 +1840,7 @@ msgstr ""
" -j, --java Java modua: Java ResourceBundle klase bat "
"sortu\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1822,20 +1849,20 @@ msgstr ""
" --java2 --java bezala , bain Java2 erabiliaz (JDK 1.2 "
"edo altuagoa)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr ""
" --csharp C# modua: .NET .dll fitxategi bat sortu\n"
-#: src/msgfmt.c: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"
@@ -1843,33 +1870,39 @@ msgstr ""
" --tcl Tcl modua: tcl/msgcat .msg fitxategi bat "
"sortu\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt Qt modua: Qt .qm fitxategi bat sortu\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, fuzzy, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr " --qt Qt modua: Qt .qm fitxategi bat sortu\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict Uniforum zehatz modua gaitu\n"
-#: 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 "Irteera fitxategia - bada, irteera irteera estandarrean idatziko da.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Irteera fitxategi kokapena java moduan:\n"
-#: 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 "
@@ -1878,7 +1911,16 @@ msgstr ""
" -l, --locale=LAKALA lokal izena, edo hizkunzta edo "
"hizkutza_NAZIOA\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, fuzzy, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --tcl Tcl modeua: sarrera tcl/msgcat .msg fitxategi "
+"bat da\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
@@ -1886,7 +1928,7 @@ msgstr ""
" -d DIRECTORY klse direktorio ierarkiaren oinarri "
"direktorioa\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1900,37 +1942,37 @@ msgstr ""
"azpian\n"
"idatziko da.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "Irteera fitxategi kokalekua C# moduan:\n"
-#: 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 "Irteera fitxategi kokapena Tcl moduan:\n"
-#: 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 ""
" -d DIRECTORY msg mezu katalogoen oinarri direktorioa\n"
-#: 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"
@@ -1940,12 +1982,43 @@ msgstr ""
"direktorioan\n"
"idatziko da.\n"
-#: 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
+#, fuzzy, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr ""
+" -d DIRECTORY msg mezu katalogoen oinarri direktorioa\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "Sarrera fitxategi interpretazioa:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1953,33 +2026,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 "
@@ -1987,18 +2060,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 " -f, --use-fuzzy zalantzazko kateak erabili irteeran\n"
-#: 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 "
@@ -2007,7 +2080,7 @@ 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"
@@ -2015,81 +2088,91 @@ msgstr ""
" --no-hash fitxategi bitarrak ez du hash taula "
"barneratuko\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics itzulpenaren estatistikak inprimatu\n"
-#: 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 " -v, --verbose handitu argibide maila\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "oharra: PO fitxategi goiburua falta edo baliogabea da\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "oharra: karaktere joko bihurketak ez du funtzionatuko\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "oharra: PO fitxategi burua nahasirik\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "oharra: msgfmt-ren bertsio zaharragoek errorea emango dute honetan\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "\"%s\" domeinu izena ez da fixtategi izen bezala erabili"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"\"%s\" domeinu izena ez da fixtategi izen bezala erabili: aurrizki bat "
"erabiliko da"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "'domain %s' directive ignored"
msgstr "`domain %s' direktiba alde batetara utziko da"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, fuzzy, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "hutsik dagoen `msgstr' sarrera alde batetara utziko da"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, fuzzy, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "zalantzan dagoen `msgstr' sarrera alde batetara utziko da"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: oharra: jatorri fitxategiak zalantzazko itzulpenak ditu"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c: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 "errorea \"%s\" irakurtzean"
-#: 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 "
@@ -2098,14 +2181,14 @@ msgstr ""
"'%c' aukera ezin da erabili 'J' , 'K' , 'T' , 'C' edo 'X' ezarria izan "
"ondoren"
-#: 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"
@@ -2145,7 +2228,7 @@ 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"
@@ -2153,12 +2236,12 @@ msgstr ""
" --escape C ihesak erabili irteeran, ez hedatutako "
"karaktereak\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output ordenatutako irteera sortu\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file fitxategi kokapenez ordenatu\n"
@@ -2321,7 +2404,7 @@ msgstr "s da a."
#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:3051
+#: src/xgettext.c:544 src/xgettext.c:3418
#, c-format
msgid "warning: "
msgstr "oharra: "
@@ -2529,17 +2612,17 @@ msgstr "plural kudeaketa GNU gettext hedapen bat da"
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
#, fuzzy, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "zenbait goiburu eremuk oraindik hasierako balioa dute\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, fuzzy, c-format
msgid "header field '%s' missing in header\n"
msgstr "`%s' goiburu eremua falta da goiburuan\n"
@@ -2560,7 +2643,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: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 "
@@ -2577,7 +2660,7 @@ 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 "
@@ -2586,16 +2669,16 @@ msgstr ""
"Ezinda \"%s\"-tik \"%s\"-ra bihurketa egin. %s iconv() funtzioan "
"oinarriturik dago. Bertsio hau iconv() gabe erabili zen."
-#: 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 "%s %s-rekin bakarrik da baliozkoa"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr "babeskopia mota"
-#: 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"
@@ -2609,24 +2692,24 @@ 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"
@@ -2636,27 +2719,27 @@ msgstr ""
" ez egin ezer def.po dagoeneko eguneraturik "
"badago\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Irteera fitxategi kokapena eguneraketa moduan:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Emaiztak berriz def.po fitxategian idatziko dira.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=KONTROL def.po-ren babeskopia bat egin\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=AURRIZKI gainidatzi babeskopia aurrizki arrunta\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2668,7 +2751,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 "
@@ -2676,36 +2759,36 @@ 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 ""
" --previous mantendu aurreko msgid-ak itzulitako mezuetan\n"
-#: 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 " -q, --quiet, --silent kendu aurrerapen erakusleak\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
msgstr "mezu honek plural moduak ezarri behar ditu"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, fuzzy, c-format
msgid "this message should not define plural forms"
msgstr "uneko"
-#: 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"
@@ -2808,7 +2891,7 @@ msgstr " -i, --indent idatzi koskadun estiloko irteera\n"
msgid " --strict write strict uniforum style\n"
msgstr " --strict idatzi uniforum zehatz estiloan\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -2821,13 +2904,13 @@ 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 ""
" -d, --repeated errepikaturiko mezuak bakarrik inprimatu\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -2898,27 +2981,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "#~ -ren erabilera okerra"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, fuzzy, c-format
msgid "missing 'msgstr[]' section"
msgstr "`msgstr[]' atala falta da"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, fuzzy, c-format
msgid "missing 'msgid_plural' section"
msgstr "`msgid_plural' atala falta da"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, fuzzy, c-format
msgid "missing 'msgstr' section"
msgstr "`msgstr' atala falta da"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "lehen plural moduak zero ez den indize bat du"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "plural moduak okerreko indize bat du"
@@ -2928,7 +3011,7 @@ msgstr "plural moduak okerreko indize bat du"
msgid "too many errors, aborting"
msgstr "errore gehiegi, uzten"
-#: 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 "multibyte sekuentzia baliogabea"
@@ -2972,16 +3055,16 @@ 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:1023
+#: src/read-catalog.c:318 src/xgettext.c:1046
#, c-format
msgid "this file may not contain domain directives"
msgstr "fitxategi honek ez lituzke domeinu direktibak izan beharko"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "bikoizturiko mezu definizioa"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "hau da lehen definizioaren kokalekua"
@@ -3176,19 +3259,19 @@ msgstr "C# klase konpilazioak huts egin du, saiatu --verbose erabiliaz"
msgid "compilation of C# class failed"
msgstr "C# klase konpilazioak huts egin du, saiatu --verbose erabiliaz"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "ez da baliozko java klase izena: %s"
-#: 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 ""
"Java klasearen konpilazioak huts egin du, saiatu --verbose erabiliz edo "
"$JAVAC ezarriz"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, fuzzy, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr ""
@@ -3200,13 +3283,13 @@ msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "errorea \"%s\" idaztekatarako irekitzerakoan"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, fuzzy, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr "internazionalizatutako kateek ezin dute `\\%c' ihes sekuentzia eduki"
-#: src/write-po.c: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"
@@ -3220,7 +3303,7 @@ msgstr ""
" garbia erabiltzean pensta ezazu.\n"
"%s\n"
-#: 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"
@@ -3292,7 +3375,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-javascript.c:988 src/x-python.c:1128
+#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "s l katea"
@@ -3302,17 +3385,22 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, fuzzy, c-format
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: oharra: Unicode karaktere baliogabea"
+
+#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "s l"
-#: src/x-c.c:1247 src/x-vala.c:832
+#: src/x-c.c:1345 src/x-vala.c:752
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "s l katea"
-#: src/x-csharp.c:224 src/xgettext.c:2055
+#: src/x-csharp.c:224 src/xgettext.c:2106
#, fuzzy
msgid "Please specify the source encoding through --from-code."
msgstr "ASCII katea s s Nork n"
@@ -3357,7 +3445,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:1335
+#: src/x-csharp.c:1390 src/x-python.c:1138
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: oharra: Unicode karaktere baliogabea"
@@ -3377,22 +3465,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: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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3446,11 +3534,21 @@ msgid ""
"Please specify the source encoding through --from-code\n"
msgstr "s l Baliogabea Nork n"
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, fuzzy, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "s l katea"
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: oharra: Unicode karaktere baliogabea"
+
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "s l katea"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3563,33 +3661,38 @@ msgstr ""
"%s:%lu: oharra: $\"...\" sintasia zaharkiturik dago segurtasun "
"arrazoiegatik ; eval_gettext erabili horren ordez"
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, fuzzy, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "s l katea"
-#: 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 ""
"--join-existing ezin da erabili irteera irteera estandarrean idazten denean"
-#: 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
#, 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:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "Irauli kate itzulgarriak emandako sarrera fitxategietatik.\n"
-#: src/xgettext.c:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3598,12 +3701,12 @@ msgstr ""
" -d, --default-domain=IZENA IZENA erabili irteerarako (messages.po "
"ordez)\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr " -o, --output=FILE idatzi irteera ezarritako fitxategian\n"
-#: src/xgettext.c:863
+#: src/xgettext.c:886
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
@@ -3611,12 +3714,12 @@ msgstr ""
" -p, --output-dir=DIR irteera fitxategiak DIR direktorioan utziko "
"dira\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Sarrera fitxategiaren hizkuntza hautapena:\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, fuzzy, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3626,7 +3729,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=IZENA ezarritako hizkuntza ezagutu\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3636,12 +3739,12 @@ msgstr ""
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ --language=C++-ren laburopena\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:902
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
@@ -3650,7 +3753,7 @@ msgstr ""
"Lehenespen bezala hizkuntza sarrera fitxategiaren izen hedapenaz igarriko "
"da.\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3659,24 +3762,24 @@ msgstr ""
" --from-code=NAME sarrera fixtategien kodeket\n"
" (Python, Tcl, Glade-en ezezik)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, 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: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 ""
" -x, --exclude-file=FITXATEGIA.po FITXATEGIA.po fitxategiko kateak ez dira "
"irauliko\n"
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -3686,17 +3789,17 @@ msgid ""
" in output file\n"
msgstr ""
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Hizkuntzaren aukera bereziak:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all kate guztiak atera\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3711,14 +3814,22 @@ msgstr ""
" Perl, PHP, GCC-source eta Glade hizkuntzetan "
"bakarrik)\n"
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:937
+#, fuzzy, 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 ""
+" (C, C++, ObjectiveC, Shell,Python, Lisp,\n"
+" EmacsLisp, librep, Scheme, Java,C#, awk, "
+"Tcl,\n"
+" Perl, PHP, GCC-source eta Glade hizkuntzetan "
+"bakarrik)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3726,7 +3837,7 @@ msgid ""
" number ARG of keyword WORD\n"
msgstr ""
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3741,38 +3852,38 @@ msgstr ""
" Tcl, Perl, PHP, GCC-source hizkuntzetan "
"bakarrik)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, 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:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
" (C, C++, ObjectiveC hizkuntzetan bakarrik)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt Qt formatuko kateak antzeman\n"
-#: 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 " (C++ hizkuntz bakarrik)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, fuzzy, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --qt Qt formatuko kateak antzeman\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --boost Boost formatuko kateak antzeman\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
@@ -3780,17 +3891,17 @@ msgstr ""
" --debug kate formatu atzemateari buruzko informazio "
"hedatuagoa\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output idatzi Java .properties fitxategi bat\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr " --copyright-holder=KATEA copyright jabea ezarri irteeran\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -3798,17 +3909,17 @@ msgstr ""
" --foreign-user alde batera utzi FSF copyright-a kanpoko "
"erabiltzaileen irteeran\n"
-#: 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
#, 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:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
@@ -3816,7 +3927,7 @@ msgstr ""
" --msgid-bugs-address=EPOSTA@HELBIDEA msgid erroreentzat erreporte "
"helbidea ezarri\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, fuzzy, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -3826,7 +3937,7 @@ msgstr ""
" -M, --msgstr-prefix[=KATEA] KATEA erabili edo \"\" aurrizki bezala msgstr "
"sarreretan\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, fuzzy, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -3836,7 +3947,7 @@ msgstr ""
" -M, --msgstr-suffix[=KATEA] KATEA erabili edo \"\" atzizki bezala msgstr "
"sarreretan\n"
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -3844,45 +3955,45 @@ msgid ""
msgstr ""
"--flag argumentuak ez du <hitz-ako>:<argzenb>:[pasa-]<badera> sintasia: %s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr "sarrera estandarra"
-#: 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 "%s%s: oharra: "
-#: 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"
@@ -3891,7 +4002,7 @@ 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"
@@ -3901,28 +4012,28 @@ msgstr ""
"gettext(\"\")-ek meta informazioa duen goiburua\n"
"itzultzen du, ez date hutsa.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "oharra: argumentu ezarpen zalanatzagarria '%.*s' hitz-gakoarentzat"
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "oharra: kontestua falta da '%.*s' hitz-gakoarentzat"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, 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:2942
+#: src/xgettext.c:3052
#, c-format
msgid "context mismatch between singular and plural form"
msgstr "kontestu parekatze okerra formatu singular eta pluralaren artean"
-#: src/xgettext.c:3052
+#: src/xgettext.c:3419
#, fuzzy
msgid ""
"The option --msgid-bugs-address was not specified.\n"
@@ -3935,7 +4046,7 @@ msgstr ""
"MSGID_BUGS_ADDRESS aldagaia hor; bestela mesedez ezarri\n"
"--msgid-bugs-address aukera komando lerroan.\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, fuzzy, c-format
msgid "language '%s' unknown"
msgstr "`%s' hizkuntza ezezaguna"
@@ -3944,25 +4055,12 @@ 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"
#~ msgid "DuplicateHandle failed with error code 0x%08x"
#~ msgstr "DuplicateHandle-ek 0x%08x errore kodeaz huts egin du"
-#~ msgid "Not yet implemented."
-#~ msgstr "Oraindik ez da onartzen."
-
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "`%s' eremuak oraindik hasierako balioa du\n"
-
#, fuzzy
#~ msgid "Multiple references to %%%c."
#~ msgstr "Anizkoitza nori k."
@@ -3980,6 +4078,15 @@ msgstr "<izengabea>"
#~ "ezta EGOKITASUNA MERKATURATZEKO edo HELBURU PARTIKULARRETARAKO "
#~ "ERABILTZEKO.\n"
+#~ msgid "Not yet implemented."
+#~ msgstr "Oraindik ez da onartzen."
+
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "`%s' goiburu eremua lerro hasieran hasi behar da\n"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "`%s' eremuak oraindik hasierako balioa du\n"
+
#~ msgid ""
#~ "message catalog has context dependent translations\n"
#~ "but the C# .dll format doesn't support contexts\n"
diff --git a/gettext-tools/po/fi.po b/gettext-tools/po/fi.po
index 4318512..802e786 100644
--- a/gettext-tools/po/fi.po
+++ b/gettext-tools/po/fi.po
@@ -7,10 +7,10 @@
#
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: 2013-07-07 18:21+0900\n"
-"PO-Revision-Date: 2013-03-03 11:26+0200\n"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2013-06-29 12:09+0300\n"
"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
"Language: fi\n"
@@ -18,7 +18,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
#: gnulib-lib/argmatch.c:133
#, c-format
@@ -186,15 +185,15 @@ msgstr "virheellinen source_version-argumentti kohteelle compile_java_class"
msgid "invalid target_version argument to compile_java_class"
msgstr "virheellinen target_version-argumentti kohteelle compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c: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 "tiedoston ”%s” luominen epäonnistui"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c: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 "virhe kirjoitettaessa tiedostoa ”%s”"
@@ -217,9 +216,9 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr "%s aliprosessisiirräntävirhe"
-#: 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 "muisti loppui"
@@ -231,7 +230,7 @@ msgid "creation of threads failed"
msgstr "säikeiden luominen epäonnistui"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "kirjoittaminen aliprosessiin %s epäonnistui"
@@ -318,8 +317,8 @@ msgid "%s subprocess got fatal signal %d"
msgstr "%s aliprosessi vastaanotti fataalin signaalin %d"
#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c: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 "virhe avattaessa tiedostoa ”%s” lukemista varten"
@@ -563,8 +562,8 @@ 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."
+"Direktiivissä numero %u osamerkkijono ”%s” ei ole kelvollinen päivämäärä- "
+"tai aikatyyli."
#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
#, c-format
@@ -585,7 +584,7 @@ msgid ""
"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
msgstr ""
"Direktiivissä numero %u argumenttinumeroa ei seuraa pilkku tai yksi "
-"seuraavista: ”%s”, ”%s”, ”%s”,”%s”."
+"seuraavista: ”%s”, ”%s”, ”%s”, ”%s”."
#: src/format-java.c:572
#, c-format
@@ -717,7 +716,7 @@ msgstr ""
"muunnosmäärittelijän ’%c’ kanssa."
#: 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'"
@@ -769,31 +768,34 @@ msgstr ""
"muotomäärittelyt eivät ole samat merkkijonossa ’%s’ ja merkkijonossa ’%s’ "
"argumentille ’%s’"
-#: src/format-python-brace.c:136
-#, fuzzy, c-format
+#: src/format-python-brace.c:137
+#, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "Direktiivissä numero %u merkkiä ’%c’ ei seuraa luku."
+msgstr "Direktiivissä numero %u merkki ’%c’ ei voi aloittaa kenttänimeä."
-#: src/format-python-brace.c:149
-#, fuzzy, c-format
+#: src/format-python-brace.c:150
+#, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "Direktiivissä numero %u argumenttinumeroa ei ole merkin ’{’ jäljessä."
+msgstr ""
+"Direktiivissä numero %u merkki ’%c’ ei voi aloittaa getattr-argumenttia."
-#: src/format-python-brace.c:164
-#, fuzzy, c-format
+#: src/format-python-brace.c:165
+#, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "Direktiivissä numero %u merkkiä ’%c’ ei seuraa luku."
+msgstr ""
+"Direktiivissä numero %u merkki ’%c’ ei voi aloittaa getitem-argumenttia."
-#: src/format-python-brace.c:184
-#, fuzzy, c-format
+#: src/format-python-brace.c:185
+#, 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’."
+msgstr ""
+"Direktiivissä numero %u ei sallita enempää sisäkkäisyyttä muotomääritteessä."
-#: src/format-python-brace.c:210
-#, fuzzy, c-format
+#: src/format-python-brace.c:270
+#, c-format
msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "Direktiivissä numero %u argumentti %d on negatiivinen."
+msgstr "Direktiivissä numero %u on päättämätön muotodirektiivi."
#: src/format-qt.c:152
#, c-format
@@ -843,11 +845,11 @@ msgid ""
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: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"
@@ -860,19 +862,19 @@ msgstr ""
"Tämä on vapaa ohjelmisto ja sen muuttaminen ja levittäminen edelleen on sallittua.\n"
"Ohjelmalle EI ANNETA TAKUUTA lain sallimissa rajoissa.\n"
-#: src/hostname.c:184 src/msgattrib.c: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 "Kirjoittanut %s.\n"
#. 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 "Bruno Haible"
@@ -882,11 +884,11 @@ msgstr "Bruno Haible"
msgid "too many arguments"
msgstr "liian monta argumenttia"
-#: 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 "Komento ’%s --help’ antaa lisää tietoja.\n"
@@ -927,29 +929,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: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 "Selittävä tuloste:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help näytä tämä ohje ja poistu\n"
-#: 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 " -V, --version tulosta ohjelman versiotiedot ja poistu\n"
@@ -958,11 +960,11 @@ msgstr " -V, --version tulosta ohjelman versiotiedot ja poistu\n"
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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 ""
"Ilmoita ohjelmiston vioista (englanniksi) osoitteeseen <bug-gnu-gettext@gnu."
@@ -975,30 +977,27 @@ msgstr ""
msgid "could not get host name"
msgstr "ei saatu tietokonenimeä"
-#: 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 "enintään yksi syötetiedosto on sallittu"
-#: 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 "valitsimet %s ja %s ovat toisensa poissulkevia"
-#: 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 "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -1007,33 +1006,33 @@ msgstr ""
"Suodattaa käännösluettelon viestit niiden attribuuttien mukaan,\n"
"ja manipuloi attribuutteja.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c: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 ""
"Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n"
-#: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
-#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
-#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
-#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
+#: src/msgattrib.c:433 src/msgcat.c: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 "Syötetiedostosijainti:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " SYÖTETIEDOSTO syötteen PO-tiedosto\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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"
@@ -1041,31 +1040,31 @@ msgstr ""
" -D, --directory=HAKEMISTO lisää HAKEMISTO syötetiedostojen "
"hakuluetteloon\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c: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 "Jos syötetiedostoa ei ole annettu tai se on -, luetaan vakiosyöte.\n"
-#: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
-#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
-#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
-#: src/xgettext.c:857
+#: src/msgattrib.c:442 src/msgcat.c: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 "Tulostetiedostosijainti:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 ""
" -o, --output-file=TIEDOSTO kirjoita tuloste määriteltyyn tiedostoon\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1075,80 +1074,80 @@ msgstr ""
"määritelty\n"
"tai jos se on -.\n"
-#: 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 "Viestivalinta:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
msgstr ""
" --translated pidä käännetyt, poista kääntämättömät viestit\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
msgstr ""
" --untranslated pidä kääntämättömät, poista käännetyt viestit\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr " --no-fuzzy poista ’fuzzy’-merkityt vajaat viestit\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr " --only-fuzzy pidä ’fuzzy’-merkityt vajaat viestit\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete poista vanhentuneet #~ -viestit\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete pidä vanhentuneet #~ -viestit\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Attribuuttimanipulointi:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr " --set-fuzzy aseta kaikki viestit vajaiksi\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr " --clear-fuzzy aseta kaikki viestit epävajaiksi\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr " --set-obsolete aseta kaikki viestit vanhentuneiksi\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr " --clear-obsolete aseta kaikki sanomat ei-vanhentuneiksi\n"
-#: src/msgattrib.c:468
-#, fuzzy, c-format
+#: src/msgattrib.c:475
+#, 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"
+" --previous kun asetetaan vajaiksi, säilytä käännettyjen\n"
+" viestien aikaisemmat msgid-merkkijonot\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
@@ -1156,7 +1155,13 @@ msgid ""
msgstr ""
" --clear-previous poista \"previous msgid\" kaikista viesteistä\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, fuzzy, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr " --no-fuzzy poista ’fuzzy’-merkityt vajaat viestit\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
@@ -1164,7 +1169,7 @@ msgstr ""
" --only-file=TIEDOSTO.po manipuloi vain rivejä, jotka on luetteloitu "
"tiedostossa TIEDOSTO.po\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
@@ -1172,14 +1177,14 @@ msgstr ""
" --ignore-file=TIEDOSTO.po manipuloi vain rivejä, joita ei ole "
"luetteloitu tiedostossa TIEDOSTO.po\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr ""
" --fuzzy synonyymi valitsimelle --only-fuzzy --clear-"
"fuzzy\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
@@ -1187,16 +1192,16 @@ msgstr ""
" --obsolete synonyymi valitsimelle --only-obsolete --clear-"
"obsolete\n"
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c: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 "Syötetiedoston syntaksi:\n"
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c: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"
@@ -1204,8 +1209,8 @@ msgstr ""
" -P, --properties-input syötetiedosto on Java .properties -"
"syntaksissa\n"
-#: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
-#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c: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 "
@@ -1214,17 +1219,17 @@ msgstr ""
" --stringtable-input syötetiedosto on NeXTstep/GNUstep .strings -"
"syntaksissa\n"
-#: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
-#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
-#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
-#: src/xgettext.c:946
+#: src/msgattrib.c:498 src/msgcat.c: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 "Tulosteen yksityiskohdat:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1239,18 +1244,18 @@ msgstr ""
" 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: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 ""
" --style=TYYLITIEDOSTO määritä CSS-tyylisääntötiedosto valitsimelle --"
"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
+#: 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"
@@ -1258,9 +1263,9 @@ msgstr ""
" -e, --no-escape älä käytä C-koodinvaihtomerkkejä tulosteessa "
"(oletus)\n"
-#: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
-#: src/msguniq.c:390 src/xgettext.c:956
+#: src/msgattrib.c:508 src/msgcat.c: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"
@@ -1268,39 +1273,39 @@ msgstr ""
" -E, --escape käytä C-koodinvaihtomerkkejä tulosteessa, ei "
"laajennettuja merkkejä\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
" --force-po kirjoita PO-tiedosto vaikka se on tyhjä\n"
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
" -i, --indent kirjoita .po -tiedosto käyttäen sisennettyä "
"tyyliä\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
" --no-location älä kirjoita ’#: filename:line’ -rivejä\n"
-#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:964
+#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
+#: src/xgettext.c:987
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr ""
" -n, --add-location tuota ’#: filename:line’ -rivit (oletus)\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c: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"
@@ -1308,32 +1313,32 @@ msgstr ""
" --strict luo tiukasti Uniforum-yhteensopiva .po-"
"tiedosto\n"
-#: src/msgattrib.c:511 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
-#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
-#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
+#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
+#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output luo Java .properties -tiedosto\n"
-#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
-#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
" --stringtable-output luo NeXTstep/GNUstep .strings -tiedosto\n"
-#: src/msgattrib.c:515 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
-#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
-#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:972
+#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
+#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=NUMERO aseta tulostesivun leveys\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c: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"
@@ -1343,33 +1348,33 @@ msgstr ""
"kuin\n"
" tulostesivun leveys, useammalle riville\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output tuota lajiteltu tuloste\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 ""
" -F, --sort-by-file lajittele tuloste tiedostosijainnin mukaan\n"
-#: 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 "määritelty mahdoton valintakriteeri (%d < n < %d)"
-#: 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 "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]...\n"
# Pistekommentilla tarkoitan kehittäjän kääntäjää varten lisäämiä kommentteja, jotka alkavat risuaitamerkillä ja sen jälkeisellä pisteellä.
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1392,25 +1397,25 @@ 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:848
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr " SYÖTETIEDOSTO ... syötetiedostot\n"
-#: 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 ""
" -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: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 "Jos syötetiedosto on -, luetaan vakiosyötettä.\n"
# Tässä defaults taitaa olla verbi yksikön kolmannessa persoonassa.
-#: 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"
@@ -1421,7 +1426,7 @@ msgstr ""
" määrittelyä. Oletus ääretön, jos ei ole "
"asetettu\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1431,7 +1436,7 @@ msgstr ""
"monta\n"
" määrittelyä. Oletus 0, jos ei ole asetettu\n"
-#: 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"
@@ -1441,8 +1446,8 @@ msgstr ""
"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
+#: 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"
@@ -1450,8 +1455,8 @@ 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
+#: 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"
@@ -1460,12 +1465,12 @@ msgstr ""
" --stringtable-input syötetiedostot ovat NeXTstep/GNUstep .strings\n"
" -syntaksissa\n"
-#: 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 " -t, --to-code=NIMI koodaus tulosteelle\n"
-#: 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"
@@ -1476,29 +1481,29 @@ msgstr ""
" jokaiselle viestille, älä yhdistä useita "
"käännöksiä\n"
-#: 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 " --lang=LUETTELONIMI aseta ’Language’-kenttä otsakkeessa\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "syötetiedostoja ei annettu"
-#: 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 "tarvitaan täsmälleen kaksi syötetiedostoa"
# Tiedostoihin ref.pot ja def.po viitataan muissa teksteissä, joten ne on paras jättää suomentamatta.
-#: src/msgcmp.c:213 src/msgmerge.c:480
+#: src/msgcmp.c:213 src/msgmerge.c:485
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Käyttö: %s [VALITSIN] def.po ref.pot\n"
@@ -1531,12 +1536,12 @@ msgstr " def.po käännökset\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot viitteet lähteisiin\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "Toimintomääreet:\n"
-#: 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."
@@ -1545,7 +1550,7 @@ msgstr ""
" -m, --multi-domain käytä ref.pot-tiedostoa jokaiselle "
"nimiavaruudelle tiedostossa def.po\n"
-#: 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 " -N, --no-fuzzy-matching älä käytä vajaustäsmäystä\n"
@@ -1570,17 +1575,17 @@ msgstr "tämä viesti on kääntämättä"
msgid "this message needs to be reviewed by the translator"
msgstr "kääntäjän on katselmoitava tämä viesti"
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1505
#, c-format
msgid "this message is used but not defined..."
msgstr "tätä viestiä käytetään, mutta sitä ei ole määritelty..."
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1508
#, c-format
msgid "...but this definition is similar"
msgstr "...mutta tämä määrittely on samanlainen"
-#: 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 ""
@@ -1591,19 +1596,19 @@ msgstr ""
msgid "warning: this message is not used"
msgstr "varoitus: tätä viestiä ei käytetä"
-#: 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] "%d vakava virhe"
msgstr[1] "%d vakavaa virhettä"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "on annettava vähintään kaksi tiedostoa"
-#: 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"
@@ -1624,7 +1629,7 @@ msgstr ""
"--use-first on määritelty. Silloin ne otetaan ensimmäisestä PO-tiedostosta,\n"
"joka on määritellyt ne. Tiedostosijainnit kaikista PO-tiedostoista kumuloituvat.\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1635,7 +1640,7 @@ msgstr ""
" monta määrittelyä. Oletus 1, jos ei ole "
"asetettu\n"
-#: 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"
@@ -1643,62 +1648,62 @@ msgstr ""
" --omit-header älä kirjoita otsaketta, jossa on ’msgid \"\"’ -"
"rivi\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr "Muuntaa käännösluettelon eri merkkikoodaukseen.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Muunnoskohde:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Oletuskoodaus on nykyisen paikallisasetuksen koodaus.\n"
-#: src/msgconv.c: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 " -i, --indent sisennetty tulostetyyli\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
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
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
+#: src/msgmerge.c:588
+#, fuzzy, c-format
msgid ""
-" --add-location preserve '#: filename:line' lines (default)\n"
+" -n, --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
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict tiukka Uniforum-tulostetyyli\n"
-#: 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 "syötetiedostoa ei annettu"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "tarvitaan täsmälleen yksi syötetiedosto"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Käyttö: %s [VALITSIN] SYÖTETIEDOSTO\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1711,7 +1716,7 @@ msgstr ""
"ohjelman luoma). Kääntämättömät rivit liitetään käännökseen, joka on\n"
"identtinen msgid-merkkijonolle.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " SYÖTETIEDOSTO syötteen PO- tai POT-tiedosto\n"
@@ -1750,7 +1755,7 @@ msgstr ""
"Erityinen sisäinen komento nimeltä ’0’ tulostaa käännöksen ja nollatavun.\n"
"”msgexec 0”:n tuloste kelpaa syötteeksi ”xargs -0”:lle.\n"
-#: src/msgexec.c:281 src/msgfilter.c:401
+#: src/msgexec.c:281 src/msgfilter.c:420
#, c-format
msgid " -i, --input=INPUTFILE input PO file\n"
msgstr " -i, --input=SYÖTETIEDOSTO syöte-PO-tiedosto\n"
@@ -1760,27 +1765,27 @@ msgstr " -i, --input=SYÖTETIEDOSTO syöte-PO-tiedosto\n"
msgid "write to stdout failed"
msgstr "kirjoittaminen vakiotulosteeseen epäonnistui"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "puuttuva suodatinnimi"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr "vähintään yksi sed-skripti on määriteltävä"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Käyttö: %s [VALITSIN] SUODATIN [SUODATTIMEN VALITSIN]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "Soveltaa suodatinta kaikkiin käännösluettelon käännöksiin.\n"
-#: src/msgfilter.c:416
+#: src/msgfilter.c:435
#, c-format
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
@@ -1790,19 +1795,19 @@ msgstr ""
"vakiosyötteestä\n"
"ja kirjoittaa muutetun käännöksen vakiotulosteeseen.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "Hyödylliset SUODATTIMEN VALITSIN-asetukset kun SUODATIN on ’sed’:\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
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
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1812,14 +1817,14 @@ msgstr ""
" -f, --file=SKRIPTITIEDOSTO lisää SKRIPTITIEDOSTOn sisältö suoritettaviin\n"
" komentoihin\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
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
+#: src/msgfilter.c:465 src/msggrep.c:600
#, c-format
msgid ""
" --no-escape do not use C escapes in output (default)\n"
@@ -1827,12 +1832,12 @@ msgstr ""
" --no-escape älä käytä C-koodinvaihtomerkkejä tulosteessa "
"(oletus)\n"
-#: 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 " --indent sisennetty tulostetyyli\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
@@ -1840,83 +1845,104 @@ msgstr ""
" --keep-header pidä otsake muokkaamattomana, älä suodata "
"sitä\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "argumentti valitsimeen %s pitäisi olla yksittäinen välimerkki"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
msgstr "virheellinen endian-tyyppi: %s"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c: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 "Ulrich Drepper"
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:439
+#, fuzzy, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr "Jos syötetiedostoa ei ole annettu tai se on -, luetaan vakiosyöte.\n"
+
+#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
#: src/msgunfmt.c:353
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "valitsin %s vaatii ”-d directory”-määrittelyn"
-#: 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 "valitsin %s vaatii ”-l locale”-määrittelyn"
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:538
+#, fuzzy, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "valitsin %s vaatii ”-l locale”-määrittelyn"
+
+#: src/msgfmt.c:545
+#, fuzzy, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "valitsin %s vaatii ”-l locale”-määrittelyn"
+
+#: src/msgfmt.c:551
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "valitsimet %s ja %s ovat toisensa poissulkevia"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "valitsin %s on kelvollinen vain valitsimen %s tai %s kanssa"
-#: src/msgfmt.c: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 "valitsin %s on kelvollinen vain valitsimen %s, %s tai %s kanssa"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d käännetty viesti"
msgstr[1] "%d käännettyä viestiä"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d vajaa käännös"
msgstr[1] ", %d vajaata käännöstä"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d kääntämätön viesti"
msgstr[1] ", %d kääntämätöntä viestiä"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Käyttö: %s [VALITSIN] tiedosto.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
"Tuota binäärimuotoisia viestiluetteloita tekstimuotoisesta "
"käännöskuvauksesta.\n"
-#: src/msgfmt.c: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"
@@ -1925,17 +1951,17 @@ msgstr ""
"Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n"
"Valinnaiset argumentit vastaavasti.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
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:890
+#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Toimintatila:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1943,7 +1969,7 @@ msgid ""
msgstr ""
" -j, --java Java-tila: tuota Java ResourceBundle -luokka\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1952,12 +1978,12 @@ msgstr ""
" --java2 kuten --java, ja otaksu Java2 (JDK 1.2 tai "
"uudempi)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr " --csharp C#-tila: tuota .NET .dll -tiedosto\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -1966,40 +1992,46 @@ msgstr ""
" --csharp-resources C#-resurssitila: tuota .NET .resources -"
"tiedosto\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
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
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt Qt-tila: tuota Qt .qm -tiedosto\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, fuzzy, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr " --qt Qt-tila: tuota Qt .qm -tiedosto\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict ota käyttöön tiukka Uniforum-tila\n"
-#: 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 "Jos tulostiedosto on -, tuloste kirjoitetaan vakiotulosteeseen.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Tulostetiedostosijainti Java-tilassa:\n"
-#: 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 " -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
+#: 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 "
@@ -2007,14 +2039,22 @@ msgid ""
msgstr ""
" -l, --locale=MAA-ASETUSTO maa-asetuston nimi, joko kieli tai kieli_MAA\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, fuzzy, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --tcl Tcl-tila: syöte on tcl/msgcat .msg -tiedosto\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
" -d HAKEMISTO luokkien hakemistohierarkian perushakemisto\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2026,12 +2066,12 @@ msgstr ""
"erottamalla ne alaviivalla. Valitsin -d on pakollinen. Luokka on\n"
"kirjoitettu määriteltyyn hakemistoon.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "Tulostetiedostosijainti C#-tilassa:\n"
-#: 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 "
@@ -2040,7 +2080,7 @@ msgstr ""
" -d HAKEMISTO perushakemisto paikallisasetuksista "
"riippuville .dll-tiedostoille\n"
-#: 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"
@@ -2050,17 +2090,17 @@ msgstr ""
"määriteltyyn\n"
"alihakemistoon, jonka nimi riippuu paikallisasetuksesta.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Tulostetiedostosijainti Tcl-tilassa:\n"
-#: 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 " -d HAKEMISTO perushakemisto .msg-viestiluetteloille\n"
-#: 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"
@@ -2069,12 +2109,44 @@ msgstr ""
"Valitsimet -l ja -d ovat pakollisia. Tiedosto .msg kirjoitetaan\n"
"määriteltyyn hakemistoon.\n"
-#: 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
+#, fuzzy, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr " -d HAKEMISTO perushakemisto .msg-viestiluetteloille\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -kWORD, --keyword=WORD etsi WORD-argumentti lisäavainsanana\n"
+" -k, --keyword älä käytä oletusavainsanoja\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "Syötetiedoston tulkinta:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -2086,13 +2158,13 @@ msgstr ""
" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format tarkista kieliriippuvaiset muotomerkkijonot\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -2100,7 +2172,7 @@ msgid ""
msgstr ""
" --check-header tarkista otsakkeen olemassaolo ja sisältö\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -2110,7 +2182,7 @@ msgstr ""
"valitsimen\n"
" --output-file väliset ristiriidat\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2119,7 +2191,7 @@ msgstr ""
" -C, --check-compatibility tarkista, että GNU msgfmt käyttäytyy kuin X/"
"Open msgfmt\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -2130,12 +2202,12 @@ msgstr ""
"olemassaolo\n"
" valikkoriveillä\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr " -f, --use-fuzzy käytä vajausmerkintöjä tulosteessa\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
@@ -2143,7 +2215,7 @@ msgstr ""
" -a, --alignment=NUMERO tasaa merkkijonot NUMEROon tavuun (oletus: "
"%d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2157,85 +2229,95 @@ msgstr ""
"riippuu\n"
" alustasta)\n"
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
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
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics tulosta tilastot käännöksistä\n"
-#: 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 " -v, --verbose kasvata laveustasoa\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "varoitus: PO-tiedoston otsake puuttuu tai on virheellinen\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "varoitus: merkistömuunnos ei tule toimimaan\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "varoitus: PO-tiedoston otsake on merkitty vajaaksi\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "varoitus: msgfmt:n vanhat versiot antavat tästä virheen\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "nimiavaruusnimi ”%s” ei ole sopiva tiedostonimenä"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "nimiavaruusnimi ”%s” ei ole sopiva tiedostonimenä: käyttää etuliitettä"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, c-format
msgid "'domain %s' directive ignored"
msgstr "’nimiavaruus %s’-direktiivi ohitetaan"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "tyhjä ’msgstr’-merkkijono jätetty huomioimatta"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "vajaa ’msgstr’-merkkijono jätetty huomioimatta"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: varoitus: lähdetiedosto sisältää vajaan käännöksen"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c: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 "virhe luettaessa tiedostoa ”%s”"
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2244,7 +2326,7 @@ 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
+#: src/msggrep.c:521
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2254,7 +2336,7 @@ msgstr ""
"tai kuuluvat johonkin annetuista lähdetiedostoista.\n"
# Pistekommentti viittaan kommenttiriviin, joka alkaa merkeillä "#. "
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2330,7 +2412,7 @@ msgstr ""
" -v, --invert-match tulosta vain viestit, jotka eivät täsmää mihinkään\n"
" valintakriteeriin\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2338,12 +2420,12 @@ msgstr ""
" --escape käytä C-koodinvaihtomerkkejä tulosteessa, ei "
"laajennettuja merkkejä\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output tuota lajiteltu tuloste\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
@@ -2510,7 +2592,7 @@ msgstr "kohdemerkistö %s” ei ole siirrettävä koodausnimi."
#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:3051
+#: src/xgettext.c:544 src/xgettext.c:3418
#, c-format
msgid "warning: "
msgstr "varoitus: "
@@ -2719,17 +2801,17 @@ msgstr "monikkomuotojen käsittely on GNU gettext -laajennos"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr-merkkijonosta puuttuu pikanäppäinmerkki ’%c’"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr-merkkijonossa on liian monta pikanäppäinmerkkiä ’%c’"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, 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
+#: src/msgl-check.c:820
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "otsakekenttä ’%s’ puuttuu otsakkeessa\n"
@@ -2749,7 +2831,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
msgstr "syötetiedosto ei sisällä otsaketta, jossa on merkistömäärittely"
#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c: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 "
@@ -2768,7 +2850,7 @@ msgstr ""
"jotkut eri msgid-merkkijonot ovat samoja."
#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:715
+#: src/xgettext.c:727
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2777,16 +2859,16 @@ 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
+#: src/msgmerge.c:392 src/msgmerge.c:398
#, c-format
msgid "%s is only valid with %s"
msgstr "valitsin %s on kelvollinen vain valitsimen %s kanssa"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr "varmuuskopiotyyppi"
-#: 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"
@@ -2809,19 +2891,19 @@ msgstr ""
"kommentit ja tiedostosijainnit säilytetään. Siellä missä ei löydetä\n"
"tarkkaa täsmäystä, käytetään vajaustäsmäystä paremman tuloksen tuottamiseksi.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
" def.po käännökset, jotka viittaavat vanhoihin "
"lähdekoodeihin\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot viittaa uusiin lähdekoodeihin\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2830,7 +2912,7 @@ msgstr ""
" -C, --compendium=TIEDOSTO viestikäännösten lisäkirjasto,\n"
" saatetaan määritellä useammin kuin kerran\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2840,28 +2922,28 @@ msgstr ""
" älä tee mitään, jos tiedosto def.po on jo ajan "
"tasalla\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Tulostetiedostosijainti päivitystilassa:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Tulos kirjoitetaan takaisin tiedostoon def.po.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTROL tee tiedoston def.po varmuuskopio\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
" --suffix=LOPPULIITE korvaa tavallisen varmuuskopioloppuliitteen\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2882,7 +2964,7 @@ msgstr ""
" yksinkertainen\n"
" simple, never tee aina yksinkertaisia varmuuskopioita\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2892,7 +2974,7 @@ msgstr ""
"Varmuuskopioloppuliite on ’~’, ellei ole asetettu valitsimella --suffix tai\n"
"ympäristömuuttujalla SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
@@ -2900,23 +2982,23 @@ msgstr ""
" --previous säilytä käännettyjen viestien aikaisemmat "
"msgid-merkkijonot\n"
-#: 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 " -q, --quiet, --silent vaienna edistymisindikaattorit\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
msgstr "tämän viestin pitäisi määritellä monikkomuodot"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
msgstr "tämän viestin ei pitäisi määritellä monikkomuotoja"
# Ensimmäinen parametri on joko tyhjä merkkijono tai rivinvaihto
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2925,7 +3007,7 @@ 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/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -3036,7 +3118,7 @@ msgstr " -i, --indent kirjoita sisennettyä tulostetyyliä\n"
msgid " --strict write strict uniforum style\n"
msgstr " --strict kirjoita tiukkaa uniforum-tyyliä\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -3058,12 +3140,12 @@ msgstr ""
"käännöksestä. Tiedostosijainnit kumuloituvat. Kun käytetään valitsinta\n"
"--unique, kaksoiskappaleet hylätään.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated tulosta vain kaksoiskappaleet\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -3133,27 +3215,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "epäjohdonmukainen #~ -käyttö"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, c-format
msgid "missing 'msgstr[]' section"
msgstr "puuttuva ’msgid_plural[]’-rivi"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, c-format
msgid "missing 'msgid_plural' section"
msgstr "puuttuva ’msgid_plural’-rivi"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, c-format
msgid "missing 'msgstr' section"
msgstr "puuttuva ’msgstr’-rivi"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "ensimmäisellä monikkomuodolla on nollasta poikkeava indeksi"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "monikkomuodolla on väärä indeksi"
@@ -3163,7 +3245,7 @@ msgstr "monikkomuodolla on väärä indeksi"
msgid "too many errors, aborting"
msgstr "liian monia virheitä, keskeytetään"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c: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 "virheellinen monitavusekvenssi"
@@ -3207,16 +3289,16 @@ 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:1023
+#: src/read-catalog.c:318 src/xgettext.c:1046
#, c-format
msgid "this file may not contain domain directives"
msgstr "tämä tiedosto ei ehkä sisällä nimiavaruusdirektiivejä"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "kaksinkertainen viestimäärittely"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "ensimmäinen määrittely täällä"
@@ -3421,13 +3503,13 @@ msgstr "epäonnistunut C#-luokan kääntäminen, yritä valitsinta --verbose"
msgid "compilation of C# class failed"
msgstr "epäonnistunut C#-luokan kääntäminen"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "kelvoton Java-luokkanimi: %s"
# käännetty tällä tavalla, jotta alkaisi pienellä alkukirjaimella.
-#: src/write-java.c:1165
+#: src/write-java.c:1210
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
@@ -3435,7 +3517,7 @@ msgstr ""
"muuttuja $JAVAC"
# käännetty tällä tavalla, jotta alkaisi pienellä alkukirjaimella.
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr "epäonnistunut Java-luokan kääntäminen, yritä asettaa muuttuja $JAVAC"
@@ -3445,14 +3527,14 @@ msgstr "epäonnistunut Java-luokan kääntäminen, yritä asettaa muuttuja $JAVA
msgid "error while opening \"%s\" for writing"
msgstr "virhe avattaessa tiedostoa ”%s” kirjoittamista varten"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, c-format
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
+#: src/write-po.c:1326 src/write-po.c:1450
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3466,7 +3548,7 @@ msgstr ""
"msgctxt-merkkijonon käyttämistä.\n"
"%s\n"
-#: 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"
@@ -3540,7 +3622,7 @@ msgid ""
"but the Tcl message catalog format doesn't support contexts\n"
msgstr ""
"viestiluettelossa on kontekstiriippuvaisia käännöksiä\n"
-"mutta Tcl-viestiluettelomuoto ei tue konteksteja.\n"
+"mutta Tcl-viestiluettelomuoto ei tue konteksteja\n"
#: src/write-tcl.c:176
msgid ""
@@ -3550,7 +3632,7 @@ msgstr ""
"viestiluettelossa on monikkomuotoisia käännöksiä\n"
"mutta Tcl-viestiluettelomuoto ei tule monikkokäsittelyä\n"
-#: src/x-awk.c:341 src/x-javascript.c: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 "%s:%d: varoitus: päättämätön merkkijono"
@@ -3560,17 +3642,22 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, fuzzy, c-format
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: varoitus: virheellinen Unicode-merkki"
+
+#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
#, 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-vala.c:832
+#: src/x-c.c:1345 src/x-vala.c:752
#, 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:2055
+#: src/x-csharp.c:224 src/xgettext.c:2106
msgid "Please specify the source encoding through --from-code."
msgstr "Määritä lähdekoodaus valitsimen --from-code avulla."
@@ -3624,7 +3711,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:1335
+#: src/x-csharp.c:1390 src/x-python.c:1138
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: varoitus: virheellinen Unicode-merkki"
@@ -3637,29 +3724,29 @@ msgstr "%s:%d: varoitus: päättämätön merkkijonovakio"
#: src/x-csharp.c:2020 src/x-java.c:1369
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: varoitus: ')' löytyi kun '}' odotettiin"
+msgstr "%s:%d: varoitus: ’)’ löytyi kun ’}’ odotettiin"
#: src/x-csharp.c:2054 src/x-java.c:1403
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: varoitus: '}' löytyi kun ')' odotettiin"
+msgstr "%s:%d: varoitus: ’}’ löytyi kun ’)’ odotettiin"
-#: src/x-glade.c:561
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
+msgstr "Puuttuva asiayhteys merkkijonolle, joka poimittiin elementistä ’%s’"
-#: 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 ""
+msgstr "Juurielementti <%s> ei ole sallittu virheettömässä Glade-tiedostossa"
-#: 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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3674,59 +3761,68 @@ 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."
+msgstr "Määritä lähdekoodaus valitsimen --from-code avulla\n"
#: src/x-javascript.c:275
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
"%s:%d: Virheellinen monitavusekvenssi.\n"
-"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla.\n"
+"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla\n"
#: src/x-javascript.c:291
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
"%s:%d: Pitkä vaillinainen monitavusekvenssi.\n"
-"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla.\n"
+"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla\n"
#: src/x-javascript.c:303
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of file.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
"%s:%d: Vaillinainen monitavusekvenssi tiedoston lopussa.\n"
-"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla.\n"
+"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla\n"
#: src/x-javascript.c:312
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of line.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
"%s:%d: Vaillinainen monitavusekvenssi rivin lopussa.\n"
-"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla.\n"
+"Määritä oikea lähdekoodikoodaus valitsimen --from-code avulla\n"
#: src/x-javascript.c:344
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the source encoding through --from-code\n"
msgstr ""
"%s:%d: Virheellinen monitavusekvenssi.\n"
-"Määritä lähdekoodikoodaus valitsimen --from-code avulla.\n"
+"Määritä lähdekoodikoodaus valitsimen --from-code avulla\n"
-#: src/x-javascript.c:1147
-#, fuzzy, c-format
+#: src/x-javascript.c:954
+#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: varoitus: päättämätön merkkijonoliteraali"
+msgstr "%s:%d: varoitus: RegExp-merkkijonoliteraali päättyi liian aikaisin"
+
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: varoitus: virheellinen Unicode-merkki"
+
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: varoitus: päättämätön merkkijono"
#: src/x-perl.c:308
#, c-format
@@ -3857,36 +3953,43 @@ msgstr ""
"%s:%lu: varoitus: syntaksi $\"...\" on vanhentunut turvallisuussyistä; käytä "
"sen sijaan funktiota eval_gettext"
-#: src/x-vala.c:558
-#, fuzzy, c-format
+#: src/x-vala.c:413
+#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: varoitus: päättämätön merkkijonoliteraali"
+msgstr ""
+"%s:%d: varoitus: säännöllisen lausekkeen merkkijonoliteraali päättyi liian "
+"aikaisin"
+
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr ""
-#: src/xgettext.c:636
+#: src/xgettext.c:648
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"valitsimen --join-existing käyttäminen epäonnistui kun tuloste kirjoitetaan "
"vakiotulosteeseen"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext ei voi työskennellä ilman etsittäviä avainsanoja"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, 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"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, 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:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3895,25 +3998,25 @@ msgstr ""
" -d, --default-domain=NIMI käytä tiedostoa NIMI.po tulostukseen (eikä "
"tiedostoa messages.po)\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
" -o, --output=TIEDOSTO kirjoita tuloste määriteltyyn tiedostoon\n"
-#: src/xgettext.c:863
+#: src/xgettext.c:886
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr ""
" -p, --output-dir=HAKEMISTO tulostetiedostot sijoitetaan HAKEMISTOon\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Syötetiedoston kielen valinta:\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, fuzzy, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3923,7 +4026,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=NIMI tunnista määritelty kieli\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3931,15 +4034,16 @@ msgstr ""
" 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"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr ""
" -C, --c++ pikavalitsin valitsimelle --language=C++\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:902
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
@@ -3947,7 +4051,7 @@ msgid ""
msgstr ""
"Oletuksena kieli on arvattu riippuen syötetiedostonimen tarkentimesta.\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3956,24 +4060,24 @@ msgstr ""
" --from-code=NIMI syötetiedostojen koodaus\n"
" (paitsi kielille Python, Tcl, Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, 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:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
" -j, --join-existing liitä viesti oleamssaolevaan tiedostoon\n"
-#: 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 ""
" -x, --exclude-file=FILE.po rivejä tiedostossa FILE.po ei ole poimittu\n"
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -3988,18 +4092,18 @@ msgstr ""
"avainsana-\n"
" rivit tulostetiedostoon\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Kielikohtaiset valitsimet:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all pura kaikki merkkijonot\n"
-#: src/xgettext.c:906 src/xgettext.c:914
-#, fuzzy, c-format
+#: src/xgettext.c:929
+#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, "
@@ -4010,18 +4114,25 @@ msgstr ""
" (vain kielet 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"
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:937
+#, fuzzy, 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 ""
-" -kWORD, --keyword=WORD etsi WORD-argumentti lisäavainsanana\n"
-" -k, --keyword älä käytä oletusavainsanoja\n"
+" (vain kielet C, C++, ObjectiveC, Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+" Lua, JavaScript, Vala)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -4032,8 +4143,8 @@ msgstr ""
"argumentti-\n"
" numeron ARG sisällä\n"
-#: src/xgettext.c:922
-#, fuzzy, c-format
+#: src/xgettext.c:945
+#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, "
@@ -4044,40 +4155,41 @@ msgstr ""
" (vain kielille 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"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
" -T, --trigraphs ymmärrä ANSI C kolmimerkkejä syötettä varten\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr " (vain kielet C, C++, ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt tunnista Qt-muotoiset merkkijonot\n"
-#: 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 " (vain C++-kieli)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --kde tunnista KDE 4 -muotoiset merkkijonot\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --boost tunnista Boost-muotoiset merkkijonot\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
@@ -4085,18 +4197,18 @@ msgstr ""
" --debug yksityiskohtaisempi "
"muotomerkkijonotunnistustulos\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output luo Java .properties -tiedoston\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
" --copyright-holder=STRING aseta copyright-omistajan tulosteessa\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -4104,17 +4216,17 @@ msgstr ""
" --foreign-user ohita FSF copyright-tulosteessa "
"vieraskieliselle käyttäjälle\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, c-format
msgid " --package-name=PACKAGE set package name in output\n"
msgstr " --package-name=PACKAGE aseta pakkausnimi tulosteessa\n"
-#: src/xgettext.c:989
+#: src/xgettext.c:1012
#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr " --package-version=VERSION aseta pakkausversio tulosteessa\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
@@ -4122,7 +4234,7 @@ msgstr ""
" --msgid-bugs-address=EMAIL@ADDRESS aseta ilmoitusosoite msgid-"
"vikailmoituksia varten\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -4133,7 +4245,7 @@ msgstr ""
"etuliitteenä msgstr-\n"
" merkkijonon arvoille\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -4144,7 +4256,7 @@ msgstr ""
"loppuliitteenä msgstr-\n"
" merkkijonon arvoille\n"
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4153,31 +4265,31 @@ msgstr ""
"Argumentilla --flag ei ole <avainsana>:<argumenttinumero>:[pass-]<lippu> -"
"syntaksia: %s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr "vakiosyöte"
-#: src/xgettext.c:2020
+#: src/xgettext.c:2071
#, c-format
msgid "Non-ASCII character at %s%s."
msgstr "Ei-ASCII-merkki osoitteessa %s%s."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr "Ei-ASCII-kommentti osoitteessa tai ennen osoitetta %s%s."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr "Ei-ASCII-merkkijono osoitteessa %s%s."
-#: 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 "%s%s: varoitus: "
-#: 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 "
@@ -4186,7 +4298,7 @@ msgstr ""
"Vaikka käytetty muotomerkkijonopaikassa, merkkijono %s ei ole kelvollinen %s-"
"muotomerkkijono. Syy: %s\n"
-#: 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: "
@@ -4195,7 +4307,7 @@ msgstr ""
"Vaikka esitelty sellaisena, merkkijono %s ei ole kelvollinen %s-"
"muotomerkkijono. Syy: %s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4209,7 +4321,7 @@ msgstr ""
"Harkitse muotomerkkijonon käyttämistä nimetyillä argumenteilla,\n"
"ja kartoittamalla eikä argumenttien monilla.\n"
-#: 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"
@@ -4219,27 +4331,27 @@ msgstr ""
"gettext(\"\") palauttaa otsakkeen metatiedolla,\n"
"ei tyhjää merkkijonoa.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "argumenttimäärittely avainsanalle ’%.*s’ ei ole yksiselitteinen"
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "varoitus: puuttuva konteksti avainsanalle ’%.*s’"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr "varoitus: puuttuva konteksti avainsanan ’%.*s’ monikkoargumentille"
-#: src/xgettext.c:2942
+#: src/xgettext.c:3052
#, c-format
msgid "context mismatch between singular and plural form"
msgstr "kontekstitäsmäämättömyys yksikkö- ja monikkomuotojen välillä"
-#: 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"
@@ -4251,7 +4363,7 @@ msgstr ""
"MSGID_BUGS_ADDRESS-muuttuja; muussa tapauksessa\n"
"määritä komentorivivalitsin --msgid-bugs-address.\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, c-format
msgid "language '%s' unknown"
msgstr "kieli ’%s’ on tuntematon"
diff --git a/gettext-tools/po/fr.po b/gettext-tools/po/fr.po
index f44ab97..cb5ef64 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: 2013-07-07 18:21+0900\n"
+"POT-Creation-Date: 2014-06-01 11:19+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"
@@ -187,15 +187,15 @@ msgstr "argument source_version invalide pour compile_java_class"
msgid "invalid target_version argument to compile_java_class"
msgstr "argument target_version invalide pour compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c: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 "Échec lors de la création de « %s »"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c: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 "Erreur pendant l'écriture du fichier « %s »"
@@ -220,9 +220,9 @@ msgstr ""
msgid "%s subprocess I/O error"
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/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 "Mémoire épuisée"
@@ -233,7 +233,7 @@ msgid "creation of threads failed"
msgstr "Échec de compilation de la classe C#"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "Échec d'écriture sur le sous-processus %s"
@@ -322,8 +322,8 @@ 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: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 "Erreur lors de l'ouverture de « %s » en lecture "
@@ -736,7 +736,7 @@ msgstr ""
"l'indicateur de conversion « %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-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'"
@@ -787,31 +787,31 @@ 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
+#: src/format-python-brace.c:137
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
msgstr "Dans la directive numéro %u, « %c » n'est pas suivi par un chiffre."
-#: src/format-python-brace.c:149
+#: src/format-python-brace.c:150
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
msgstr ""
"Dans la directive numéro %u, le symbole « { » n'est pas suivi par un numéro "
"d'argument."
-#: src/format-python-brace.c:164
+#: src/format-python-brace.c:165
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
msgstr "Dans la directive numéro %u, « %c » n'est pas suivi par un chiffre."
-#: src/format-python-brace.c:184
+#: src/format-python-brace.c:185
#, fuzzy, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
msgstr ""
"Dans la directive numéro %u, une précision n'est pas permise avant « %c »."
-#: src/format-python-brace.c:210
+#: src/format-python-brace.c:270
#, fuzzy, c-format
msgid "In the directive number %u, there is an unterminated format directive."
msgstr "Dans la directive numéro %u, l'argument %d est négatif."
@@ -870,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: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"
@@ -887,19 +887,19 @@ msgstr ""
"Ceci est un logiciel libre : vous pouvez le modifier et le redistribuer.\n"
"Il n'y a PAS DE GARANTIE, dans la mesure de ce que permet la loi.\n"
-#: src/hostname.c:184 src/msgattrib.c: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 "Écrit par %s.\n"
#. 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 "Bruno Haible"
@@ -909,11 +909,11 @@ msgstr "Bruno Haible"
msgid "too many arguments"
msgstr "Trop d'arguments"
-#: 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
#, fuzzy, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Pour plus d'information, essayez « %s --help ».\n"
@@ -954,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: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 "Sortie informative :\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help afficher ce message d'aide, puis terminer\n"
-#: 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 " -V, --version afficher le numéro de version de ce programme, puis terminer\n"
@@ -985,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: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 "Signalez tout bogue à <bug-gnu-gettext@gnu.org>.\n"
@@ -998,30 +998,27 @@ 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: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 "Un seul fichier est permis en entrée"
-#: 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 "%s et %s s'excluent mutuellement"
-#: 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 "Usage : %s [OPTION] [FICHIER_ENTRÉE]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -1030,10 +1027,10 @@ msgstr ""
"msgattrib permet de filtrer les messages d'un catalogue de traduction selon leurs attributs\n"
"et de manipuler les attributs.\n"
-#: src/msgattrib.c: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"
@@ -1042,23 +1039,23 @@ msgstr ""
"également\n"
"obligatoires pour les formes courtes correspondantes.\n"
-#: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
-#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
-#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
-#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
+#: src/msgattrib.c:433 src/msgcat.c: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 "Emplacement du fichier d'entrée :\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " FICHIER ... fichier PO d'entrée\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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"
@@ -1066,32 +1063,32 @@ msgstr ""
" -D, --directory=DOSSIER ajouter le DOSSIER pour la recherche des "
"fichiers d'entrée\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
" Si 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: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 "Emplacement du fichier de sortie :\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 " -o, --output-file=FICHIER écrire la sortie dans le FICHIER\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1100,12 +1097,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: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 "Sélection des messages :\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
@@ -1113,7 +1110,7 @@ msgstr ""
" --translated conserver les messages traduit, retirer les "
"messages non traduits\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
@@ -1121,61 +1118,61 @@ msgstr ""
" --untranslated conserver les messages non traduits, retirer "
"les messages traduits\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr " --no-fuzzy retirer les messages marqués « fuzzy »\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr ""
" --only-fuzzy conserver seulement les messages marqués "
"« fuzzy »\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete retirer les messages obsolètes « #~ »\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr ""
" --only-obsolete conserver seulement les messages obsolètes "
"« #~ »\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Manipulation d'attribut :\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr ""
" --set-fuzzy placer tous les messages dans l'état "
"« fuzzy »\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr ""
" --clear-fuzzy retirer l'état « fuzzy » de tous les messages\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr ""
" --set-obsolete marquer tous les messages comme obsolètes\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr ""
" --clear-obsolete marquer tous les messages comme non-obsolètes\n"
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, fuzzy, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
@@ -1184,7 +1181,7 @@ msgstr ""
" --previous conserver les précédentes chaînes « msgid » "
"des messages traduits\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
@@ -1193,7 +1190,13 @@ msgstr ""
" --clear-previous retirer la chaîne « previous msgid » de tous "
"les messages\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, fuzzy, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr " --no-fuzzy retirer les messages marqués « fuzzy »\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
@@ -1201,7 +1204,7 @@ msgstr ""
" --only-file=FICHIER.po manipuler seulement les entrées listées dans "
"le FICHIER.po\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
@@ -1209,13 +1212,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:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr ""
" --fuzzy identique à « --only-fuzzy --clear-fuzzy »\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
@@ -1223,16 +1226,16 @@ msgstr ""
" --obsolete identique à « --only-obsolete --clear-"
"obsolete »\n"
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c: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 "Syntaxe du fichier d'entrée :\n"
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c: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"
@@ -1240,8 +1243,8 @@ msgstr ""
" -P, --properties-input la syntaxe du fichier d'entrée est celle\n"
" des fichiers « .properties » de Java\n"
-#: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
-#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c: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 "
@@ -1250,17 +1253,17 @@ msgstr ""
" --stringtable-input la syntaxe du fichier d'entrée est celle\n"
" des fichiers « .strings » de 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
-#: 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 "Détails des données de sortie :\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1275,18 +1278,18 @@ msgstr ""
" QUAND peut être « always », « never », « auto "
"», or « html ».\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr ""
" --style=FICHIERSTYLE spécifie le fichier de règles de style CSS "
"pour --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
+#: 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"
@@ -1294,9 +1297,9 @@ msgstr ""
" -e, --no-escape ne pas utiliser de séquences d'échappement C "
"dans la sortie (par défaut)\n"
-#: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
-#: src/msguniq.c:390 src/xgettext.c:956
+#: src/msgattrib.c:508 src/msgcat.c: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"
@@ -1304,31 +1307,31 @@ msgstr ""
" -E, --escape utiliser des séquences d'échappements C dans "
"la sortie, sans caractère étendu\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
" --force-po créer un fichier .po même s'il est vide\n"
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
" -i, --indent créer le fichier .po avec un style indenté\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
" --no-location ne pas créer les commentaires de numérotation "
"du type « #: fichier:ligne»\n"
-#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:964
+#: src/msgattrib.c:516 src/msgcat.c: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"
@@ -1336,8 +1339,8 @@ msgstr ""
" -n, --add-location créer des commentaires de numérotation du type "
"« #: fichier:ligne » (par défaut)\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c: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"
@@ -1345,17 +1348,17 @@ msgstr ""
" --strict créer des fichier .po strictement conformes à "
"l'Uniforum\n"
-#: src/msgattrib.c:511 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
-#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
-#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
+#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
+#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr ""
" -p, --properties-output créer un fichier « .properties » de type 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
+#: 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"
@@ -1363,16 +1366,16 @@ msgstr ""
" --stringtable-output créer un fichier « .strings » de type 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
+#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
+#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=NOMBRE spécifier la largeur de page\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c: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"
@@ -1382,33 +1385,33 @@ msgstr ""
"plus longues\n"
" que la largeur des pages de sortie.\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output trier les données de sortie\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 ""
" -F, --sort-by-file trier les données de sortie selon "
"l'emplacement des fichiers\n"
-#: 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 "Critère de sélection irréalisable (%d < n < %d)"
-#: 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 "Usage : %s [OPTION] [FICHIER_ENTRÉE]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, fuzzy, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1430,27 +1433,27 @@ msgstr ""
"ils seront pris dans le premier fichier .po où ils ont été définis.\n"
"Les indications de position de tous les fichiers .po seront accumulées.\n"
-#: src/msgcat.c: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 " FICHIER ... fichiers d'entrée\n"
-#: 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 ""
" -f, --files-from=FICHIER obtenir la liste des fichiers d'entrée à "
"partir du FICHIER\n"
-#: 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 ""
" Si le nom du fichier d'entrée est « - », les données sont lues depuis "
"l'entrée standard.\n"
-#: 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"
@@ -1459,7 +1462,7 @@ msgstr ""
" -<, --less-than=N afficher les messages définis moins de N fois\n"
" (sans limite par défaut)\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1468,7 +1471,7 @@ msgstr ""
" ->, --more-than=N afficher les messages définis plus de N fois\n"
" (zéro par défaut, càd sans limite)\n"
-#: src/msgcat.c: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"
@@ -1477,8 +1480,8 @@ msgstr ""
" -u, --unique Afficher les messages uniques (identique à « --"
"less-than=2 »)\n"
-#: 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"
@@ -1486,8 +1489,8 @@ msgstr ""
" -P, --properties-input la syntaxe des fichiers d'entrée est celle\n"
" des fichiers « .properties » de Java\n"
-#: 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"
@@ -1496,12 +1499,12 @@ msgstr ""
" --stringtable-input la syntaxe des fichiers d'entrée est celle\n"
" des fichiers « .strings » de NeXTstep/GNUstep\n"
-#: 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 " -t, --to-code=ENCODAGE encodage de sortie\n"
-#: 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"
@@ -1512,7 +1515,7 @@ msgstr ""
" message ; ne pas faire la fusion de plusieurs "
"traductions\n"
-#: 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"
@@ -1520,21 +1523,21 @@ msgstr ""
" --lang=NOMCATALOGUE définir le champ 'Language' dans l'en-tête\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "Fichiers d'entrée non spécifiés"
-#: 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 "Deux fichiers sont requis en entrée"
-#: 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 "Usage : %s [OPTION] def.po ref.pot\n"
@@ -1568,12 +1571,12 @@ msgstr " def.po traductions\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot références aux sources\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "Modificateurs d'opération:\n"
-#: 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."
@@ -1582,7 +1585,7 @@ msgstr ""
" -m, --multi-domain appliquer ref.pot à chaque domaine défini dans "
"def.po\n"
-#: 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 ""
@@ -1610,17 +1613,17 @@ msgstr "ce message n'est pas traduit"
msgid "this message needs to be reviewed by the translator"
msgstr "ce message doit être révisé par le traducteur"
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1505
#, c-format
msgid "this message is used but not defined..."
msgstr "Ce message est utilisé mais non défini..."
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1508
#, c-format
msgid "...but this definition is similar"
msgstr "...mais cette définition est semblable"
-#: 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 "Ce message est utilisé mais non défini dans « %s »"
@@ -1630,19 +1633,19 @@ msgstr "Ce message est utilisé mais non défini dans « %s »"
msgid "warning: this message is not used"
msgstr "AVERTISSEMENT : ce message n'est pas utilisé"
-#: src/msgcmp.c:553 src/msgfmt.c: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] "%d erreur fatale trouvée"
msgstr[1] "%d erreurs fatales trouvées"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "Il faut indiquer au moins deux fichiers"
-#: src/msgcomm.c:363
+#: src/msgcomm.c:364
#, fuzzy, c-format, no-wrap
msgid ""
"Find messages which are common to two or more of the specified PO files.\n"
@@ -1662,7 +1665,7 @@ msgstr ""
"ils seront pris dans le premier fichier .po où ils ont été définis.\n"
"Les commentaires de position de tous les fichiers .po seront accumulés.\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1672,7 +1675,7 @@ msgstr ""
"N\n"
" définitions (1 par défaut)\n"
-#: src/msgcomm.c:451 src/xgettext.c:981
+#: src/msgcomm.c:452 src/xgettext.c:1004
#, fuzzy, c-format
msgid ""
" --omit-header don't write header with 'msgid \"\"' entry\n"
@@ -1680,70 +1683,70 @@ msgstr ""
" --omit-header ne pas créer d'en-têtes de la forme « msgid "
"\"\" »' \n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr ""
"msgconv permet de modifier l'encodage utilisé dans un catalogue de "
"traduction.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Cible de conversion :\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr ""
"L'encodage par défaut est l'encodage de « locale » actuellement utilisé.\n"
-#: 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 " -i, --indent indenter les données de sortie\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
" --no-location supprimer les commentaires du type « #: "
"fichier:ligne »\n"
-#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
-#: src/msgmerge.c:583
-#, c-format
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
+#: src/msgmerge.c:588
+#, fuzzy, c-format
msgid ""
-" --add-location preserve '#: filename:line' lines (default)\n"
+" -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
" --add-location conserver les commentaires du type « #: "
"fichier:ligne » (par défaut)\n"
-#: src/msgconv.c: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 ""
" --strict créer une sortie strictement conforme à "
"l'Uniforum\n"
-#: 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 "Aucun fichier d'entrée n'a été fourni"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "Un (et un seul) fichier d'entrée doit être fourni"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Usage : %s [OPTION] FICHIER_ENTRÉE\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1757,7 +1760,7 @@ msgstr ""
"Le texte original anglais du champ « msgid » est alors utilisé\n"
"comme traduction pour les messages non traduits.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " FICHIER ... fichiers d'entrée .po ou .pot\n"
@@ -1796,7 +1799,7 @@ msgstr ""
"Une commande interne spéciale appelée « 0 » renvoie la traduction suivie par un\n"
"octet nul. La sortie de « msgexec 0 » peut être utilisée comme entrée pour « xargs -0 ».\n"
-#: src/msgexec.c:281 src/msgfilter.c:401
+#: src/msgexec.c:281 src/msgfilter.c:420
#, c-format
msgid " -i, --input=INPUTFILE input PO file\n"
msgstr " -i, --input=FICHIER fichier .po d'entrée\n"
@@ -1806,29 +1809,29 @@ msgstr " -i, --input=FICHIER fichier .po d'entrée\n"
msgid "write to stdout failed"
msgstr "Échec d'écriture sur la sortie standard"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "Il manque le nom du filtre"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr "Un script « sed » doit au moins être spécifié"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Usage : %s [OPTION] FILTRE [OPTION_DU_FILTRE]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr ""
"msgfilter permet d'appliquer un filtre à toutes les traductions d'un "
"catalogue.\n"
-#: src/msgfilter.c:416
+#: src/msgfilter.c:435
#, c-format
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
@@ -1838,19 +1841,19 @@ msgstr ""
"l'entrée standard et qui renvoie une traduction modifiée sur la sortie "
"standard.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "Options de filtrage utiles lorsque le FILTRE est « sed » :\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
msgstr ""
" -e, --expression=SCRIPT ajouter le SCRIPT aux commandes à exécuter\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1860,7 +1863,7 @@ msgstr ""
" -f, --file=FICHIER_SCRIPT ajouter le contenu du FICHIER_SCRIPT aux "
"commandes à exécuter\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
@@ -1868,7 +1871,7 @@ msgstr ""
" -n, --quiet, --silent demander à « sed » de ne pas afficher son "
"espace de travail (pattern space)\n"
-#: 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"
@@ -1876,94 +1879,117 @@ msgstr ""
" --no-escape ne pas utiliser de séquences d'échappement C "
"dans la sortie (par défaut)\n"
-#: 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 " --indent indenter la sortie\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
msgstr " --keep-header ne pas filtrer ni modifier l'en-tête\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "L'argument de %s devrait être un simple caractère de ponctuation"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
msgstr "ordre des octets invalide (endianness) : %s"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c: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 "Ulrich Drepper"
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:439
+#, fuzzy, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr ""
+" Si le nom du fichier d'entrée est « - » ou s'il n'est pas fourni, les "
+"données sont lues depuis l'entrée standard.\n"
+
+#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
#: src/msgunfmt.c:353
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s a besoin de l'option « -d DOSSIER »"
-#: 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 "%s a besoin de l'option « -l locale »"
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:538
+#, fuzzy, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s a besoin de l'option « -l locale »"
+
+#: src/msgfmt.c:545
+#, fuzzy, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s a besoin de l'option « -l locale »"
+
+#: src/msgfmt.c:551
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s et %s s'excluent mutuellement"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s n'est valide qu'avec %s ou %s"
-#: 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 "%s n'est valide qu'avec %s, %s ou %s"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
msgstr "%s : "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d message traduit"
msgstr[1] "%d messages traduits"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d traduction approximative"
msgstr[1] ", %d traductions approximatives"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d message non traduit"
msgstr[1] ", %d messages non traduits"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Usage : %s [OPTION] fichier.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
"msgfmt permet de créer un catalogue binaire de messages à partir de la "
"description textuelle des traductions.\n"
-#: src/msgfmt.c: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"
@@ -1972,17 +1998,17 @@ msgstr ""
"Les arguments obligatoires pour les formes longues des options sont également\n"
"obligatoires pour les formes courtes correspondantes. (idem options factultatives)\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
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:890
+#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Mode d'exécution :\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1991,7 +2017,7 @@ msgstr ""
" -j, --java mode JAVA : produire une classe Java "
"« ResourceBundle »\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -2000,14 +2026,14 @@ msgstr ""
" --java2 identique à --java, mais pour Java2 (JDK 1.2 "
"ou plus récent)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr ""
" --csharp mode C# : générer un fichier « .dll » de type ."
"NET\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -2016,7 +2042,7 @@ msgstr ""
" --csharp-resources mode C# : produire un fichier « .resources » "
"de type .NET\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -2024,39 +2050,47 @@ msgstr ""
" --tcl mode TCL : produire un fichier « .msg » de "
"type tcl/msgcat\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr ""
" --tcl mode QT : produire un fichier « .qm » de type "
"Qt\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, fuzzy, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+" --tcl mode QT : produire un fichier « .qm » de type "
+"Qt\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
" --strict active le mode de conformité stricte à "
"l'Uniforum\n"
-#: 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 ""
" Si le nom du fichier de sortie est « - », la sortie est envoyée vers la "
"sortie standard\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Emplacement du fichier de sortie en mode Java :\n"
-#: 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 " -r, --resource=RESSOURCE nom de la 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
+#: 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 "
@@ -2065,7 +2099,16 @@ msgstr ""
" -l, --locale=LOCALE nom de la « locale » (par exemple « fr » ou "
"« fr_FR »)\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, fuzzy, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --tcl mode Tcl : l'entrée est un fichier « .msg » de "
+"type tcl/msgcat\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
@@ -2073,7 +2116,7 @@ msgstr ""
" -d DOSSIER répertoire de base de la hiérarchie des "
"classes\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2087,12 +2130,12 @@ msgstr ""
"obligatoire. La classe est créée\n"
" dans le répertoire spécifié.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "Emplacement du fichier de sortie en mode C# :\n"
-#: 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 "
@@ -2101,7 +2144,7 @@ msgstr ""
" -d DOSSIER répertoire de base pour les fichiers .dll "
"dépendants de la « locale »\n"
-#: 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"
@@ -2111,19 +2154,19 @@ msgstr ""
" Le fichier .dll est créé dans le sous-répertoire (du répertoire spécifié)\n"
" dont le nom dépend de la « locale ».\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Emplacement du fichier de sortie en mode Tcl :\n"
-#: 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 ""
" -d DOSSIER répertoire de base des catalogues de messages "
"de type « .msg »\n"
-#: 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"
@@ -2132,12 +2175,46 @@ 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: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
+#, fuzzy, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr ""
+" -d DOSSIER répertoire de base des catalogues de messages "
+"de type « .msg »\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -kMOT, --keyword=MOT chercher MOT comme mot clé additionnel\n"
+" -k, --keyword ne pas utiliser les mots clés par défaut\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "Interprétation du fichier d'entrée :\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -2149,14 +2226,14 @@ msgstr ""
" --check-format, --check-header et --check-"
"domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format vérifier les chaînes de formatage dépendantes "
"du langage\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -2165,7 +2242,7 @@ msgstr ""
" --check-header vérifier la présence et le contenu de l'en-"
"tête\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -2175,7 +2252,7 @@ msgstr ""
"domaine\n"
" et l'option « --output-file »\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2184,7 +2261,7 @@ msgstr ""
" -C, --check-compatibility vérifier que le « msgfmt » de GNU se comporte "
"comme celui de X/Open\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -2195,14 +2272,14 @@ msgstr ""
"clavier\n"
" pour les éléments de menu\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
" -f, --use-fuzzy utiliser les traductions approximatives "
"(fuzzy) dans la sortie\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
@@ -2210,7 +2287,7 @@ msgstr ""
" -a, --alignment=N effectuer un alignement des chaînes à N octets "
"(%d par défaut)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2219,7 +2296,7 @@ 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"
@@ -2227,86 +2304,96 @@ msgstr ""
" --no-hash ne pas inclure la table de hachage dans le "
"fichier binaire\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
" --statistics afficher les statistiques de traduction\n"
-#: 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 " -v, --verbose afficher plus d'informations\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "AVERTISSEMENT : l'en-tête du fichier .po est absent ou invalide\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "AVERTISSEMENT : la conversion d'encodage ne fonctionnera pas\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "AVERTISSEMENT : l'en-tête du fichier .po est approximatif (fuzzy)\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
"AVERTISSEMENT : les versions plus anciennes de « msgfmt » génèreront une "
"erreur à cet endroit\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "Le nom de domaine « %s » n'est pas un nom de fichier approprié"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"Le nom de domaine « %s » n'est pas un nom de fichier approprié : un préfixe "
"sera utilisé"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "'domain %s' directive ignored"
msgstr "La directive « domain %s » a été ignorée"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, fuzzy, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "Une chaîne vide « msgstr » a été ignorée"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, fuzzy, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "Une chaîne « msgstr » approximative (fuzzy) a été ignorée"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr ""
"%s : AVERTISSEMENT : le fichier source contient des traductions "
"approximatives"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
#: 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 "Erreur lors de la lecture de « %s »"
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2315,7 +2402,7 @@ msgstr ""
"L'option « %c » ne peut être utilisée avant que « J », « K », « T », « C » "
"ou « X » n'ait été spécifié"
-#: src/msggrep.c:516
+#: src/msggrep.c:521
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2324,7 +2411,7 @@ msgstr ""
"msggrep permet d'extraire tous les messages d'un catalogue de traduction qui concordent avec\n"
"un motif particulier ou qui appartiennent à des fichiers sources donnés.\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2399,7 +2486,7 @@ msgstr ""
" -v, --invert-match récupère seulement les messages qui ne concordent avec\n"
" aucun critère de sélection\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2407,12 +2494,12 @@ msgstr ""
" --escape utiliser les séquences d'échappements C dans "
"la sortie, sans caractère étendu\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output trier les données en sortie\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
@@ -2591,7 +2678,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 "AVERTISSEMENT : "
@@ -2824,17 +2911,17 @@ msgstr ""
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "« msgstr » n'a pas de marqueur de raccourci clavier « %c »"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "« msgstr » a trop de marqueurs de raccourcis clavier « %c »"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, fuzzy, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "Le champ d'en-tête « %s » a encore sa valeur initiale par défaut\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, fuzzy, c-format
msgid "header field '%s' missing in header\n"
msgstr "Le champ « %s » est absent de l'en-tête\n"
@@ -2857,7 +2944,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: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 "
@@ -2876,7 +2963,7 @@ msgstr ""
"chaînes « msgids » différentes deviennent identiques."
#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:715
+#: src/xgettext.c:727
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2885,16 +2972,16 @@ msgstr ""
"Impossible de convertir de « %s » vers « %s ». %s s'appuie sur iconv(), et "
"cette version a été compilée sans iconv()."
-#: src/msgmerge.c:383 src/msgmerge.c:389
+#: src/msgmerge.c:392 src/msgmerge.c:398
#, c-format
msgid "%s is only valid with %s"
msgstr "%s est valable seulement avec %s"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr "Type de sauvegarde"
-#: 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"
@@ -2920,18 +3007,18 @@ msgstr ""
"Lorsqu'une correspondance exacte n'est pas possible,\n"
" une correspondance floue (fuzzy) est utilisée pour produire un meilleur résultat. \n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
" def.po traduction des anciens messages sources\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot messages sources actuels à traduire\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2941,7 +3028,7 @@ msgstr ""
"traduction,\n"
" peut être spécifié plusieurs fois\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2951,28 +3038,28 @@ msgstr ""
" ne rien faire si le fichier def.po est déjà à "
"jour\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Emplacement du fichier de sortie en mode mise à jour :\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr " Le résultat est réécrit dans le fichier def.po.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTRÔLE créer une sauvegarde de def.po\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
" --suffix=SUFFIXE choisir un suffixe différent de sauvegarde\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2995,7 +3082,7 @@ msgstr ""
" sinon effectuer des sauvegardes simples\n"
" simple, never toujours créer des sauvegardes simples\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, fuzzy, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -3006,7 +3093,7 @@ msgstr ""
"l'option «--suffix »\n"
"ou par la variable d'environnement SIMPLE_BACKUP_SUFFIX\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
@@ -3014,22 +3101,22 @@ msgstr ""
" --previous conserver les précédentes chaînes « msgid » "
"des messages traduits\n"
-#: 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 " -q, --quiet, --silent supprimer le témoin de progression\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
msgstr "Ce message devrait définir des formes au pluriel"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
msgstr "Ce message ne devrait pas définir de forme au pluriel"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -3038,7 +3125,7 @@ msgstr ""
"%s lues %ld anciennes + %ld références, %ld fusionnées, %ld approximatives, "
"%ld manquantes, %ld périmées.\n"
-#: 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"
@@ -3159,7 +3246,7 @@ msgstr ""
" --strict produire une sortie strictement conforme à "
"l'Uniforum\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -3180,12 +3267,12 @@ msgstr ""
"Si l'option « --use-first » est spécifiée, seuls ceux de la première traduction seront utilisés.\n"
"Les commentaires de position sont cumulés. Lorsque l'option « --unique » est utilisée, seuls les messages uniques sont conservés.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated afficher seulement les doublons\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -3259,27 +3346,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "Utilisation incohérente de #~"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, fuzzy, c-format
msgid "missing 'msgstr[]' section"
msgstr "Section « msgstr[] » absente"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, fuzzy, c-format
msgid "missing 'msgid_plural' section"
msgstr "Section « msgstr_plural » absente"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, fuzzy, c-format
msgid "missing 'msgstr' section"
msgstr "Section « msgstr » absente"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "La première forme du pluriel a un indice non nul"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "La forme du pluriel a un indice erroné"
@@ -3289,7 +3376,7 @@ msgstr "La forme du pluriel a un indice erroné"
msgid "too many errors, aborting"
msgstr "Trop d'erreurs, on abandonne"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c: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 "Séquence d'octets multiples invalide"
@@ -3333,16 +3420,16 @@ msgstr "Fin de ligne au milieu d'une chaîne"
msgid "context separator <EOT> within string"
msgstr "séparateur de contexte <EOT> à l'intérieur d'une chaîne"
-#: src/read-catalog.c: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 "Ce fichier peut ne pas contenir de directive de domaine"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "Double définition de message"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "voici l'endroit de la première occurence"
@@ -3546,19 +3633,19 @@ msgstr "Échec de compilation de la classe C#. Essayez l'option « --verbose 
msgid "compilation of C# class failed"
msgstr "Échec de compilation de la classe C#"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "« %s » n'est pas un nom de classe Java valide"
-#: src/write-java.c:1165
+#: src/write-java.c:1210
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
"Échec de compilation de la classe Java. Essayez l'option « --verbose » ou "
"définissez $JAVAC"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr "Échec de compilation de la classe Java. Essayez de définir $JAVAC"
@@ -3568,14 +3655,14 @@ msgstr "Échec de compilation de la classe Java. Essayez de définir $JAVAC"
msgid "error while opening \"%s\" for writing"
msgstr "Erreur lors de l'ouverture de « %s » en écriture"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, fuzzy, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr ""
"un message à traduire ne doit pas contenir de séquence d'échappement « \\%c »"
-#: src/write-po.c: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"
@@ -3588,7 +3675,7 @@ msgstr ""
"différent du vôtre. Vous devriez utiliser un msgctxt en pur ASCII.\n"
"%s\n"
-#: 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"
@@ -3674,7 +3761,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-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 "%s:%d : AVERTISSEMENT : chaîne non terminée"
@@ -3684,17 +3771,22 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, fuzzy, c-format
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d : AVERTISSEMENT : caractère Unicode invalide"
+
+#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
#, 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-vala.c:832
+#: src/x-c.c:1345 src/x-vala.c:752
#, 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:2055
+#: src/x-csharp.c:224 src/xgettext.c:2106
msgid "Please specify the source encoding through --from-code."
msgstr ""
"Veuillez spécifier l'encodage de la source avec l'option « --from-code »."
@@ -3749,7 +3841,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:1335
+#: src/x-csharp.c:1390 src/x-python.c:1138
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d : AVERTISSEMENT : caractère Unicode invalide"
@@ -3769,22 +3861,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: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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3849,11 +3941,21 @@ 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
+#: src/x-javascript.c:954
#, fuzzy, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d : AVERTISSEMENT : chaîne sans terminaison"
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d : AVERTISSEMENT : caractère Unicode invalide"
+
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d : AVERTISSEMENT : chaîne non terminée"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3993,38 +4095,43 @@ msgstr ""
"%s:%lu : AVERTISSEMENT : la syntaxe « $\"...\" » ne doit pas être utilisée "
"pour des raisons de sécurité. Utilisez plutôt « eval_gettext »"
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, fuzzy, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d : AVERTISSEMENT : chaîne sans terminaison"
-#: src/xgettext.c: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 ""
"L'option « --join-existing » ne peut pas être utilisée pour l'écriture sur "
"la sortie standard"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext ne peut pas fonctionner sans mot clé à rechercher"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, fuzzy, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr ""
"AVERTISSEMENT : pour le fichier « %s », l'extension « %s » est inconnue. On "
"suppose que c'est du C"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, 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:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -4033,13 +4140,13 @@ msgstr ""
" -d, --default-domain=NOM utiliser NOM.po pour la sortie (au lieu de "
"messages.po)\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, 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:863
+#: src/xgettext.c:886
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
@@ -4047,12 +4154,12 @@ msgstr ""
" -p, --output-dir=RÉP créer les fichiers de sortie dans le "
"répertoire spécifié\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Choix du langage du fichier d'entrée :\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, fuzzy, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -4062,7 +4169,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=NOM reconnaître le langage spécifié\n"
" (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
@@ -4070,12 +4177,12 @@ msgstr ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ identique à « --language=C++ »\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:902
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
@@ -4083,7 +4190,7 @@ msgid ""
msgstr ""
" Par défaut, le langage est deviné selon l'extension du nom du fichier.\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -4092,25 +4199,25 @@ msgstr ""
" --from-code=NOM encodage des fichiers d'entrée\n"
" (sauf pour Python, Tcl, Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, 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:892
+#: src/xgettext.c:915
#, 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:894
+#: src/xgettext.c:917
#, 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:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -4127,17 +4234,17 @@ msgstr ""
"précédant les lignes de mots clés\n"
" dans le fichier de sortie\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Options spécifiques au langage:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all extraire toutes les chaînes\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4152,16 +4259,22 @@ msgstr ""
"C#, awk,\n"
" awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:937
+#, fuzzy, 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 ""
-" -kMOT, --keyword=MOT chercher MOT comme mot clé additionnel\n"
-" -k, --keyword ne pas utiliser les mots clés par défaut\n"
+" (seulement les langages C, C++, ObjectiveC, "
+"Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, Java, "
+"C#, awk,\n"
+" awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -4172,7 +4285,7 @@ msgstr ""
"l'intérieur de\n"
" l'argument numéro ARG du MOT clé\n"
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4187,42 +4300,42 @@ msgstr ""
"Java,\n"
" C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, 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:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
" (seuls les langages C, C++, ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt reconnaître les chaînes au format Qt\n"
-#: 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 " (seulement le langage C++)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, 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:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr ""
" --boost reconnaître les chaînes au format Boost\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
@@ -4230,19 +4343,19 @@ msgstr ""
" --debug mieux détailler la reconnaissance des chaînes "
"de format\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, 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:983
+#: src/xgettext.c:1006
#, 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:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -4250,18 +4363,18 @@ msgstr ""
" --foreign-user omettre le copyright FSF dans la sortie pour "
"les utilisateurs étrangers\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, 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:989
+#: src/xgettext.c:1012
#, 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:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
@@ -4269,7 +4382,7 @@ msgstr ""
" --msgid-bugs-address=ADRESSE@COURRIEL adresse de courriel pour les "
"rapport d'anomalie des msgid\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -4280,7 +4393,7 @@ msgstr ""
"préfixe aux valeurs\n"
" msgstr\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -4291,7 +4404,7 @@ msgstr ""
"suffixe aux valeurs\n"
" msgstr\n"
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4300,31 +4413,31 @@ msgstr ""
"Un argument « --flag » n'a pas la syntaxe <mot_clé>:<n°_argument>:"
"[pass-]<drapeau>:%s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr "entrée standard"
-#: src/xgettext.c:2020
+#: src/xgettext.c:2071
#, c-format
msgid "Non-ASCII character at %s%s."
msgstr "Caractère non-ASCII à %s%s."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr "Commentaire non-ASCII à (ou avant) %s%s."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr "Chaîne non-ASCII à %s%s."
-#: 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 "%s%s : AVERTISSEMENT : "
-#: 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 "
@@ -4333,7 +4446,7 @@ msgstr ""
"Malgré sa position, %s n'est pas une chaîne de format %s valide. La raison "
"est :%s\n"
-#: 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: "
@@ -4342,7 +4455,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:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4356,7 +4469,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:2232
+#: src/xgettext.c:2283
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
@@ -4366,30 +4479,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:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "Argument ambigu pour le mot clé « %.*s »"
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "AVERTISSEMENT : contexte absent pour le mot clé « %.*s »"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, 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:2942
+#: src/xgettext.c:3052
#, 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:3052
+#: src/xgettext.c:3419
#, fuzzy
msgid ""
"The option --msgid-bugs-address was not specified.\n"
@@ -4402,7 +4515,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:3267
+#: src/xgettext.c:3638
#, fuzzy, c-format
msgid "language '%s' unknown"
msgstr "langage « %s » inconnu"
@@ -4411,8 +4524,7 @@ msgstr "langage « %s » inconnu"
msgid "<unnamed>"
msgstr "<sans nom>"
-#, fuzzy
-#~ msgid "header field '%s' should start at beginning of line\n"
+#~ 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"
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 ""
diff --git a/gettext-tools/po/gl.po b/gettext-tools/po/gl.po
index 6beb9a7..485c112 100644
--- a/gettext-tools/po/gl.po
+++ b/gettext-tools/po/gl.po
@@ -1,27 +1,27 @@
# Galician translation of gettext.
# This file is distributed under the same license as the gettext package.
# Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
-# Copyright (C) 2012 Leandro Regueiro.
+# Copyright (C) 2012, 2014 Leandro Regueiro.
#
# Jesús Bravo Álvarez <jba@pobox.com>, 1999-2001.
-# Leandro Regueiro <leandro.regueiro@gmail.com>, 2012.
+# Leandro Regueiro <leandro.regueiro@gmail.com>, 2012, 2014.
#
# Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas
-# colaborar connosco, podes atopar máis información en http://www.trasno.net
+# colaborar connosco, podes atopar máis información en <http://trasno.net>
#
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.18\n"
+"Project-Id-Version: gettext-tools 0.19-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-07-07 18:21+0900\n"
-"PO-Revision-Date: 2012-11-11 12:53+0100\n"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2014-05-20 13:35+0200\n"
"Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
"Language-Team: Galician <proxecto@trasno.net>\n"
"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#: gnulib-lib/argmatch.c:133
#, c-format
@@ -41,6 +41,7 @@ msgstr "Os argumentos válidos son:"
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr ""
+"non foi posíbel atopar ningún directorio temporal, probe a definir $TMPDIR"
#: gnulib-lib/clean-temp.c:346
#, c-format
@@ -64,31 +65,31 @@ msgstr "erro de escritura"
#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
#, c-format
msgid "preserving permissions for %s"
-msgstr ""
+msgstr "conservando os permisos de %s"
#: gnulib-lib/copy-file.c:194
-#, fuzzy, c-format
+#, c-format
msgid "error while opening %s for reading"
msgstr "produciuse un erro ao abrir «%s» para lectura"
#: gnulib-lib/copy-file.c:198
-#, fuzzy, c-format
+#, 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:202
-#, fuzzy, c-format
+#, c-format
msgid "error reading %s"
msgstr "produciuse un erro ao ler «%s»"
#: gnulib-lib/copy-file.c:206
-#, fuzzy, c-format
+#, c-format
msgid "error writing %s"
msgstr "produciuse un erro ao escribir «%s»"
#: gnulib-lib/copy-file.c:210
-#, fuzzy, c-format
+#, c-format
msgid "error after reading %s"
msgstr "produciuse un erro despois de ler «%s»"
@@ -103,12 +104,12 @@ msgstr "fdopen() fallou"
#: gnulib-lib/csharpcomp.c:571
#, c-format
msgid "C# compiler not found, try installing pnet"
-msgstr ""
+msgstr "Non se atopou ningún compilador de C#, probe a instalar pnet"
#: gnulib-lib/csharpexec.c:343
#, c-format
msgid "C# virtual machine not found, try installing pnet"
-msgstr ""
+msgstr "Non se atopou a máquina virtual de C#, probe a instalar pnet"
#: gnulib-lib/error.c:188
msgid "Unknown system error"
@@ -117,14 +118,14 @@ msgstr "Erro de sistema descoñecido"
#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
-#, c-format
+#, fuzzy, c-format
msgid "%s subprocess failed"
-msgstr ""
+msgstr "fallou o subproceso %s"
#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: a opción «%s» é ambigua\n"
+msgstr "%s: a opción «%s» é ambigua; as posibilidades son:"
#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
#, c-format
@@ -188,15 +189,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 "produciuse un erro ao crear «%s»"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c: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 "produciuse un erro ao escribir o ficheiro «%s»"
@@ -205,21 +206,24 @@ msgstr "produciuse un erro ao escribir o ficheiro «%s»"
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
+"Non se atopou o compilador de Java, probe a instalar gcj ou definir $JAVAC"
#: gnulib-lib/javaexec.c:417
#, c-format
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
+"Non se atopou a máquina virtual de Java, probe a instalar gij ou definir "
+"$JAVA"
#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
#: src/msginit.c:1140
#, c-format
msgid "%s subprocess I/O error"
-msgstr ""
+msgstr "Erro de E/S do subproceso %s"
-#: 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 "memoria esgotada"
@@ -227,18 +231,18 @@ msgstr "memoria esgotada"
#: gnulib-lib/pipe-filter-ii.c:192
#, c-format
msgid "creation of threads failed"
-msgstr ""
+msgstr "produciuse un erro ao crear os fíos"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
-msgstr ""
+msgstr "produciuse un erro ao escribir ao subproceso %s"
#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
#, c-format
msgid "read from %s subprocess failed"
-msgstr ""
+msgstr "produciuse un erro ao ler do subproceso %s"
#: gnulib-lib/pipe-filter-ii.c:298
#, c-format
@@ -287,7 +291,7 @@ msgstr "»"
#: gnulib-lib/set-acl.c:46
#, c-format
msgid "setting permissions for %s"
-msgstr ""
+msgstr "definindo os permisos de %s"
#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
@@ -298,7 +302,7 @@ msgstr "non é posíbel crear a canalización"
#: gnulib-lib/w32spawn.h:43
#, c-format
msgid "_open_osfhandle failed"
-msgstr ""
+msgstr "_open_osfhandle fallou"
#: gnulib-lib/w32spawn.h:84
#, c-format
@@ -309,7 +313,7 @@ msgstr "non foi posíbel restaurar o fd %d: dup2 fallou"
#: gnulib-lib/wait-process.c:317
#, c-format
msgid "%s subprocess"
-msgstr ""
+msgstr "subproceso %s"
#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
#, c-format
@@ -317,8 +321,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 "produciuse un erro ao abrir «%s» para lectura"
@@ -470,14 +474,14 @@ msgid "'%s' does not use %%m but '%s' uses %%m"
msgstr "«%s» non usa %%m pero «%s» usa %%m"
#: src/format-gfc-internal.c:383
-#, fuzzy, c-format
+#, c-format
msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "«%s» usa %%m pero «%s» non o fai"
+msgstr "«%s» usa %%C pero «%s» non o fai"
#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
+#, c-format
msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "«%s» non usa %%m pero «%s» usa %%m"
+msgstr "«%s» non usa %%C pero «%s» usa %%C"
#: src/format-invalid.h:22
msgid "The string ends in the middle of a directive."
@@ -667,7 +671,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'"
@@ -713,28 +717,28 @@ msgstr ""
"as especificacións de formato en «%s» e «%s» para o argumento «%s» non son "
"as mesmas"
-#: 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 ""
@@ -780,11 +784,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"
@@ -793,19 +797,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 "Escrito por %s.\n"
#. 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 "Bruno Haible"
@@ -815,12 +819,12 @@ msgstr "Bruno Haible"
msgid "too many arguments"
msgstr "demasiados argumentos"
-#: src/hostname.c:207 src/msgattrib.c:410 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
-#: src/msgfilter.c:384 src/msgfmt.c:650 src/msggrep.c:507 src/msginit.c:358
-#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:828
-#, fuzzy, c-format
+#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
+#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Use «%s --help» para obter máis información.\n"
@@ -857,29 +861,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 "Saída informativa:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help Mostra esta mensaxe de axuda e sae\n"
-#: src/hostname.c: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 " -V, --version Mostra a información da versión e sae\n"
@@ -888,11 +892,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: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 "Envíe informes de fallo a <bug-gnu-gettext@gnu.org>.\n"
@@ -901,230 +905,233 @@ msgstr "Envíe informes de fallo a <bug-gnu-gettext@gnu.org>.\n"
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 "permítese un ficheiro de entrada como moito"
-#: 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 "%s e %s son mutuamente excluíntes"
-#: 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 "Uso: %s [OPCIÓN] [FICHEIRO_ENTRADA]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
"and manipulates the attributes.\n"
msgstr ""
-#: 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 "Selección de mensaxes:\n"
-#: 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"
@@ -1133,118 +1140,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 "o criterio de selección indicado é imposíbel (%d < n < %d)"
-#: 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
#, fuzzy, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1266,92 +1273,92 @@ 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: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 "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "non se indicou ningún ficheiro de entrada"
-#: 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 "requírense exactamente dous ficheiros de entrada"
-#: 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 ""
@@ -1384,19 +1391,19 @@ msgstr " def.po traducións\n"
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 "Modificadores de operación:\n"
-#: 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 ""
@@ -1421,17 +1428,17 @@ msgstr "esta mensaxe está sen traducir"
msgid "this message needs to be reviewed by the translator"
msgstr "esta mensaxe ten que ser revisada polo tradutor"
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1505
#, c-format
msgid "this message is used but not defined..."
msgstr "esta mensaxe úsase mais non está definida..."
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1508
#, c-format
msgid "...but this definition is similar"
msgstr "...mais esta definición é semellante"
-#: 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 "esta mensaxe úsase mais non está definida en %s"
@@ -1441,19 +1448,19 @@ msgstr "esta mensaxe úsase mais non está definida en %s"
msgid "warning: this message is not used"
msgstr "aviso: esta mensaxe non se usa"
-#: src/msgcmp.c:553 src/msgfmt.c: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] "atopouse %d erro grave"
msgstr[1] "atopáronse %d erros graves"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "téñense que indicar polo menos dous ficheiros"
-#: src/msgcomm.c:363
+#: src/msgcomm.c:364
#, fuzzy, c-format, no-wrap
msgid ""
"Find messages which are common to two or more of the specified PO files.\n"
@@ -1474,74 +1481,74 @@ msgstr ""
"ficheiro, para definilos. Mantéñense as posicións nos ficheiros de todos\n"
"os ficheiros PO.\n"
-#: 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 "non se indicou ningún ficheiro de entrada"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "requírese exactamente un ficheiro de entrada"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Uso: %s [OPCIÓN] FICHEIRO_ENTRADA\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1550,7 +1557,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 ""
@@ -1582,7 +1589,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 ""
@@ -1592,45 +1599,45 @@ msgstr ""
msgid "write to stdout failed"
msgstr "produciuse un erro ao escribir a stdout"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "falta o nome do filtro"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr "tense que indicar polo menos un script de sed"
-#: 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 "
@@ -1638,192 +1645,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 "Ulrich Drepper"
-#: 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 "%s e %s son mutuamente excluíntes en %s"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr ""
-#: 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 "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d mensaxe traducida"
msgstr[1] "%d mensaxes traducidas"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d tradución dubidosa"
msgstr[1] ", %d traducións dubidosas"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d mensaxe sen traducir"
msgstr[1] ", %d mensaxes sen traducir"
-#: src/msgfmt.c: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 "Modo de operación:\n"
-#: 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 "
@@ -1832,48 +1873,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"
@@ -1881,33 +1952,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 "
@@ -1915,18 +1986,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 "
@@ -1935,101 +2006,111 @@ 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 "aviso: a conversión de xogo de caracteres non vai funcionar\n"
-#: 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 "o nome de dominio «%s» non é axeitado para nome de ficheiro"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"o nome de dominio «%s» non é axeitado como nome de ficheiro:\n"
"empregarase un prefixo"
-#: src/msgfmt.c:955
-#, fuzzy, c-format
+#: src/msgfmt.c:1095
+#, c-format
msgid "'domain %s' directive ignored"
msgstr "ignorouse a directiva «domain %s»"
-#: src/msgfmt.c:1015
-#, fuzzy, c-format
+#: src/msgfmt.c:1155
+#, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "ignorouse a entrada «msgstr» baleira"
-#: src/msgfmt.c:1016
-#, fuzzy, c-format
+#: src/msgfmt.c:1156
+#, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "ignorouse a entrada «msgstr» dubidosa"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: aviso: o ficheiro fonte contén traducións dubidosas"
+#: 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 "produciuse un erro ao ler «%s»"
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
"specified"
msgstr ""
-#: 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"
@@ -2069,18 +2150,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 ""
@@ -2219,7 +2300,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 "aviso: "
@@ -2362,34 +2443,30 @@ msgid ""
msgstr ""
#: src/msgl-check.c:611
-#, fuzzy
msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
msgstr ""
"as entradas «msgid» e «msgid_plural» non comezan ámbalas dúas con «\\n»"
#: src/msgl-check.c:619
-#, fuzzy, c-format
+#, c-format
msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
msgstr "as entradas «msgid» e «msgstr[%u]» non comezan ámbalas dúas con «\\n»"
#: src/msgl-check.c:634
-#, fuzzy
msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
msgstr "as entradas «msgid» e «msgstr» non comezan ámbalas dúas con «\\n»"
#: src/msgl-check.c:652
-#, fuzzy
msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
msgstr ""
"as entradas «msgid» e «msgid_plural» non rematan ámbalas dúas con «\\n»"
#: src/msgl-check.c:660
-#, fuzzy, c-format
+#, c-format
msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
msgstr "as entradas «msgid» e «msgstr[%u]» non rematan ámbalas dúas con «\\n»"
#: src/msgl-check.c:675
-#, fuzzy
msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
msgstr "as entradas «msgid» e «msgstr» non rematan ámbalas dúas con «\\n»"
@@ -2402,18 +2479,18 @@ 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
-#, fuzzy, c-format
+#: src/msgl-check.c:804
+#, 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
+#: src/msgl-check.c:820
+#, c-format
msgid "header field '%s' missing in header\n"
msgstr "falta o campo «%s» na cabeceira\n"
@@ -2434,7 +2511,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 "
@@ -2451,7 +2528,7 @@ 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 "
@@ -2460,17 +2537,16 @@ msgstr ""
"Non é posíbel converter desde «%s» a «%s». %s depende de iconv(). Esta "
"versión compilouse sen iconv()."
-#: 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 "%s só é válido con %s"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr ""
-# src/msgmerge.c:324
-#: 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"
@@ -2494,51 +2570,51 @@ msgstr ""
"non se atope ningunha coincidencia exacta, empregarase coincidencia difusa\n"
"para producir mellores resultados.\n"
-#: 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 "
@@ -2550,7 +2626,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 "
@@ -2558,28 +2634,28 @@ 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 "esta mensaxe debe definir formas plurais"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
msgstr "esta mensaxe non debe definir formas plurais"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2588,7 +2664,7 @@ msgstr ""
"%sLeronse %ld antigas + %ld referencias, mesturadas %ld, dubidosas %ld, "
"faltan %ld, obsoletas %ld.\n"
-#: 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"
@@ -2686,7 +2762,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"
@@ -2699,12 +2775,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 "
@@ -2773,27 +2849,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "uso inconsistente de #~"
-#: src/po-gram-gen.y:240
-#, fuzzy, c-format
+#: src/po-gram-gen.y:243
+#, c-format
msgid "missing 'msgstr[]' section"
msgstr "falta a sección «msgstr[]»"
-#: src/po-gram-gen.y:249
-#, fuzzy, c-format
+#: src/po-gram-gen.y:252
+#, c-format
msgid "missing 'msgid_plural' section"
msgstr "falta a sección «msgid_plural»"
-#: src/po-gram-gen.y:257
-#, fuzzy, c-format
+#: src/po-gram-gen.y:260
+#, c-format
msgid "missing 'msgstr' section"
msgstr "falta a sección «msgstr»"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "a primeira forma do plural ten un índice distinto a cero"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "a forma do plural ten un índice erróneo"
@@ -2803,7 +2879,7 @@ msgstr "a forma do plural ten un índice erróneo"
msgid "too many errors, aborting"
msgstr "demasiados erros, interrompendo"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c: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 "secuencia multibyte non válida"
@@ -2847,16 +2923,16 @@ msgstr "fin de liña nunha cadea"
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 "este ficheiro non pode conter directivas de dominio"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "definición de mensaxe duplicada"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "este é o lugar da primeira definición"
@@ -3042,17 +3118,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 ""
+msgstr "non é un nome de clase Java válido: %s"
-#: 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 ""
@@ -3062,14 +3138,14 @@ msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "produciuse un erro ao abrir «%s» para escribir"
-#: src/write-po.c:803
-#, fuzzy, c-format
+#: src/write-po.c:875
+#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr ""
"as mensaxes internacionalizadas non deben conter a secuencia de escape «\\%c»"
-#: 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"
@@ -3078,7 +3154,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"
@@ -3111,7 +3187,7 @@ msgstr ""
#: src/write-resources.c:94
#, c-format
msgid "error while writing to %s subprocess"
-msgstr ""
+msgstr "produciuse un erro ao escribir ao subproceso %s"
#: src/write-resources.c:131
msgid ""
@@ -3137,7 +3213,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 "%s:%d: aviso: cadea non rematada"
@@ -3147,17 +3223,22 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, c-format
+msgid "warning: invalid Unicode character"
+msgstr "aviso: carácter Unicode incorrecto"
+
+#: 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 "%s:%d: aviso: constante de tipo carácter non rematada"
-#: 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 "%s:%d: aviso: literal de cadea non rematada"
-#: 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 ""
@@ -3192,7 +3273,7 @@ msgstr ""
#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
#, c-format
msgid "%s:%d: iconv failure"
-msgstr ""
+msgstr "%s:%d: fallo de iconv"
#: src/x-csharp.c:338
#, c-format
@@ -3201,7 +3282,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 "%s:%d: aviso: carácter Unicode incorrecto"
@@ -3221,22 +3302,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"
@@ -3289,10 +3370,20 @@ msgid ""
"Please specify the source encoding through --from-code\n"
msgstr ""
-#: src/x-javascript.c:1147
-#, fuzzy, c-format
+#: src/x-javascript.c:954
+#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: aviso: literal de cadea non rematada"
+msgstr ""
+
+#: src/x-javascript.c:1055
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr ""
+
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: aviso: cadea non rematada"
#: src/x-perl.c:308
#, c-format
@@ -3402,56 +3493,61 @@ msgid ""
"use eval_gettext instead"
msgstr ""
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, 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
+#: 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 "non é posíbel usar --join-existing cando a saída se escribe en stdout"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext non funciona sen palabras clave polas que buscar"
-#: src/xgettext.c:785
-#, fuzzy, c-format
+#: src/xgettext.c:808
+#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr ""
"aviso: o ficheiro «%s» coa extensión «%s» é descoñecido; tentarase con C"
-#: 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"
@@ -3461,44 +3557,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"
@@ -3508,17 +3604,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"
@@ -3528,14 +3624,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 "
@@ -3543,7 +3642,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"
@@ -3553,75 +3652,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 ""
+msgstr " (só linguaxe C++)\n"
-#: 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 "
@@ -3629,7 +3728,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 "
@@ -3637,52 +3736,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 "entrada estándar"
-#: 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 "%s%s: aviso: "
-#: 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"
@@ -3691,34 +3790,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"
@@ -3726,8 +3825,8 @@ msgid ""
"specify an --msgid-bugs-address command line option.\n"
msgstr ""
-#: src/xgettext.c:3267
-#, fuzzy, c-format
+#: src/xgettext.c:3638
+#, c-format
msgid "language '%s' unknown"
msgstr "linguaxe «%s» descoñecida"
@@ -3735,8 +3834,7 @@ msgstr "linguaxe «%s» descoñecida"
msgid "<unnamed>"
msgstr ""
-#, fuzzy
-#~ msgid "header field '%s' should start at beginning of line\n"
+#~ 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"
diff --git a/gettext-tools/po/id.po b/gettext-tools/po/id.po
index dfa8a3e..9188905 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: 2013-07-07 18:21+0900\n"
+"POT-Creation-Date: 2014-06-01 11:19+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"
@@ -184,15 +184,15 @@ msgstr "argumen source_version tidak valid untuk compile_java_class"
msgid "invalid target_version argument to compile_java_class"
msgstr "argumen target_version tidak valid untuk compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c: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 "gagal untuk membuat \"%s\""
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: 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 "error ketika menulis berkas \"%s\""
@@ -213,9 +213,9 @@ msgstr "Mesin maya java tidak ditemukan, coba pasang gij atau set $JAVA"
msgid "%s subprocess I/O error"
msgstr "%s subproses I/O error"
-#: gnulib-lib/obstack.c: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 "kehabisan memori"
@@ -226,7 +226,7 @@ msgid "creation of threads failed"
msgstr "kompilasi dari kelas C# gagal"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "tulis ke %s subproses gagal"
@@ -313,8 +313,8 @@ 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: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 "error ketika membuka \"%s\" untuk dibaca"
@@ -703,7 +703,7 @@ msgstr ""
"penspesifkasi konversi '%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-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'"
@@ -754,29 +754,29 @@ 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
+#: src/format-python-brace.c:137
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
msgstr "Dalam direktif nomor %u, '%c' tidak diikuti oleh sebuah digit."
-#: src/format-python-brace.c:149
+#: src/format-python-brace.c:150
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
msgstr ""
"Dalam direktif nomor %u, '{' tidak diikuti dengan sebuah nomor argumen."
-#: src/format-python-brace.c:164
+#: src/format-python-brace.c:165
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
msgstr "Dalam direktif nomor %u, '%c' tidak diikuti oleh sebuah digit."
-#: src/format-python-brace.c:184
+#: src/format-python-brace.c:185
#, fuzzy, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
msgstr "Dalam direktif nomor %u, sebuah presisi tidak diijinkan sebelum '%c'. "
-#: src/format-python-brace.c:210
+#: src/format-python-brace.c:270
#, fuzzy, c-format
msgid "In the directive number %u, there is an unterminated format directive."
msgstr "Dalam direktif nomor %u, argumen %d negatif."
@@ -833,11 +833,11 @@ msgstr ""
"Karakter yang mengakhiri nomor direktif %u bukan sebuah angka diantara 1 dan "
"9."
-#: src/hostname.c:178 src/msgattrib.c:344 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
-#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
-#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:599
+#: 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"
@@ -850,19 +850,19 @@ msgstr ""
"Ini adalah piranti lunak bebas: anda bebas untuk mengubah dan meredistribusikannya.\n"
"TIDAK ADA GARANSI, sampai batas yang diijinkan oleh hukum yang berlaku.\n"
-#: src/hostname.c:184 src/msgattrib.c: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 "Ditulis oleh %s.\n"
#. 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 "Bruno Haible"
@@ -872,11 +872,11 @@ msgstr "Bruno Haible"
msgid "too many arguments"
msgstr "terlalu banyak argumen"
-#: 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
#, fuzzy, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Coba `%s --help' untuk informasi lebih jauh.\n"
@@ -917,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: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 "Keluaran informatif:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help tampilkan bantuan ini dan keluar\n"
-#: 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 " -V, --version keluarkan informasi versi dan keluar\n"
@@ -948,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: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 "Laporkan bugs ke <bug-gnu-gettext@gnu.org>.\n"
@@ -961,30 +961,27 @@ 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: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 "di paling tidak satu berkas masukan diijinkan"
-#: 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 "%s dan %s adalah mutually exclusive"
-#: 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 "Penggunaan: %s [PILIHAN] [BERKAS MASUKAN]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -993,33 +990,33 @@ msgstr ""
"Saring pesan dari sebuah katalog terjemahan menurut atributnya,\n"
"dan manipulasi atribut.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c: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 ""
"Argumen wajib untuk pilihan panjang juga wajib untuk pilihan pendek juga.\n"
-#: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
-#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
-#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
-#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
+#: src/msgattrib.c:433 src/msgcat.c: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 "Lokasi berkas masukan:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " BERKAS MASUKAN berkas masukan PO\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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"
@@ -1027,34 +1024,34 @@ msgstr ""
" -D, --directory=DIREKTORI tambahkan DIREKTORI ke daftar pencarian "
"masukan berkas\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c: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 ""
"Jika tidak ada berkas masukan yang diberikan atau jika ini adalah -, standar "
"masukan yang dibaca.\n"
-#: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
-#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
-#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
-#: src/xgettext.c:857
+#: src/msgattrib.c:442 src/msgcat.c: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 "Lokasi berkas keluaran:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 ""
" -o, --output-file=BERKAS tulis keluaran ke berkas yang "
"dispesifikasikan\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1063,12 +1060,12 @@ msgstr ""
"Hasil ditulis ke standar keluaran jika tidak ada berkas keluaran yang\n"
"dispesifikasikan atau jika ini adalah -.\n"
-#: 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 "Pemilihan pesan:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
@@ -1076,7 +1073,7 @@ msgstr ""
" --translated simpan terjemahan, hapus pesan tidak "
"diterjemahkan\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
@@ -1084,52 +1081,52 @@ msgstr ""
" --untranslated simpan tidak terjemahkan, hapus pesan "
"terjemahan\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr " --no-fuzzy hapus pesan ditandai 'fuzzy'\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr " --only-fuzzy simpan pesan ditandai 'fuzzy'\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete hapus pesan sudah ditinggalkan #~\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete simpan pesan sudah ditinggalkan #~\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Manipulasi atribut:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr " --set-fuzzy set seluruh pesan 'fuzzy'\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr " --clear-fuzzy set seluruh pesan non-'fuzzy'\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr " --set-obsolete set seluruh pesan sudah ditinggalkan\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr " --clear-obsolete set seluruh pesan tidak ditinggalkan\n"
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, fuzzy, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
@@ -1138,7 +1135,7 @@ msgstr ""
" --previous simpan msgids sebelumnya dari pesan yang "
"diterjemahkan\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
@@ -1146,7 +1143,13 @@ msgid ""
msgstr ""
" --clear-previous hapus \"previous msgid\" dari seluruh pesan\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, fuzzy, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr " --no-fuzzy hapus pesan ditandai 'fuzzy'\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
@@ -1154,7 +1157,7 @@ msgstr ""
" --only-file=BERKAS.po hanya manipulasi masukan terdaftar dalam "
"BERKAS.po\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
@@ -1162,13 +1165,13 @@ msgstr ""
" --ignore-file=BERKAS.po hanya manipulasi masukan tidak terdaftar dalam "
"BERKAS.po\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr ""
" --fuzzy sinonim untuk --only-fuzzy --clear-fuzzy\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
@@ -1176,16 +1179,16 @@ msgstr ""
" --obsolete sinonim untuk --only-obsolete --clear-"
"obsolete\n"
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c: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 "Sintaks berkas masukan:\n"
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c: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"
@@ -1193,8 +1196,8 @@ msgstr ""
" -P, --properties-input berkas masukan berada dalam .properties "
"sintaks Java\n"
-#: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
-#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c: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 "
@@ -1203,17 +1206,17 @@ msgstr ""
" --stringtable-input berkas masukan berada dalam sintaks .strings "
"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
-#: 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 "Detil keluaran:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1227,27 +1230,27 @@ msgstr ""
" KETIKA dapat berupa 'always', 'never', 'auto', "
"atau 'html'.\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr ""
" --style=BERKAS GAYA spesifikasikan aturan gaya CSS berkas untuk --"
"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
+#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:977
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
msgstr ""
" -e, --no-escape jangan gunakan C escape dalam keluaran (baku)\n"
-#: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
-#: src/msguniq.c:390 src/xgettext.c:956
+#: src/msgattrib.c:508 src/msgcat.c: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"
@@ -1255,69 +1258,69 @@ msgstr ""
" -E, --escape gunakan C escape dalam keluaran, bukan "
"karakter ekstensi\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr " --force-po tulis berkas PO walaupun itu kosong\n"
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
" -i, --indent tulis berkas .po menggunakan gaya teridentasi\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
" --no-location jangan tulis '#: nama berkas:baris' baris\n"
-#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:964
+#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
+#: src/xgettext.c:987
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr ""
" -n, --add-location hasilkan '#: nama berkas:baris' baris (baku)\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
+#: src/xgettext.c:989
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
" --strict tulis strict Uniforum konform berkas .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
-#: 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 " -p, --properties-output tulis sebuah berkas .properties 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
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
" --stringtable-output tulis sebuah .string berkas 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
+#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
+#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=ANGKA set keluaran lebar halaman\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c: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"
@@ -1328,33 +1331,33 @@ msgstr ""
" dari lebar halaman keluaran, dalam beberapa "
"beris\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output hasilkan keluaran terurut\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 ""
" -F, --sort-by-file urutkan keluaran berdasarkan lokasi berkas\n"
-#: 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 ""
"kriteria pemilihan yang dispesifikasikan tidak memungkinkan (%d < n < %d)"
-#: 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 "Penggunaan: %s [PILIHAN] [BERKAS MASUKAN]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, fuzzy, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1376,25 +1379,25 @@ msgstr ""
"komentar ekstraksi akan dijaga, tetapi hanya dari berkas PO pertama yang\n"
"mendefinisikan mereka. Posisi berkas dari seluruh berkas PO akan dijaga.\n"
-#: src/msgcat.c:388 src/msgcomm.c: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 " BERKAS MASUKAN ... berkas masukan\n"
-#: 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 ""
" -f, --files-from=BERKAS dapatkan daftar dari berkas masukan dari "
"BERKAS\n"
-#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c: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 "Jika berkas masukan adalah -, standar masukan dibaca.\n"
-#: 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"
@@ -1404,7 +1407,7 @@ msgstr ""
" definisi ini, baku ke tidak terhingga jika "
"tidak diset\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1413,7 +1416,7 @@ msgstr ""
" ->, --more-than=ANGKA tampilkan pesan dengan lebih besar dari \n"
" definisi ini, baku ke 0 jika tidak diset\n"
-#: src/msgcat.c:413 src/msgcomm.c:404
+#: src/msgcat.c:414 src/msgcomm.c:405
#, c-format
msgid ""
" -u, --unique shorthand for --less-than=2, requests\n"
@@ -1422,8 +1425,8 @@ msgstr ""
" -u, --unique kependekan untuk --less-than=2, diminta\n"
" hanya pesan unik untuk ditampilkan\n"
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c: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"
@@ -1431,8 +1434,8 @@ msgstr ""
" -P, --properties-input berkas masukan berada dalam sintaks ."
"properties Java\n"
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c: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"
@@ -1441,12 +1444,12 @@ msgstr ""
" --stringtable-input berkas masukan berada dalam sintaks .strings "
"NeXTstep/GNUstep\n"
-#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
+#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
#, c-format
msgid " -t, --to-code=NAME encoding for output\n"
msgstr " -t, --to-code=NAMA pengkodean untuk keluaran\n"
-#: src/msgcat.c:429 src/msguniq.c:379
+#: src/msgcat.c:430 src/msguniq.c:380
#, c-format
msgid ""
" --use-first use first available translation for each\n"
@@ -1457,7 +1460,7 @@ msgstr ""
" setiap pesan, jangan gabungkan beberapa "
"terjemahan.\n"
-#: 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"
@@ -1465,21 +1468,21 @@ msgstr ""
" --lang=NAMAKATALOG isi baris 'Language' dalam masukan header\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
msgstr "Peter MIller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "tidak ada berkas masukan yang diberikan"
-#: src/msgcmp.c:194 src/msgmerge.c:366
+#: src/msgcmp.c:194 src/msgmerge.c:375
#, c-format
msgid "exactly 2 input files required"
msgstr "dibutuhkan tepat 2 berkas input"
-#: src/msgcmp.c:213 src/msgmerge.c:480
+#: src/msgcmp.c:213 src/msgmerge.c:485
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Penggunaan: %s [PILIHAN] def.po ref.pot\n"
@@ -1511,12 +1514,12 @@ msgstr " def.po terjemahan\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot referensi ke sumber\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "Operasi pemodifikasi:\n"
-#: 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."
@@ -1525,7 +1528,7 @@ msgstr ""
" -m, --multi-domain aplikasikan ref.pot ke setiap dari domain "
"dalam def.po\n"
-#: src/msgcmp.c:243 src/msgmerge.c:550
+#: src/msgcmp.c:243 src/msgmerge.c:555
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching jangan gunakan fuzzy matching\n"
@@ -1551,17 +1554,17 @@ msgstr "pesan ini tidak diterjemahkan"
msgid "this message needs to be reviewed by the translator"
msgstr "pesan ini butuh untuk diulas oleh penerjemah"
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1505
#, c-format
msgid "this message is used but not defined..."
msgstr "pesan ini digunakan tapi tidak didefinisikan..."
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1508
#, c-format
msgid "...but this definition is similar"
msgstr "...tetapi definisi ini serupa"
-#: src/msgcmp.c:377 src/msgmerge.c:1531
+#: src/msgcmp.c:377 src/msgmerge.c:1536
#, c-format
msgid "this message is used but not defined in %s"
msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s"
@@ -1571,19 +1574,19 @@ msgstr "pesan ini digunakan tapi tidak didefinisikan dalam %s"
msgid "warning: this message is not used"
msgstr "peringatan: pesan ini tidak digunakan"
-#: src/msgcmp.c:553 src/msgfmt.c: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] "ditemukan %d kesalahan fatal"
msgstr[1] "ditemukan %d kesalahan fatal"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "paling tidak dua berkas harus dispesifikasikan"
-#: src/msgcomm.c:363
+#: src/msgcomm.c:364
#, fuzzy, c-format, no-wrap
msgid ""
"Find messages which are common to two or more of the specified PO files.\n"
@@ -1603,7 +1606,7 @@ msgstr ""
"komentar ekstraksi akan dijaga, tetapi hanya dari berkas PO pertama yang\n"
"mendefinisikan mereka. Posisi berkas dari seluruh berkas PO akan diakumulasikan.\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1612,7 +1615,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:981
+#: src/msgcomm.c:452 src/xgettext.c:1004
#, fuzzy, c-format
msgid ""
" --omit-header don't write header with 'msgid \"\"' entry\n"
@@ -1620,63 +1623,63 @@ msgstr ""
" --omit-header jangan tulis header dengan masukan `msgid "
"\"\"'\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr ""
"Konversikan sebuah katalog terjemahan ke pengkodean karakter yang berbeda.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Target konversi:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Pengkodean baku adalah pengkodean lokal sekarang.\n"
-#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent gaya keluaran terindentasi\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location tekan '#: nama berkas:baris' baris\n"
-#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
-#: src/msgmerge.c:583
-#, c-format
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
+#: src/msgmerge.c:588
+#, fuzzy, c-format
msgid ""
-" --add-location preserve '#: filename:line' lines (default)\n"
+" -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
" --add-location simpan '#: nama berkas: baris' baris (baku)\n"
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict gaya keluaran Uniforum strict\n"
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
+#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
#, c-format
msgid "no input file given"
msgstr "tidak ada berkas masukan yang diberikan"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "tepatnya sebuah berkas masukan dibutuhkan"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Penggunaan: %s [PILIHAN] BERKAS MASUKAN\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1689,7 +1692,7 @@ msgstr ""
"(secara umum dibuat oleh xgettext). Masukan yang tidak diterjemahkan diberikan\n"
"sebuah terjemahan yang identik dengan msgid.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " BERKAS MASUKAN berkas masukan PO atau POT\n"
@@ -1728,7 +1731,7 @@ msgstr ""
"Sebuah perintah bawaan dipanggil '0' mengeluarkan terjemahan, diikuti oleh sebuah\n"
"null byte. Keluaran dari \"msgexec 0\" cocok sebagai sebuah masukan untuk \"xargs -0\".\n"
-#: src/msgexec.c:281 src/msgfilter.c:401
+#: src/msgexec.c:281 src/msgfilter.c:420
#, c-format
msgid " -i, --input=INPUTFILE input PO file\n"
msgstr " -i, --input=BERKAS MASUKAN masukan berkas PO\n"
@@ -1738,29 +1741,29 @@ msgstr " -i, --input=BERKAS MASUKAN masukan berkas PO\n"
msgid "write to stdout failed"
msgstr "penulisan ke stdout gagal"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "hilang nama penyaring"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr "paling tidak sebuah script sed harus dispesifikasikan"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Penggunaan: %s [PILIHAN] PENYARING [PILIHAN-PENYARING]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr ""
"Mengaplikasikan sebuah penyaring ke seluruh terjemahan dari sebuah katalog "
"terjemahan.\n"
-#: src/msgfilter.c:416
+#: src/msgfilter.c:435
#, c-format
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
@@ -1770,19 +1773,19 @@ msgstr ""
"standar masukan\n"
"dan menulis sebuah terjemahan termodifikasi ke standar keluaran.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "Sangat berguna FILTER-OPTIONs ketika PENYARING adalah 'sed':\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
msgstr ""
" -e, --expression=SCRIPT tambahkan SCRIPT ke perintah yang dijalankan\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1792,14 +1795,14 @@ msgstr ""
" -f, --file=SCRIPTFILE tambahkan isi dari SCRIPTFILE ke perintah\n"
" untuk dijalankan\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
" -n, --quiet, --silent tekan pencetakan otomatis dari ruang pola\n"
-#: src/msgfilter.c: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"
@@ -1807,12 +1810,12 @@ msgstr ""
" --no-escape jangan gunakan C escapes dalam keluaran "
"(baku)\n"
-#: 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 " --indent gaya keluaran terindentasi\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
@@ -1820,81 +1823,104 @@ msgstr ""
" --keep-header simpan masukan header tidak termodifikasi, "
"janya saring itu\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "argumen ke %s seharusnya berupa sebuah karakter punctuation tunggal"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
msgstr "endianness tidak valid: %s"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
+#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
msgid "Ulrich Drepper"
msgstr "Ulrich Drepper"
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:439
+#, fuzzy, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr ""
+"Jika tidak ada berkas masukan yang diberikan atau jika ini adalah -, standar "
+"masukan yang dibaca.\n"
+
+#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
#: src/msgunfmt.c:353
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s membutuhkan sebuah spesifikasi \"-d direktori\""
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
+#: src/msgfmt.c: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 "%s membutuhkan sebuah spesifikasi \"-l lokal\""
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:538
+#, fuzzy, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s membutuhkan sebuah spesifikasi \"-l lokal\""
+
+#: src/msgfmt.c:545
+#, fuzzy, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s membutuhkan sebuah spesifikasi \"-l lokal\""
+
+#: src/msgfmt.c:551
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s dan %s adalah mutually exclusive"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s hanya valid dengan %s atau %s"
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:571 src/msgfmt.c:577
#, c-format
msgid "%s is only valid with %s, %s or %s"
msgstr "%s hanya valid dengan %s, %s atau %s"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d pesan diterjemahkan"
msgstr[1] "%d pesan diterjemahkan"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d terjemahan fuzzy"
msgstr[1] ", %d terjemahan fuzzy"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d pesan belum diterjemahkan"
msgstr[1] ", %d pesan belum diterjemahkan"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Penggunaan: %s [PILIHAN] nama-berkas.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "Hasilkan katalog pesan binari dari deskripsi tekstual terjemahan.\n"
-#: src/msgfmt.c: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"
@@ -1903,17 +1929,17 @@ msgstr ""
"Argumen wajib ke pilihan panjang juga wajib untuk pilihan pendek juga.\n"
"Sama untuk opsional argumen.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
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:890
+#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Mode operasi:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1922,7 +1948,7 @@ msgstr ""
" -j, --java Mode: java menghasilkan sebuah class Java "
"ResourceBundle\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1931,13 +1957,13 @@ msgstr ""
" --java2 seperti --java, dan asumsikan Java2 (JDK 1.2 "
"atau lebih tinggi)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr ""
" --csharp C# mode: hasilkan sebuah berkas .dll .NET\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -1946,39 +1972,45 @@ msgstr ""
" --csharp-resources mode resources C#: hasilkan sbeuah berkas ."
"resources .NET\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr " --tcl mode Tcl: hasilkan sebuah .tcl/msgcat\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt mode Qt: hasilkan sebuah berkas Qt .qm\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, fuzzy, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr " --qt mode Qt: hasilkan sebuah berkas Qt .qm\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict aktifkan mode strict Uniforum\n"
-#: 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 "Jika keluaran berkas adalah -, keluaran ditulis ke standar keluaran.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Lokasi berkas keluaran dalam mode Java:\n"
-#: 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 " -r, --resource=RESOURCE nama resource\n"
-#: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
-#: src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c: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 "
@@ -1986,14 +2018,23 @@ msgid ""
msgstr ""
" -l, --locale=LOKAL nama lokal, baik bahasa atau bahasa_NEGARA\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, fuzzy, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --tcl mode Tcl: masukan adalah sebuah berkas .msg "
+"tcl/msgcat\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
" -d DIREKTORI basis direktori dari struktur direktori kelas\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2006,12 +2047,12 @@ msgstr ""
"dibawah\n"
"direktoris yang dispesifikasikan.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "Lokasi keluaran berkas dalam mode C#:\n"
-#: 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 "
@@ -2020,7 +2061,7 @@ msgstr ""
" -d DIREKTORI basis direktori untuk lokal dependen berkas ."
"dll\n"
-#: 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"
@@ -2029,18 +2070,18 @@ msgstr ""
"Pilihan -l dan -d wajib. Berkas .dll ditulis dalam sebuah subdirektori\n"
"dari direktori yang dispesifikasikan yang namanya tergantung dari lokal.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Lokasi keluaran berkas dalam mode Tcl:\n"
-#: 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 ""
" -d DIREKTORI basis direktori dari katalog pesan .msg\n"
-#: 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"
@@ -2049,12 +2090,45 @@ msgstr ""
"Pilihan -l dan -d wajib. Berkas .msg ditulis dalam direktori yang "
"dispesifikasikan.\n"
-#: 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
+#, fuzzy, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr ""
+" -d DIREKTORI basis direktori dari katalog pesan .msg\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -kKATA, --keyword=KATA cari untuk KATA sebagai kata kunci tambahan\n"
+" -k, --keyword jangan gunakan untuk kata kunci baku\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "Interpretasi masukan berkas:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -2066,13 +2140,13 @@ msgstr ""
" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format periksa format string tergantung bahasa\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -2081,7 +2155,7 @@ msgstr ""
" --check-header verifikasi keberadaan dan isi dari masukan "
"header\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -2091,7 +2165,7 @@ msgstr ""
"domain\n"
" dan pilihan --output-file\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2100,7 +2174,7 @@ msgstr ""
" -C, --check-compatibility periksa GNU msgfmt berlaku seperti X/Open "
"msgfmt\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -2110,19 +2184,19 @@ msgstr ""
" --check-accelerators[=CHAR] periksa keberadaan dari akselerator\n"
" keyboard untuk item menu\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr " -f, --use-fuzzy gunakan masukan fuzzy dalam keluaran\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
" -a, --alignment=JUMLAH align string ke JUMLAH bytes (baku: %d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2131,7 +2205,7 @@ 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"
@@ -2139,83 +2213,93 @@ msgstr ""
" --no-hash berkas binari tidak akan dimasukan dalam tabel "
"hash\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
" --statistics tampilkan statistik mengenai terjemahan\n"
-#: 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 " -v, --verbose naikan tingkat keramaian\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "peringatan: header berkas PO hilang atau tidak valid\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "peringatan: konversi set karakter tidak akan bekerja\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "peringatan: header berkas PO fuzzy\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
"peringatan: versi lebih lama dari msgfmt akan memberikan sebuah error "
"disini\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "nama domain \"%s\" tidak sesuai dengan nama berkas"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"nama domain \"%s\" tidak sesuai dengan nama berkas: akan menggunakan prefix"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "'domain %s' directive ignored"
msgstr "direktif `domain %s' diabaikan"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, fuzzy, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "masukan `msgstr' kosong diabaikan"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, fuzzy, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "masukan fuzzy `msgstr' diabaikan"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: peringatan: berkas sumber mengandung terjemahan fuzzy"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c: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 "kesalahan ketika membaca \"%s\""
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2224,7 +2308,7 @@ msgstr ""
"pilihan '%c' tidak dapat digunakan sebelum 'J' atau 'K' atau 'T' atau 'C' "
"atau 'X' telah dispesifikasikan"
-#: src/msggrep.c:516
+#: src/msggrep.c:521
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2233,7 +2317,7 @@ msgstr ""
"Ekstrak seluruh pesan dari sebuah katalog terjemahan yang cocok dengan pola\n"
"yang diberikan atau milik dari beberapa berkas sumber yang diberikan.\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2308,7 +2392,7 @@ msgstr ""
" -v, --invert-match keluarkan hanya pesan yang tidak cocok dengan\n"
" kriteria pemilihan apapun\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2316,12 +2400,12 @@ msgstr ""
" --escape gunakan C escapes dalam keluaran, tidak ada "
"karakter ekstensi\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output hasilkan keluaran terurut\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
@@ -2492,7 +2576,7 @@ msgstr "target set karakter \"%s\" bukan sebuah nama pengkodean yang portabel."
#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:3051
+#: src/xgettext.c:544 src/xgettext.c:3418
#, c-format
msgid "warning: "
msgstr "peringatan: "
@@ -2707,17 +2791,17 @@ msgstr "penanganan plural adalah sebuah ekstensi GNU gettext"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr kuran tanda akselerasi keyboard '%c'"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr memiliki terlalu banyak tanda akselerasi keyboard '%c'"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, fuzzy, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "beberapa field header `%s' masih memiliki nilai baku awal\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, fuzzy, c-format
msgid "header field '%s' missing in header\n"
msgstr "header field `%s' hilang dalam header\n"
@@ -2739,7 +2823,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: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 "
@@ -2758,7 +2842,7 @@ msgstr ""
"berbeda menjadi sama."
#: 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 "
@@ -2767,16 +2851,16 @@ msgstr ""
"Tidak dapat mengubah dari \"%s\" ke \"%s\". %s mengandalkan iconv(). Versi "
"ini dibuat tanpa iconv()."
-#: src/msgmerge.c:383 src/msgmerge.c:389
+#: src/msgmerge.c:392 src/msgmerge.c:398
#, c-format
msgid "%s is only valid with %s"
msgstr "%s hanya valid dengan %s"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr "tipe backup"
-#: 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"
@@ -2798,18 +2882,18 @@ msgstr ""
"digunakan fuzzy matching untuk memberi hasil yang lebih baik. Hasilnya ditulis\n"
"ke stdout kecuali diberikan sebuah output berkas.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
" def.po terjemahan mereferensikan ke sumber lama\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot referensi ke sumber baru\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2818,7 +2902,7 @@ msgstr ""
" -C, --compendium=BERKAS perpustakaan tambahan dari pesan terjemahan,\n"
" mungkin dispesifikasikan lebih dari sekali.\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2827,27 +2911,27 @@ msgstr ""
" -U, --update perbarui def.po,\n"
" jangan lakukan apapun jika def.po telah baru\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Lokasi berkas keluaran dalam mode perbarui:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Hasil ditulis kembali ke def.po.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=KONTROL buat sebuah backup dari def.po\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=AKHIRAN override akhiran backup biasa\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2867,7 +2951,7 @@ msgstr ""
"ada\n"
" simple, never selalu membuat backup sederhana\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, fuzzy, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2877,7 +2961,7 @@ msgstr ""
"Akhiran backup adalah `~', kecuali diset dengan --suffix atau "
"SIMPLE_BACKUP_SUFFIX\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
@@ -2885,22 +2969,22 @@ msgstr ""
" --previous simpan msgids sebelumnya dari pesan yang "
"diterjemahkan\n"
-#: 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 " -q, --quiet, --silent tekan indikator perkembangan\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
msgstr "pesan ini seharusnya mendefinisikan bentuk plural"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
msgstr "pesan ini seharusnya tidak mendefinisikan bentuk plural"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2909,7 +2993,7 @@ msgstr ""
"%sMembaca %ld lama + %ld referensi, digabung %ld, fuzzy %ld, hilang %ld, "
"sudah ditinggalkan %ld.\n"
-#: 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"
@@ -3023,7 +3107,7 @@ msgstr " -i, --indent tulis keluaran gaya berindentasi\n"
msgid " --strict write strict uniforum style\n"
msgstr " --strict tulis gaya strict uniforum\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -3044,12 +3128,12 @@ msgstr ""
", mereka akan diambil dari terjemahan pertama. Posisi berkas akan dijaga.\n"
"Ketika menggunakan pilihan --unique, duplikasi diabaikan.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated tampilkan hanya duplikasi\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -3118,27 +3202,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "penggunaan tidak konsisten dari #~"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, fuzzy, c-format
msgid "missing 'msgstr[]' section"
msgstr "bagian `msgstr[]' hilang"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, fuzzy, c-format
msgid "missing 'msgid_plural' section"
msgstr "bagian `msgid_plural' hilang"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, fuzzy, c-format
msgid "missing 'msgstr' section"
msgstr "bagian `msgstr' hilang"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "bentuk plural pertama memiliki indeks bukan nol"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "bentuk plural memiliki indeks salah"
@@ -3148,7 +3232,7 @@ msgstr "bentuk plural memiliki indeks salah"
msgid "too many errors, aborting"
msgstr "terlalu banyak kesalahan, membatalkan"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c: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 "urutan multibyte tidak valid"
@@ -3192,16 +3276,16 @@ 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:1023
+#: src/read-catalog.c:318 src/xgettext.c:1046
#, c-format
msgid "this file may not contain domain directives"
msgstr "berkas ini tidak boleh mengandung direktif domain"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "duplikasi definisi pesan"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "ini adalah lokasi dari definisi pertama"
@@ -3402,17 +3486,17 @@ msgstr "kompilasi dari kelas C# gagal, mohon coba --verbose"
msgid "compilation of C# class failed"
msgstr "kompilasi dari kelas C# gagal"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "bukan sebuah nama kelas Java yang valid: %s"
-#: src/write-java.c:1165
+#: src/write-java.c:1210
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr "kompilasi dari kelas Java gagal, mohon coba --verbose atau set $JAVAC"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr "kompilasi dari kelas Java gagal, mohon coba set $JAVAC"
@@ -3422,13 +3506,13 @@ msgstr "kompilasi dari kelas Java gagal, mohon coba set $JAVAC"
msgid "error while opening \"%s\" for writing"
msgstr "error ketika membuka \"%s\" untuk ditulis"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, fuzzy, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr "Pesan internasionalisasi tidak boleh mengandung escape sequence `\\%c'"
-#: src/write-po.c: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"
@@ -3442,7 +3526,7 @@ msgstr ""
"berbeda dengan anda. Pertimbangkan menggunakan sebuah msgctxt ASCII murni.\n"
"%s\n"
-#: 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"
@@ -3522,7 +3606,7 @@ msgstr ""
"katalog pesan memiliki bentuk terjemahan plural\n"
"tetapi format katalog pesan Tcl tidak mendukung penanganan plural\n"
-#: src/x-awk.c:341 src/x-javascript.c: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 "%s:%d: peringatan: string tidak terselesaikan"
@@ -3532,17 +3616,22 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, fuzzy, c-format
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: peringatan: karakter Unicode tidak valid"
+
+#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: peringatan: karakter konstan yang unterminated"
-#: 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 "%s:%d: peringatan: string literal yang unterminated"
-#: 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 "Mohon spesifikasikan sumber pengkodean melalui --from-code."
@@ -3596,7 +3685,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:1335
+#: src/x-csharp.c:1390 src/x-python.c:1138
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: peringatan: karakter Unicode tidak valid"
@@ -3616,22 +3705,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: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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3695,11 +3784,21 @@ msgstr ""
"%s:%d: Urutan multibyte tidak valid.\n"
"Mohon spesifikasikan sumber pengkodean melalui --from-code.\n"
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, fuzzy, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: peringatan: string literal yang unterminated"
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: peringatan: karakter Unicode tidak valid"
+
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: peringatan: string tidak terselesaikan"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3838,33 +3937,38 @@ msgstr ""
"%s:%lu: peringatan: sintaks $\"...\" telah ditinggalkan karena alasan "
"keamanan; lebih baik gunakan eval_gettext"
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, fuzzy, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: peringatan: string literal yang unterminated"
-#: 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 "--join-existing tidak dapat digunakan ketika output ditulis ke stdout"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext tidak dapat bekerja tanpa kata kunci untuk dicari"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, 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:836
+#: src/xgettext.c:859
#, 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:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3873,14 +3977,14 @@ msgstr ""
" -d, --default-domain=NAMA gunakan NAMA.po untuk keluaran (daripada "
"messages.po)\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, 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:863
+#: src/xgettext.c:886
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
@@ -3888,12 +3992,12 @@ msgstr ""
" -p, --output-dir=DIR keluarkan berkas akan ditempatkan dalam "
"direktori DIR\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Pilihan dari masukan bahasa berkas:\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, fuzzy, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3903,7 +4007,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=NAMA kenali bahasa yang dispesifikasikan\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3913,12 +4017,12 @@ msgstr ""
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ kependekan untuk --language=C++\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:902
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
@@ -3926,7 +4030,7 @@ msgid ""
msgstr ""
"Secara baku bahasa ditebak tergantung dari ekstensi masukan nama berkas.\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3935,24 +4039,24 @@ msgstr ""
" --from-code=NAMA pengkodean dari berkas masukan\n"
" (kecuali untuk Python, Tcl, Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, 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:892
+#: src/xgettext.c:915
#, 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:894
+#: src/xgettext.c:917
#, 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:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -3969,17 +4073,17 @@ msgstr ""
"kata kunci\n"
" dalam berkas keluaran\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Pilihan spesifik untuk bahasa:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all ekstrak seluruh string\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3993,16 +4097,21 @@ msgstr ""
"Java,\n"
" C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:937
+#, fuzzy, 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 ""
-" -kKATA, --keyword=KATA cari untuk KATA sebagai kata kunci tambahan\n"
-" -k, --keyword jangan gunakan untuk kata kunci baku\n"
+" (hanya bahasa C, C++, ObjectiveC, Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+" C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -4012,7 +4121,7 @@ msgstr ""
" --flag=WORD:ARG:FLAG simbol tambahan untuk string didalam argumen\n"
" nomor ARG dari kata kunci KATA\n"
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4026,56 +4135,56 @@ msgstr ""
"Java,\n"
" C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, 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:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr " (hanya bahasa C, C++, ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt kenali format string Qt\n"
-#: 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 " (hanya bahasa C++)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --kde kenali format string KDE 4\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --boost kenali format string Boost\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
" --debug lebih detil hasil pengenalan format string\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, 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:983
+#: src/xgettext.c:1006
#, 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:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -4083,17 +4192,17 @@ msgstr ""
" --foreign-user abaikan FSF hak cipta dalam keluaran untuk "
"pengguna luar negri\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, 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:989
+#: src/xgettext.c:1012
#, 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:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
@@ -4101,7 +4210,7 @@ msgstr ""
" --msgid-bugs-address=EMAIL@ALAMAT set alamat laporan untuk msgid "
"bugs\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -4112,7 +4221,7 @@ msgstr ""
"awalan\n"
" untuk nilai msgstr\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -4123,7 +4232,7 @@ msgstr ""
"akhiran\n"
" untuk nilai msgstr\n"
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4132,31 +4241,31 @@ msgstr ""
"Sebuah argumen --flag tidak memiliki <keyword>:<argnum>:[pass-]<flag> "
"sintaks: %s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr "standard input"
-#: src/xgettext.c:2020
+#: src/xgettext.c:2071
#, c-format
msgid "Non-ASCII character at %s%s."
msgstr "Karakter bukan-ASCII di %s%s."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr "Komentar bukan-ASCII di atau sebelum %s%s."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr "String bukan-ASCII di %s%s."
-#: 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 "%s%s: peringatan: "
-#: 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 "
@@ -4165,7 +4274,7 @@ msgstr ""
"Walaupun telah digunakan dalam sebuah posisi format string, %s bukan sebuah "
"format string %s valid. Karena: %s\n"
-#: 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: "
@@ -4174,7 +4283,7 @@ msgstr ""
"Walaupun dideklarasikan seperti itu, %s bukan sebuah format string %s yang "
"valid. Karena: %s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4189,7 +4298,7 @@ msgstr ""
"bernama,\n"
"dan sebuah pemetaan daripada sebuah tuple untuk argumen.\n"
-#: 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"
@@ -4199,27 +4308,27 @@ msgstr ""
"gettext(\"\") mengembalikan masukan header dengan\n"
"informasi meta, bukan string kosong.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "spesifikasi argumen ambigu untuk kata kunci '%.*s'"
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "peringatan: hilang konteks untuk kata kunci '%.*s'"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, 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:2942
+#: src/xgettext.c:3052
#, c-format
msgid "context mismatch between singular and plural form"
msgstr "konteks tidak cocok diantara bentuk singular dan plural"
-#: src/xgettext.c:3052
+#: src/xgettext.c:3419
#, fuzzy
msgid ""
"The option --msgid-bugs-address was not specified.\n"
@@ -4232,7 +4341,7 @@ msgstr ""
"variabel MSGID_BUGS_ADDRESS disana; jika tidak mohon spesifikasikan\n"
"sebuah pilihan baris perintah --msgid-bugs-address.\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, fuzzy, c-format
msgid "language '%s' unknown"
msgstr "bahasa `%s' tidak dikenal"
@@ -4241,8 +4350,7 @@ msgstr "bahasa `%s' tidak dikenal"
msgid "<unnamed>"
msgstr "<tidak bernama>"
-#, fuzzy
-#~ msgid "header field '%s' should start at beginning of line\n"
+#~ 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"
diff --git a/gettext-tools/po/it.po b/gettext-tools/po/it.po
index d908901..397a374 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-07-07 18:21+0900\n"
+"POT-Creation-Date: 2014-06-01 11:19+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"
@@ -183,15 +183,15 @@ msgstr "argomento source_version di compile_java_class non valido"
msgid "invalid target_version argument to compile_java_class"
msgstr "argomento target_version di compile_java_class non valido"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c: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 "creazione di \"%s\" non riuscita"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c: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 "errore durante la scrittura del file \"%s\""
@@ -215,9 +215,9 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr "errore di I/O nel sottoprocesso %s"
-#: 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 "memoria esaurita"
@@ -228,7 +228,7 @@ msgid "creation of threads failed"
msgstr "creazione di thread non riuscita"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "scrittura sul sottoprocesso %s non riuscita"
@@ -315,8 +315,8 @@ msgid "%s subprocess got fatal signal %d"
msgstr "il sottoprocesso %s ha ricevuto il segnale fatale %d"
#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c: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 "errore durante l'apertura di \"%s\" in lettura"
@@ -718,7 +718,7 @@ msgstr ""
"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
+#: 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'"
@@ -771,26 +771,26 @@ msgstr ""
"le specifiche di formato in \"%s\" e \"%s\" per l'argomento \"%s\" non "
"corrispondono"
-#: 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 ""
"Nella direttiva numero %u, \"%c\" non può iniziare il nome di un campo."
-#: 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 ""
"Nella direttiva numero %u, \"%c\" non è seguito da un argomento di getattr."
-#: 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 ""
"Nella direttiva numero %u, \"%c\" non può iniziare un parametro di gettitem."
# FIXME: nesting?
-#: 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."
@@ -798,7 +798,7 @@ msgstr ""
"Nella direttiva numero %u, non è ammesso ulteriore nesting nel formato di "
"specificazione."
-#: 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 "Nella direttiva numero %u, c'è una direttiva di formato non terminata."
@@ -853,11 +853,11 @@ msgid ""
msgstr ""
"Il carattere che termina la direttiva numero %u non è una cifra tra 1 e 9."
-#: src/hostname.c:178 src/msgattrib.c: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"
@@ -871,19 +871,19 @@ msgstr ""
"Questo è software libero: siete liberi di cambiarlo e redistribuirlo.\n"
"NON c'è alcuna garanzia, fino agli estremi permessi dalla legge.\n"
-#: src/hostname.c:184 src/msgattrib.c: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 "Scritto da %s.\n"
#. 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 "Bruno Haible"
@@ -893,11 +893,11 @@ msgstr "Bruno Haible"
msgid "too many arguments"
msgstr "troppi argomenti"
-#: 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 "Usare \"%s --help\" per maggiori informazioni.\n"
@@ -938,29 +938,29 @@ msgstr ""
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address indirizzi per il nome dell'host\n"
-#: src/hostname.c:228 src/msgattrib.c: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 "Output informativo:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help mostra questo aiuto ed esce\n"
-#: 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 " -V, --version mostra le informazioni sulla versione ed esce\n"
@@ -969,11 +969,11 @@ msgstr " -V, --version mostra le informazioni sulla versione ed e
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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 "Segnalare i bug a <bug-gnu-gettext@gnu.org>.\n"
@@ -982,30 +982,27 @@ msgstr "Segnalare i bug a <bug-gnu-gettext@gnu.org>.\n"
msgid "could not get host name"
msgstr "impossibile ottenere il nome dell'host"
-#: src/msgattrib.c: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 "è permesso al massimo un file di input"
-#: 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 "%s e %s sono mutuamente esclusive"
-#: 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 "Uso: %s [OPZIONE] [FILEINPUT]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -1014,10 +1011,10 @@ msgstr ""
"Filtra i messaggi di un catalogo di traduzioni in base ai loro attributi,\n"
"e manipola gli attributi.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c: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"
@@ -1025,23 +1022,23 @@ 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
-#: 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 "Posizione del file di input:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " FILEINPUT file PO di input\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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"
@@ -1050,31 +1047,31 @@ msgstr ""
"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
+#: 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 ""
"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
-#: 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 "Posizione del file di output:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 " -o, --output-file=FILE scrive l'output sul file specificato\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1083,12 +1080,12 @@ msgstr ""
"I risultati vengono scritti su standard output quando nessun file di output\n"
"è specificato o è -.\n"
-#: 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 "Selezione dei messaggi:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
@@ -1097,7 +1094,7 @@ msgstr ""
"messaggi\n"
" non tradotti\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
@@ -1105,54 +1102,54 @@ msgstr ""
" --untranslated mantiene i messaggi non tradotti, rimuove i\n"
" messaggi tradotti\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr ""
" --no-fuzzy rimuove i messaggi marcati come \"fuzzy\"\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr ""
" --only-fuzzy mantiene i messaggi marcati come \"fuzzy\"\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete rimuove i messaggi #~ obsoleti\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete mantiene i messaggi #~ obsoleti\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Manipolazione degli attributi:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr " --set-fuzzy rende \"fuzzy\" tutti i messaggi\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr " --clear-fuzzy rende non \"fuzzy\" tutti i messaggi\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr " --set-obsolete rende obsoleti tutti i messaggi\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr " --clear-obsolete rende non obsoleti tutti i messaggi\n"
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
@@ -1162,7 +1159,7 @@ msgstr ""
"precedenti\n"
" msgid dei messaggi tradotti\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
@@ -1171,42 +1168,49 @@ msgstr ""
" --clear-previous elimina i \"previous msgid\" da tutti i "
"messaggi\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, fuzzy, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+" --no-fuzzy rimuove i messaggi marcati come \"fuzzy\"\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
msgstr ""
" --only-file=FILE.po manipola solo le voci elencate in FILE.po\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
msgstr ""
" --ignore-file=FILE.po manipola solo le voci non elencate in FILE.po\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr " --fuzzy sinonimo di --only-fuzzy --clear-fuzzy\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
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
-#: 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 "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
+#: 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"
@@ -1214,8 +1218,8 @@ 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
+#: 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 "
@@ -1225,17 +1229,17 @@ msgstr ""
"GNUstep\n"
" .strings\n"
-#: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
-#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
-#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
-#: src/xgettext.c:946
+#: src/msgattrib.c:498 src/msgcat.c: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 "Dettagli di output:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1248,17 +1252,17 @@ msgstr ""
" 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
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr ""
" --style=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
+#: 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"
@@ -1266,9 +1270,9 @@ 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
+#: 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"
@@ -1277,29 +1281,29 @@ msgstr ""
"carattere\n"
" esteso\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr " --force-po scrive il file PO anche se vuoto\n"
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
" -i, --indent 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
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
" --no-location 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
+#: 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"
@@ -1308,40 +1312,40 @@ msgstr ""
"\" (predefinito)\n"
"\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
+#: src/xgettext.c:989
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
" --strict genera un 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
-#: 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 " -p, --properties-output genera un file Java .properties\n"
-#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
-#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
" --stringtable-output 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
-#: 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 " -w, --width=NUMERO imposta la larghezza della pagina\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c: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"
@@ -1351,33 +1355,33 @@ msgstr ""
"lunghe\n"
" della larghezza della pagina\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output genera un output ordinato\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 ""
" -F, --sort-by-file ordina l'output in base alla posizione del "
"file\n"
-#: 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 "il criterio di selezione specificato è impossibile (%d < n < %d)"
-#: 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 "Uso: %s [OPZIONE] [FILEINPUT]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1400,24 +1404,24 @@ msgstr ""
"meno che sia specificata l'opzione --use-first, nel qual caso vengono usati\n"
"solo quelli nel primo file PO.\n"
-#: src/msgcat.c: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 " FILEINPUT ... file di input\n"
-#: 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 ""
" -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
+#: 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 "Se il file di input è -, viene letto lo standard input.\n"
-#: 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"
@@ -1426,7 +1430,7 @@ msgstr ""
" -<, --less-than=NUMERO stampa i messaggi with con meno di NUMERO\n"
" definizioni, è predefinito a 1\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1436,7 +1440,7 @@ msgstr ""
"definizioni,\n"
" è predefinito a 0\n"
-#: 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"
@@ -1446,8 +1450,8 @@ msgstr ""
"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
+#: 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"
@@ -1455,8 +1459,8 @@ 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
+#: 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"
@@ -1466,12 +1470,12 @@ msgstr ""
"GNUstep\n"
" .strings\n"
-#: 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 " -t, --to-code=NOME codifica dell'output\n"
-#: 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"
@@ -1480,7 +1484,7 @@ msgstr ""
" --use-first usa la prima traduzione disponibile per ogni\n"
" messaggio, non unisce diverse traduzioni\n"
-#: 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"
@@ -1488,21 +1492,21 @@ 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
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "non sono specificati file d'ingresso"
-#: 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 "sono richiesti esattamente 2 file d'ingresso"
-#: 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 "Uso: %s [OPZIONE] def.po ref.pot\n"
@@ -1536,12 +1540,12 @@ msgid " ref.pot references to the sources\n"
msgstr " ref.pot riferimenti alle fonti\n"
# FIXME
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "Modificatori di operazione:\n"
-#: 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."
@@ -1550,7 +1554,7 @@ msgstr ""
" -m, --multi-domain applica ref.pot a ciascuno dei domini in def."
"po\n"
-#: 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 " -N, --no-fuzzy-matching non usa le corrispondenze fuzzy\n"
@@ -1575,17 +1579,17 @@ msgstr "questo messaggio non è tradotto"
msgid "this message needs to be reviewed by the translator"
msgstr "questo messaggio deve essere controllato dal traduttore"
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1505
#, c-format
msgid "this message is used but not defined..."
msgstr "questo messaggio è usato ma non definito..."
-#: 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 "...ma questa definizione è simile"
-#: 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 "questo messaggio è usato ma non è definito in %s"
@@ -1595,19 +1599,19 @@ msgstr "questo messaggio è usato ma non è definito in %s"
msgid "warning: this message is not used"
msgstr "attenzione: questo messaggio non è usato"
-#: src/msgcmp.c:553 src/msgfmt.c: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] "trovato %d errore fatale"
msgstr[1] "trovati %d errori fatali"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "devono essere specificati almeno due file"
-#: 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"
@@ -1627,7 +1631,7 @@ msgstr ""
"commenti di estrazione saranno conservati, ma solo dal primo file PO che li\n"
"definisce. Le posizioni nei file di tutti i file PO verranno accumulate.\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1637,7 +1641,7 @@ msgstr ""
"definizioni,\n"
" è predefinito a 1\n"
-#: 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"
@@ -1645,65 +1649,65 @@ msgstr ""
" --omit-header non scrive l'intestazione con la voce 'msgid "
"\"\"'\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr "Converte un catalogo di traduzioni in una diversa codifica.\n"
# FIXME
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Obiettivo di conversione:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "La codifica predefinita è la codifica della locale corrente.\n"
-#: src/msgconv.c: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 " -i, --indent stile di output indentato\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
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
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
+#: src/msgmerge.c:588
+#, fuzzy, c-format
msgid ""
-" --add-location preserve '#: filename:line' lines (default)\n"
+" -n, --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
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict stile di output Uniforum strict\n"
-#: 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 "non è specificato nessun file d'ingresso"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "è richiesto esattamente un file d'ingresso"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Uso: %s [OPZIONE] FILEINPUT\n"
# FIXME
-#: 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"
@@ -1716,7 +1720,7 @@ msgstr ""
"xgettext). Alle voci non tradotte è fornita una traduzione identica\n"
"al msgid.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " FILEINPUT file PO o POT di input\n"
@@ -1755,7 +1759,7 @@ msgstr ""
"Uno speciale comando interno chiamato \"0\" stampa la traduzione, seguita da\n"
"un byte null. L'output di \"msgexec 0\" è valido come input per \"xargs -0\".\n"
-#: src/msgexec.c:281 src/msgfilter.c:401
+#: src/msgexec.c:281 src/msgfilter.c:420
#, c-format
msgid " -i, --input=INPUTFILE input PO file\n"
msgstr " -i, --input=FILEINPUT file PO di input\n"
@@ -1765,28 +1769,28 @@ msgstr " -i, --input=FILEINPUT file PO di input\n"
msgid "write to stdout failed"
msgstr "scrittura su standard output non riuscita"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "nome di filtro mancante"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr "deve essere specificato almeno uno script sed"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Uso: %s [OPZIONE] FILTRO [OPZIONE-FILTRO]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr ""
"Applica un filtro a tutte le traduzioni di un catalogo di traduzioni.\n"
-#: src/msgfilter.c:416
+#: src/msgfilter.c:435
#, c-format
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
@@ -1795,18 +1799,18 @@ msgstr ""
"Un FILTRO può essere qualunque programma che legge una traduzione dallo\n"
"standard input e scrive una traduzione modificata sullo standard output.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "OPZIONI-FILTRO utili quando FILTRO è \"sed\":\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
msgstr " -e, --expression=SCRIPT aggiunge SCRIPT ai comandi da eseguire\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1817,7 +1821,7 @@ msgstr ""
" da eseguire\n"
# FIXME
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
@@ -1826,7 +1830,7 @@ msgstr ""
"dei\n"
" modelli\n"
-#: 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"
@@ -1834,96 +1838,118 @@ msgstr ""
" --no-escape non usa gli escape del C nell'output "
"(predefinito)\n"
-#: 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 " --indent stile di output indentato\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
msgstr ""
" --keep-header non modifica l'intestazione, non la filtra\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "l'argomento di %s deve essere un singolo carattere di punteggiatura"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
msgstr "endianness non valida: %s"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c: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 "Ulrich Drepper"
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:439
+#, fuzzy, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr ""
+"Se nessun file di input è indicato o è -, viene letto lo standard input.\n"
+
+#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
#: src/msgunfmt.c:353
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s richiede una specificazione \"-d directory\""
-#: 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 "%s richiede una specificazione \"-l locale\""
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:538
+#, fuzzy, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s richiede una specificazione \"-l locale\""
+
+#: src/msgfmt.c:545
+#, fuzzy, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s richiede una specificazione \"-l locale\""
+
+#: src/msgfmt.c:551
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s e %s sono mutuamente esclusive"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s è valido solo con %s o %s"
-#: 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 "%s è valido solo con %s, %s o %s"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d messaggio tradotto"
msgstr[1] "%d messaggi tradotti"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d traduzione fuzzy"
msgstr[1] ", %d traduzioni fuzzy"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d messaggio non tradotto"
msgstr[1] ", %d messaggi non tradotti"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Uso: %s [OPZIONE] nomefile.po ...\n"
# FIXME
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
"Genera un catalogo binario di messaggi dalla descrizione di traduzioni "
"testuali.\n"
-#: src/msgfmt.c: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"
@@ -1932,17 +1958,17 @@ msgstr ""
"Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle corte.\n"
"Similmente per gli argomenti opzionali.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
msgid " filename.po ... input files\n"
msgstr " filename.po ... file di input\n"
-#: 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 "Modo di operazione:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1951,7 +1977,7 @@ msgstr ""
" -j, --java modo Java: genera una classe Java "
"ResourceBundle\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1960,12 +1986,12 @@ msgstr ""
" --java2 come --java, e assume Java2 (JDK 1.2 o "
"superiore)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr " --csharp modo C#: genera un file .NET .dll\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -1974,42 +2000,48 @@ msgstr ""
" --csharp-resources modo risorse C#: genera un file .NET ."
"resources\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
" --tcl modo Tcl: genera un file tcl/msgcat .msg\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt modo Qt: genera un file Qt .qm\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, fuzzy, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr " --qt modo Qt: genera un file Qt .qm\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict abilita il modo Uniforum strict\n"
-#: 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 ""
"Se il file di output è -, l'output viene scritto sullo standard output.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Posizione del file di output in modo Java:\n"
-#: 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 " -r, --resource=RISORSA nome della risorsa\n"
# FIXME
-#: 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 "
@@ -2017,8 +2049,16 @@ msgid ""
msgstr ""
" -l, --locale=LOCALE nome della locale, o lingua o lingua_PAESE\n"
+#: src/msgfmt.c:829
+#, fuzzy, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --tcl modo Tcl: l'input è un file tcl/msgcat .msg\n"
+
# FIXME
-#: src/msgfmt.c:707
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
@@ -2027,7 +2067,7 @@ msgstr ""
"delle\n"
" classi\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2039,12 +2079,12 @@ msgstr ""
"della risorsa, separata da una sottolineatura. L'opzione -d è obbligatoria.\n"
"La classe viene scritta nella directory specificata.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "Posizione del file di output in modo C#:\n"
-#: 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 "
@@ -2054,7 +2094,7 @@ msgstr ""
"dalla\n"
" locale\n"
-#: 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"
@@ -2063,18 +2103,18 @@ msgstr ""
"Le opzioni -l e -d sono obbligatorie. Il file .dll viene scritto in una\n"
"sottodirectory della directory indicata, il cui nome dipende dalla locale.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Posizione del file di output in modo Tcl:\n"
-#: 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 ""
" -d DIRECTORY directory base dei cataloghi di messaggi .msg\n"
-#: 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"
@@ -2083,12 +2123,45 @@ msgstr ""
"Le opzioni -l e -d sono obbligatorie. Il file .msg viene scritto nella\n"
"directory indicata.\n"
-#: 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
+#, fuzzy, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr ""
+" -d DIRECTORY directory base dei cataloghi di messaggi .msg\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -kPAROLA, --keyword=PAROLA cerca PAROLA come parola chiave aggiuntiva\n"
+" -k, --keyword non usa le parole chiave predefinite\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "Interpretazione del file di input:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -2099,14 +2172,14 @@ msgstr ""
" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format controlla le stringhe di formato dipendenti\n"
" dal linguaggio\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -2115,7 +2188,7 @@ msgstr ""
" --check-header verifica l'esistenza e il contenuto\n"
" dell'intestazione\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -2125,7 +2198,7 @@ msgstr ""
"dominio\n"
" e l'opzione --output-file\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2134,7 +2207,7 @@ msgstr ""
" -C, --check-compatibility controlla che GNU msgfmt si comporti come\n"
" X/Open msgfmt\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -2144,12 +2217,12 @@ msgstr ""
" --check-accelerators[=CAR] controlla la presenza degli acceleratori\n"
" da tastiera per le voci di menù\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr " -f, --use-fuzzy usa le voci fuzzy nell'output\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
@@ -2157,7 +2230,7 @@ msgstr ""
" -a, --alignment=NUMERO allinea le stringhe a NUMERO byte\n"
" (predefinito: %d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2169,90 +2242,100 @@ msgstr ""
" richiesto (big o little, predefinito: dipende\n"
" dall'architettura)\n"
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
" --no-hash non include la tabella hash nel file binario\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics stampa statistiche sulle traduzioni\n"
-#: 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 " -v, --verbose aumenta il livello di prolissità\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "attenzione: intestazione del file PO mancante o non valida\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "attenzione: la conversione del set di caratteri non riuscirà\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "attenzione: intestazione fuzzy del file PO\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
"attenzione: versioni più vecchie di msgfmt generano un errore in questo "
"caso\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "il nome di dominio \"%s\" non è adatto come nome di file"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"il nome di dominio \"%s\" non è adatto come nome di file: sarà usato\n"
"un prefisso"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, c-format
msgid "'domain %s' directive ignored"
msgstr "direttiva di dominio \"%s\" ignorata"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "ignorata la voce \"msgstr\" vuota"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "ignorata la voce \"msgstr\" fuzzy"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: attenzione: il file sorgente contiene traduzioni fuzzy"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c: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 "errore durante la lettura di \"%s\""
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2261,7 +2344,7 @@ msgstr ""
"l'opzione \"%c\" non può essere usata prima di aver specificato \"J\", \"K"
"\", \"T\", \"C\" o \"X\"."
-#: 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"
@@ -2270,7 +2353,7 @@ msgstr ""
"Estrae tutti i messaggi di un catalogo di traduzioni che corrispondono a un\n"
"modello indicato o appartengono a qualche file sorgente specificato.\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2346,7 +2429,7 @@ msgstr ""
" -v, --invert-match emette solo i messaggi che non corrispondono ad\n"
" alcun criterio di selezione\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2355,13 +2438,13 @@ msgstr ""
"carattere\n"
" esteso\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output genera un output ordinato\n"
# FIXME
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
@@ -2534,7 +2617,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 "attenzione: "
@@ -2744,19 +2827,19 @@ msgstr "la gestione del plurale è un'estensione di GNU gettext"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "in msgstr manca il carattere \"%c\" per l'acceleratore da tastiera"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
"in msgstr ci sono troppi caratteri \"%c\" per l'acceleratore da tastiera"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, 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"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "campo \"%s\" mancante nell'intestazione\n"
@@ -2779,7 +2862,7 @@ msgstr ""
"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
+#: 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 "
@@ -2799,7 +2882,7 @@ msgstr ""
"uguali."
#: 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 "
@@ -2808,17 +2891,17 @@ 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
+#: src/msgmerge.c:392 src/msgmerge.c:398
#, c-format
msgid "%s is only valid with %s"
msgstr "%s è valido solamente con %s"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr "tipo di backup"
# FIXME UPSTREAM
-#: 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"
@@ -2843,19 +2926,19 @@ msgstr ""
"Quando è impossibile trovare una corrispondenza esatta, una corrispondenza\n"
"approssimativa (fuzzy) è usata per ottenere i migliori risultati.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
" def.po traduzioni che si riferiscono alle vecchie "
"fonti\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot riferimenti alle nuove fonti\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2865,7 +2948,7 @@ msgstr ""
"messaggi,\n"
" può essere specificata più di una volta\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2874,28 +2957,28 @@ msgstr ""
" -U, --update aggiorna il file def.po,\n"
" non fa niente se def.po è già aggiornato\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Posizione del file di output in modalità di aggiornamento:\n"
# FIXME
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Il risultato è riscritto in def.po.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTROLLO fa il backup di def.po\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=SUFFISSO cambia il solito suffisso dei backup\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2914,7 +2997,7 @@ msgstr ""
" existing, nil numerati se esistono backup numerati, altrimenti semplici\n"
" simple, never fa sempre backup semplici\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2924,7 +3007,7 @@ msgstr ""
"Il suffisso dei backup è \"~\", a meno che sia impostato con --suffix o la\n"
"variabile d'ambiente SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
@@ -2932,22 +3015,22 @@ msgstr ""
" --previous mantiene i precedenti msgid dei messaggi "
"tradotti\n"
-#: 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 " -q, --quiet, --silent sopprime gli indicatori di avanzamento\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
msgstr "questo messaggio dovrebbe definire forme plurali"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
msgstr "questo messaggio non dovrebbe definire forme plurali"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2956,7 +3039,7 @@ 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/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -3069,7 +3152,7 @@ msgid " --strict write strict uniforum style\n"
msgstr " --strict scrive in stile Uniforum strict\n"
# FIXME UPSTREAM
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -3092,12 +3175,12 @@ msgstr ""
"traduzione. Le posizioni dei file vengono accumulate. Quando si usa l'opzione\n"
"--unique, i duplicati vengono scartati.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated stampa solo i duplicati\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -3170,27 +3253,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "uso improprio di #~"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, c-format
msgid "missing 'msgstr[]' section"
msgstr "manca la sezione \"msgstr[]\""
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, c-format
msgid "missing 'msgid_plural' section"
msgstr "manca la sezione \"msgid_plural\""
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, c-format
msgid "missing 'msgstr' section"
msgstr "manca la sezione \"msgstr\""
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "la prima forma plurale ha indice diverso da zero"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "la forma plurale ha indice non corretto"
@@ -3200,7 +3283,7 @@ msgstr "la forma plurale ha indice non corretto"
msgid "too many errors, aborting"
msgstr "troppi errori, interrotto"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c: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 "sequenza multibyte non valida"
@@ -3244,16 +3327,16 @@ msgstr "end-of-line all'interno di una stringa"
msgid "context separator <EOT> within string"
msgstr "separatore di contesto <EOT> all'interno di una stringa"
-#: src/read-catalog.c: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 "questo file potrebbe non contenere direttive di dominio"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "definizione del messaggio duplicata"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "questa è la posizione della prima definizione"
@@ -3455,19 +3538,19 @@ msgstr "compilazione della classe C# non riuscita, provare --verbose"
msgid "compilation of C# class failed"
msgstr "compilazione della classe C# non riuscita"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "nome di classe Java non valido: %s"
-#: 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 ""
"compilazione della classe Java non riuscita, provare --verbose o impostare "
"$JAVAC"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr ""
@@ -3478,7 +3561,7 @@ msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "errore durante l'apertura di \"%s\" in scrittura"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
@@ -3486,7 +3569,7 @@ msgstr ""
"i messaggi internazionalizzati non devono contenere la sequenza di escape "
"\"\\%c\""
-#: 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"
@@ -3499,7 +3582,7 @@ msgstr ""
"diversa dalla propria. Considerare l'uso di un msgctxt in puro ASCII.\n"
"%s\n"
-#: 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"
@@ -3585,7 +3668,7 @@ msgstr ""
"formato\n"
"dei cataloghi Tcl non le gestisce.\n"
-#: 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 "%s:%d: attenzione: stringa non terminata"
@@ -3595,17 +3678,22 @@ msgstr "%s:%d: attenzione: stringa non terminata"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: attenzione: espressione regolare non terminata"
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:762
+#: src/x-c.c:1051
+#, fuzzy, c-format
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: attenzione: carattere Unicode non valido"
+
+#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: attenzione: costante carattere non terminata"
-#: 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 "%s:%d: attenzione: costante stringa non terminata"
-#: 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 "Specificare la codifica del sorgente usando --from-code."
@@ -3659,7 +3747,7 @@ msgstr ""
"%s:%d: sequenza multibyte non valida.\n"
"Indicare la codifica del sorgente usando --from-code.\n"
-#: src/x-csharp.c:1390 src/x-python.c:1335
+#: src/x-csharp.c:1390 src/x-python.c:1138
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: attenzione: carattere Unicode non valido"
@@ -3679,22 +3767,22 @@ msgstr "%s:%d: attenzione: trovata \")\" dove era prevista \"}\""
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: attenzione: trovata \"}\" dove era prevista \")\""
-#: src/x-glade.c:561
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
msgstr "Contesto mancante per la stringa estratta dall'elemento \"%s\""
-#: src/x-glade.c:686
+#: src/x-glade.c:417
#, c-format
msgid "The root element <%s> is not allowed in a valid Glade file"
msgstr "L'elemento radice <%s> non è ammesso in un file di Glade valido"
-#: src/x-glade.c:841 src/x-glade.c:848
+#: src/x-glade.c:572 src/x-glade.c:579
#, c-format
msgid "%s:%lu:%lu: %s"
msgstr "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3758,11 +3846,21 @@ msgstr ""
"%s:%d: sequenza multibyte non valida.\n"
"Indicare la codifica del sorgente usando --from-code\n"
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: attenzione: costante RegExp terminata troppo presto"
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: attenzione: carattere Unicode non valido"
+
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: attenzione: stringa non terminata"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3895,35 +3993,40 @@ msgstr ""
"%s:%lu: attenzione: la sintassi $\"...\" è deprecata per motivi di "
"sicurezza; usare eval_gettext al suo posto"
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: attenzione: espressione regolare terminata troppo presto"
-#: 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 ""
"--join-existing non può essere usato quando l'output è scritto su standard "
"output"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext non può operare senza parole chiavi da ricercare"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr ""
"attenzione: il file \"%s\" ha estensione \"%s\" sconosciuta: si prova con C"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "Estrae le stringhe traducibili dai file di input indicati.\n"
-#: src/xgettext.c:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3932,12 +4035,12 @@ msgstr ""
" -d, --default-domain=NOME usa NOME.po per l'output (invece di messages."
"po)\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr " -o, --output=FILE scrive l'output sul file indicato\n"
-#: src/xgettext.c:863
+#: src/xgettext.c:886
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
@@ -3945,13 +4048,13 @@ msgstr ""
" -p, --output-dir=DIR i file di output saranno posizionati nella\n"
" directory DIR\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Scelta del linguaggio del file di input:\n"
-#: src/xgettext.c:870
-#, c-format
+#: src/xgettext.c:893
+#, fuzzy, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3960,7 +4063,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=NOME riconosce i linguaggi specificati\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3971,12 +4074,12 @@ msgstr ""
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
" JavaScript, Vala)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ abbreviazione di --language=C++\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:902
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
@@ -3985,7 +4088,7 @@ msgstr ""
"Come impostazione predefinita, la scelta del linguaggio si basa "
"sull'estensione del file di input.\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3994,23 +4097,23 @@ msgstr ""
" --from-code=NOME codifica dei file di input\n"
" (ad eccezione di Python, Tcl, Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr "Come impostazione predefinita, i file di input si considerano ASCII.\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
" -j, --join-existing unisce i messaggi con il file esistente\n"
-#: src/xgettext.c:894
+#: src/xgettext.c:917
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr " -x, --exclude-file=FILE.po non estrae le voci in FILE.po\n"
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -4028,17 +4131,17 @@ msgstr ""
" le righe di parole chiave nel file di "
"output\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Opzioni di linguaggio specifiche:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all estrae tutte le stringhe\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4053,16 +4156,22 @@ msgstr ""
" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
" Lua, JavaScript, Vala)\n"
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:937
+#, fuzzy, 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 ""
-" -kPAROLA, --keyword=PAROLA cerca PAROLA come parola chiave aggiuntiva\n"
-" -k, --keyword non usa le parole chiave predefinite\n"
+" (solo linguaggi C, C++, ObjectiveC, Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+" Lua, JavaScript, Vala)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -4073,7 +4182,7 @@ msgstr ""
"nell'argomento\n"
" numero ARG della parola chiave PAROLA\n"
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4088,37 +4197,37 @@ msgstr ""
" C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
" Lua, JavaScript, Vala)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr " -T, --trigraphs riconosce i trigrammi ANSI C in input\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr " (solo linguaggi C, C++, ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt riconosce le stringhe di formato Qt\n"
-#: 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 " (solo linguaggio C++)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --kde riconosce le stringhe di formato KDE 4\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --boost riconosce le stringhe di formato Boost\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
@@ -4127,12 +4236,12 @@ msgstr ""
"del\n"
" riconoscimento della stringa di formato\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output scrive un file .properties Java\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
@@ -4140,7 +4249,7 @@ msgstr ""
"output\n"
# FIXME UPSTREAM
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -4148,20 +4257,20 @@ msgstr ""
" --foreign-user omette dall'output il copyright della FSF per\n"
" gli utenti non GNU\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, c-format
msgid " --package-name=PACKAGE set package name in output\n"
msgstr ""
" --package-name=NOME imposta il nome del pacchetto in output\n"
-#: src/xgettext.c:989
+#: src/xgettext.c:1012
#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr ""
" --package-version=VERSIONE imposta la versione del pacchetto in "
"output\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
@@ -4170,7 +4279,7 @@ msgstr ""
"segnalare\n"
" errori nelle voci msgid\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -4181,7 +4290,7 @@ msgstr ""
"nelle\n"
" voci msgstr\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -4193,7 +4302,7 @@ msgstr ""
" voci msgstr\n"
# FIXME UPSTREAM
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4202,31 +4311,31 @@ msgstr ""
"Un argomento di --flag non usa la sintassi <parolachiave>:<num-arg>:[pass-]"
"[flag]: %s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr "standard input"
-#: src/xgettext.c:2020
+#: src/xgettext.c:2071
#, c-format
msgid "Non-ASCII character at %s%s."
msgstr "Carattere non ASCII in %s%s."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr "Commento non ASCII in o prima di %s%s."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr "Stringa non ASCII in %s%s."
-#: 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 "%s%s: attenzione: "
-#: 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 "
@@ -4235,7 +4344,7 @@ 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
+#: src/xgettext.c:2190
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4245,7 +4354,7 @@ msgstr ""
"Motivo: %s\n"
# FIXME
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4259,7 +4368,7 @@ msgstr ""
"Considerare l'uso di una stringa di formato con argomenti con nome,\n"
"e di una mappatura invece di una tupla per gli argomenti.\n"
-#: src/xgettext.c:2232
+#: src/xgettext.c:2283
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
@@ -4269,29 +4378,29 @@ msgstr ""
"gettext(\"\") restituisce l'intestazione con\n"
"le metainformazioni, non la stringa vuota.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "specificazione di argomento ambigua per la parola chiave \"%.*s\""
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "attenzione: contesto mancante per la parola chiave \"%.*s\""
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr ""
"attenzione: contesto mancante per l'argomento plurale della parola chiave "
"\"%.*s\""
-#: src/xgettext.c:2942
+#: src/xgettext.c:3052
#, c-format
msgid "context mismatch between singular and plural form"
msgstr "differenza di contesto tra la forma singolare e la forma plurale"
-#: src/xgettext.c: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"
@@ -4303,7 +4412,7 @@ msgstr ""
"variabile MSGID_BUGS_ADDRESS; altrimenti specificare \n"
"l'opzione --msgid-bugs-address da riga di comando.\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, c-format
msgid "language '%s' unknown"
msgstr "linguaggio \"%s\" sconosciuto"
diff --git a/gettext-tools/po/ja.po b/gettext-tools/po/ja.po
index 850d4b6..2278458 100644
--- a/gettext-tools/po/ja.po
+++ b/gettext-tools/po/ja.po
@@ -1,14 +1,14 @@
# Translation of `gettext-tools' messages to Japanese.
-# Copyright (C) 1999, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
# This file is distributed under the same license as the gettext package.
-# Masahito Yamaga <ma@yama-ga.com>, 2013.
+# Masahito Yamaga <ma@yama-ga.com>, 2014.
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.18.3\n"
+"Project-Id-Version: GNU gettext-tools 0.19-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-07-07 18:21+0900\n"
-"PO-Revision-Date: 2013-06-25 22:58+0900\n"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2014-05-11 13:39+0900\n"
"Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
"Language: ja\n"
@@ -181,15 +181,15 @@ msgstr "compile_java_class Ф̵ source_version "
msgid "invalid target_version argument to compile_java_class"
msgstr "compile_java_class Ф̵ target_version "
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c: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 "\"%s\" ˼Ԥޤ"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: 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 "\"%s\" ե񤭹˥顼ȯޤ"
@@ -214,9 +214,9 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr "%s ֥ץϥ顼"
-#: 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 "Ȥ̤ޤ"
@@ -227,7 +227,7 @@ msgid "creation of threads failed"
msgstr "åɤ˼"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "%s ؽ񤭽Ф֥ץԤޤ"
@@ -314,8 +314,8 @@ 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: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 "\"%s\" ɤ߹⤦Ȥƥ顼ȯޤ"
@@ -665,7 +665,7 @@ msgid ""
msgstr "ֹ̿ %u Ǥ, Ѵ '%c' ȸߴǤϤޤ."
#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-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'"
@@ -707,28 +707,28 @@ 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
+#: src/format-python-brace.c:137
#, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
msgstr "ֹ̿ %u Ǥ, '%c' ǥե̾Ϥ뤳ȤǤޤ."
-#: src/format-python-brace.c:149
+#: src/format-python-brace.c:150
#, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
msgstr "ֹ̿ %u Ǥ, '%c' getattr ΰϤ뤳ȤǤޤ."
-#: src/format-python-brace.c:164
+#: src/format-python-brace.c:165
#, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
msgstr "ֹ̿ %u Ǥ, '%c' getitem ΰϤ뤳ȤǤޤ."
-#: src/format-python-brace.c: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 "ֹ̿ %u Ǥ, եޥåȼ̻ҤǤʾΥͥȤϤǤޤ."
-#: 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 "ֹ̿ %u , üʸΤʤեޥå̿᤬ޤ."
@@ -779,11 +779,11 @@ msgid ""
"1 and 9."
msgstr "ֹ̿ %u νüʸ 1 9 δ֤οǤϤޤ."
-#: src/hostname.c:178 src/msgattrib.c:344 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
-#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
-#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:599
+#: 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"
@@ -800,19 +800,19 @@ msgstr ""
"ϥե꡼եȥǤΤѹȺۤϼͳǤ.\n"
"ˡΧϰϤ̵ݾڤǤ.\n"
-#: 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 " %s.\n"
#. 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 "Bruno Haible"
@@ -822,11 +822,11 @@ msgstr "Bruno Haible"
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 "¿ξ뤿ˤ '%s --help' ϤƤ.\n"
@@ -867,29 +867,29 @@ msgstr ""
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address ۥ̾Ф륢ɥ쥹\n"
-#: src/hostname.c:228 src/msgattrib.c:525 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
-#: src/msgfilter.c:476 src/msgfmt.c:775 src/msggrep.c:623 src/msginit.c:420
-#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
+#: src/hostname.c: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 ":\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help Υإפɽƽλ\n"
-#: 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 " -V, --version Сɽƽλ\n"
@@ -898,11 +898,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: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 "ХݡȤ <bug-gnu-gettext@gnu.org> ޤ.\n"
@@ -911,93 +911,90 @@ msgstr "ХݡȤ <bug-gnu-gettext@gnu.org> ޤ.\n"
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 " 1Ĥϥե뤬ޤ"
-#: 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 "%s %s ȿǤ"
-#: src/msgattrib.c:414 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "ˡ: %s [ץ] [ϥե]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
"and manipulates the attributes.\n"
msgstr "°˽äΥå̤, °򤦤ޤޤ.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
+#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msguniq.c:342
#, c-format
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr "ĹץɬܤΰûץˤɬܤǤ.\n"
-#: src/msgattrib.c: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 "ϥեλ:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " INPUTFILE PO ե\n"
-#: 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 ""
" -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
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
"ϥե뤬ꤵʤ, ⤷ - ξɸϤɤ߹ޤޤ.\n"
-#: 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 "ϥեλ:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 " -o, --output-file=FILE ꤷե˽\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1006,19 +1003,19 @@ msgstr ""
"ϥե뤬ꤵʤ, ⤷ - ξɸϤ˷̤񤭽Ф"
".\n"
-#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
#, c-format
msgid "Message selection:\n"
msgstr "å:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
msgstr ""
" --translated 줿åĤ, ̤\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
@@ -1026,53 +1023,53 @@ msgstr ""
" --untranslated ̤ΥåĤ, 줿Τ"
"\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr " --no-fuzzy 'fuzzy' ޡդΥå\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr " --only-fuzzy 'fuzzy' ޡդΥåĤ\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete Ѥ줿 #~ å\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete Ѥ줿 #~ åĤ\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "°:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr " --set-fuzzy ƤΥå 'fuzzy' \n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr " --clear-fuzzy ƤΥå ' fuzzy' \n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr " --set-obsolete ƤΥå 'Ѥ줿' ֤\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr ""
" --clear-obsolete ƤΥå 'Ѥ줿' ֤\n"
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
@@ -1081,7 +1078,7 @@ msgstr ""
" --previous 'fuzzy'ꤹ, 줿å\n"
" msgid Ĥ\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
@@ -1089,47 +1086,53 @@ msgid ""
msgstr ""
" --clear-previous ƤΥå \" msgid\" \n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr " --empty 'fuzzy' κ msgstr \n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
msgstr " --only-file=FILE.po FILE.po ˤ륨ȥΤ߽\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
msgstr " --ignore-file=FILE.po FILE.po ˤʤȥΤ߽\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr " --fuzzy --only-fuzzy --clear-fuzzy Ʊ\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
msgstr ""
" --obsolete --only-obsolete --clear-obsolete Ʊ\n"
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c: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 "ϥեʸˡ:\n"
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr " -P, --properties-input ϥե Java .properties ʸˡ\n"
-#: 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 "
@@ -1138,17 +1141,17 @@ msgstr ""
" --stringtable-input ϥե NeXTstep/GNUstep .strings ʸ"
"ˡ\n"
-#: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
-#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
-#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
-#: src/xgettext.c:946
+#: src/msgattrib.c:498 src/msgcat.c: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 "Ϥξܺ:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1161,26 +1164,26 @@ msgstr ""
" WHEN 'always', 'never', 'auto', ޤ "
"'html'.\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr ""
" --style=STYLEFILE --color Ф CSS 롼\n"
-#: 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 ""
" -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
+#: 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"
@@ -1188,68 +1191,68 @@ msgstr ""
" -E, --escape Ϥ C ΥפȤ,\n"
" ĥʸޤʤ\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr " --force-po ǤäƤ PO ե񤭽Ф\n"
-#: 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 " -i, --indent .po ե\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
" --no-location '#: ե̾:ֹ' ιԤ񤭽Фʤ\n"
-#: 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 ""
" -n, --add-location '#: ե̾:ֹ' ιԤ (ɸ)\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
+#: src/xgettext.c:989
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
" --strict ̩ Uniforum .po ե\n"
-#: 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 " -p, --properties-output Java .properties ե\n"
-#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
-#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
" --stringtable-output NeXTstep/GNUstep .strings ե\n"
-#: 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 " -w, --width=NUMBER ϥڡ\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c: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"
@@ -1258,31 +1261,31 @@ msgstr ""
" --no-wrap ϥڡĹåԤԤ"
"\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output Ȥ줿Ϥ\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 " -F, --sort-by-file եǽϤ򥽡\n"
-#: 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 "ꤵ줿 (%d < n < %d) ԲǽǤ"
-#: 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 "ˡ: %s [ץ] [ϥե]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1304,23 +1307,23 @@ msgstr ""
", եΰ֤ϤΤޤ޻Ĥޤ. --use-first ꤵ줿\n"
"ˤ, 餬줿ǽ PO եΤΤΤޤ޻Ĥޤ.\n"
-#: 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 " INPUTFILE ... ϥե\n"
-#: 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 " -f, --files-from=FILE ϥեΥꥹȤ FILE \n"
-#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:854
+#: src/msgcat.c: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 "ϥե뤬 - ξɸϤɤ߹ޤޤ.\n"
-#: 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"
@@ -1329,7 +1332,7 @@ msgstr ""
" -<, --less-than=NUMBER NUMBER 꾯ʤ줿å\n"
" . ꤵʤɸ̵¸\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1338,7 +1341,7 @@ msgstr ""
" ->, --more-than=NUMBER NUMBER ¿줿å\n"
" ꤵʤɸ 0\n"
-#: 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"
@@ -1347,15 +1350,15 @@ msgstr ""
" -u, --unique --less-than=2 û̷. 1Ĥʤå\n"
" Τߤɽ\n"
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:739
-#: src/msgmerge.c:557
+#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
+#: src/msgmerge.c:562
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr " -P, --properties-input ϥե Java .properties ʸˡ\n"
-#: 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"
@@ -1364,12 +1367,12 @@ msgstr ""
" --stringtable-input ϥե NeXTstep/GNUstep .strings ʸ"
"ˡ\n"
-#: 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 " -t, --to-code=NAME ϤΥ󥳡ǥ\n"
-#: 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"
@@ -1378,28 +1381,28 @@ msgstr ""
" --use-first ơΥåκǽͭȤ\n"
" ʣޡʤ\n"
-#: 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 " --lang=CATALOGNAME إåܤ 'Language' \n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
msgstr "Peter Miller"
-#: 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 "Τ 2Ĥϥե뤬ɬפǤ"
-#: 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 "ˡ: %s [ץ] def.po ref.pot\n"
@@ -1432,12 +1435,12 @@ msgstr " def.po \n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot ؤλ\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr ":\n"
-#: 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."
@@ -1445,7 +1448,7 @@ msgid ""
msgstr ""
" -m, --multi-domain ref.pot def.po ΥɥᥤγơŬ\n"
-#: 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 " -N, --no-fuzzy-matching ޤԤʤ\n"
@@ -1470,17 +1473,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 "ΥåϻȤޤ %s ǤƤޤ"
@@ -1490,18 +1493,18 @@ msgstr "ΥåϻȤޤ %s ǤƤޤ"
msgid "warning: this message is not used"
msgstr "ٹ: ΥåϻȤޤ"
-#: src/msgcmp.c:553 src/msgfmt.c:545
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "%d Ĥ̿Ū顼Ĥޤ"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "ʤȤ 2ĤΥեꤷʤФޤ"
-#: 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"
@@ -1521,7 +1524,7 @@ msgstr ""
"Ȥ, 餬줿ǽ PO եΤΤΤߤΤޤ޻Ĥޤ.\n"
"ޤեΰ֤Ƥ PO ե뤫餽Τޤ޻Ĥޤ.\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1530,68 +1533,68 @@ msgstr ""
" ->, --more-than=NUMBER NUMBER ¿줿å\n"
" ꤵʤɸ 1\n"
-#: 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 ""
" --omit-header 'msgid \"\"' ޤإåϤʤ\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr "ۤʤäʸ󥳡ǥ󥰤Ѵ.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Ѵо:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "ɸΥ󥳡ǥ󥰤ϸߤΥΥ󥳡ǥ󥰤Ǥ.\n"
-#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent ν\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\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
+#: 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"
-msgstr " --add-location '#: filename:line' ιԤݻ (ɸ)\n"
+" -n, --add-location preserve '#: filename:line' lines (default)\n"
+msgstr " -n, --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
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict ̩ Uniforum Ϸ\n"
-#: 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 "Τ 1Ĥϥե뤬ɬפǤ"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "ˡ: %s [ץ] INPUTFILE\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1603,7 +1606,7 @@ msgstr ""
"PO ƥץ졼ȥե (̤ xgettext ˤä) Ǥ. ̤Υȥ\n"
" msgid Ʊ˳Ƥޤ.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " INPUTFILE Ϥ PO ޤ POT ե\n"
@@ -1642,7 +1645,7 @@ msgstr ""
"'0' Ȥ̤Ȥ߹ߥޥɤϺǸ˥̥ʸդϤޤ.\n"
"\"msgexec 0\" νϤ \"xargs -0\" ؤϤŬƤޤ.\n"
-#: 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 " -i, --input=INPUTFILE Ϥ PO ե\n"
@@ -1652,27 +1655,27 @@ msgstr " -i, --input=INPUTFILE Ϥ PO ե\n"
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 "ʤȤ 1Ĥ sed ץȤꤷʤФޤ"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "ˡ: %s [ץ] ե륿 [ե륿ץ]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "Ƥ˥ե륿Ŭ.\n"
-#: 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"
@@ -1682,18 +1685,18 @@ msgstr ""
"\n"
"ǤդΥץꤹ뤳ȤǤޤ.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "FILTER 'sed' ξ FILTER-OPTION:\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
msgstr " -e, --expression=SCRIPT ¹Ԥ륳ޥɤ SCRIPT ɲ\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1702,102 +1705,123 @@ msgid ""
msgstr ""
" -f, --file=SCRIPTFILE SCRIPTFILE Ƥ¹Ԥ륳ޥɤɲ\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr " -n, --quiet, --silent ѥ󥹥ڡμưŪɽ\n"
-#: src/msgfilter.c:446 src/msggrep.c:595
+#: src/msgfilter.c:465 src/msggrep.c:600
#, c-format
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
+#: src/msgfilter.c:471 src/msggrep.c:606
#, c-format
msgid " --indent indented output style\n"
msgstr " --indent ν\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
msgstr " --keep-header إåΥȥݻ\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "%s ؤΰñζڤʸǤ٤Ǥ"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
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:605
+#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
msgid "Ulrich Drepper"
msgstr "Ulrich Drepper"
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:439
+#, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr "%s %s ꤹϥեꤷƤϤޤ"
+
+#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
#: src/msgunfmt.c:353
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s ˤ \"-d ǥ쥯ȥ\" λ꤬ɬפǤ"
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c: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 "%s ˤ \"-l \" λ꤬ɬפǤ"
-#: 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 "%s ˤ \"--template ƥץ졼\" λ꤬ɬפǤ"
+
+#: src/msgfmt.c:545
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s ˤ \"-o ե\" λ꤬ɬפǤ"
+
+#: src/msgfmt.c:551
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s %s %s ˤȿǤ"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s %s ޤ %s ˤΤͭǤ"
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:571 src/msgfmt.c:577
#, c-format
msgid "%s is only valid with %s, %s or %s"
msgstr "%s %s, %s ޤ %s ˤΤͭǤ"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d Ĥå"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d ĤΤޤ"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d Ĥ̤Υå"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "ˡ: %s [ץ] filename.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "ХʥåʸεҤ.\n"
-#: 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"
@@ -1806,17 +1830,17 @@ msgstr ""
"ĹץɬܤΰûץˤɬܤǤ.\n"
"ɬܤǤʤƱǤ.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
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:890
+#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "⡼:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1824,7 +1848,7 @@ msgid ""
msgstr ""
" -j, --java Java ⡼: Java ResourceBundle 饹\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1832,12 +1856,12 @@ msgid ""
msgstr ""
" --java2 --java Ʊ Java2 (JDK 1.2 ʹ) \n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr " --csharp C# ⡼: .NET .dll ե\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -1846,40 +1870,47 @@ msgstr ""
" --csharp-resources C# resources ⡼: .NET .resources ե"
"\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
" --tcl Tcl ⡼: tcl/msgcat .msg ե\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt Qt ⡼: Qt .qm ե\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+" --desktop Desktop Entry ⡼: .desktop ե\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict ̩ Uniforum ⡼ɤͭ\n"
-#: 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 "ϥե뤬 - ξɸϤ˷̤񤭽Фޤ.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Java ⡼ɤˤϥեξ:\n"
-#: src/msgfmt.c:703 src/msgfmt.c:717 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr " -r, --resource=RESOURCE ꥽̾\n"
-#: src/msgfmt.c: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 "
@@ -1887,14 +1918,23 @@ msgid ""
msgstr ""
" -l, --locale=LOCALE ̾. ̾⤷ \"̾_̾\"\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --source .class ե .java ե"
+"\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
" -d DIRECTORY 饹ǥ쥯ȥγؤδܥǥ쥯ȥ\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1908,12 +1948,12 @@ msgstr ""
"\n"
"񤭽Фޤ.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "C# ⡼ɤˤϥեξ:\n"
-#: 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 "
@@ -1922,7 +1962,7 @@ msgstr ""
" -d DIRECTORY ¸ .dll եδܥǥ쥯"
"\n"
-#: 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"
@@ -1931,18 +1971,18 @@ msgstr ""
"-l -d ץɬܤǤ. .dll եϥ˰¸̾\n"
"ꤵ줿ǥ쥯ȥΥ֥ǥ쥯ȥ˽񤭽Фޤ.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Tcl ⡼ɤˤϥեξ:\n"
-#: 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 ""
" -d DIRECTORY .msg åδܥǥ쥯ȥ\n"
-#: 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"
@@ -1951,12 +1991,46 @@ msgstr ""
"-l -d ץɬܤǤ. .msg եϻꤵ줿ǥ쥯ȥ˽\n"
"Фޤ.\n"
-#: src/msgfmt.c:745 src/xgettext.c:882
+#: src/msgfmt.c:861
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr "Desktop Entry ⡼ɤΥץ:\n"
+
+#: src/msgfmt.c:867
+#, c-format
+msgid " --template=TEMPLATE a .desktop file used as a template\n"
+msgstr " --template=TEMPLATE .desktop եƥץ졼Ȥ˻\n"
+
+#: src/msgfmt.c:869
+#, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr " -d DIRECTORY .po եδܥǥ쥯ȥ\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -kWORD, --keyword=WORD ɲåɤȤ WORD 򸡺\n"
+" -k, --keyword ɸΥɤϻȤʤ\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+"-l, -o, --template ץɬܤǤ. -D ꤵ줿, \n"
+"եϥޥɥ饤ˤΥǥ쥯ȥ꤫ɤ߹ޤޤ.\n"
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "ϥեβ:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1967,20 +2041,20 @@ msgstr ""
"domain\n"
" ǻꤵƤΥåԤʤ\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format ˰¸եޥåʸå\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
msgstr " --check-header إåܤ¸ߤƤǧ\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -1989,7 +2063,7 @@ msgstr ""
" --check-domain ɥᥤ̿ --output-file ץδ֤\n"
" ̷⤬ʤå\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -1997,7 +2071,7 @@ msgid ""
msgstr ""
" -C, --check-compatibility GNU msgfmt X/Open msgfmt Ȥθߴǧ\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -2006,19 +2080,19 @@ msgid ""
msgstr ""
" --check-accelerators[=ʸ] ˥塼ܤؤΥƤå\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr " -f, --use-fuzzy fuzzy (ޤ) ܤϤ˻Ȥ\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
" -a, --alignment=NUMBER ʸ NUMBER ХȤ· (ɸ: %d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2031,87 +2105,97 @@ msgstr ""
" (ɸϥץåȥեˤ big "
"little)\n"
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
" --no-hash Хʥեϥϥåơ֥ޤޤʤ\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics ˴ؤ׾ɽ\n"
-#: src/msgfmt.c:783 src/msgmerge.c:607 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose ǥ٥夲\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "ٹ: PO եΥإåʤ, ⤷Ǥ\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "ٹ: ʸåȤѴǽޤ\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "ٹ: PO եإåޤǤ\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "ٹ: msgfmt ΰΥСǤϤǥ顼ˤʤޤ\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "ɥᥤ̾ \"%s\" ϥե̾ȤŬڤǤϤޤ"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"ɥᥤ̾ \"%s\" ϥե̾ȤŬڤǤϤޤ. ƬȤޤ"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, c-format
msgid "'domain %s' directive ignored"
msgstr "'ɥᥤ %s' ̵̿뤵ޤ"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, c-format
msgid "empty 'msgstr' entry ignored"
msgstr " 'msgstr' ȥ̵뤵ޤ"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "ޤ (fuzzy) 'msgstr' ȥ̵뤵ޤ"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: ٹ: եˤޤ (fuzzy) ޤ"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr "%s ¸ߤޤ"
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr "%s ¸ߤޤɤ߹ޤ"
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-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 "\"%s\" ɤ߹˥顼ȯޤ"
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2120,7 +2204,7 @@ msgstr ""
"ץ '%c' 'J' 'K' 'T' 'C' 'X' ꤵ˻ȤȤ"
"Ǥޤ"
-#: 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"
@@ -2129,7 +2213,7 @@ msgstr ""
"椫, ꤵ줿ѥ˰פ, ⤷ϻꤵ줿\n"
"Υե˴ޤޤƤΥåФޤ.\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2204,7 +2288,7 @@ msgstr ""
" -i, --ignore-case ʸʸ̤ʤ\n"
" -v, --invert-match ɤˤפʤåΤߤ\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2212,12 +2296,12 @@ msgstr ""
" --escape Ϥ C ΥפȤ,\n"
" ĥʸޤʤ\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output Ȥ줿Ϥ\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file եǽϤ򥽡\n"
@@ -2378,7 +2462,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 "ٹ: "
@@ -2585,18 +2669,18 @@ msgstr "ʣ GNU gettext γĥǤ"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr ˤϥܡɥ졼ε '%c' ޤ"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr ""
"msgstr ˤϤޤ¿Υܡɥ졼ε '%c' ޤ"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "إå '%s' ɸͤΤޤޤǤ\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "إå '%s' إåˤޤ\n"
@@ -2618,7 +2702,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 "
@@ -2637,7 +2721,7 @@ 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 "
@@ -2646,16 +2730,16 @@ msgstr ""
"\"%s\" \"%s\" ѴǤޤ. %s iconv() ˰¸Ƥޤ.ΥС"
" iconv() ʤǺƤޤ."
-#: 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 "%s %s ˤΤͭǤ"
-#: 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"
@@ -2677,17 +2761,17 @@ msgstr ""
"Ĥޤ. Τ˰פƤĽ꤬Ĥʤ, ޤ (fuzzy)\n"
"ȤȤɤ̤Ǥ礦. \n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po ŤФ뻲\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot Ф뻲\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2696,7 +2780,7 @@ msgstr ""
" -C, --compendium=FILE åɲʸ\n"
" 1ʾꤵǽ\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2705,27 +2789,27 @@ msgstr ""
" -U, --update def.po 򹹿\n"
" def.po ˺ǿǤǤв⤷ʤ\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "⡼ɤǤνϥեξ:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "̤ def.po ˽ᤵޤ.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTROL def.po ΥХååפ\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=SUFFIX ̾ΥХåå\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2745,7 +2829,7 @@ msgstr ""
"\n"
" simple, never ñΥХååפ\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2755,29 +2839,29 @@ msgstr ""
"--suffix Ķѿ SIMPLE_BACKUP_SUFFIX ꤵƤʤ,\n"
"Хåå '~' Ǥ.\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
msgstr ""
" --previous 줿å msgid Ĥ\n"
-#: src/msgmerge.c:609 src/urlget.c:192
+#: src/msgmerge.c:614 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent ʹԾɽʤ\n"
-#: 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, "
@@ -2786,7 +2870,7 @@ 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/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2896,7 +2980,7 @@ msgstr " -i, --indent ν\n"
msgid " --strict write strict uniforum style\n"
msgstr " --strict ̩ Uniforum ǽ\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -2917,12 +3001,12 @@ msgstr ""
"ǽФޤ. եΰ֤ϤΤޤ޻Ĥޤ. --unique\n"
"ץȤȽʣ̵뤵ޤ.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated ʣƤΤΤߤɽ\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -2991,27 +3075,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 "'msgstr[]' ιबޤ"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, c-format
msgid "missing 'msgid_plural' section"
msgstr "'msgid_plural' ιबޤ"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, c-format
msgid "missing 'msgstr' section"
msgstr "'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 "ʣ˴ְäޤ"
@@ -3021,7 +3105,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 "ʣХȤΥ"
@@ -3065,16 +3149,16 @@ msgstr "ʸ end-of-line"
msgid "context separator <EOT> within string"
msgstr "ʸʸ̮ѥ졼 <EOT>"
-#: 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 "ϺǽξǤ"
@@ -3276,18 +3360,18 @@ msgstr "C# 饹Υѥ˼. --verbose Ƥ"
msgid "compilation of C# class failed"
msgstr "C# 饹Υѥ˼"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr " Java 饹̾ǤϤޤ: %s"
-#: 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 ""
"Java 饹Υѥ˼. --verbose  $JAVAC ꤷƤ"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr "Java 饹Υѥ˼. $JAVAC ꤷƤߤƤ"
@@ -3297,7 +3381,7 @@ msgstr "Java 饹Υѥ˼. $JAVAC ꤷƤߤƤ"
msgid "error while opening \"%s\" for writing"
msgstr "\"%s\" ˽񤭹⤦Ȥƥ顼ȯޤ"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
@@ -3305,7 +3389,7 @@ msgstr ""
"ݲ줿å '\\%c' Ȥץ󥹤ޤǤϤޤ"
""
-#: 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"
@@ -3319,7 +3403,7 @@ msgstr ""
"ƤƤ.\n"
"%s\n"
-#: 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"
@@ -3401,7 +3485,7 @@ msgstr ""
"åˤʣޤ.\n"
" Tcl åʣνƤޤ\n"
-#: 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 "%s:%d: ٹ: ʸ˽üޤ"
@@ -3411,17 +3495,22 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, c-format
+msgid "warning: invalid Unicode character"
+msgstr "ٹ: Unicode ʸ"
+
+#: 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 "%s:%d: ٹ: ʸ˽üޤ"
-#: 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 "%s:%d: ٹ: ʸ˽üޤ"
-#: 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 "--from-code ϥ󥳡ǥ󥰤ꤷƤ."
@@ -3475,7 +3564,7 @@ msgstr ""
"%s:%d: ʥޥХȥ.\n"
"--from-code ϥ󥳡ǥ󥰤ꤷƤ.\n"
-#: 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 "%s:%d: ٹ: Unicode ʸ"
@@ -3495,22 +3584,22 @@ msgstr "%s:%d: ٹ: '}' ٤Ȥ ')' ޤ"
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: ٹ: ')' ٤Ȥ '}' ޤ"
-#: src/x-glade.c:561
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
msgstr "'%s' ǤФʸФ륳ƥȤޤ"
-#: 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 "롼 <%s> ͭ Glade ե뤳ȤϤǤޤ"
-#: 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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3573,11 +3662,21 @@ msgstr ""
"%s:%d: ʥޥХȥ.\n"
"--from-code ϥ󥳡ǥ󥰤ꤷƤ\n"
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: ٹ: RegExp ƥνü᤮ޤ"
+#: src/x-javascript.c:1055
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: ٹ: %s ϵĤƤޤ"
+
+#: src/x-javascript.c:1069
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: ٹ: üΤʤ XML ޡå"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3711,32 +3810,37 @@ msgstr ""
"%s:%lu: ٹ: ʸˡ $\"...\" ϥƥͳǿ侩ޤ. "
"eval_gettext ȤäƤ"
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: ٹ: ɽƥνü᤮ޤ"
-#: src/xgettext.c:636
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr "'%s' ͭʥ󥳡̾ǤϤޤ. ASCII .\n"
+
+#: src/xgettext.c:648
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-existing Ͻ褬ɸϤξˤϻȤޤ"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext ϸ륭ɤʤưޤ"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr "ٹ: ե '%s' (ĥ '%s') ̤ΤηʤΤ C ޤ"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "Ϳ줿ϥե뤫ǽʸФޤ.\n"
-#: src/xgettext.c:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3744,23 +3848,23 @@ msgid ""
msgstr ""
" -d, --default-domain=NAME Ϥ NAME.po (message.po )\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr " -o, --output=FILE ꤵ줿ե˽\n"
-#: 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 " -p, --output-dir=DIR ǥ쥯ȥ DIR ˥ե\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "ϥե:\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3770,7 +3874,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=NAME ꤵ줿ǧ\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3779,21 +3883,21 @@ msgstr ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ --language=C++ û̷\n"
-#: 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 "ɸǸϥեγĥҤǼ̤ޤ.\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3802,22 +3906,22 @@ msgstr ""
" --from-code=NAME ϥեΥ󥳡ǥ\n"
" (Python, Tcl, Glade ʳ)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr "ɸǤ, ϥե ASCII Ȳꤵޤ.\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr " -j, --join-existing ¸ߤեȥå\n"
-#: 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 " -x, --exclude-file=FILE.po FILE.po ιܤФʤ\n"
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -3831,17 +3935,17 @@ msgstr ""
" -c, --add-comments[=TAG] ɹԤޤǤƤΥʬ\n"
" ϥե\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "ꥪץ:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all Ƥʸ\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3856,16 +3960,22 @@ msgstr ""
" C#, awk. Tcl, Perl, PHP, GCC-source, Glade,\n"
" Lua, JavaScript, Vala Τ)\n"
-#: 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 ""
-" -kWORD, --keyword=WORD ɲåɤȤ WORD 򸡺\n"
-" -k, --keyword ɸΥɤϻȤʤ\n"
+" (θΤ: C, C++, ObjectiveC, Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+" Lua, JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3876,7 +3986,7 @@ msgstr ""
"\n"
" ղåե饰\n"
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3891,53 +4001,53 @@ msgstr ""
" C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
" Lua, JavaScript, Vala Τ)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr " -T, --trigraphs Ϥ줿 ANSI C ȥ饤դǧ\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr " (C, C++, ObjectiveC Τ)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt Qt ʸǧ\n"
-#: 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 " (C++ Τ)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --kde KDE 4 ʸǧ\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --boost Boost ʸǧ\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr " --debug ܺ٤ʥեޥåʸǧ\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output Java .properties ե\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr " --copyright-holder=STRING ͭԤϤ\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -3945,24 +4055,24 @@ msgstr ""
" --foreign-user GNU ץȰʳΥ桼˽ FSF "
"ά\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, c-format
msgid " --package-name=PACKAGE set package name in output\n"
msgstr " --package-name=PACKAGE ѥå̾Ϥ\n"
-#: src/xgettext.c:989
+#: src/xgettext.c:1012
#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr " --package-version=VERSION ѥåСϤ\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
" --msgid-bugs-address=EMAIL@ADDRESS msgid ΥХѥɥ쥹\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -3973,7 +4083,7 @@ msgstr ""
"\"\"\n"
" \n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -3984,7 +4094,7 @@ msgstr ""
"\"\"\n"
" \n"
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -3992,31 +4102,31 @@ msgid ""
msgstr ""
"--flag <keyword>:<argnum>:[pass-]<flag> ʸˡäƤޤ: %s"
-#: 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 "%s%s ASCIIʸ."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr "%s%s ޤϤASCII."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr "%s%s ASCIIʸ."
-#: 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 "%s%s: ٹ: "
-#: 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 "
@@ -4025,7 +4135,7 @@ msgstr ""
"եޥåʸΰ֤ǻȤƤޤ, %s %s եޥåʸ"
"ǤϤޤ. ͳ: %s\n"
-#: 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: "
@@ -4034,7 +4144,7 @@ msgstr ""
"Τ褦Ƥޤ, '%s' %s ʸǤϤޤ. "
"ͳ: %s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4047,7 +4157,7 @@ msgstr ""
"̾դΤեޥåʸȤ, İФ (tuple)\n"
"˥ޥåԥ󥰤ȤȤƤƤ.\n"
-#: 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"
@@ -4057,27 +4167,27 @@ msgstr ""
"gettext(\"\") ϥ᥿դإåȥ֤ޤ\n"
"ʸ֤ޤ.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr " '%.*s' Ф꤬ۣǤ"
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "ٹ:  '%.*s' Фʸ̮ޤ"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr "ٹ:  '%.*s' ʣʸ̮ޤ"
-#: 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"
@@ -4089,7 +4199,7 @@ msgstr ""
".\n"
"⤷, ޥɥ饤󥪥ץ --msgid-bugs-address ꤷƤ.\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, c-format
msgid "language '%s' unknown"
msgstr " '%s' Τޤ"
diff --git a/gettext-tools/po/ko.po b/gettext-tools/po/ko.po
index e107c23..f577ec5 100644
--- a/gettext-tools/po/ko.po
+++ b/gettext-tools/po/ko.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the gettext package.
#
# Bang Jun-Young <bangjy@geocities.com>, 1995-1997.
-# Changwoo Ryu <cwryu@debian.org>, 2001-2005, 2007, 2009-2010, 2013.
+# Changwoo Ryu <cwryu@debian.org>, 2001-2005, 2007, 2009-2010, 2013-2014.
#
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.18.2\n"
+"Project-Id-Version: gettext-tools 0.19-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-07-07 18:21+0900\n"
-"PO-Revision-Date: 2013-03-12 03:39+0900\n"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2014-05-11 06:21+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
"Language: ko\n"
@@ -183,15 +183,15 @@ msgstr "compile_java_class에 대한 source_version 인자가 잘못되었습니
msgid "invalid target_version argument to compile_java_class"
msgstr "compile_java_class에 대한 target_version 인자가 잘못되었습니다"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c: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 "\"%s\"을(를) 만드는 데 실패했습니다"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: 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 "\"%s\" 파일을 쓰는 동안 오류 발생"
@@ -214,9 +214,9 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr "%s 하위 프로세스 입출력 오류"
-#: 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 "메모리가 바닥났습니다"
@@ -227,7 +227,7 @@ msgid "creation of threads failed"
msgstr "스레드 만들기에 실패했습니다"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "%s 하위 프로세스에 쓰기가 실패했습니다"
@@ -315,8 +315,8 @@ 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: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 "읽으려고 \"%s\"을(를) 여는 동안 오류 발생"
@@ -607,7 +607,7 @@ msgid_plural ""
"In the directive number %u, too many parameters are given; expected at most "
"%u parameters."
msgstr[0] ""
-"지시자 %u번에서, 매개변수가 너무 많습니다; 최대 %u개의 매개변수만 올 수 있습"
+"지시자 %u번에서, 매개변수가 너무 많습니다. 매개변수는 최대 %u개만 올 수 있습"
"니다."
#: src/format-lisp.c:2496 src/format-scheme.c:2499
@@ -673,7 +673,7 @@ msgid ""
msgstr "지시자 %u번에서, 크기 지정은 '%c' 변환 지정과 호환되지 않습니다."
#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-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'"
@@ -717,31 +717,31 @@ 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
+#: src/format-python-brace.c:137
+#, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "지시자 %u번에서, '%c' 다음에 숫자가 오지 않습니다."
+msgstr "지시자 %u번에서, 필드 이름이 '%c' 문자로 시작할 수 없습니다."
-#: src/format-python-brace.c:149
-#, fuzzy, c-format
+#: src/format-python-brace.c:150
+#, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "지시자 %u번에서, '{' 다음에 인자 번호가 오지 않습니다."
+msgstr "지시자 %u번에서, getattr 인자가 '%c' 문자로 시작할 수 없습니다."
-#: src/format-python-brace.c:164
-#, fuzzy, c-format
+#: src/format-python-brace.c:165
+#, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "지시자 %u번에서, '%c' 다음에 숫자가 오지 않습니다."
+msgstr "지시자 %u번에서, getitem 인자가 '%c' 문자로 시작할 수 없습니다."
-#: src/format-python-brace.c:184
-#, fuzzy, c-format
+#: src/format-python-brace.c:185
+#, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "지시자 %u번에서, '%c' 앞에는 유효숫자가 올 수 없습니다."
+msgstr "지시자 %u번에서, 포맷 지정에서 더 이상은 네스팅을 허용하지 않습니다."
-#: src/format-python-brace.c:210
-#, fuzzy, c-format
+#: src/format-python-brace.c:270
+#, c-format
msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "지시자 %u번에서, 인자 %d이(가) 0보다 작습니다."
+msgstr "지시자 %u번에서, 포맷 지시자를 마치지 않았습니다."
#: src/format-qt.c:152
#, c-format
@@ -788,11 +788,11 @@ msgid ""
"1 and 9."
msgstr "지시자 %u번을 끝마치는 문자가 1과 9 사이의 숫자가 아닙니다."
-#: src/hostname.c:178 src/msgattrib.c:344 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
-#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
-#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:599
+#: 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"
@@ -805,19 +805,19 @@ msgstr ""
"This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
-#: src/hostname.c:184 src/msgattrib.c: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 "%s이(가) 만들었습니다.\n"
#. 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 "브루노 헤이블(Bruno Haible)"
@@ -827,11 +827,11 @@ msgstr "브루노 헤이블(Bruno Haible)"
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 "더 많은 정보를 보려면 '%s --help' 하십시오.\n"
@@ -871,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: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 "정보 출력:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help 이 도움말을 보여주고 끝납니다\n"
-#: 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 " -V, --version 버전 정보를 표시하고 끝납니다\n"
@@ -902,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: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 "<bug-gnu-gettext@gnu.org>로 문제점을 알려 주십시오.\n"
@@ -915,92 +915,89 @@ msgstr "<bug-gnu-gettext@gnu.org>로 문제점을 알려 주십시오.\n"
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 "%s과(와) %s은(는) 서로 배타적입니다"
-#: src/msgattrib.c:414 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "사용법: %s [옵션] [입력파일]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
"and manipulates the attributes.\n"
msgstr "번역 메시지를 그 속성에 따라 걸러내고, 그 속성을 조작합니다.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
+#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msguniq.c:342
#, c-format
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr "긴 옵션에서 꼭 필요한 인수는 짧은 옵션에도 꼭 필요합니다.\n"
-#: src/msgattrib.c: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 "입력 파일 위치:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " <입력파일> 입력 PO 파일\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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 ""
" -D, --directory=<디렉터리> 입력 파일 탐색 명단에 <디렉터리>를 추가합니다\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr "입력 파일이 주어지지 않거나 \"-\"이면, 표준 입력에서 읽습니다.\n"
-#: 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 "출력 파일 위치:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 " -o, --output-file=<파일> 지정한 파일로 출력합니다\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1009,12 +1006,12 @@ msgstr ""
"만약 출력 파일이 지정되지 않았거나 \"-\"인 경우, 결과물을 표준 출력으로 \n"
"출력합니다.\n"
-#: 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 "메시지 선택:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
@@ -1022,7 +1019,7 @@ msgstr ""
" --translated 번역되었으면 놔 두고, 번역되지 않았으면 지웁니"
"다\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
@@ -1030,62 +1027,63 @@ msgstr ""
" --untranslated 번역되지 않았으면 놔 두고, 번역되었으면 지웁니"
"다\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr " --no-fuzzy 'fuzzy'로 표시된 메시지를 지웁니다\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr " --only-fuzzy 'fuzzy'로 표시된 메시지를 놔 둡니다\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete 없어진 #~ 메시지를 지웁니다\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete 없어진 #~ 메시지를 놔 둡니다\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "속성 조작:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr " --set-fuzzy 모든 메시지를 'fuzzy'로 만듭니다\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr ""
" --clear-fuzzy 모든 메시지를 'fuzzy'가 아니도록 만듭니다\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr " --set-obsolete 모든 메시지를 없는 메시지로 만듭니다\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr ""
" --clear-obsolete 모든 메시지를 없는 메시지가 아니도록 만듭니다\n"
-#: src/msgattrib.c:468
-#, fuzzy, c-format
+#: src/msgattrib.c:475
+#, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
" of translated messages.\n"
msgstr ""
-" --previous 이전에 번역한 메시지의 msgid를 놔 둡니다\n"
+" --previous 'fuzzy'로 설정할 때, 이전에 번역한 메시지의\n"
+" msgid를 놔 둡니다\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
@@ -1093,27 +1091,33 @@ msgid ""
msgstr ""
" --clear-previous 모든 메시지에서 \"이전의 msgid\"를 지웁니다\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr " --empty 'fuzzy'를 제거할 때, msgstr도 비웁니다\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
msgstr ""
" --only-file=<파일>.po <파일>.po에 들어 있는 항목만 조작합니다\n"
-#: 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 ""
" --ignore-file=<파일>.po <파일>.po에 들어 있지 않은 항목만 조작합니다\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr ""
" --fuzzy \"--only-fuzzy --clear-fuzzy\"와 동일합니다\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
@@ -1121,24 +1125,24 @@ msgstr ""
" --obsolete \"--only-obsolete --clear-obsolete\"와 동일합니"
"다\n"
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c: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 "입력 파일 문법:\n"
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
" -P, --properties-input 입력 파일이 자바 .properties 문법입니다\n"
-#: 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 "
@@ -1147,17 +1151,17 @@ msgstr ""
" --stringtable-input 입력 파일이 NeXTstep/GNUstep .strings 문법입니"
"다\n"
-#: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
-#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
-#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
-#: src/xgettext.c:946
+#: src/msgattrib.c:498 src/msgcat.c: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 "출력 상세:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1170,26 +1174,26 @@ msgstr ""
" <상황>은 'always', 'never', 'auto', 혹은 "
"'html'.\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr ""
" --style=<스타일파일> --color 옵션에 대해 CSS 스타일을 지정합니다\n"
-#: 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 ""
" -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
+#: 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"
@@ -1197,68 +1201,68 @@ msgstr ""
" -E, --escape 출력에 C 이스케이프를 쓰고 확장 문자를 쓰지 않"
"습니다\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr " --force-po 비어 있는 파일이라도 PO 파일로 씁니다\n"
-#: 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 " -i, --indent 들여쓰기된 스타일로 .po 파일을 씁니다\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
" --no-location '#: 파일_이름:줄번호' 줄을 쓰지 않습니다\n"
-#: 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 ""
" -n, --add-location '#: 파일_이름:줄번호' 줄을 만듭니다(기본값)\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
+#: src/xgettext.c:989
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
" --strict 엄격하게 유니포럼을 따르는 .po 파일을 씁니다\n"
-#: 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 " -p, --properties-output 자바 .properties 파일을 씁니다\n"
-#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
-#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
" --stringtable-output NeXTstep/GNUstep .strings 파일을 씁니다\n"
-#: 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 " -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
-#: 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"
@@ -1267,31 +1271,31 @@ msgstr ""
" --no-wrap 출력 페이지 폭보다 긴 메시지 라인을 여러 줄로\n"
" 자르지 않습니다.\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output 정렬된 출력을 만들어 냅니다\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 " -F, --sort-by-file 파일 위치에 따라 출력을 정렬합니다\n"
-#: 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 "불가능한 선택 조건을 지정하였습니다 (%d < n < %d)"
+msgstr "불가능한 선택 조건을 지정하였습니다(%d < n < %d)"
-#: 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 "사용법: %s [<옵션>] [<입력파일>]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1313,23 +1317,23 @@ msgstr ""
"나타나는 가장 첫 번째 PO 파일에 들어 있는 모든 PO 파일에서 파일 위치는 그대로\n"
"유지됩니다.\n"
-#: 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 " 입력파일 ... 입력 파일\n"
-#: 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 " -f, --files-from=<파일> 입력 파일의 목록을 <파일>에서 읽습니다\n"
-#: 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 "입력 파일이 -이면, 표준 입력을 읽습니다.\n"
-#: 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"
@@ -1338,7 +1342,7 @@ msgstr ""
" -<, --less-than=<크기> 지정한 것보다 적은 메시지만을 출력합니다.\n"
" 이 옵션이 없을 경우에 기본값은 무한대입니다.\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1347,7 +1351,7 @@ msgstr ""
" -<, --less-than=<크기> 지정한 것보다 많은 메시지만을 출력합니다.\n"
" 이 옵션이 없을 경우에 기본값은 무한대입니다.\n"
-#: 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"
@@ -1356,8 +1360,8 @@ msgstr ""
" -u, --unique --less-than=2를 짧게 쓴 것입니다.\n"
" 유일한 메시지만을 출력합니다.\n"
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:739
-#: src/msgmerge.c:557
+#: src/msgcat.c: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"
@@ -1365,8 +1369,8 @@ 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
+#: 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"
@@ -1375,12 +1379,12 @@ msgstr ""
" --stringtable-input 입력 파일이 NeXTstep/GNUstep .strings 문법입니"
"다\n"
-#: 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 " -t, --to-code=<이름> 출력의 인코딩\n"
-#: 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"
@@ -1389,28 +1393,28 @@ msgstr ""
" --use-first 각 메시지중에서 첫번째로 나타나는 번역문만\n"
" 사용하고, 여러 번역문을 합치지 않습니다\n"
-#: 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 " --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
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
msgstr "피터 밀러(Peter Miller)"
-#: 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 "정확히 2개의 입력 파일이 필요합니다"
-#: 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 "사용법: %s [<옵션>] def.po ref.pot\n"
@@ -1425,7 +1429,7 @@ msgid ""
"you have translated each and every message in your program. Where an exact\n"
"match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
msgstr ""
-"같은 내용의 msgid 문자열을 포함하고 있는지 확인하려고 Uniforum 형태의 두 .po\n"
+"같은 내용의 msgid 문자열이 들어 있는지 확인하려고 Uniforum 형태의 두 .po\n"
"파일을 비교합니다. def.po 파일은 이미 존재하는 파일이며 예전에 번역된 메시지를\n"
"담고 있습니다. ref.po 파일은 최근에 만들어진 PO 파일이거나 PO 서식 파일입니다.\n"
"(일반적으로 xgettext에서 만듭니다.) 이 프로그램은 프로그램 내에 있는 각각의\n"
@@ -1442,12 +1446,12 @@ msgstr " def.po 번역문\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot 소스를 참조\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "동작 변경:\n"
-#: 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."
@@ -1456,7 +1460,7 @@ msgstr ""
" -m, --multi-domain ref.pot 파일을 def.po의 각 도메인에 적용합니"
"다\n"
-#: 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 " -N, --no-fuzzy-matching 퍼지 매칭을 하지 않습니다\n"
@@ -1481,17 +1485,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 "이 메시지는 사용되지만 %s에서 정의되지 않았습니다"
@@ -1501,18 +1505,18 @@ msgstr "이 메시지는 사용되지만 %s에서 정의되지 않았습니다"
msgid "warning: this message is not used"
msgstr "경고: 이 메시지는 사용되지 않습니다"
-#: src/msgcmp.c:553 src/msgfmt.c:545
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "치명적인 오류 %d개를 찾았습니다"
-#: 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"
@@ -1531,7 +1535,7 @@ msgstr ""
"주석문은 모두 유지될 것이지만, 정의하려면 첫 번째 PO 파일에서만 유지됩니다. 모든\n"
"PO 파일에서 파일 위치는 누적됩니다.\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1540,70 +1544,70 @@ msgstr ""
" ->, --more-than=<크기> 지정한 것보다 많은 메시지만을 출력합니다.\n"
" 이 옵션이 없을 경우에 기본값은 1입니다.\n"
-#: 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 ""
" --omit-header 헤더에 'msgid \"\"' 항목을 쓰지 않습니다\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr "번역 목록을 다른 문자 인코딩으로 변환합니다.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "변환 목표:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "기본 인코딩은 현재 로캘의 인코딩입니다.\n"
-#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent 들여쓰기된 출력 형태\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
" --no-location ''#: 파일_이름:줄번호' 줄을 쓰지 않습니다\n"
-#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
-#: src/msgmerge.c:583
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c: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 ""
-" --add-location '#: 파일_이름:줄번호 줄을 만듭니다(기본값)\n"
+" -n, --add-location '#: 파일_이름:줄번호 줄을 만듭니다(기본값)\n"
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict 엄격한 Uniforum 출력 형태로 씁니다\n"
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
+#: src/msgen.c:258 src/msgfmt.c: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 "사용법: %s [<옵션>] <입력파일>\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1615,7 +1619,7 @@ msgstr ""
"서식 파일입니다. (일반적으로 xgettext로 만듭니다.) 번역되지 않은 항목은\n"
"msgid와 동일한 번역문이 할당되고, 퍼지로 표시됩니다.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " <입력파일> 입력 PO 파일 혹은 POT 파일\n"
@@ -1654,7 +1658,7 @@ msgstr ""
"특별히 내부 명령어 '0'은 번역문을 그대로 출력하고, 맨 끝에 0 널 바이트를 \n"
"출력합니다. \"msgexec 0\"의 출력물은 \"xargs -0\"의 입력으로 사용하기에 적합합니다\n"
-#: 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 " -i, --input=<입력파일> 입력 PO 파일\n"
@@ -1664,27 +1668,27 @@ msgstr " -i, --input=<입력파일> 입력 PO 파일\n"
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 "최소한 한 개의 sed 스크립트를 지정해야 합니다"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "사용법: %s [<옵션>] <필터> [<필터-옵션>]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "번역 목록의 모든 번역문에 대하여 필터를 적용합니다.\n"
-#: 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"
@@ -1693,19 +1697,19 @@ msgstr ""
"\"필터\"는 표준 입력에서 번역문을 읽어서 수정된 번역문을 표준 출력으로\n"
"출력하는 프로그램이면 어떤 프로그램이든 가능합니다.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "<필터>가 'sed'일 때 유용한 <필터-옵션>들:\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
msgstr ""
" -e, --expression=<스크립트> 실행할 명령어에 <스크립트>를 추가합니다\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1715,26 +1719,26 @@ msgstr ""
" -f, --file=<스크립트파일> <스크립트파일>의 내용을 실행할 명령어에\n"
" 추가합니다.\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
" -n, --quiet, --silent 패턴 공백을 자동으로 출력하지 않도록 합니다\n"
-#: src/msgfilter.c:446 src/msggrep.c:595
+#: src/msgfilter.c:465 src/msggrep.c:600
#, c-format
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
+#: src/msgfilter.c:471 src/msggrep.c:606
#, c-format
msgid " --indent indented output style\n"
msgstr " --indent 들여 쓰기된 출력 스타일\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
@@ -1742,78 +1746,99 @@ msgstr ""
" --keep-header 헤더 항목을 수정하지 않습니다. 필터링하지 않습"
"니다.\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "%s의 인자는 한 개의 구두점 문자여야 합니다"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
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:605
+#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
msgid "Ulrich Drepper"
msgstr "울리히 드레퍼(Ulrich Drepper)"
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:439
+#, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr "%s 및 %s 옵션을 사용하면 입력 파일을 지정하지 않아야 합니다"
+
+#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
#: src/msgunfmt.c:353
#, c-format
msgid "%s requires a \"-d directory\" specification"
-msgstr "%s은(는) \"-d 디렉터리\" 지정이 필요합니다"
+msgstr "%s 옵션은 \"-d <디렉터리>\" 지정이 필요합니다"
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
+#: src/msgfmt.c: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 "%s은(는) \"-d 로캘\" 지정이 필요합니다"
+msgstr "%s 옵션은 \"-d <로캘>\" 지정이 필요합니다"
+
+#: src/msgfmt.c:538
+#, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s 옵션은 \"--template <서식>\" 지정이 필요합니다"
+
+#: src/msgfmt.c:545
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s 옵션은 \"-o <파일>\" 지정이 필요합니다"
+
+#: src/msgfmt.c:551
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s 및 %s 옵션은 %s에서 서로 배타적입니다"
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
-msgstr "%s은(는) %s 혹은 %s과(와) 함께 써야만 효과가 있습니다"
+msgstr "%s 옵션은 %s 혹은 %s 옵션과 함께 써야만 효과가 있습니다"
-#: 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 "%s은(는) %s, %s 혹은 %s과(와) 함께 써야만 효과가 있습니다"
+msgstr "%s 옵션은 %s, %s 또는 %s 옵션과 함께 써야만 효과가 있습니다"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "번역된 메시지 %d개"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", 퍼지 번역문 %d개"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", 번역되지 않은 메시지 %d개"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "사용법: %s [<옵션>] <파일이름>.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "주어진 번역문에서 이진 메시지 목록 파일을 만들어 냅니다.\n"
-#: 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"
@@ -1822,17 +1847,17 @@ msgstr ""
"긴 옵션에서 꼭 필요한 인수는 짧은 옵션에도 꼭 필요합니다.\n"
"없어도 되는 인자도 마찬가지입니다.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
msgid " filename.po ... input files\n"
msgstr " <파일이름>.po ... 입력 파일\n"
-#: 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 "동작 모드:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1841,7 +1866,7 @@ msgstr ""
" -j, --java 자바 모드: 자바 ResourceBundle 클래스를 만듭니"
"다\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1850,12 +1875,12 @@ msgstr ""
" --java2 --java와 같지만, Java2를 가정합니다(JDK 1.2 이"
"상)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr " --csharp C# 모드: .NET .dll 파일을 만듭니다\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -1864,53 +1889,67 @@ msgstr ""
" --csharp-resources C# 리소스 모드: .NET .resources 파일을 만듭니"
"다\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
" --tcl Tcl 모드: tcl/msgcat .msg 파일을 만듭니다\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt Qt 모드: Qt .qm 파일을 만듭니다\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+" --desktop desktop 항목 모드: .desktop 파일을 만듭니다\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict 엄격한 Uniforum 출력 형태로 씁니다\n"
-#: 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 "출력 파일이 -이면, 출력은 표준 출력에 씁니다.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "자바 모드에서 출력 파일 위치:\n"
-#: 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 " -r, --resource=<리소스> 리소스 이름\n"
-#: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
-#: src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
+#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr " -l, --locale=<로캘> 로캘 이름, 언어 혹은 언어_국가\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr " --source .class 파일 대신 .java 파일을 만듭니다\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr " -d <디렉터리> 클래스 디렉터리 구조의 베이스 디렉터리\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1922,19 +1961,19 @@ msgstr ""
"이름으로 결정됩니다. -d 옵션은 꼭 필요합니다. 클래스는 지정한 디렉터리\n"
"아래에 출력됩니다.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "C# 모드에서 출력 파일 위치:\n"
-#: 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 " -d <디렉터리> 로캘 의존 .dll 파일의 베이스 디렉터리\n"
-#: 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"
@@ -1943,29 +1982,66 @@ msgstr ""
"-l과 -d 옵션은 꼭 필요합니다. .dll 파일은 지정한 디렉터리의(로캘에 따라 달라"
"지는 이름의) 아래 디렉터리에 씁니다.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Tcl 모드에서 출력 파일 위치:\n"
-#: 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 " -d <디렉터리> .msg 메시지 목록의 베이스 디렉터리\n"
-#: 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 "-l과 -d 옵션은 꼭 필요합니다. .msg 파일은 지정한 디렉터리에 씁니다.\n"
-#: src/msgfmt.c:745 src/xgettext.c:882
+# freedesktop.org desktop을 말한다
+#: src/msgfmt.c:861
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr "desktop 항목 모드 옵션:\n"
+
+#: src/msgfmt.c:867
+#, c-format
+msgid " --template=TEMPLATE a .desktop file used as a template\n"
+msgstr " --template=<서식> .desktop 파일을 서식으로 사용\n"
+
+#: src/msgfmt.c:869
+#, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr ""
+" -d <디렉터리> .po 파일의 베이스 디렉터리\n"
+"\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -k<단어>, --keyword=<단어> <단어>를 추가 키워드로 찾습니다\n"
+" -k, --keyword 기본 키워드를 사용하지 않습니다\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+"-l, -o 및 --template 옵션은 필수입니다. -D 옵션을 사용하면 입력 파일을 명령"
+"행 대신 디렉터리에서 읽습니다.\n"
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "입력 파일 해석:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1976,12 +2052,12 @@ msgstr ""
" --check-domain에서 하는 검사를 모두 수행합니"
"다\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr " --check-format 언어에 따라 포맷 문자열을 검사합니다\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -1989,7 +2065,7 @@ msgid ""
msgstr ""
" --check-header 헤더 항목이 있는지와 그 내용을 검사합니다\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -1998,7 +2074,7 @@ msgstr ""
" --check-domain 도메인 지정과 --output-file 옵션의 도메인이\n"
" 충돌하지 않는지 검사합니다\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2006,7 +2082,7 @@ msgid ""
msgstr ""
" -C, --check-compatibility GNU msgfmt이 X/Open의 msgfmt처럼 검사합니다\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -2016,12 +2092,12 @@ msgstr ""
" --check-accelerators[=CHAR] 메뉴 항목에 키보드 단축글쇠가 있는지 \n"
" 검사합니다\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr " -f, --use-fuzzy 출력에 퍼지 항목을 사용합니다\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
@@ -2029,7 +2105,7 @@ msgstr ""
" -a, --alignment=<크기> 문자열을 <크기> 바이트에 정렬합니다(기본값: "
"%d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2040,88 +2116,98 @@ msgstr ""
" --endianness=<바이트순> 32비트 수를 주어진 바이트 순서로 씁니다\n"
" (big 또는 little, 기본값은 플랫폼에 따라)\n"
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
" --no-hash 이진 파일에 해쉬 테이블을 넣지 않습니다\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics 번역에 대한 통계를 표시합니다\n"
-#: src/msgfmt.c:783 src/msgmerge.c:607 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose 더 자세히 출력합니다\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "경고: PO 파일 헤더가 빠졌거나 잘못되었습니다\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "경고: 문자셋 변환이 동작하지 않습니다\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "경고: PO 파일 헤더가 퍼지입니다\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "경고: 과거 버전의 msgfmt은 여기에 오류를 낼 것입니다\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "도메인이름 \"%s\"은(는) 파일 이름으로 알맞지 않습니다"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"도메인 이름 \"%s\"은(는) 파일 이름으로 알맞지 않습니다. 그러므로 접두사를\n"
"사용합니다"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, c-format
msgid "'domain %s' directive ignored"
msgstr "'domain %s' 지시자는 무시됨"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "빈 'msgstr' 항목은 무시됨"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "퍼지 'msgstr' 항목은 무시됨"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s: 경고: 소스 파일이 퍼지 번역문을 포함하고 있습니다"
+msgstr "%s: 경고: 소스 파일에 퍼지 번역문이 들어 있습니다"
+
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr "%s 파일이 없습니다"
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr "%s 파일이 있지만 읽을 수 없습니다"
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-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 "\"%s\"을(를) 읽는 동안 오류 발생"
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2129,7 +2215,7 @@ msgid ""
msgstr ""
"'%c' 옵션은 'J'나 'K'나 'T'나 'C'나 'X'가 지정되기 전에는 쓸 수 없습니다"
-#: 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"
@@ -2138,7 +2224,7 @@ msgstr ""
"번역 목록에서 주어진 패턴에 맞는 메시지 혹은 주어진 소스 파일에 들어 있는\n"
"메시지만을 뽑아 냅니다.\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2212,19 +2298,19 @@ msgstr ""
" -i, --ignore-case 대소문자 구별을 하지 않습니다\n"
" -v, --invert-match 지정한 옵션에 맞지 않는 메시지만을 출력합니다\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
msgstr ""
" --escape 확장 문자 없이, 출력에 C 이스케이프를 씁니다\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output 정렬된 출력을 만듭니다\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file 파일의 위치에 따라 출력을 정렬합니다\n"
@@ -2339,9 +2425,9 @@ msgid ""
"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 ...",
@@ -2383,7 +2469,7 @@ msgstr "목표 문자셋 \"%s\"은(는) 널리 쓸 수 있는 인코딩 이름
#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:3051
+#: src/xgettext.c:544 src/xgettext.c:3418
#, c-format
msgid "warning: "
msgstr "경고: "
@@ -2534,13 +2620,13 @@ msgstr "nplurals = %lu"
#, c-format
msgid "but some messages have only one plural form"
msgid_plural "but some messages have only %lu plural forms"
-msgstr[0] "하지만 어떤 메시지는 %lu개의 복수 형밖에 없습니다"
+msgstr[0] "하지만 어떤 메시지는 복수형이 %lu개 밖에 없습니다"
#: src/msgl-check.c:490
#, c-format
msgid "but some messages have one plural form"
msgid_plural "but some messages have %lu plural forms"
-msgstr[0] "하지만 어떤 메시지는 %lu개의 복수 형이 있습니다"
+msgstr[0] "하지만 어떤 메시지는 복수형이 %lu개 있습니다"
#: src/msgl-check.c:514
msgid ""
@@ -2585,17 +2671,17 @@ msgstr "복수 처리는 GNU gettext 확장 기능입니다"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr에 키보드 단축키 '%c'에 대한 표시가 없습니다"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr에 키보드 단축키 '%c' 표시가 너무 많습니다"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "'%s' 헤더 필드가 아직도 초기의 기본값을 가지고 있습니다\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "헤더에 헤더 필드 '%s'이(가) 빠졌음\n"
@@ -2615,7 +2701,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 "
@@ -2634,7 +2720,7 @@ 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 "
@@ -2643,16 +2729,16 @@ msgstr ""
"\"%s\"에서 \"%s\"로(으로) 변환할 수 없습니다. %s은(는) iconv()에 의존하지만, "
"이 버전은 iconv()를 지원되지 않는 상태로 빌드되었습니다."
-#: 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 "%s은(는) %s과(와) 함께 써야만 효과가 있습니다"
-#: 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"
@@ -2675,17 +2761,17 @@ msgstr ""
"보존됩니다. 정확한 짝을 찾지 못할 경우, 보다 나은 결과를 얻으려고 퍼지\n"
"매칭이 사용됩니다.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po 과거 소스를 참조하는 번역문\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot 새로운 소스를 참조\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2694,7 +2780,7 @@ msgstr ""
" -C, --compendium=<파일> 메시지 번역 라이브러리 추가,\n"
" 두 개 이상 지정할 수 있습니다\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2704,28 +2790,28 @@ msgstr ""
" 이미 def.po를 업데이트했다면 아무 것도 안 합니"
"다\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "업데이트 모드에서 출력 파일 위치:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "결과물은 def.po파일로 다시 쓰여집니다.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=<컨트롤> def.po의 백업을 만듭니다\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
" --suffix=<접미어> 일반적인 백업 접미어 대신 <접미어>를 씁니다\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2738,13 +2824,13 @@ msgid ""
msgstr ""
"버전 컨트롤 방법은 --backup 옵션이나 VERSION_CONTROL 환경 변수로 \n"
"선택할 수 있습니다. 다음의 값을 쓸 수 있습니다:\n"
-" none, off 백업을 만들지 않습니다 (--backup 옵션이 있을지라도)\n"
+" none, off 백업을 만들지 않습니다(--backup 옵션이 있어도)\n"
" nummbered, t 번호를 붙인 백업을 만듭니다\n"
" existing, nil 번호를 붙인 백업이 있으면 번호를 붙여서, 그렇지 않으면 간단"
"히\n"
" simple, never 간단한 백업만을 만듭니다\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2754,29 +2840,29 @@ msgstr ""
"--suffix 옵션이나 SIMPLE_BACKUP_SUFFIX 환경 변수를 세팅하지 않았다면, 백업 접"
"미어는 '~'입니다.\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
msgstr ""
" --previous 이전에 번역한 메시지의 msgid를 놔 둡니다\n"
-#: src/msgmerge.c:609 src/urlget.c:192
+#: src/msgmerge.c:614 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent 진행상태 표시를 하지 않습니다\n"
-#: 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, "
@@ -2785,7 +2871,7 @@ 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/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2894,7 +2980,7 @@ msgstr " -i, --indent 들여쓰기된 출력 형태로 씁니다
msgid " --strict write strict uniforum style\n"
msgstr " --strict 엄격한 Uniforum 출력 형태로 씁니다\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -2915,12 +3001,12 @@ msgstr ""
"것만을 쓰게 됩니다. 파일의 위치는 모두 유지됩니다. --unique 옵션을\n"
"사용할 때, 중복된 메시지를 버립니다.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated 중복된 메시지만을 출력합니다\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -2990,27 +3076,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 "'msgstr[]' 부분이 빠졌습니다"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, c-format
msgid "missing 'msgid_plural' section"
msgstr "'msgstr_plural' 부분이 빠졌습니다"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, c-format
msgid "missing 'msgstr' section"
msgstr "'msgstr' 부분이 빠졌습니다"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "첫 번째 복수형의 인덱스가 0이 아닙니다"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "복수형의 인덱스가 잘못되었습니다"
@@ -3020,7 +3106,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 "잘못된 가변바이트 문자열"
@@ -3064,16 +3150,16 @@ msgstr "문자열 내부에서 행이 끝남"
msgid "context separator <EOT> within string"
msgstr "문자열 안에 컨텍스트 구분 <EOT>가 있습니다."
-#: 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 "이 파일은 도메인 지시자를 포함하고 있지 않을 수도 있습니다"
+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 "여기는 첫번째 정의의 위치입니다"
@@ -3269,19 +3355,19 @@ msgstr "C# 클래스 컴파일에 실패했습니다. --verbose로 시도해 보
msgid "compilation of C# class failed"
msgstr "C# 클래스 컴파일에 실패했습니다"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "올바른 자바 클래스 이름이 아닙니다: %s"
-#: 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 ""
"자바 클래스 컴파일에 실패했습니다. --verbose로 시도해 보거나 $JAVAC 환경변수"
"를 세팅하십시오"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr "자바 클래스 컴파일에 실패했습니다. $JAVAC 환경변수를 세팅하십시오"
@@ -3291,13 +3377,13 @@ msgstr "자바 클래스 컴파일에 실패했습니다. $JAVAC 환경변수를
msgid "error while opening \"%s\" for writing"
msgstr "쓰려고 \"%s\"을(를) 여는 동안 오류 발생"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "국제화된 메시지는 '\\%c' 이스케이프 순서열을 포함할 수 없습니다"
+msgstr "국제화된 메시지에는 '\\%c' 이스케이프 순서열이 들어 있으면 안 됩니다"
-#: 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"
@@ -3310,7 +3396,7 @@ msgstr ""
"발생할 수 있습니다. 순수한 ASCII msgctxt만을 사용하도록 하십시오.\n"
"%s\n"
-#: 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"
@@ -3393,7 +3479,7 @@ msgstr ""
"메시지 목록에 복수형 번역이 들어 있지만, \n"
"Tcl 메시지 목록 형식은 복수형을 지원하지 않습니다\n"
-#: 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 "%s:%d: 경고: 완결되지 않은 문자열"
@@ -3403,17 +3489,22 @@ 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-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 "%s:%d: 경고: 완결되지 않은 문자 상수"
-#: 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 "%s:%d: 경고: 완결되지 않은 문자열 상수"
-#: 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 "소스 인코딩을 --from-code 옵션으로 지정하십시오."
@@ -3467,7 +3558,7 @@ msgstr ""
"%s:%d: 잘못된 다중바이트 시퀀스.\n"
"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
-#: 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 "%s:%d: 경고: 잘못된 유니코드 문자"
@@ -3487,22 +3578,24 @@ msgstr "%s:%d: 경고: '}'가 와야 하는 곳에 ')'가 발견되었습니다"
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: 경고: ')가 와야 하는 곳에 '}'가 발견되었습니다"
-#: src/x-glade.c:561
+# XML 엘리먼트를 말한다
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
+msgstr "'%s' 엘리먼트에서 뽑아낸 문자열에 대한 컨텍스트가 없습니다"
-#: src/x-glade.c:686
+# XML 엘리먼트를 말한다
+#: src/x-glade.c:417
#, c-format
msgid "The root element <%s> is not allowed in a valid Glade file"
-msgstr ""
+msgstr "글레이드 파일에서 최상위 엘리먼트로 <%s>은(는) 허용하지 않습니다"
-#: 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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3517,59 +3610,68 @@ 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 옵션으로 지정하십시오."
+msgstr "소스 인코딩을 --from-code 옵션으로 지정하십시오\n"
#: src/x-javascript.c:275
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
"%s:%d: 잘못된 다중바이트 시퀀스.\n"
-"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
+"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오\n"
#: src/x-javascript.c:291
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
"%s:%d: 길고 불완전한 다중바이트 시퀀스.\n"
-"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
+"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오\n"
#: src/x-javascript.c:303
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of file.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
"%s:%d: 파일의 끝에 불완전한 다중바이트 시퀀스.\n"
-"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
+"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오\n"
#: src/x-javascript.c:312
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of line.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
"%s:%d: 줄 끝에 불완전한 다중바이트 시퀀스.\n"
-"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
+"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오\n"
#: src/x-javascript.c:344
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the source encoding through --from-code\n"
msgstr ""
"%s:%d: 잘못된 다중바이트 시퀀스.\n"
-"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
+"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오\n"
-#: src/x-javascript.c:1147
-#, fuzzy, c-format
+#: src/x-javascript.c:954
+#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: 경고: 완결되지 않은 문자열 상수"
+msgstr "%s:%d: 경고: 정규식 문자열이 너무 빨리 끝났습니다"
+
+#: src/x-javascript.c:1055
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: 경고: %s은(는) 허용하지 않습니다"
+
+#: src/x-javascript.c:1069
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: 경고: 완결되지 XML 마크업"
#: src/x-perl.c:308
#, c-format
@@ -3700,32 +3802,37 @@ msgstr ""
"%s:%lu: 경고: $\"...\" 문법은 보안상의 이유로 없어질 예정입니다; 대신에 "
"eval_gettext를 사용하십시오"
-#: src/x-vala.c:558
-#, fuzzy, c-format
+#: src/x-vala.c:413
+#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: 경고: 완결되지 않은 문자열 상수"
+msgstr "%s:%d: 경고: 정규식 문자열이 너무 빨리 끝났습니다"
+
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr "'%s'은(는) 올바른 인코딩 이름이 아닙니다. ASCII를 대신 사용합니다.\n"
-#: src/xgettext.c:636
+#: src/xgettext.c:648
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-exeisting은 출력이 표준출력에 쓰여질 때 사용될 수 없습니다"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext는 검색할 키워드 없이는 동작하지 않습니다"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr "경고: '%s' 파일의 확장자 '%s'을(를) 알 수 없습니다; C 형식으로 간주함"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "주어진 입력 파일에서 번역 가능한 문자열을 뽑아냅니다.\n"
-#: src/xgettext.c:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3734,25 +3841,25 @@ msgstr ""
" -d, --default-domain=<이름> 출력에(messages.po 대신) <이름>.po를 씁니"
"다\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr " -o, --output=<파일> 지정된 파일에 출력합니다\n"
-#: 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 ""
" -p, --output-dir=<디렉터리> 출력 파일을 <디렉터리> 디렉터리에 놓습니다\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "입력 파일의 언어 선택:\n"
-#: src/xgettext.c:870
-#, fuzzy, c-format
+#: src/xgettext.c:893
+#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3761,7 +3868,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=<이름> 지정한 언어로 인식하도록 합니다\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3769,14 +3876,15 @@ msgstr ""
" 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, Desktop)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ --language=C++를 짧게 쓴 것입니다\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:902
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
@@ -3784,7 +3892,7 @@ msgid ""
msgstr ""
"기본적으로 입력 파일의 확장자에 따라 어떤 언어를 사용할 지 짐작합니다.\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3793,24 +3901,24 @@ msgstr ""
" --from-code=<이름> 입력 파일의 인코딩\n"
" (Python, Tcl, Glade 제외)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr "기본값으로 입력 파일은 ASCII로 인코딩되어 있다고 가정합니다.\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr " -j, --join-existing 현존하는 파일과 메시지를 합칩니다\n"
-#: 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 ""
" -x, --exclude-file=<파일.po> <파일.po>의 메시지는 뽑아내지 않습니다\n"
# TAG가 정확이 뭐지?
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -3824,18 +3932,18 @@ msgstr ""
" -c, --add-comments 키워드 줄 앞에 모든 주석 부분을 출력\n"
" 파일에 씁니다\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Language 관련 옵션:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all 모든 문자열을 뽑아 냅니다\n"
-#: src/xgettext.c:906 src/xgettext.c:914
-#, fuzzy, c-format
+#: src/xgettext.c:929
+#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, "
@@ -3847,18 +3955,26 @@ msgstr ""
"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"
-#: 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 ""
-" -k<단어>, --keyword=<단어> <단어>를 추가 키워드로 찾습니다\n"
-" -k, --keyword 기본 키워드를 사용하지 않습니다\n"
+" (다음 언어만 지원: C, C++, ObjectiveC, "
+"Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+" Lua, JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3868,8 +3984,8 @@ msgstr ""
" --flag=WORD:ARG:FLAG 키워드 WORD의 인자 번호 ARG안에 있는 문자열의\n"
" 추가 플래그\n"
-#: src/xgettext.c:922
-#, fuzzy, c-format
+#: src/xgettext.c:945
+#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, "
@@ -3881,58 +3997,59 @@ msgstr ""
"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"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
" -T, --trigraphs 입력에서 ANSI C 삼중자(trigraph)를 인식합니"
"다\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
" (다음 언어만 지원: C, C++, ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt Qt 형식 문자열을 알아냅니다\n"
-#: 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 " (C++만 지원)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --kde KDE 4 형식 문자열을 알아냅니다\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --boost Boost 형식 문자열을 알아냅니다\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr " --debug 더 자세한 형식문자열 인식 결과\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output 자바 .properties 파일을 씁니다\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr " --copyright-holder=<문자열> 출력할 저작권 소유자를 지정합니다\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -3940,25 +4057,25 @@ msgstr ""
" --foreign-user 외부 사용자를 위해 FSF 저작권 표시를 뺍니"
"다\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, c-format
msgid " --package-name=PACKAGE set package name in output\n"
msgstr " --package-name=<패키지> 출력에서 패키지 이름을 지정합니다\n"
-#: src/xgettext.c:989
+#: src/xgettext.c:1012
#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr " --package-version=<버전> 출력에서 패키지 버전을 지정합니다\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
-" --msgid-bugs-address=이메일@주소 msgid 버그를 보고할 주소를 지정합"
+" --msgid-bugs-address=전자메일@주소 msgid 버그를 보고할 주소를 지정합"
"니다\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -3969,7 +4086,7 @@ msgstr ""
"\"\"을 \n"
" 접두어로 사용합니다\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -3980,38 +4097,38 @@ msgstr ""
"\"\"을 \n"
" 접미어로 사용합니다\n"
-#: 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 "--flag의 인자가 <keyword>:<argnum>:[pass-]<flag> 문법이 아닙니다: %s"
-#: 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 "%s%s에 ASCII가 아닌 문자열이 있습니다."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr "%s%s에 또는 그 앞에 ASCII가 아닌 문자열이 있습니다."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr "%s%s에 시작하는 ASCII가 아닌 문자열이 있습니다."
-#: 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 "%s%s: 경고: "
-#: 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 "
@@ -4020,7 +4137,7 @@ msgstr ""
"형식 문자열에 위치 지정을 사용했지만, %s은(는) 잘못된 %s 형식 문자열입니다. "
"이유: %s\n"
-#: 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: "
@@ -4028,7 +4145,7 @@ msgid ""
msgstr ""
"선언한 것과는 달리, '%s'은(는) 올바른 %s 형식 문자열이 아닙니다. 이유: %s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4041,7 +4158,7 @@ msgstr ""
"이름이 있는 인자를 이용해 형식 문자열을 사용해 보십시오.\n"
"아니면 인자에 대해 튜플 대신에 매핑을 사용해 보십시오.\n"
-#: 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"
@@ -4051,27 +4168,27 @@ msgstr ""
"gettext(\"\")는 빈 문자열이 아니라, 메타 정보가 들어 있는 \n"
"헤더 항목을 리턴합니다.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "'%.*s' 키워드에 대한 인자 지정이 애매합니다"
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "경고: '%.*s' 키워드에 대해 컨텍스트가 없습니다"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr "경고: '%.*s' 키워드의 복수형 인자에 대해 컨텍스트가 없습니다"
-#: 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"
@@ -4083,7 +4200,7 @@ msgstr ""
"변수를 지정하십시오; 그렇지 않으면 --msgid-bugs-address\n"
"명령행 옵션을 사용하십시오.\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, c-format
msgid "language '%s' unknown"
msgstr "'%s' 언어를 알 수 없습니다"
@@ -4091,9 +4208,3 @@ 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 8ca2cd8..aa5e0b4 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: 2013-07-07 18:21+0900\n"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
"PO-Revision-Date: 2001-05-09 02:08+02:00\n"
"Last-Translator: Trond Endrestl <endrestol@hotmail.com>\n"
"Language-Team: Norwegian-bokml <no@li.org>\n"
@@ -180,15 +180,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 "feil under skriving av filen %s"
@@ -209,9 +209,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 "minnet oppbrukt"
@@ -222,7 +222,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 ""
@@ -309,8 +309,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 "feil under pning av %s for lesing"
@@ -649,7 +649,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
#, fuzzy, c-format
msgid "a format specification for argument '%s' doesn't exist in '%s'"
@@ -690,28 +690,28 @@ 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
+#: 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 ""
@@ -757,11 +757,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"
@@ -770,19 +770,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 "Skrevet av %s.\n"
#. 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 ""
@@ -792,11 +792,11 @@ msgstr ""
msgid "too many arguments"
msgstr "for mange argumenter"
-#: 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
#, fuzzy, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Prv %s --help for mer informasjon.\n"
@@ -834,29 +834,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 ""
@@ -865,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: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
#, fuzzy
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
@@ -879,230 +879,233 @@ msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
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
#, fuzzy, c-format
msgid "at most one input file allowed"
msgstr "trenger nyaktig to innfiler"
-#: 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 "%s og %s utelukker hverandre"
-#: 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
#, fuzzy, c-format
msgid "Input file location:\n"
msgstr "ingen innfil angitt"
-#: 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"
@@ -1111,87 +1114,87 @@ 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
#, fuzzy, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1210,31 +1213,31 @@ msgstr ""
" -V, --version skriv ut programversjon og avslutt\n"
" -w, --width=ANTALL sett sidebredden i utdata\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 "umulig utvalgskriterie angitt (%d < n < %d)"
-#: 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
#, fuzzy, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1264,92 +1267,92 @@ 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: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 "ingen innfiler angitt"
-#: 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 "trenger nyaktig to innfiler"
-#: 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 ""
@@ -1387,19 +1390,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 ""
@@ -1424,17 +1427,17 @@ msgstr "advarsel: denne meldingen er ikke brukt"
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 "denne meldingen er brukt, men ikke definert..."
-#: 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 "... men denne definisjonen ligner"
-#: 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 "denne meldingen er brukt, men ikke definert i %s"
@@ -1444,19 +1447,19 @@ msgstr "denne meldingen er brukt, men ikke definert i %s"
msgid "warning: this message is not used"
msgstr "advarsel: denne meldingen er ikke brukt"
-#: 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] "fant %d fatale feil"
msgstr[1] "fant %d fatale feil"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "minst to filer m angis"
-#: src/msgcomm.c:363
+#: src/msgcomm.c:364
#, fuzzy, c-format, no-wrap
msgid ""
"Find messages which are common to two or more of the specified PO files.\n"
@@ -1485,74 +1488,74 @@ msgstr ""
"PO-filen som definerer dem. Filposisjonene fra alle PO-filene vil\n"
"bli bevart.\n"
-#: 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 "ingen innfil angitt"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, fuzzy, c-format
msgid "exactly one input file required"
msgstr "trenger nyaktig to innfiler"
-#: 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"
@@ -1561,7 +1564,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 ""
@@ -1593,7 +1596,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 ""
@@ -1603,45 +1606,45 @@ msgstr ""
msgid "write to stdout failed"
msgstr ""
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, fuzzy, c-format
msgid "missing filter name"
msgstr "mangler argumenter"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, fuzzy, c-format
msgid "at least one sed script must be specified"
msgstr "minst to filer m angis"
-#: 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 "
@@ -1649,192 +1652,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
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s og %s utelukker hverandre"
+
+#: 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] "%d oversatt melding"
msgstr[1] "%d oversatte meldinger"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d antatt oversettelse"
msgstr[1] ", %d antatte oversettelser"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d uoversatt melding"
msgstr[1] ", %d uoversatte meldinger"
-#: 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 "
@@ -1843,48 +1880,78 @@ msgid ""
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, fuzzy, c-format
msgid "Output file location in C# mode:\n"
msgstr "ingen innfil angitt"
-#: 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"
@@ -1892,33 +1959,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 "
@@ -1926,18 +1993,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 "
@@ -1946,105 +2013,115 @@ 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
#, fuzzy, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr ""
"%s: advarsel: PO-filheader mangler, fuzzy, eller ugyldig\n"
"%*s advarsel: tegnsettkonvertering vil ikke virke"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, fuzzy, c-format
msgid "warning: charset conversion will not work\n"
msgstr ""
"Tegnsettet mangler i headeren.\n"
"Meldingskonvertering til brukerens tegnsett kan ikke virke.\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, fuzzy, c-format
msgid "warning: PO file header fuzzy\n"
msgstr ""
"%s: advarsel: PO-filheader mangler, fuzzy, eller ugyldig\n"
"%*s advarsel: tegnsettkonvertering vil ikke virke"
-#: src/msgfmt.c: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 "domenenavnet %s passer ikke som filnavn"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domenenavnet %s passer ikke som filnavn: bruker prefiks"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "'domain %s' directive ignored"
msgstr "nkkelord domain %s ignorert"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, fuzzy, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "tom msgstr-linje ignorert"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, fuzzy, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "antatt msgstr-linje ignorert"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: advarselL: kildefil har antatte oversettelser"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c: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 "feil under lesing av %s"
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
"specified"
msgstr ""
-#: 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"
@@ -2084,18 +2161,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 ""
@@ -2234,7 +2311,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
#, fuzzy, c-format
msgid "warning: "
msgstr "%s: advarsel: "
@@ -2417,17 +2494,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
#, fuzzy, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "noen filhodefelt har fremdeles sin initielle verdi"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, fuzzy, c-format
msgid "header field '%s' missing in header\n"
msgstr "filhodefelt %s mangler i filhode"
@@ -2447,7 +2524,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
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2464,7 +2541,7 @@ 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
#, fuzzy, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2473,16 +2550,16 @@ msgstr ""
"Tegnsettet \"%s\" er ikke stttet. %s er avhengig av iconv().\n"
"Denne versjonen ble blygget uten iconv().\n"
-#: 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
#, fuzzy, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2507,51 +2584,51 @@ msgstr ""
"resultater. Resultatet blir skrevet til standard ut, med mindre en utfil\n"
"er spesifisert.\n"
-#: 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 "
@@ -2563,7 +2640,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 "
@@ -2571,28 +2648,28 @@ 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
#, fuzzy, c-format
msgid "this message should define plural forms"
msgstr "denne meldingen er brukt, men ikke definert i %s"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, fuzzy, c-format
msgid "this message should not define plural forms"
msgstr "denne meldingen er brukt, men ikke definert i %s"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2601,7 +2678,7 @@ msgstr ""
"%sLeste %ld gamle + %ld referanser, flettet %ld, antok %ld, mangler %ld, "
"foreldete %ld.\n"
-#: 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"
@@ -2699,7 +2776,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"
@@ -2712,12 +2789,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 "
@@ -2785,27 +2862,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "inkonsistent bruk av #~"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, fuzzy, c-format
msgid "missing 'msgstr[]' section"
msgstr "mangler msgstr[]-seksjon"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, fuzzy, c-format
msgid "missing 'msgid_plural' section"
msgstr "mangler msgid_plural-seksjon"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, fuzzy, c-format
msgid "missing 'msgstr' section"
msgstr "mangler msgstr-seksjon"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "frste flertallsform har en ikke-null indeks"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "flertallsform har feil indeks"
@@ -2815,7 +2892,7 @@ msgstr "flertallsform har feil indeks"
msgid "too many errors, aborting"
msgstr "for mange feil, avbryter"
-#: 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 "ulovlig multibytesekvens"
@@ -2859,16 +2936,16 @@ msgstr "slutt-p-linje inne i streng"
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 "denne filen kan ikke inneholde domene-direktiver"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "duplisert definisjon av melding"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
#, fuzzy
msgid "this is the location of the first definition"
msgstr "... dette er lokasjonen til den frste definisjonen"
@@ -3060,17 +3137,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 ""
@@ -3080,14 +3157,14 @@ msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "feil under pning av %s for skriving"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, fuzzy, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr ""
"internasjonaliserte meldinger br ikke inneholde escape-sekvensen \\%c"
-#: 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"
@@ -3096,7 +3173,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"
@@ -3155,7 +3232,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
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "%s:%d: advarsel: uavsluttet strengliteral"
@@ -3165,17 +3242,22 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, fuzzy, c-format
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
+
+#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
-#: 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 "%s:%d: advarsel: uavsluttet strengliteral"
-#: 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 ""
@@ -3219,7 +3301,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
#, fuzzy, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
@@ -3239,22 +3321,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
#, fuzzy, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3307,11 +3389,21 @@ msgid ""
"Please specify the source encoding through --from-code\n"
msgstr ""
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, fuzzy, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: advarsel: uavsluttet strengliteral"
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
+
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: advarsel: uavsluttet strengliteral"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3420,56 +3512,61 @@ msgid ""
"use eval_gettext instead"
msgstr ""
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, fuzzy, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: advarsel: uavsluttet strengliteral"
-#: src/xgettext.c: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 ""
"--join-existing kan ikke brukes nr utdata blir skrevet til standard ut"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext kan ikke arbeide uten finne nkkelord"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, 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, forsker C"
-#: 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
#, fuzzy, c-format
msgid "Choice of input file language:\n"
msgstr "ingen innfil angitt"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3479,44 +3576,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"
@@ -3526,17 +3623,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"
@@ -3546,14 +3643,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 "
@@ -3561,7 +3661,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"
@@ -3571,75 +3671,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 "
@@ -3647,7 +3747,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 "
@@ -3655,52 +3755,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 "standard inn"
-#: 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
#, fuzzy, c-format
msgid "%s%s: warning: "
msgstr "%s: advarsel: "
-#: 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"
@@ -3709,34 +3809,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"
@@ -3744,7 +3844,7 @@ msgid ""
"specify an --msgid-bugs-address command line option.\n"
msgstr ""
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, fuzzy, c-format
msgid "language '%s' unknown"
msgstr "sprket %s er ukjent"
@@ -3753,18 +3853,14 @@ msgstr "sprket %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"
#, fuzzy
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "filhodefelt %s skulle ha startet ved begynnelsen av linjen"
+
+#, fuzzy
#~ msgid "field `%s' still has initial default value\n"
#~ msgstr "feltet %s har fremdeles sin forvalgte verdi"
diff --git a/gettext-tools/po/nl.po b/gettext-tools/po/nl.po
index cf89ea9..c5bae95 100644
--- a/gettext-tools/po/nl.po
+++ b/gettext-tools/po/nl.po
@@ -1,24 +1,25 @@
# Dutch translations for gettext-tools.
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2014 Free Software Foundation, Inc.
# This file is distributed under the same license as the gettext package.
#
+# "Voor de wind."
+#
# Erick Branderhorst <Erick.Branderhorst@asml.nl>, 1996.
-# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2008.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2008, 2014.
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools-0.16.2-pre5\n"
+"Project-Id-Version: gettext-tools-0.19-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2014-05-11 13:12+0200\n"
+"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2008-06-30 19:52+0000\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
#: gnulib-lib/argmatch.c:133
#, c-format
@@ -61,32 +62,32 @@ msgstr "schrijffout"
#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
#, c-format
msgid "preserving permissions for %s"
-msgstr ""
+msgstr "behouden van toegangsrechten van %s"
#: gnulib-lib/copy-file.c:194
-#, fuzzy, c-format
+#, c-format
msgid "error while opening %s for reading"
-msgstr "fout bij openen van '%s' voor lezen"
+msgstr "fout bij openen van %s voor lezen"
#: gnulib-lib/copy-file.c:198
-#, fuzzy, c-format
+#, c-format
msgid "cannot open backup file %s for writing"
-msgstr "kan reservebestand '%s' niet openen voor schrijven"
+msgstr "kan reservekopiebestand %s niet openen voor schrijven"
#: gnulib-lib/copy-file.c:202
-#, fuzzy, c-format
+#, c-format
msgid "error reading %s"
-msgstr "fout bij lezen van '%s'"
+msgstr "fout bij lezen van %s"
#: gnulib-lib/copy-file.c:206
-#, fuzzy, c-format
+#, c-format
msgid "error writing %s"
-msgstr "fout bij schrijven van '%s'"
+msgstr "fout bij schrijven van %s"
#: gnulib-lib/copy-file.c:210
-#, fuzzy, c-format
+#, c-format
msgid "error after reading %s"
-msgstr "fout na lezen van '%s'"
+msgstr "fout na lezen van %s"
#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
@@ -118,60 +119,60 @@ msgid "%s subprocess failed"
msgstr "subproces %s is mislukt"
#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: optie '%s' is niet eenduidig\n"
+msgstr "%s: optie '%s' is niet eenduidig; mogelijkheden zijn:"
#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '--%s' doesn't allow an argument\n"
msgstr "%s: optie '--%s' staat geen argument toe\n"
#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%c%s' doesn't allow an argument\n"
msgstr "%s: optie '%c%s' staat geen argument toe\n"
#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: optie '%s' vereist een argument\n"
+msgstr "%s: optie '--%s' vereist een argument\n"
#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '--%s'\n"
msgstr "%s: onbekende optie '--%s'\n"
#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%c%s'\n"
msgstr "%s: onbekende optie '%c%s'\n"
#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
+#, c-format
msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ongeldige optie -- %c\n"
+msgstr "%s: ongeldige optie -- '%c'\n"
#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
+#, c-format
msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: optie vereist een argument -- %c\n"
+msgstr "%s: optie vereist een argument -- '%c'\n"
#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '-W %s' is ambiguous\n"
msgstr "%s: optie '-W %s' is niet eenduidig\n"
#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr "%s: optie '-W %s' staat geen argument toe\n"
#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: optie '%s' vereist een argument\n"
+msgstr "%s: optie '-W %s' vereist een argument\n"
#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
#: gnulib-lib/javacomp.c:156
@@ -184,15 +185,15 @@ msgstr "ongeldige waarde voor 'source_version' in compile_java_class()"
msgid "invalid target_version argument to compile_java_class"
msgstr "ongeldige waarde voor 'target_version' in compile_java_class()"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c: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 "aanmaken van '%s' is mislukt"
#: 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 "fout bij schrijven van bestand '%s'"
@@ -211,11 +212,11 @@ msgstr "Virtuele Java-machine is niet gevonden; installeer 'gcj' of zet $JAVA"
#: src/msginit.c:1140
#, c-format
msgid "%s subprocess I/O error"
-msgstr "I/O-fout in subproces %s"
+msgstr "In-/uitvoerfout in subproces %s"
-#: 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 "onvoldoende geheugen beschikbaar"
@@ -223,10 +224,10 @@ msgstr "onvoldoende geheugen beschikbaar"
#: gnulib-lib/pipe-filter-ii.c:192
#, c-format
msgid "creation of threads failed"
-msgstr ""
+msgstr "aanmaken van threads is mislukt"
#: 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 "schrijven naar subproces %s is mislukt"
@@ -234,12 +235,12 @@ msgstr "schrijven naar subproces %s is mislukt"
#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
#, c-format
msgid "read from %s subprocess failed"
-msgstr "lezen van subproces %s is mislukt"
+msgstr "lezen uit subproces %s is mislukt"
#: gnulib-lib/pipe-filter-ii.c:298
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
+msgstr "kan geen niet-blokkerende in-/uitvoer instellen naar subproces %s"
#: gnulib-lib/pipe-filter-ii.c:329
#, c-format
@@ -283,7 +284,7 @@ msgstr "’"
#: gnulib-lib/set-acl.c:46
#, c-format
msgid "setting permissions for %s"
-msgstr ""
+msgstr "instellen van toegangsrechten van %s"
#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
@@ -297,9 +298,9 @@ msgid "_open_osfhandle failed"
msgstr "_open_osfhandle() is mislukt"
#: gnulib-lib/w32spawn.h:84
-#, fuzzy, c-format
+#, c-format
msgid "cannot restore fd %d: dup2 failed"
-msgstr "kan uitvoerbestand '%s' niet aanmaken"
+msgstr "kan bestandsdescriptor %d niet herstellen: dup2() is mislukt"
#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
#: gnulib-lib/wait-process.c:317
@@ -313,26 +314,25 @@ 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: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 "fout bij openen van '%s' voor lezen"
#: src/format.c:151
-#, fuzzy, c-format
+#, 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"
+msgstr "'%s' is geen geldige opmaakreeks voor %s, anders dan '%s'. 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-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
+#, c-format
msgid ""
"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
-msgstr "opmaakcode voor argument %u, als in '%s', komt niet voor in 'msgid'"
+msgstr "opmaakcode voor argument %u, als in '%s', komt niet voor in '%s'"
#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
@@ -348,14 +348,14 @@ msgstr "opmaakcode voor argument %u komt niet voor in '%s'"
#: 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
+#, 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"
+msgstr "opmaakcodes in '%s' en '%s' voor argument %u zijn niet hetzelfde"
#: src/format-boost.c:449
#, c-format
msgid "The directive number %u starts with | but does not end with |."
-msgstr "Directiefnummer %u begint met | maar eindigt niet op |."
+msgstr "Directief nummer %u begint met | maar eindigt niet op |."
#: src/format-c.c:36
#, c-format
@@ -363,14 +363,15 @@ 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 directiefnummer %u is de tekenreeks na '<' niet de naam van macro met een "
-"opmaakcode. Juiste macronamen staan opgesomd in ISO C 99, paragraaf 7.8.1."
+"In directief nummer %u is de tekenreeks na '<' niet de naam van een "
+"opmaakcodemacro. Geldige macronamen staan opgesomd in ISO C 99, paragraaf "
+"7.8.1."
#: src/format-c.c:39
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
msgstr ""
-"In directiefnummer %u wordt de tekenreeks na '<' niet gevolgd door '>'."
+"In directief nummer %u wordt de tekenreeks na '<' niet gevolgd door '>'."
#: src/format-c.c:42 src/format-gfc-internal.c:289
#, c-format
@@ -381,19 +382,19 @@ msgstr ""
#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
#: src/format-javascript.c:215 src/format-python.c:515
#: src/format-qt-plural.c:110
-#, fuzzy, c-format
+#, 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"
+msgstr "het aantal opmaakcodes in '%s' en '%s' is niet gelijk"
#: 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 "In directiefnummer %u wordt '{' niet gevolgd door een argumentnummer."
+msgstr "In directief nummer %u wordt '{' niet gevolgd door een argumentnummer."
#: src/format-csharp.c:109
#, c-format
msgid "In the directive number %u, ',' is not followed by a number."
-msgstr "In directiefnummer %u wordt ',' niet gevolgd door een nummer."
+msgstr "In directief nummer %u wordt ',' niet gevolgd door een nummer."
#: src/format-csharp.c:130 src/format-java.c:191
msgid ""
@@ -407,14 +408,13 @@ msgstr ""
msgid ""
"The directive number %u ends with an invalid character '%c' instead of '}'."
msgstr ""
-"Het directiefnummer %u eindigt op een ongeldig karakter '%c' in plaats van "
-"'}'."
+"Het directief nummer %u eindigt op ongeldig teken '%c' in plaats van '}'."
#: src/format-csharp.c:140
#, c-format
msgid "The directive number %u ends with an invalid character instead of '}'."
msgstr ""
-"Het directiefnummer %u eindigt op een ongeldig karakter in plaats van '}'."
+"Het directief nummer %u eindigt op een ongeldig teken in plaats van '}'."
#: src/format-csharp.c:161 src/format-java.c:346
msgid ""
@@ -427,18 +427,19 @@ msgstr ""
#: src/format-csharp.c:162
#, c-format
msgid "The string contains a lone '}' after directive number %u."
-msgstr "De tekenreeks bevat een ongepaarde '}' na directiefnummer %u."
+msgstr "De tekenreeks bevat een ongepaarde '}' na directief nummer %u."
#: src/format-gcc-internal.c:255
#, c-format
msgid "In the directive number %u, the flags combination is invalid."
-msgstr "In directiefnummer %u is de combinatie van vlaggen ongeldig."
+msgstr "In directief nummer %u is de combinatie van vlaggen ongeldig."
#: src/format-gcc-internal.c:292
#, c-format
msgid "In the directive number %u, a precision is not allowed before '%c'."
msgstr ""
-"In directiefnummer %u is geen nauwkeurigheidsaanduiding voor '%c' toegestaan."
+"In directief nummer %u is geen nauwkeurigheidsaanduiding voor '%c' "
+"toegestaan."
#: src/format-gcc-internal.c:334
#, c-format
@@ -446,7 +447,7 @@ msgid ""
"In the directive number %u, the argument number for the precision must be "
"equal to %u."
msgstr ""
-"In directiefnummer %u moet het argumentnummer voor de nauwkeurigheid gelijk "
+"In directief nummer %u moet het argumentnummer voor de nauwkeurigheid gelijk "
"zijn aan %u."
#: src/format-gcc-internal.c:398
@@ -455,39 +456,39 @@ msgid ""
"In the directive number %u, a precision specification is not allowed before "
"'%c'."
msgstr ""
-"In directiefnummer %u is geen nauwkeurigheidsspecificatie toegestaan voor "
+"In directief nummer %u is geen nauwkeurigheidsspecificatie toegestaan voor "
"'%c'."
#: src/format-gcc-internal.c:406
#, c-format
msgid "In the directive number %u, the precision specification is invalid."
-msgstr "In directiefnummer %u is de nauwkeurigheidsspecificatie ongeldig."
+msgstr "In directief nummer %u is de nauwkeurigheidsspecificatie ongeldig."
#: src/format-gcc-internal.c:463
#, c-format
msgid "In the directive number %u, flags are not allowed before '%c'."
msgstr ""
-"In directiefnummer %u zijn geen vlaggen toegestaan voorafgaand aan '%c'."
+"In directief nummer %u zijn geen vlaggen toegestaan voorafgaand aan '%c'."
#: src/format-gcc-internal.c:677
-#, fuzzy, c-format
+#, c-format
msgid "'%s' uses %%m but '%s' doesn't"
-msgstr "'msgid' gebruikt %%m, maar '%s' niet"
+msgstr "'%s' gebruikt %%m, maar '%s' niet"
#: src/format-gcc-internal.c:680
-#, fuzzy, c-format
+#, c-format
msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr "'msgid' gebruikt geen %%m, maar '%s' gebruikt %%m"
+msgstr "'%s' gebruikt geen %%m, maar '%s' gebruikt %%m"
#: src/format-gfc-internal.c:383
-#, fuzzy, c-format
+#, c-format
msgid "'%s' uses %%C but '%s' doesn't"
-msgstr "'msgid' gebruikt %%m, maar '%s' niet"
+msgstr "'%s' gebruikt %%C, maar '%s' niet"
#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
+#, c-format
msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr "'msgid' gebruikt geen %%m, maar '%s' gebruikt %%m"
+msgstr "'%s' gebruikt geen %%C, maar '%s' gebruikt %%C"
#: src/format-invalid.h:22
msgid "The string ends in the middle of a directive."
@@ -505,7 +506,7 @@ msgstr ""
#, c-format
msgid ""
"In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "In directiefnummer %u is argumentnummer 0 geen positief geheel getal."
+msgstr "In directief nummer %u is argumentnummer 0 geen positief geheel getal."
#: src/format-invalid.h:30
#, c-format
@@ -513,7 +514,7 @@ msgid ""
"In the directive number %u, the width's argument number 0 is not a positive "
"integer."
msgstr ""
-"In directiefnummer %u is de breedte's argumentnummer 0 geen positief geheel "
+"In directief nummer %u is de breedte's argumentnummer 0 geen positief geheel "
"getal."
#: src/format-invalid.h:32
@@ -522,7 +523,7 @@ msgid ""
"In the directive number %u, the precision's argument number 0 is not a "
"positive integer."
msgstr ""
-"In directiefnummer %u is de nauwkeurigheid's argumentnummer 0 geen positief "
+"In directief nummer %u is de nauwkeurigheid's argumentnummer 0 geen positief "
"geheel getal."
#: src/format-invalid.h:36
@@ -531,7 +532,7 @@ msgid ""
"In the directive number %u, the character '%c' is not a valid conversion "
"specifier."
msgstr ""
-"In directiefnummer %u is karakter '%c' geen geldige conversiespecificatie."
+"In directief nummer %u is teken '%c' geen geldige conversiespecificatie."
#: src/format-invalid.h:37
#, c-format
@@ -539,7 +540,7 @@ msgid ""
"The character that terminates the directive number %u is not a valid "
"conversion specifier."
msgstr ""
-"Het karakter waarmee directiefnummer %u afsluit is geen geldige "
+"Het teken waarmee directief nummer %u afsluit is geen geldige "
"conversiespecificatie."
#: src/format-invalid.h:40
@@ -554,19 +555,19 @@ msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
"style."
msgstr ""
-"In directiefnummer %u is deeltekenreeks \"%s\" geen geldige datum/tijdstijl."
+"In directief nummer %u is deeltekenreeks \"%s\" geen geldige datum/tijdstijl."
#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr "In directiefnummer %u wordt \"%s\" niet gevolgd door een komma."
+msgstr "In directief nummer %u wordt \"%s\" niet gevolgd door een komma."
#: src/format-java.c:274
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
msgstr ""
-"In directiefnummer %u is deeltekenreeks \"%s\" geen geldige getallenstijl."
+"In directief nummer %u is deeltekenreeks \"%s\" geen geldige getallenstijl."
#: src/format-java.c:323
#, c-format
@@ -574,13 +575,13 @@ msgid ""
"In the directive number %u, the argument number is not followed by a comma "
"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
msgstr ""
-"In directiefnummer %u wordt het argumentnummer niet gevolgd door een komma "
+"In directief nummer %u wordt het argumentnummer niet gevolgd door een komma "
"en één van \"%s\", \"%s\", \"%s\", \"%s\"."
#: src/format-java.c:572
#, c-format
msgid "In the directive number %u, a choice contains no number."
-msgstr "In directiefnummer %u bevat een keuze geen getal."
+msgstr "In directief nummer %u bevat een keuze geen getal."
#: src/format-java.c:583
#, c-format
@@ -588,14 +589,14 @@ msgid ""
"In the directive number %u, a choice contains a number that is not followed "
"by '<', '#' or '%s'."
msgstr ""
-"In directiefnummer %u bevat een keuze een getal dat niet gevolgd wordt door "
+"In directief nummer %u bevat een keuze een getal dat niet gevolgd wordt door "
"'<', '#' of '%s'."
#: src/format-java.c:745
-#, fuzzy, c-format
+#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "opmaakcode voor argument {%u}, als in '%s', komt niet voor in 'msgid'"
+msgstr "opmaakcode voor argument {%u}, als in '%s', komt niet voor in '%s'"
#: src/format-java.c:756
#, c-format
@@ -603,10 +604,10 @@ msgid "a format specification for argument {%u} doesn't exist in '%s'"
msgstr "opmaakcode voor argument {%u} komt niet voor in '%s'"
#: src/format-java.c:776
-#, fuzzy, c-format
+#, 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"
+msgstr "opmaakcodes in '%s' en '%s' voor argument {%u} zijn niet hetzelfde"
#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
#: src/format-scheme.c:2375
@@ -615,8 +616,8 @@ msgid ""
"In the directive number %u, parameter %u is of type '%s' but a parameter of "
"type '%s' is expected."
msgstr ""
-"In directiefnummer %u is parameter %u van type '%s' maar wordt een parameter "
-"van type '%s' verwacht."
+"In directief nummer %u is parameter %u van type '%s' maar wordt een "
+"parameter van type '%s' verwacht."
#: src/format-lisp.c:2372 src/format-scheme.c:2398
#, c-format
@@ -627,21 +628,21 @@ msgid_plural ""
"In the directive number %u, too many parameters are given; expected at most "
"%u parameters."
msgstr[0] ""
-"In directiefnummer %u zijn teveel parameters opgegeven; maximaal %u "
+"In directief nummer %u zijn te veel parameters opgegeven; maximaal %u "
"parameter wordt verwacht."
msgstr[1] ""
-"In directiefnummer %u zijn teveel parameters opgegeven; maximaal %u "
+"In directief nummer %u zijn te veel parameters opgegeven; maximaal %u "
"parameters worden verwacht."
#: src/format-lisp.c:2496 src/format-scheme.c:2499
#, c-format
msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr "In directiefnummer %u wordt '%c' niet gevolgd door een cijfer."
+msgstr "In directief nummer %u wordt '%c' niet gevolgd door een cijfer."
#: src/format-lisp.c:2736 src/format-scheme.c:2754
#, c-format
msgid "In the directive number %u, the argument %d is negative."
-msgstr "In directiefnummer %u is argument %d negatief."
+msgstr "In directief nummer %u is argument %d negatief."
#: src/format-lisp.c:2805
msgid "The string ends in the middle of a ~/.../ directive."
@@ -657,7 +658,7 @@ msgstr "'-%c' gevonden zonder overeenkomstige '-%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 "In directiefnummer %u zijn zowel de @- en de :-aanpastekens gegeven."
+msgstr "In directief nummer %u zijn zowel de @- en de :-aanpastekens gegeven."
#: src/format-lisp.c:2976 src/format-scheme.c:2973
#, c-format
@@ -665,13 +666,13 @@ msgid ""
"In the directive number %u, '~:[' is not followed by two clauses, separated "
"by '~;'."
msgstr ""
-"In directiefnummer %u is '~:[' niet gevolgd door twee clausules, gescheiden "
+"In directief nummer %u is '~:[' niet gevolgd door twee clausules, gescheiden "
"door een '~;'."
#: src/format-lisp.c:3326 src/format-scheme.c:3263
#, c-format
msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr "In directiefnummer %u is '~;' gebruikt op een onjuiste positie."
+msgstr "In directief nummer %u is '~;' gebruikt op een onjuiste positie."
#: src/format-lisp.c:3432 src/format-scheme.c:3355
msgid "The string refers to some argument in incompatible ways."
@@ -679,14 +680,14 @@ msgstr ""
"De tekenreeks verwijst naar enig argument op niet-compatibele manieren."
#: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, fuzzy, c-format
+#, c-format
msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "de opmaakcodes in 'msgid' en '%s' zijn niet gelijkwaardig"
+msgstr "de opmaakcodes in '%s' en '%s' zijn niet gelijkwaardig"
#: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, fuzzy, c-format
+#, c-format
msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr "de opmaakcodes in '%s' zijn geen subset van die in 'msgid'"
+msgstr "de opmaakcodes in '%s' zijn geen subset van die in '%s'"
#: src/format-perl.c:433
#, c-format
@@ -694,11 +695,11 @@ msgid ""
"In the directive number %u, the size specifier is incompatible with the "
"conversion specifier '%c'."
msgstr ""
-"In directiefnummer %u is de groottespecificatie niet-compatibel met de "
+"In directief nummer %u is de groottespecificatie niet-compatibel met de "
"conversiespecificatie '%c'."
#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c: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'"
@@ -720,69 +721,66 @@ msgstr ""
"wijze."
#: src/format-python.c:430
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
msgstr ""
-"de opmaakcodes in 'msgid' verwachten een afbeelding, die in '%s' verwachten "
-"een tupel"
+"de opmaakcodes in '%s' verwachten een afbeelding, die in '%s' een tupel"
#: src/format-python.c:437
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
msgstr ""
-"opmaakcodes in 'msgid' verwachten een tuple, terwijl die in '%s' een "
-"afbeelding verwachten"
+"de opmaakcodes in '%s' verwachten een tupel, die in '%s' een afbeelding"
#: src/format-python.c:460 src/format-sh.c:297
-#, fuzzy, c-format
+#, c-format
msgid ""
"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr "opmaakcode voor argument '%s', als in '%s', komt niet voor in 'msgid'"
+msgstr "opmaakcode voor argument '%s', als in '%s', komt niet voor in '%s'"
#: src/format-python.c:494
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr ""
-"de opmaakcodes in 'msgid' en '%s' voor argument '%s' zijn niet hetzelfde"
+msgstr "de opmaakcodes in '%s' en '%s' voor argument '%s' zijn niet hetzelfde"
-#: src/format-python-brace.c:136
-#, fuzzy, c-format
+#: src/format-python-brace.c:137
+#, 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."
+msgstr "In directief nummer %u kan '%c' geen veldnaam beginnen."
-#: src/format-python-brace.c:149
-#, fuzzy, c-format
+#: src/format-python-brace.c:150
+#, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "In directiefnummer %u wordt '{' niet gevolgd door een argumentnummer."
+msgstr "In directief nummer %u kan '%c' geen 'getattr'-argument beginnen."
-#: src/format-python-brace.c:164
-#, fuzzy, c-format
+#: src/format-python-brace.c:165
+#, 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."
+msgstr "In directief nummer %u kan '%c' geen 'getitem'-argument beginnen."
-#: src/format-python-brace.c:184
-#, fuzzy, c-format
+#: src/format-python-brace.c:185
+#, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
msgstr ""
-"In directiefnummer %u is geen nauwkeurigheidsaanduiding voor '%c' toegestaan."
+"In directiefnummer %u is geen nesting meer toegestaan in een opmaakcode."
-#: src/format-python-brace.c:210
-#, fuzzy, c-format
+#: src/format-python-brace.c:270
+#, c-format
msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "In directiefnummer %u is argument %d negatief."
+msgstr "In directief nummer %u is er een onafgemaakte opmaakcode."
#: src/format-qt.c:152
-#, fuzzy, c-format
+#, c-format
msgid ""
"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
"a double-digit argument number"
msgstr ""
-"'msgid' is een eenvoudige opmaakcode maar '%s' is dat niet: het bevat een "
-"'L'-vlag of een argumentnummer met dubbele cijfers."
+"'%s' is een eenvoudige opmaakcode maar '%s' is dat niet: het bevat een 'L'-"
+"vlag of een argumentnummer met dubbele cijfers"
#: src/format-sh.c:79
msgid "The string refers to a shell variable with a non-ASCII name."
@@ -809,7 +807,7 @@ msgstr ""
msgid ""
"In the directive number %u, the character '%c' is not a digit between 1 and "
"9."
-msgstr ""
+msgstr "In directief nummer %u is teken '%c' geen cijfer tussen 1 en 9."
#: src/format-ycp.c:91
#, c-format
@@ -817,12 +815,13 @@ msgid ""
"The character that terminates the directive number %u is not a digit between "
"1 and 9."
msgstr ""
+"Het teken waarmee directief nummer %u afsluit is geen cijfer tussen 1 en 9."
-#: src/hostname.c:178 src/msgattrib.c: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"
@@ -836,19 +835,19 @@ 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: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 "Geschreven door %s.\n"
#. 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 "Bruno Haible"
@@ -858,12 +857,12 @@ msgstr "Bruno Haible"
msgid "too many arguments"
msgstr "te veel argumenten"
-#: src/hostname.c:207 src/msgattrib.c:410 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
-#: src/msgfilter.c:384 src/msgfmt.c:650 src/msggrep.c:507 src/msginit.c:358
-#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:828
-#, fuzzy, c-format
+#: 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 "Typ '%s --help' voor meer informatie.\n"
@@ -900,29 +899,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: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 "Informatieve uitvoer:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help deze hulptekst tonen en stoppen\n"
-#: 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 " -V, --version programmaversie tonen en stoppen\n"
@@ -931,11 +930,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: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 ""
"Rapporteer gebreken in het programma aan <bug-gnu-gettext@gnu.org>;\n"
@@ -946,231 +945,234 @@ msgstr ""
msgid "could not get host name"
msgstr "kan hostnaam niet verkrijgen"
-#: 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 "hoogstens één invoerbestand is toegestaan"
-#: 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 "%s en %s sluiten elkaar uit"
-#: 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 "Gebruik: %s [OPTIE...] [INVOERBESTAND]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
"and manipulates the attributes.\n"
msgstr ""
-#: 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 ""
"Een verplicht argument bij een lange optie geldt ook voor de korte vorm.\n"
-#: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
-#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
-#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
-#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
+#: src/msgattrib.c:433 src/msgcat.c: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 "Locatie van invoerbestand:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " INVOERBESTAND in te lezen PO-bestand\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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 "Locatie van uitvoerbestand:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 "Berichtenselectie:\n"
-#: 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 "Uitvoerdetails:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1179,118 +1181,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 "Gebruik: %s [OPTIE...] [INVOERBESTAND]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1304,92 +1306,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 " INVOERBESTAND... invoerbestanden\n"
-#: 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 "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "geen invoerbestanden gegeven"
-#: 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 "precies twee invoerbestanden zijn vereist"
-#: 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 "Gebruik: %s [OPTIE...] bestaande.po referentie.pot\n"
@@ -1422,19 +1424,19 @@ msgstr " bestaande.po bestaand bestand met vertalingen\n"
msgid " ref.pot references to the sources\n"
msgstr " referentie.pot verwijzingen naar de programmatekst\n"
-#: src/msgcmp.c:239 src/msgmerge.c: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 ""
@@ -1459,17 +1461,17 @@ msgstr "dit bericht is onvertaald"
msgid "this message needs to be reviewed by the translator"
msgstr "dit bericht moet door een vertaler gecontroleerd worden"
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1505
#, c-format
msgid "this message is used but not defined..."
msgstr "dit bericht wordt gebruikt maar is niet gedefinieerd..."
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1508
#, c-format
msgid "...but this definition is similar"
msgstr "...maar de definitie is gelijksoortig"
-#: 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 "dit bericht wordt gebruikt maar is niet gedefinieerd in %s"
@@ -1479,19 +1481,19 @@ msgstr "dit bericht wordt gebruikt maar is niet gedefinieerd in %s"
msgid "warning: this message is not used"
msgstr "waarschuwing: dit bericht wordt niet gebruikt"
-#: src/msgcmp.c:553 src/msgfmt.c: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] "%d fatale fout gevonden"
msgstr[1] "%d fatale fouten gevonden"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "er moeten minstens twee bestanden opgegeven worden"
-#: 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"
@@ -1504,74 +1506,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 "geen invoerbestand gegeven"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "precies één invoerbestand is vereist"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Gebruik: %s [OPTIE...] INVOERBESTAND\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1580,7 +1582,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 ""
@@ -1612,7 +1614,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 ""
@@ -1622,27 +1624,27 @@ msgstr ""
msgid "write to stdout failed"
msgstr "schrijven naar standaarduitvoer is mislukt"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "ontbrekende filternaam"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr "er moet minstens één sed-script gegeven worden"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Gebruik: %s [OPTIE...] FILTER [FILTEROPTIE...]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "Een filter toepassen op alle vertalingen in een PO-bestand.\n"
-#: 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"
@@ -1651,18 +1653,18 @@ msgstr ""
"Het FILTER kan elk programma zijn dat een bericht leest van standaardinvoer\n"
"en een gewijzigd bericht naar standaarduitvoer schrijft.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "Nuttige FILTEROPTIEs als het FILTER 'sed' is:\n"
-#: 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 "
@@ -1670,104 +1672,125 @@ 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 "Ulrich Drepper"
-#: 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 "%s en %s sluiten elkaar uit in %s"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr ""
-#: 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] "%d vertaald bericht"
msgstr[1] "%d vertaalde berichten"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d vage gelijkenis"
msgstr[1] ", %d vage gelijkenissen"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d onvertaald bericht"
msgstr[1] ", %d onvertaalde berichten"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Gebruik: %s [OPTIE] bestandsnaam.po...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "Uit een vertalingenbestand een binaire berichtencatalogus genereren.\n"
-#: 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"
@@ -1776,88 +1799,101 @@ msgstr ""
"Een verplicht of optioneel argument bij een lange optie\n"
"geldt ook voor de korte vorm.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
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:890
+#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Werkingsmodus:\n"
-#: 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 "Locatie van uitvoerbestand in Java-modus:\n"
-#: 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 "
@@ -1866,48 +1902,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 "Locatie van uitvoerbestand in C#-modus:\n"
-#: 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 "Locatie van uitvoerbestand in Tcl-modus:\n"
-#: 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"
@@ -1915,33 +1981,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 "
@@ -1949,18 +2015,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 "
@@ -1969,87 +2035,97 @@ 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 "waarschuwing: PO-kopregels ontbreken of zijn ongeldig\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "waarschuwing: tekensetconversie zal niet werken\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "waarschuwing: PO-kopregels zijn gemarkeerd als 'fuzzy'\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "waarschuwing: oudere versies van 'msgfmt' vinden dit een fout\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domeinnaam '%s' is niet bruikbaar als bestandsnaam"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"domeinnaam '%s' is niet bruikbaar als bestandsnaam: voorvoegsel wordt "
"gebruikt"
-#: src/msgfmt.c:955
-#, fuzzy, c-format
+#: src/msgfmt.c:1095
+#, c-format
msgid "'domain %s' directive ignored"
msgstr "directief 'domain %s' is genegeerd"
-#: src/msgfmt.c:1015
-#, fuzzy, c-format
+#: src/msgfmt.c:1155
+#, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "leeg 'msgstr'-item is genegeerd"
-#: src/msgfmt.c:1016
-#, fuzzy, c-format
+#: src/msgfmt.c:1156
+#, c-format
msgid "fuzzy 'msgstr' entry ignored"
-msgstr "vaag 'msgstr'-item is genegeerd"
+msgstr "fuzzy 'msgstr'-item is genegeerd"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s: waarschuwing: bronbestand bevat vage vertaling"
+msgstr "%s: waarschuwing: bronbestand bevat fuzzy vertaling"
+
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr "%s bestaat niet"
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr "%s bestaat maar kan deze niet lezen"
#: 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 "fout tijdens lezen van '%s'"
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2058,14 +2134,14 @@ msgstr ""
"optie '%c' kan niet gebruikt worden voordat\n"
"'J' of 'K' of 'T' of 'C' of 'X' gegeven is"
-#: 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"
@@ -2105,18 +2181,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 ""
@@ -2236,26 +2312,28 @@ msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr ""
#: src/msgl-cat.c:203
-#, fuzzy, c-format
+#, c-format
msgid ""
"input file '%s' doesn't contain a header entry with a charset specification"
-msgstr "invoerbestand bevat geen kopregel met een tekensetspecificatie"
+msgstr "invoerbestand '%s' bevat geen kopregel met een tekensetspecificatie"
#: src/msgl-cat.c:207
-#, fuzzy, c-format
+#, c-format
msgid ""
"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
"charset specification"
-msgstr "invoerbestand bevat geen kopregel met een tekensetspecificatie"
+msgstr ""
+"domein '%s' in invoerbestand '%s' bevat geen kopregel met een "
+"tekensetspecificatie"
#: src/msgl-cat.c:391 src/msgl-iconv.c:375
#, c-format
msgid "target charset \"%s\" is not a portable encoding name."
-msgstr "doeltekensetnaam '%s' is geen overdraagbare coderingsnaam"
+msgstr "doeltekenset '%s' is geen overdraagbare codering"
#: 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 "waarschuwing: "
@@ -2401,32 +2479,28 @@ msgid ""
msgstr ""
#: src/msgl-check.c:611
-#, fuzzy
msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
msgstr "'msgid' en 'msgid_plural' beginnen niet beide met '\\n'"
#: src/msgl-check.c:619
-#, fuzzy, c-format
+#, c-format
msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
msgstr "'msgid' en 'msgstr[%u]' beginnen niet beide met '\\n'"
#: src/msgl-check.c:634
-#, fuzzy
msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
msgstr "'msgid' en 'msgstr' beginnen niet beide met '\\n'"
#: src/msgl-check.c:652
-#, fuzzy
msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
msgstr "'msgid' en 'msgid_plural' eindigen niet beide met '\\n'"
#: src/msgl-check.c:660
-#, fuzzy, c-format
+#, c-format
msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
msgstr "'msgid' en 'msgstr[%u]' eindigen niet beide met '\\n'"
#: src/msgl-check.c:675
-#, fuzzy
msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
msgstr "'msgid' en 'msgstr' eindigen niet beide met '\\n'"
@@ -2439,18 +2513,18 @@ msgstr "meervoudsvormen zijn een uitbreiding van GNU gettext"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "sneltoetsmarkering '%c' ontbreekt in 'msgstr'"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "'msgstr' bevat te veel '%c'-sneltoetsmarkeringen"
-#: src/msgl-check.c:801
-#, fuzzy, c-format
+#: src/msgl-check.c:804
+#, c-format
msgid "header field '%s' still has the initial default value\n"
-msgstr "sommige kopvelden hebben nog de standaardwaarde\n"
+msgstr "kopveld '%s' heeft nog de standaardwaarde\n"
-#: src/msgl-check.c:816
-#, fuzzy, c-format
+#: src/msgl-check.c:820
+#, c-format
msgid "header field '%s' missing in header\n"
msgstr "kopveld '%s' ontbreekt in PO-kopregels\n"
@@ -2469,7 +2543,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: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 "
@@ -2484,23 +2558,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 "%s is alleen geldig met %s"
-#: 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"
@@ -2524,52 +2598,52 @@ msgstr ""
"Wanneer er geen exacte overeenkomst is, wordt er ook naar vage gelijkenissen\n"
"gekeken, om een beter resultaat te produceren.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " bestaande.po bestaand bestand met oude vertalingen\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr ""
" referentie.pot verwijzingen naar nieuwe programmatekst\n"
-#: 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 "Locatie van uitvoerbestand in update-modus:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Het resultaat wordt teruggeschreven naar bestaande.po.\n"
-#: 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 "
@@ -2581,7 +2655,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 "
@@ -2589,28 +2663,28 @@ 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 "dit bericht dient meervouden te definiëren"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
msgstr "dit bericht dient geen meervouden te definiëren"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2619,7 +2693,7 @@ msgstr ""
"%s Gelezen: %ld bestaande plus %ld referentiebestanden -- %ld overgenomen, "
"%ld vervanderd, %ld ontbreken, %ld verouderd.\n"
-#: 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"
@@ -2717,7 +2791,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"
@@ -2730,12 +2804,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 "
@@ -2773,11 +2847,11 @@ msgstr ""
#: src/po-charset.c:578 src/po-charset.c:616
msgid "Continuing anyway, expect parse errors."
-msgstr ""
+msgstr "Toch doorgegaan -- verwacht ontledingsfouten."
#: src/po-charset.c:580
msgid "Continuing anyway."
-msgstr ""
+msgstr "Toch doorgegaan."
#: src/po-charset.c:607
#, c-format
@@ -2801,27 +2875,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "inconsistent gebruik van '#~'"
-#: src/po-gram-gen.y:240
-#, fuzzy, c-format
+#: src/po-gram-gen.y:243
+#, c-format
msgid "missing 'msgstr[]' section"
-msgstr "ontbrekende 'msgstr[]'"
+msgstr "ontbrekende 'msgstr[]'-sectie"
-#: src/po-gram-gen.y:249
-#, fuzzy, c-format
+#: src/po-gram-gen.y:252
+#, c-format
msgid "missing 'msgid_plural' section"
-msgstr "ontbrekende 'msgid_plural'"
+msgstr "ontbrekende 'msgid_plural'-sectie"
-#: src/po-gram-gen.y:257
-#, fuzzy, c-format
+#: src/po-gram-gen.y:260
+#, c-format
msgid "missing 'msgstr' section"
-msgstr "ontbrekende 'msgstr'"
+msgstr "ontbrekende 'msgstr'-sectie"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "eerste meervoudsvorm heeft een index ongelijk aan nul"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "meervoudsvorm heeft een onjuiste index"
@@ -2831,7 +2905,7 @@ msgstr "meervoudsvorm heeft een onjuiste index"
msgid "too many errors, aborting"
msgstr "te veel fouten -- gestopt"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c: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 "ongeldige multibyte-sequentie"
@@ -2875,16 +2949,16 @@ 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:1023
+#: src/read-catalog.c:318 src/xgettext.c:1046
#, c-format
msgid "this file may not contain domain directives"
msgstr "dit bestand mag geen domeindirectieven bevatten"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "dubbele definitie van een bericht"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "dit is de plek van de eerste definitie"
@@ -2929,11 +3003,11 @@ msgstr "waarschuwing: onafgesloten sleutel/waarde-paar"
#: src/read-stringtable.c:939
msgid "warning: syntax error, expected ';' after string"
-msgstr "waarschuwing: syntaxfout -- na tekenreeks werd ';' verwacht"
+msgstr "waarschuwing: syntaxfout -- na een tekenreeks werd ';' verwacht"
#: src/read-stringtable.c:948
msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "waarschuwing: syntaxfout -- na tekenreeks werd '=' of ';' verwacht"
+msgstr "waarschuwing: syntaxfout -- na een tekenreeks werd '=' of ';' verwacht"
#: src/recode-sr-latin.c:116
#, c-format
@@ -2951,7 +3025,7 @@ msgstr "Danilo Šegan"
#: src/recode-sr-latin.c:153
#, c-format, no-wrap
msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr ""
+msgstr "Hercodeert Servische tekst van Cyrillisch naar Latijns schrift.\n"
#: src/recode-sr-latin.c:156
#, c-format, no-wrap
@@ -3005,17 +3079,17 @@ msgstr "fout na lezen van '%s'"
#: src/urlget.c:264
#, c-format
msgid "Retrieving %s..."
-msgstr ""
+msgstr "Ophalen van %s..."
#: src/urlget.c:308
#, c-format
msgid " timed out.\n"
-msgstr ""
+msgstr " duurde te lang.\n"
#: src/urlget.c:445
#, c-format
msgid " failed.\n"
-msgstr ""
+msgstr " is mislukt.\n"
#: src/write-catalog.c:126
msgid ""
@@ -3072,17 +3146,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 ""
@@ -3092,14 +3166,14 @@ msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "fout bij openen van '%s' voor schrijven"
-#: src/write-po.c:803
-#, fuzzy, c-format
+#: src/write-po.c:875
+#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr ""
"geïnternationaliseerde berichten horen geen '\\%c'-stuurcodes te bevatten"
-#: 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"
@@ -3108,7 +3182,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"
@@ -3167,7 +3241,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 "%s:%d: waarschuwing: onafgesloten tekenreeks"
@@ -3177,17 +3251,22 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, c-format
+msgid "warning: invalid Unicode character"
+msgstr "waarschuwing: ongeldig Unicode-teken"
+
+#: 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 "%s:%d: waarschuwing: onafgesloten tekenconstante"
-#: 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 "%s:%d: waarschuwing: onafgesloten tekenreeks"
-#: 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 ""
@@ -3231,7 +3310,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 "%s:%d: waarschuwing: ongeldig Unicode-teken"
@@ -3251,22 +3330,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: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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3317,11 +3396,21 @@ msgid ""
"Please specify the source encoding through --from-code\n"
msgstr ""
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, fuzzy, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
+#: src/x-javascript.c:1055
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: waarschuwing: %s is niet toegestaan"
+
+#: src/x-javascript.c:1069
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: waarschuwing: onafgesloten XML-opmaak"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3406,7 +3495,7 @@ msgstr ""
#: src/x-python.c:722
#, c-format
msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr ""
+msgstr "Onbekende codering '%s'. Verdergegaan met ASCII."
#: src/x-rst.c:108
#, c-format
@@ -3430,59 +3519,64 @@ msgid ""
"use eval_gettext instead"
msgstr ""
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, fuzzy, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
-#: 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 ""
"'--join-existing' kan niet gebruikt worden wanneer uitvoer naar "
"standaarduitvoer wordt geschreven"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr ""
-#: src/xgettext.c:785
-#, fuzzy, c-format
+#: src/xgettext.c:808
+#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr ""
"waarschuwing: onbekende extensie '%2$s' van bestand '%1$s'; C wordt "
"aangenomen"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
-msgstr "Vertaalbare berichten extraheren uit de gegeven invoerbestanden.\n"
+msgstr "Extraheert vertaalbare berichten uit de gegeven invoerbestanden.\n"
-#: 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"
@@ -3492,44 +3586,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"
@@ -3539,17 +3633,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"
@@ -3559,14 +3653,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 "
@@ -3574,7 +3671,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"
@@ -3584,75 +3681,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 "
@@ -3660,7 +3757,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 "
@@ -3668,52 +3765,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 "standaardinvoer"
-#: 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 "%s%s: waarschuwing: "
-#: 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"
@@ -3722,34 +3819,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"
@@ -3757,8 +3854,8 @@ msgid ""
"specify an --msgid-bugs-address command line option.\n"
msgstr ""
-#: src/xgettext.c:3267
-#, fuzzy, c-format
+#: src/xgettext.c:3638
+#, c-format
msgid "language '%s' unknown"
msgstr "taal '%s' is onbekend"
@@ -3766,13 +3863,6 @@ 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"
@@ -3782,5 +3872,5 @@ msgstr "<ongenoemd>"
#~ msgid "Not yet implemented."
#~ msgstr "Nog niet geïmplementeerd."
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "kopveld '%s' heeft nog de standaardwaarde\n"
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "kopveld '%s' moet aan het begin van de regel beginnen\n"
diff --git a/gettext-tools/po/nn.po b/gettext-tools/po/nn.po
index 48b44c1..db5cb81 100644
--- a/gettext-tools/po/nn.po
+++ b/gettext-tools/po/nn.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU gettext-tools 0.17\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: 2009-06-17 22:37+0200\n"
"Last-Translator: Eirik U. Birkeland <eirbir@gmail.com>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
"Language: nn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8-bit\n"
"X-Generator: Lokalize 0.3\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -183,15 +183,15 @@ msgstr "Ugyldig «source_version»-argument til «compile_java_class»"
msgid "invalid target_version argument to compile_java_class"
msgstr "Ugyldig «target_version»-argument til «compile_java_class»"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c: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 "Klarte ikkje oppretta «%s»"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c: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 "Feil under skriving av fila «%s»"
@@ -216,9 +216,9 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr "Inn/ut-feil i underprosessen %s"
-#: 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 "Tomt for minne"
@@ -229,15 +229,15 @@ 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 ""
#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
-#, fuzzy, c-format
+#, c-format
msgid "read from %s subprocess failed"
-msgstr "Underprosessen %s var mislukka"
+msgstr ""
#: gnulib-lib/pipe-filter-ii.c:298
#, c-format
@@ -245,9 +245,9 @@ msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr ""
#: gnulib-lib/pipe-filter-ii.c:329
-#, fuzzy, c-format
+#, c-format
msgid "communication with %s subprocess failed"
-msgstr "Underprosessen %s var mislukka"
+msgstr ""
#: gnulib-lib/pipe-filter-ii.c:449
#, c-format
@@ -316,8 +316,8 @@ 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: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 "Feil ved opning av fila «%s» for lesing"
@@ -706,7 +706,7 @@ msgstr ""
"omgjeringsspesifikasjonen «%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-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'"
@@ -753,28 +753,28 @@ 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
+#: src/format-python-brace.c:137
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
msgstr "I direktivnummer %u er ikkje «%c» etterfølgt av eit tal."
-#: src/format-python-brace.c:149
+#: src/format-python-brace.c:150
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
msgstr "I direktivnummer %u er ikkje «{» etterfølgt av eit argumentnummer."
-#: src/format-python-brace.c:164
+#: src/format-python-brace.c:165
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
msgstr "I direktivnummer %u er ikkje «%c» etterfølgt av eit tal."
-#: src/format-python-brace.c:184
+#: src/format-python-brace.c:185
#, fuzzy, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
msgstr "I direktivnummer %u er det ikkje lov med ei presisering før «%c»."
-#: src/format-python-brace.c:210
+#: src/format-python-brace.c:270
#, fuzzy, c-format
msgid "In the directive number %u, there is an unterminated format directive."
msgstr "I direktivnummer %u er argumentet «%d» negativt."
@@ -820,11 +820,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"
@@ -837,19 +837,19 @@ 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: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 "Skrive av %s.\n"
#. 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 "Bruno Haible"
@@ -859,11 +859,11 @@ msgstr "Bruno Haible"
msgid "too many arguments"
msgstr "For mange argument"
-#: 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
#, fuzzy, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Prøv «%s --help» for meir informasjon.\n"
@@ -901,29 +901,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 ""
@@ -932,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: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 ""
@@ -945,230 +945,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 "%s og %s utelukker kvarandre"
-#: 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
#, fuzzy, c-format
msgid "Input file location:\n"
msgstr "inga innfil spesifisert"
-#: 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"
@@ -1177,118 +1180,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"
@@ -1302,92 +1305,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
#, fuzzy, c-format
msgid "no input files given"
msgstr "inga innfil spesifisert"
-#: 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 "treng nøyaktig to innfiler"
-#: 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 ""
@@ -1424,19 +1427,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 ""
@@ -1461,17 +1464,17 @@ msgstr "advarsel: denne meldinga er ikkje brukt"
msgid "this message needs to be reviewed by the translator"
msgstr ""
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1505
#, c-format
msgid "this message is used but not defined..."
msgstr "denne meldinga er brukt, men ikkje definert..."
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1508
#, c-format
msgid "...but this definition is similar"
msgstr "... men denne definisjonen liknar"
-#: 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 "denne meldinga er brukt, men ikkje definert i %s"
@@ -1481,19 +1484,19 @@ msgstr "denne meldinga er brukt, men ikkje definert i %s"
msgid "warning: this message is not used"
msgstr "advarsel: denne meldinga er ikkje brukt"
-#: src/msgcmp.c:553 src/msgfmt.c:545
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
#, fuzzy, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "fann %d fatale feil"
msgstr[1] "fann %d fatale feil"
-#: 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"
@@ -1506,74 +1509,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 "inga innfil spesifisert"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, fuzzy, c-format
msgid "exactly one input file required"
msgstr "treng nøyaktig to innfiler"
-#: 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"
@@ -1582,7 +1585,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 ""
@@ -1614,7 +1617,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 ""
@@ -1624,45 +1627,45 @@ msgstr ""
msgid "write to stdout failed"
msgstr ""
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, fuzzy, c-format
msgid "missing filter name"
msgstr "manglar argument"
-#: 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 "
@@ -1670,192 +1673,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
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s og %s utelukker kvarandre"
+
+#: 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 "
@@ -1864,48 +1901,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"
@@ -1913,33 +1980,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 "
@@ -1947,18 +2014,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 "
@@ -1967,99 +2034,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 "domenenamnet \"%s\" passar ikkje som filnavn"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domenenamnet \"%s\" passar ikkje som filnavn: brukar prefiks"
-#: src/msgfmt.c: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
#, fuzzy, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "ADVARSEL: kildefila har «fuzzy» oversetjingar"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c: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
#, fuzzy, c-format
msgid "error while reading \"%s\""
msgstr "feil under skriving av fila \"%s\""
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
"specified"
msgstr ""
-#: 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"
@@ -2099,18 +2176,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 ""
@@ -2249,7 +2326,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 ""
@@ -2430,17 +2507,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
#, fuzzy, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "nokre filhovud-felt har framleis sin initielle verdi"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, fuzzy, c-format
msgid "header field '%s' missing in header\n"
msgstr "filhovud-feltet «%s» manglar i filhovud"
@@ -2460,7 +2537,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 "
@@ -2475,23 +2552,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
#, fuzzy, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2516,51 +2593,51 @@ msgstr ""
"resultat. Resultatet vert skrive til standard ut, med mindre ei utfil er\n"
"spesifisert.\n"
-#: 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 "
@@ -2572,7 +2649,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 "
@@ -2580,28 +2657,28 @@ 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
#, fuzzy, c-format
msgid "this message should define plural forms"
msgstr "denne meldinga er brukt, men ikkje definert i %s"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, fuzzy, c-format
msgid "this message should not define plural forms"
msgstr "denne meldinga er brukt, men ikkje definert i %s"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, fuzzy, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2610,7 +2687,7 @@ msgstr ""
"%sLeste %d gamle + %d referansar, fletta inn %d, «fuzzya» %d, manglar %d,\n"
"utdaterte %d.\n"
-#: 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"
@@ -2708,7 +2785,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"
@@ -2721,12 +2798,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 "
@@ -2784,27 +2861,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr ""
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, fuzzy, c-format
msgid "missing 'msgstr[]' section"
msgstr "manglar «msgstr»-seksjon"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, fuzzy, c-format
msgid "missing 'msgid_plural' section"
msgstr "manglar «msgstr»-seksjon"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, fuzzy, c-format
msgid "missing 'msgstr' section"
msgstr "manglar «msgstr»-seksjon"
-#: 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 ""
@@ -2814,7 +2891,7 @@ msgstr ""
msgid "too many errors, aborting"
msgstr "for mange feil, avsluttar"
-#: 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 ""
@@ -2858,16 +2935,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 "denne fila kan ikkje innehalde domene-nøkkelord"
-#: 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
#, fuzzy
msgid "this is the location of the first definition"
msgstr "den første definisjonen finst her"
@@ -3053,17 +3130,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 ""
@@ -3073,14 +3150,14 @@ msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "feil under skriving av fila \"%s\""
-#: src/write-po.c:803
+#: src/write-po.c:875
#, fuzzy, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr ""
"internasjonaliserte meldingar skal ikkje innehalde escape-sekvensen «\\%c»"
-#: src/write-po.c: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"
@@ -3089,7 +3166,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"
@@ -3148,7 +3225,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
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "advarsel: denne meldinga er ikkje brukt"
@@ -3158,17 +3235,22 @@ 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-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 ""
@@ -3212,7 +3294,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 ""
@@ -3232,22 +3314,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"
@@ -3298,11 +3380,21 @@ msgid ""
"Please specify the source encoding through --from-code\n"
msgstr ""
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, fuzzy, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "advarsel: denne meldinga er ikkje brukt"
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "advarsel: denne meldinga er ikkje brukt"
+
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "advarsel: denne meldinga er ikkje brukt"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3411,56 +3503,61 @@ msgid ""
"use eval_gettext instead"
msgstr ""
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, fuzzy, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "advarsel: denne meldinga er ikkje brukt"
-#: src/xgettext.c: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 ""
"--join-existing kan ikkje brukast når utdata vert skrive til standard ut"
-#: 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
#, fuzzy, c-format
msgid "Choice of input file language:\n"
msgstr "inga innfil spesifisert"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3470,44 +3567,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"
@@ -3517,17 +3614,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"
@@ -3537,14 +3634,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 "
@@ -3552,7 +3652,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"
@@ -3562,75 +3662,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 "
@@ -3638,7 +3738,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 "
@@ -3646,52 +3746,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"
@@ -3700,34 +3800,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"
@@ -3735,7 +3835,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 ""
@@ -3744,14 +3844,6 @@ 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"
@@ -3759,6 +3851,10 @@ msgstr ""
#~ msgstr "Feil i «DuplicateHandle», med feilkoden 0x%08x"
#, fuzzy
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "filhovud-feltet «%s» skulle ha starta på byrjinga av linja"
+
+#, fuzzy
#~ msgid "field `%s' still has initial default value\n"
#~ msgstr "feltet «%s» har framleis sin forvalgte verdi"
diff --git a/gettext-tools/po/pa.po b/gettext-tools/po/pa.po
index f0265db..eaa5b6a 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: 2013-07-07 18:21+0900\n"
+"POT-Creation-Date: 2014-06-01 11:19+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"
@@ -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 "\"%s\" ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: 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 "ਫਾਇਲ \"%s\" ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ"
@@ -211,9 +211,9 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr "%s ਸਬ-ਪ੍ਰੋਸੈਸ I/O ਗਲਤੀ"
-#: 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 "%s ਸਬ-ਪਰੋਸੈਸ ਲਈ ਲਿਖਣ ਵਾਸਤੇ ਫੇਲ੍ਹ"
@@ -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 "ਪੜ੍ਹਨ ਵਾਸਤੇ \"%s\" ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
@@ -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"
@@ -776,19 +776,19 @@ msgstr ""
"ਇਹ ਮੁਕਤ/ਮੁਫ਼ਤ ਸਾਫਟਵੇਅਰ ਹੈ: ਤੁਸੀਂ ਇਹ ਬਦਲਣ ਅਤੇ ਮੁੜ-ਵੰਡਣ ਲਈ ਮੁਕਤ ਹੋ।\n"
"ਕੋਈ ਵੀ ਵਾਰੰਟੀ ਨਹੀਂ ਹੈ, ਕਾਨੂੰਨ ਰਾਹੀਂ ਵੱਧ ਵੱਧ ਮਨਜ਼ੂਰੀ ਮੁਤਾਬਕ।\n"
-#: 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 "%s ਵਲੋਂ ਲਿਖਿਆ।\n"
#. 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 "ਬਰੁਨੋ ਹਏਬਲੇ"
@@ -798,11 +798,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
#, fuzzy, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ `%s --help' ਨਾਲ ਕੋਸ਼ਿਸ਼ ਕਰੋ।\n"
@@ -840,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: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 "ਜਾਣਕਾਰੀ ਸਮੇਤ ਆਉਟਪੁੱਟ:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help ਇਹ ਮੱਦਦ ਵੇਖਾਉ ਅਤੇ ਬੰਦ ਕਰੋ\n"
-#: 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 " -V, --version ਆਉਟਪੁੱਟ ਵਰਜਨ ਜਾਣਕਾਰੀ ਅਤੇ ਬੰਦ ਕਰੋ\n"
@@ -871,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: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 "ਬੱਗ ਬਾਰੇ ਜਾਣਕਾਰੀ <bug-gnu-gettext@gnu.org> ਨੂੰ ਭੇਜੋ।\n"
@@ -884,230 +884,233 @@ msgstr "ਬੱਗ ਬਾਰੇ ਜਾਣਕਾਰੀ <bug-gnu-gettext@gnu.org>
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 "ਵਰਤੋਂ: %s [OPTION] [INPUTFILE]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
"and manipulates the attributes.\n"
msgstr ""
-#: 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 "ਇੰਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " INPUTFILE ਇੰਪੁੱਟ PO ਫਾਇਲ\n"
-#: 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 "ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 " -o, --output-file=FILE ਆਉਟਪੁੱਟ ਦਿੱਤੀ ਫਾਇਲ ਵਿੱਚ ਲਿਖੋ\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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 "ਸੁਨੇਹਾ ਚੋਣ:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
msgstr " --translated ਕੀਤਾ ਅਨੁਵਾਦ ਰੱਖੋ, ਨਾ-ਅਨੁਵਾਦ ਸੁਨੇਹਿਆਂ ਨੂੰ ਹਟਾਓ\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
msgstr " --untranslated ਨਾ-ਅਨੁਵਾਦ ਰੱਖੋ, ਕੀਤਾ ਅਨੁਵਾਦ ਸੁਨੇਹੇ ਹਟਾਓ\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr " --no-fuzzy ਅਸਪਸ਼ਟ ('fuzzy') ਨਿਸ਼ਾਨਬੱਧ ਕੀਤੇ ਸੁਨੇਹੇ ਹਟਾਓ\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr ""
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete ਬਰਤਰਫ਼ #~ ਸੁਨੇਹੇ ਹਟਾਓ\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr ""
-#: 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 " --set-fuzzy ਸਭ ਸੁਨੇਹੇ ਅਸਪਸ਼ਟ ('fuzzy') ਬਣਾਓ\n"
-#: 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
+#, fuzzy, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr " --no-fuzzy ਅਸਪਸ਼ਟ ('fuzzy') ਨਿਸ਼ਾਨਬੱਧ ਕੀਤੇ ਸੁਨੇਹੇ ਹਟਾਓ\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
msgstr ""
-#: src/msgattrib.c: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 "ਇੰਪੁੱਟ ਫਾਇਲ ਸੰਟੈਕਸ:\n"
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c: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 "ਆਉਟਪੁੱਟ ਵੇਰਵਾ:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1116,118 +1119,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 "ਵਰਤੋਂ: %s [OPTION] [INPUTFILE]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1241,92 +1244,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 " INPUTFILE ... ਇੰਪੁੱਟ ਫਾਇਲਾਂ\n"
-#: 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 " -f, --files-from=FILE ਫਾਇਲ (FILE) ਤੋਂ ਇੰਪੁੱਟ ਫਾਇਲਾਂ ਦੀ ਸੂਚੀ ਲਵੋ\n"
-#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:854
+#: src/msgcat.c: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 "ਠੀਕ 2 ਇੰਪੁੱਟ ਫਾਇਲਾਂ ਹੀ ਚਾਹੀਦੀਆਂ ਹਨ"
-#: 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 "ਵਰਤੋ: %s [OPTION] def.po ref.pot\n"
@@ -1352,19 +1355,19 @@ msgstr " def.po ਅਨੁਵਾਦ\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot ਸਰੋਤ ਲਈ ਹਵਾਲਾ/ਰੈਫਰੈਂਸ\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "ਓਪਰੇਸ਼ਨ ਮਾਡੀਫਾਇਰ:\n"
-#: 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 ""
@@ -1389,17 +1392,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 "ਇਹ ਸੁਨੇਹਾ ਵਰਤਿਆ ਤਾਂ ਗਿਆ ਹੈ, ਪਰ %s ਵਿੱਚ ਪਰਿਭਾਸ਼ਿਤ ਨਹੀਂ ਹੈ"
@@ -1409,19 +1412,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] "%d ਘਾਤਕ ਗਲਤੀ ਲੱਭੀ"
msgstr[1] "%d ਘਾਤਕ ਗਲਤੀਆਂ ਲੱਭੀਆਂ"
-#: 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"
@@ -1434,74 +1437,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 "ਕਨਵਰਜ਼ਨ ਟਾਰਗੇਟ:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "ਡਿਫਾਲਟ ਇੰਕੋਡਿੰਗ ਮੌਜੂਦਾ ਲੋਕੇਲ ਦੀ ਇੰਕੋਡਿੰਗ ਹੈ।\n"
-#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c: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 "ਵਰਤੋਂ: %s [OPTION] INPUTFILE\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1510,7 +1513,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 " INPUTFILE ਇੰਪੁੱਟ PO ਜਾਂ POT ਫਾਇਲ\n"
@@ -1542,7 +1545,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 " -i, --input=INPUTFILE ਇੰਪੁੱਟ PO ਫਾਇਲ\n"
@@ -1552,45 +1555,45 @@ msgstr " -i, --input=INPUTFILE ਇੰਪੁੱਟ PO ਫਾਇਲ\n"
msgid "write to stdout failed"
msgstr "stdout ਉੱਤੇ ਲਿਖਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
-#: 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 "ਵਰਤੋਂ: %s [OPTION] FILTER [FILTER-OPTION]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "ਅਨੁਵਾਦ ਕੈਟਾਲਾਗ ਲਈ ਸਭ ਅਨੁਵਾਦ ਉੱਤੇ ਇੱਕ ਫਿਲਟਰ ਲਾਗੂ ਕਰੋ।\n"
-#: 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 "
@@ -1598,192 +1601,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 "ਗਲਤ ਅੰਤ(endianness): %s"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
+#: src/msgfmt.c: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 "%s ਲਈ ਇੱਕ \"-d directory\" ਦੇਣ ਦੀ ਲੋੜ ਹੈ"
-#: 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 "%s ਲਈ ਇੱਕ \"-l locale\" ਹਦਾਇਤ ਦੀ ਲੋੜ ਹੈ"
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:538
+#, fuzzy, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s ਲਈ ਇੱਕ \"-l locale\" ਹਦਾਇਤ ਦੀ ਲੋੜ ਹੈ"
+
+#: src/msgfmt.c:545
+#, fuzzy, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s ਲਈ ਇੱਕ \"-l locale\" ਹਦਾਇਤ ਦੀ ਲੋੜ ਹੈ"
+
+#: src/msgfmt.c:551
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr ""
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s ਕੇਵਲ %s ਜਾਂ %s ਲਈ ਹੀ ਢੁੱਕਵਾਂ ਹੈ"
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c: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 "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d ਅਨੁਵਾਦ ਕੀਤਾ ਸੁਨੇਹਾ"
msgstr[1] "%d ਅਨੁਵਾਦ ਕੀਤੇ ਸੁਨੇਹੇ"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d ਅਸਪਸ਼ਟ ਅਨੁਵਾਦ"
msgstr[1] ", %d ਅਸਪਸ਼ਟ ਅਨੁਵਾਦ"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d ਨਾ-ਅਨੁਵਾਦ ਸੁਨੇਹਾ"
msgstr[1] ", %d ਨਾ-ਅਨੁਵਾਦ ਸੁਨੇਹੇ"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "ਵਰਤੋਂ: %s [OPTION] ਫਾਇਲ-ਨਾਂ.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "ਟੈਕਸਟ ਅਨੁਵਾਦ ਵੇਰਵੇ ਤੋਂ ਬਾਈਨਰੀ ਸੁਨੇਹਾ ਕੈਟਾਲਾਗ ਤਿਆਰ ਕਰੋ।\n"
-#: 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 " filename.po ... ਇੰਪੁੱਟ ਫਾਇਲ ਨਾਂ\n"
-#: 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 "ਓਪਰੇਸ਼ਨ ਮੋਡ:\n"
-#: 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 "ਜਾਵਾ ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
-#: 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 " -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
+#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
+#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr " -l, --locale=LOCALE ਲੋਕੇਲ ਨਾਂ, ਜਾਂ ਭਾਸ਼ਾ ਨਾਂ ਜਾਂ ਭਾਸ਼ਾ_ਦੇਸ਼ \n"
-#: 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 " -d DIRECTORY ਕਲਾਸ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਬੇਸ ਡਾਇਰੈਕਟਰੀ\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1792,48 +1829,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 "C# ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
-#: 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 "Tcl ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
-#: 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
+#, fuzzy, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr " -d DIRECTORY ਕਲਾਸ ਡਾਇਰੈਕਟਰੀ ਲੜੀ ਵਿੱਚ ਬੇਸ ਡਾਇਰੈਕਟਰੀ\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "ਇੰਪੁੱਟ ਫਾਇਲ ਇੰਟਰਪਰੇਟੇਸ਼ਨ:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1841,33 +1908,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 "
@@ -1875,18 +1942,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 " -f, --use-fuzzy ਆਉਟਪੁੱਟ ਵਿੱਚ ਅਸਪਸ਼ਟ (fuzzy) ਐਂਟਰੀਆਂ ਵਰਤੋਂ\n"
-#: 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 "
@@ -1895,99 +1962,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 " --statistics ਅਨੁਵਾਦ ਬਾਰੇ ਅੰਕੜੇ ਪੇਸ਼ ਕਰੋ\n"
-#: 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 "ਸਾਵਧਾਨ: PO ਫਾਇਲ ਹੈੱਡਰ ਗੁੰਮ ਹੈ ਜਾਂ ਗਲਤ ਹੈ\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "ਸਾਵਧਾਨ: charset ਬਦਲਣਾ ਕੰਮ ਨਹੀਂ ਕਰੇਗਾ\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "ਸਾਵਧਾਨ: PO ਫਾਇਲ ਹੈੱਡਰ ਅਸਪਸ਼ਟ ਹੈ\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "ਸਾਵਧਾਨ: msgfmt ਦਾ ਪੁਰਾਣਾ ਵਰਜਨ ਇਸ ਉੱਤੇ ਗਲਤੀ ਦੇਵੇਗਾ\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "ਡੋਮੇਨ ਨਾਂ \"%s\" ਫਾਇਲ ਨਾਂ ਲਈ ਢੁੱਕਵਾਂ ਨਹੀਂ ਹੈ"
-#: 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
#, fuzzy, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "ਖਾਲੀ `msgstr' ਐਂਟਰੀ ਅਣ-ਡਿੱਠੀ ਕੀਤੀ ਜਾਵੇਗੀ"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, fuzzy, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "ਅਸਪਸ਼ਟ `msgstr' ਐਂਟਰੀ ਅਣਡਿੱਠੀ ਕੀਤੀ ਜਾਵੇਗੀ"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: ਸਾਵਧਾਨ: ਸਰੋਤ ਫਾਇਲ ਵਿੱਚ ਅਸਪਸ਼ਟ ਅਨੁਵਾਦ ਹੋ ਸਕਦਾ ਹੈ"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c: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 "\"%s\" ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
"specified"
msgstr ""
-#: 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"
@@ -2027,18 +2104,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 " --sort-by-file ਆਉਟਪੁੱਟ ਨੂੰ ਫਾਇਲ ਟਿਕਾਣੇ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕਰੋ\n"
@@ -2186,7 +2263,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 "ਸਾਵਧਾਨ: "
@@ -2373,17 +2450,17 @@ msgstr "ਬਹੁਵਚਨ ਹੈਡਲਿੰਗ ਗਨੂ gettext ਇਕਸਟ
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr ਵਿੱਚ ਕੀਬੋਰਡ ਐਕਸਰਲੇਟਰ ਮਾਰਕ '%c' ਦੀ ਕਮੀ ਹੈ"
-#: 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
#, fuzzy, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "ਹੈੱਡਰ ਖੇਤਰ `%s' ਹਾਲੇ ਵੀ ਮੁੱਢਲਾ ਮੁੱਲ ਰੱਖਦਾ ਹੈ\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, fuzzy, c-format
msgid "header field '%s' missing in header\n"
msgstr "ਹੈੱਡਰ ਵਿੱਚ `%s' ਹੈੱਡਰ ਖੇਤਰ ਗੁੰਮ ਹੈ\n"
@@ -2403,7 +2480,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: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 "
@@ -2418,23 +2495,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 "%s ਕੇਵਲ %s ਨਾਲ ਠੀਕ ਹੈ"
-#: 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"
@@ -2448,51 +2525,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 " def.po ਪੁਰਾਣੇ ਸੋਰਤ ਲਈ ਰੈਫਰੈਂਸ ਅਨੁਵਾਦ\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot ਨਵੇਂ ਸਰੋਤ ਲਈ ਰੈਫਰੈਂਸ\n"
-#: 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 "ਆਉਟਪੁੱਟ ਮੋਡ ਵਿੱਚ ਆਉਟਪੁੱਟ ਫਾਇਲ ਟਿਕਾਣਾ:\n"
-#: 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 "
@@ -2504,7 +2581,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 "
@@ -2512,35 +2589,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"
@@ -2638,7 +2715,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"
@@ -2651,12 +2728,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 "
@@ -2716,27 +2793,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "#~ ਦੀ ਅਨਿਯਮਤ ਵਰਤੋਂ"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, fuzzy, c-format
msgid "missing 'msgstr[]' section"
msgstr "`msgstr[]' ਭਾਗ ਮੌਜੂਦ ਨਹੀਂ"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, fuzzy, c-format
msgid "missing 'msgid_plural' section"
msgstr "ਨਾ-ਮੌਜੂਦ `msgid_plural' ਭਾਗ"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, fuzzy, c-format
msgid "missing 'msgstr' section"
msgstr "ਨਾ-ਮੌਜੂਦ `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 "ਬਹੁਵਚਨ ਰੂਪ ਦਾ ਗਲਤ ਇੰਡੈਕਸ"
@@ -2746,7 +2823,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 "ਗਲਤ ਮਲਟੀਬਾਈਟ ਲੜੀ"
@@ -2790,16 +2867,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 ""
@@ -2984,17 +3061,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 "ਠੀਕ ਜਾਵਾ ਕਲਾਸ ਨਾਂ ਨਹੀਂ ਹੈ: %s"
-#: 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 ""
@@ -3004,13 +3081,13 @@ msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "ਲਿਖਣ ਵਾਸਤੇ \"%s\" ਖੋਲ੍ਹਣ ਦੌਰਾਨ ਗਲਤੀ"
-#: 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"
@@ -3019,7 +3096,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"
@@ -3078,7 +3155,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 "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
@@ -3088,17 +3165,22 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, fuzzy, c-format
+msgid "warning: invalid Unicode character"
+msgstr "ਸਾਵਧਾਨ: ਯੂਨੀਕੋਡ ਅੱਖਰ ਲਈ ਗਲਤ \\uxxxx ਸੰਟੈਕਸ"
+
+#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
#, 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 ""
@@ -3142,7 +3224,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 ""
@@ -3162,22 +3244,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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3228,11 +3310,21 @@ msgid ""
"Please specify the source encoding through --from-code\n"
msgstr ""
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, fuzzy, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
+
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3341,55 +3433,60 @@ msgid ""
"use eval_gettext instead"
msgstr ""
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, fuzzy, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: ਸਾਵਧਾਨ: ਨਾ-ਖਤਮ ਹੋਈ ਲਾਈਨ ਹੈ"
-#: 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 "xgettext ਲੱਭਣ ਵਾਲੇ ਸ਼ਬਦ ਤੋਂ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰ ਸਕਦਾ"
-#: 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 "ਇੰਪੁੱਟ ਫਾਇਲ ਲੈਗੂਇਜ਼ ਦੀ ਚੋਣ:\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3399,44 +3496,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"
@@ -3446,17 +3543,17 @@ msgid ""
" in output file\n"
msgstr ""
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "ਲੈਗੂਇਜ਼ ਖਾਸ ਚੋਣਾਂ:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all ਸਭ ਲਾਇਨਾਂ ਕੱਢੋ\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3466,14 +3563,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 "
@@ -3481,7 +3581,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"
@@ -3491,76 +3591,76 @@ 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 " (ਕੇਵਲ ਲੈਗੂਇਜ਼ C++)\n"
-#: 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 " --package-name=PACKAGE ਆਉਟਪੁੱਟ ਵਿੱਚ ਪੈਕੇਜ ਨਾਂ ਦਿਓ\n"
-#: src/xgettext.c:989
+#: src/xgettext.c:1012
#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr " --package-version=VERSION ਆਉਟਪੁੱਟ ਵਿੱਚ ਪੈਕੇਜ ਵਰਜਨ ਦਿਓ\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
" --msgid-bugs-address=EMAIL@ADDRESS msgid ਬੱਗ ਦੀ ਜਾਣਕਾਰੀ ਐਡਰੈਸ ਉੱਤੇ ਦਿਓ\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -3568,7 +3668,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 "
@@ -3576,52 +3676,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 "%s%s ਉੱਤੇ ਗੈਰ-ASCII ਅੱਖਰ ਹੈ।"
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr "%s%s ਉੱਤੇ ਜਾਂ ਤੋਂ ਪਹਿਲਾਂ ਉੱਤੇ ਗੈਰ-ASCII ਟਿੱਪਣੀ ਹੈ।"
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr "%s%s ਉੱਤੇ ਗੈਰ-ASCII ਲਾਇਨ"
-#: 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 "%s%s: ਸਾਵਧਾਨ: "
-#: 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"
@@ -3630,7 +3730,7 @@ 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"
@@ -3640,27 +3740,27 @@ msgstr ""
"gettext(\"\") ਖਾਲੀ ਲਾਈਨ ਮੋੜਨ ਦੀ ਬਜਾਏ\n"
"ਹੈੱਡਰ ਐਂਟਰੀ ਨਾਲ ਮੇਟਾ ਜਾਣਕਾਰੀ ਮੋੜਦਾ ਹੈ।\n"
-#: 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 "ਸਾਵਧਾਨ: ਸ਼ਬਦ '%.*s' ਲਈ ਪ੍ਰਸੰਗ (context) ਮੌਜੂਦ ਨਹੀਂ"
-#: 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"
@@ -3668,7 +3768,7 @@ msgid ""
"specify an --msgid-bugs-address command line option.\n"
msgstr ""
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, fuzzy, c-format
msgid "language '%s' unknown"
msgstr "ਲੈਗੂਇਜ਼ `%s' ਅਣਜਾਣ"
@@ -3677,8 +3777,7 @@ msgstr "ਲੈਗੂਇਜ਼ `%s' ਅਣਜਾਣ"
msgid "<unnamed>"
msgstr "<ਬਿਨ-ਨਾਂ>"
-#, fuzzy
-#~ msgid "header field '%s' should start at beginning of line\n"
+#~ msgid "header field `%s' should start at beginning of line\n"
#~ msgstr "ਹੈੱਡਰ ਖੇਤਰ `%s' ਲਾਈਨ ਦੇ ਸ਼ੁਰੂ ਵਿੱਚ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ\n"
#~ msgid "some header fields still have the initial default value\n"
diff --git a/gettext-tools/po/pl.po b/gettext-tools/po/pl.po
index cd8d7dc..7f15e8e 100644
--- a/gettext-tools/po/pl.po
+++ b/gettext-tools/po/pl.po
@@ -1,16 +1,16 @@
# Polish translations for the GNU gettext messages, tools domain
-# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, 2005, 2006, 2007, 2010, 2013 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2004, 2005, 2006, 2007, 2010, 2013, 2014 Free Software Foundation, Inc.
# This file is distributed under the same license as the gettext package.
# Piotr Pogorzelski <ppogorze@ippt.gov.pl>, 1995
# Jakub Bogusz <qboosh@pld.org.pl>, 2002, 2003
-# Rafał Maszkowski <rzm@icm.edu.pl>, 1995-1999, 2001, 2003-2007, 2010, 2013
+# Rafał Maszkowski <rzm@icm.edu.pl>, 1995-1999, 2001, 2003-2007, 2010, 2013, 2014
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.18.3\n"
+"Project-Id-Version: GNU gettext-tools 0.19-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-07-07 18:21+0900\n"
-"PO-Revision-Date: 2013-06-25 17:00+0200\n"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2014-05-10 18:15+0200\n"
"Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"Language: pl\n"
@@ -184,15 +184,15 @@ msgstr "błędny argument source_version do compile_java_class"
msgid "invalid target_version argument to compile_java_class"
msgstr "błędny argument target_version do compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c: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 "tworzenie \"%s\" nie powiodło się"
#: 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 "błąd podczas pisania do pliku \"%s\""
@@ -216,9 +216,9 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr "błąd wejścia/wyjścia podprocesu %s"
-#: 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 "pamięć wyczerpana"
@@ -229,7 +229,7 @@ msgid "creation of threads failed"
msgstr "kompilacja wątków nie udała się"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "pisanie do podprocesu %s nie powiodło się"
@@ -316,8 +316,8 @@ msgid "%s subprocess got fatal signal %d"
msgstr "podproces %s otrzymał krytyczny sygnał %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: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 "błąd w czasie otwierania \"%s\" do czytania"
@@ -696,7 +696,7 @@ msgstr ""
"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
+#: 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'"
@@ -746,22 +746,22 @@ msgid ""
msgstr ""
"specyfikacje formatu w „%s” i w „%s” dla argumentu „%s” nie są takie same"
-#: 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 "W dyrektywie numer %u „%c” nie może być początkiem nazwy pola."
-#: 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 "W dyrektywie numer %u „%c” nie może być początkiem argumentu getattr."
-#: 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 "W dyrektywie numer %u „%c” nie może być początkiem argumentu getitem."
-#: 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."
@@ -769,7 +769,7 @@ msgstr ""
"W dyrektywie numer %u w specyfikacji formatu nie może byc więcej poziomów "
"zagłębień."
-#: 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 "W dyrektywie numer %u jest niezakończona dyrektywa formatu."
@@ -823,11 +823,11 @@ msgid ""
"1 and 9."
msgstr "Znak kończący dyrektywę %u nie jest cyfrą od 1 do 9."
-#: src/hostname.c:178 src/msgattrib.c: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"
@@ -840,19 +840,19 @@ msgstr ""
"To jest wolne oprogramowanie: możesz je modyfikować i rozpowszechniać.\n"
"Autorzy NIE DAJĄ GWARANCJI, na ile pozwala na to prawo.\n"
-#: src/hostname.c:184 src/msgattrib.c: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 "Program napisał %s.\n"
#. 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 "Bruno Haible"
@@ -862,11 +862,11 @@ msgstr "Bruno Haible"
msgid "too many arguments"
msgstr "za dużo argumentów"
-#: 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 "Napisz „%s --help” żeby otrzymać więcej informacji.\n"
@@ -907,29 +907,29 @@ msgstr ""
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address adresy komputera\n"
-#: src/hostname.c:228 src/msgattrib.c: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 "Informacje:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help wyświetlenie tego opisu i zakończenie\n"
-#: 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 " -V, --version wypisanie informacji o wersji i zakończenie pracy\n"
@@ -938,11 +938,11 @@ msgstr " -V, --version wypisanie informacji o wersji i zakończen
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/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 "Raporty o błędach prosimy wysyłać do bug-gnu-gettext@gnu.org .\n"
@@ -951,30 +951,27 @@ msgstr "Raporty o błędach prosimy wysyłać do bug-gnu-gettext@gnu.org .\n"
msgid "could not get host name"
msgstr "nie można odczytać nazwy komputera"
-#: 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 "dozwolony najwyżej jeden plik wejściowy"
-#: 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 "%s i %s wzajemnie się wykluczają"
-#: 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 "Składnia: %s [OPCJA] [PLIK-WEJŚCIOWY]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -983,65 +980,65 @@ msgstr ""
"Filtrowanie komunikatów z katalogu tłumaczeń zgodnie z ich atrybutami oraz\n"
"manipulowanie atrybutami.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c: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 ""
"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
-#: 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 "Położenie pliku wejściowego:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " PLIK-WEJŚCIOWY wczytanie pliku PO\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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 ""
" -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
+#: 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 ""
"Jeśli nie podano pliku wejściowego lub plik to -, czytane jest standardowe\n"
"wejście.\n"
-#: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
-#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
-#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
-#: src/xgettext.c:857
+#: src/msgattrib.c:442 src/msgcat.c: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 "Położenie pliku wyjściowego:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 " -o, --output-file=PLIK zapisanie wyniku do podanego pliku\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1051,12 +1048,12 @@ msgstr ""
"podany\n"
"plik to -.\n"
-#: 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 "Wybór komunikatów:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
@@ -1064,7 +1061,7 @@ msgstr ""
" --translated zachowanie przetłumaczonych, usunięcie nie\n"
" przetłumaczonych\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
@@ -1072,64 +1069,64 @@ msgstr ""
" --untranslated zachowanie nie przetłumaczonych, usunięcie\n"
" przetłumaczonych\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr ""
" --no-fuzzy usunięcie komunikatów oznaczonych „fuzzy”\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr ""
" --only-fuzzy zachowanie komunikatów oznaczonych „fuzzy”\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr ""
" --no-obsolete usunięcie przestarzałych komunikatów #~\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr ""
" --only-obsolete zachowanie przestarzałych komunikatów #~\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Manipulowanie atrybutami:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr ""
" --set-fuzzy oznaczenie wszystkich komunikatów jako "
"„fuzzy”\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr ""
" --clear-fuzzy oznaczenie wszystkich komunikatów jako\n"
" nie-„fuzzy”\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr ""
" --set-obsolete oznaczenie wszystkich komunikatów jako\n"
" przestarzałe\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr ""
" --clear-obsolete oznaczenie wszystkich komunikatów jako nie\n"
" przestarzałe\n"
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
@@ -1139,7 +1136,7 @@ msgstr ""
" przetłumaczonych komunikatów przy zaznaczaniu\n"
" jako „fuzzy”\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
@@ -1148,14 +1145,23 @@ msgstr ""
" --clear-previous usunięcie \"previous msgid\" z wszystkich "
"komunikatów\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+" --empty zmiana zawartości msgstr na pustą przy "
+"usuwaniu\n"
+" komunikatów oznaczonych „fuzzy”\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
msgstr ""
" --only-file=PLIK.po modyfikacja tylko wpisów obecnych w PLIKU.po\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
@@ -1163,36 +1169,36 @@ msgstr ""
" --ignore-file=PLIK.po modyfikacja tylko wpisów nie obecnych w PLIKU."
"po\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr " --fuzzy synonim dla --only-fuzzy --clear-fuzzy\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
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
-#: 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 "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
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
" -P, --properties-input plik wejściowy ma składnię .properties Javy\n"
-#: 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 "
@@ -1201,17 +1207,17 @@ msgstr ""
" --stringtable-input plik wejściowy ma składnię .string z\n"
" 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
-#: 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 "Szczegóły dotyczące wyjścia:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1227,17 +1233,17 @@ msgstr ""
"albo\n"
" „html”.\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr ""
" --style=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
+#: 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"
@@ -1245,9 +1251,9 @@ 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
+#: 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"
@@ -1255,37 +1261,37 @@ 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
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr ""
" --force-po zapisanie pliku PO nawet jeśli jest pusty\n"
-#: 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 ""
" -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
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr " --no-location nie zapisywanie linii „#: plik:linia”\n"
-#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:964
+#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
+#: src/xgettext.c:987
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr ""
" -n, --add-location generowanie linii „#: plik:linia” (domyślne)\n"
-#: 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"
@@ -1293,33 +1299,33 @@ 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
-#: 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 " -p, --properties-output zapisanie pliku .properties Javy\n"
-#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
-#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
" --stringtable-output 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
+#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
+#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr ""
" -w, --width=LICZBA ustawienie szerokości strony dla wyjścia\n"
-#: 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"
@@ -1329,32 +1335,32 @@ msgstr ""
"dłuższych\n"
" niż szerokość strony\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output generowanie posortowanego wyjścia\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 ""
" -F, --sort-by-file sortowanie wyjścia według położenia pliku\n"
-#: 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 "podane niemożliwe kryteria selekcji (%d < n < %d)"
-#: 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 "Składnia: %s [OPCJA] [PLIK-WEJŚCIOWY]\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1376,24 +1382,24 @@ msgstr ""
"i pozycje w plikach zostaną zgromadzone, chyba że zostanie podana opcja\n"
"--use-first, wtedy będą skopiowane z pierwszego definiującego je pliku PO.\n"
-#: src/msgcat.c: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 " PLIK-WEJŚCIOWY ... pliki wejściowe\n"
-#: 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 ""
" -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
+#: 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 "Jeśli plik wejściowy to -, czytane jest standardowe wejście.\n"
-#: 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"
@@ -1403,7 +1409,7 @@ msgstr ""
" mniejszą od LICZBY, domyślnie "
"nieskończoności\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1412,7 +1418,7 @@ msgstr ""
" ->, --more-than=LICZBA wypisanie komunikatów z liczbą definicji\n"
" większą od LICZBY, domyślnie 1\n"
-#: 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"
@@ -1421,8 +1427,8 @@ msgstr ""
" -u, --unique skrót dla --less-than=2, żądanie wypisania\n"
" wyłącznie unikalnych komunikatów\n"
-#: 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"
@@ -1430,8 +1436,8 @@ 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
+#: 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"
@@ -1440,12 +1446,12 @@ msgstr ""
" --stringtable-input pliki wejściowe mają składnię .strings\n"
" NeXTstep/GNUstep\n"
-#: 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 " -t, --to-code=NAZWA kodowanie dla wyjścia\n"
-#: 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"
@@ -1454,28 +1460,28 @@ msgstr ""
" --use-first użycie pierwszego dostępnego tłumaczenia dla\n"
" każdego komunikatu zamiast łączenia wielu\n"
-#: 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 " --lang=NAZWA_KATALOGU ustawienie pola „Language” w nagłówku\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "nie podano plików wejściowych"
-#: 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 "wymagane są dokładnie dwa pliki wejściowe"
-#: 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 "Składnia: %s [OPCJA] def.po ref.pot\n"
@@ -1508,12 +1514,12 @@ msgstr " def.po tłumaczenia\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot odniesienia do źródeł\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "Modyfikatory operacji:\n"
-#: 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."
@@ -1522,7 +1528,7 @@ msgstr ""
" -m, --multi-domain zastosowanie ref.pot dla wszystkich domen def."
"po\n"
-#: 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 " -N, --no-fuzzy-matching nie używanie dopasowywania rozmytego\n"
@@ -1550,17 +1556,17 @@ msgstr "uwaga: ten komunikat nie jest przetłumaczony"
msgid "this message needs to be reviewed by the translator"
msgstr "ten komunikat powinien być sprawdzony przez tłumacza"
-#: 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 "ten komunikat jest użyty, ale nie zdefiniowany..."
-#: 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 "...ale ta definicja jest podobna"
-#: 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 "ten komunikat jest użyty, ale nie zdefiniowany w %s"
@@ -1570,7 +1576,7 @@ msgstr "ten komunikat jest użyty, ale nie zdefiniowany w %s"
msgid "warning: this message is not used"
msgstr "uwaga: ten komunikat nie jest użyty"
-#: 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"
@@ -1578,12 +1584,12 @@ msgstr[0] "znaleziono %d błąd krytyczny"
msgstr[1] "znaleziono %d błędy krytyczne"
msgstr[2] "znaleziono %d błędów krytycznych"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "muszą być podane przynajmniej dwa pliki"
-#: 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"
@@ -1603,7 +1609,7 @@ msgstr ""
"zostaną zachowane, ale tylko z pierwszego definiującego je pliku PO. Pozycje\n"
"w plikach dla wszystkich plików PO zostaną zgromadzone.\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1612,7 +1618,7 @@ msgstr ""
" ->, --more-than=LICZBA wypisanie komunikatów z liczbą definicji\n"
" większą od LICZBY, domyślnie 1\n"
-#: 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"
@@ -1620,65 +1626,65 @@ msgstr ""
" --omit-header nie zapisywanie nagłówka z wpisem „msgid "
"\"\"”\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr "Konwersja katalogu tłumaczeń na inne kodowanie znaków.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Cel konwersji:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Domyślnym kodowaniem jest kodowanie dla aktualnej lokalizacji.\n"
-#: src/msgconv.c: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 ""
" -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
+#: 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 " --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
+#: 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 ""
" -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
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
" --strict zapisanie pliku .po ściśle zgodnego z "
"Uniforum\n"
-#: 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 "nie podano nazwy pliku wejściowego"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "wymagany jest dokładnie jeden plik wejściowy"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Składnia: %s [OPCJA] PLIK-WEJŚCIOWY\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1691,7 +1697,7 @@ msgstr ""
"xgettext). Nie przetłumaczonym wpisom są przypisywane tłumaczenia identyczne\n"
"z msgid.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " PLIK-WEJŚCIOWY plik wejściowy PO lub POT\n"
@@ -1730,7 +1736,7 @@ msgstr ""
"Specjalne wbudowane polecenie o nazwie „0” wypisuje tłumaczenie zakończone\n"
"bajtem 0. Wyjście „msgexec 0” może być wejściem dla „xargs -0”.\n"
-#: src/msgexec.c:281 src/msgfilter.c:401
+#: src/msgexec.c:281 src/msgfilter.c:420
#, c-format
msgid " -i, --input=INPUTFILE input PO file\n"
msgstr " -i, --input=PLIK-WEJŚCIOWY plik wejściowy PO\n"
@@ -1740,28 +1746,28 @@ msgstr " -i, --input=PLIK-WEJŚCIOWY plik wejściowy PO\n"
msgid "write to stdout failed"
msgstr "pisanie na standardowe wyjście nie powiodło się"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "brak nazwy filtru"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr "musi być podany przynajmniej jeden skrypt seda"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Składnia: %s [OPCJA] FILTR [OPCJA-FILTRA]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr ""
"Zastosowanie filtru na wszystkich tłumaczeniach z katalogu tłumaczeń.\n"
-#: 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"
@@ -1770,19 +1776,19 @@ msgstr ""
"FILTR może być dowolnym programem czytającym tłumaczenie ze standardowego\n"
"wejścia i wypisującym zmodyfikowane tłumaczenie na standardowym wyjściu.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "Przydatne OPCJE-FILTRA jeśli FILTREM jest „sed”:\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
msgstr ""
" -e, --expresion=SKRYPT dodanie SKRYPTU do wykonywanych poleceń\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1793,13 +1799,13 @@ msgstr ""
"wykonywanych\n"
" poleceń\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr " -n, --quiet, --silent nie wypisywanie zawartości wzorca\n"
-#: src/msgfilter.c: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"
@@ -1807,62 +1813,83 @@ msgstr ""
" --no-escape nie używanie sekwencji C na wyjściu "
"(domyślne)\n"
-#: 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 " --indent zapisanie pliku w stylu z wcięciami\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
msgstr ""
" --keep-header zachowanie nagłówka z pominięciem filtra\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "argument dla %s powinien być pojedynczym znakiem przestankowym"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
msgstr "błędna endianness: %s"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c: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 "Ulrich Drepper"
-#: 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 "jeżeli są podane %s i %s, nie należy podawać pliku wejściowego"
+
+#: 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 "%s wymaga podania \"-d katalog\""
-#: 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 "%s wymaga podania \"-l lokalizacja\""
-#: 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 "%s wymaga podania \"--template wzorzec\""
+
+#: src/msgfmt.c:545
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s wymaga podania \"-o plik\""
+
+#: src/msgfmt.c:551
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s i %s wykluczają się wzajemnie w %s"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s jest prawidłowe tylko z %s lub %s"
-#: 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 "%s jest prawidłowe tylko z %s, %s albo z %s"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
@@ -1870,7 +1897,7 @@ msgstr[0] "%d przetłumaczony komunikat"
msgstr[1] "%d przetłumaczone komunikaty"
msgstr[2] "%d przetłumaczonych komunikatów"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
@@ -1878,7 +1905,7 @@ msgstr[0] ", %d tłumaczenie budzi wątpliwości"
msgstr[1] ", %d tłumaczenia budzą wątpliwości"
msgstr[2] ", %d tłumaczeń budzi wątpliwości"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
@@ -1886,18 +1913,18 @@ msgstr[0] ", %d nie przetłumaczony komunikat"
msgstr[1] ", %d nie przetłumaczone komunikaty"
msgstr[2] ", %d nie przetłumaczonych komunikatów"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Składnia: %s [OPCJA] nazwa-pliku.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
"Generowanie binarnego katalogu komunikatów z tekstowego opisu tłumaczeń.\n"
-#: 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"
@@ -1906,17 +1933,17 @@ msgstr ""
"Argumenty obowiązkowe dla długich opcji są obowiązkowe także dla krótkich.\n"
"Podobnie dla argumentów opcjonalnych.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
msgid " filename.po ... input files\n"
msgstr " nazwa-pliku.po ... pliki wejściowe\n"
-#: 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 "Tryb działania:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1925,7 +1952,7 @@ msgstr ""
" -j, --java tryb Javy: generowanie klas Java "
"ResourceBundle\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1933,12 +1960,12 @@ msgid ""
msgstr ""
" --java2 jak --java dla Javy 2 (JDK 1.2 i nowsze)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr " --csharp tryb C#: generowanie pliku .dll .NET\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -1947,44 +1974,51 @@ msgstr ""
" --csharp-resources tryb zasobów C#: generowanie pliku .resources ."
"NET\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
" --tcl tryb Tcl: generowanie pliku tcl/msgcat .msg\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
+msgstr " --qt tryb Qt: generowanie pliku .qm\n"
+
+#: src/msgfmt.c:811
+#, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
msgstr ""
-" --qt tryb Qt: generowanie pliku .qm formatu Qt\n"
+" --desktop tryb Elementu Pulpitu: generowanie pliku ."
+"desktop\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
" --strict włączenie trybu ścisłej zgodności z Uniforum\n"
-#: 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 ""
"Jeśli plikiem wyjściowym jest -, wynik jest kierowany na standardowe "
"wyjście.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Położenie pliku wyjściowego w trybie Javy:\n"
-#: 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 " -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
+#: 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 "
@@ -1992,14 +2026,21 @@ msgid ""
msgstr ""
" -l, --locale=LOKALIZACJA nazwa lokalizacji - język lub język_KRAJ\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr " --source utworzenie pliku .java zamiast .class\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
" -d KATALOG bazowy katalog w hierarchii katalogu klas\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2012,12 +2053,12 @@ msgstr ""
"Klasa\n"
"jest zapisywana w podanym katalogu.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "Położenie pliku wyjściowego w trybie C#:\n"
-#: 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 "
@@ -2026,7 +2067,7 @@ msgstr ""
" -d KATALOG katalog bazowy plików .dll zależnych od "
"locale\n"
-#: 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"
@@ -2036,18 +2077,18 @@ msgstr ""
"podanego\n"
"katalogu, którego nazwa zależy od locale.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Położenie pliku wyjściowego w trybie Tcl:\n"
-#: 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 ""
" -d KATALOG bazowy katalog katalogów komunikatów .msg\n"
-#: 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"
@@ -2055,12 +2096,48 @@ msgid ""
msgstr ""
"Opcje -l i -d są obowiązkowe. Plik .msg jest zapisywany w podanym katalogu.\n"
-#: src/msgfmt.c:745 src/xgettext.c:882
+#: src/msgfmt.c:861
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr "Opcje trybu Elementu Pulpitu (Desktop Entry):\n"
+
+#: src/msgfmt.c:867
+#, c-format
+msgid " --template=TEMPLATE a .desktop file used as a template\n"
+msgstr " --template=WZORZEC plik .desktop użyty jako WZORZEC\n"
+
+#: src/msgfmt.c:869
+#, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr " -d KATALOG bazowy katalog plików .po\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -kSŁOWO, --keyword=SŁOWO dodatkowe słowo kluczowe do poszukiwania\n"
+" -k, --keyword bez używania domyślnych słów kluczowych\n"
+
+#: src/msgfmt.c: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 ""
+"Opcje -l, -o i --template są obowiązkowe. Jeżeli podana jest opcja -D, "
+"pliki\n"
+"wejściowe są szukane w podanym katalogu zamiast pośród argumentów "
+"polecenia.\n"
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "Interpretacja pliku wejściowego:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -2071,14 +2148,14 @@ msgstr ""
" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format sprawdzenie tłumaczeń z formatów zależnych od\n"
" języka\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -2087,7 +2164,7 @@ msgstr ""
" --check-header sprawdzenie obecności i zawartości wpisu "
"nagłówka\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -2096,7 +2173,7 @@ msgstr ""
" --check-domain sprawdzenie konfliktów między dyrektywami\n"
" dotyczącymi domeny i opcją --output-file\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2105,7 +2182,7 @@ msgstr ""
" -C, --check-compatibility kontrola czy GNU msgfmt działa jak X/Open "
"msgfmt\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -2116,13 +2193,13 @@ msgstr ""
"klawiszowych\n"
" dla opcji w menu\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
" -f, --use-fuzzy użycie na wyjściu niepewnych (fuzzy) wpisów\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
@@ -2131,7 +2208,7 @@ msgstr ""
"(domyślnie:\n"
" %d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2144,7 +2221,7 @@ msgstr ""
"domyślna\n"
" kolejność zależy od platformy\n"
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
@@ -2152,82 +2229,92 @@ msgstr ""
" --no-hash tworzenie pliku binarnego bez tablicy "
"haszującej\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
" --statistics wypisanie statystyk dotyczących tłumaczeń\n"
-#: 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 ""
" -v, --verbose zwiększenie ilości podawanych informacji\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "uwaga: brakujący lub niepoprawny nagłówek pliku PO\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "uwaga: konwersja zestawu znaków nie będzie działać\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "uwaga: nagłówek pliku PO jest niepewny (fuzzy)\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "uwaga: starsze wersje msgfmt nie zgłoszą błędu w tym miejscu\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "nazwa domeny \"%s\" nie jest odpowiednią nazwa pliku"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"nazwa domeny \"%s\" nie jest dobra jako nazwa pliku: użycie przedrostka"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, c-format
msgid "'domain %s' directive ignored"
msgstr "dyrektywa „domain %s” zignorowana"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "zignorowana pusta wartość „msgstr”"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "zignorowana niepewna (fuzzy) wartość „msgstr”"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: uwaga: plik źródłowy zawiera tłumaczenie budzące wątpliwości"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr "%s nie istnieje"
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr "%s istnieje, ale nie może zostać przeczytane"
+
#: 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 "błąd w czasie czytania \"%s\""
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2235,7 +2322,7 @@ msgid ""
msgstr ""
"opcja „%c” nie może być użyta przed podaniem „J”, „K”, „T”, „C” lub „X”"
-#: 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"
@@ -2244,7 +2331,7 @@ msgstr ""
"Wyciągnięcie z katalogu tłumaczeń wszystkich komunikatów pasujących do podanego\n"
"wzorca lub należących do podanego pliku źródłowego.\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2319,7 +2406,7 @@ msgstr ""
" -v, --invert-match wypisanie tylko komunikatów, które nie pasują do\n"
" kryteriów wyboru\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2327,12 +2414,12 @@ msgstr ""
" --escape używanie sekwencji C, bez znaków "
"rozszerzonych\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output generowanie posortowanego wyjścia\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
@@ -2499,7 +2586,7 @@ msgstr "docelowy zestaw znaków \"%s\" nie jest przenośną nazwą kodowania."
#: 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 "uwaga: "
@@ -2709,17 +2796,17 @@ msgstr "obsługa form mnogich jest rozszerzeniem gettexta GNU"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "w msgstr brakuje skrótu oznaczenia klawiszowego „%c”"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr zawiera zbyt dużo oznaczeń skrótów klawiszowych „%c”"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "pole nagłówka „%s” nadal zawiera początkową wartość domyślną\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "w nagłówku brakuje pola „%s”\n"
@@ -2740,7 +2827,7 @@ 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
+#: 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 "
@@ -2759,7 +2846,7 @@ msgstr ""
"msgid stają się identyczne."
#: 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 "
@@ -2768,16 +2855,16 @@ msgstr ""
"Nie można przekonwertować z \"%s\" do \"%s\". %s opiera się na iconv(). Ta "
"wersja została zbudowana bez iconv()."
-#: src/msgmerge.c:383 src/msgmerge.c:389
+#: src/msgmerge.c:392 src/msgmerge.c:398
#, c-format
msgid "%s is only valid with %s"
msgstr "%s jest prawidłowe tylko z %s"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr "typ zapasowy"
-#: 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"
@@ -2799,18 +2886,18 @@ msgstr ""
"kropką i pozycje w plikach będą zachowane. Tam, gdzie nie można dopasować\n"
"dokładnie, używane jest dopasowanie rozmyte, dla lepszych wyników.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
" def.po tłumaczenia odnoszące się do starych źródeł\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot odniesienia do nowych źródeł\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2819,7 +2906,7 @@ msgstr ""
" -C, --compendium=PLIK dodatkowa biblioteka tłumaczeń komunikatów,\n"
" może być podana więcej niż raz\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2828,28 +2915,28 @@ msgstr ""
" -U, --update uaktualnienie def.po, nie wykonywanie\n"
" niczego jeśli def.po jest już aktualny\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Położenie pliku wyjściowego w trybie uaktualniania:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Wynik jest zapisywany z powrotem do def.po.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=KONTROLA utworzenie kopii zapasowej def.po\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
" --suffix=KOŃCÓWKA zmiana domyślnej końcówki kopii zapasowej\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2869,7 +2956,7 @@ msgstr ""
" existing, nil numerowanie jeśli istnieją numerowane, proste jeśli nie\n"
" simple, never tworzenie zawsze prostych kopii zapasowych\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2879,7 +2966,7 @@ msgstr ""
"Końcówka nazwy kopii zapasowej to „~”, o ile nie ustawiono przez --suffix\n"
"lub zmienną środowiskową SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
@@ -2887,22 +2974,22 @@ msgstr ""
" --previous zachowanie poprzednich identyfikatorów\n"
" przetłumaczonych komunikatów\n"
-#: 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 " -q, --quiet, --silent pominięcie znaczników postępu\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
msgstr "ten komunikat powinien definiować formy mnogie"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
msgstr "ten komunikat nie powinien definiować form mnogich"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2911,7 +2998,7 @@ 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/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -3025,7 +3112,7 @@ msgid " --strict write strict uniforum style\n"
msgstr ""
" --strict zapisanie pliku ściśle zgodnego z Uniforum\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -3047,12 +3134,12 @@ msgstr ""
"w plikach zostaną zgromadzone. W przypadku użycia opcji --unique, duplikaty\n"
"zostaną usunięte.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated wypisanie tylko duplikatów\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -3121,27 +3208,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "niekonsekwentne użycie #~"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, c-format
msgid "missing 'msgstr[]' section"
msgstr "brak częsci „msgstr[]”"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, c-format
msgid "missing 'msgid_plural' section"
msgstr "brak częsci „msgstr_plural”"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, c-format
msgid "missing 'msgstr' section"
msgstr "brak częsci „msgstr”"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "pierwsza forma mnoga ma niezerowy indeks"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "forma mnoga ma zły indeks"
@@ -3151,7 +3238,7 @@ msgstr "forma mnoga ma zły indeks"
msgid "too many errors, aborting"
msgstr "za dużo błędów, przerwanie wykonywania"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c: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 "błędna sekwencja wielobajtowa"
@@ -3195,16 +3282,16 @@ msgstr "znak końca wiersza wewnątrz napisu"
msgid "context separator <EOT> within string"
msgstr "separator kontekstu <EOT> wewnątrz napisu"
-#: 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 "ten plik nie może zawierać dyrektyw domain"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "podwójna definicja komunikatu"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "to jest położenie pierwszej definicji"
@@ -3403,18 +3490,18 @@ msgstr "kompilacja klasy C# nie udała się, proszę użyć --verbose"
msgid "compilation of C# class failed"
msgstr "kompilacja klasy C# nie udała się"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "niepoprawna nazwa klasy Javy: %s"
-#: 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 ""
"kompilacja klasy Javy nie udała się, proszę użyć --verbose lub ustawić $JAVAC"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr "kompilacja klasy Javy nie udała się, proszę ustawić $JAVAC"
@@ -3424,13 +3511,13 @@ msgstr "kompilacja klasy Javy nie udała się, proszę ustawić $JAVAC"
msgid "error while opening \"%s\" for writing"
msgstr "błąd otwarcia \"%s\" do pisania"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr "umiędzynaradawiane komunikaty nie powinny zawierać sekwencji „\\%c”"
-#: src/write-po.c: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"
@@ -3443,7 +3530,7 @@ msgstr ""
"innego niż ty. Rozważ używanie w nazwach msgctxt wyłącznie znaków ASCII.\n"
"%s\n"
-#: 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"
@@ -3522,7 +3609,7 @@ msgstr ""
"katalog komunikatów zawiera tłumaczenia form mnogich,\n"
"ale format katalogu komunikatów Tcl-a nie obsługuje liczby mnogiej\n"
-#: src/x-awk.c:341 src/x-javascript.c: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 "%s:%d: uwaga: niezakończony napis"
@@ -3532,17 +3619,22 @@ msgstr "%s:%d: uwaga: niezakończony napis"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: uwaga: niezakończone wyrażenie regularne"
-#: 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 "uwaga: błędny znak unikodowy"
+
+#: 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 "%s:%d: uwaga: niezakończona stała znakowa"
-#: 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 "%s:%d: uwaga: niezakończona stała łańcuchowa"
-#: 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 "Proszę podać kodowanie źródła przy pomocy --from-code ."
@@ -3596,7 +3688,7 @@ msgstr ""
"%s:%d: Nieprawidłowa sekwencja wielobajtowa.\n"
"Proszę podać prawidłowe kodowanie źródłowe przy pomocy --from-code .\n"
-#: src/x-csharp.c: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 "%s:%d: uwaga: błędny znak unikodowy"
@@ -3616,22 +3708,22 @@ msgstr "%s:%d: uwaga: znaleziono „)”, oczekiwano „}”"
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: uwaga: znaleziono „}”, oczekiwano „)”"
-#: src/x-glade.c:561
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
msgstr "Brakuje kontekstu dla łańcucha znaków wydobytego z elementu „%s”"
-#: 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 "Element główny <%s> nie jest dozwolony w prawidłowym pliku Glade"
-#: 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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3694,11 +3786,21 @@ msgstr ""
"%s:%d: Nieprawidłowa sekwencja wielobajtowa.\n"
"Proszę podać prawidłowe kodowanie źródłowe przy pomocy --from-code\n"
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: uwaga: niezakończona stała łańcuchowa RegExp"
+#: src/x-javascript.c:1055
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: uwaga: %s nie jest dozwolone"
+
+#: src/x-javascript.c:1069
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: uwaga: niezakończony element składniowy XML"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3830,33 +3932,38 @@ 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
+#: src/x-vala.c:413
#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: uwaga: niezakończona stała łańcuchowa wyrażenia regularnego"
-#: src/xgettext.c:636
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr "„%s” nie jest prawidłową nazwą kodowania. W zastępstwie użyję ASCII.\n"
+
+#: src/xgettext.c:648
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "--join-existing nie może być użyte przy pisaniu na standardowe wyjście"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext nie może działać bez podania słów kluczowych"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr "uwaga: typ pliku „%s” z rozszerzeniem „%s” jest nieznany; spróbuję C"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr ""
"Wyciągnięcie przetłumaczalnych napisów z podanych plików wejściowych.\n"
-#: src/xgettext.c:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3864,24 +3971,24 @@ msgid ""
msgstr ""
" -d, --default-domain=NAZWA użycie NAZWA.po (nie messages.po) dla wyjścia\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr " -o, --output=PLIK zapisanie wyniku do podanego pliku\n"
-#: src/xgettext.c:863
+#: src/xgettext.c:886
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr ""
" -p, --output-dir=KATALOG umieszczenie plików wyjściowych w KATALOGU\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Wybór języka pliku wejściowego:\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3891,7 +3998,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=NAZWA rozpoznawanie podanego języka\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3900,14 +4007,14 @@ msgstr ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ skrót dla --language=C++\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:902
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
@@ -3915,7 +4022,7 @@ msgid ""
msgstr ""
"Domyślnie język jest zgadywany na podstawie rozszerzenia pliku wejściowego.\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3924,23 +4031,23 @@ msgstr ""
" --from-code=NAZWA kodowanie plików wejściowych\n"
" (oprócz Pythona, Tcl-a, Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr "Domyślnie zakłada się, że pliki wejściowe są w ASCII.\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
" -j, --join-existing dołączenie komunikatów do istniejącego pliku\n"
-#: 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 " -x, --exclude-file=PLIK.po pominięcie wpisów z PLIKU.po\n"
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -3960,17 +4067,17 @@ msgstr ""
"kluczowym)\n"
" w pliku wyjściowym\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Opcje specyficzne dla języka:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all wyciągnięcie wszystkich napisów\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3985,16 +4092,22 @@ msgstr ""
" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
" Lua, JavaScript, Vala)\n"
-#: 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 ""
-" -kSŁOWO, --keyword=SŁOWO dodatkowe słowo kluczowe do poszukiwania\n"
-" -k, --keyword bez używania domyślnych słów kluczowych\n"
+" (tylko języki C, C++, ObjectiveC, Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+" Lua, JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -4005,7 +4118,7 @@ msgstr ""
"numer\n"
" ARG słowa kluczowego SŁOWO\n"
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4020,38 +4133,38 @@ msgstr ""
" C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
" Lua, JavaScript, Vala)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
" -T, --trigraphs przetwarzanie na wejściu trójznaków ANSI C\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr " (tylko języki C, C++, ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt rozpoznawanie napisów w formacie Qt\n"
-#: 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 " (tylko język C++)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --kde rozpoznawanie napisów w formacie KDE 4\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --boost rozpoznawanie napisów w formacie Boost\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
@@ -4059,18 +4172,18 @@ msgstr ""
" --debug więcej szczegółów o rozpoznawaniu formatów\n"
" napisów\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output zapisanie pliku .properties Javy\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
" --copyright-holder=NAPIS wypisanie właściciela praw autorskich\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -4078,24 +4191,24 @@ msgstr ""
" --foreign-user pominięcie na wyjściu copyrightu FSF dla\n"
" zewnętrznych projektów\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, c-format
msgid " --package-name=PACKAGE set package name in output\n"
msgstr " --package-name=PAKIET podanie nazwy PAKIETU na wyjściu\n"
-#: src/xgettext.c:989
+#: src/xgettext.c:1012
#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr " --package-version=WERSJA podanie na wyjściu WERSJI pakietu\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
" --msgid-bugs-address=ADRES@EMAIL adres do zgłaszania błędów w msgid\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -4105,7 +4218,7 @@ msgstr ""
" -m[NAPIS], --msgstr-prefix[=NAPIS] użycie NAPISU lub \"\" jako\n"
" przedrostka wpisów msgstr\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -4116,7 +4229,7 @@ msgstr ""
"przyrostka\n"
" wpisów msgstr\n"
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4124,31 +4237,31 @@ msgid ""
msgstr ""
"Argument opcji --flag nie ma składni <keyword>:<argnum>:[pass-]<flag>: %s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr "standardowe wejście"
-#: src/xgettext.c:2020
+#: src/xgettext.c:2071
#, c-format
msgid "Non-ASCII character at %s%s."
msgstr "Znak nie-ASCII w %s%s."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr "Komentarz ze znakami nie-ASCII przy albo przez %s%s."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr "Napis nie-ASCII przy %s%s."
-#: 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 "%s%s: uwaga: "
-#: 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 "
@@ -4157,7 +4270,7 @@ 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
+#: src/xgettext.c:2190
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4166,7 +4279,7 @@ msgstr ""
"%s nie jest prawidłowym formatem napisu %s, mimo że jest tak zadeklarowany. "
"Powód: %s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4180,7 +4293,7 @@ msgstr ""
"Rozważ użycie formatu z nazwami argumentów i mapowania zamiast\n"
"zestawu argumentów.\n"
-#: 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"
@@ -4190,27 +4303,27 @@ msgstr ""
"gettext(\"\") zwraca wpis nagłówka z meta-informacjami,\n"
"a nie pusty napis.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "niejednoznaczna specyfikacja argumentu słowa kluczowego „%.*s”"
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "uwaga: brak kontekstu słowa kluczowego „%.*s”"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr "uwaga: brak kontekstu dla mnogiego argumentu słowa kluczowego „%.*s”"
-#: src/xgettext.c:2942
+#: src/xgettext.c:3052
#, c-format
msgid "context mismatch between singular and plural form"
msgstr "pomieszanie kontekstów między formą pojedyńczą i mnogą"
-#: 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"
@@ -4222,7 +4335,7 @@ msgstr ""
"zmienną MSGID_BUGS_ADDRESS; w przeciwnym wypadku proszę\n"
"podać opcję --msgid-bugs-address z linii poleceń.\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, c-format
msgid "language '%s' unknown"
msgstr "nieznany język „%s”"
diff --git a/gettext-tools/po/pt.po b/gettext-tools/po/pt.po
index 1903a4f..4c3a1cc 100644
--- a/gettext-tools/po/pt.po
+++ b/gettext-tools/po/pt.po
@@ -4,16 +4,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gettext 0.10.23\n"
+"Project-Id-Version: gettext 0.10.23\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: 1996-09-18 20:51 WET DST\n"
"Last-Translator: Nuno Oliveira <nuno@eq.uc.pt>\n"
"Language-Team: Portuguese <pt@li.org>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8-bit\n"
#: gnulib-lib/argmatch.c:133
#, c-format
@@ -30,9 +30,9 @@ msgid "Valid arguments are:"
msgstr ""
#: gnulib-lib/clean-temp.c:332
-#, fuzzy, c-format
+#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "impossvel criar o ficheiro de sada \"%s\""
+msgstr ""
#: gnulib-lib/clean-temp.c:346
#, fuzzy, c-format
@@ -45,9 +45,9 @@ msgid "cannot remove temporary file %s"
msgstr "impossvel criar o ficheiro de sada \"%s\""
#: gnulib-lib/clean-temp.c:457
-#, fuzzy, c-format
+#, c-format
msgid "cannot remove temporary directory %s"
-msgstr "impossvel criar o ficheiro de sada \"%s\""
+msgstr ""
#: gnulib-lib/closeout.c:66
msgid "write error"
@@ -64,9 +64,9 @@ msgid "error while opening %s for reading"
msgstr "erro durante a abertura de \"%s\" para leitura"
#: gnulib-lib/copy-file.c:198
-#, fuzzy, c-format
+#, c-format
msgid "cannot open backup file %s for writing"
-msgstr "erro durante a abertura de \"%s\" para escrita"
+msgstr ""
#: gnulib-lib/copy-file.c:202
#, fuzzy, c-format
@@ -179,15 +179,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 "erro durante a escrita do ficheiro \"%s\""
@@ -208,9 +208,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
#, fuzzy, c-format
msgid "memory exhausted"
msgstr "memria exausta"
@@ -221,7 +221,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 ""
@@ -308,8 +308,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 "erro durante a abertura de \"%s\" para leitura"
@@ -633,7 +633,7 @@ msgstr ""
#: src/format-lisp.c:3474 src/format-scheme.c:3397
#, fuzzy, c-format
msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "o nmero de especificaes em `msgid' e `msgstr' diferente"
+msgstr "as especificaes do argumento %u so diferentes"
#: src/format-lisp.c:3490 src/format-scheme.c:3413
#, fuzzy, c-format
@@ -648,7 +648,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
#, fuzzy, c-format
msgid "a format specification for argument '%s' doesn't exist in '%s'"
@@ -666,16 +666,16 @@ msgid "The string refers to the argument named '%s' in incompatible ways."
msgstr ""
#: src/format-python.c:430
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr "o nmero de especificaes em `msgid' e `msgstr' diferente"
+msgstr ""
#: src/format-python.c:437
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr "o nmero de especificaes em `msgid' e `msgstr' diferente"
+msgstr ""
#: src/format-python.c:460 src/format-sh.c:297
#, fuzzy, c-format
@@ -689,28 +689,28 @@ msgid ""
"format specifications in '%s' and '%s' for argument '%s' are not the same"
msgstr "as especificaes do argumento %u so diferentes"
-#: 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 ""
@@ -756,11 +756,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"
@@ -769,19 +769,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 ""
@@ -791,11 +791,11 @@ msgstr ""
msgid "too many arguments"
msgstr "demasiados argumentos"
-#: 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
#, fuzzy, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Tente `%s --help' para mais informao\n"
@@ -833,29 +833,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 ""
@@ -864,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: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 ""
@@ -877,230 +877,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
-#, fuzzy, c-format
+#: 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 "so necessrios exactamente 2 ficheiros"
+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 "%s e %s so mutuamente exclusivas"
-#: 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
#, fuzzy, c-format
msgid "Input file location:\n"
msgstr "nenhum ficheiro de entrada fornecido"
-#: 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"
@@ -1109,133 +1112,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
-#, fuzzy, c-format
+#: 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 ""
-"Utilizao: %s [OPO] [FICHEIRO]...\n"
-"Os argumentos obrigatrios para as opes longas so igualmente\n"
-"obrigatrios para as opes curtas.\n"
-" -e, --no-escape no usa sequncias de escape do C na sada\n"
-" (opo por defeito)\n"
-" -E, --escape usa sequncias de escape do C na sada, no\n"
-" usando caracteres especiais\n"
-" -h, --help mostra esta ajuda e sai\n"
-" -i, --indent usa o modo de sada alinhado\n"
-" -o, --output-file=FICHEIRO os resultados de sada sero escritos no "
-"FICHEIRO\n"
-" em vez do canal de sada por defeito (stdout)\n"
-" --strict usa o modo de sada Uniforum estrito\n"
-" -V, --version mostra a informao de verso e sai\n"
-" -w, --width=NMERO especifica a largura de pgina na sada\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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"
@@ -1249,92 +1237,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 "ficheiros de entrada no fornecidos"
-#: 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 "so necessrios exactamente 2 ficheiros"
-#: 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 ""
@@ -1376,19 +1364,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 ""
@@ -1413,17 +1401,17 @@ msgstr "ateno: esta mensagem no usada"
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 "esta mensagem usada mas no definida..."
-#: 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 "...mas esta definio semelhante"
-#: 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 "esta mensagem usada mas no definida em %s"
@@ -1433,18 +1421,19 @@ msgstr "esta mensagem usada mas no definida em %s"
msgid "warning: this message is not used"
msgstr "ateno: esta mensagem no usada"
-#: src/msgcmp.c:553 src/msgfmt.c:545
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
#, fuzzy, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "encontrados %d erros fatais"
+msgstr[1] "encontrados %d erros fatais"
-#: src/msgcomm.c: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"
@@ -1457,74 +1446,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 "nenhum ficheiro de entrada fornecido"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, fuzzy, c-format
msgid "exactly one input file required"
msgstr "so necessrios exactamente 2 ficheiros"
-#: 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"
@@ -1533,15 +1522,15 @@ 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 ""
#: src/msgexec.c:196
-#, fuzzy, c-format
+#, c-format
msgid "missing command name"
-msgstr "argumentos insuficientes"
+msgstr ""
#: src/msgexec.c:257
#, c-format
@@ -1565,7 +1554,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 ""
@@ -1575,45 +1564,45 @@ msgstr ""
msgid "write to stdout failed"
msgstr ""
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, fuzzy, c-format
msgid "missing filter name"
msgstr "argumentos insuficientes"
-#: 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 "
@@ -1621,189 +1610,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
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s e %s so mutuamente exclusivas"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr ""
-#: src/msgfmt.c: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
#, fuzzy, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d mensagens traduzidas"
+msgstr[1] "%d mensagens traduzidas"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, fuzzy, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d tradues aproximadas"
+msgstr[1] ", %d tradues aproximadas"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, fuzzy, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d mensagens no traduzidas"
+msgstr[1] ", %d mensagens no traduzidas"
-#: 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 "
@@ -1812,48 +1838,78 @@ msgid ""
"written under the specified directory.\n"
msgstr ""
-#: src/msgfmt.c:715
-#, fuzzy, c-format
+#: src/msgfmt.c:839
+#, c-format
msgid "Output file location in C# mode:\n"
-msgstr "nenhum ficheiro de entrada fornecido"
+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"
@@ -1861,33 +1917,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 "
@@ -1895,18 +1951,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 "
@@ -1915,101 +1971,111 @@ 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
-#, fuzzy, c-format
+#: src/msgfmt.c:1037
+#, c-format
msgid "warning: PO file header missing or invalid\n"
-msgstr "CUIDADO: o ficheiro fonte contm tradues aproximadas"
+msgstr ""
-#: src/msgfmt.c:900
-#, fuzzy, c-format
+#: src/msgfmt.c:1040
+#, c-format
msgid "warning: charset conversion will not work\n"
-msgstr "CUIDADO: o ficheiro fonte contm tradues aproximadas"
+msgstr ""
-#: src/msgfmt.c:910
-#, fuzzy, c-format
+#: src/msgfmt.c:1050
+#, c-format
msgid "warning: PO file header fuzzy\n"
-msgstr "CUIDADO: o ficheiro fonte contm tradues aproximadas"
+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 "nome de domnio \"%s\" no apropriado como nome de ficheiro"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"nome de domnio \"%s\" no apropriado como nome de ficheiro:\n"
"prefixo usado"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "'domain %s' directive ignored"
msgstr "directiva `domnio %s' ignorada"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, fuzzy, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "elemento `msgstr' vazio ignorada"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, fuzzy, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "elemento `msgstr' vazio ignorada"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, fuzzy, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "CUIDADO: o ficheiro fonte contm tradues aproximadas"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c: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 "erro durante a leitura de \"%s\""
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
"specified"
msgstr ""
-#: 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"
@@ -2049,18 +2115,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 ""
@@ -2199,7 +2265,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 ""
@@ -2309,33 +2375,31 @@ msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
#: src/msgl-check.c:420
-#, fuzzy
msgid "invalid nplurals value"
-msgstr "sequncia de controlo ilegal"
+msgstr ""
#: src/msgl-check.c:442
-#, fuzzy
msgid "invalid plural expression"
-msgstr "sequncia de controlo ilegal"
+msgstr ""
#: src/msgl-check.c:472 src/msgl-check.c:488
-#, fuzzy, c-format
+#, c-format
msgid "nplurals = %lu"
-msgstr "sequncia de controlo ilegal"
+msgstr ""
#: src/msgl-check.c:474
-#, fuzzy, c-format
+#, c-format
msgid "but some messages have only one plural form"
msgid_plural "but some messages have only %lu plural forms"
-msgstr[0] "esta mensagem usada mas no definida em %s"
-msgstr[1] "esta mensagem usada mas no definida em %s"
+msgstr[0] ""
+msgstr[1] ""
#: src/msgl-check.c:490
-#, fuzzy, c-format
+#, c-format
msgid "but some messages have one plural form"
msgid_plural "but some messages have %lu plural forms"
-msgstr[0] "esta mensagem usada mas no definida em %s"
-msgstr[1] "esta mensagem usada mas no definida em %s"
+msgstr[0] ""
+msgstr[1] ""
#: src/msgl-check.c:514
msgid ""
@@ -2382,17 +2446,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
#, fuzzy, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "alguns campos do cabealho ainda tm o valor inicial por defeito"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, fuzzy, c-format
msgid "header field '%s' missing in header\n"
msgstr "o campo `%s' falta no cabealho"
@@ -2412,7 +2476,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 "
@@ -2427,23 +2491,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
#, fuzzy, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2470,51 +2534,51 @@ msgstr ""
"resultados sero escritos no canal de sada por defeito (stdout) a\n"
"menos que seja especificado um ficheiro de sada.\n"
-#: 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 "
@@ -2526,7 +2590,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 "
@@ -2534,28 +2598,28 @@ 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
#, fuzzy, c-format
msgid "this message should define plural forms"
msgstr "esta mensagem usada mas no definida em %s"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, fuzzy, c-format
msgid "this message should not define plural forms"
msgstr "esta mensagem usada mas no definida em %s"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, fuzzy, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2564,7 +2628,7 @@ msgstr ""
"%sLidas %d antigas + %d referncias, combinadas %d, aproximadas %d, faltam "
"%d, obsoletas %d.\n"
-#: 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"
@@ -2629,9 +2693,9 @@ msgid ""
msgstr ""
#: src/msgunfmt.c:467
-#, fuzzy, c-format
+#, c-format
msgid "Input file location in C# mode:\n"
-msgstr "nenhum ficheiro de entrada fornecido"
+msgstr ""
#: src/msgunfmt.c:475
#, c-format
@@ -2662,7 +2726,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"
@@ -2675,12 +2739,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 "
@@ -2693,11 +2757,11 @@ msgid "<stdin>"
msgstr ""
#: src/po-charset.c:489
-#, fuzzy, c-format
+#, c-format
msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Message conversion to user's charset might not work.\n"
-msgstr "CUIDADO: o ficheiro fonte contm tradues aproximadas"
+msgstr ""
#: src/po-charset.c:557
#, c-format
@@ -2728,38 +2792,37 @@ msgid ""
msgstr ""
#: src/po-charset.c:644
-#, fuzzy
msgid ""
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
-msgstr "CUIDADO: o ficheiro fonte contm tradues aproximadas"
+msgstr ""
#: src/po-gram-gen.y:93
#, c-format
msgid "inconsistent use of #~"
msgstr ""
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, fuzzy, c-format
msgid "missing 'msgstr[]' section"
msgstr "falta a seco `msgstr'"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, fuzzy, c-format
msgid "missing 'msgid_plural' section"
msgstr "falta a seco `msgstr'"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, fuzzy, c-format
msgid "missing 'msgstr' section"
msgstr "falta a seco `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 ""
@@ -2769,20 +2832,20 @@ msgstr ""
msgid "too many errors, aborting"
msgstr "demasiados erros, interrompendo"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:740 src/write-po.c:869
-#, fuzzy, c-format
+#: 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 "sequncia de controlo ilegal"
+msgstr ""
#: src/po-lex.c:465
-#, fuzzy, c-format
+#, c-format
msgid "incomplete multibyte sequence at end of file"
-msgstr "sequncia de controlo ilegal"
+msgstr ""
#: src/po-lex.c:475
-#, fuzzy, c-format
+#, c-format
msgid "incomplete multibyte sequence at end of line"
-msgstr "sequncia de controlo ilegal"
+msgstr ""
#: src/po-lex.c:487
msgid "iconv failure"
@@ -2813,16 +2876,16 @@ msgstr "fim-de-linha dentro da cadeia"
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 "este ficheiro no pode conter directivas de domnio"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "definio de mensagem duplicada"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "este o local da primeira definio"
@@ -2842,39 +2905,33 @@ msgid "file \"%s\" is not in GNU .mo format"
msgstr "o ficheiro \"%s\" no est no formato .mo GNU"
#: src/read-mo.c:178
-#, fuzzy, c-format
+#, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr "o ficheiro \"%s\" no est no formato .mo GNU"
+msgstr ""
#: src/read-properties.c:227
-#, fuzzy
msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "o ficheiro \"%s\" no est no formato .mo GNU"
+msgstr ""
#: src/read-stringtable.c:802
-#, fuzzy
msgid "warning: unterminated string"
-msgstr "o ficheiro \"%s\" no est no formato .mo GNU"
+msgstr ""
#: src/read-stringtable.c:810
-#, fuzzy
msgid "warning: syntax error"
-msgstr "o ficheiro \"%s\" no est no formato .mo GNU"
+msgstr ""
#: src/read-stringtable.c:871 src/read-stringtable.c:893
-#, fuzzy
msgid "warning: unterminated key/value pair"
-msgstr "o ficheiro \"%s\" no est no formato .mo GNU"
+msgstr ""
#: src/read-stringtable.c:939
-#, fuzzy
msgid "warning: syntax error, expected ';' after string"
-msgstr "o ficheiro \"%s\" no est no formato .mo GNU"
+msgstr ""
#: src/read-stringtable.c:948
-#, fuzzy
msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "o ficheiro \"%s\" no est no formato .mo GNU"
+msgstr ""
#: src/recode-sr-latin.c:116
#, c-format
@@ -3013,17 +3070,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 ""
@@ -3033,7 +3090,7 @@ msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "erro durante a abertura de \"%s\" para escrita"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, fuzzy, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
@@ -3041,7 +3098,7 @@ msgstr ""
"as mensagens de internacionalizao no devem conter\n"
"a sequncia de escape `\\%c'"
-#: 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"
@@ -3050,7 +3107,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"
@@ -3109,27 +3166,32 @@ 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
#, fuzzy, c-format
msgid "%s:%d: warning: unterminated string"
-msgstr "o ficheiro \"%s\" no est no formato .mo GNU"
+msgstr "cuidado: nenhum elemento encontrado no cabealho"
#: src/x-awk.c:592
-#, fuzzy, c-format
+#, c-format
msgid "%s:%d: warning: unterminated regular expression"
-msgstr "o ficheiro \"%s\" no est no formato .mo GNU"
+msgstr ""
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:762
-#, fuzzy, c-format
+#: 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 "o ficheiro \"%s\" no est no formato .mo GNU"
+msgstr ""
-#: src/x-c.c:1247 src/x-vala.c:832
-#, fuzzy, c-format
+#: src/x-c.c:1345 src/x-vala.c:752
+#, c-format
msgid "%s:%d: warning: unterminated string literal"
-msgstr "o ficheiro \"%s\" no est no formato .mo GNU"
+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 ""
@@ -3173,15 +3235,15 @@ msgid ""
"Please specify the source encoding through --from-code.\n"
msgstr ""
-#: src/x-csharp.c:1390 src/x-python.c:1335
-#, fuzzy, c-format
+#: src/x-csharp.c:1390 src/x-python.c:1138
+#, c-format
msgid "%s:%d: warning: invalid Unicode character"
-msgstr "o ficheiro \"%s\" no est no formato .mo GNU"
+msgstr ""
#: src/x-csharp.c:1512 src/x-java.c:875
-#, fuzzy, c-format
+#, c-format
msgid "%s:%d: warning: unterminated string constant"
-msgstr "o ficheiro \"%s\" no est no formato .mo GNU"
+msgstr ""
#: src/x-csharp.c:2020 src/x-java.c:1369
#, c-format
@@ -3193,22 +3255,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"
@@ -3216,9 +3278,9 @@ msgid ""
msgstr ""
#: src/x-java.c:494
-#, fuzzy, c-format
+#, c-format
msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "o ficheiro \"%s\" no est no formato .mo GNU"
+msgstr ""
#: src/x-javascript.c:230
msgid "Please specify the source encoding through --from-code\n"
@@ -3259,10 +3321,20 @@ msgid ""
"Please specify the source encoding through --from-code\n"
msgstr ""
-#: src/x-javascript.c:1147
-#, fuzzy, c-format
+#: src/x-javascript.c:954
+#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "o ficheiro \"%s\" no est no formato .mo GNU"
+msgstr ""
+
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "ateno: esta mensagem no usada"
+
+#: src/x-javascript.c:1069
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr ""
#: src/x-perl.c:308
#, c-format
@@ -3372,59 +3444,64 @@ msgid ""
"use eval_gettext instead"
msgstr ""
-#: src/x-vala.c:558
-#, fuzzy, c-format
+#: src/x-vala.c:413
+#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "o ficheiro \"%s\" no est no formato .mo GNU"
+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 ""
"--join-existing no pode ser usada quando a sada\n"
" escrita no stdout"
-#: 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
#, fuzzy, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr ""
"cuidado: o tipo do ficheiro `%s' com a extenso `%s' desconhecido;\n"
"ser tentado C"
-#: 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
#, fuzzy, c-format
msgid "Choice of input file language:\n"
msgstr "nenhum ficheiro de entrada fornecido"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3434,44 +3511,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"
@@ -3481,17 +3558,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"
@@ -3501,14 +3578,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 "
@@ -3516,7 +3596,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"
@@ -3526,75 +3606,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 "
@@ -3602,7 +3682,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 "
@@ -3610,52 +3690,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 "entrada standard"
-#: 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"
@@ -3664,34 +3744,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"
@@ -3699,7 +3779,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 ""
@@ -3708,237 +3788,11 @@ msgstr ""
msgid "<unnamed>"
msgstr ""
-#, fuzzy
-#~ msgid "header field '%s' should start at beginning of line\n"
-#~ msgstr "o campo `%s' do cabealho deve comear no incio da linha"
-
-#, fuzzy
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr "alguns campos do cabealho ainda tm o valor inicial por defeito"
-
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: opo ilegal -- %c\n"
-#, fuzzy
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "o campo `%s' ainda tem o valor por defeito inicial"
-
-#~ msgid "...this is the location of the first definition"
-#~ msgstr "...este o local da primeira definio"
-
-#, fuzzy
-#~ msgid "%s:%lu: warning: unterminated string"
-#~ msgstr "o ficheiro \"%s\" no est no formato .mo GNU"
-
-#, fuzzy
-#~ msgid ""
-#~ "Output details:\n"
-#~ " -t, --to-code=NAME encoding for output\n"
-#~ " --use-first use first available translation for "
-#~ "each\n"
-#~ " message, don't merge several "
-#~ "translations\n"
-#~ " -e, --no-escape do not use C escapes in output "
-#~ "(default)\n"
-#~ " -E, --escape use C escapes in output, no extended "
-#~ "chars\n"
-#~ " --force-po write PO file even if empty\n"
-#~ " -i, --indent write the .po file using indented style\n"
-#~ " --no-location do not write '#: filename:line' lines\n"
-#~ " -n, --add-location generate '#: filename:line' lines "
-#~ "(default)\n"
-#~ " --strict write out strict Uniforum conforming .po "
-#~ "file\n"
-#~ " -w, --width=NUMBER set output page width\n"
-#~ " --no-wrap do not break long message lines, longer "
-#~ "than\n"
-#~ " the output page width, into several "
-#~ "lines\n"
-#~ " -s, --sort-output generate sorted output\n"
-#~ " -F, --sort-by-file sort output by file location\n"
-#~ msgstr ""
-#~ "Utilizao: %s [OPO] def.po ref.po\n"
-#~ "Os argumentos obrigatrios para as opes longas so igualmente\n"
-#~ "obrigatrios para as opes curtas.\n"
-#~ " -D, --directory=DIRECTRIO adiciona DIRECTRIO lista de procura "
-#~ "para\n"
-#~ " os ficheiros de entrada\n"
-#~ " -e, --no-escape no usa sequncias de escape do C na sada\n"
-#~ " (opo por defeito)\n"
-#~ " -E, --escape usa sequncias de escape do C na sada, "
-#~ "no\n"
-#~ " usando caracteres especiais\n"
-#~ " -h, --help mostra esta ajuda e sai\n"
-#~ " -i, --indent modo de sada alinhado\n"
-#~ " -o, --output-file=FICHEIRO os resultados de sada sero escritos no "
-#~ "FICHEIRO\n"
-#~ " --strict modo de sada Uniforum estrito\n"
-#~ " -v, --verbose aumenta o nvel de verbosidade da sada\n"
-#~ " -V, --version mostra a informao de verso e sai\n"
-#~ " -w, --width=NMERO especifica a largura de pgina na sada\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Output details:\n"
-#~ " -e, --no-escape do not use C escapes in output "
-#~ "(default)\n"
-#~ " -E, --escape use C escapes in output, no extended "
-#~ "chars\n"
-#~ " --force-po write PO file even if empty\n"
-#~ " -i, --indent write the .po file using indented style\n"
-#~ " --no-location do not write '#: filename:line' lines\n"
-#~ " -n, --add-location generate '#: filename:line' lines "
-#~ "(default)\n"
-#~ " --strict write out strict Uniforum conforming .po "
-#~ "file\n"
-#~ " -w, --width=NUMBER set output page width\n"
-#~ " --no-wrap do not break long message lines, longer "
-#~ "than\n"
-#~ " the output page width, into several "
-#~ "lines\n"
-#~ " -s, --sort-output generate sorted output\n"
-#~ " -F, --sort-by-file sort output by file location\n"
-#~ " --omit-header don't write header with `msgid \"\"' "
-#~ "entry\n"
-#~ msgstr ""
-#~ "Utilizao: %s [OPO] def.po ref.po\n"
-#~ "Os argumentos obrigatrios para as opes longas so igualmente\n"
-#~ "obrigatrios para as opes curtas.\n"
-#~ " -D, --directory=DIRECTRIO adiciona DIRECTRIO lista de procura "
-#~ "para\n"
-#~ " os ficheiros de entrada\n"
-#~ " -e, --no-escape no usa sequncias de escape do C na sada\n"
-#~ " (opo por defeito)\n"
-#~ " -E, --escape usa sequncias de escape do C na sada, "
-#~ "no\n"
-#~ " usando caracteres especiais\n"
-#~ " -h, --help mostra esta ajuda e sai\n"
-#~ " -i, --indent modo de sada alinhado\n"
-#~ " -o, --output-file=FICHEIRO os resultados de sada sero escritos no "
-#~ "FICHEIRO\n"
-#~ " --strict modo de sada Uniforum estrito\n"
-#~ " -v, --verbose aumenta o nvel de verbosidade da sada\n"
-#~ " -V, --version mostra a informao de verso e sai\n"
-#~ " -w, --width=NMERO especifica a largura de pgina na sada\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Output details:\n"
-#~ " -e, --no-escape do not use C escapes in output (default)\n"
-#~ " -E, --escape use C escapes in output, no extended chars\n"
-#~ " --force-po write PO file even if empty\n"
-#~ " -i, --indent indented output style\n"
-#~ " --no-location suppress '#: filename:line' lines\n"
-#~ " --add-location preserve '#: filename:line' lines "
-#~ "(default)\n"
-#~ " --strict strict Uniforum output style\n"
-#~ " -w, --width=NUMBER set output page width\n"
-#~ " --no-wrap do not break long message lines, longer "
-#~ "than\n"
-#~ " the output page width, into several lines\n"
-#~ " -s, --sort-output generate sorted output\n"
-#~ " -F, --sort-by-file sort output by file location\n"
-#~ msgstr ""
-#~ "Utilizao: %s [OPO] def.po ref.po\n"
-#~ "Os argumentos obrigatrios para as opes longas so igualmente\n"
-#~ "obrigatrios para as opes curtas.\n"
-#~ " -D, --directory=DIRECTRIO adiciona DIRECTRIO lista de procura "
-#~ "para\n"
-#~ " os ficheiros de entrada\n"
-#~ " -e, --no-escape no usa sequncias de escape do C na sada\n"
-#~ " (opo por defeito)\n"
-#~ " -E, --escape usa sequncias de escape do C na sada, "
-#~ "no\n"
-#~ " usando caracteres especiais\n"
-#~ " -h, --help mostra esta ajuda e sai\n"
-#~ " -i, --indent modo de sada alinhado\n"
-#~ " -o, --output-file=FICHEIRO os resultados de sada sero escritos no "
-#~ "FICHEIRO\n"
-#~ " --strict modo de sada Uniforum estrito\n"
-#~ " -v, --verbose aumenta o nvel de verbosidade da sada\n"
-#~ " -V, --version mostra a informao de verso e sai\n"
-#~ " -w, --width=NMERO especifica a largura de pgina na sada\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Output details:\n"
-#~ " --no-escape do not use C escapes in output (default)\n"
-#~ " -E, --escape use C escapes in output, no extended chars\n"
-#~ " --force-po write PO file even if empty\n"
-#~ " --indent indented output style\n"
-#~ " --keep-header keep header entry unmodified, don't filter "
-#~ "it\n"
-#~ " --no-location suppress '#: filename:line' lines\n"
-#~ " --add-location preserve '#: filename:line' lines "
-#~ "(default)\n"
-#~ " --strict strict Uniforum output style\n"
-#~ " -w, --width=NUMBER set output page width\n"
-#~ " --no-wrap do not break long message lines, longer "
-#~ "than\n"
-#~ " the output page width, into several lines\n"
-#~ " -s, --sort-output generate sorted output\n"
-#~ " -F, --sort-by-file sort output by file location\n"
-#~ msgstr ""
-#~ "Utilizao: %s [OPO] def.po ref.po\n"
-#~ "Os argumentos obrigatrios para as opes longas so igualmente\n"
-#~ "obrigatrios para as opes curtas.\n"
-#~ " -D, --directory=DIRECTRIO adiciona DIRECTRIO lista de procura "
-#~ "para\n"
-#~ " os ficheiros de entrada\n"
-#~ " -e, --no-escape no usa sequncias de escape do C na sada\n"
-#~ " (opo por defeito)\n"
-#~ " -E, --escape usa sequncias de escape do C na sada, "
-#~ "no\n"
-#~ " usando caracteres especiais\n"
-#~ " -h, --help mostra esta ajuda e sai\n"
-#~ " -i, --indent modo de sada alinhado\n"
-#~ " -o, --output-file=FICHEIRO os resultados de sada sero escritos no "
-#~ "FICHEIRO\n"
-#~ " --strict modo de sada Uniforum estrito\n"
-#~ " -v, --verbose aumenta o nvel de verbosidade da sada\n"
-#~ " -V, --version mostra a informao de verso e sai\n"
-#~ " -w, --width=NMERO especifica a largura de pgina na sada\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Output details:\n"
-#~ " --no-escape do not use C escapes in output (default)\n"
-#~ " --escape use C escapes in output, no extended chars\n"
-#~ " --force-po write PO file even if empty\n"
-#~ " --indent indented output style\n"
-#~ " --no-location suppress '#: filename:line' lines\n"
-#~ " --add-location preserve '#: filename:line' lines "
-#~ "(default)\n"
-#~ " --strict strict Uniforum output style\n"
-#~ " -w, --width=NUMBER set output page width\n"
-#~ " --no-wrap do not break long message lines, longer "
-#~ "than\n"
-#~ " the output page width, into several lines\n"
-#~ " --sort-output generate sorted output\n"
-#~ " --sort-by-file sort output by file location\n"
-#~ msgstr ""
-#~ "Utilizao: %s [OPO] def.po ref.po\n"
-#~ "Os argumentos obrigatrios para as opes longas so igualmente\n"
-#~ "obrigatrios para as opes curtas.\n"
-#~ " -D, --directory=DIRECTRIO adiciona DIRECTRIO lista de procura "
-#~ "para\n"
-#~ " os ficheiros de entrada\n"
-#~ " -e, --no-escape no usa sequncias de escape do C na sada\n"
-#~ " (opo por defeito)\n"
-#~ " -E, --escape usa sequncias de escape do C na sada, "
-#~ "no\n"
-#~ " usando caracteres especiais\n"
-#~ " -h, --help mostra esta ajuda e sai\n"
-#~ " -i, --indent modo de sada alinhado\n"
-#~ " -o, --output-file=FICHEIRO os resultados de sada sero escritos no "
-#~ "FICHEIRO\n"
-#~ " --strict modo de sada Uniforum estrito\n"
-#~ " -v, --verbose aumenta o nvel de verbosidade da sada\n"
-#~ " -V, --version mostra a informao de verso e sai\n"
-#~ " -w, --width=NMERO especifica a largura de pgina na sada\n"
-
-#, fuzzy
#~ msgid ""
+#~ "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
#~ " -d, --domain=TEXTDOMAIN retrieve translated messages from TEXTDOMAIN\n"
#~ " -e enable expansion of some escape sequences\n"
#~ " -E (ignored for compatibility)\n"
@@ -3959,32 +3813,8 @@ msgstr ""
#~ " [DIALECTO] MSGID obtm a mensagem traduzida correspondente a\n"
#~ " MSGID do DIALECTO\n"
-#, fuzzy
-#~ msgid ""
-#~ " -d, --domain=TEXTDOMAIN retrieve translated message from TEXTDOMAIN\n"
-#~ " -e enable expansion of some escape sequences\n"
-#~ " -E (ignored for compatibility)\n"
-#~ " -h, --help display this help and exit\n"
-#~ " -V, --version display version information and exit\n"
-#~ " [TEXTDOMAIN] retrieve translated message from TEXTDOMAIN\n"
-#~ " MSGID MSGID-PLURAL translate MSGID (singular) / MSGID-PLURAL "
-#~ "(plural)\n"
-#~ " COUNT choose singular/plural form based on this "
-#~ "value\n"
-#~ msgstr ""
-#~ "Utilizao: %s [OPO] [[[DIALECTO] MSGID] | [-s [MSGID]...]]\n"
-#~ " -d, --domain=DIALECTO obtm as mensagems traduzidas do DIALECTO\n"
-#~ " -e permite a expanso de algumas sequncias de "
-#~ "escape\n"
-#~ " -E (ignorado para compatibilidade)\n"
-#~ " -h, --help mostra esta ajuda e sai\n"
-#~ " -n suprime o newline final\n"
-#~ " -V, --version mostra a informao de verso e sai\n"
-#~ " [DIALECTO] MSGID obtm a mensagem traduzida correspondente a\n"
-#~ " MSGID do DIALECTO\n"
-
-#, fuzzy
#~ msgid ""
+#~ "\n"
#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
#~ "the\n"
#~ "environment variable TEXTDOMAIN. If the message catalog is not found in "
@@ -3992,6 +3822,11 @@ msgstr ""
#~ "regular directory, another location can be specified with the "
#~ "environment\n"
#~ "variable TEXTDOMAINDIR.\n"
+#~ "When used with the -s option the program behaves like the `echo' "
+#~ "command.\n"
+#~ "But it does not simply copy its arguments to stdout. Instead those "
+#~ "messages\n"
+#~ "found in the selected catalog are translated.\n"
#~ "Standard search directory: %s\n"
#~ msgstr ""
#~ "\n"
@@ -4005,34 +3840,99 @@ msgstr ""
#~ "so traduzidas.\n"
#~ "Directrio standard de pesquisa: %s\n"
-#, fuzzy
-#~ msgid "file \"%s\" contains a not NUL terminated sysdep segment"
-#~ msgstr "o ficheiro \"%s\" no est no formato .mo GNU"
+#~ msgid "...this is the location of the first definition"
+#~ msgstr "...este o local da primeira definio"
-#, fuzzy
-#~ msgid "seek \"%s\" offset %ld failed"
-#~ msgstr "seek \"%s\" offset %ld falhou"
+#~ msgid "this message has no definition in the \"%s\" domain"
+#~ msgstr "esta mensagem no tem definio no domnio \"%s\""
-#, fuzzy
-#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
-#~ msgstr "as especificaes do argumento %u so diferentes"
+#~ msgid "while preparing output"
+#~ msgstr "durante a preparao da sada"
#, fuzzy
-#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-#~ msgstr "as especificaes do argumento %u so diferentes"
+#~ msgid ""
+#~ "Usage: %s [OPTION] INPUTFILE ...\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ " -d, --default-domain=NAME use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ " -D, --directory=DIRECTORY add DIRECTORY to list for input files "
+#~ "search\n"
+#~ " -e, --no-escape do not use C escapes in output "
+#~ "(default)\n"
+#~ " -E, --escape use C escapes in output, no extended "
+#~ "chars\n"
+#~ " -f, --files-from=FILE get list of input files from FILE\n"
+#~ " --force-po write PO file even if empty\n"
+#~ " -F, --sort-by-file sort output by file location\n"
+#~ " -h, --help display this help and exit\n"
+#~ msgstr ""
+#~ "Utilizao: %s [OPO] FICHEIRODEENTRADA...\n"
+#~ "Os argumentos obrigatrios para as opes longas so igualmente\n"
+#~ "obrigatrios para as opes curtas.\n"
+#~ " -a, --extract-all extrai todas as cadeias\n"
+#~ " -c, --add-comments[=TAG] coloca o bloco comentado com TAG (ou as\n"
+#~ " linhas de cabealho precedentes) no "
+#~ "ficheiro\n"
+#~ " de sada.\n"
+#~ " -C, --c++ reconhece comentrios do tipo C++\n"
+#~ " --debug produz resultados mais detalhados do\n"
+#~ " reconhecimento das cadeias de "
+#~ "formatao\n"
+#~ " -d, --default-domain=NOME usa NOME.po para a sada (em vez de\n"
+#~ " messages.po)\n"
+#~ " -D, --directory=DIRECTRIO adiciona DIRECTRIO lista de procura "
+#~ "para\n"
+#~ " \" os ficheiros de entrada\n"
+#~ " -e, --no-escape no usa sequncias de escape do C na "
+#~ "sada\n"
+#~ " (opo por defeito)\n"
+#~ " -E, --escape usa sequncias de escape do C na sada, "
+#~ "no\n"
+#~ " usando caracteres especiais\n"
+#~ " -f, --files-from=FICHEIRO obtm lista de ficheiros de entrada de\n"
+#~ " FICHEIRO\n"
+#~ " --force-po escreve o ficheiro PO mesmo se este "
+#~ "estiver\n"
+#~ " vazio\n"
+#~ " -F, --sort-by-file ordena a sada pela localizao dos "
+#~ "ficheiros\n"
#, fuzzy
-#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
-#~ msgstr "as especificaes do argumento %u so diferentes"
-
-#~ msgid "while creating hash table"
-#~ msgstr "durante a criao da tabela de disperso"
-
-#~ msgid "while preparing output"
-#~ msgstr "durante a preparao da sada"
-
-#~ msgid "this message has no definition in the \"%s\" domain"
-#~ msgstr "esta mensagem no tem definio no domnio \"%s\""
+#~ msgid ""
+#~ " -i, --indent write the .po file using indented style\n"
+#~ " --no-location do not write '#: filename:line' lines\n"
+#~ " -n, --add-location generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ " --omit-header don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ " -o, --output=FILE write output to specified file\n"
+#~ " -p, --output-dir=DIR output files will be placed in directory "
+#~ "DIR\n"
+#~ " -s, --sort-output generate sorted output and remove "
+#~ "duplicates\n"
+#~ " --strict write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ " -T, --trigraphs understand ANSI C trigraphs for input\n"
+#~ " -u, --unique shorthand for --less-than=2, requests\n"
+#~ " that only unique messages be printed\n"
+#~ msgstr ""
+#~ " -n, --add-location gera linhas do tipo '#: filename:line'\n"
+#~ " (opo utilizada por defeito)\n"
+#~ " --omit-header no escreve cabealhos com campos `msgid"
+#~ "\"\"'\n"
+#~ " -p, --output-dir=DIR os ficheiros de sada sero colocados no\n"
+#~ " directrio DIR\n"
+#~ " -s, --sort-output gera resultados ordenados, removendo os\n"
+#~ " duplicados\n"
+#~ " --strict escreve um ficheiro .po de acordo com o\n"
+#~ " modo Uniforum estrito\n"
+#~ " -T, --trigraphs entende trigrafos ANSI C na entrada\n"
+#~ " -V, --version mostra a informao de verso e sai\n"
+#~ " -w, --width=NMERO especifica a largura de pgina na sada\n"
+#~ " -x, --exclude-file=FICHEIRO os campos do FICHEIRO no so extrados\n"
+#~ "\n"
+#~ "Se o ficheiro de entrada for -, o canal de entrada por defeito (stdin) \n"
+#~ "usado.\n"
#, fuzzy
#~ msgid ""
@@ -4087,6 +3987,88 @@ msgstr ""
#~ "Se o ficheiro de entrada -, usado o canal de entrada stdin. Se o\n"
#~ "ficheiro de sada -, a sada escrita no canal de sada stdout.\n"
+#~ msgid "while creating hash table"
+#~ msgstr "durante a criao da tabela de disperso"
+
+#~ msgid "header field `%s' should start at beginning of line"
+#~ msgstr "o campo `%s' do cabealho deve comear no incio da linha"
+
+#~ msgid "field `%s' still has initial default value"
+#~ msgstr "o campo `%s' ainda tem o valor por defeito inicial"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION] def.po ref.po\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ " -D, --directory=DIRECTORY add DIRECTORY to list for input files "
+#~ "search\n"
+#~ " -e, --no-escape do not use C escapes in output (default)\n"
+#~ " -E, --escape use C escapes in output, no extended chars\n"
+#~ " --force-po write PO file even if empty\n"
+#~ " -h, --help display this help and exit\n"
+#~ " -i, --indent indented output style\n"
+#~ " -o, --output-file=FILE result will be written to FILE\n"
+#~ " --no-location suppress '#: filename:line' lines\n"
+#~ " --add-location preserve '#: filename:line' lines "
+#~ "(default)\n"
+#~ " --strict strict Uniforum output style\n"
+#~ " -v, --verbose increase verbosity level\n"
+#~ " -V, --version output version information and exit\n"
+#~ " -w, --width=NUMBER set output page width\n"
+#~ msgstr ""
+#~ "Utilizao: %s [OPO] def.po ref.po\n"
+#~ "Os argumentos obrigatrios para as opes longas so igualmente\n"
+#~ "obrigatrios para as opes curtas.\n"
+#~ " -D, --directory=DIRECTRIO adiciona DIRECTRIO lista de procura "
+#~ "para\n"
+#~ " os ficheiros de entrada\n"
+#~ " -e, --no-escape no usa sequncias de escape do C na sada\n"
+#~ " (opo por defeito)\n"
+#~ " -E, --escape usa sequncias de escape do C na sada, "
+#~ "no\n"
+#~ " usando caracteres especiais\n"
+#~ " -h, --help mostra esta ajuda e sai\n"
+#~ " -i, --indent modo de sada alinhado\n"
+#~ " -o, --output-file=FICHEIRO os resultados de sada sero escritos no "
+#~ "FICHEIRO\n"
+#~ " --strict modo de sada Uniforum estrito\n"
+#~ " -v, --verbose aumenta o nvel de verbosidade da sada\n"
+#~ " -V, --version mostra a informao de verso e sai\n"
+#~ " -w, --width=NMERO especifica a largura de pgina na sada\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION] [FILE]...\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ " -e, --no-escape do not use C escapes in output (default)\n"
+#~ " -E, --escape use C escapes in output, no extended chars\n"
+#~ " --force-po write PO file even if empty\n"
+#~ " -h, --help display this help and exit\n"
+#~ " -i, --indent write indented output style\n"
+#~ " -o, --output-file=FILE write output into FILE instead of standard "
+#~ "output\n"
+#~ " --strict write strict uniforum style\n"
+#~ " -V, --version output version information and exit\n"
+#~ " -w, --width=NUMBER set output page width\n"
+#~ msgstr ""
+#~ "Utilizao: %s [OPO] [FICHEIRO]...\n"
+#~ "Os argumentos obrigatrios para as opes longas so igualmente\n"
+#~ "obrigatrios para as opes curtas.\n"
+#~ " -e, --no-escape no usa sequncias de escape do C na sada\n"
+#~ " (opo por defeito)\n"
+#~ " -E, --escape usa sequncias de escape do C na sada, "
+#~ "no\n"
+#~ " usando caracteres especiais\n"
+#~ " -h, --help mostra esta ajuda e sai\n"
+#~ " -i, --indent usa o modo de sada alinhado\n"
+#~ " -o, --output-file=FICHEIRO os resultados de sada sero escritos no "
+#~ "FICHEIRO\n"
+#~ " em vez do canal de sada por defeito "
+#~ "(stdout)\n"
+#~ " --strict usa o modo de sada Uniforum estrito\n"
+#~ " -V, --version mostra a informao de verso e sai\n"
+#~ " -w, --width=NMERO especifica a largura de pgina na sada\n"
+
#~ msgid ""
#~ "\n"
#~ "Convert binary .mo files to Uniforum style .po files.\n"
@@ -4102,6 +4084,10 @@ msgstr ""
#~ "stdout.\n"
#, fuzzy
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "seek \"%s\" offset %ld falhou"
+
+#, fuzzy
#~ msgid ""
#~ "Usage: %s [OPTION] INPUTFILE ...\n"
#~ "Extract translatable string from given input files.\n"
@@ -4166,6 +4152,8 @@ msgstr ""
#~ " -k, --keyword[=WORD] additonal keyword to be looked for "
#~ "(without\n"
#~ " WORD means not to use default keywords)\n"
+#~ " -l, --string-limit=NUMBER set string length limit to NUMBER "
+#~ "instead %u\n"
#~ " -L, --language=NAME recognise the specified language (C, C+"
#~ "+, PO),\n"
#~ " otherwise is guessed from file "
@@ -4198,25 +4186,41 @@ msgstr ""
#, fuzzy
#~ msgid ""
-#~ "%s: warning: charset \"%s\" is not supported by iconv%s\n"
-#~ "%*s warning: consider installing GNU libiconv and then\n"
-#~ "%*s reinstalling GNU gettext"
-#~ msgstr "CUIDADO: o ficheiro fonte contm tradues aproximadas"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s: warning: charset \"%s\" is not supported without iconv%s\n"
-#~ "%*s warning: consider installing GNU libiconv and then\n"
-#~ "%*s reinstalling GNU gettext"
-#~ msgstr "CUIDADO: o ficheiro fonte contm tradues aproximadas"
-
-#, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "memria exausta"
-
-#, fuzzy
-#~ msgid "%s: warning: no header entry found"
-#~ msgstr "cuidado: nenhum elemento encontrado no cabealho"
+#~ " -n, --add-location generate '#: filename:line' lines "
+#~ "(default)\n"
+#~ " --omit-header don't write header with `msgid \"\"' "
+#~ "entry\n"
+#~ " -o, --output=FILE write output to specified file\n"
+#~ " -p, --output-dir=DIR output files will be placed in directory "
+#~ "DIR\n"
+#~ " -s, --sort-output generate sorted output and remove "
+#~ "duplicates\n"
+#~ " --strict write out strict Uniforum conforming .po "
+#~ "file\n"
+#~ " -T, --trigraphs understand ANSI C trigraphs for input\n"
+#~ " -V, --version output version information and exit\n"
+#~ " -w, --width=NUMBER set output page width\n"
+#~ " -x, --exclude-file=FILE entries from FILE are not extracted\n"
+#~ "\n"
+#~ "If INPUTFILE is -, standard input is read.\n"
+#~ msgstr ""
+#~ " -n, --add-location gera linhas do tipo '#: filename:line'\n"
+#~ " (opo utilizada por defeito)\n"
+#~ " --omit-header no escreve cabealhos com campos `msgid"
+#~ "\"\"'\n"
+#~ " -p, --output-dir=DIR os ficheiros de sada sero colocados no\n"
+#~ " directrio DIR\n"
+#~ " -s, --sort-output gera resultados ordenados, removendo os\n"
+#~ " duplicados\n"
+#~ " --strict escreve um ficheiro .po de acordo com o\n"
+#~ " modo Uniforum estrito\n"
+#~ " -T, --trigraphs entende trigrafos ANSI C na entrada\n"
+#~ " -V, --version mostra a informao de verso e sai\n"
+#~ " -w, --width=NMERO especifica a largura de pgina na sada\n"
+#~ " -x, --exclude-file=FICHEIRO os campos do FICHEIRO no so extrados\n"
+#~ "\n"
+#~ "Se o ficheiro de entrada for -, o canal de entrada por defeito (stdin) \n"
+#~ "usado.\n"
#~ msgid "duplicate message ID"
#~ msgstr "ID de mensagem duplicada"
diff --git a/gettext-tools/po/pt_BR.po b/gettext-tools/po/pt_BR.po
index 61ea8cf..65ff1c2 100644
--- a/gettext-tools/po/pt_BR.po
+++ b/gettext-tools/po/pt_BR.po
@@ -4,14 +4,14 @@
# Sandro Nunes Henrique <sandro@conectiva.com.br>, 1998
# Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>, 2000
# Flávio Bruno Leitner <flavio@conectiva.com.br>, 2001.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013.
+# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
#
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.18.3\n"
+"Project-Id-Version: gettext-tools 0.19-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-07-07 18:21+0900\n"
-"PO-Revision-Date: 2013-06-25 14:30-0300\n"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2014-05-10 17:53-0300\n"
"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
"net>\n"
@@ -19,8 +19,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.4\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.5.4\n"
#: gnulib-lib/argmatch.c:133
#, c-format
@@ -187,15 +187,15 @@ msgstr "argumento source_version inválido para compile_java_class"
msgid "invalid target_version argument to compile_java_class"
msgstr "argumento target_version inválido para compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
-#: src/write-java.c:1143
+#: gnulib-lib/javacomp.c: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 "falha ao criar \"%s\""
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
+#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr "erro ao gravar o arquivo \"%s\""
@@ -218,9 +218,9 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr "erro de E/S no subprocesso de %s"
-#: 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 "memória insuficiente"
@@ -231,7 +231,7 @@ msgid "creation of threads failed"
msgstr "criação de fluxos falhou"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "escrita para subprocesso %s falhou"
@@ -318,8 +318,8 @@ msgid "%s subprocess got fatal signal %d"
msgstr "subprocesso de %s recebeu o sinal 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: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 "erro ao abrir \"%s\" para leitura"
@@ -716,7 +716,7 @@ msgstr ""
"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-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'"
@@ -769,22 +769,22 @@ 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
+#: src/format-python-brace.c:137
#, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
msgstr "Na diretiva número %u, \"%c\" não pode iniciar um nome de campo."
-#: src/format-python-brace.c:149
+#: src/format-python-brace.c:150
#, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
msgstr "Na diretiva número %u, \"%c\" não pode iniciar um argumento getattr."
-#: src/format-python-brace.c:164
+#: src/format-python-brace.c:165
#, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
msgstr "Na diretiva número %u, \"%c\" não pode iniciar um argumento getitem."
-#: src/format-python-brace.c:184
+#: src/format-python-brace.c:185
#, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
@@ -792,7 +792,7 @@ msgstr ""
"Na diretiva de número %u, não é mais permitido empilhamento em um "
"especificador de formato."
-#: 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 "Na diretiva número %u, há uma diretiva de formato não terminado."
@@ -846,11 +846,11 @@ msgid ""
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
-#: 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"
@@ -863,19 +863,19 @@ msgstr ""
"Este é um software livre: você é livre para alterar e redistribui-lo.\n"
"NÃO HÁ GARANTIA, à extensão permitida pela lei.\n"
-#: 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 "Escrito por %s.\n"
#. 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 "Bruno Haible"
@@ -885,11 +885,11 @@ msgstr "Bruno Haible"
msgid "too many arguments"
msgstr "excesso de argumentos"
-#: 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 "Tente \"%s --help\" para mais informações.\n"
@@ -929,29 +929,29 @@ msgstr ""
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address endereços para o nome da máquina\n"
-#: src/hostname.c: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 "Saída informativa:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help exibe essa ajuda e sai\n"
-#: 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 " -V, --version exibe a informação da versão e sai\n"
@@ -960,11 +960,11 @@ msgstr " -V, --version exibe a informação da versão e sai\n"
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/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 "Relate erros para <bug-gnu-gettext@gnu.org>.\n"
@@ -973,30 +973,27 @@ msgstr "Relate erros para <bug-gnu-gettext@gnu.org>.\n"
msgid "could not get host name"
msgstr "não foi possível obter nome de máquina"
-#: 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 "no máximo um arquivo é permitido"
-#: 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 "%s e %s são mutuamente exclusivos"
-#: 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 "Uso: %s [OPÇÃO] [ARQUIVO-ENTRADA]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -1005,33 +1002,33 @@ msgstr ""
"Filtra as mensagens de um catálogo de tradução de acordo com seus atributos\n"
"e manipula-os.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c: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 ""
"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
-#: 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 "Localização do arquivo de entrada:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " ARQUIVO-ENTRADA arquivo PO de entrada\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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"
@@ -1039,33 +1036,33 @@ msgstr ""
" -D, --directory=DIRETÓRIO adiciona DIRETÓRIO à lista de arquivos de\n"
" entrada para pesquisar\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c: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 ""
"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
-#: 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 "Localização do arquivo de saída:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 ""
" -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
-#: 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"
@@ -1075,12 +1072,12 @@ msgstr ""
"for\n"
"especificado ou se ele for -.\n"
-#: 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 "Seleção de mensagem:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
@@ -1088,7 +1085,7 @@ msgstr ""
" --translated mantém as traduzidas, remove as mensagens não\n"
" traduzidas\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
@@ -1096,56 +1093,56 @@ msgstr ""
" --untranslated mantém as não traduzidas, remove as mensagens\n"
" traduzidas\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr ""
" --no-fuzzy remove as mensagens marcadas com \"fuzzy\"\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr ""
" --only-fuzzy mantém as mensagens marcadas com \"fuzzy\"\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete remove mensagens obsoletas (#~)\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete mantém mensagens obsoletas (#~)\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Manipulação de atributo:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr " --set-fuzzy define \"fuzzy\" em todas as mensagens\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr " --clear-fuzzy apaga \"fuzzy\" de todas as mensagens\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr ""
" --set-obsolete define como obsoletas todas as mensagens\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr ""
" --clear-obsolete define como não obsoletas todas as mensagens\n"
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
@@ -1155,7 +1152,7 @@ msgstr ""
"anteriores\n"
" de mensagens traduzidas.\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
@@ -1164,7 +1161,15 @@ msgstr ""
" --clear-previous remove a \"previous msgid\" de todas as\n"
" mensagens\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+" --empty ao remover os \"fuzzy\", também esvazia a "
+"msgstr\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
@@ -1172,7 +1177,7 @@ msgstr ""
" --only-file=ARQUIVO.po manipula apenas entradas listadas no ARQUIVO."
"po\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
@@ -1181,28 +1186,28 @@ msgstr ""
" manipula apenas entradas não listadas no\n"
" ARQUIVO.po\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr " --fuzzy sinônimo de --only-fuzzy --clear-fuzzy\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
msgstr ""
" --obsolete sinônimo de --only-obsolete --clear-obsolete\n"
-#: 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 "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
+#: 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"
@@ -1210,8 +1215,8 @@ msgstr ""
" -P, --properties-input arquivo de entrada está em sintaxe de\n"
" .properties Java\n"
-#: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
-#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c: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 "
@@ -1220,17 +1225,17 @@ msgstr ""
" --stringtable-input arquivo de entrada está em sintaxe de\n"
" .strings de 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
-#: 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 "Detalhes de entrada:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1246,9 +1251,9 @@ msgstr ""
"\" ou\n"
" \"html\".\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c: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 ""
@@ -1256,17 +1261,17 @@ msgstr ""
"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
+#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:977
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
msgstr " -e, --no-escape nã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
+#: 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"
@@ -1274,30 +1279,30 @@ msgstr ""
" -E, --escape usa escapes de C na saída, nenhum caractere\n"
" estendido\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr " --force-po escreve um arquivo PO mesmo se vazio\n"
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
" -i, --indent 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
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
" --no-location não escreve linhas \"#: nome-de-arquivo:linha"
"\"\n"
-#: 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"
@@ -1305,8 +1310,8 @@ 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
+#: 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"
@@ -1314,16 +1319,16 @@ msgstr ""
" --strict escreve um arquivo .po em conformidade com\n"
" com Uniforum estrito\n"
-#: src/msgattrib.c:511 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
-#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
-#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
+#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
+#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output escreve em arquivo .properties de 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
+#: 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"
@@ -1331,16 +1336,16 @@ 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
-#: 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 " -w, --width=NÚMERO define a largura da página de saída\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c: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"
@@ -1352,32 +1357,32 @@ msgstr ""
"várias\n"
" linhas\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output gera uma saída ordenada\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 ""
" -F, --sort-by-file ordena a saída por localização de arquivos\n"
-#: 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 "critério de seleção especificado impossível (%d < n < %d)"
-#: 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 "Uso: %s [OPÇÃO] [ARQUIVO-ENTRADA]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1400,24 +1405,24 @@ msgstr ""
"--use-first for especificado, eles vão ser obtidos do primeiro arquivo PO para\n"
"defini-los.\n"
-#: 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 " ARQUIVO-ENTRADA ... arquivos de entrada\n"
-#: 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 ""
" -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
+#: 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 "Se o arquivo de entrada for -, a entrada padrão é lida.\n"
-#: 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"
@@ -1426,7 +1431,7 @@ msgstr ""
" -<, --less-than=NÚMERO exibe mensagens com menos do que esse número\n"
" de definições; padrão é infinito\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1435,7 +1440,7 @@ msgstr ""
" ->, --more-than=NÚMERO exibe mensagens com mais do que estas várias\n"
" definições, sendo 0 se não for definida\n"
-#: src/msgcat.c: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"
@@ -1444,8 +1449,8 @@ msgstr ""
" -u, --unique abreviação para --less-than=2, requer que\n"
" apenas mensagens únicas sejam exibidas\n"
-#: 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"
@@ -1453,8 +1458,8 @@ msgstr ""
" -P, --properties-input arquivos de entrada estão em sintaxe \n"
" .properties do Java\n"
-#: 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"
@@ -1463,12 +1468,12 @@ msgstr ""
" --stringtable-input arquivos de entrada estão em sintaxe .strings\n"
" do NeXTstep/GNUstep\n"
-#: 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 " -t, --to-code=NOME codificação da saída\n"
-#: 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"
@@ -1477,7 +1482,7 @@ msgstr ""
" --use-first usa a primeira tradução disponível para cada\n"
" mensagem, não mescla várias traduções\n"
-#: src/msgcat.c: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"
@@ -1486,21 +1491,21 @@ msgstr ""
" cabeçalho\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "nenhum arquivo de entrada informado"
-#: 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 "são necessários 2 arquivos de entrada"
-#: 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 "Uso: %s [OPÇÃO] def.po ref.pot\n"
@@ -1533,12 +1538,12 @@ msgstr " def.po traduções\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot referências para as fontes\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "Modificadores de operação:\n"
-#: 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."
@@ -1547,7 +1552,7 @@ 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
+#: src/msgcmp.c:243 src/msgmerge.c:555
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching não usa marcação de aproximada\n"
@@ -1572,17 +1577,17 @@ msgstr "esta mensagem está não traduzida"
msgid "this message needs to be reviewed by the translator"
msgstr "esta mensagem precisa ser revisada pelo tradutor"
-#: 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 "esta mensagem é usada, mas não foi definida..."
-#: 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 "...mas esta definição é similar"
-#: 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 "esta mensagem é utilizada mas não definida em %s"
@@ -1592,19 +1597,19 @@ msgstr "esta mensagem é utilizada mas não definida em %s"
msgid "warning: this message is not used"
msgstr "atenção: esta mensagem não é utilizada"
-#: src/msgcmp.c:553 src/msgfmt.c: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] "encontrado %d erro fatal"
msgstr[1] "encontrados %d erros fatais"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "pelo menos dois arquivos devem ser especificados"
-#: 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"
@@ -1625,7 +1630,7 @@ msgstr ""
"do primeiro arquivo PO a defini-los. Posições de arquivos de todos\n"
"os arquivos PO serão cumulados.\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1635,7 +1640,7 @@ msgstr ""
"várias\n"
" definições, sendo 1 se não for definida\n"
-#: 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"
@@ -1643,68 +1648,68 @@ msgstr ""
" --omit-header não escreve um cabeçalho com a entrada 'msgid"
"\"\"'\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr ""
"Converte um catálogo de tradução para uma codificação de caracteres "
"diferente.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Alvo de conversão:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "A codificação padrão é a codificação do local atual.\n"
-#: 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 " -i, --indent estilo de saída com recuo\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
" --no-location suprime as linhas \"#: nome-de-arquivo:linha"
"\"\n"
-#: 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 ""
-" --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
-#: 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 " --strict estilo de saída Uniform estrito\n"
-#: 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 "nenhum arquivo de entrada fornecido"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "exatamente um arquivo de entrada é necessário"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Uso: %s [OPÇÃO] ARQUIVO-ENTRADA\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1716,7 +1721,7 @@ msgstr ""
"PO em inglês criado ou arquivo POT (geralmente criado por xgettext). Entradas\n"
"não traduzidas estão assinadas um tradução que é idêntica no msgid.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " ARQUIVO-ENTRADA entrada de arquivo PO ou POT\n"
@@ -1753,7 +1758,7 @@ msgid ""
"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
msgstr "Um comando especial embutido chamado \"0\" retorna a tradução, seguida por um byte nulo. A saída de \"msgexec 0\" serve como entrada para \"xargs -0\".\n"
-#: src/msgexec.c:281 src/msgfilter.c:401
+#: src/msgexec.c:281 src/msgfilter.c:420
#, c-format
msgid " -i, --input=INPUTFILE input PO file\n"
msgstr ""
@@ -1765,27 +1770,27 @@ msgstr ""
msgid "write to stdout failed"
msgstr "Escrita para a saída padrão falhou"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "faltando o nome do filtro"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr "pelo menos um script sed deve ser especificado"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Uso: %s [OPÇÃO] FILTRO [OPÇÃO-DO-FILTRO]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "Aplica um filtro em todas as traduções de um catálogo de tradução.\n"
-#: src/msgfilter.c:416
+#: src/msgfilter.c:435
#, c-format
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
@@ -1794,12 +1799,12 @@ msgstr ""
"O FILTRO pode ser qualquer programa que lê uma tradução da entrada padrão\n"
"e escreve uma tradução modificada para a saída padrão.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "Lista de OPÇÃO-DE-FILTROs úteis para quando o FILTRO é \"sed\":\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
@@ -1807,7 +1812,7 @@ msgstr ""
" -e, --expression=SCRIPT adiciona SCRIPT aos comandos a serem "
"executados\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1818,7 +1823,7 @@ msgstr ""
" adiciona o conteúdo do ARQUIVO-SCRIPT aos\n"
" comandos a serem executados\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
@@ -1826,18 +1831,18 @@ msgstr ""
" -n, --quiet, --silent suprime impressão automática do espaço de "
"padrão\n"
-#: 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 " --no-escape não usa escapes de C na saída (padrão)\n"
-#: 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 " --indent estilo de saída com recuo\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
@@ -1845,83 +1850,105 @@ msgstr ""
" --keep-header mantém mensagem de cabeçalho não modificada,\n"
" não a filtra\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "o argumento %s deveria ser um caractere singular de pontuação"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
msgstr "extremidade inválida: %s"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
+#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
msgid "Ulrich Drepper"
msgstr "Ulrich Drepper"
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:439
+#, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr ""
+"nenhum arquivo de entrada deveria ser passado se %s e %s forem especificadas."
+
+#: 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 "%s requer especificação de um \"-d diretório\""
-#: 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 "%s requer especificação de um \"-l local\""
-#: 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 "%s requer especificação de um \"--template modelo\""
+
+#: src/msgfmt.c:545
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s requer especificação de um \"-o arquivo\""
+
+#: src/msgfmt.c:551
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s e %s são mutuamente exclusivos em %s"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s é válido apenas com %s ou %s"
-#: 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 "%s é válido apenas com %s, %s ou %s"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d mensagem traduzida"
msgstr[1] "%d mensagens traduzidas"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d tradução aproximada (fuzzy)"
msgstr[1] ", %d traduções aproximadas (fuzzy)"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d mensagem não traduzida"
msgstr[1] ", %d mensagens não traduzidas"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Uso: %s [OPÇÕES] arquivo.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
"Gera um catálogo de mensagens binário a partir da descrição da tradução "
"textual.\n"
-#: 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"
@@ -1930,17 +1957,17 @@ msgstr ""
"Argumentos obrigatórios para opções longas também são para as curtas.\n"
"Da mesma forma para argumentos opcionais.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
msgid " filename.po ... input files\n"
msgstr " arquivo.po ... arquivos de entrada\n"
-#: 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 "Modo de operação:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1949,7 +1976,7 @@ msgstr ""
" -j, --java modo Java: gera uma classe ResourceBundle de "
"Java\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1958,12 +1985,12 @@ msgstr ""
" --java2 semelhante a --java, e supõe Java2 (JDK 1.2 "
"+)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr " --csharp modo C#: gera um arquivo .dll de .NET\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -1972,40 +1999,47 @@ msgstr ""
" --csharp-resources modo de recursos C#: gera um arquivo ."
"resources de .NET\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
" --tcl modo Tcl: gera um arquivo .msg de tcl/msgcat\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt modo Qt: gera um arquivo .qm de Qt\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+" --desktop modo Desktop Entry: gera um arquivo .desktop\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict habilita modo Uniforum estrito\n"
-#: 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 "Se o arquivo de saída for -, a saída é escrita na saída padrão.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Localização do arquivo de saída em modo Java:\n"
-#: src/msgfmt.c: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 " -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
+#: 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 "
@@ -2014,7 +2048,17 @@ 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
+#: src/msgfmt.c:829
+#, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --source produz um arquivo .java, ao invés de um "
+"arquivo\n"
+" .class\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
@@ -2022,7 +2066,7 @@ msgstr ""
" -d DIRETÓRIO diretório base de hierarquia de diretório de\n"
" classes\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2034,12 +2078,12 @@ msgstr ""
"nome do recurso, separados por um sublinhado. A opção -d é obrigatória.\n"
"A classe é escrita sob o diretório especificado.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "Localização do arquivo de saída em modo C#:\n"
-#: src/msgfmt.c:721 src/msgunfmt.c:473
+#: src/msgfmt.c:845 src/msgunfmt.c:473
#, c-format
msgid ""
" -d DIRECTORY base directory for locale dependent .dll "
@@ -2048,7 +2092,7 @@ msgstr ""
" -d DIRETÓRIO diretório base para arquivos .dll dependentes\n"
" da localização\n"
-#: 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"
@@ -2057,18 +2101,18 @@ msgstr ""
"As opções -l e -d são obrigatórias. O arquivo .dll é escrito em um\n"
"subdiretório do diretório especificado, cujo nome depende da localização.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Localização do arquivo de saída em modo Tcl:\n"
-#: src/msgfmt.c: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 ""
" -d DIRETÓRIO diretório base de catálogos de mensagens .msg\n"
-#: 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"
@@ -2077,12 +2121,50 @@ msgstr ""
"As opções -l e -d são obrigatórias. O arquivo .msg é escrito no\n"
"diretório especificado.\n"
-#: src/msgfmt.c:745 src/xgettext.c:882
+#: src/msgfmt.c:861
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr "Opções de modo Desktop Entry:\n"
+
+#: src/msgfmt.c:867
+#, c-format
+msgid " --template=TEMPLATE a .desktop file used as a template\n"
+msgstr ""
+" --template=MODELEO um arquivo .desktop usado como um modelo\n"
+
+#: src/msgfmt.c:869
+#, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr " -d DIRETÓRIO diretório base de arquivos .po\n"
+
+#: src/msgfmt.c: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 ""
+" -kPALAVRA, --keyword=PALAVRA\n"
+" procura por PALAVRA como uma palavra-chave\n"
+" adicional\n"
+" -k, --keyword não usa palavras-chaves padrões\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+"As opções -l, -o e --template são obrigatórias. Se -D for especificada, os\n"
+"arquivos de entrada são lidos do diretório ao invés dos argumentos da linha\n"
+"de comando.\n"
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "Interpretação do arquivo de entrada:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -2093,14 +2175,14 @@ msgstr ""
" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format verifica strings de formato dependente da\n"
" localização\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -2109,7 +2191,7 @@ msgstr ""
" --check-header verifica presença e conteúdo da mensagem\n"
" de cabeçalho\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -2119,7 +2201,7 @@ msgstr ""
"domínios\n"
" e a opção --output-file\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2128,7 +2210,7 @@ msgstr ""
" -C, --check-compatibility verifica se o GNU msgfmt se comporta como\n"
" X/Open msgfmt\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -2139,12 +2221,12 @@ msgstr ""
" verifica a presença de aceleradores de\n"
" teclado para itens de menu\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr " -f, --use-fuzzy usa entradas aproximadas na saída\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
@@ -2152,7 +2234,7 @@ 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
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2166,88 +2248,98 @@ msgstr ""
"plataforma)\n"
# "binary" de binário (compilado, .mo), e não de executável
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
" --no-hash arquivo binário não vai incluir a tabela hash\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics imprime estatísticas sobre traduções\n"
-#: 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 " -v, --verbose aumenta o nível de detalhamento\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "aviso: cabeçalho do arquivo PO faltando ou inválido\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "aviso: conversão de codificação de caracteres não vai funcionar\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "aviso: cabeçalho de arquivo PO como tradução aproximada (fuzzy)\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "aviso: versões mais antigas do msgfmt vão dar um erro nisso\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "nome do domínio \"%s\" não é válido como nome de arquivo"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"nome do domínio \"%s\" não é válido como nome de arquivo: será usado um "
"prefixo"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, c-format
msgid "'domain %s' directive ignored"
msgstr "diretiva \"domain %s\" ignorada"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "mensagem \"msgstr\" vazia ignorada"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "mensagem \"msgstr\" aproximada (fuzzy) ignorada"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: aviso: arquivo fonte contém traduções aproximadas"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr "%s não existe"
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr "%s existe, mas não pode ler"
+
#: 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 "erro ao ler \"%s\""
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2256,7 +2348,7 @@ msgstr ""
"opção \"%c\" não pode ser usada antes de \"J\", \"K\", \"T\", \"C\" ou \"X"
"\" ser especificada"
-#: 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"
@@ -2266,7 +2358,7 @@ msgstr ""
"padrão fornecido ou pertence a alguns dos arquivos fontes fornecidos.\n"
# Separei as frases (ou..ou...ou..) por ponto-e-vírgula denotando enumeração. Dadas as condições dessa string, penso ficar mais organizado assim - Rafael
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2347,7 +2439,7 @@ msgstr ""
" -v, --invert-match exibe apenas mensagens que não corresponderem\n"
" a qualquer critério de seleção\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2355,12 +2447,12 @@ msgstr ""
" --escape usa escapes de C na saída, nenhum caractere\n"
" estendido\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output gera uma saída ordenada\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
@@ -2538,7 +2630,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 "aviso: "
@@ -2749,17 +2841,17 @@ msgstr "manipulação de plural é uma extensão do GNU gettext"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr não possui a marca de acelerador de teclado \"%c\""
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr possui marcas de aceleradores de teclado \"%c\" demais"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "campo de cabeçalho \"%s\" ainda possui o valor inicial padrão\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "campo de cabeçalho \"%s\" faltando no cabeçalho\n"
@@ -2781,7 +2873,7 @@ msgstr ""
"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
+#: 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 "
@@ -2800,7 +2892,7 @@ msgstr ""
"diferentes ficaram equal."
#: 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 "
@@ -2809,16 +2901,16 @@ 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
+#: src/msgmerge.c:392 src/msgmerge.c:398
#, c-format
msgid "%s is only valid with %s"
msgstr "%s é válida apenas com %s"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr "tipo de cópia de segurança"
-#: 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"
@@ -2841,17 +2933,17 @@ msgstr ""
"de arquivos serão preservados. Onde não se encontrar uma coincidência exata, é\n"
"marcado como aproximada (fuzzy) para se ter melhores resultados.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po traduções referindo a fontes antigas\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot referências a fontes novas\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2861,7 +2953,7 @@ msgstr ""
"mensagens\n"
" pode ser especificada mais de uma vez\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2870,27 +2962,27 @@ msgstr ""
" -U, --update atualiza def.po,\n"
" faz nada se def.po estiver atualizado\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Localização de arquivo de saída no modo de atualização:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "O resultado é escrito de volta no def.po.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTROLE faz um backup do def.po\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=SUFIXO sobrescreve o sufixo padrão do backup\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2909,7 +3001,7 @@ msgstr ""
" existing, nil numerado se backups numerados existirem; Se não, simples\n"
" simple, never sempre faz backups simples\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2919,7 +3011,7 @@ msgstr ""
"O sufixo de backup é '~', a menos que seja definido com --suffix ou com a\n"
"variável de ambiente SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
@@ -2927,22 +3019,22 @@ msgstr ""
" --previous mantém msgids anteriores de mensagens "
"traduzidas\n"
-#: 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 " -q, --quiet, --silent suprime indicadores de progresso\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
msgstr "esta mensagem deveria definir formas de plural"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
msgstr "esta mensagem não deveria definir formas de plural"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2951,7 +3043,7 @@ 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/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -3065,7 +3157,7 @@ msgstr " -i, --indent escreve um estilo de saída com recuo\n"
msgid " --strict write strict uniforum style\n"
msgstr " --strict escreve em estilo Uniforum estrito\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -3087,12 +3179,12 @@ msgstr ""
"serão retirados da primeira tradução. Posições de arquivos serão cumuladas.\n"
"Quando se está usando a opção --unique, duplicatas são descartadas.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated exibe apenas duplicados\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -3162,27 +3254,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "uso inconsistente de #~"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, c-format
msgid "missing 'msgstr[]' section"
msgstr "seção \"msgstr[]\" não localizada"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, c-format
msgid "missing 'msgid_plural' section"
msgstr "seção \"msgid_plural\" não localizada"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, c-format
msgid "missing 'msgstr' section"
msgstr "seção \"msgstr\" não localizada"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "primeira forma em plural tem o índice diferente de zero"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "forma plural tem o índice errado"
@@ -3192,7 +3284,7 @@ msgstr "forma plural tem o índice errado"
msgid "too many errors, aborting"
msgstr "excesso de erros - abortando"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c: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 "sequência multi-byte inválida"
@@ -3236,16 +3328,16 @@ msgstr "fim de linha dentro de string"
msgid "context separator <EOT> within string"
msgstr "separador de contexto <EOT> dentro de string"
-#: 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 "este arquivo parece não conter diretivas de domínio"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "definição duplicada de mensagem"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "esta é a localização da primeira definição"
@@ -3446,19 +3538,19 @@ msgstr "compilação de classe C# falhou, por favor tente --verbose"
msgid "compilation of C# class failed"
msgstr "compilação de classe C# falhou"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "não é um nome de classe Java válido: %s"
-#: src/write-java.c:1165
+#: src/write-java.c:1210
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
"compilação de classe Java falhou, por favor tente --verbose ou tente definir "
"$JAVAC"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr "compilação de classe Java falhou, por favor tente definir $JAVAC"
@@ -3468,14 +3560,14 @@ msgstr "compilação de classe Java falhou, por favor tente definir $JAVAC"
msgid "error while opening \"%s\" for writing"
msgstr "erro ao abrir o arquivo \"%s\" para gravação"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr ""
"mensagens internacionalizadas não devem conter o caractere de escape \"\\%c\""
-#: 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"
@@ -3488,7 +3580,7 @@ msgstr ""
"caracteres diferente da sua. Considere usar um msgctxt ASCII puro.\n"
"%s\n"
-#: 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"
@@ -3570,7 +3662,7 @@ msgstr ""
"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
+#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
#, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "%s:%d: aviso: string não terminada"
@@ -3580,17 +3672,22 @@ msgstr "%s:%d: aviso: string não terminada"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: aviso: expressão regular não terminada"
-#: 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 "aviso: caractere Unicode inválido"
+
+#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: aviso: constante de caractere não terminada"
-#: 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 "%s:%d: aviso: string literal não terminada"
-#: 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 "Por favor, especifique a codificação fonte por meio de --from-code"
@@ -3644,7 +3741,7 @@ msgstr ""
"%s:%d: Sequência multi-byte inválida.\n"
"Por favor, especifique a codificação fonte por meio de --from-code.\n"
-#: src/x-csharp.c: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 "%s:%d: aviso: caractere Unicode inválido"
@@ -3664,22 +3761,22 @@ msgstr "%s:%d: aviso: \")\" encontrado quando \"}\" era esperado"
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: aviso: \"}\" encontrado quando \")\" era esperado"
-#: src/x-glade.c:561
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
msgstr "Faltando contexto para a string extraída do elemento \"%s\""
-#: 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 "O elemento raiz <%s> não é permitido em um arquivo Glade válido"
-#: 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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3742,11 +3839,21 @@ msgstr ""
"%s:%d: Sequência multi-byte inválida.\n"
"Por favor, especifique a codificação fonte por meio de --from-code.\n"
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: aviso: RegExp literal terminada muito cedo"
+#: src/x-javascript.c:1055
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: aviso: %s não é permitido"
+
+#: src/x-javascript.c:1069
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: aviso: marcação XML indeterminada"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3881,34 +3988,39 @@ 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
+#: src/x-vala.c:413
#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: aviso: expressão regular literal terminada muito cedo"
-#: src/xgettext.c:636
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr "\"%s\" não é um nome de codificação válida. Usando ASCII.\n"
+
+#: src/xgettext.c:648
#, 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"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext não pode funcionar sem as teclas para procurar"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr "aviso: arquivo \"%s\", extensão \"%s\" é desconhecida; tentarei C"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "Extrai strings traduzíveis dos arquivos de entrada passados.\n"
# "messages.po" é, de fato, um nome de um arquivo; não mude isso.
-#: src/xgettext.c:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3917,13 +4029,13 @@ msgstr ""
" -d, --default-domain=NOME usa NOME.po para saída (ao invés de messages."
"po)\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
" -o, --output=ARQUIVO escreve a saída para o arquivo especificado\n"
-#: src/xgettext.c:863
+#: src/xgettext.c:886
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
@@ -3932,12 +4044,12 @@ msgstr ""
" diretório DIR\n"
# Não é idioma. É linguagem de programação (C, C# etc.), de formatação (HTML etc.), de scripts (Shell script) e por aí vai.
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Escolha da linguagem do arquivo de entrada:\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3947,7 +4059,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=NOME reconhece a linguagem especificada\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3958,14 +4070,14 @@ msgstr ""
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, "
"Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ abreviação para --language=C++\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:902
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
@@ -3974,7 +4086,7 @@ msgstr ""
"Por padrão, a linguagem é adivinhada dependendo da extensão do nome do\n"
"arquivo de entrada.\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3983,24 +4095,24 @@ msgstr ""
" --from-code=NOME codificação dos arquivos de entrada\n"
" (exceto para Python, Tcl, Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr "Po padrão, supõe-se que os arquivos de entrada estejam em ASCII.\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr " -j, --join-existing junta mensagens com arquivo existente\n"
-#: src/xgettext.c:894
+#: src/xgettext.c:917
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr ""
" -x, --exclude-file=arquivo.po\n"
" entradas do ARQUIVO.po não são extraídas\n"
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -4019,17 +4131,17 @@ msgstr ""
" as linhas de palavras-chaves no arquivo de "
"saída\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Opções específicas de linguagens:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all extrai todas as strings\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4045,18 +4157,23 @@ msgstr ""
" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
" Lua, JavaScript, Vala)\n"
-#: 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 ""
-" -kPALAVRA, --keyword=PALAVRA\n"
-" procura por PALAVRA como uma palavra-chave\n"
-" adicional\n"
-" -k, --keyword não usa palavras-chaves padrões\n"
+" (apenas linguagens C, C++, ObjectiveC, "
+"Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+" Lua, JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -4068,7 +4185,7 @@ msgstr ""
"argumento\n"
" de número ARG da palavra-chave PALAVRA\n"
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4085,39 +4202,39 @@ msgstr ""
" Lua, JavaScript, Vala)\n"
# Trigraphs são seqüências de três caracteres (introduzidos por dois pontos de interrogação consecutivos) que o compilador substitui com seus caracteres de pontuação correspondente
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
" -T, --trigraphs entende trigraphs de ANSI C para entrada\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
" (apenas linguagens C, C++, ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt reconhece strings no formato Qt\n"
-#: 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 " (apenas a linguagem C++)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --kde reconhece as strings de formato KDE 4\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --boost reconhece strings no formato Boost\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
@@ -4125,13 +4242,13 @@ msgstr ""
" --debug resultado de reconhecimento de string de\n"
" formato mais detalhado\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr ""
" --properties-output escreve em um arquivo .properties de Java\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
@@ -4139,7 +4256,7 @@ msgstr ""
" define o detentor dos direitos autorais\n"
" na saída\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -4147,19 +4264,19 @@ msgstr ""
" --foreign-user omite direitos autorais da FSF na saída para\n"
" usuários de fora\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, c-format
msgid " --package-name=PACKAGE set package name in output\n"
msgstr " --package-name=PACOTE define o nome do pacote na saída\n"
-#: src/xgettext.c:989
+#: src/xgettext.c:1012
#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr ""
" --package-version=VERSÃO\n"
" define a versão do pacote na saída\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
@@ -4168,7 +4285,7 @@ msgstr ""
" define o endereço para relatar erros de\n"
" msgid\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -4180,7 +4297,7 @@ msgstr ""
"de\n"
" msgstr\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -4192,7 +4309,7 @@ msgstr ""
"de\n"
" msgstr\n"
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4201,31 +4318,31 @@ msgstr ""
"Um argumento de --flag não possui a sintaxe <palavra-chave>:<argnum>:"
"[pass-]<flag>: %s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr "entrada padrão"
-#: src/xgettext.c:2020
+#: src/xgettext.c:2071
#, c-format
msgid "Non-ASCII character at %s%s."
msgstr "Caractere não-ASCII em %s%s."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr "Comentário não ASCII em ou antes de %s%s."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr "String não-ASCII em %s%s."
-#: 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 "%s%s: aviso: "
-#: 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 "
@@ -4234,7 +4351,7 @@ 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
+#: src/xgettext.c:2190
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4243,7 +4360,7 @@ 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
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4258,7 +4375,7 @@ msgstr ""
"Por favor, considere usar uma string de formato com argumentos nomeados,\n"
"e um mapeamento ao invés de uma tupla de argumentos.\n"
-#: 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"
@@ -4268,28 +4385,28 @@ msgstr ""
"gettext(\"\") retorna a entrada de cabeçalho com\n"
"informações meta, e não a string vazia.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "especificação de argumento ambíguo para a palavra-chave \"%.*s\""
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "aviso: faltando contexto para palavra-chave \"%.*s\""
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr ""
"aviso: faltando contexto para argumentos plurais de palavra-chave '%.*s'"
-#: src/xgettext.c:2942
+#: src/xgettext.c:3052
#, c-format
msgid "context mismatch between singular and plural form"
msgstr "contexto não confere para formas singular e plural"
-#: 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"
@@ -4301,7 +4418,7 @@ msgstr ""
"especifique lá a variável MSGID_BUGS_ADDRESS; Senão por favor\n"
"especifique uma opção de linha de comando --msgid-bugs-address.\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, c-format
msgid "language '%s' unknown"
msgstr "idioma \"%s\" desconhecido"
diff --git a/gettext-tools/po/ro.po b/gettext-tools/po/ro.po
index ba02001..7713aab 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: 2013-07-07 18:21+0900\n"
+"POT-Creation-Date: 2014-06-01 11:19+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"
@@ -187,15 +187,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 "eroare n crearea \"%s\""
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: 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 "eroare n scrierea fiierului \"%s\""
@@ -220,22 +220,20 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr "eroare I/O a subprocesului %s"
-#: 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 "memorie plin"
#: gnulib-lib/pipe-filter-ii.c:192
-#, fuzzy, c-format
+#, c-format
msgid "creation of threads failed"
msgstr ""
-"compilarea clasei Java a euat, v rugm ncercai --verbose sau setai "
-"$JAVAC"
#: 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 "scrierea n subprocesul %s euat"
@@ -322,8 +320,8 @@ 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: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 "eroare n timpul deschiderii \"%s\" pentru citire"
@@ -368,7 +366,9 @@ msgstr ""
#: src/format-boost.c:449
#, fuzzy, c-format
msgid "The directive number %u starts with | but does not end with |."
-msgstr "n directiva numrul %u '~,' este folosit ntr-o poziie invalid."
+msgstr ""
+"n numrul de directiv %u, numrul mrimii argumentului 0 nu este un ntreg "
+"pozitiv."
#: src/format-c.c:36
#, c-format
@@ -713,7 +713,7 @@ msgstr ""
"specificatorul de conversie '%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-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'"
@@ -764,29 +764,29 @@ msgstr ""
"specificaiile de formatare din 'msgid' i '%s' pentru argumentul '%s' nu "
"sunt la fel"
-#: src/format-python-brace.c:136
+#: src/format-python-brace.c:137
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
msgstr "n directiva numrul %u, '%c' nu este urmat de un digit."
-#: src/format-python-brace.c:149
+#: src/format-python-brace.c:150
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
msgstr "n numrul de directiv %u, '{' nu este urmat de un numr de argument."
-#: src/format-python-brace.c:164
+#: src/format-python-brace.c:165
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
msgstr "n directiva numrul %u, '%c' nu este urmat de un digit."
-#: src/format-python-brace.c:184
+#: src/format-python-brace.c:185
#, fuzzy, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
msgstr ""
"n numrul de directiv %u, marcajele(flags) nu sunt admise nainte de '%c'."
-#: src/format-python-brace.c:210
+#: src/format-python-brace.c:270
#, fuzzy, c-format
msgid "In the directive number %u, there is an unterminated format directive."
msgstr "n directiva numrul %u parametrul %d este negativ."
@@ -838,11 +838,11 @@ msgid ""
msgstr ""
"Caracterul care termin directiva numrul %u nu este un digit ntre 1 i 9."
-#: src/hostname.c:178 src/msgattrib.c:344 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
-#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
-#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:599
+#: 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"
@@ -851,19 +851,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 "Scris de %s.\n"
#. 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 ""
@@ -873,11 +873,11 @@ msgstr ""
msgid "too many arguments"
msgstr "prea muli parametri"
-#: 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
#, fuzzy, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "ncercai `%s --help' pentru mai multe informaii.\n"
@@ -918,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: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 "Ieire(output) informativ:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help afieaz acest ajutor i iese\n"
-#: 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 " -V, --version afieaz informaii despre versiune i iese\n"
@@ -949,11 +949,11 @@ msgstr " -V, --version afieaz informaii 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: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 "Raportai bug-urile la <bug-gnu-gettext@gnu.org>.\n"
@@ -962,30 +962,27 @@ msgstr "Raportai 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: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 "cel mult un fiier de intrare(input) este permis"
-#: 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 "%s i %s se exclud reciproc"
-#: 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 "Folosire: %s [OPIUNE] [FIIER_INTRARE]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -994,10 +991,10 @@ msgstr ""
"Filtreaz mesajele unui catalog de traduceri potrivit atributelor lor,\n"
"i manipuleaz atributele.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c: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"
@@ -1005,23 +1002,23 @@ msgstr ""
"Parametrii obligatorii la opiunile lungi sunt obligatorii i la opiunile "
"scurte.\n"
-#: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
-#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
-#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
-#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
+#: src/msgattrib.c:433 src/msgcat.c: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 "Locaie fiier intrare(input):\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " FIIER_INTRARE fiier de intrare(input) PO\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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"
@@ -1029,33 +1026,33 @@ msgstr ""
" -D, --directory=DIRECTOR adaug DIRECTOR n lista de cutare a "
"fiierelor de intrare\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c: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 ""
"Dac nu este dat nici un fiier de intrare sau este -, se va citi "
"intrarea(input) standard.\n"
-#: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
-#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
-#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
-#: src/xgettext.c:857
+#: src/msgattrib.c:442 src/msgcat.c: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 "Locaie fiier ieire(output):\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 ""
" -o, --output-file=FIIER scrie output-ul n fiierul specificat\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1065,12 +1062,12 @@ msgstr ""
"fiier\n"
"de ieire(output) sau dac acesta este -.\n"
-#: 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 "Selecie mesaje:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
@@ -1078,7 +1075,7 @@ msgstr ""
" --translated pstreaz pe cele traduse, terge mesajele "
"netraduse\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
@@ -1086,68 +1083,74 @@ msgstr ""
" --untranslated pstreaz pe cele netraduse, terge mesajele "
"traduse\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr " --no-fuzzy terge mesajele marcate 'fuzzy'\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr " --only-fuzzy pstreaz mesajele marcate 'fuzzy'\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete terge mesajele nvechite #~ \n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete pstreaz mesajele nvechite #~ \n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Manipulare de atribute:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr " --set-fuzzy seteaz toate mesajele 'fuzzy'\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr " --clear-fuzzy seteaz toate mesajele non-'fuzzy'\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr " --set-obsolete seteaz toate mesajele nvechite\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr " --clear-obsolete seteaz toate mesajele non-nvechite\n"
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, fuzzy, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
" of translated messages.\n"
msgstr ""
-" --translated pstreaz pe cele traduse, terge mesajele "
-"netraduse\n"
+" -u, --unique scurttur pentru --less-than=2, solicit\n"
+" ca doar mesajele unice s fie tiprite\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, fuzzy, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
"messages\n"
msgstr " --clear-fuzzy seteaz toate mesajele non-'fuzzy'\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, fuzzy, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr " --no-fuzzy terge mesajele marcate 'fuzzy'\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
@@ -1155,7 +1158,7 @@ msgstr ""
" --only-file=FIIER.po manipuleaz doar intrrile listate n FIIER."
"po\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
@@ -1163,13 +1166,13 @@ msgstr ""
" --ignore-file=FIIER.po manipuleaz doar intrrile nelistate n "
"FIIER.po\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr ""
" --fuzzy sinonim pentru --only-fuzzy --clear-fuzzy\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
@@ -1177,16 +1180,16 @@ msgstr ""
" --obsolete sinonim pentru --only-obsolete --clear-"
"obsolete\n"
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c: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 "Sintax fiier de intrare(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
+#: 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"
@@ -1194,8 +1197,8 @@ msgstr ""
" -P, --properties-input fiierul de intrare(input) este n sintax "
"Java .properties\n"
-#: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
-#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c: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 "
@@ -1204,17 +1207,17 @@ msgstr ""
" --stringtable-input fiierul de intrare(input) este n sintax \n"
"NeXTstep/GNUstep .strings\n"
-#: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
-#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
-#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
-#: src/xgettext.c:946
+#: src/msgattrib.c:498 src/msgcat.c: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 "Detalii de output:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1223,24 +1226,24 @@ 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 " -e, --no-escape nu folosete escape-uri C n output\n"
-#: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
-#: src/msguniq.c:390 src/xgettext.c:956
+#: src/msgattrib.c:508 src/msgcat.c: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"
@@ -1248,28 +1251,28 @@ msgstr ""
" -E, --escape folosete escape-uri C n output, fr "
"caractere extinse\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr " --force-po scrie fiierul PO chiar dac e gol\n"
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
" -i, --indent scrie fiierul .po folosind stil indentat\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr " --no-location nu scrie liniile '#: filename:line'\n"
-#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:964
+#: src/msgattrib.c:516 src/msgcat.c: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"
@@ -1277,39 +1280,39 @@ msgstr ""
" -n, --add-location genereaz liniile '#: filename:"
"line' (implicit)\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
+#: src/xgettext.c:989
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr " --strict scrie strict fiiere conforme Uniforum\n"
-#: src/msgattrib.c:511 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
-#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
-#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
+#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
+#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output scrie un fiier .properties 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
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
" --stringtable-output scrie un fiier .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
+#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
+#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=NUMR setare lime output pagin\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c: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"
@@ -1320,32 +1323,32 @@ msgstr ""
" dect limea paginii de output,n cteva "
"linii\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output genereaz output sortat\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 ""
" -F, --sort-by-file sorteaz output-ul dup locaia fiierului\n"
-#: 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 "criteriu de selecie specificat imposibil (%d < n < %d)"
-#: 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 "Folosire: %s [OPIUNE] [FIIER_INTRARE]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, fuzzy, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1369,26 +1372,26 @@ msgstr ""
"este specificat --use-first, caz n care vor fi preluate din primul fiier PO pentru\n"
"a fi definite. Pozitiile din fiier din toate fiierele PO vor fi cumulate.\n"
-#: 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 " FIIER_INTRARE ... fiiere de intrare(input)\n"
-#: 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 ""
" -f, --files-from=FIIER obine lista de fiiere de intrare din "
"FIIER\n"
-#: 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 ""
"Dac fiierul de intrare este -, se va citi intrarea(input) standard.\n"
-#: 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"
@@ -1399,7 +1402,7 @@ msgstr ""
"este\n"
" infinit\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1409,7 +1412,7 @@ msgstr ""
" definiii, dac nu este setat implicit este "
"0\n"
-#: 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"
@@ -1418,8 +1421,8 @@ msgstr ""
" -u, --unique scurttur pentru --less-than=2, solicit\n"
" ca doar mesajele unice s fie tiprite\n"
-#: 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"
@@ -1427,8 +1430,8 @@ msgstr ""
" -P, --properties-input fiierele de intrare(input) sunt n sintax ."
"properties Java\n"
-#: 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"
@@ -1437,13 +1440,13 @@ msgstr ""
" --stringtable-input fiierele de intrare(input) sunt n sintax \n"
"NeXTstep/GNUstep .strings\n"
-#: 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 ""
" -t, --to-code=NUME codarea(encoding) pentru ieire(output)\n"
-#: 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"
@@ -1454,28 +1457,28 @@ msgstr ""
" fiecare mesaj, nu mbin mai multe "
"traduceri\n"
-#: 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 "nu au fost date fiiere de intrare(input)"
-#: 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 "sunt necesare exact 2 fiiere de intrare(input)"
-#: 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 "Folosire: %s [OPIUNE] def.po ref.pot\n"
@@ -1508,12 +1511,12 @@ msgstr " def.po traduceri\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot referine la surse\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "Modificatori de operaie:\n"
-#: 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."
@@ -1521,7 +1524,7 @@ msgid ""
msgstr ""
" -m, --multi-domain aplic ref.pot pe fiecare domeniu din def.po\n"
-#: 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 ""
@@ -1551,17 +1554,17 @@ msgstr "avertisment: acest mesaj nu este folosit"
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 "acest mesaj este folosit dar nu este definit..."
-#: 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 "...dar definiia este similar"
-#: 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 "acest mesaj este folosit dar nu i definit n %s"
@@ -1571,19 +1574,19 @@ msgstr "acest mesaj este folosit dar nu i definit n %s"
msgid "warning: this message is not used"
msgstr "avertisment: acest mesaj nu este folosit"
-#: 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] "s-a gsit %d eroare fatal"
msgstr[1] "s-au gsit %d erori fatale"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "cel puin dou fiiere trebuie specificate"
-#: src/msgcomm.c:363
+#: src/msgcomm.c:364
#, fuzzy, c-format, no-wrap
msgid ""
"Find messages which are common to two or more of the specified PO files.\n"
@@ -1604,7 +1607,7 @@ msgstr ""
"comentariile i comentariile extrase vor fi pstrate, dar doar dac sunt definite\n"
"n primul fiier PO. Pozitiile din fiier din toate fiierele PO vor fi cumulate.\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1614,76 +1617,76 @@ msgstr ""
" definiii, dac nu este setat implicit este "
"1\n"
-#: src/msgcomm.c:451 src/xgettext.c:981
+#: src/msgcomm.c:452 src/xgettext.c:1004
#, fuzzy, c-format
msgid ""
" --omit-header don't write header with 'msgid \"\"' entry\n"
msgstr ""
" --omit-header nu include n header intrarea `msgid \"\"'\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr ""
"Face conversia unui catalog de traduceri ntr-o alt codare(encoding) de "
"caractere.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "int conversie:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr ""
"Codarea(encoding) implicit este codarea(encoding) localizrii curente.\n"
-#: 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 ""
" --force-po scrie fiierul PO chiar dac este vid\n"
" -i, --indent scrie fiierul .po folosind stil indentat\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location nu scrie linii '#: 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
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
+#: src/msgmerge.c:588
+#, fuzzy, c-format
msgid ""
-" --add-location preserve '#: filename:line' lines (default)\n"
+" -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
" --add-location genereaz linii '#: filename:"
"line' (implicit)\n"
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
" --strict scrie strict fiiere conforme Uniforum\n"
-#: 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 "nu este furnizat nici un fiier de intrare"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "este solicitat exact un singur fiier de intrare"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Folosire: %s [OPIUNE] FIIER_INTRARE\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1696,7 +1699,7 @@ msgstr ""
"(n general creat de xgettext). Intrrilor netraduse le sunt asignate traduceri care\n"
"sunt identice cu msgid, i care vor fi marcate fuzzy.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr ""
@@ -1737,7 +1740,7 @@ msgstr ""
"un octet null. Rezultatul(output) \"msgexec 0\" este potrivit ca intrare(input)\n"
"pentru \"xargs - 0\".\n"
-#: src/msgexec.c:281 src/msgfilter.c:401
+#: src/msgexec.c:281 src/msgfilter.c:420
#, c-format
msgid " -i, --input=INPUTFILE input PO file\n"
msgstr ""
@@ -1748,27 +1751,27 @@ msgstr ""
msgid "write to stdout failed"
msgstr "scriere la stdout euat"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "lipsete numele de filtru"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr "cel puin un script sed trebuie specificat"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Folosire: %s [OPIUNE] FILTRU [OPIUNE-FILTRU]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "Aplic un filtru pe toate traducerile unui catalog de traduceri.\n"
-#: src/msgfilter.c:416
+#: src/msgfilter.c:435
#, c-format
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
@@ -1777,12 +1780,12 @@ msgstr ""
"FILTRU poate fi orice program care citete de la intrarea(input) standard\n"
"i scrie traducerea modificat la ieirea(output) standard.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "OPIUNi de FILTRU folositoare atunci cnd FILTRU este 'sed':\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
@@ -1790,7 +1793,7 @@ msgstr ""
" -e, --expression=SCRIPT adaug SCRIPTul la comenzile ce vor fi "
"executate\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1800,7 +1803,7 @@ msgstr ""
" -f, --file=FIIERSCRIPT adaug coninutul FIIERSCRIPT la comenzile\n"
" ce vor fi executate\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
@@ -1808,7 +1811,7 @@ msgstr ""
" -n, --quiet, --silent suprim tiprirea automat a spaiului "
"model(pattern)\n"
-#: 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"
@@ -1816,13 +1819,13 @@ msgstr ""
" --no-escape nu folosete escape-uri C n output "
"(implicit)\n"
-#: 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 ""
" --indent scrie fiierul .po folosind stil indentat\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
@@ -1830,82 +1833,105 @@ msgstr ""
" --keep-header pstreaz headerul nemodificat, nu l "
"filtreaz\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "argumentul lui %s ar trebui s fie un singur caracter de punctuaie"
-#: 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
+#, fuzzy, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr ""
+"Dac nu este dat nici un fiier de intrare sau este -, se va citi "
+"intrarea(input) standard.\n"
+
+#: 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 "%s necesit specificarea \"-d director\""
-#: 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 "%s necesit specificarea \"-l localizare\""
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:538
+#, fuzzy, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s necesit specificarea \"-l localizare\""
+
+#: src/msgfmt.c:545
+#, fuzzy, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s necesit specificarea \"-l localizare\""
+
+#: src/msgfmt.c:551
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s i %s se exclud reciproc"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s e valid doar cu %s sau cu %s"
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:571 src/msgfmt.c:577
#, fuzzy, c-format
msgid "%s is only valid with %s, %s or %s"
msgstr "%s e valid doar cu %s sau cu %s"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c: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] "%d mesaj tradus"
msgstr[1] "%d mesaje traduse"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d traducere aproximativ(fuzzy)"
msgstr[1] ", %d traduceri aproximative(fuzzy)"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d mesaj netradus"
msgstr[1] ", %d mesaje netraduse"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Folosire: %s [OPIUNE] numefiier.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
"Genereaz un catalog binar de mesaje din descriere de traducere textual\n"
-#: src/msgfmt.c: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"
@@ -1914,17 +1940,17 @@ msgstr ""
"Argumentele obligatorii pentru opiunile lungi sunt obligatorii i pentru opiunile\n"
"scurte. Similar pentru argumentele opionale.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
msgid " filename.po ... input files\n"
msgstr " numefiier.po ... fiiere de intrare(input)\n"
-#: 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 "Mod de operare:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1933,7 +1959,7 @@ msgstr ""
" -j, --java Mod Java: genereaz o clas Java "
"ResourceBundle\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1942,54 +1968,60 @@ msgstr ""
" --java2 precum --java, i presupune Java2 (JDK 1.2 sau "
"ulterior)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, fuzzy, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr " --qt Mod Qt: genereaz un fiier .qm Qt\n"
-#: src/msgfmt.c:685
-#, fuzzy, c-format
+#: src/msgfmt.c:805
+#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
"file\n"
-msgstr " --qt Mod Qt: genereaz un fiier .qm Qt\n"
+msgstr ""
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
" --tcl Mod tcl: genereaz un fiier tcl/msgcat .msg\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt Mod Qt: genereaz un fiier .qm Qt\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, fuzzy, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr " --qt Mod Qt: genereaz un fiier .qm Qt\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict activeaz modul strict Uniforum\n"
-#: 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 ""
"Dac fiierul de ieire(output) este -, output-ul este scris la ieirea "
"standard.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Locaie fiier output n mod Java:\n"
-#: 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 " -r, --resource=RESURS nume resurs\n"
-#: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
-#: src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c: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 "
@@ -1998,14 +2030,23 @@ msgstr ""
" -l, --locale=LOCALIZARE nume localizare, fie limb, "
"fie limb_AR\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, fuzzy, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --tcl mod Tcl: intrarea(input) este un fiier tcl/"
+"msgcat .msg\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
" -d DIRECTOR directorul de baz al ierarhiei directoarelor\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2018,12 +2059,12 @@ msgstr ""
"separat de liniu_jos. Opiunea -d este obligatorie. Clasa este\n"
"scris n directorul specificat.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, fuzzy, c-format
msgid "Output file location in C# mode:\n"
msgstr "Locaie fiier output n mod Tcl:\n"
-#: src/msgfmt.c:721 src/msgunfmt.c:473
+#: src/msgfmt.c:845 src/msgunfmt.c:473
#, fuzzy, c-format
msgid ""
" -d DIRECTORY base directory for locale dependent .dll "
@@ -2031,7 +2072,7 @@ msgid ""
msgstr ""
" -d DIRECTOR directorul de baz al ierarhiei directoarelor\n"
-#: src/msgfmt.c:723
+#: src/msgfmt.c:847
#, fuzzy, c-format
msgid ""
"The -l and -d options are mandatory. The .dll file is written in a\n"
@@ -2041,19 +2082,19 @@ msgstr ""
"directorul\n"
"specificat\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Locaie fiier output n mod Tcl:\n"
-#: 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 ""
" -d DIRECTOR directorul de baz al cataloagelor de mesaje ."
"msg\n"
-#: 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"
@@ -2063,12 +2104,48 @@ msgstr ""
"directorul\n"
"specificat\n"
-#: 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
+#, fuzzy, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr ""
+" -d DIRECTOR directorul de baz al cataloagelor de mesaje ."
+"msg\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, fuzzy, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -k, --keyword[=CUVNT] cuvinte cheie de cutat (fr\n"
+" CUVNT nseamn neutilizarea "
+"cuvintelor_cheie\n"
+" implicite)\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "Interpretare fiier de intrarea(input):\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -2079,13 +2156,13 @@ msgstr ""
" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format verific irurile format dependent de limbaj\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -2093,7 +2170,7 @@ msgid ""
msgstr ""
" --check-header verific prezena i coninutul header-ului\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -2103,7 +2180,7 @@ msgstr ""
"directivele\n"
" de domenii i opiunea --output-file\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2112,7 +2189,7 @@ msgstr ""
" -C, --check-compatibility verific dac GNU msgfmt se comport ca X/Open "
"msgfmt\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -2123,14 +2200,14 @@ msgstr ""
"tastatur\n"
" pentru elementele meniului\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
" -f, --use-fuzzy folosete intrri parial traduse la "
"ieire(output)\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
@@ -2138,7 +2215,7 @@ msgstr ""
" -a, --alignment=NUMR aliniaz irurile la NUMR octei (implicit: "
"%d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2147,89 +2224,99 @@ 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 ""
" --no-hash fiierul binar nu va include tabela de hash\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics afieaz statistici despre traduceri\n"
-#: 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 " -v, --verbose mrete nivelul de detaliere\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "avertisment: headerul fiierului PO lipsete sau este invalid\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "avertisment: conversia setului de caractere nu va funciona\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "avertisment: headerul fiierului PO este neclar(fuzzy)\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
"avertisment: versiunile mai vechi ale msgfmt ar putea aici raporta o eroare\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "numele de domeniu \"%s\" nu este potrivit ca nume fiier"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"numele de domeniu \"%s\" nu este potrivit ca nume de fiier: se va utiliza "
"prefix"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "'domain %s' directive ignored"
msgstr "directiva `domain %s' ignorat"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, fuzzy, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "intrarea `msgstr' vid ignorat"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, fuzzy, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "intrarea `msgstr' neclar(fuzzy) ignorat"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: avertisment: fiierul surs conine traduceri aproximative(fuzzy)"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c: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 "eroare n timpul citirii \"%s\""
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, fuzzy, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2237,7 +2324,7 @@ msgid ""
msgstr ""
"opiunea '%c' nu poate fi folosit nainte ca 'K' sau 'T' s fie specificate"
-#: 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"
@@ -2246,7 +2333,7 @@ msgstr ""
"Extrage toate mesajele unui catalog care se potrivete unui tipar dat\n"
"sau care e dependent de fiiere surs date.\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, fuzzy, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2312,7 +2399,7 @@ msgstr ""
" -f, --file=FIIER obine TIPAR din FIIER\n"
" -i, --ignore-case ignor distincia de caz\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2320,12 +2407,12 @@ msgstr ""
" --escape folosete escape-uri C n output, nu \n"
"caractere extinse\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output genereaz output sortat\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
@@ -2502,7 +2589,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 "avertisment: "
@@ -2713,18 +2800,18 @@ msgstr "manipularea de plurale este o extensie a GNU gettext"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr nu are marcaj de accelerator de tastatur '%c'"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr are prea multe marcaje de acceleratoare tastatur '%c'"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, fuzzy, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr ""
"cteva cmpuri de header ar trebui s aib valoare implicit iniial\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, fuzzy, c-format
msgid "header field '%s' missing in header\n"
msgstr "cmpul header '%s' lipsete din header\n"
@@ -2746,7 +2833,7 @@ msgstr ""
"caractere"
#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c: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 "
@@ -2765,7 +2852,7 @@ msgstr ""
"diferite devin egale."
#: 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 "
@@ -2774,16 +2861,16 @@ msgstr ""
"Nu se poate converti din \"%s\" n \"%s\". %s se bazeaz pe iconv(). Aceast "
"versiune a fost construit(built) fr inconv()."
-#: 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 "%s e valid doar cu %s"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr "tip de backup"
-#: 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"
@@ -2807,17 +2894,17 @@ msgstr ""
"exact, se va folosi potrivirea aproximativ(fuzzy) pentru a produce rezultate\n"
"mai bune.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po traducerile referitoare la surse vechi\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot referine la surse noi\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2827,7 +2914,7 @@ msgstr ""
"mesaje,\n"
" poate fi specificat de mai multe ori\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2837,27 +2924,27 @@ msgstr ""
" nu face nimic dac def.po este deja adus la "
"zi\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Locaie fiiere de ieire(output) n modul aducerii la zi(update):\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Rezultatele vor fi scrise n def.po:\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTROL se creaz un backup al def.po\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=SUFIX suprascrie sufixul obinuit de backup\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2877,7 +2964,7 @@ msgstr ""
" existing, nil numerotate dac exist backup-uri, simple n caz contrar\n"
" simple, never creaz ntotdeauna backup-uri simple\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, fuzzy, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2888,7 +2975,7 @@ msgstr ""
"cu\n"
"variabila de mediu SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, fuzzy, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
@@ -2896,22 +2983,22 @@ msgstr ""
" --translated pstreaz pe cele traduse, terge mesajele "
"netraduse\n"
-#: 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 " -q, --quiet, --silent suprim indicatorii de progres\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
msgstr "acest mesaj ar trebui s defineasc formele plurale"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
msgstr "acest mesaj nu ar trebui s defineasc formele plurale"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2920,7 +3007,7 @@ msgstr ""
"%sCitite %ld vechi + %ld referine, unite %ld, aproximri %ld, lips %ld, "
"nvechite %ld.\n"
-#: 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"
@@ -2958,13 +3045,11 @@ msgstr ""
"msgcat .msg\n"
#: src/msgunfmt.c:444
-#, fuzzy, c-format
+#, c-format
msgid ""
" --csharp-resources C# resources mode: input is a .NET .resources "
"file\n"
msgstr ""
-" --tcl mod Tcl: intrarea(input) este un fiier tcl/"
-"msgcat .msg\n"
#: src/msgunfmt.c:446
#, c-format
@@ -3036,7 +3121,7 @@ msgid " --strict write strict uniforum style\n"
msgstr ""
" --strict scrie strict fiiere conforme Uniforum\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -3058,12 +3143,12 @@ msgstr ""
"Poziiile din fiier vor fi cumulate. Dac se folosete opiunea --unique,\n"
"duplicatele vor fi omise.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated afieaz doar duplicatele\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -3136,27 +3221,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "folosire inconsistent a #~"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, fuzzy, c-format
msgid "missing 'msgstr[]' section"
msgstr "lipsete seciunea `msgstr[]'"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, fuzzy, c-format
msgid "missing 'msgid_plural' section"
msgstr "lipsete seciunea `msgid_plural[]'"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, fuzzy, c-format
msgid "missing 'msgstr' section"
msgstr "lipsete seciunea `msgstr'"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "primul plural are index nonzero"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "forma plural are index greit"
@@ -3166,7 +3251,7 @@ msgstr "forma plural are index greit"
msgid "too many errors, aborting"
msgstr "prea multe erori, se renun"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c: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 "secven multibyte invalid"
@@ -3210,16 +3295,16 @@ msgstr "sfrit de linie n ir"
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 "acest fiier poate s nu conin directive de domeniu"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "definiie duplicat de mesaj"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
#, fuzzy
msgid "this is the location of the first definition"
msgstr "...aceasta este locaia primei definiii"
@@ -3428,23 +3513,21 @@ msgstr ""
#: src/write-csharp.c:768
#, fuzzy, c-format
msgid "compilation of C# class failed"
-msgstr ""
-"compilarea clasei Java a euat, v rugm ncercai --verbose sau setai "
-"$JAVAC"
+msgstr "comunicaia cu subprocesul %s a euat"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "nu este un nume valid de clas Java: %s"
-#: 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 ""
"compilarea clasei Java a euat, v rugm ncercai --verbose sau setai "
"$JAVAC"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, fuzzy, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr ""
@@ -3456,14 +3539,14 @@ msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "eroare n deschiderea \"%s\" pentru scriere"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, fuzzy, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr ""
"mesajele internaionalizate nu ar trebui s conin secvena de escape `\\%c'"
-#: src/write-po.c:1254 src/write-po.c:1383
+#: src/write-po.c:1326 src/write-po.c:1450
#, fuzzy, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3478,7 +3561,7 @@ msgstr ""
"pur ASCII n loc.\n"
"%s\n"
-#: 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"
@@ -3538,8 +3621,8 @@ msgid ""
"message catalog has context dependent translations\n"
"but the C# .resources format doesn't support contexts\n"
msgstr ""
-"catalogul de mesaje are traduceri n form plural,\n"
-"dar formatul catalogului de mesaje Qt nu suport manipularea pluralelor\n"
+"catalogul de mesaje are traduceri n form plural, dar formatul de "
+"ieire(output) nu le suport."
#: src/write-resources.c:150
#, fuzzy
@@ -3567,7 +3650,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-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 "%s:%d: avertisment: ir neterminat"
@@ -3577,17 +3660,22 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, fuzzy, c-format
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: avertisment: caracter Unicode invalid"
+
+#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: avertisment: constant caracter neterminat"
-#: 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 "%s:%d: avertisment: ir literal neterminat"
-#: src/x-csharp.c:224 src/xgettext.c:2055
+#: src/x-csharp.c:224 src/xgettext.c:2106
#, fuzzy
msgid "Please specify the source encoding through --from-code."
msgstr ""
@@ -3644,7 +3732,7 @@ msgstr ""
"ir non-ASCII la %s%s.\n"
"V rugm specificai sursa codrii(encoding) prin --from-code.\n"
-#: 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 "%s:%d: avertisment: caracter Unicode invalid"
@@ -3664,22 +3752,22 @@ msgstr "%s:%d: avertisment: s-a gsit ')' unde se atepta '}'"
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: avertisment: s-a gsit '}' unde se atepta ')'"
-#: 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
#, fuzzy, c-format
msgid "%s:%lu:%lu: %s"
msgstr "%s:%d:%d: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3745,11 +3833,21 @@ msgstr ""
"ir non-ASCII la %s%s.\n"
"V rugm specificai sursa codrii(encoding) prin --from-code.\n"
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, fuzzy, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: avertisment: ir literal neterminat"
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%lu: avertisment: eroare de sintax"
+
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: avertisment: ir neterminat"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3787,63 +3885,50 @@ msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
msgstr "%s:%d: interpolare invalid (\"\\U\") a caracterului pe 8bii \"%c\""
#: 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 ""
-"ir non-ASCII la %s%s.\n"
-"V rugm specificai sursa codrii(encoding) prin --from-code.\n"
#: src/x-python.c:324
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"ir non-ASCII la %s%s.\n"
-"V rugm specificai sursa codrii(encoding) prin --from-code.\n"
#: src/x-python.c:341
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"ir non-ASCII la %s%s.\n"
-"V rugm specificai sursa codrii(encoding) prin --from-code.\n"
#: src/x-python.c:354
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of file.\n"
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"ir non-ASCII la %s%s.\n"
-"V rugm specificai sursa codrii(encoding) prin --from-code.\n"
#: src/x-python.c:364
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of line.\n"
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"ir non-ASCII la %s%s.\n"
-"V rugm specificai sursa codrii(encoding) prin --from-code.\n"
#: src/x-python.c:397
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the source encoding through --from-code or through a comment\n"
"as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"ir non-ASCII la %s%s.\n"
-"V rugm specificai sursa codrii(encoding) prin --from-code.\n"
#: src/x-python.c:722
#, c-format
@@ -3874,35 +3959,40 @@ msgstr ""
"%s:%lu: avertisment: sintaxa $\"...\" nu se mai folosete din motive de "
"securitate; nlocuii cu eval_gettext"
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, fuzzy, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: avertisment: ir literal neterminat"
-#: src/xgettext.c: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 ""
"--join-existing nu poate fi folosit cnd output-ul este scris la stdout"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext nu poate funciona fr cuvinte cheie dup care s caute"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, fuzzy, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr ""
"avertisment: fiierul `%s' extensia `%s' este necunoscut(); se va ncerca C"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr ""
"Extrage irurile traductibile din fiierele de intrare(input) specificate.\n"
-#: src/xgettext.c:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3911,13 +4001,13 @@ msgstr ""
" -d, --default-domain=NUME folosete NUME.po pentru output \n"
"(n loc de messages.po)\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
" -o, --output=FIIER scrie output-ul n fiierul specificat\n"
-#: src/xgettext.c:863
+#: src/xgettext.c:886
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
@@ -3926,12 +4016,12 @@ msgstr ""
"n \n"
"directorul DIR\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Alegerea limbajul fiierelor de intrare(input):\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, fuzzy, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3941,7 +4031,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=NUME recunoate limbajul specificat\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3950,12 +4040,12 @@ msgstr ""
" JavaProperties, awk, YCP, Tcl, Perl, PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ scurttur pentru --language=C++\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:902
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
@@ -3965,7 +4055,7 @@ msgstr ""
"intrare \n"
"(input)\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3974,25 +4064,25 @@ msgstr ""
" --from-code=NUME codare pentru fiierele de intrare(input)\n"
" (exceptnd Python, Tcl, Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr "Implicit fiierele de intrare(input) sunt presupuse a fi n ASCII.\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
" -j, --join-existing altur mesajele fiierului existent\n"
-#: 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 ""
" -x, --exclude-file=FIIER.po intrrile din FIIER.po nu vor fi "
"extrase\n"
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, fuzzy, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -4007,17 +4097,17 @@ msgstr ""
" cuvinte cheie) n fiierul de "
"ieire(output)\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Opiuni specifice limbajului:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all extrage toate irurile\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4030,18 +4120,20 @@ msgstr ""
" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
" Tcl, Perl, PHP, GCC-surs, Glade)\n"
-#: src/xgettext.c:911
+#: src/xgettext.c:937
#, fuzzy, 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 ""
-" -k, --keyword[=CUVNT] cuvinte cheie de cutat (fr\n"
-" CUVNT nseamn neutilizarea "
-"cuvintelor_cheie\n"
-" implicite)\n"
+" (doar limbajele C, C++, ObjectiveC, Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
+" Tcl, Perl, PHP, GCC-surs, Glade)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -4052,7 +4144,7 @@ msgstr ""
"argumentul\n"
" numrul ARG al cuvntului cheie CUVNT\n"
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4065,7 +4157,7 @@ msgstr ""
" Python, Lisp, EmacsLisp, librep, Java, awk,\n"
" YCP, Tcl, Perl, PHP, GCC-surs)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
@@ -4073,32 +4165,32 @@ msgstr ""
"pentru intrare\n"
" (input)\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr " (doar limbajele C, C++, ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt recunoate formatul irurilor Qt\n"
-#: 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 " (doar limbajul C++)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, fuzzy, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --qt recunoate formatul irurilor Qt\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, fuzzy, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --qt recunoate formatul irurilor Qt\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
@@ -4106,19 +4198,19 @@ msgstr ""
" --debug rezultat mai detaliat al recunoaterii "
"formatstring\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output scrie un fiier .properties Java\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
" --copyright-holder=IR seteaz deintorul copyright-ului la "
"ieire(output)\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -4126,19 +4218,19 @@ msgstr ""
" --foreign-user omite copyright FSF la ieire pentru user "
"strin(foreign)\n"
-#: 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
#, fuzzy, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr ""
" --copyright-holder=IR seteaz deintorul copyright-ului la "
"ieire(output)\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
@@ -4146,7 +4238,7 @@ msgstr ""
" --msgid-bugs-address=EMAIL@ADRES seteaz adresa de reportare a\n"
"bug-urilor msgid\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, fuzzy, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -4156,7 +4248,7 @@ msgstr ""
" -m, --msgstr-prefix[=IR] folosete IR sau \"\" ca prefix pentru "
"intrrile msgstr\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, fuzzy, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -4166,7 +4258,7 @@ msgstr ""
" -M, --msgstr-suffix[=IR] folosete IR sau \"\" ca suefix pentru "
"intrrile msgstr\n"
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4174,31 +4266,31 @@ msgid ""
msgstr ""
"Un argument --flag nu are sintaxa <keyword>:<argnum>:[pass-]<flag> : %s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr "intrare(input) standard"
-#: 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 "%s%s: avertisment: "
-#: 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 "
@@ -4207,7 +4299,7 @@ msgstr ""
"Dei este folosit ntr-o poziie de format a irului, %s nu este un format\n"
"al irului valid %s. Motiv: %s\n"
-#: 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: "
@@ -4216,7 +4308,7 @@ msgstr ""
"Dei este declarat astfel, %s nu este un format al irului valid %s: Motiv:\n"
"%s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4225,7 +4317,7 @@ 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"
@@ -4235,27 +4327,27 @@ msgstr ""
"gettext(\"\") returneaz header-ul cu informaii\n"
"meta, nu cu irul vid.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, fuzzy, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "parametru ambiguu `%s' pentru `%s'"
-#: src/xgettext.c:2896
-#, fuzzy, c-format
+#: src/xgettext.c:3006
+#, c-format
msgid "warning: missing context for keyword '%.*s'"
-msgstr "parametru ambiguu `%s' pentru `%s'"
+msgstr ""
-#: src/xgettext.c:2921
-#, fuzzy, c-format
+#: src/xgettext.c:3031
+#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "parametru ambiguu `%s' pentru `%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
#, fuzzy
msgid ""
"The option --msgid-bugs-address was not specified.\n"
@@ -4268,7 +4360,7 @@ msgstr ""
"aici variabila MSGID_BUGS_ADDRESS; n caz contrar\n"
"v rugm specificai optiunea --msgid-bugs-address n linia de comand.\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, fuzzy, c-format
msgid "language '%s' unknown"
msgstr "limbajul `%s' este necunoscut"
@@ -4277,26 +4369,12 @@ msgstr "limbajul `%s' este necunoscut"
msgid "<unnamed>"
msgstr ""
-#, fuzzy
-#~ msgid "header field '%s' should start at beginning of line\n"
-#~ msgstr "cmpul header `%s' ar trebui s nceap la nceputul liniei\n"
-
-#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr ""
-#~ "cteva cmpuri de header ar trebui s aib valoare implicit iniial\n"
-
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: opiune ilegal -- %c\n"
#~ msgid "DuplicateHandle failed with error code 0x%08x"
#~ msgstr "DuplicateHandle a euat cu cod de eroare 0x%08x"
-#~ msgid "Not yet implemented."
-#~ msgstr "Neimplimentat nc."
-
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "cmpul `%s' nc are valoarea implicit iniial\n"
-
#~ msgid "Multiple references to %%%c."
#~ msgstr "Referine multiple la % % %c."
@@ -4313,21 +4391,32 @@ msgstr ""
#~ "garanie; nici mcar pentru VANDABILITATE sau MODIFICARE NTR-UN SCOP "
#~ "PRIVAT.\n"
-#, fuzzy
-#~ msgid ""
-#~ "message catalog has context dependent translations\n"
-#~ "but the C# .dll format doesn't support contexts\n"
-#~ msgstr ""
-#~ "catalogul de mesaje are traduceri n form plural,\n"
-#~ "dar formatul catalogului de mesaje Qt nu suport manipularea pluralelor\n"
+#~ msgid "Not yet implemented."
+#~ msgstr "Neimplimentat nc."
-#, fuzzy
-#~ msgid ""
-#~ "message catalog has context dependent translations\n"
-#~ "but the Java ResourceBundle format doesn't support contexts\n"
-#~ msgstr ""
-#~ "catalogul de mesaje are traduceri n form plural,\n"
-#~ "dar formatul catalogului de mesaje Qt nu suport manipularea pluralelor\n"
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "cmpul header `%s' ar trebui s nceap la nceputul liniei\n"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "cmpul `%s' nc are valoarea implicit iniial\n"
+
+#~ msgid "write to grep subprocess failed"
+#~ msgstr "scrierea n subprocesul grep a euat"
+
+#~ msgid "conversion failure"
+#~ msgstr "eroare de conversie"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: avertisment: "
+
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
+
+#~ msgid "%s:%lu: warning: unterminated string"
+#~ msgstr "%s:%lu: avertisment: ir neterminat"
+
+#~ msgid "%s:%d: fatal: plural message seen before singular message\n"
+#~ msgstr "%s:%d: fatal: mesaj plural ntlnit nainte de mesajul singular\n"
#~ msgid "Which is your email address?"
#~ msgstr "Care este adresa voastr de email?"
@@ -4361,21 +4450,3 @@ msgstr ""
#~ msgid "Please enter your email address."
#~ msgstr "V rugm introducei adresa voastr de email."
-
-#~ msgid "%s: warning: "
-#~ msgstr "%s: avertisment: "
-
-#~ msgid "%s\n"
-#~ msgstr "%s\n"
-
-#~ msgid "%s:%lu: warning: unterminated string"
-#~ msgstr "%s:%lu: avertisment: ir neterminat"
-
-#~ msgid "%s:%d: fatal: plural message seen before singular message\n"
-#~ msgstr "%s:%d: fatal: mesaj plural ntlnit nainte de mesajul singular\n"
-
-#~ msgid "conversion failure"
-#~ msgstr "eroare de conversie"
-
-#~ msgid "write to grep subprocess failed"
-#~ msgstr "scrierea n subprocesul grep a euat"
diff --git a/gettext-tools/po/ru.po b/gettext-tools/po/ru.po
index a4faa98..edc8a05 100644
--- a/gettext-tools/po/ru.po
+++ b/gettext-tools/po/ru.po
@@ -1,89 +1,92 @@
-# gettext
+# Локализация для gettext
# Copyright (C) 1998 Free Software Foundation, Inc.
-# Oleg S. Tihonov <ost@tatnipi.ru>, 1998, 2001-2007.
+# This file is distributed under the same license as the gettext package.
#
+# Oleg S. Tihonov <ost@tatnipi.ru>, 1998, 2001-2007.
+# Yuri Kozlov <yuray@komyakino.ru>, 2014.
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.16\n"
+"Project-Id-Version: gettext-tools 0.19-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2014-05-11 13:59+0400\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"Language-Team: Russian <gnu@mx.ru>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-r\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Lokalize 1.5\n"
#: gnulib-lib/argmatch.c:133
#, c-format
msgid "invalid argument %s for %s"
-msgstr " %s %s"
+msgstr "неверный аргумент %s для %s"
#: gnulib-lib/argmatch.c:134
#, c-format
msgid "ambiguous argument %s for %s"
-msgstr " %s %s"
+msgstr "неоднозначный аргумент %s для %s"
#: gnulib-lib/argmatch.c:153
msgid "Valid arguments are:"
-msgstr " :"
+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
msgid "cannot create a temporary directory using template \"%s\""
-msgstr " \"%s\""
+msgstr "невозможно создать временный каталог с помощью шаблона «%s»"
#: gnulib-lib/clean-temp.c:442
#, c-format
msgid "cannot remove temporary file %s"
-msgstr " %s"
+msgstr "невозможно удалить временный файл %s"
#: gnulib-lib/clean-temp.c:457
#, c-format
msgid "cannot remove temporary directory %s"
-msgstr " %s"
+msgstr "невозможно удалить временный каталог %s"
#: gnulib-lib/closeout.c:66
msgid "write error"
-msgstr " "
+msgstr "ошибка записи"
#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
#, c-format
msgid "preserving permissions for %s"
-msgstr ""
+msgstr "сохранение прав доступа для %s"
#: gnulib-lib/copy-file.c:194
-#, fuzzy, c-format
+#, c-format
msgid "error while opening %s for reading"
-msgstr " \"%s\" "
+msgstr "ошибка при открытии файла %s для чтения"
#: gnulib-lib/copy-file.c:198
-#, fuzzy, c-format
+#, c-format
msgid "cannot open backup file %s for writing"
-msgstr " \"%s\" "
+msgstr "не удалось открыть файл резервной копии %s для записи"
#: gnulib-lib/copy-file.c:202
-#, fuzzy, c-format
+#, c-format
msgid "error reading %s"
-msgstr " \"%s\""
+msgstr "ошибка чтения %s"
#: gnulib-lib/copy-file.c:206
-#, fuzzy, c-format
+#, c-format
msgid "error writing %s"
-msgstr " \"%s\""
+msgstr "ошибка записи %s"
#: gnulib-lib/copy-file.c:210
-#, fuzzy, c-format
+#, c-format
msgid "error after reading %s"
-msgstr " \"%s\""
+msgstr "ошибка после чтения %s"
#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
@@ -91,166 +94,166 @@ msgstr " \"%s\""
#: src/read-tcl.c:110 src/write-resources.c:77
#, c-format
msgid "fdopen() failed"
-msgstr " fdopen() "
+msgstr "ошибка при вызовы fdopen()"
#: gnulib-lib/csharpcomp.c:571
#, c-format
msgid "C# compiler not found, try installing pnet"
-msgstr " C#, pnet"
+msgstr "Не найден компилятор C#, попробуйте поставить pnet"
#: gnulib-lib/csharpexec.c:343
#, c-format
msgid "C# virtual machine not found, try installing pnet"
-msgstr " C#, pnet"
+msgstr "Не найдена виртуальная машина C#, попробуйте поставить pnet"
#: gnulib-lib/error.c:188
msgid "Unknown system error"
-msgstr " "
+msgstr "Неизвестная системная ошибка"
#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
-msgstr " %s "
+msgstr "дочерний процесс %s завершился неуспехом"
#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: `%s'\n"
+msgstr "%s: двусмысленный параметр «%s»; возможные варианты:"
#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: `--%s' \n"
+msgstr "%s: у параметра «--%s» не может быть аргумента\n"
#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: `%c%s' \n"
+msgstr "%s: у параметра «%c%s» не может быть аргумента\n"
#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: `%s' c \n"
+msgstr "%s: для параметра «--%s» требуется аргумент\n"
#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: `--%s'\n"
+msgstr "%s: неизвестный параметр «--%s»\n"
#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: `%c%s'\n"
+msgstr "%s: неизвестный параметр «%c%s»\n"
#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
+#, c-format
msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: -- %c\n"
+msgstr "%s: недопустимый параметр — «%c»\n"
#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
+#, c-format
msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: %c c \n"
+msgstr "%s: для параметра требуется аргумент — «%c»\n"
#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: `-W %s'\n"
+msgstr "%s: двусмысленный параметр «-W %s»\n"
#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: `-W %s' \n"
+msgstr "%s: у параметра «-W %s» не может быть аргумента\n"
#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: `%s' c \n"
+msgstr "%s: для параметра «-W %s» требуется аргумент\n"
#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
#: gnulib-lib/javacomp.c:156
#, c-format
msgid "invalid source_version argument to compile_java_class"
-msgstr " source_version compile_java_class"
+msgstr "неправильный аргумент source_version для compile_java_class"
#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
#, c-format
msgid "invalid target_version argument to compile_java_class"
-msgstr " target_version compile_java_class"
+msgstr "неправильный аргумент target_version для compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
-#: src/write-java.c:1143
+#: gnulib-lib/javacomp.c: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 " \"%s\" "
+msgstr "ошибка при создании «%s»"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: 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 " \"%s\""
+msgstr "ошибка записи файла «%s»"
#: gnulib-lib/javacomp.c:2343
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-" Java, gcj $JAVAC"
+"Не найден компилятор 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, поставьте gij или установите переменную "
"$JAVA"
#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
#: src/msginit.c:1140
#, c-format
msgid "%s subprocess I/O error"
-msgstr " / %s"
+msgstr "ошибка ввода/вывода в дочернем процессе %s"
-#: 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 " "
+msgstr "память исчерпана"
#: gnulib-lib/pipe-filter-ii.c:192
-#, fuzzy, c-format
+#, c-format
msgid "creation of threads failed"
-msgstr " C#- , --verbose"
+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 " %s "
+msgstr "ошибка при записи в дочерний процесс %s"
#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
#, c-format
msgid "read from %s subprocess failed"
-msgstr " %s "
+msgstr "ошибка при чтении из дочернего процесса %s"
#: gnulib-lib/pipe-filter-ii.c:298
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr ""
-" / %s"
+"невозможно организовать неблокирующий ввод/вывод для дочернего процесса %s"
#: gnulib-lib/pipe-filter-ii.c:329
#, c-format
msgid "communication with %s subprocess failed"
-msgstr " %s "
+msgstr "ошибка при попытке связи с дочерним процессом %s"
#: gnulib-lib/pipe-filter-ii.c:449
#, c-format
msgid "%s subprocess terminated with exit code %d"
-msgstr " %s %d"
+msgstr "дочерний процесс %s завершился с выходным кодом %d"
#. TRANSLATORS:
#. Get translations for open and closing quotation marks.
@@ -275,66 +278,66 @@ msgstr " %s %d"
#. and use glyphs suitable for your language.
#: gnulib-lib/quotearg.c:312
msgid "`"
-msgstr ""
+msgstr "«"
#: gnulib-lib/quotearg.c:313
msgid "'"
-msgstr ""
+msgstr "»"
#: gnulib-lib/set-acl.c:46
#, c-format
msgid "setting permissions for %s"
-msgstr ""
+msgstr "установка прав доступа для %s"
#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
#, c-format
msgid "cannot create pipe"
-msgstr " "
+msgstr "невозможно создать канал"
#: gnulib-lib/w32spawn.h:43
#, c-format
msgid "_open_osfhandle failed"
-msgstr " _open_osfhandle "
+msgstr "ошибка при _open_osfhandle"
#: gnulib-lib/w32spawn.h:84
-#, fuzzy, c-format
+#, c-format
msgid "cannot restore fd %d: dup2 failed"
-msgstr " \"%s\""
+msgstr "не удалось восстановить fd %d: ошибка dup2"
#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
#: gnulib-lib/wait-process.c:317
#, c-format
msgid "%s subprocess"
-msgstr " %s"
+msgstr "дочерний процесс %s"
#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
#, c-format
msgid "%s subprocess got fatal signal %d"
-msgstr " %s %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: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 " \"%s\" "
+msgstr "ошибка открытия файла «%s» для чтения"
#: src/format.c:151
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
msgstr ""
-"'%s' %s 'msgid'. "
-": %s"
+"Строка «%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
-#, fuzzy, c-format
+#, c-format
msgid ""
"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
-msgstr " 'msgid' '%u' '%s'"
+msgstr "спецификация формата аргумента %u в «%s» не существует в «%s»"
#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
@@ -342,7 +345,7 @@ msgstr " 'msgid' '%u' '%s'"
#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
#, c-format
msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr " %u '%s' "
+msgstr "спецификация формата аргумента %u не существует в «%s»"
#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
#: src/format-elisp.c:379 src/format-gcc-internal.c:658
@@ -350,14 +353,14 @@ msgstr " %u '%s' "
#: 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
+#, c-format
msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr " `msgid' `%s' %u"
+msgstr "спецификации формата в «%s» и «%s» не совпадают для аргумента %u"
#: 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
@@ -365,77 +368,77 @@ 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."
+"В директиве номер %u лексема после «<» не является именем макроса-"
+"спецификации формата. Допустимые имена макросов перечислены в ISO C 99, "
+"раздел 7.8.1."
#: src/format-c.c:39
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
msgstr ""
-" %u , '<', '>'."
+"В директиве номер %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."
+"Строка ссылается на аргумент номер %u, но игнорирует аргумент номер %u."
#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
#: src/format-javascript.c:215 src/format-python.c:515
#: src/format-qt-plural.c:110
-#, fuzzy, c-format
+#, c-format
msgid "number of format specifications in '%s' and '%s' does not match"
-msgstr " `msgid' `%s'"
+msgstr "не совпадает количество спецификаций формата в «%s» и «%s»"
#: src/format-csharp.c:88 src/format-java.c:205
#, c-format
msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr " %u '{' ."
+msgstr "В директиве номер %u после «{» не стоит номер аргумента."
#: src/format-csharp.c:109
#, c-format
msgid "In the directive number %u, ',' is not followed by a number."
-msgstr " %u ',' ."
+msgstr "В директиве номер %u после «,» не стоит число."
#: src/format-csharp.c:130 src/format-java.c:191
msgid ""
"The string ends in the middle of a directive: found '{' without matching '}'."
msgstr ""
-" : '{' '}'."
+"Строка обрывается посреди директивы: найдена «{» без соответствующей «}»."
#: src/format-csharp.c:139
#, c-format
msgid ""
"The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr " %u '%c', '}'."
+msgstr "Директива номер %u заканчивается на неверный символ «%c», а не на «}»."
#: src/format-csharp.c:140
#, c-format
msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr " %u , '}'."
+msgstr "Директива номер %u заканчивается на неверный символ, а не на «}»."
#: src/format-csharp.c:161 src/format-java.c:346
msgid ""
"The string starts in the middle of a directive: found '}' without matching "
"'{'."
msgstr ""
-" : '}' '{'."
+"Строка начинается посреди директивы: найдена «}» без соответствующей «{»."
#: src/format-csharp.c:162
#, c-format
msgid "The string contains a lone '}' after directive number %u."
-msgstr " '}' %u."
+msgstr "Строка содержит непарную «}» после директивы номер %u."
#: src/format-gcc-internal.c:255
#, c-format
msgid "In the directive number %u, the flags combination is invalid."
-msgstr " %u ."
+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
@@ -443,62 +446,65 @@ msgid ""
"In the directive number %u, the argument number for the precision must be "
"equal to %u."
msgstr ""
-" %u %u."
+"В директиве номер %u номер аргумента для точности должен быть равно %u."
#: src/format-gcc-internal.c:398
-#, fuzzy, c-format
+#, c-format
msgid ""
"In the directive number %u, a precision specification is not allowed before "
"'%c'."
-msgstr " %u '%c' ."
+msgstr ""
+"В директиве номер %u перед «%c» нельзя указывать спецификацию точности."
#: src/format-gcc-internal.c:406
#, c-format
msgid "In the directive number %u, the precision specification is invalid."
-msgstr " %u ."
+msgstr "В директиве номер %u неверная спецификация точности."
#: src/format-gcc-internal.c:463
#, c-format
msgid "In the directive number %u, flags are not allowed before '%c'."
-msgstr " %u '%c' ."
+msgstr "В директиве номер %u перед «%c» нельзя писать флаги."
#: src/format-gcc-internal.c:677
-#, fuzzy, c-format
+#, c-format
msgid "'%s' uses %%m but '%s' doesn't"
-msgstr " 'msgid' %%m, '%s' "
+msgstr "В «%s» используется %%m, но в «%s» нет"
#: src/format-gcc-internal.c:680
-#, fuzzy, c-format
+#, c-format
msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr " 'msgid' %%m, '%s' "
+msgstr "В «%s» не используется %%m, но в «%s» используется %%m"
#: src/format-gfc-internal.c:383
-#, fuzzy, c-format
+#, c-format
msgid "'%s' uses %%C but '%s' doesn't"
-msgstr " 'msgid' %%m, '%s' "
+msgstr "В «%s» используется %%C, но в «%s» нет"
#: src/format-gfc-internal.c:386
-#, fuzzy, c-format
+#, c-format
msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr " 'msgid' %%m, '%s' "
+msgstr "В «%s» не используется %%C, но в «%s» используется %%C"
#: src/format-invalid.h:22
msgid "The string ends in the middle of a directive."
-msgstr " ."
+msgstr "Строка обрывается посреди директивы."
#: src/format-invalid.h:25
msgid ""
"The string refers to arguments both through absolute argument numbers and "
"through unnumbered argument specifications."
msgstr ""
-" , "
-" ."
+"Строка ссылается на аргументы как по абсолютным номерам, так и через "
+"ненумерованные спецификации аргументов."
#: src/format-invalid.h:28
#, c-format
msgid ""
"In the directive number %u, the argument number 0 is not a positive integer."
msgstr ""
+"В директиве номер %u аргумент с номером 0 не является положительным целым "
+"числом."
#: src/format-invalid.h:30
#, c-format
@@ -506,6 +512,8 @@ 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
@@ -513,6 +521,8 @@ 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
@@ -520,7 +530,8 @@ msgid ""
"In the directive number %u, the character '%c' is not a valid conversion "
"specifier."
msgstr ""
-" %u '%c' ."
+"В директиве номер %u символ «%c» не является верным спецификатором "
+"преобразования."
#: src/format-invalid.h:37
#, c-format
@@ -528,13 +539,13 @@ msgid ""
"The character that terminates the directive number %u is not a valid "
"conversion specifier."
msgstr ""
-", %u "
-"."
+"Символ, завершающий директиву номер %u не является верным спецификатором "
+"преобразования."
#: src/format-invalid.h:40
#, c-format
msgid "The string refers to argument number %u in incompatible ways."
-msgstr " %u ."
+msgstr "Строка ссылается на аргумент номер %u несовместимым образом."
#: src/format-java.c:240
#, c-format
@@ -542,18 +553,18 @@ msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
"style."
msgstr ""
-" %u \"%s\" /."
+"В директиве номер %u подстрока «%s» не является верным стилем даты/времени."
#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr " %u \"%s\" ."
+msgstr "В директиве номер %u после «%s» не стоит запятая."
#: src/format-java.c:274
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr " %u \"%s\" ."
+msgstr "В директиве номер %u подстрока «%s» не является верным стилем числа."
#: src/format-java.c:323
#, c-format
@@ -561,13 +572,13 @@ msgid ""
"In the directive number %u, the argument number is not followed by a comma "
"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
msgstr ""
-" %u \"%s"
-"\", \"%s\", \"%s\", \"%s\"."
+"В директиве номер %u после номера аргумента не стоит запятая и одно из «%s», "
+"«%s», «%s», «%s»."
#: src/format-java.c:572
#, c-format
msgid "In the directive number %u, a choice contains no number."
-msgstr " %u ."
+msgstr "В директиве номер %u оператор выбора не содержит номера."
#: src/format-java.c:583
#, c-format
@@ -575,25 +586,25 @@ msgid ""
"In the directive number %u, a choice contains a number that is not followed "
"by '<', '#' or '%s'."
msgstr ""
-" %u , "
-"'<', '#' '%s'."
+"В директиве номер %u оператор выбора содержит число, за которым не следует "
+"«<», «#» или «%s»."
#: src/format-java.c:745
-#, fuzzy, c-format
+#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr " '%u' 'msgid' '%s'"
+msgstr "спецификация формата аргумента {%u} в «%s» не существует в «%s»"
#: src/format-java.c:756
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr " {%u} '%s'"
+msgstr "для аргумента {%u} нет спецификации формата в «%s»"
#: src/format-java.c:776
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr " 'msgid' '%s' {%u}"
+msgstr "в «%s» и «%s» не совпадают спецификации формата для аргумента {%u}"
#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
#: src/format-scheme.c:2375
@@ -602,8 +613,8 @@ msgid ""
"In the directive number %u, parameter %u is of type '%s' but a parameter of "
"type '%s' is expected."
msgstr ""
-" %u %u '%s', "
-" '%s'."
+"В директиве номер %u параметр %u принадлежит типу «%s», но ожидается "
+"параметр типа «%s»."
#: src/format-lisp.c:2372 src/format-scheme.c:2398
#, c-format
@@ -614,33 +625,40 @@ 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
msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr " %u '%c' ."
+msgstr "В директиве номер %u после «%c» не стоит цифра."
#: src/format-lisp.c:2736 src/format-scheme.c:2754
#, c-format
msgid "In the directive number %u, the argument %d is negative."
-msgstr " %u %d ."
+msgstr "В директиве номер %u аргумент %d отрицателен."
#: src/format-lisp.c:2805
msgid "The string ends in the middle of a ~/.../ directive."
-msgstr " ~/.../."
+msgstr "Строка обрывается посреди директивы ~/.../."
#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
#, c-format
msgid "Found '~%c' without matching '~%c'."
-msgstr " '~%c' '~%c'."
+msgstr "Встречено «~%c» без соответствующего «~%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 " %u @ :."
+msgstr "В директиве номер %u одновременно заданы модификаторы @ и :."
#: src/format-lisp.c:2976 src/format-scheme.c:2973
#, c-format
@@ -648,28 +666,27 @@ msgid ""
"In the directive number %u, '~:[' is not followed by two clauses, separated "
"by '~;'."
msgstr ""
-" %u '~:[' , '~;'."
+"В директиве номер %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."
-msgstr " - ."
+msgstr "Строка ссылается на какой-то аргумент несовместимым образом."
#: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, fuzzy, c-format
+#, c-format
msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr " `msgid' `%s' "
+msgstr "спецификации формата в «%s» и «%s» не эквивалентны"
#: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, fuzzy, c-format
+#, c-format
msgid "format specifications in '%s' are not a subset of those in '%s'"
msgstr ""
-" '%s' "
-"'msgid' "
+"спецификации формата в «%s» не являются подмножеством спецификаций из «%s»"
#: src/format-perl.c:433
#, c-format
@@ -677,78 +694,80 @@ msgid ""
"In the directive number %u, the size specifier is incompatible with the "
"conversion specifier '%c'."
msgstr ""
-" %u "
-" '%c'."
+"В директиве номер %u спецификатор размера несовместим со спецификатором "
+"преобразования «%c»."
#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-python-brace.c:434 src/format-python-brace.c:447
#: src/format-sh.c:308
#, c-format
msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr " '%s' '%s'"
+msgstr "для аргумента «%s» нет спецификации формата в «%s»"
#: src/format-python.c:115
msgid ""
"The string refers to arguments both through argument names and through "
"unnamed argument specifications."
msgstr ""
-" , "
-" ."
+"Строка ссылается на аргументы как по именам, так и по безымянным "
+"спецификациям аргументов."
#: src/format-python.c:354
#, c-format
msgid "The string refers to the argument named '%s' in incompatible ways."
-msgstr " '%s' ."
+msgstr "Строка ссылается на аргумент по имени «%s» несовместимым образом."
#: src/format-python.c:430
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr " 'msgid' , '%s' -- "
+msgstr "спецификация формата в «%s» ожидает отображение, а в «%s» — кортеж"
#: src/format-python.c:437
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr " 'msgid' , '%s' -- "
+msgstr "спецификация формата в «%s» ожидает кортеж, а в «%s» — отображение"
#: src/format-python.c:460 src/format-sh.c:297
-#, fuzzy, c-format
+#, c-format
msgid ""
"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr " 'msgid' '%s', '%s'"
+msgstr "спецификация формата аргумента «%s» в «%s» не существует в «%s»"
#: src/format-python.c:494
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr " 'msgid' '%s' %s"
+msgstr "в «%s» и «%s» не совпадают спецификации формата для аргумента «%s»"
-#: src/format-python-brace.c:136
-#, fuzzy, c-format
+#: src/format-python-brace.c:137
+#, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr " %u '%c' ."
+msgstr "В директиве номер %u с «%c» не может начинаться имя поля."
-#: src/format-python-brace.c:149
-#, fuzzy, c-format
+#: src/format-python-brace.c:150
+#, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr " %u '{' ."
+msgstr "В директиве номер %u с «%c» не может начинаться аргумент getattr."
-#: src/format-python-brace.c:164
-#, fuzzy, c-format
+#: src/format-python-brace.c:165
+#, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr " %u '%c' ."
+msgstr "В директиве номер %u с «%c» не может начинаться аргумент getitem."
-#: src/format-python-brace.c:184
-#, fuzzy, c-format
+#: src/format-python-brace.c:185
+#, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr " %u '%c' ."
+msgstr ""
+"В директиве номер %u в спецификаторе формата невозможно указать большую "
+"вложенность."
-#: src/format-python-brace.c:210
-#, fuzzy, c-format
+#: src/format-python-brace.c:270
+#, c-format
msgid "In the directive number %u, there is an unterminated format directive."
-msgstr " %u %d ."
+msgstr "В директиве номер %u есть незавершённая директива формата."
#: src/format-qt.c:152
#, c-format
@@ -756,52 +775,54 @@ 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."
+"Строка ссылается на переменную оболочки с именем, не представимым в 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 ""
-" "
-". "
-"."
+"Строка ссылается на переменную оболочки со сложным синтактисом фигурных "
+"скобок. Этот синтактис не поддерживается в этой программе по соображениям "
+"безопасности."
#: src/format-sh.c:83
msgid ""
"The string refers to a shell variable whose value may be different inside "
"shell functions."
msgstr ""
-" , "
-" ."
+"Строка ссылается на переменную оболочки, чье значение может оказаться иным "
+"внутри функций оболочки."
#: src/format-sh.c:85
msgid "The string refers to a shell variable with an empty name."
-msgstr " ."
+msgstr "Строка ссылается на переменную оболочки с пустым именем."
#: src/format-ycp.c:90
#, c-format
msgid ""
"In the directive number %u, the character '%c' is not a digit between 1 and "
"9."
-msgstr " %u '%c' 1 9."
+msgstr "В директиве номер %u символ «%c» не является цифрой между 1 и 9."
#: src/format-ycp.c:91
#, c-format
msgid ""
"The character that terminates the directive number %u is not a digit between "
"1 and 9."
-msgstr ", %u 1 9."
+msgstr "Символ, завершающий директиву номер %u не является цифрой между 1 и 9."
-#: src/hostname.c:178 src/msgattrib.c:344 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
-#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
-#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:599
+#: 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"
@@ -809,57 +830,61 @@ msgid ""
"This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"Лицензия GPLv3+: GNU GPL версии 3 или новее <http://gnu.org/licenses/gpl.html>\n"
+"Это свободное ПО: вы можете продавать и распространять его.\n"
+"Нет НИКАКИХ ГАРАНТИЙ до степени, разрешённой законом.\n"
-#: src/hostname.c: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 " -- %s.\n"
+msgstr "Автор программы — %s.\n"
#. 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 " "
+msgstr "Бруно Хайбл"
#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
-msgstr " "
-
-#: src/hostname.c:207 src/msgattrib.c:410 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
-#: src/msgfilter.c:384 src/msgfmt.c:650 src/msggrep.c:507 src/msginit.c:358
-#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:828
-#, fuzzy, c-format
+msgstr "слишком много аргументов"
+
+#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
+#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
+#, c-format
msgid "Try '%s --help' for more information.\n"
-msgstr " `%s --help' .\n"
+msgstr "По команде «%s --help» можно получить дополнительную информацию.\n"
#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
-msgstr ": %s []\n"
+msgstr "Использование: %s [ПАРАМЕТР]\n"
#: src/hostname.c:215
#, c-format
msgid "Print the machine's hostname.\n"
-msgstr " .\n"
+msgstr "Печатает имя данной машины.\n"
#: src/hostname.c:218
#, c-format
msgid "Output format:\n"
-msgstr " :\n"
+msgstr "Формат вывода:\n"
#: src/hostname.c:220
#, c-format
msgid " -s, --short short host name\n"
-msgstr " -s, --short \n"
+msgstr " -s, --short короткое имя машины\n"
#: src/hostname.c:222
#, c-format
@@ -868,308 +893,313 @@ msgid ""
"domain\n"
" name, and aliases\n"
msgstr ""
-" -f, --fqdn, --long , "
-"\n"
-" \n"
+" -f, --fqdn, --long длинное имя машины, включает полностью\n"
+" заданное доменное имя и псевдонимы\n"
#: src/hostname.c:225
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
-msgstr " -i, --ip-address \n"
+msgstr " -i, --ip-address адреса для заданного имени машины\n"
-#: src/hostname.c:228 src/msgattrib.c:525 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
-#: src/msgfilter.c:476 src/msgfmt.c:775 src/msggrep.c:623 src/msginit.c:420
-#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
+#: src/hostname.c: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 " :\n"
+msgstr "Информационный вывод:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
-msgstr " -h, --help \n"
+msgstr " -h, --help показать эту справку и выйти\n"
-#: 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 " -V, --version \n"
+msgstr " -V, --version показать информацию о версии и выйти\n"
#. TRANSLATORS: The placeholder indicates the bug-reporting address
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/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 " <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Об ошибках сообщайте по адресу <bug-gnu-gettext@gnu.org>.\n"
#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
#, c-format
msgid "could not get host name"
-msgstr " "
+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 " "
+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 "%s %s "
+msgstr "%s и %s взаимно исключают друг друга"
-#: src/msgattrib.c:414 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
-msgstr ": %s [] [-]\n"
+msgstr "Использование: %s [ПАРАМЕТР] [ВХОДНОЙ-ФАЙЛ]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
"and manipulates the attributes.\n"
msgstr ""
-" \n"
-" .\n"
+"Фильтрует сообщения каталога переводов в соответствии с их атрибутами\n"
+"и манипулирует этими атрибутами.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
+#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msguniq.c:342
#, c-format
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
-", , .\n"
+"Аргументы, обязательные для длинных параметров, обязательны и для коротких.\n"
-#: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
-#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
-#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
-#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
+#: src/msgattrib.c:433 src/msgcat.c: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 " :\n"
+msgstr "Нахождение входного файла:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
-msgstr " - PO-\n"
+msgstr " ВХОДНОЙ-ФАЙЛ входной PO-файл\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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 ""
-" -D, --directory= \n"
+" -D, --directory=КАТАЛОГ добавить КАТАЛОГ к пути поиска входных файлов\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
-" -, .\n"
+"Если входной файл не задан или задан как -, читается стандартный ввод.\n"
-#: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
-#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
-#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
-#: src/xgettext.c:857
+#: src/msgattrib.c:442 src/msgcat.c: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 " :\n"
+msgstr "Нахождение выходного файла:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 " -o, --output-file= \n"
+msgstr " -o, --output-file=ФАЙЛ записать вывод в указанный файл\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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 ""
-" , \n"
-" -.\n"
+"Результаты выводятся на стандартный вывод, если выходной файл не задан\n"
+"или задан как -.\n"
-#: 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 " :\n"
+msgstr "Выбор сообщений:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
msgstr ""
-" --translated , "
-"\n"
+" --translated сохранить переведенные, удалить "
+"непереведённые\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
msgstr ""
-" --untranslated , "
-"\n"
+" --untranslated сохранить непереведённые, удалить "
+"переведенные\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr ""
-" --no-fuzzy ''\n"
+" --no-fuzzy удалить сообщения помеченные как «неточные»\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr ""
-" --only-fuzzy ''\n"
+" --only-fuzzy сохранить сообщения помеченные как «неточные»\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr ""
-" --no-obsolete , ''\n"
+" --no-obsolete удалить сообщения, помеченные как «старые»\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr ""
-" --only-obsolete , ''\n"
+" --only-obsolete сохранить сообщения, помеченные как «старые»\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
-msgstr " :\n"
+msgstr "Операции с атрибутами:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
-msgstr " --set-fuzzy ''\n"
+msgstr " --set-fuzzy пометить все сообщения как «неточные»\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
-msgstr " --clear-fuzzy ''\n"
+msgstr " --clear-fuzzy снять все пометки «неточное»\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
-msgstr " --set-obsolete ''\n"
+msgstr " --set-obsolete пометить все сообщения как «старые»\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
-msgstr " --clear-obsolete ''\n"
+msgstr " --clear-obsolete снять все пометки «старое»\n"
-#: src/msgattrib.c:468
-#, fuzzy, c-format
+#: src/msgattrib.c:475
+#, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
" of translated messages.\n"
msgstr ""
-" --previous msgid "
-"\n"
+" --previous если пометка «неточное», то сохранить\n"
+" предыдущие msgid переведённых сообщений\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
"messages\n"
-msgstr " --clear-previous ' msgid'\n"
+msgstr ""
+" --clear-previous удалить «предыдущий msgid» из всех сообщений\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+" --empty при удалении «неточных», также делать\n"
+" msgstr пустой\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
msgstr ""
-" --only-file=.po , ."
+" --only-file=ФАЙЛ.po обработать сообщения, перечисленные в ФАЙЛЕ."
"po\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
msgstr ""
-" --ignore-file=.po , ."
-"po\n"
+" --ignore-file=ФАЙЛ.po обработать сообщения, не перечисленные\n"
+" в ФАЙЛЕ.po\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr " --fuzzy --only-fuzzy --clear-fuzzy\n"
+msgstr " --fuzzy синоним для --only-fuzzy --clear-fuzzy\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
msgstr ""
-" --obsolete --only-obsolete --clear-obsolete\n"
+" --obsolete синоним для --only-obsolete --clear-obsolete\n"
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c: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 " :\n"
+msgstr "Синтаксис входного файла:\n"
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
-" -P, --properties-input Java .properties\n"
+" -P, --properties-input входной файл имеет синтаксис Java .properties\n"
-#: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
-#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
#, c-format
msgid ""
" --stringtable-input input file is in NeXTstep/GNUstep .strings "
"syntax\n"
msgstr ""
-" --stringtable-input NeXTstep/GNUstep ."
+" --stringtable-input входной файл имеет синтаксис NeXTstep/GNUstep ."
"strings\n"
-#: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
-#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
-#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
-#: src/xgettext.c:946
+#: src/msgattrib.c:498 src/msgcat.c: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 " :\n"
+msgstr "Подробности выходного формата:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1177,134 +1207,140 @@ msgid ""
" WHEN may be 'always', 'never', 'auto', or "
"'html'.\n"
msgstr ""
+" --color всегда использовать цвета и другие\n"
+" текстовые атрибуты\n"
+" --color=КОГДА использовать цвета и другие "
+"текстовые атрибуты в соответствии с КОГДА\n"
+" КОГДА может быть: «always» (всегда),\n"
+" «never» (никогда), «auto» или «html»\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr ""
+" --style=ФАЙЛ_СТИЛЯ указать файл правил стилей CSS для --color\n"
-#: 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 ""
-" -e, --no-escape \n"
-" escape- C ( "
-")\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
+#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
msgstr ""
-" -E, --escape escape-, \n"
-" \n"
+" -E, --escape использовать экранирующие последовательности,\n"
+" а не расширенные символы\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
-msgstr " --force-po PO-, \n"
+msgstr " --force-po записать PO-файл, даже если он пуст\n"
-#: src/msgattrib.c: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 ""
-" -i, --indent PO-, \n"
+" -i, --indent форматировать PO-файл, используя отступы\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
-msgstr " --no-location '#: :'\n"
+msgstr " --no-location не писать строки «#: файл:строка»\n"
-#: src/msgattrib.c: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 ""
-" -n, --add-location '#: :' ( "
-")\n"
+" -n, --add-location генерировать строки «#: файл:строка»\n"
+" (по умолчанию)\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
+#: src/xgettext.c:989
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
-" --strict "
-"\n"
+" --strict вывод в режиме строгого соответствия "
+"стандарту\n"
" Uniforum\n"
-#: src/msgattrib.c:511 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
-#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
-#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
+#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
+#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
-msgstr " -p, --properties-output .properties- Java\n"
+msgstr " -p, --properties-output записать .properties-файл 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
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
-" --stringtable-output .strings- NeXTstep/GNUstep\n"
+" --stringtable-output записать .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
+#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
+#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
-msgstr " -w, --width= \n"
+msgstr " -w, --width=ЧИСЛО задает ширину выходной страницы\n"
-#: src/msgattrib.c: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 ""
-" --no-wrap , \n"
-" \n"
+" --no-wrap не разбивать длинные строки, которые длиннее\n"
+" ширины выходной страницы\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output \n"
+msgstr " -s, --sort-output сортировать вывод\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 " -F, --sort-by-file \n"
+msgstr " -F, --sort-by-file сортировать вывод по именам файлов\n"
-#: 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 " (%d < n < %d)"
+msgstr "задан недопустимый критерий выбора (%d < n < %d)"
-#: 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 ": %s [] [-]...\n"
+msgstr "Использование: %s [ПАРАМЕТР] [ВХОДНОЙ-ФАЙЛ]…\n"
-#: src/msgcat.c:371
-#, fuzzy, c-format, no-wrap
+#: src/msgcat.c:372
+#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
"Find messages which are common to two or more of the specified PO files.\n"
@@ -1316,125 +1352,121 @@ msgid ""
"that if --use-first is specified, they will be taken from the first PO file\n"
"to define them.\n"
msgstr ""
-" PO-.\n"
-" PO-. \n"
-" --more-than ,\n"
-" . , --less-than \n"
-" \n"
-"(.. --less-than=2 ). ,\n"
-" , \n"
-"--use-first, PO-, \n"
-" . , \n"
-" PO-.\n"
+"Сцепляет и объединяет заданные PO-файлы.\n"
+"Находит одинаковые сообщения в двух или более указанных PO-файлах.\n"
+"С помощью параметра --more-than можно затребовать вывод сообщений,\n"
+"встречающихся чаще других. И обратно, --less-than может быть\n"
+"использован для получения редко встречающихся сообщений\n"
+"(т. е. --less-than=2 выведет только уникальные сообщения). Переводы,\n"
+"комментарии, извлечённые комментарии и положение в файле сохраняются,\n"
+"но если задан параметр --use-first, то они берутся из первого PO-файла,\n"
+"в котором были определены.\n"
-#: 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 " -... \n"
+msgstr " ВХОДНОЙ-ФАЙЛ... входные файлы\n"
-#: 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 ""
-" -f, --files-from= \n"
+" -f, --files-from=ФАЙЛ получить список входных файлов из ФАЙЛА\n"
-#: 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 " -, .\n"
+msgstr "Если входной файл задан как -, читается стандартный ввод.\n"
-#: 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 ""
-" -<, --less-than= , \n"
-" ( "
-"\n"
-" )\n"
+" -<, --less-than=ЧИСЛО вывести те сообщения, для которых число\n"
+" определений меньше заданного ЧИСЛА\n"
+" (по умолчанию не ограничено)\n"
-#: 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 ""
-" ->, --more-than= , \n"
-" ( "
-"\n"
-" )\n"
+" ->, --more-than=ЧИСЛО вывести те сообщения, для которых число\n"
+" определений больше заданного ЧИСЛА\n"
+" (по умолчанию больше нуля)\n"
-#: 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 ""
-" -u, --unique --less-than=2, \n"
-" \n"
+" -u, --unique сокращение для --less-than=2, запрашивает\n"
+" печать только уникальных сообщений\n"
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:739
-#: src/msgmerge.c:557
+#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
+#: src/msgmerge.c:562
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
-" -P, --properties-input Java ."
+" -P, --properties-input входные файлы имеют синтаксис Java ."
"properties\n"
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
-#: src/msgmerge.c:559
+#: src/msgcat.c: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 ""
-" --stringtable-input NeXTstep/"
+" --stringtable-input входные файлы имеют синтаксис NeXTstep/"
"GNUstep\n"
" .strings\n"
-#: 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 " -t, --to-code= \n"
+msgstr " -t, --to-code=ИМЯ выходная кодировка\n"
-#: 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 ""
-" --use-first "
-"\n"
-" , \n"
+" --use-first использовать первый доступный перевод для\n"
+" каждого сообщения, не объединять переводы\n"
-#: 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 ""
+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
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
-msgstr " "
+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 " "
+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 " "
+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 ": %s [] def.po ref.pot\n"
+msgstr "Использование: %s [ПАРАМЕТР] def.po ref.pot\n"
#: src/msgcmp.c:218
#, c-format, no-wrap
@@ -1446,97 +1478,97 @@ msgid ""
"you have translated each and every message in your program. Where an exact\n"
"match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
msgstr ""
-" .po- Uniforum, , \n"
-" , . def.po -- \n"
-" ; ref.po -- PO- \n"
-"POT- ( xgettext). ,\n"
-" , .\n"
-" , \n"
-" .\n"
+"Сравнивает два .po-файла в формате Uniforum, чтобы узнать, содержат ли\n"
+"они одинаковый набор строк, подлежащих переводу. Файл def.po — это\n"
+"файл со старыми переводами; ref.po — это вновь созданный PO-файл или\n"
+"POT-файл (обычно производимый программой xgettext). Это полезно,\n"
+"если вы хотите убедиться, что перевели каждое сообщение в программе.\n"
+"Для улучшения диагностики используется приблизительное сравнение, если\n"
+"нельзя найти точное совпадение.\n"
#: src/msgcmp.c:232
#, c-format
msgid " def.po translations\n"
-msgstr " def.po \n"
+msgstr " def.po переводы\n"
#: src/msgcmp.c:234
#, c-format
msgid " ref.pot references to the sources\n"
-msgstr " ref.pot \n"
+msgstr " ref.pot ссылки на исходники\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
-msgstr " :\n"
+msgstr "Модификаторы режима работы:\n"
-#: 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 ""
-" -m, --multi-domain ref.pot def.po\n"
+" -m, --multi-domain применить ref.pot ко всем доменам из def.po\n"
-#: 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 " -N, --no-fuzzy-matching \n"
+msgstr " -N, --no-fuzzy-matching не применять нечеткое сопоставление\n"
#: src/msgcmp.c:245
#, c-format
msgid " --use-fuzzy consider fuzzy entries\n"
-msgstr " --use-fuzzy \n"
+msgstr " --use-fuzzy использовать неточные записи\n"
#: src/msgcmp.c:247
#, c-format
msgid " --use-untranslated consider untranslated entries\n"
-msgstr " --use-untranslated \n"
+msgstr " --use-untranslated использовать непереведённые записи\n"
#: src/msgcmp.c:324
#, c-format
msgid "this message is untranslated"
-msgstr " "
+msgstr "это сообщение не переведено"
#: src/msgcmp.c:330
#, c-format
msgid "this message needs to be reviewed by the translator"
-msgstr " "
+msgstr "это сообщение должно быть проверено переводчиком"
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1505
#, c-format
msgid "this message is used but not defined..."
-msgstr " , ..."
+msgstr "это сообщение используется программой, но не было определено..."
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1508
#, c-format
msgid "...but this definition is similar"
-msgstr "... "
+msgstr "...однако здесь определено похожее сообщение"
-#: src/msgcmp.c:377 src/msgmerge.c:1531
+#: src/msgcmp.c:377 src/msgmerge.c:1536
#, c-format
msgid "this message is used but not defined in %s"
-msgstr " %s"
+msgstr "это сообщение не было определено в %s"
#: src/msgcmp.c:546
#, c-format
msgid "warning: this message is not used"
-msgstr ": "
+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] " %d "
-msgstr[1] " %d "
-msgstr[2] " %d "
+msgstr[0] "найдена %d критическая ошибка"
+msgstr[1] "найдено %d критические ошибки"
+msgstr[2] "найдено %d критических ошибок"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
-msgstr " "
+msgstr "необходимо задать не менее двух файлов"
-#: src/msgcomm.c:363
-#, fuzzy, c-format, no-wrap
+#: src/msgcomm.c:364
+#, c-format, no-wrap
msgid ""
"Find messages which are common to two or more of the specified PO files.\n"
"By using the --more-than option, greater commonality may be requested\n"
@@ -1547,91 +1579,90 @@ msgid ""
"PO file to define them. File positions from all PO files will be\n"
"cumulated.\n"
msgstr ""
-" PO-.\n"
-" --more-than , \n"
-" . , --less-than \n"
-" (.. --less-than=2 \n"
-"). , , \n"
-" PO-, . ,\n"
-" PO-.\n"
+"Находит одинаковые сообщения в двух или более указанных PO-файлах.\n"
+"С помощью параметра --more-than можно затребовать вывод сообщений,\n"
+"встречающихся чаще других. И обратно, --less-than может быть использован\n"
+"для получения редко встречающихся сообщений (т. е. --less-than=2 выведет\n"
+"только уникальные сообщения). Переводы, комментарии и извлеченные\n"
+"комментарии сохраняются, но только из первого PO-файла, в котором они\n"
+"были определены. Положения в файлах сохраняются из всех PO-файлов.\n"
-#: 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 ""
-" ->, --more-than= , \n"
-" ( "
-"\n"
-" )\n"
+" ->, --more-than=ЧИСЛО вывести те сообщения, для которых количество\n"
+" определений больше заданного ЧИСЛА\n"
+" (по умолчанию больше одного)\n"
-#: src/msgcomm.c:451 src/xgettext.c:981
-#, fuzzy, c-format
+#: src/msgcomm.c:452 src/xgettext.c:1004
+#, c-format
msgid ""
" --omit-header don't write header with 'msgid \"\"' entry\n"
msgstr ""
-" --omit-header `msgid \"\"'\n"
+" --omit-header не выводить заголовок с полем «msgid \"\"»\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
-msgstr " .\n"
+msgstr "Преобразует каталог переводов в другую кодировку.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
-msgstr " :\n"
+msgstr "Цель преобразования:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
-msgstr " .\n"
+msgstr "По умолчанию используется кодировка текущей локали.\n"
-#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
#, c-format
msgid " -i, --indent indented output style\n"
-msgstr " -i, --indent \n"
+msgstr " -i, --indent использовать на выводе отступы\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
-msgstr " --no-location '#: :'\n"
+msgstr " --no-location убрать строки «#: файл:строка»\n"
-#: src/msgconv.c: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 ""
-" --add-location '#: :' ( "
-")\n"
+" -n, --add-location сохранять строки «#: файл:строка»\n"
+" (по умолчанию)\n"
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
-" --strict "
-"Uniforum\n"
+" --strict выводить в строгом соответствии\n"
+" стандарту Uniforum\n"
-#: 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 " "
+msgstr "не задан входной файл"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
-msgstr " "
+msgstr "необходимо задать ровно один входной файл"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
-msgstr ": %s [] -\n"
+msgstr "Использование: %s [ПАРАМЕТР] ВХОДНОЙ-ФАЙЛ\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1639,25 +1670,25 @@ msgid ""
"xgettext). Untranslated entries are assigned a translation that is\n"
"identical to the msgid.\n"
msgstr ""
-" . -- \n"
-" PO- PO- ( \n"
-" xgettext). ,\n"
-" msgid.\n"
+"Создает каталог английских переводов. Входной файл — это последний\n"
+"созданный английский PO-файл или шаблон PO-файла (обычно создаваемый\n"
+"программой xgettext). Непереведённым сообщениям дается перевод,\n"
+"совпадающий с msgid.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
-msgstr " - PO- POT-\n"
+msgstr " ВХОДНОЙ-ФАЙЛ входной PO- или POT-файл\n"
#: src/msgexec.c:196
#, c-format
msgid "missing command name"
-msgstr " "
+msgstr "не задана команда"
#: src/msgexec.c:257
#, c-format
msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-msgstr ": %s [] [-]\n"
+msgstr "Использование: %s [ПАРАМЕТР] КОМАНДА [ПАРАМЕТР-КОМАНДЫ]\n"
#: src/msgexec.c:262
#, c-format, no-wrap
@@ -1668,11 +1699,11 @@ msgid ""
"msgexec's output. msgexec's return code is the maximum return code\n"
"across all invocations.\n"
msgstr ""
-" .\n"
-" , \n"
-" . . \n"
-" msgexec. , msgexec --\n"
-" .\n"
+"Применяет указанную команду ко всем переводам из каталога.\n"
+"КОМАНДА может быть любой программой, которая считывает перевод со\n"
+"стандартного ввода. Она вызывается один раз для каждого перевода. Её\n"
+"вывод отправляется на выход msgexec. Значение, возвращаемое msgexec —\n"
+"это максимальный код возврата среди всех вызовов.\n"
#: src/msgexec.c:271
#, c-format, no-wrap
@@ -1680,277 +1711,314 @@ msgid ""
"A special builtin command called '0' outputs the translation, followed by a\n"
"null byte. The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
msgstr ""
-" '0' \n"
-". \"msgexec 0\" \"xargs -0\".\n"
+"Специальная встроенная команда «0» выводит перевод и за ним нулевой\n"
+"байт. Вывод «msgexec 0» подходит для передачи на вход «xargs -0».\n"
-#: 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 " -i, --input=- PO-\n"
+msgstr " -i, --input=ВХОДНОЙ-ФАЙЛ входной PO-файл\n"
#: src/msgexec.c:345
#, c-format
msgid "write to stdout failed"
-msgstr " "
+msgstr "запись на стандартный вывод завершилась с ошибкой"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
-msgstr " "
+msgstr "не задано имя фильтра"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
-msgstr " sed"
+msgstr "необходимо задать хотя бы один сценарий sed"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr ": %s [] [-]\n"
+msgstr "Использование: %s [ПАРАМЕТР] ФИЛЬТР [ПАРАМЕТР-ФИЛЬТРА]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr " .\n"
+msgstr "Применяет фильтр ко всем переводам каталога.\n"
-#: 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 ""
-" , "
-"\n"
-" .\n"
+"Фильтр может быть любой программой, читающей перевод со стандартного ввода "
+"и\n"
+"печатающей измененный перевод на стандартный вывод.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
-msgstr " - , 'sed':\n"
+msgstr "Полезные ПАРАМЕТРЫ-ФИЛЬТРА в случае, если ФИЛЬТРОМ является «sed»:\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
-msgstr " -e, --expression= \n"
+msgstr " -e, --expression=СЦЕН добавить СЦЕН к выполняемым командам\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
"commands\n"
" to be executed\n"
msgstr ""
-" -f, --file=- - \n"
-" \n"
+" -f, --file=ФАЙЛ-СЦЕН добавить содержимое файла ФАЙЛ-СЦЕН к\n"
+" выполняемым командам\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-" -n, --quiet, --silent \n"
+" -n, --quiet, --silent выключить автоматическую печать образца\n"
-#: 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 ""
-" --no-escape \n"
-" escape- C ( "
-")\n"
+" --no-escape не использовать при выводе\n"
+" escape-последовательности языка C (по "
+"умолчанию)\n"
-#: 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 " --indent \n"
+msgstr " --indent использовать на выводе отступы\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
msgstr ""
-" --keep-header , "
-"\n"
+" --keep-header сохранить заголовок как есть, не фильтровать "
+"его\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
-msgstr " %s "
+msgstr "аргумент %s должен быть одиночным знаком пунктуации"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
-msgstr ""
+msgstr "неверный порядок байт: %s"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
+#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
msgid "Ulrich Drepper"
-msgstr " "
+msgstr "Ульрих Дреппер"
+
+#: src/msgfmt.c:439
+#, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr "нельзя указывать входной файл, если задан %s или %s"
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c: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 "%s \"-d \""
+msgstr "для %s требуется указать «-d каталог»"
-#: 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 "%s \"-l \""
+msgstr "для %s требуется указать «-l локаль»"
+
+#: src/msgfmt.c:538
+#, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "для %s требуется указать «--template шаблон»"
+
+#: src/msgfmt.c:545
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "для %s требуется указать «-o файл»"
+
+#: src/msgfmt.c:551
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s и %s взаимно исключают друг друга в %s"
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
-msgstr "%s %s %s"
+msgstr "%s допустимо только с %s или %s"
-#: 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 "%s %s, %s %s"
+msgstr "%s допустимо только с %s, %s или %s"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
-msgstr ""
+msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
-msgstr[0] "%d "
-msgstr[1] "%d "
-msgstr[2] "%d "
+msgstr[0] "%d переведённое сообщение"
+msgstr[1] "%d переведённых сообщения"
+msgstr[2] "%d переведённых сообщений"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
-msgstr[0] ", %d "
-msgstr[1] ", %d "
-msgstr[2] ", %d "
+msgstr[0] ", %d неточный перевод"
+msgstr[1] ", %d неточных перевода"
+msgstr[2] ", %d неточных переводов"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
-msgstr[0] ", %d "
-msgstr[1] ", %d "
-msgstr[2] ", %d "
+msgstr[0] ", %d непереведённое сообщение"
+msgstr[1] ", %d непереведённых сообщения"
+msgstr[2] ", %d непереведённых сообщений"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
-msgstr ": %s [] -.po ...\n"
+msgstr "Использование: %s [ПАРАМЕТР] имя-файла.po …\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
-msgstr " .\n"
+msgstr "Создаёт двоичный каталог сообщений из текстового описания переводов.\n"
-#: 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 ""
-", , .\n"
-" .\n"
+"Аргументы, обязательные для длинных параметров, обязательны и для коротких.\n"
+"То же и для необязательных аргументов.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
msgid " filename.po ... input files\n"
-msgstr " -.po ... \n"
+msgstr " имя-файл.po ... входные файлы\n"
-#: 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 " :\n"
+msgstr "Режим работы:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
"class\n"
msgstr ""
-" -j, --java Java: Java- ResourceBundle\n"
+" -j, --java режим Java: создает Java-класс ResourceBundle\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
"higher)\n"
msgstr ""
-" --java2 --java, Java2 (JDK 1.2 "
-")\n"
+" --java2 как --java, но предполагает Java2 (JDK 1.2 или "
+"выше)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
-msgstr " --csharp C#: .dll- .NET\n"
+msgstr " --csharp режим C#: генерировать .dll-файл .NET\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
"file\n"
msgstr ""
-" --csharp-resources C#: .resources- ."
+" --csharp-resources режим ресурсов C#: генерировать .resources-файл ."
"NET\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
-" --tcl Tcl: .msg- tcl/msgcat\n"
+" --tcl режим Tcl: создает .msg-файл для tcl/msgcat\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
-msgstr " --qt Qt: .qm- Qt\n"
+msgstr " --qt режим Qt: генерировать .qm-файл Qt\n"
+
+#: src/msgfmt.c:811
+#, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+" --desktop режим Desktop Entry: генерировать файл ."
+"desktop\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
-" --strict Uniforum\n"
+" --strict строго соответствовать стандарту Uniforum\n"
-#: 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 ""
-" -, .\n"
+"Если выходной файл задан как -, результаты выводятся на стандартный вывод.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
-msgstr " Java:\n"
+msgstr "Нахождение выходного файла в режиме Java:\n"
-#: 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 " -r, --resource= \n"
+msgstr " -r, --resource=РЕСУРС имя ресурса\n"
-#: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
-#: src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
+#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr ""
-" -l, --locale= , , _\n"
+" -l, --locale=ЛОКАЛЬ имя локали, это либо язык, либо язык_СТРАНА\n"
+
+#: src/msgfmt.c:829
+#, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --source создавать файл .java, вместо файла .class\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
-" -d \n"
+" -d КАТАЛОГ корневой каталог иерархии каталогов классов\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1958,130 +2026,164 @@ msgid ""
"separated with an underscore. The -d option is mandatory. The class is\n"
"written under the specified directory.\n"
msgstr ""
-" "
-" \n"
-" . -d . \n"
-".\n"
+"Имя класса определяется путём добавления имени локали к имени ресурса после\n"
+"символа подчеркивания. Параметр -d обязателен. Класс записывается в "
+"указанный\n"
+"каталог.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
-msgstr " C#:\n"
+msgstr "Нахождение выходного файла в режиме C#:\n"
-#: 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 ""
-" -d .dll-"
-"\n"
+" -d КАТАТОГ базовый каталог для зависящих от локали .dll-"
+"файлов\n"
-#: 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 ""
-" -l -d . .dll- \n"
-" , \n"
-".\n"
+"Параметры -l и -d обязательны. Выходной .dll-файл записывается в\n"
+"подкаталог указанного каталога, имя этого подкаталога зависит от\n"
+"локали.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
-msgstr " Tcl:\n"
+msgstr "Нахождение входного файла в режиме Tcl:\n"
-#: 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 " -d .msg-\n"
+msgstr " -d КАТАЛОГ корневой каталог иерархии .msg-файлов\n"
-#: 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 ""
-" -l -d . .msg- "
-".\n"
+"Параметры -l и -d обязательны. Выходной .msg-файл записывается в указанный "
+"каталог.\n"
+
+#: src/msgfmt.c:861
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr "Параметры режима Desktop Entry:\n"
+
+#: src/msgfmt.c:867
+#, c-format
+msgid " --template=TEMPLATE a .desktop file used as a template\n"
+msgstr ""
+" --template=ШАБЛОН в качестве шаблона использовать файл .desktop\n"
+
+#: src/msgfmt.c:869
+#, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr " -d КАТАЛОГ корневой каталог файлов .po\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -k, --keyword[=СЛОВО] дополнительное ключевое слово для поиска\n"
+" -k, --keyword не использовать ключевые слова по умолчанию\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+"Параметры -l, -o и --template обязательны. Если указан -D, то входные\n"
+"файлы читаются из каталога, а не берутся из аргументов командной строки.\n"
-#: src/msgfmt.c:745 src/xgettext.c:882
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
-msgstr " :\n"
+msgstr "Интерпретация входного файла:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\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,\n"
+" --check-domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
-" --check-format \n"
+" --check-format проверить зависящие от языка форматные строки\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
msgstr ""
-" --check-header \n"
+" --check-header проверить наличие и содержимое заголовка\n"
-#: 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 ""
-" --check-domain "
-" \n"
-" --output-file\n"
+" --check-domain проверить на конфликты между директивами "
+"домена\n"
+" и параметром --output-file\n"
-#: 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 ""
-" -C, --check-compatibility , GNU msgfmt , \n"
-" X/Open msgfmt\n"
+" -C, --check-compatibility проверить, что GNU msgfmt ведет себя так же, \n"
+" как X/Open msgfmt\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
"for\n"
" menu items\n"
msgstr ""
-" --check-accelerators[=] "
-" \n"
-" \n"
+" --check-accelerators[=СИМВОЛ]\n"
+" проверить наличие клавиатурных\n"
+" эквивалентов для пунктов меню\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
-" -f, --use-fuzzy \n"
+" -f, --use-fuzzy использовать при выводе неточные переводы\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
-" -a, --alignment= ( "
-": %d)\n"
+" -a, --alignment=ЧИСЛО выравнивать строки по ЧИСЛУ байт (по "
+"умолчанию: %d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2089,109 +2191,122 @@ msgid ""
" (big or little, default depends on "
"platform)\n"
msgstr ""
+" --endianness=П_БАЙТ записывать 32-битные числа в заданном\n"
+" порядке байт (big или little, значение по\n"
+" умолчанию зависит от платформы)\n"
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
-" --no-hash -\n"
+" --no-hash двоичный файл не будет включать хэш-таблицу\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
-msgstr " --statistics \n"
+msgstr " --statistics напечатать статистику о переводах\n"
-#: 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 ""
-" -v, --verbose "
-"\n"
+" -v, --verbose увеличить подробность диагностических "
+"сообщений\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
-msgstr ": PO- \n"
+msgstr "предупреждение: заголовок PO-файла отсутствует или неправилен\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
-msgstr ": \n"
+msgstr "предупреждение: преобразование кодировок не будет работать\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
-msgstr ": PO- \n"
+msgstr "предупреждение: заголовок PO-файла помечен как неточный\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr ": msgfmt \n"
+msgstr "предупреждение: более старые версии msgfmt выдадут здесь ошибку\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
-msgstr " \"%s\" "
+msgstr "имя домена «%s» не может быть использовано в качестве имени файла"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
-" \"%s\" , \n"
-" "
+"имя домена «%s» недопустимо в качестве имени файла, будет использовано\n"
+"частично усеченное имя домена"
-#: src/msgfmt.c:955
-#, fuzzy, c-format
+#: src/msgfmt.c:1095
+#, c-format
msgid "'domain %s' directive ignored"
-msgstr " `domain %s' "
+msgstr "директива «domain %s» игнорируется"
-#: src/msgfmt.c:1015
-#, fuzzy, c-format
+#: src/msgfmt.c:1155
+#, c-format
msgid "empty 'msgstr' entry ignored"
-msgstr " `msgstr' "
+msgstr "пустая запись «msgstr» игнорируется"
-#: src/msgfmt.c:1016
-#, fuzzy, c-format
+#: src/msgfmt.c:1156
+#, c-format
msgid "fuzzy 'msgstr' entry ignored"
-msgstr " `msgstr' "
+msgstr "неточная запись «msgstr» игнорируется"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s: : "
+msgstr "%s: предупреждение: исходный файл содержит неточные переводы"
+
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr "%s не существует"
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr "%s существует, но недоступен для чтения"
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-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 " \"%s\""
+msgstr "ошибка чтения «%s»"
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
"specified"
msgstr ""
-" '%c' , 'J', 'K', 'T', 'C' 'X'"
+"параметр «%c» нельзя использовать до того, как заданы «J», «K», «T», «C» или "
+"«X»"
-#: src/msggrep.c:516
+#: src/msggrep.c:521
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr ""
-" , \n"
-" .\n"
-"\n"
+"Извлекает из каталога переводов все сообщения, которые соответствуют\n"
+"заданному образцу или принадлежат заданным исходным файлам.\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2230,71 +2345,71 @@ msgid ""
" -v, --invert-match output only the messages that do not match any\n"
" selection criterion\n"
msgstr ""
-" :\n"
-" [-N -]... [-M -]...\n"
-" [-J -MSGCTXT] [-K -MSGID] [-T -MSGSTR]\n"
-" [-C -] [-X --]\n"
-" , \n"
-" , \n"
-" ,\n"
-" -J, (msgctxt) \n"
-"-MSGCTXT,\n"
-" -K, (msgid msgid_plural)\n"
-" -MSGID,\n"
-" -K, (msgid msgid_plural)\n"
-" -MSGID,\n"
-" -T, (msgstr) \n"
-"-MSGSTR,\n"
-" -C, \n"
-"-,\n"
-" -X, \n"
-"--.\n"
+"Выбор сообщений:\n"
+" [-N ИСХ-ФАЙЛ]... [-M ИМЯ-ДОМЕНА]...\n"
+" [-J ОБРАЗЕЦ-MSGCTXT] [-K ОБРАЗЕЦ-MSGID] [-T ОБРАЗЕЦ-MSGSTR]\n"
+" [-C ОБРАЗЕЦ-КОММЕНТАРИЯ] [-X ОБРАЗЕЦ-ИЗВЛЕКАЕМОГО-КОММЕНТАРИЯ]\n"
+"Сообщение выбирается, если оно содержится в одном из указанных\n"
+"исходных файлов, \n"
+"или если оно содержится в одном из указанных доменов,\n"
+"или если задан параметр -J, и контекст сообщения (msgctxt) соответствует\n"
+"ОБРАЗЦУ-MSGCTXT,\n"
+"или если задан параметр -K, и ключ сообщения (msgid или msgid_plural)\n"
+"соответствует ОБРАЗЦУ-MSGID,\n"
+"или если задан параметр -K, и ключ сообщения (msgid или msgid_plural)\n"
+"соответствует ОБРАЗЦУ-MSGID,\n"
+"или если задан параметр -T, и перевод сообщения (msgstr) соответствует\n"
+"ОБРАЗЦУ-MSGSTR,\n"
+"или если задан параметр -C, а комментарий для переводчика соответствует\n"
+"ОБРАЗЦУ-КОММЕНТАРИЯ,\n"
+"или если задан параметр -X, а комментарий для переводчика соответствует\n"
+"ОБРАЗЦУ-ИЗВЛЕКАЕМОГО-КОММЕНТАРИЯ.\n"
"\n"
"\n"
-" , \n"
-" , \n"
-".\n"
+"Когда задано несколько критериев выбора, то множество выбранных\n"
+"сообщений будет объединением сообщений, выбранных по каждому\n"
+"критерию.\n"
"\n"
-" -MSGID, -MSGSTR, - \n"
-"--:\n"
-" [-E | -F] [-e | -f ]...\n"
-" -- , \n"
-" , -E, \n"
-" , -F.\n"
+"Синтаксис ОБРАЗЦА-MSGID, ОБРАЗЦА-MSGSTR, ОБРАЗЦА-КОММЕНТАРИЯ или\n"
+"ОБРАЗЦА-ИЗВЛЕКАЕМОГО-КОММЕНТАРИЯ:\n"
+" [-E | -F] [-e ОБРАЗЕЦ | -f ФАЙЛ]...\n"
+"ОБРАЗЦЫ — это по умолчанию базовые регулярные выражения, либо\n"
+"расширенные регулярные выражения, если задан параметр -E, либо\n"
+"фиксированные строки, если задан параметр -F.\n"
"\n"
-" -N, --location=- , -\n"
-" -M, --domain=- , \n"
-" -J, --msgctxt msgctxt\n"
-" -K, --msgid msgid\n"
-" -T, --msgstr msgstr\n"
-" -C, --comment \n"
-" -X, --extracted-comment \n"
-" -E, --extended-regexp . \n"
-" -F, --fixed-strings ,\n"
-" \n"
-" -e, --regexp= . \n"
-" -f, --file= \n"
-" -i, --ignore-case \n"
-" -v, --invert-match , \n"
-" \n"
-
-#: src/msggrep.c:597
+" -N, --location=ИСХ-ФАЙЛ выбрать сообщения, извлеченные из ИСХ-ФАЙЛ\n"
+" -M, --domain=ИМЯ-ДОМЕНА выбрать сообщения, принадлежащие домену\n"
+" -J, --msgctxt начало образцов msgctxt\n"
+" -K, --msgid начало образцов msgid\n"
+" -T, --msgstr начало образцов msgstr\n"
+" -C, --comment начало образцов комментариев для переводчика\n"
+" -X, --extracted-comment начало образцов извлекаемого комментария\n"
+" -E, --extended-regexp ОБРАЗЕЦ является расширенным рег. выражением\n"
+" -F, --fixed-strings ОБРАЗЕЦ является набором строк,\n"
+" разделённых символами перевода строки\n"
+" -e, --regexp=ОБРАЗЕЦ использовать ОБРАЗЕЦ в качестве рег. выражения\n"
+" -f, --file=ФАЙЛ получить ОБРАЗЕЦ из ФАЙЛА\n"
+" -i, --ignore-case игнорировать регистр букв\n"
+" -v, --invert-match выводить только сообщения, которые не\n"
+" соответствуют ни одному критерию выбора\n"
+
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
msgstr ""
-" --escape escape-, \n"
-" \n"
+" --escape использовать экранирующие последовательности,\n"
+" а не расширенные символы\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
-msgstr " --sort-output \n"
+msgstr " --sort-output сортировать вывод\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
-msgstr " --sort-by-file \n"
+msgstr " --sort-by-file сортировать вывод по именам файлов\n"
#: src/msginit.c:297
msgid ""
@@ -2302,9 +2417,9 @@ msgid ""
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-" . ,\n"
-" LANG ABOUT-NLS. \n"
-", .\n"
+"В вашем окружении не определён предпочтительный язык.\n"
+"Установите переменную окружения LANG как описано в файле ABOUT-NLS. Это\n"
+"необходимо, чтобы вы могли проверить свои переводы.\n"
#: src/msginit.c:321
#, c-format
@@ -2313,14 +2428,14 @@ msgid ""
"Please specify the locale through the --locale option or\n"
"the output .po file through the --output-file option.\n"
msgstr ""
-" %s . \n"
-", --locale \n"
-"po- --output-file.\n"
+"Выходной файл %s уже существует.\n"
+"Укажите локаль с помощью параметра --locale или выходной\n"
+"po-файл с помощью параметра --output-file.\n"
#: src/msginit.c:347
#, c-format
msgid "Created %s.\n"
-msgstr " %s.\n"
+msgstr "Создано %s.\n"
#: src/msginit.c:367
#, c-format, no-wrap
@@ -2328,13 +2443,13 @@ msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-" PO-, \n"
-" .\n"
+"Создаёт новый PO-файл, инициализируя метаинформацию на основе\n"
+"пользовательского окружения.\n"
#: src/msginit.c:377
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
-msgstr " -i, --input=- POT-\n"
+msgstr " -i, --input=ВХОДНОЙ-ФАЙЛ входной POT-файл\n"
#: src/msginit.c:379
#, c-format
@@ -2343,13 +2458,13 @@ msgid ""
"file.\n"
"If it is -, standard input is read.\n"
msgstr ""
-" , .\n"
-" -, .\n"
+"Если входной файл не задан, он ищется в текущем каталоге.\n"
+"Если входной файл задан как -, читается стандартный ввод.\n"
#: src/msginit.c:385
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
-msgstr " -o, --output-file= \n"
+msgstr " -o, --output-file=ФАЙЛ записать вывод в указанный файл\n"
#: src/msginit.c:387
#, c-format
@@ -2357,50 +2472,50 @@ 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"
-" . -, \n"
-" .\n"
+"Если выходной файл не задан, он зависит от параметра --locale или от\n"
+"установленной локали. Если он задан как -, результаты выводятся на\n"
+"стандартный вывод.\n"
#: src/msginit.c:400
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
-msgstr " -l, --locale=_ \n"
+msgstr " -l, --locale=ЯЯ_СС задает целевую локаль\n"
#: src/msginit.c:402
#, c-format
msgid ""
" --no-translator assume the PO file is automatically generated\n"
msgstr ""
-" --no-translator , PO- "
-"\n"
+" --no-translator предполагать, что PO-файл сгенерирован "
+"автоматически\n"
#: src/msginit.c:468
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-" pot-.\n"
-", pot- --input.\n"
+"Найдено более одного pot-файла.\n"
+"Укажите входной pot-файл с помощью параметра --input.\n"
#: src/msginit.c:476 src/msginit.c:481
#, c-format
msgid "error reading current directory"
-msgstr " "
+msgstr "ошибка при чтении текущего каталога"
#: src/msginit.c:489
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-" pot-.\n"
-", pot- --input.\n"
+"В текущем каталоге не найден pot-файл.\n"
+"Укажите входной pot-файл с помощью параметра --input.\n"
#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
-msgstr " %s %d"
+msgstr "дочерний процесс %s завершился неуспехом с выходным кодом %d"
#: src/msginit.c:1118
msgid ""
@@ -2410,10 +2525,10 @@ msgid ""
"contact\n"
"you in case of unexpected technical problems.\n"
msgstr ""
-" ,\n"
-" \n"
-", \n"
-" , .\n"
+"Новый каталог сообщений должен содержать ваш адрес электронной почты,\n"
+"чтобы пользователи могли присылать свои замечания по поводу ваших\n"
+"передов, а также чтобы сопроводители программ могли связаться с вами в\n"
+"том случае, если возникнут непредвиденные технические проблемы.\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
@@ -2421,44 +2536,44 @@ msgstr ""
#: src/msginit.c:1534
#, c-format
msgid "English translations for %s package"
-msgstr " %s"
+msgstr "Английские переводы для пакета %s"
#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
-msgstr " \"%s\" "
+msgstr "текущая кодировка «%s» не является переносимым именем кодировки"
#: src/msgl-cat.c:188 src/msgl-iconv.c:259
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
-msgstr " \"%s\" \"%s\""
+msgstr "во входном файле две разные кодировки «%s» и «%s»"
#: src/msgl-cat.c:203
-#, fuzzy, c-format
+#, c-format
msgid ""
"input file '%s' doesn't contain a header entry with a charset specification"
-msgstr " `%s' "
+msgstr "входной файл «%s» не содержит запись заголовка с описанием кодировки"
#: src/msgl-cat.c:207
-#, fuzzy, c-format
+#, c-format
msgid ""
"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
"charset specification"
msgstr ""
-" \"%s\" `%s' "
-""
+"домен «%s» во входном файле «%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
-#: src/xgettext.c:3051
+#: src/xgettext.c:544 src/xgettext.c:3418
#, c-format
msgid "warning: "
-msgstr ": "
+msgstr "предупреждение: "
#: src/msgl-cat.c:443
#, c-format
@@ -2466,8 +2581,8 @@ msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-" , \n"
-"UTF-8. UTF-8.\n"
+"Входные файлы содержат сообщения в разных кодировках, в том числе в\n"
+"UTF-8. Вывод преобразуется к UTF-8.\n"
#: src/msgl-cat.c:449
#, c-format
@@ -2477,10 +2592,10 @@ msgid ""
"Converting the output to UTF-8.\n"
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-" , %s "
+"Входные файлы содержат сообщения в разных кодировках, в том числе в %s и "
"%s.\n"
-" UTF-8. ,\n"
-" --to-code.\n"
+"Вывод преобразуется к UTF-8. Чтобы выбрать другую выходную кодировку,\n"
+"используйте параметр --to-code.\n"
#: src/msgl-cat.c:488
#, c-format
@@ -2490,11 +2605,11 @@ msgid ""
"Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
"UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
msgstr ""
-" %s %s %s\n"
-" msgid msgctxt.\n"
-" msgid msgctxt ASCII , "
-"\n"
-" UTF-8, .\n"
+"Преобразование файла %s из кодировки %s в кодировку %s\n"
+"изменяет некоторые msgid или msgctxt.\n"
+"Вы должно переписать все msgid и msgctxt в чистом ASCII либо убедиться, что "
+"они\n"
+"изначально представлены в UTF-8, например в исходных файлах программы.\n"
#: src/msgl-charset.c:93
#, c-format
@@ -2504,14 +2619,14 @@ msgid ""
"Output of '%s' might be incorrect.\n"
"Possible workarounds are:\n"
msgstr ""
-" \"%s\" \"%s\".\n"
-" '%s' .\n"
-" :\n"
+"Кодировка локали «%s» отличается входной кодировки «%s».\n"
+"Вывод «%s» может быть неправильным.\n"
+"Возможные методы обойти эту ситуацию:\n"
#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr "- LC_ALL %s.\n"
+msgstr "- Установить LC_ALL равной локали с кодировкой %s.\n"
#: src/msgl-charset.c:105
#, c-format
@@ -2520,9 +2635,9 @@ msgid ""
" then apply '%s',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-"- %s 'msgconv',\n"
-" '%s',\n"
-" %s 'msgconv'.\n"
+"- Преобразовать каталог переводов к %s с помощью «msgconv»,\n"
+" затем применить «%s»,\n"
+" затем преобразовать обратно к %s с помощью «msgconv».\n"
#: src/msgl-charset.c:114
#, c-format
@@ -2532,10 +2647,10 @@ msgid ""
" then apply '%s',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-"- LC_ALL %s,\n"
-" %s 'msgconv',\n"
-" '%s',\n"
-" %s 'msgconv'.\n"
+"- Установить LC_ALL равной локали с кодировкой %s,\n"
+" преобразовать каталог переводов к %s с помощью «msgconv»,\n"
+" затем применить «%s»,\n"
+" затем преобразовать обратно к %s с помощью «msgconv».\n"
#: src/msgl-charset.c:128
#, c-format
@@ -2544,61 +2659,61 @@ msgid ""
"Output of '%s' might be incorrect.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-" \"%s\" .\n"
-" '%s' .\n"
-" -- LC_ALL=C.\n"
+"Кодировка локали «%s» не является переносимым именем кодировки.\n"
+"Вывод «%s» может быть неправильным.\n"
+"Возможный метод обойти эту ситуацию — установить LC_ALL=C.\n"
#: src/msgl-check.c:130
msgid "plural expression can produce negative values"
-msgstr " "
+msgstr "выражение во множественном числе может давать отрицательные значения"
#: src/msgl-check.c:141
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
msgstr ""
-"nplurals = %lu, "
+"nplurals = %lu, но выражение во множественном числе может давать значения до "
"%lu"
#: src/msgl-check.c:187
msgid "plural expression can produce division by zero"
-msgstr " "
+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 ""
-" "
-", , "
+"выражение во множественном числе может давать исключительные ситуации в "
+"арифметике, возможно, деление на ноль"
#: src/msgl-check.c:266
#, c-format
msgid "Try using the following, valid for %s:"
-msgstr " , %s:"
+msgstr "Попробуйте следующее, подходит для %s:"
#: src/msgl-check.c:358 src/msgl-check.c:382
msgid "message catalog has plural form translations"
-msgstr " "
+msgstr "каталог сообщений содержит переводы во множественном числе"
#: src/msgl-check.c:360
msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr " \"plural=\""
+msgstr "но в заголовке нет атрибута «plural=ВЫРАЖЕНИЕ»"
#: src/msgl-check.c:384
msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr " \"nplurals=\""
+msgstr "но в заголовке нет атрибута «nplurals=ЦЕЛОЕ»"
#: src/msgl-check.c:420
msgid "invalid nplurals value"
-msgstr " nplurals"
+msgstr "неверная значение nplurals"
#: src/msgl-check.c:442
msgid "invalid plural expression"
-msgstr " "
+msgstr "неверное выражение во множественном числе"
#: src/msgl-check.c:472 src/msgl-check.c:488
#, c-format
@@ -2606,118 +2721,103 @@ msgid "nplurals = %lu"
msgstr "nplurals = %lu"
#: src/msgl-check.c:474
-#, fuzzy, c-format
+#, c-format
msgid "but some messages have only one plural form"
msgid_plural "but some messages have only %lu plural forms"
-msgstr[0] " "
-msgstr[1] " %lu "
-msgstr[2] " %lu "
+msgstr[0] "но в некоторых сообщениях только %lu форма во множественном числе"
+msgstr[1] "но в некоторых сообщениях только %lu формы во множественном числе"
+msgstr[2] "но в некоторых сообщениях только %lu форм во множественном числе"
#: src/msgl-check.c:490
-#, fuzzy, c-format
+#, c-format
msgid "but some messages have one plural form"
msgid_plural "but some messages have %lu plural forms"
-msgstr[0] " "
-msgstr[1] " %lu "
-msgstr[2] " %lu "
+msgstr[0] "но в некоторых сообщениях есть %lu форма во множественном числе"
+msgstr[1] "но в некоторых сообщениях есть %lu формы во множественном числе"
+msgstr[2] "но в некоторых сообщениях есть %lu форм во множественном числе"
#: src/msgl-check.c:514
msgid ""
"message catalog has plural form translations, but lacks a header entry with "
"\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
msgstr ""
-" , "
-" \"Plural-Forms: nplurals=; plural=;\""
+"каталог сообщений содержит переводы во множественном числе, но в нем "
+"заголовка с «Plural-Forms: nplurals=ЦЕЛОЕ; plural=ВЫРАЖЕНИЕ;»"
#: src/msgl-check.c:611
-#, fuzzy
msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
-msgstr ""
-" `msgid' `msgid_plural' '\\n', "
-" -- "
+msgstr "поля «msgid» и «msgid_plural» не начинаются с «\\n»"
#: src/msgl-check.c:619
-#, fuzzy, c-format
+#, c-format
msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
-msgstr ""
-" `msgid' `msgstr[%u]' '\\n', "
-"-- "
+msgstr "поля «msgid» и «msgstr[%u]» не начинаются с «\\n»"
#: src/msgl-check.c:634
-#, fuzzy
msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
-msgstr ""
-" `msgid' `msgstr' '\\n', -- "
-""
+msgstr "поля «msgid» и «msgstr» не начинаются с «\\n»"
#: src/msgl-check.c:652
-#, fuzzy
msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
-msgstr ""
-" `msgid' `msgid_plural' '\\n', "
-"-- "
+msgstr "поля «msgid» и «msgid_plural» не заканчиваются «\\n»"
#: src/msgl-check.c:660
-#, fuzzy, c-format
+#, c-format
msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
-msgstr ""
-" `msgid' `msgstr[%u]' '\\n', "
-"-- "
+msgstr "поля «msgid» и «msgstr[%u]» не заканчиваются «\\n»"
#: src/msgl-check.c:675
-#, fuzzy
msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
-msgstr ""
-" `msgid' `msgstr' '\\n', -- "
+msgstr "поля «msgid» и «msgstr» не заканчиваются «\\n»"
#: src/msgl-check.c:687
msgid "plural handling is a GNU gettext extension"
-msgstr " GNU gettext"
+msgstr "обработка форм во множественном числе является расширением GNU gettext"
#: src/msgl-check.c:729
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr " msgstr '%c'"
+msgstr "в msgstr недостает отметки клавиатурного эквивалента «%c»"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr " msgstr '%c'"
+msgstr "в msgstr слишком много отметок клавиатурных эквивалентов «%c»"
-#: src/msgl-check.c:801
-#, fuzzy, c-format
+#: src/msgl-check.c:804
+#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr ""
-" \n"
+"поле заголовка «%s» всё ещё содержит первоначальное значение по умолчанию\n"
-#: src/msgl-check.c:816
-#, fuzzy, c-format
+#: src/msgl-check.c:820
+#, c-format
msgid "header field '%s' missing in header\n"
-msgstr " `%s'\n"
+msgstr "в заголовке отсутствует поле «%s»\n"
#: src/msgl-iconv.c:65
#, c-format
msgid "%s: input is not valid in \"%s\" encoding"
-msgstr "%s: \"%s\""
+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"
-msgstr " "
+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 "
"not support this conversion."
msgstr ""
-" \"%s\" \"%s\". %s iconv(), "
-"iconv() ."
+"Невозможно преобразовать из «%s» в «%s». %s полагается на iconv(), но "
+"iconv() не поддерживает это преобразование."
#: src/msgl-iconv.c:335
#, c-format
@@ -2725,29 +2825,29 @@ msgid ""
"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
"msgids become equal."
msgstr ""
-" \"%s\" \"%s\" : "
-" ."
+"Преобразование из «%s» в «%s» порождает дубликаты: некоторые различающиеся "
+"оригиналы сообщений становятся одинаковыми."
#: 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 ""
-" \"%s\" \"%s\". %s iconv(). "
-" iconv()."
+"Невозможно преобразовать из «%s» в «%s». %s полагается на iconv(). Эта "
+"версия была собрана без iconv()."
-#: 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 "%s %s"
+msgstr "%s допустимо только с %s"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
-msgstr " "
+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"
@@ -2760,70 +2860,70 @@ msgid ""
"comments and file positions will be preserved. Where an exact match\n"
"cannot be found, fuzzy matching is used to produce better results.\n"
msgstr ""
-" PO- Uniforum . def.po -- \n"
-" - , \n"
-", . , \n"
-", \n"
-" . ref.pot -- \n"
-" , , \n"
-"PO-- ( xgettext). \n"
-" , \n"
-" . \n"
-" , \n"
-".\n"
+"Объединяет два PO-файла в стиле Uniforum в один. Файл def.po — это\n"
+"существующий РО-файл со переводами, которые будут перенесены в новый\n"
+"файл, если они еще верны. Комментарии сохраняются, кроме\n"
+"комментариев, извлеченных из исходного текста программы или содержащих\n"
+"имя файла и номер строки. Файл ref.pot — новый файл со свежими\n"
+"ссылками на исходные тексты, но устаревшими переводами, либо это\n"
+"PO-файл-шаблон (обычно производимый программой xgettext). В этом\n"
+"файле игнорируются все комментарии, кроме начинающихся с точки или\n"
+"содержащих имя файла и номер строки. Для улучшения результата\n"
+"используется приблизительное сравнение, если нельзя найти точное\n"
+"совпадение.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
-" def.po , \n"
+" def.po переводы, ссылающиеся на старые исходники\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
-msgstr " ref.pot \n"
+msgstr " ref.pot ссылки на новые исходники\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
" may be specified more than once\n"
msgstr ""
-" -C, --compendium= "
-", \n"
-" \n"
+" -C, --compendium=ФАЙЛ дополнительная библиотека переводов "
+"сообщений, \n"
+" можно указывать несколько раз\n"
-#: 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 ""
-" -U, --update def.po,\n"
-" , def.po \n"
+" -U, --update обновить def.po,\n"
+" ничего не делать, если def.po уже обновлен\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
-msgstr " :\n"
+msgstr "Нахождение выходного файла в режиме обновления:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
-msgstr " def.po.\n"
+msgstr "Результат записывается обратно в def.po.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
-msgstr " --backup= def.po\n"
+msgstr " --backup=МЕТОД сделать резервную копию def.po\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
-" --suffix= \n"
+" --suffix=СУФФИКС перекрыть обычный суффикс резервной копии\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2834,77 +2934,78 @@ msgid ""
" existing, nil numbered if numbered backups exist, simple otherwise\n"
" simple, never always make simple backups\n"
msgstr ""
-" --backup \n"
-" VERSION_CONTROL. :\n"
-" none, off ( --backup)\n"
-" numbered, t \n"
-" existing, nil , , , \n"
-" simple, never \n"
+"Метод управления версиями можно выбрать с помощью параметра --backup или\n"
+"через переменную среды VERSION_CONTROL. Вот допустимые значения:\n"
+" none, off не делать резервных копий (даже если задан параметр --"
+"backup)\n"
+" numbered, t делать нумерованные резервные копии\n"
+" existing, nil нумерованные, если такие уже есть, и простые, если нет\n"
+" simple, never всегда делать простые резервные копии\n"
"\n"
-#: src/msgmerge.c:541
-#, fuzzy, c-format
+#: src/msgmerge.c:546
+#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
"SIMPLE_BACKUP_SUFFIX\n"
"environment variable.\n"
msgstr ""
-" `~', \n"
-" --suffix \n"
+"В качестве суффикса резервных копий используется «~», если не\n"
+"установлен иной с помощью параметра --suffix или переменной окружения\n"
"SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
msgstr ""
-" --previous msgid "
-"\n"
+" --previous сохранить предыдущие msgid переведённых\n"
+" сообщений\n"
-#: 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 " -q, --quiet, --silent \n"
+msgstr " -q, --quiet, --silent не выводить индикатор хода выполнения\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
-msgstr " "
+msgstr "данное сообщение должно определять формы во множественном числе"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
-msgstr " "
+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 ""
-"%s : %ld + %ld; %ld, "
-" %ld, %ld, %ld.\n"
+"%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/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
-msgstr " .\n"
+msgstr " завершено.\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 "%s "
+msgstr "%s и явно заданное имя файла взаимно исключают друг друга"
#: src/msgunfmt.c:427
#, c-format
msgid "Usage: %s [OPTION] [FILE]...\n"
-msgstr ": %s [] []...\n"
+msgstr "Использование: %s [ПАРАМЕТР] [ФАЙЛ]…\n"
#: src/msgunfmt.c:431
#, c-format
msgid "Convert binary message catalog to Uniforum style .po file.\n"
-msgstr " .po- Uniforum.\n"
+msgstr "Преобразует двоичный каталог сообщений в .po-файл в стиле Uniforum.\n"
#: src/msgunfmt.c:440
#, c-format
@@ -2912,13 +3013,13 @@ msgid ""
" -j, --java Java mode: input is a Java ResourceBundle "
"class\n"
msgstr ""
-" -j, --java Java: Java- "
+" -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#: .dll- .NET\n"
+msgstr " --csharp режим C#: на входе .dll-файл .NET\n"
#: src/msgunfmt.c:444
#, c-format
@@ -2926,7 +3027,7 @@ msgid ""
" --csharp-resources C# resources mode: input is a .NET .resources "
"file\n"
msgstr ""
-" --csharp-resources C#: .resources- ."
+" --csharp-resources режим ресурсов C#: на входе .resources-файл ."
"NET\n"
#: src/msgunfmt.c:446
@@ -2934,17 +3035,17 @@ msgstr ""
msgid ""
" --tcl Tcl mode: input is a tcl/msgcat .msg file\n"
msgstr ""
-" --tcl Tcl: .msg- tcl/msgcat\n"
+" --tcl режим Tcl: на входе .msg-файл для tcl/msgcat\n"
#: src/msgunfmt.c:451
#, c-format
msgid " FILE ... input .mo files\n"
-msgstr " ... .mo-\n"
+msgstr " ФАЙЛ ... входные .mo-файлы\n"
#: src/msgunfmt.c:456
#, c-format
msgid "Input file location in Java mode:\n"
-msgstr " Java:\n"
+msgstr "Нахождение входного файла в режиме Java:\n"
#: src/msgunfmt.c:462
#, c-format
@@ -2953,13 +3054,13 @@ msgid ""
"name,\n"
"separated with an underscore. The class is located using the CLASSPATH.\n"
msgstr ""
-" \n"
-" . CLASSPATH.\n"
+"Имя класса определяется путем добавления имени локали к имени ресурса после\n"
+"символа подчеркивания. Класс ищется с помощью CLASSPATH.\n"
#: src/msgunfmt.c:467
#, c-format
msgid "Input file location in C# mode:\n"
-msgstr " C#:\n"
+msgstr "Нахождение входного файла в режиме C#:\n"
#: src/msgunfmt.c:475
#, c-format
@@ -2967,13 +3068,13 @@ 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"
-" , .\n"
+"Параметры -l и -d обязательны. Входной .dll-файл ищется в подкаталоге\n"
+"указанного каталога, имя этого подкаталога зависит от локали.\n"
#: src/msgunfmt.c:479
#, c-format
msgid "Input file location in Tcl mode:\n"
-msgstr " Tcl:\n"
+msgstr "Нахождение входного файла в режиме Tcl:\n"
#: src/msgunfmt.c:485
#, c-format
@@ -2981,21 +3082,22 @@ msgid ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
"specified directory.\n"
msgstr ""
-" -l -d . .msg- .\n"
+"Параметры -l и -d обязательны. Входной .msg-файл ищется в указанном "
+"каталоге.\n"
#: src/msgunfmt.c:511
#, c-format
msgid " -i, --indent write indented output style\n"
-msgstr " -i, --indent \n"
+msgstr " -i, --indent использовать на выводе отступы\n"
#: src/msgunfmt.c:513
#, c-format
msgid " --strict write strict uniforum style\n"
msgstr ""
-" --strict "
+" --strict выводить в строгом соответствии стандарту "
"Uniforum\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -3007,35 +3109,35 @@ msgid ""
"specified, they will be taken from the first translation. File positions\n"
"will be cumulated. When using the --unique option, duplicates are discarded.\n"
msgstr ""
-" .\n"
-" ID . \n"
-" , \n"
-"msgfmt, msgmerge msgcat. . \n"
-" --repeated, \n"
-", . \n"
-" , --use-first, \n"
-" . .\n"
-" --unique, \n"
-".\n"
+"Убирает дублированные переводы из каталога сообщений.\n"
+"Находит дублированные переводы с одинаковым ID сообщения. Подобные\n"
+"дубликаты являются недопустимым вводом для других программ, таких как\n"
+"msgfmt, msgmerge или msgcat. По умолчанию дубликаты сливаются. При\n"
+"использовании параметра --repeated, выводятся только дублированные\n"
+"сообщения, а все остальные отбрасываются. Комментарии и извлеченные\n"
+"комментарии сливаются, если только не задан параметр --use-first, в этом\n"
+"случае они берутся из первого перевода. Позиции в файлах сливаются.\n"
+"При использовании параметра --unique, отбрасываются дублированные\n"
+"сообщения.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
-msgstr " -d, --repeated \n"
+msgstr " -d, --repeated печатать только дубликаты\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
"duplicates\n"
msgstr ""
-" -u, --unique , "
-"\n"
+" -u, --unique печатать только уникальные, пропуская "
+"дубликаты\n"
#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
msgid "<stdin>"
-msgstr "< >"
+msgstr "<стандартный ввод>"
#: src/po-charset.c:489
#, c-format
@@ -3043,8 +3145,8 @@ msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Message conversion to user's charset might not work.\n"
msgstr ""
-"\"%s\" .\n"
-" .\n"
+"Имя «%s» не является переносимым названием кодировки.\n"
+"Преобразование сообщений к кодировке пользователя может не сработать.\n"
#: src/po-charset.c:557
#, c-format
@@ -3052,24 +3154,24 @@ msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"and iconv() does not support \"%s\".\n"
msgstr ""
-" \"%s\" . %s iconv(), iconv() "
-" \"%s\".\n"
+"Кодировка «%s» не поддерживается. %s полагается на iconv(), но iconv() не "
+"поддерживает «%s».\n"
#: src/po-charset.c:564 src/po-charset.c:612
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr ""
-" , GNU libiconv GNU "
+"Чтобы решить эту проблему, установите GNU libiconv и переустановите GNU "
"gettext.\n"
#: src/po-charset.c:578 src/po-charset.c:616
msgid "Continuing anyway, expect parse errors."
-msgstr " , ."
+msgstr "Выполнение продолжается, будут ошибки разбора."
#: src/po-charset.c:580
msgid "Continuing anyway."
-msgstr " ."
+msgstr "Выполнение продолжается."
#: src/po-charset.c:607
#, c-format
@@ -3077,159 +3179,159 @@ msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
msgstr ""
-" \"%s\" . %s iconv().\n"
-" iconv().\n"
+"Кодировка «%s» не поддерживается. %s полагается на iconv().\n"
+"Эта версия собрана без iconv().\n"
#: src/po-charset.c:644
msgid ""
"Charset missing in header.\n"
"Message conversion to user's charset will not work.\n"
msgstr ""
-" .\n"
-" .\n"
+"В заголовке не указана кодировка.\n"
+"Преобразование сообщений к кодировке пользователя не сработает.\n"
#: src/po-gram-gen.y:93
#, c-format
msgid "inconsistent use of #~"
-msgstr " #~"
+msgstr "непоследовательное применение #~"
-#: src/po-gram-gen.y:240
-#, fuzzy, c-format
+#: src/po-gram-gen.y:243
+#, c-format
msgid "missing 'msgstr[]' section"
-msgstr " `msgstr[]'"
+msgstr "пропущена секция «msgstr[]»"
-#: src/po-gram-gen.y:249
-#, fuzzy, c-format
+#: src/po-gram-gen.y:252
+#, c-format
msgid "missing 'msgid_plural' section"
-msgstr " `msgid_plural'"
+msgstr "пропущена секция «msgid_plural»"
-#: src/po-gram-gen.y:257
-#, fuzzy, c-format
+#: src/po-gram-gen.y:260
+#, c-format
msgid "missing 'msgstr' section"
-msgstr " `msgstr'"
+msgstr "пропущена секция «msgstr»"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
-msgstr " "
+msgstr "первая форма множественного числа имеет ненулевой индекс"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
-msgstr " "
+msgstr "форма множественного числа имеет неправильный индекс"
#: src/po-lex.c:90 src/po-lex.c:109
#, c-format
msgid "too many errors, aborting"
-msgstr " , "
+msgstr "слишком много ошибок, завершение"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:740 src/write-po.c:869
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
#, c-format
msgid "invalid multibyte sequence"
-msgstr " "
+msgstr "неверная многобайтовая последовательность"
#: src/po-lex.c:465
#, c-format
msgid "incomplete multibyte sequence at end of file"
-msgstr " "
+msgstr "неполная многобайтовая последовательность в конце файла"
#: src/po-lex.c:475
#, c-format
msgid "incomplete multibyte sequence at end of line"
-msgstr " "
+msgstr "неполная многобайтовая последовательность в конце строки"
#: src/po-lex.c:487
msgid "iconv failure"
-msgstr " iconv "
+msgstr "вызов iconv завершился неуспехом"
#: src/po-lex.c:744
#, c-format
msgid "keyword \"%s\" unknown"
-msgstr " \"%s\""
+msgstr "неизвестное ключевое слово «%s»"
#: src/po-lex.c:854
#, c-format
msgid "invalid control sequence"
-msgstr " "
+msgstr "неверная управляющая последовательность"
#: src/po-lex.c:981
#, c-format
msgid "end-of-file within string"
-msgstr " "
+msgstr "символ конца файла встречен внутри строки"
#: src/po-lex.c:987
#, c-format
msgid "end-of-line within string"
-msgstr " "
+msgstr "символ конца строки встречен внутри строки"
#: src/po-lex.c:1008
#, c-format
msgid "context separator <EOT> within string"
-msgstr " <EOT> "
+msgstr "разделитель контекста <EOT> внутри строки"
-#
-#: 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 " "
+msgstr "этот файл не может содержать директивы домена"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
-msgstr " "
+msgstr "повторное определение сообщения"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
-msgstr " "
+msgstr "место появления первого определения"
#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
#, c-format
msgid "file \"%s\" is truncated"
-msgstr " \"%s\" "
+msgstr "файл «%s» усечён"
#: src/read-mo.c:129
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
-msgstr " \"%s\" , "
+msgstr "файл «%s» содержит строку, не завершённую нулем"
#: src/read-mo.c:165 src/read-mo.c:274
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
-msgstr " \"%s\" GNU .mo"
+msgstr "файл «%s» не в соответствует формату GNU .mo"
#: src/read-mo.c:178
#, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr " \"%s\" , , %s"
+msgstr "файл «%s» содержит строку, не завершённую нулем, в позиции %s"
#: src/read-properties.c:227
msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr ": \\uxxxx Unicode"
+msgstr "предупреждение: неверный синтаксис \\uxxxx для символа Unicode"
#: src/read-stringtable.c:802
msgid "warning: unterminated string"
-msgstr ": "
+msgstr "предупреждение: незавершенная строка"
#: src/read-stringtable.c:810
msgid "warning: syntax error"
-msgstr ": "
+msgstr "предупреждение: синтаксическая ошибка"
#: src/read-stringtable.c:871 src/read-stringtable.c:893
msgid "warning: unterminated key/value pair"
-msgstr ": /"
+msgstr "предупреждение: незавершенная пара ключ/значение"
#: src/read-stringtable.c:939
msgid "warning: syntax error, expected ';' after string"
-msgstr ": , ';'"
+msgstr "предупреждение: синтаксическая ошибка, после строки ожидается «;»"
#: src/read-stringtable.c:948
msgid "warning: syntax error, expected '=' or ';' after string"
msgstr ""
-": , '=' ';'"
+"предупреждение: синтаксическая ошибка, после строки ожидается «=» или «;»"
#: src/recode-sr-latin.c:116
#, c-format
msgid "Written by %s and %s.\n"
-msgstr " -- %s %s.\n"
+msgstr "Авторы программы — %s и %s.\n"
#. TRANSLATORS: This is a proper name. The last name is
#. (with Unicode escapes) "\u0160egan" or (with HTML entities)
@@ -3237,12 +3339,12 @@ msgstr " -- %s %s.\n"
#. This is a proper name. See the gettext manual, section Names.
#: src/recode-sr-latin.c:120
msgid "Danilo Segan"
-msgstr " "
+msgstr "Данило Шеган"
#: src/recode-sr-latin.c:153
#, c-format, no-wrap
msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr " .\n"
+msgstr "Перекодирует сербский текст из кириллицы в латиницу.\n"
#: src/recode-sr-latin.c:156
#, c-format, no-wrap
@@ -3250,28 +3352,28 @@ msgid ""
"The input text is read from standard input. The converted text is output to\n"
"standard output.\n"
msgstr ""
-" . \n"
-" .\n"
+"Входной текст читается со стандартного ввода. Преобразованный текст\n"
+"печатается на стандартный вывод.\n"
#: src/recode-sr-latin.c:339
#, c-format
msgid "input is not valid in \"%s\" encoding"
-msgstr " \"%s\""
+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
msgid "expected two arguments"
-msgstr " "
+msgstr "ожидается два аргумента"
#: src/urlget.c:176
#, c-format
msgid "Usage: %s [OPTION] URL FILE\n"
-msgstr ": %s [] URL \n"
+msgstr "Использование: %s [ПАРАМЕТР] URL ФАЙЛ\n"
#: src/urlget.c:181
#, c-format, no-wrap
@@ -3279,62 +3381,62 @@ msgid ""
"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
"the locally accessible FILE is used instead.\n"
msgstr ""
-" URL. URL \n"
-" , .\n"
+"Получает и выводит содержимое заданного URL. Если к URL невозможно\n"
+"получить доступ, вместо него используется указанный локальный ФАЙЛ.\n"
#: src/urlget.c:228
#, c-format
msgid "error reading \"%s\""
-msgstr " \"%s\""
+msgstr "ошибка чтения «%s»"
#: src/urlget.c:234
#, c-format
msgid "error writing stdout"
-msgstr " "
+msgstr "ошибка записи на стандартный вывод"
#: src/urlget.c:238
#, c-format
msgid "error after reading \"%s\""
-msgstr " \"%s\""
+msgstr "ошибка после чтения «%s»"
#: src/urlget.c:264
#, c-format
msgid "Retrieving %s..."
-msgstr ""
+msgstr "Получение %s…"
#: src/urlget.c:308
#, c-format
msgid " timed out.\n"
-msgstr ""
+msgstr " время ожидания истекло.\n"
#: src/urlget.c:445
#, c-format
msgid " failed.\n"
-msgstr ""
+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-."
+"Невозможно вывести несколько доменов перевода в единый файл указанного "
+"формата. Попробуйте применить синтаксис PO-файлов."
#: src/write-catalog.c:129
msgid ""
"Cannot output multiple translation domains into a single file with the "
"specified output format."
msgstr ""
-" "
-"."
+"Невозможно вывести несколько доменов перевода в единый файл указанного "
+"формата."
#: src/write-catalog.c:162
msgid ""
"message catalog has context dependent translations, but the output format "
"does not support them."
msgstr ""
-" , "
-"."
+"каталог сообщений содержит переводы с контекстом, но выходной формат их не "
+"поддерживает."
#: src/write-catalog.c:197
msgid ""
@@ -3342,74 +3444,74 @@ msgid ""
"support them. Try generating a Java class using \"msgfmt --java\", instead "
"of a properties file."
msgstr ""
-" , "
-" . Java- "
-"\"msgfmt --java\", properties."
+"каталог сообщений содержит переводы во множественном числе, но выходной "
+"формат не поддерживает их. Попробуйте сгенерировать Java-класс с помощью "
+"«msgfmt --java», а не файл properties."
#: src/write-catalog.c:202
msgid ""
"message catalog has plural form translations, but the output format does not "
"support them."
msgstr ""
-" , "
-" ."
+"каталог сообщений содержит переводы во множественном числе, но выходной "
+"формат их не поддерживает."
#: src/write-catalog.c:231 src/write-catalog.c:275
#, c-format
msgid "cannot create output file \"%s\""
-msgstr " \"%s\""
+msgstr "невозможно создать файл вывода «%s»"
#: src/write-catalog.c:239 src/write-catalog.c:283
msgid "standard output"
-msgstr " "
+msgstr "стандартный вывод"
#: src/write-csharp.c:703
#, c-format
msgid "failed to create directory \"%s\""
-msgstr " \"%s\""
+msgstr "не удалось создать каталог «%s»"
#: src/write-csharp.c:766
#, c-format
msgid "compilation of C# class failed, please try --verbose"
-msgstr " C#- , --verbose"
+msgstr "компиляция C#-класса завершилась неуспехом, попробуйте --verbose"
#: src/write-csharp.c:768
-#, fuzzy, c-format
+#, c-format
msgid "compilation of C# class failed"
-msgstr " C#- , --verbose"
+msgstr "компиляция класса C# завершилась с ошибкой"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
-msgstr "%s Java"
+msgstr "%s не является верным именем класса Java"
-#: 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 ""
-" Java- , --verbose "
-" $JAVAC"
+"компиляция класса Java завершилась с ошибкой, попробуйте --verbose или "
+"установите $JAVAC"
-#: src/write-java.c:1168
-#, fuzzy, c-format
+#: src/write-java.c:1213
+#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr ""
-" Java- , --verbose "
-" $JAVAC"
+"компиляция класса Java завершилась с ошибкой, попробуйте установить $JAVAC"
#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
#, c-format
msgid "error while opening \"%s\" for writing"
-msgstr " \"%s\" "
+msgstr "ошибка открытия «%s» для записи"
-#: src/write-po.c:803
-#, fuzzy, c-format
+#: src/write-po.c:875
+#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr ""
-" escape- `\\%c'"
+"переводимые сообщения не должны содержать экранирующую последовательность «\\"
+"%c»"
-#: 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"
@@ -3417,12 +3519,12 @@ msgid ""
"different from yours. Consider using a pure ASCII msgctxt instead.\n"
"%s\n"
msgstr ""
-" msgctxt -ASCII-.\n"
-" , \n"
-", . msgctxt ASCII.\n"
+"Следующий msgctxt содержит не ASCII символы.\n"
+"Это вызовет проблемы у переводчиков, которые не используют ту же\n"
+"кодировку, что и вы. Подумайте об использовании в msgctxt только ASCII.\n"
"%s\n"
-#: 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"
@@ -3430,9 +3532,9 @@ msgid ""
"different from yours. Consider using a pure ASCII msgid instead.\n"
"%s\n"
msgstr ""
-" msgid -ASCII-.\n"
-" , \n"
-", . msgid ASCII.\n"
+"Следующий msgid содержит не ASCII символы.\n"
+"Это вызовет проблемы у переводчиков, которые не используют ту же\n"
+"кодировку, что и вы. Подумайте об использовании в msgid только ASCII.\n"
"%s\n"
#: src/write-qt.c:667
@@ -3440,9 +3542,9 @@ msgid ""
"message catalog has plural form translations\n"
"but the Qt message catalog format doesn't support plural handling\n"
msgstr ""
-" , \n"
-" Qt \n"
-"\n"
+"каталог сообщений содержит переводы во множественном числе, но формат\n"
+"каталогов сообщений Qt не поддерживает обработку множественного\n"
+"числа\n"
#: src/write-qt.c:693
msgid ""
@@ -3451,9 +3553,9 @@ msgid ""
"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 Unicode \n"
-" , \n"
+"каталог сообщений содержит строки msgctxt с символами не из ISO-8859-1,\n"
+"но формат каталога сообщений Qt поддерживает Unicode только в\n"
+"переведенных строках, но не в контекстах\n"
#: src/write-qt.c:717
msgid ""
@@ -3461,74 +3563,76 @@ 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 Unicode \n"
-" , \n"
+"каталог сообщений содержит строки msgid с символами не из ISO-8859-1,\n"
+"но формат каталога сообщений Qt поддерживает Unicode только в\n"
+"переведенных строках, но не в оригиналах\n"
#: src/write-resources.c:94
#, c-format
msgid "error while writing to %s subprocess"
-msgstr " \"%s\""
+msgstr "ошибка при записи в дочерний процесс %s"
#: src/write-resources.c:131
msgid ""
"message catalog has context dependent translations\n"
"but the C# .resources format doesn't support contexts\n"
msgstr ""
-" , \n"
-".resources C# \n"
+"каталог сообщений содержит переводы с контекстом, но формат\n"
+".resources C# не поддерживает контексты\n"
#: src/write-resources.c:150
msgid ""
"message catalog has plural form translations\n"
"but the C# .resources format doesn't support plural handling\n"
msgstr ""
-" , \n"
-".resources C# \n"
+"каталог сообщений содержит переводы во множественном числе, но формат\n"
+".resources C# не поддерживает обработку множественного числа\n"
#: src/write-tcl.c:157
msgid ""
"message catalog has context dependent translations\n"
"but the Tcl message catalog format doesn't support contexts\n"
msgstr ""
-" , \n"
-" Tcl \n"
+"каталог сообщений содержит переводы с контекстом, но формат\n"
+"каталогов сообщений для Tcl не поддерживает контексты\n"
#: src/write-tcl.c:176
msgid ""
"message catalog has plural form translations\n"
"but the Tcl message catalog format doesn't support plural handling\n"
msgstr ""
-" , \n"
-" Tcl \n"
-"\n"
+"каталог сообщений содержит переводы во множественном числе, но формат\n"
+"каталогов сообщений для Tcl не поддерживает обработку множественного\n"
+"числа\n"
-#: 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 "%s:%d: : "
+msgstr "%s:%d: предупреждение: незавершенная строка"
#: src/x-awk.c:592
#, c-format
msgid "%s:%d: warning: unterminated regular expression"
-msgstr "%s:%d: : "
+msgstr "%s:%d: предупреждение: незавершенное регулярное выражение"
+
+#: src/x-c.c:1051
+#, c-format
+msgid "warning: invalid Unicode character"
+msgstr "предупреждение: неверный символ Unicode"
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:762
+#: 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 "%s:%d: : "
+msgstr "%s:%d: предупреждение: незавершенная символьная константа"
-#: 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 "%s:%d: : "
+msgstr "%s:%d: предупреждение: незавершенная строка"
-#: src/x-csharp.c:224 src/xgettext.c:2055
-#, fuzzy
+#: src/x-csharp.c:224 src/xgettext.c:2106
msgid "Please specify the source encoding through --from-code."
-msgstr ""
-"-ASCII- %s%s.\n"
-", --from-code.\n"
+msgstr "Укажите входную кодировку с помощью параметра --from-code."
#: src/x-csharp.c:269
#, c-format
@@ -3536,8 +3640,8 @@ msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the correct source encoding through --from-code.\n"
msgstr ""
-"%s:%d: .\n"
-", --from-code.\n"
+"%s:%d: Неверная мультибайтная последовательность.\n"
+"Укажите входную кодировку с помощью параметра --from-code.\n"
#: src/x-csharp.c:285
#, c-format
@@ -3545,8 +3649,8 @@ msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code.\n"
msgstr ""
-"%s:%d: .\n"
-", --from-code.\n"
+"%s:%d: Длинная неполная мультибайтная последовательность.\n"
+"Укажите входную кодировку с помощью параметра --from-code.\n"
#: src/x-csharp.c:297
#, c-format
@@ -3554,8 +3658,8 @@ msgid ""
"%s:%d: Incomplete multibyte sequence at end of file.\n"
"Please specify the correct source encoding through --from-code.\n"
msgstr ""
-"%s:%d: .\n"
-", --from-code.\n"
+"%s:%d: Неполная мультибайтная последовательность в конце файла.\n"
+"Укажите входную кодировку с помощью параметра --from-code.\n"
#: src/x-csharp.c:306
#, c-format
@@ -3563,13 +3667,13 @@ msgid ""
"%s:%d: Incomplete multibyte sequence at end of line.\n"
"Please specify the correct source encoding through --from-code.\n"
msgstr ""
-"%s:%d: .\n"
-", --from-code.\n"
+"%s:%d: Неполная мультибайтная последовательность в конце строки.\n"
+"Укажите входную кодировку с помощью параметра --from-code.\n"
#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
#, c-format
msgid "%s:%d: iconv failure"
-msgstr "%s:%d: iconv "
+msgstr "%s:%d: вызов iconv завершился с ошибкой"
#: src/x-csharp.c:338
#, c-format
@@ -3577,161 +3681,164 @@ msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the source encoding through --from-code.\n"
msgstr ""
-"%s:%d: .\n"
-", --from-code.\n"
+"%s:%d: Неверная мультибайтная последовательность.\n"
+"Укажите входную кодировку с помощью параметра --from-code.\n"
-#: src/x-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 "%s:%d: : Unicode-"
+msgstr "%s:%d: предупреждение: неверный символ Unicode"
#: src/x-csharp.c:1512 src/x-java.c:875
#, c-format
msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: : "
+msgstr "%s:%d: предупреждение: незавершенная строковая константа"
#: src/x-csharp.c:2020 src/x-java.c:1369
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: : ')', '}'"
+msgstr "%s:%d: предупреждение: встречена «)», где ожидается «}»"
#: src/x-csharp.c:2054 src/x-java.c:1403
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: : '}', ')'"
+msgstr "%s:%d: предупреждение: встречена «}», где ожидается «)»"
-#: src/x-glade.c:561
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
+msgstr "Отсутствует контекст для строки, извлечённой из элемента «%s»"
-#: 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 ""
+msgstr "Корневой элемент <%s> недопустим в корректном файле Glade"
-#: 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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
"This version was built without expat.\n"
msgstr ""
-" \"glade\" . %s expat.\n"
-" expat.\n"
+"Язык «glade» не поддерживается. %s полагается на expat.\n"
+"Эта версия собрана без expat.\n"
#: src/x-java.c:494
-#, fuzzy, c-format
+#, c-format
msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: : "
+msgstr "%s:%d: предупреждение: одиночный заменитель U+%04X"
#: src/x-javascript.c:230
-#, fuzzy
msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-"-ASCII- %s%s.\n"
-", --from-code.\n"
+msgstr "Укажите входную кодировку с помощью параметра --from-code\n"
#: src/x-javascript.c:275
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
-"%s:%d: .\n"
-", --from-code.\n"
+"%s:%d: Неверная мультибайтная последовательность.\n"
+"Укажите входную кодировку с помощью параметра --from-code\n"
#: src/x-javascript.c:291
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
-"%s:%d: .\n"
-", --from-code.\n"
+"%s:%d: Длинная неполная мультибайтная последовательность.\n"
+"Укажите входную кодировку с помощью параметра --from-code\n"
#: src/x-javascript.c:303
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of file.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
-"%s:%d: .\n"
-", --from-code.\n"
+"%s:%d: Неполная мультибайтная последовательность в конце файла.\n"
+"Укажите входную кодировку с помощью параметра --from-code\n"
#: src/x-javascript.c:312
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of line.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
-"%s:%d: .\n"
-", --from-code.\n"
+"%s:%d: Неполная мультибайтная последовательность в конце строки.\n"
+"Укажите входную кодировку с помощью параметра --from-code\n"
#: src/x-javascript.c:344
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the source encoding through --from-code\n"
msgstr ""
-"%s:%d: .\n"
-", --from-code.\n"
+"%s:%d: Неверная мультибайтная последовательность.\n"
+"Укажите входную кодировку с помощью параметра --from-code\n"
-#: src/x-javascript.c:1147
-#, fuzzy, c-format
+#: src/x-javascript.c:954
+#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: : "
+msgstr "%s:%d: предупреждение: литерал RegExp завершился слишком рано"
+
+#: src/x-javascript.c:1055
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: предупреждение: %s не допускается"
+
+#: src/x-javascript.c:1069
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: предупреждение: незавершенная разметка XML"
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
-msgstr ""
-"%s:%d: \"%s\" "
+msgstr "%s:%d: не удалось найти ограничитель строки «%s» вплоть до конца файла"
#: src/x-perl.c:1043
#, c-format
msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr "%s:%d: \\x{HEXNUMBER}"
+msgstr "%s:%d: пропущена закрывающая фигурная скобка в \\x{HEXNUMBER}"
#: src/x-perl.c:1163
#, c-format
msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr "%s:%d: (\"\\l\") \"%c\""
+msgstr "%s:%d: неверная интерполяция («\\l») восьмибитного символа «%c»"
#: src/x-perl.c:1183
#, c-format
msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr "%s:%d: (\"\\u\") \"%c\""
+msgstr "%s:%d: неверная интерполяция («\\u») восьмибитного символа «%c»"
#: src/x-perl.c:1217
#, c-format
msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s:%d: \"%c\""
+msgstr "%s:%d: неверная интерполяция переменной в «%c»"
#: src/x-perl.c:1230
#, c-format
msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr "%s:%d: (\"\\L\") \"%c\""
+msgstr "%s:%d: неверная интерполяция («\\L») восьмибитного символа «%c»"
#: src/x-perl.c:1247
#, c-format
msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
-msgstr "%s:%d: (\"\\U\") \"%c\""
+msgstr "%s:%d: неверная интерполяция («\\U») восьмибитного символа «%c»"
#: 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- %s%s.\n"
-", --from-code "
-"\n"
-" http://www.python.org/peps/pep-0263.html.\n"
+"Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
+"комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
#: src/x-python.c:324
#, c-format
@@ -3740,10 +3847,9 @@ msgid ""
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"%s:%d: .\n"
-", --from-code "
-"\n"
-" http://www.python.org/peps/pep-0263.html.\n"
+"%s:%d: Неверная мультибайтная последовательность.\n"
+"Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
+"комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
#: src/x-python.c:341
#, c-format
@@ -3752,10 +3858,9 @@ msgid ""
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"%s:%d: .\n"
-", --from-code "
-"\n"
-" http://www.python.org/peps/pep-0263.html.\n"
+"%s:%d: Длинная неполная мультибайтная последовательность.\n"
+"Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
+"комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
#: src/x-python.c:354
#, c-format
@@ -3764,10 +3869,9 @@ msgid ""
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"%s:%d: .\n"
-", --from-code "
-"\n"
-" http://www.python.org/peps/pep-0263.html.\n"
+"%s:%d: Неполная мультибайтная последовательность в конце файла.\n"
+"Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
+"комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
#: src/x-python.c:364
#, c-format
@@ -3776,10 +3880,9 @@ msgid ""
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"%s:%d: .\n"
-", --from-code "
-"\n"
-" http://www.python.org/peps/pep-0263.html.\n"
+"%s:%d: Неполная мультибайтная последовательность в конце строки.\n"
+"Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
+"комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
#: src/x-python.c:397
#, c-format
@@ -3788,30 +3891,29 @@ 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 ""
-"%s:%d: .\n"
-", --from-code "
-"\n"
-" http://www.python.org/peps/pep-0263.html.\n"
+"%s:%d: Неверная мультибайтная последовательность.\n"
+"Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
+"комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
#: src/x-python.c:722
#, c-format
msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr " \"%s\" . ASCII."
+msgstr "Кодировка «%s» неизвестна. Вместо неё используем ASCII."
#: src/x-rst.c:108
#, c-format
msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: "
+msgstr "%s:%d: неверное определение строки"
#: src/x-rst.c:172
#, c-format
msgid "%s:%d: missing number after #"
-msgstr "%s:%d: #"
+msgstr "%s:%d: пропущено число после #"
#: src/x-rst.c:207
#, c-format
msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: "
+msgstr "%s:%d: неверное строковое выражение"
#: src/x-sh.c:1074
#, c-format
@@ -3819,62 +3921,69 @@ msgid ""
"%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
"use eval_gettext instead"
msgstr ""
-"%s:%lu: : $\"...\" "
-"; eval_gettext"
+"%s:%lu: предупреждение: синтаксис $\"...\" запрещен по соображениям "
+"безопасности; используйте eval_gettext"
-#: src/x-vala.c:558
-#, fuzzy, c-format
+#: src/x-vala.c:413
+#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: : "
+msgstr ""
+"%s:%d: предупреждение: литерал регулярного выражения завершился слишком рано"
+
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr "«%s» не является корректным именем кодировки. Используется ASCII.\n"
-#: src/xgettext.c:636
+#: src/xgettext.c:648
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
-" --join-existing "
+"параметр --join-existing не может быть использован при записи в стандартный "
+"вывод"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
-msgstr "xgettext , "
+msgstr "xgettext не может работать, не зная искомых ключевых слов"
-#: src/xgettext.c:785
-#, fuzzy, c-format
+#: src/xgettext.c:808
+#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr ""
-": `%s' `%s'; C"
+"предупреждение: файл «%s» имеет неизвестное расширение «%s»; трактуется как C"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
-msgstr " .\n"
+msgstr "Извлекает переводимые строки из указанных входных файлов.\n"
-#: 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 ""
-" -d, --default-domain= .po ( messages.po)\n"
+" -d, --default-domain=ИМЯ выводить в файл ИМЯ.po (вместо messages.po)\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
-msgstr " -o, --output= \n"
+msgstr " -o, --output=ФАЙЛ записать вывод в указанный файл\n"
-#: src/xgettext.c:863
+#: src/xgettext.c:886
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
-msgstr " -p, --output-dir= \n"
+msgstr " -p, --output-dir=КАТ поместить выходные файлы в каталог КАТ\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
-msgstr " :\n"
+msgstr "Выбор языка входного файла:\n"
-#: src/xgettext.c:870
-#, fuzzy, c-format
+#: src/xgettext.c:893
+#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3883,54 +3992,53 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
-" -L, --language= \n"
-" (C, C++, ObjectiveC, PO, Shell, Python, "
-"Lisp,\n"
-" EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
-" JavaProperties, C#, awk, YCP, Tcl, Perl, "
-"PHP,\n"
-" GCC-source, NXStringTable, RST, Glade)\n"
+" -L, --language=ИМЯ распознавать указанный язык\n"
+" (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n"
+" EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
+" JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
+" GCC-source, NXStringTable, RST, Glade, Lua,\n"
+" JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
-msgstr " -C, --c++ --language=C++\n"
+msgstr " -C, --c++ синоним --language=C++\n"
-#: 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 " .\n"
+msgstr "По умолчанию язык определяется по расширению входного файла.\n"
-#: 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 ""
-" --from-code= \n"
-" ( Python, Tcl, Glade)\n"
+" --from-code=ИМЯ кодировка входных файлов\n"
+" (кроме Python, Tcl, Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
-msgstr " , ASCII.\n"
+msgstr "По умолчанию считается, что входные файлы содержат только ASCII.\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
-msgstr " -j, --join-existing \n"
+msgstr " -j, --join-existing слить сообщения с существующим файлом\n"
-#: src/xgettext.c:894
+#: src/xgettext.c:917
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
-msgstr " -x, --exclude-file=.po .po\n"
+msgstr " -x, --exclude-file=ФАЙЛ.po не извлекать вхождения из ФАЙЛА.po\n"
-#: src/xgettext.c:896
-#, fuzzy, c-format
+#: src/xgettext.c:919
+#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
" preceding keyword lines in output file\n"
@@ -3938,22 +4046,23 @@ msgid ""
"lines\n"
" in output file\n"
msgstr ""
-" -c, --add-comments[=] \n"
-" ( , \n"
-" )\n"
+" -cТЕГ, --add-comments[=ТЕГ] записать блоки комментариев, начиная с ТЕГА и\n"
+" предшествующих ключевых строк в выходной файл\n"
+" -c, --add-comments записать все блоки комментариев, начиная с\n"
+" предшествующих ключевых строк в выходной файл\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
-msgstr " :\n"
+msgstr "Параметры для конкретных языков:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
-msgstr " -a, --extract-all \n"
+msgstr " -a, --extract-all извлечь все строки\n"
-#: src/xgettext.c:906 src/xgettext.c:914
-#, fuzzy, c-format
+#: src/xgettext.c:929
+#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, "
@@ -3961,34 +4070,40 @@ msgid ""
" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
" Lua, JavaScript, Vala)\n"
msgstr ""
-" ( C, C++, ObjectiveC, Shell,\n"
+" (только языки 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"
-#: src/xgettext.c:911
-#, fuzzy, c-format
+#: 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 ""
-" -k, --keyword[=] (\n"
-" , \n"
-" )\n"
+" (только языки C, C++, ObjectiveC, Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+" Lua, JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
"argument\n"
" number ARG of keyword WORD\n"
msgstr ""
-" --flag=:: "
-"\n"
-" \n"
+" --flag=СЛОВО:АРГ:ФЛАГ дополнительный флаг для строк внутри "
+"аргумента\n"
+" номер АРГ ключевого слова СЛОВО\n"
-#: src/xgettext.c:922
-#, fuzzy, c-format
+#: src/xgettext.c:945
+#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, "
@@ -3996,164 +4111,165 @@ msgid ""
" C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
" Lua, JavaScript, Vala)\n"
msgstr ""
-" ( C, C++, ObjectiveC, Shell,\n"
+" (только языки 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"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
-msgstr " -T, --trigraphs ANSI C\n"
+msgstr " -T, --trigraphs понимать на входе триграфы ANSI C\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
-msgstr " ( C, C++, ObjectiveC)\n"
+msgstr " (только языки C, C++, ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
-msgstr " --qt Qt\n"
+msgstr " --qt распознавать форматные строки Qt\n"
-#: 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 " ( C++)\n"
+msgstr " (только язык C++)\n"
-#: src/xgettext.c:935
-#, fuzzy, c-format
+#: src/xgettext.c:958
+#, c-format
msgid " --kde recognize KDE 4 format strings\n"
-msgstr " --qt Qt\n"
+msgstr " --kde распознавать форматные строки KDE 4\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
-msgstr " --boost Boost\n"
+msgstr " --boost распознавать форматные строки Boost\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
-" --debug "
-"\n"
+" --debug более подробный результат разбора форматной "
+"строки\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
-msgstr " --properties-output .properties- Java\n"
+msgstr " --properties-output записать .properties-файл Java\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
-" --copyright-holder=\n"
-" \n"
+" --copyright-holder=СТРОКА\n"
+" задает наименование обладателя авторских прав\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
msgstr ""
-" --foreign-user "
+" --foreign-user не выводить уведомление об авторских правах "
"FSF\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, c-format
msgid " --package-name=PACKAGE set package name in output\n"
-msgstr ""
+msgstr " --package-name=ПАКЕТ задать имя пакета для вывода\n"
-#: src/xgettext.c:989
-#, fuzzy, c-format
+#: src/xgettext.c:1012
+#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr ""
-" --copyright-holder=\n"
-" \n"
+" --package-version=ВЕРСИЯ\n"
+" задать версию пакета для вывода\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
-" --msgid-bugs-address=@.\n"
-" , "
-"\n"
+" --msgid-bugs-address=АДРЕС@ЭЛЕКТРОННОЙ.ПОЧТЫ\n"
+" задает адрес, куда следует отправлять отчет об "
+"ошибках\n"
-#: src/xgettext.c:993
-#, fuzzy, c-format
+#: src/xgettext.c:1016
+#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
"msgstr\n"
" values\n"
msgstr ""
-" -m, --msgstr-prefix[=]\n"
-" \"\" "
-"msgstr\n"
+" -m[СТРОКА], --msgstr-prefix[=СТРОКА]\n"
+" использовать СТРОКУ или «» как префикс\n"
+" к значениям msgstr\n"
-#: src/xgettext.c:996
-#, fuzzy, c-format
+#: src/xgettext.c:1019
+#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
"msgstr\n"
" values\n"
msgstr ""
-" -M, --msgstr-suffix[=]\n"
-" \"\" "
-"msgstr\n"
+" -M[СТРОКА], --msgstr-suffix[=СТРОКА]\n"
+" использовать СТРОКУ или «» как суффикс\n"
+" к значениям msgstr\n"
-#: 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 ""
-" --flag <->:<->:"
-"[pass-]<>: %s"
+"Аргумент --flag не соответствует синтаксису <ключевое-слово>:<номер-арг>:"
+"[pass-]<флаг>: %s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
-msgstr " "
+msgstr "стандартный ввод"
-#: src/xgettext.c:2020
+#: src/xgettext.c:2071
#, c-format
msgid "Non-ASCII character at %s%s."
-msgstr ""
+msgstr "Не ASCII-символ у %s%s."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
-msgstr ""
+msgstr "Не ASCII-комментарий у или перед %s%s."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
-msgstr ""
+msgstr "Не ASCII-строка у %s%s."
-#: 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 "%s%s: : "
+msgstr "%s%s: предупреждение: "
-#: 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 ""
-" , , %s "
-" %s. : %s\n"
+"Несмотря на использование в месте, где предполагается форматная строка, %s "
+"не является верной форматной строкой %s. Причина: %s\n"
-#: 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 ""
-" %s %s, "
-". : %s\n"
+"Строка %s не является верной форматной строкой %s, хотя и объявлена как "
+"таковая. Причина: %s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4161,89 +4277,73 @@ msgid ""
"Please consider using a format string with named arguments,\n"
"and a mapping instead of a tuple for the arguments.\n"
msgstr ""
-" '%s' \n"
-" : \n"
-".\n"
-", \n"
-" .\n"
+"Форматная строка «%s» с безымянными аргументами не может быть\n"
+"правильно локализована: переводчик не может поменять местами\n"
+"аргументы.\n"
+"Используйте форматную строку с именованными аргументами и\n"
+"отображение вместо кортежа для аргументов.\n"
-#: 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 ""
-" msgid. GNU gettext:\n"
-"gettext(\"\") ,\n"
-" .\n"
+"Пустой msgid. Он зарезервирован для GNU gettext:\n"
+"gettext(\"\") возвращает текст заголовка с метаинформацией,\n"
+"а не пустую строку.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr " '%.*s'"
+msgstr "неоднозначная спецификация аргумента для ключевого слова «%.*s»"
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
-msgstr ": '%.*s'"
+msgstr "предупреждение: не указан контекст для ключевого слова «%.*s»"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr ""
-": "
-" '%.*s'"
+"предупреждение: не указан контекст для аргумента во множественном числе у "
+"ключевого слова «%.*s»"
-#: src/xgettext.c:2942
+#: src/xgettext.c:3052
#, c-format
msgid "context mismatch between singular and plural form"
-msgstr " "
+msgstr "не совпадают контексты у форм в единственном и множественном числе"
-#: src/xgettext.c:3052
-#, fuzzy
+#: src/xgettext.c:3419
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a 'Makevars' file, please specify\n"
"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
"specify an --msgid-bugs-address command line option.\n"
msgstr ""
-" --msgid-bugs-address. \n"
-"`Makevars', MSGID_BUGS_ADDRESS, \n"
-" --msgid-bugs-address.\n"
+"Не задан параметр --msgid-bugs-address. Если вы используете файл\n"
+"«Makevars», установите в нём переменную MSGID_BUGS_ADDRESS, в\n"
+"противном случае задайте в командной строке параметр --msgid-bugs-address.\n"
-#: src/xgettext.c:3267
-#, fuzzy, c-format
+#: src/xgettext.c:3638
+#, c-format
msgid "language '%s' unknown"
-msgstr " `%s' "
+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"
+msgstr "<без имени>"
#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: -- %c\n"
+#~ msgstr "%s: недопустимый ключ -- %c\n"
#~ msgid "DuplicateHandle failed with error code 0x%08x"
#~ msgstr ""
-#~ " DuplicateHandle 0x%08x"
-
-#~ msgid "Not yet implemented."
-#~ msgstr " ."
-
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr ""
-#~ " `%s' \n"
+#~ "операция DuplicateHandle завершилась неуспехом с выходным кодом 0x%08x"
#~ msgid "Multiple references to %%%c."
-#~ msgstr " %%%c."
+#~ msgstr "Множественные ссылки на %%%c."
#~ msgid ""
#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -4253,21 +4353,31 @@ msgstr "< >"
#~ "PURPOSE.\n"
#~ msgstr ""
#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ " ; "
-#~ "\n"
-#~ " . ; \n"
-#~ " .\n"
+#~ "Это свободная программа; подробности об условиях распространения "
+#~ "смотрите\n"
+#~ "в исходном тексте. Мы НЕ предоставляем гарантий; даже гарантий\n"
+#~ "КОММЕРЧЕСКОЙ ЦЕННОСТИ или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ.\n"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Еще не реализовано."
+
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "поле заголовка `%s' должно начинаться с новой строки\n"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr ""
+#~ "поле заголовка `%s' все еще имеет первоначальное шаблонное значение\n"
#~ msgid ""
#~ "message catalog has context dependent translations\n"
#~ "but the C# .dll format doesn't support contexts\n"
#~ msgstr ""
-#~ " , \n"
-#~ ".dll C# \n"
+#~ "каталог сообщений содержит переводы с контекстом, но формат\n"
+#~ ".dll C# не поддерживает контексты\n"
#~ msgid ""
#~ "message catalog has context dependent translations\n"
#~ "but the Java ResourceBundle format doesn't support contexts\n"
#~ msgstr ""
-#~ " , \n"
-#~ "Java ResourceBundle \n"
+#~ "каталог сообщений содержит переводы с контекстом, но формат\n"
+#~ "Java ResourceBundle не поддерживает контексты\n"
diff --git a/gettext-tools/po/sk.po b/gettext-tools/po/sk.po
index 556a612..05e90c0 100644
--- a/gettext-tools/po/sk.po
+++ b/gettext-tools/po/sk.po
@@ -2,14 +2,14 @@
# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2008, 2009, 2010, 2012, 2013 Free Software Foundation, Inc.
# This file is distributed under the same license as the gettext package.
# Štefan Ondrejička <ondrej@idata.sk>, 1999.
-# Marcel Telka <marcel@telka.sk>, 2001, 2002, 2003, 2004, 2005, 2008, 2009, 2010, 2012, 2013.
+# Marcel Telka <marcel@telka.sk>, 2001, 2002, 2003, 2004, 2005, 2008, 2009, 2010, 2012, 2013, 2014.
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.18.3\n"
+"Project-Id-Version: GNU gettext-tools 0.19-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-07-07 18:21+0900\n"
-"PO-Revision-Date: 2013-07-04 10:55+0200\n"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2014-05-10 17:44+0200\n"
"Last-Translator: Marcel Telka <marcel@telka.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
"Language: sk\n"
@@ -182,15 +182,15 @@ msgstr "neplatný parameter source_version pre compile_java_class"
msgid "invalid target_version argument to compile_java_class"
msgstr "neplatný parameter target_version pre compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c: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 "zlyhalo vytvorenie \"%s\""
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
+#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr "chyba počas zápisu do súboru \"%s\""
@@ -214,9 +214,9 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr "V/V chyba podprocesu %s"
-#: 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 "pamäť je vyčerpaná"
@@ -227,7 +227,7 @@ msgid "creation of threads failed"
msgstr "vytváranie vláken zlyhalo"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "zápis do podprocesu %s zlyhal"
@@ -314,8 +314,8 @@ msgid "%s subprocess got fatal signal %d"
msgstr "%s podproces dostal kritický signál %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: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 "chyba pri otváraní súboru \"%s\" na čítanie"
@@ -680,7 +680,7 @@ msgstr ""
"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
+#: 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'"
@@ -728,29 +728,29 @@ 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
+#: src/format-python-brace.c:137
#, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
msgstr "V direktíve číslo %u, '%c' nemôže byť na začiatku názvu poľa."
-#: 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 "V direktíve číslo %u, '%c' nemôže byť na začiatku parametra getattr."
-#: 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 "V direktíve číslo %u, '%c' nemôže byť na začiatku parametra getitem."
-#: 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 ""
"V direktíve číslo %u nie je povolené ďalšie vnorenie v špecifikácii formátu."
-#: 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 "V direktíve číslo %u je neukončená formátovacia direktíva."
@@ -804,11 +804,11 @@ msgid ""
"1 and 9."
msgstr "Znak, ktorý ukončuje direktívu číslo %u nie je číslica medzi 1 a 9."
-#: src/hostname.c:178 src/msgattrib.c: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"
@@ -821,19 +821,19 @@ msgstr ""
"Toto je voľne šíriteľný softvér: môžete ho voľne meniť a ďalej šíriť.\n"
"Neposkytuje sa ŽIADNA ZÁRUKA, v rozsahu povolenom zákonmi.\n"
-#: src/hostname.c:184 src/msgattrib.c: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 "Napísal %s.\n"
#. 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 "Bruno Haible"
@@ -843,11 +843,11 @@ msgstr "Bruno Haible"
msgid "too many arguments"
msgstr "príliš veľa parametrov"
-#: 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 "Skúste '%s --help' a dozviete sa viac informácií.\n"
@@ -888,29 +888,29 @@ msgstr ""
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address adresy pre meno hostiteľa\n"
-#: src/hostname.c:228 src/msgattrib.c: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 "Informatívny výstup:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help zobraziť túto nápovedu a skončiť\n"
-#: 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 " -V, --version zobraziť informáciu o verzii a skončiť\n"
@@ -919,11 +919,11 @@ msgstr " -V, --version zobraziť informáciu o verzii a skončiť
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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 ""
"Správy o chybách zasielajte na adresu <bug-gnu-gettext@gnu.org> (iba "
@@ -936,30 +936,27 @@ msgstr ""
msgid "could not get host name"
msgstr "Nemôžem získať meno hostiteľa"
-#: 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 "povolený najviac jeden vstupný súbor"
-#: 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 "%s a %s sa navzájom vylučujú"
-#: 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 "Použitie: %s [VOĽBA] [VSTUPNÝSÚBOR]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -968,32 +965,32 @@ msgstr ""
"Filtruje správy z prekladového katalógu podľa ich vlastností a mení tieto\n"
"vlastnosti.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c: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 "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
-#: 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 "Umiestnenie vstupného súboru:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " VSTUPNÝSÚBOR vstupný PO súbor\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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"
@@ -1001,31 +998,31 @@ msgstr ""
" -D, --directory=ADRESÁR pridať ADRESÁR do zoznamu pre vyhľadávané\n"
" vstupné súbory\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c: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 ""
"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
-#: 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 "Umiestnenie výstupného súboru:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 " -o, --output-file=SÚBOR zapísať výstup do zadaného súboru\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1034,12 +1031,12 @@ msgstr ""
"Výsledky sú zapísané na štandardný výstup ak nie je zadaný výstupný súbor\n"
"alebo ak je -.\n"
-#: src/msgattrib.c: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 "Výber správy:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
@@ -1047,7 +1044,7 @@ msgstr ""
" --translated zachovať preložené, odstrániť nepreložené "
"správy\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
@@ -1055,54 +1052,54 @@ msgstr ""
" --untranslated zachovať nepreložené, odstrániť preložené "
"správy\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr " --no-fuzzy odstrániť nepresné preklady\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr " --only-fuzzy zachovať nepresné preklady\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete odstrániť zastarané správy označené #~\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete zachovať zastarané správy označené #~\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Úprava vlastností:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr " --set-fuzzy nastaviť všetky správy ako nepresné\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr ""
" --clear-fuzzy nastaviť všetky správy ako nie nepresné\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr " --set-obsolete nastaviť všetky správy ako zastarané\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr ""
" --clear-obsolete nastaviť všetky správy ako nie zastarané\n"
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
@@ -1112,7 +1109,7 @@ msgstr ""
"predchádzajúce\n"
" msgid preložených správ.\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
@@ -1121,27 +1118,37 @@ msgstr ""
" --clear-previous odstrániť \"predchádzajúce msgid\" zo všetkých "
"správ\n"
-#: src/msgattrib.c:473
+# c-format
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+" --empty pri odstraňovaní nepresných prekladov "
+"nastaviť\n"
+" prázdne msgstr\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
msgstr ""
" --only-file=SÚBOR.po spracovať len položky uvedené v SÚBOR.po\n"
-#: 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 ""
" --ignore-file=SÚBOR.po spracovať len položky neuvedené v SÚBOR.po\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr ""
" --fuzzy synonymum pre --only-fuzzy --clear-fuzzy\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
@@ -1149,24 +1156,24 @@ 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
-#: 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 "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
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
" -P, --properties-input vstupný súbor má syntax Java .properties\n"
-#: 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 "
@@ -1175,17 +1182,17 @@ 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
-#: 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 "Podrobnosti výstupu:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1199,16 +1206,16 @@ msgstr ""
"'never' (nikdy),\n"
" 'auto' (automaticky) alebo 'html'.\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=SÚBORŠTÝLU zadať pravidlo štýlu CSS pre --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
+#: 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"
@@ -1216,9 +1223,9 @@ msgstr ""
" -e, --no-escape nepoužiť na výstupe riadiace sekvencie\n"
" jazyka C (predvolené)\n"
-#: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
-#: src/msguniq.c:390 src/xgettext.c:956
+#: src/msgattrib.c:508 src/msgcat.c: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"
@@ -1227,29 +1234,29 @@ msgstr ""
"C,\n"
" bez rozšírených znakov\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr " --force-po zapísať súbor PO, aj keď bude prázdny\n"
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr ""
" -i, --indent 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
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
" --no-location nezapisovať riadky '#: meno_súboru:riadok'\n"
-#: 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"
@@ -1257,8 +1264,8 @@ msgstr ""
" -n, --add-location generovať riadky '#: meno_súboru:riadok'\n"
" (predvolené)\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c: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"
@@ -1266,32 +1273,32 @@ msgstr ""
" --strict zapísať .po súbor presne dodržiavajúci štýl\n"
" Uniforum\n"
-#: src/msgattrib.c:511 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
-#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
-#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
+#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
+#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output zapísať Java súbor .properties\n"
-#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
-#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
" --stringtable-output 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
-#: 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 " -w, --width=ČÍSLO nastaviť šírku výstupnej strany\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c: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"
@@ -1300,32 +1307,32 @@ msgstr ""
" --no-wrap nezalamovať riadky správ dlhšie ako šírka\n"
" výstupnej strany do viacerých riadkov\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output generovať utriedený výstup\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 ""
" -F, --sort-by-file utriediť výstup podľa umiestnenia v súboroch\n"
-#: 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 "je uvedené nepovolené kritérium výberu (%d < n < %d)"
-#: 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 "Použitie: %s [VOĽBA] [VSTUPNÝSÚBOR]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1348,24 +1355,24 @@ msgstr ""
"--use-first, ktorá zabezpečí ich zachovanie iba z prvého PO súboru, ktorý\n"
"ich definuje.\n"
-#: 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 " VSTUPNÝSÚBOR ... vstupné súbory\n"
-#: 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 ""
" -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
+#: 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 "Ak je vstupný súbor -, načítaný je štandardný vstup.\n"
-#: 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"
@@ -1374,7 +1381,7 @@ msgstr ""
" -<, --less-than=POČET vypísať správy, ktoré sú definované menej ako\n"
" POČET-krát, štandardne nastavené na nekonečno\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1383,7 +1390,7 @@ msgstr ""
" ->, --more-than=POČET vypísať správy, ktoré sú defineované viac\n"
" ako POČET-krát, štandardne nastavené na 0\n"
-#: src/msgcat.c:413 src/msgcomm.c:404
+#: src/msgcat.c:414 src/msgcomm.c:405
#, c-format
msgid ""
" -u, --unique shorthand for --less-than=2, requests\n"
@@ -1392,16 +1399,16 @@ msgstr ""
" -u, --unique skratka pre --less-than=2, nastavuje výpis\n"
" len unikátnych správ\n"
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c: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 ""
" -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
+#: 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"
@@ -1410,12 +1417,12 @@ msgstr ""
" --stringtable-input vstupné súbory majú syntax NeXTstep-GNUstep\n"
" .strings\n"
-#: 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 " -t, --to-code=NÁZOV kódovanie pre výstup\n"
-#: 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"
@@ -1425,7 +1432,7 @@ msgstr ""
"správu,\n"
" nezlučovať viacero prekladov\n"
-#: 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"
@@ -1433,21 +1440,21 @@ 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
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "neboli zadané vstupné súbory"
-#: 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 "potrebné sú presne 2 vstupné súbory"
-#: 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 "Použitie: %s [VOĽBA] def.po ref.pot\n"
@@ -1479,12 +1486,12 @@ msgstr " def.po preklady\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot odkazy na zdrojové súbory\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "Modifikátory operácie:\n"
-#: 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."
@@ -1492,7 +1499,7 @@ msgid ""
msgstr ""
" -m, --multi-domain použije ref.pot na všetky domény v def.po\n"
-#: src/msgcmp.c:243 src/msgmerge.c:550
+#: src/msgcmp.c:243 src/msgmerge.c:555
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr ""
@@ -1519,17 +1526,17 @@ msgstr "táto správa je nepreložená"
msgid "this message needs to be reviewed by the translator"
msgstr "táto správa musí byť skontrolovaná prekladateľom"
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1505
#, c-format
msgid "this message is used but not defined..."
msgstr "táto správa je použitá, ale nie je definovaná..."
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1508
#, c-format
msgid "...but this definition is similar"
msgstr "...ale táto definícia je podobná"
-#: 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 "táto správa je použitá, ale nie je definovaná v %s"
@@ -1539,7 +1546,7 @@ msgstr "táto správa je použitá, ale nie je definovaná v %s"
msgid "warning: this message is not used"
msgstr "upozornenie: táto správa nie je použitá"
-#: src/msgcmp.c:553 src/msgfmt.c: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"
@@ -1547,12 +1554,12 @@ msgstr[0] "nájdených %d závažných chýb"
msgstr[1] "nájdená %d závažná chyba"
msgstr[2] "nájdené %d závažné chyby"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "musia byť uvedené minimálne dva súbory"
-#: 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"
@@ -1572,7 +1579,7 @@ msgstr ""
"komentáre budú zachované iba z prvého PO súboru, v ktorom sú definované.\n"
"Pozície v zdrojových súboroch budú zlúčené zo všetkých PO súborov.\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1581,71 +1588,71 @@ msgstr ""
" ->, --more-than=POČET vypísať správy, ktoré sú defineované viac\n"
" ako POČET-krát, štandardne nastavené na 1\n"
-#: src/msgcomm.c: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 ""
" --omit-header nezapisovať hlavičku s položkou 'msgid \"\"'\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr "Konvertovať prekladový katalóg do iného kódovania znakov.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Cieľ konverzie:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Predvolené kódovanie je kódovanie aktuálneho národného prostredia.\n"
-#: src/msgconv.c: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 " -i, --indent výstup s použitím odsadzovania\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\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
+#: 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 ""
-" --add-location zachovať riadky '#: meno_súboru:riadok'\n"
+" -n, --add-location zachovať riadky '#: meno_súboru:riadok'\n"
" (predvolené)\n"
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict presné dodržiavanie štýlu Uniforum\n"
-#: 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 "nie sú zadané vstupné súbory"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "potrebné je presne jeden vstupný súbor"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Použitie: %s [VOĽBA] VSTUPNÝSÚBOR\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1658,7 +1665,7 @@ msgstr ""
"programom xgettext). Nepreloženým položkám je priradený preklad\n"
"zhodný s msgid.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " VSTUPNÝSÚBOR vstupný PO alebo POT súbor\n"
@@ -1697,7 +1704,7 @@ msgstr ""
"Špeciálny vstavaný príkaz s názvom '0' vypisuje preklad nasledovaný nulovým\n"
"bajtom. Výstup príkazu \"msgexec 0\" je použiteľný ako vstup pre \"xargs -0\".\n"
-#: src/msgexec.c:281 src/msgfilter.c:401
+#: src/msgexec.c:281 src/msgfilter.c:420
#, c-format
msgid " -i, --input=INPUTFILE input PO file\n"
msgstr " -i, --input=VSTUPNÝSÚBOR vstupný PO súbor\n"
@@ -1707,27 +1714,27 @@ msgstr " -i, --input=VSTUPNÝSÚBOR vstupný PO súbor\n"
msgid "write to stdout failed"
msgstr "zápis na štandardný výstup zlyhal"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "chýbajúci názov filtra"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr "musí byť uvedený aspoň jeden sed skript"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Použitie: %s [VOĽBA] FILTER [VOĽBA-FILTRA]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "Aplikovať filter na všetky preklady prekladového katalógu.\n"
-#: src/msgfilter.c:416
+#: src/msgfilter.c:435
#, c-format
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
@@ -1737,18 +1744,18 @@ msgstr ""
"vstupu\n"
"a zapisuje upravené preklady na štandardný výstup.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "Užitočné VOĽBY-FILTRA keď je použitý FILTER 'sed':\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
msgstr " -e, --expression=SKRIPT pridať SKRIPT k vykonávaným príkazom\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1759,14 +1766,14 @@ msgstr ""
"výkonávaným\n"
" príkazom\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
" -n, --quiet, --silent potlačiť automatickú tlač priestoru vzorov\n"
-#: 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"
@@ -1774,12 +1781,12 @@ msgstr ""
" --no-escape nepoužiť na výstupe riadiace sekvencie\n"
" jazyka C (predvolené)\n"
-#: 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 " --indent výstup s použitím odsadzovania\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
@@ -1787,50 +1794,71 @@ msgstr ""
" --keep-header zachovať položku hlavičky nezmenenú,\n"
" neodfiltrovať ju\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "parameter pre %s by malo byť len jedno interpunkčné znamienko"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
msgstr "neplatné poradie bajtov: %s"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c: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 "Ulrich Drepper"
-#: 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 "ak sú uvedené %s a %s, vstupný súbor nemá byť zadaný"
+
+#: 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 "%s vyžaduje špecifikáciu \"-d adresár\""
-#: 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 "%s vyžaduje špecifikáciu \"-l národné prostredie\""
-#: 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 "%s vyžaduje špecifikáciu \"--template šablóna\""
+
+#: src/msgfmt.c:545
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s vyžaduje špecifikáciu \"-o súbor\""
+
+#: src/msgfmt.c:551
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s a %s sa navzájom vylučujú v %s"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s je platné len s %s alebo %s"
-#: src/msgfmt.c: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 "%s je platné len s %s, %s alebo %s"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
@@ -1838,7 +1866,7 @@ msgstr[0] "%d preložených správ"
msgstr[1] "%d preložená správa"
msgstr[2] "%d preložené správy"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
@@ -1846,7 +1874,7 @@ msgstr[0] ", %d nepresných prekladov"
msgstr[1] ", %d nepresný preklad"
msgstr[2] ", %d nepresné preklady"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
@@ -1854,17 +1882,17 @@ msgstr[0] ", %d nepreložených správ"
msgstr[1] ", %d nepreložená správa"
msgstr[2] ", %d nepreložené správy"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Použitie: %s [VOĽBA] menosúboru.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "Generovať binárny katalóg správ z textového popisu prekladu.\n"
-#: src/msgfmt.c: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"
@@ -1873,26 +1901,26 @@ msgstr ""
"Povinné parametre dlhých volieb sú povinné aj pre krátke voľby.\n"
"Podobne aj pre voliteľné parametre.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
msgid " filename.po ... input files\n"
msgstr " menosúboru.po ... vstupné súbory\n"
-#: 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 "Mód činnosti:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
"class\n"
msgstr ""
-" -j, --java mód Java: generovať triedu Java "
+" -j, --java režim Java: generovať triedu Java "
"ResourceBundle\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1902,12 +1930,13 @@ msgstr ""
"alebo\n"
" vyššie)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
-msgstr " --csharp mód C#: generovať .dll súbor pre .NET\n"
+msgstr ""
+" --csharp režim C#: generovať .dll súbor pre .NET\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -1916,40 +1945,48 @@ msgstr ""
" --csharp-resources režim zdrojov C#: generovať .resources súbor "
"pre .NET\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, 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"
+" --tcl režim Tcl: generovať súbor .msg tcl/msgcat\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
-msgstr " --qt mód Qt: generovať Qt súbor .qm\n"
+msgstr " --qt režim Qt: generovať Qt súbor .qm\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+" --desktop režim položiek pracovnej plochy: generovať "
+"súbor .desktop\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
-msgstr " --strict povoliť presne dodržaný mód Uniforum\n"
+msgstr " --strict povoliť presne dodržaný režim Uniforum\n"
-#: 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 "Ak je výstupný súbor -, výstup je zapísaný na štandardný výstup.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
-msgstr "Umiestnenie výstupného súboru v móde Java:\n"
+msgstr "Umiestnenie výstupného súboru v režime Java:\n"
-#: 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 " -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
+#: 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 "
@@ -1958,14 +1995,22 @@ msgstr ""
" -l, --locale=N_PROSTREDIE názov národného prostredia, buď jazyk alebo\n"
" jazyk_KRAJINA\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --source vytvorí súbor .java, namiesto súboru .class\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
" -d ADRESÁR základný adresár adresárov hierarchie tried\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1977,12 +2022,12 @@ msgstr ""
"oddelené znakom \"_\". Voľba -d je povinná. Trieda je zapísaná do zadaného\n"
"adresára.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "Umiestnenie výstupného súboru v režime C#:\n"
-#: src/msgfmt.c:721 src/msgunfmt.c:473
+#: src/msgfmt.c:845 src/msgunfmt.c:473
#, c-format
msgid ""
" -d DIRECTORY base directory for locale dependent .dll "
@@ -1991,7 +2036,7 @@ msgstr ""
" -d ADRESÁR základný adresár pre lokálne závislé .dll "
"súbory\n"
-#: 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"
@@ -2001,17 +2046,17 @@ msgstr ""
"adresára,\n"
"ktorého názov závisí od národného prostredia.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
-msgstr "Umiestnenie výstupného súboru v móde Tcl:\n"
+msgstr "Umiestnenie výstupného súboru v režime Tcl:\n"
-#: 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 " -d ADRESÁR základný adresár katalógov správ .msg\n"
-#: 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"
@@ -2019,12 +2064,46 @@ msgid ""
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
+#: src/msgfmt.c:861
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr "Voľby pre položky pracovnej plochy:\n"
+
+#: src/msgfmt.c:867
+#, c-format
+msgid " --template=TEMPLATE a .desktop file used as a template\n"
+msgstr " --template=ŠABLÓNA súbor .desktop použitý ako šablóna\n"
+
+#: src/msgfmt.c:869
+#, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr " -d ADRESÁR základný adresár súborov .po\n"
+
+#: src/msgfmt.c: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 ""
+" -kSLOVO, --keyword=SLOVO hľadať SLOVO ako ďalšie kľúčové slovo\n"
+" -k, --keyword nepoužiť predvolené kľúčové slová)\n"
+
+#: src/msgfmt.c: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 ""
+"Voľby -l, -o a --template sú povinné. Ak je zadané -D, vstupné súbory sú\n"
+"načítané zo zadaného adresára, namiesto z parametrov príkazového riadka.\n"
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "Interpretácia vstupného súboru:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -2035,14 +2114,14 @@ msgstr ""
" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format kontrolovať jazykovo závislé formátované "
"reťazce\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -2050,7 +2129,7 @@ msgid ""
msgstr ""
" --check-header overiť prítomnosť a obsah položky hlavičky\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -2060,7 +2139,7 @@ msgstr ""
"domény\n"
" a voľbou --output-file\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2069,7 +2148,7 @@ msgstr ""
" -C, --check-compatibility kontrolovať, či sa GNU msgfmt správa tak ako\n"
" X/Open msgfmt\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -2080,12 +2159,12 @@ msgstr ""
"skratiek\n"
" pre položky menu\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr " -f, --use-fuzzy použiť nepresné preklady vo výstupe\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
@@ -2093,7 +2172,7 @@ msgstr ""
" -a, --alignment=POČET zarovnať reťazce na POČET bajtov (štandardne: "
"%d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2106,7 +2185,7 @@ msgstr ""
" (big alebo little, predvolené závisí na "
"platforme)\n"
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
@@ -2114,80 +2193,90 @@ msgstr ""
" --no-hash binárny súbor nebude obsahovať hašovaciu "
"tabuľku\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics zobraziť štatistiky prekladov\n"
-#: 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 " -v, --verbose zvýšiť úroveň táravosti\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "upozornenie: hlavička súboru PO chýba alebo je neplatná\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "upozornenie: konverzia znakovej sady nebude fungovať\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "upozornenie: hlavička súboru PO je nepresná\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "upozornenie: staršie verzie msgfmt vrátia pri tomto chybu\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "meno domény \"%s\" nie je použitelné ako meno súboru"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"meno domény \"%s\" nie je použitelné ako meno súboru: použije sa predpona"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, c-format
msgid "'domain %s' directive ignored"
msgstr "direktíva 'domain %s' bola ignorovaná"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "prázdna položka 'msgstr' bola ignorovaná"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "nepresná položka 'msgstr' bola ignorovaná"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: upozornenie: zdrojový súbor obsahuje nepresné preklady"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr "%s neexistuje"
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr "%s existuje, ale nedá sa čítať"
+
#: 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 "chyba pri čítaní súboru \"%s\""
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2196,7 +2285,7 @@ msgstr ""
"voľba '%c' nemôže byť použitá pred špecifikovaným 'J' alebo 'K' alebo 'T' "
"alebo 'C' alebo 'X'"
-#: src/msggrep.c:516
+#: src/msggrep.c:521
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2205,7 +2294,7 @@ msgstr ""
"Vyberie všetky správy z prekladového katalógu, ktoré vyhovujú zadanému\n"
"vzoru alebo sú v zadaných zdrojových súboroch.\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2282,7 +2371,7 @@ msgstr ""
" -v, --invert-match vytlačiť len tie správy, ktoré nevyhovujú žiadnemu\n"
" výberovému kritériu\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2291,12 +2380,12 @@ msgstr ""
"C,\n"
" bez rozšírených znakov\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output generovať utriedený výstup\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
@@ -2463,7 +2552,7 @@ msgstr "cieľová znaková sada \"%s\" nie je prenositeľné meno kódovania."
#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:3051
+#: src/xgettext.c:544 src/xgettext.c:3418
#, c-format
msgid "warning: "
msgstr "upozornenie: "
@@ -2674,17 +2763,17 @@ msgstr "spracovanie množných čísel je rozšírením GNU"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "v msgstr chýba značka klávesovej skratky '%c'"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr obsahuje príliš veľa značiek klávesových skratiek '%c'"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "položka hlavičky '%s' ešte obsahujú počiatočnú štandardnú hodnotu\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "položka hlavičky '%s' v hlavičke chýba\n"
@@ -2704,7 +2793,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
msgstr "vstupný súbor nemá v hlavičke uvedenú znakovú sadu"
#: src/msgl-iconv.c:305 src/recode-sr-latin.c: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 "
@@ -2723,7 +2812,7 @@ msgstr ""
"stanú rovnakými."
#: 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 "
@@ -2732,16 +2821,16 @@ 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
+#: src/msgmerge.c:392 src/msgmerge.c:398
#, c-format
msgid "%s is only valid with %s"
msgstr "%s je platné len s %s"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr "typ zálohy"
-#: 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"
@@ -2765,18 +2854,18 @@ msgstr ""
"pri ktorých nemožno nájsť presnú zhodu, bude použitý fuzzy algoritmus,\n"
"ktorý dosahuje lepšie výsledky.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
" def.po preklady podľa starých zdrojových súborov\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot odkazy na nové zdrojové súbory\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2785,7 +2874,7 @@ msgstr ""
" -C, --compendium=SÚBOR prídavná knižnica prekladov správ, môže byť\n"
" zadaná viac ako raz\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2794,27 +2883,27 @@ msgstr ""
" -U, --update aktualizovať def.po,\n"
" nerobiť nič, ak def.po je aktuálny\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
-msgstr "Umiestnenie výstupného súboru v móde aktualizácie:\n"
+msgstr "Umiestnenie výstupného súboru v režime aktualizácie:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Výsledok je zapísaný späť do def.po.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTROL vytvoriť zálohu súboru def.po\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=PRÍPONA prekryť obvyklú príponu zálohy\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2832,7 +2921,7 @@ msgstr ""
" existing, nil numbered, ak existuje číslovaná záloha, inak simple\n"
" simple, never vždy vytvoriť jednoduchú zálohu\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2842,7 +2931,7 @@ msgstr ""
"Prípona zálohy je '~', pokiaľ nie je zadaná voľba --suffix alebo nastavená\n"
"premenná prostredia SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
@@ -2850,22 +2939,22 @@ msgstr ""
" --previous zachovať predchádzajúce msgid preložených "
"správ\n"
-#: 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 " -q, --quiet, --silent potlačiť indikátory postupu\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
msgstr "táto správa by mala definovať tvary množného čísla"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
msgstr "táto správa by nemala definovať tvary množného čísla"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2874,7 +2963,7 @@ 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/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2901,7 +2990,8 @@ msgid ""
" -j, --java Java mode: input is a Java ResourceBundle "
"class\n"
msgstr ""
-" -j, --java mód Java: vstup je trieda Java ResourceBundle\n"
+" -j, --java režim Java: vstup je trieda Java "
+"ResourceBundle\n"
#: src/msgunfmt.c:442
#, c-format
@@ -2922,7 +3012,7 @@ msgstr ""
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"
+" --tcl režim Tcl: vstup je súbor .msg tcl/msgcat\n"
#: src/msgunfmt.c:451
#, c-format
@@ -2932,7 +3022,7 @@ msgstr " SÚBOR ... vstupné .mo súbory\n"
#: src/msgunfmt.c:456
#, c-format
msgid "Input file location in Java mode:\n"
-msgstr "Umiestnenie vstupného súboru v móde Java:\n"
+msgstr "Umiestnenie vstupného súboru v režime Java:\n"
#: src/msgunfmt.c:462
#, c-format
@@ -2961,7 +3051,7 @@ msgstr ""
#: src/msgunfmt.c:479
#, c-format
msgid "Input file location in Tcl mode:\n"
-msgstr "Umiestnenie vstupného súboru v móde Tcl:\n"
+msgstr "Umiestnenie vstupného súboru v režime Tcl:\n"
#: src/msgunfmt.c:485
#, c-format
@@ -2984,7 +3074,7 @@ msgstr ""
" --strict zapísať súbor s presne dodržaným štýlom "
"uniforum\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -3005,12 +3095,12 @@ msgstr ""
"z prvého prekladu. Pozície v súboroch budú zlúčené. Pri použití voľby\n"
"--unique budú duplikáty potlačené.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated zobraziť len duplikáty\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -3080,27 +3170,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "nekonzistentné použitie #~"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, c-format
msgid "missing 'msgstr[]' section"
msgstr "chýba sekcia 'msgstr[]'"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, c-format
msgid "missing 'msgid_plural' section"
msgstr "chýba sekcia 'msgid_plural'"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, c-format
msgid "missing 'msgstr' section"
msgstr "chýba sekcia 'msgstr'"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "prvé množné číslo má nenulový index"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "množné číslo má nesprávny index"
@@ -3110,7 +3200,7 @@ msgstr "množné číslo má nesprávny index"
msgid "too many errors, aborting"
msgstr "vyskytlo sa príliš veľa chýb, ukončuje sa program"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:740 src/write-po.c:869
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
#, c-format
msgid "invalid multibyte sequence"
msgstr "neplatná viacznaková sekvencia"
@@ -3154,16 +3244,16 @@ msgstr "koniec riadka uprostred reťazca"
msgid "context separator <EOT> within string"
msgstr "oddeľovač kontextu <EOT> v reťazci"
-#: src/read-catalog.c:332 src/xgettext.c:1023
+#: src/read-catalog.c:318 src/xgettext.c:1046
#, c-format
msgid "this file may not contain domain directives"
msgstr "tento súbor nesmie obsahovať direktívy pre doménu"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "duplicitná definícia správy"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "toto je miesto prvého definovania"
@@ -3363,18 +3453,18 @@ msgstr "kompilácia triedy C# zlyhala, prosím skúste --verbose"
msgid "compilation of C# class failed"
msgstr "kompilácia triedy C# zlyhala"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "nie je platným názvom triedy Java: %s"
-#: 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 ""
"kompilácia triedy Java zlyhala, prosím skúste --verbose alebo nastavte $JAVAC"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr "kompilácia triedy Java zlyhala, prosím skúste nastaviť $JAVAC"
@@ -3384,13 +3474,13 @@ msgstr "kompilácia triedy Java zlyhala, prosím skúste nastaviť $JAVAC"
msgid "error while opening \"%s\" for writing"
msgstr "chyba pri otváraní súboru \"%s\" na zápis"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr "internacionalizované správy nesmú obsahovať riadiacu sekvenciu '\\%c'"
-#: src/write-po.c:1254 src/write-po.c:1383
+#: src/write-po.c:1326 src/write-po.c:1450
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3403,7 +3493,7 @@ msgstr ""
"ako vy. Zvážte namiesto toho použitie msgctxt len s ASCII znakmi.\n"
"%s\n"
-#: src/write-po.c:1266 src/write-po.c:1395
+#: src/write-po.c:1338 src/write-po.c:1462
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3482,7 +3572,7 @@ msgstr ""
"katalóg správ má preklady s množnými číslami,\n"
"ale formát katalógu správ Tcl nepodporuje množné čísla\n"
-#: src/x-awk.c:341 src/x-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 "%s:%d: upozornenie: neukončený reťazec"
@@ -3492,17 +3582,22 @@ msgstr "%s:%d: upozornenie: neukončený reťazec"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: upozornenie: neukončený regulárny výraz"
-#: 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 "upozornenie: neplatný znak Unicode"
+
+#: 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 "%s:%d: upozornenie: neukončená znaková konštanta"
-#: 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 "%s:%d: upozornenie: neukončený znakový reťazec"
-#: 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 "Prosím, zadajte kódovanie zdroja pomocou --from-code."
@@ -3556,7 +3651,7 @@ msgstr ""
"%s:%d: Neplatná viacbajtová postupnosť.\n"
"Prosím, zadajte kódovanie zdroja pomocou --from-code.\n"
-#: src/x-csharp.c:1390 src/x-python.c:1335
+#: src/x-csharp.c:1390 src/x-python.c:1138
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: upozornenie: neplatný znak Unicode"
@@ -3576,22 +3671,22 @@ msgstr "%s:%d: upozornenie: nájdené ')' tam, kde bolo očakávané '}'"
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: upozornenie: nájdené '}' tam, kde bolo očakávané ')'"
-#: src/x-glade.c:561
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
msgstr "Chýba kontext pre reťazec extrahovaný z element '%s'"
-#: 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 "Koreňový element <%s> nie je dovolený v platnom súbore Glade"
-#: 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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3654,11 +3749,21 @@ msgstr ""
"%s:%d: Neplatná viacbajtová postupnosť.\n"
"Prosím, zadajte kódovanie zdroja pomocou --from-code\n"
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: upozornenie: reťazec RegExp je ukončený príliš skoro"
+#: src/x-javascript.c:1055
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: upozornenie: %s nie je dovolené"
+
+#: src/x-javascript.c:1069
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: upozornenie: neukončená značka XML"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3786,34 +3891,39 @@ 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
+#: src/x-vala.c:413
#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr ""
"%s:%d: upozornenie: reťazec regulárneho výrazu je ukončený príliš skoro"
-#: src/xgettext.c:636
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr "'%s' nie je platný názov kódovania. Použijem ASCII namiesto neho.\n"
+
+#: src/xgettext.c:648
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"--join-existing nemožno použiť ak je výstup posielaný na štandardný výstup"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext nemôže pracovať bez kľúčových slov, ktoré má hľadať"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr "upozornenie: súbor '%s' s príponou '%s' je neznámy; skúsim C"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "Extrahovať preložiteľné reťazce zo zadaných vstupných súborov.\n"
-#: src/xgettext.c:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3822,12 +3932,12 @@ msgstr ""
" -d, --default-domain=NÁZOV použiť NÁZOV.po pre výstup (namiesto messages."
"po)\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr " -o, --output=SÚBOR zapísať výstup do zadaného súboru\n"
-#: src/xgettext.c:863
+#: src/xgettext.c:886
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
@@ -3835,12 +3945,12 @@ msgstr ""
" -p, --output-dir=ADRESÁR výstupné súbory budú umiestnené v adresári "
"ADRESÁR\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Voľba jazyka vstupného súboru:\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3850,7 +3960,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=NÁZOV použiť zadaný jazyk\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3859,21 +3969,21 @@ msgstr ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ skratka pre --language=C++\n"
-#: 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 "Štandardne je jazyk odhadnutý podľa prípony vstupného súboru\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3882,24 +3992,24 @@ msgstr ""
" --from-code=NÁZOV kódovanie vstupných súborov\n"
" (s výnimkou pre Python, Tcl, Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr "Štandardne sa predpokladá, že vstupné súbory sú v kódovaní ASCII.\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr " -j, --join-existing spojiť správy s existujúcim súborom\n"
-#: src/xgettext.c:894
+#: src/xgettext.c:917
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr ""
" -x, --exclude-file=SÚBOR.po položky zo súboru SÚBOR.po nie sú "
"extrahované\n"
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -3916,17 +4026,17 @@ msgstr ""
" predchádzajú riadky s kľúčovými slovami,\n"
" do výstupného súboru\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
-msgstr "Špecifické voľby jazyk:\n"
+msgstr "Voľby špecifické pre jednotlivé jazyky:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all extrahovať všetky reťazce\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3941,16 +4051,22 @@ msgstr ""
" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
" Lua, JavaScript, Vala)\n"
-#: 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 ""
-" -kSLOVO, --keyword=SLOVO hľadať SLOVO ako ďalšie kľúčové slovo\n"
-" -k, --keyword nepoužiť predvolené kľúčové slová)\n"
+" (len jazyky C, C++, ObjectiveC, Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+" Lua, JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3961,7 +4077,7 @@ msgstr ""
"číslo\n"
" ARG kľúčového slova SLOVO\n"
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3976,37 +4092,37 @@ msgstr ""
" C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
" Lua, JavaScript, Vala)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr " -T, --trigraphs poznať ANSI C trojznaky na vstupe\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr " (len jazyky C, C++, ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt rozoznať formát reťazcov Qt\n"
-#: 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 " (len jazyk C++)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --kde rozoznať formát reťazcov KDE 4\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --boost rozoznať formát reťazcov Boost\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
@@ -4015,19 +4131,19 @@ msgstr ""
"formátovacích\n"
" reťazcov\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output zapísať Java súbor .properties\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
" --copyright-holder=REŤAZEC nastaviť držiteľa autorských práv vo "
"výstupe\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -4035,17 +4151,17 @@ msgstr ""
" --foreign-user vynechať informáciu o autorských právach FSF\n"
" pre cudzieho používateľa\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, c-format
msgid " --package-name=PACKAGE set package name in output\n"
msgstr " --package-name=BALÍK nastaviť názov balíka vo výstupe\n"
-#: src/xgettext.c:989
+#: src/xgettext.c:1012
#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr " --package-version=VERZIA nastaviť verziu balíka vo výstupe\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
@@ -4054,7 +4170,7 @@ msgstr ""
"chýb\n"
" v msgid\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -4065,7 +4181,7 @@ msgstr ""
"predponu\n"
" pre hodnoty msgstr\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -4076,7 +4192,7 @@ msgstr ""
"príponu pre\n"
" hodnoty msgstr\n"
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4084,31 +4200,31 @@ msgid ""
msgstr ""
"Parameter pre --flag nemá tvar <kľúčové_slovo>:<č_param>:[pass-]<príznak>: %s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr "štandardný vstup"
-#: src/xgettext.c:2020
+#: src/xgettext.c:2071
#, c-format
msgid "Non-ASCII character at %s%s."
msgstr "Nie ASCII znak na %s%s."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr "Nie ASCII komentár na alebo pred %s%s."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr "Nie ASCII reťazec na %s%s."
-#: 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 "%s%s: upozornenie: "
-#: 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 "
@@ -4117,7 +4233,7 @@ msgstr ""
"Aj keď je použité v pozícii formátovacieho reťazca, %s nie je platný "
"formátovací reťazec %s. Dôvod: %s\n"
-#: src/xgettext.c:2139
+#: src/xgettext.c:2190
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4126,7 +4242,7 @@ msgstr ""
"Aj keď je to tak deklarované, %s nie je platný formátovací reťazec %s. "
"Dôvod: %s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4140,7 +4256,7 @@ msgstr ""
"Prosím, zvážte použitie formátovacieho reťazca s pomenovanými parametrami\n"
"a mapovaním namiesto zoznamu parametrov.\n"
-#: src/xgettext.c:2232
+#: src/xgettext.c:2283
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
@@ -4150,29 +4266,29 @@ msgstr ""
"gettext(\"\") vráti hlavičku s meta informáciami\n"
"a nie prázdny reťazec.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "nejednoznačne zadaný parameter pre kľúčové slovo '%.*s'"
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "upozornenie: chýbajúci kontext pre kľúčové slovo '%.*s'"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr ""
"upozornenie: chýbajúci kontext pre parameter množného čísla kľúčového slova "
"'%.*s'"
-#: src/xgettext.c:2942
+#: src/xgettext.c:3052
#, c-format
msgid "context mismatch between singular and plural form"
msgstr "nezhoda kontextu medzi jednotným a množným číslom"
-#: 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"
@@ -4184,7 +4300,7 @@ msgstr ""
"MSGID_BUGS_ADDRESS; inak prosím zadajte voľbu príkazového\n"
"riadka --msgid-bugs-address.\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, c-format
msgid "language '%s' unknown"
msgstr "jazyk '%s' je neznámy"
diff --git a/gettext-tools/po/sl.po b/gettext-tools/po/sl.po
index c5f5268..ab9a024 100644
--- a/gettext-tools/po/sl.po
+++ b/gettext-tools/po/sl.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the gettext package.
# Primož Peterlin <primozz.peterlin@gmail.com>, 1996, 1999-2003, 2006, 2007, 2011, 2013.
#
-# $Id: gettext-tools-0.18.2.sl.po,v 1.2 2013/03/09 12:26:49 peterlin Exp $
+# $Id: gettext-tools-0.18.3.sl.po,v 1.2 2013/12/11 22:24:44 peterlin Exp $
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.18.2\n"
+"Project-Id-Version: GNU gettext-tools 0.18.3\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-07-07 18:21+0900\n"
-"PO-Revision-Date: 2013-03-09 13:26+0100\n"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2013-12-11 23:24+0100\n"
"Last-Translator: Primoz PETERLIN <primozz.peterlin@gmail.com>\n"
"Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
"Language: sl\n"
@@ -184,15 +184,15 @@ msgstr "neveljaven argument source_version za compile_java_class"
msgid "invalid target_version argument to compile_java_class"
msgstr "neveljaven argument target_version za compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c: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 "ustvarjanje »%s« neuspešno"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c: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 "napaka pri pisanju na datoteko »%s«"
@@ -215,9 +215,9 @@ msgid "%s subprocess I/O error"
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/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 "zmanjkalo pomnilnika"
@@ -228,7 +228,7 @@ msgid "creation of threads failed"
msgstr "ustvarjanje niti ni uspelo"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "posredovanje podatkov podprocesu %s neuspešno"
@@ -315,8 +315,8 @@ msgid "%s subprocess got fatal signal %d"
msgstr "podproces %s prejel kritični signal %d"
#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c: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 "datoteke \"%s\" ni moč odpreti za branje"
@@ -688,7 +688,7 @@ msgstr ""
"faktorjem »%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-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'"
@@ -735,31 +735,33 @@ 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
+#: src/format-python-brace.c:137
+#, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "V direktivi številka %u, »%c« ne sledi števka."
+msgstr "V direktivi številka %u »%c« ne more začenjati imena polja."
-#: src/format-python-brace.c:149
-#, fuzzy, c-format
+#: src/format-python-brace.c:150
+#, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "V direktivi števika %u oklepaju »{« ne sledi število argumentov."
+msgstr "V direktivi števika %u »%c« ne more začenjati argumenta getattr."
-#: src/format-python-brace.c:164
-#, fuzzy, c-format
+#: src/format-python-brace.c:165
+#, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "V direktivi številka %u, »%c« ne sledi števka."
+msgstr "V direktivi številka %u »%c« ne more začenjati argumenta getitem."
-#: src/format-python-brace.c:184
-#, fuzzy, c-format
+#: src/format-python-brace.c:185
+#, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "V direktivi številka %u natančnost pred »%c« ni dovoljena."
+msgstr ""
+"V direktivi številka %u ni dovoljeno nadaljnje gnezdenje formatnega "
+"določilnika."
-#: src/format-python-brace.c:210
-#, fuzzy, c-format
+#: src/format-python-brace.c:270
+#, c-format
msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "V direktivi številka %u je argument %d negativen."
+msgstr "V direktivi številka %u je nezaključena formatna direktiva."
#: src/format-qt.c:152
#, c-format
@@ -811,11 +813,11 @@ msgid ""
"1 and 9."
msgstr "Znak, ki zaključuje direktivo številka %u, ni števka med 1 in 9."
-#: src/hostname.c:178 src/msgattrib.c: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"
@@ -828,19 +830,19 @@ msgstr ""
"To je prost program; smete ga spreminjati in deliti z drugimi.\n"
"Za program ni NOBENEGA JAMSTVA do zakonsko podanih omejitev.\n"
-#: src/hostname.c:184 src/msgattrib.c: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 "Avtor(ica) %s.\n"
#. 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 "Bruno Haible"
@@ -850,11 +852,11 @@ msgstr "Bruno Haible"
msgid "too many arguments"
msgstr "preveč argumentov"
-#: 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 "Poskusite »%s --help« za izčrpnejša navodila\n"
@@ -895,29 +897,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: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 "Informativni izpis:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help ta navodila\n"
-#: 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 " -V, --version različica programa\n"
@@ -926,11 +928,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: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 "Morebitne napake v programu sporočite na <bug-gnu-gettext@gnu.org>.\n"
@@ -939,30 +941,27 @@ 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: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 "dovoljena je največ ena vhodna datoteka"
-#: 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 "%s in %s se med seboj izključujeta"
-#: 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 "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -971,10 +970,10 @@ msgstr ""
"Filtriranje sporočil iz kataloga prevodov glede na njihova določila\n"
"in rokovanje z njimi.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c: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"
@@ -982,23 +981,23 @@ msgstr ""
"Če je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n"
"tudi za kratko obliko.\n"
-#: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
-#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
-#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
-#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
+#: src/msgattrib.c:433 src/msgcat.c: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 "Izbira vhodne datoteke:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " VHODNA_DATOTEKA vhodna datoteka PO\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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"
@@ -1006,31 +1005,31 @@ msgstr ""
" -D, --directory=IMENIK vhodne datoteke iščemo tudi v navedenem "
"IMENIKU\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c: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 ""
"Če vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n"
-#: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
-#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
-#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
-#: src/xgettext.c:857
+#: src/msgattrib.c:442 src/msgcat.c: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 "Izbira izhodne datoteke:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 " -o, --output-file=DATOTEKA izhod zapisujemo v navedeno DATOTEKO\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1040,12 +1039,12 @@ msgstr ""
"standardni\n"
"izhod.\n"
-#: 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 "Izbira sporočil:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
@@ -1053,7 +1052,7 @@ msgstr ""
" --translated obdržimo prevedena sporočila, zavržemo "
"neprevedena\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
@@ -1061,58 +1060,58 @@ msgstr ""
" --untranslated obdržimo neprevedena sporočila, zavržemo "
"prevedena\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr ""
" --no-fuzzy brez ohlapnih samodejno prevedenih sporočil\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr ""
" --only-fuzzy zgolj ohlapna samodejno prevedena sporočila\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete brez zastarelih (#~) sporočil\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete zgolj zastarela (#~) sporočila\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Rokovanje z določili:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr ""
" --set-fuzzy vsa sporočila označimo kot ohlapno pprevedena\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr ""
" --clear-fuzzy izbrišemo vse oznake o ohlapnosti prevodov\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr " --set-obsolete vsa sporočila označimo kot zastarela\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr ""
" --clear-obsolete izbrišemo vse oznake o zastarelosti prevodov\n"
-#: src/msgattrib.c:468
-#, fuzzy, c-format
+#: src/msgattrib.c:475
+#, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
" of translated messages.\n"
@@ -1120,7 +1119,7 @@ msgstr ""
" --previous obdržimo prejšnja polja msgid prevedenih "
"sporočil\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
@@ -1129,14 +1128,21 @@ msgstr ""
" --clear-previous izbrišemo oznake \"previous msgid\" iz vseh "
"sporočil\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, fuzzy, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+" --no-fuzzy brez ohlapnih samodejno prevedenih sporočil\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
msgstr ""
" --only-file=DATOTEKA.po obdelamo le vnose, navedene v DATOTEKI.po\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
@@ -1144,28 +1150,28 @@ msgstr ""
" --ignore-file=DATOTEKA.po obdelamo vnose razen navedenih v DATOTEKI."
"po\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr " --fuzzy isto kot --only-fuzzy --clear-fuzzy\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
msgstr ""
" --obsolete isto kot --only-obsolete --clear-obsolete\n"
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c: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 "Skladnja vhodne datoteke:\n"
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c: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"
@@ -1173,8 +1179,8 @@ msgstr ""
" -P, --properties-input skladnja vhodne datoteke je javanska ."
"properties\n"
-#: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
-#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c: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 "
@@ -1183,17 +1189,17 @@ msgstr ""
" --stringtable-input skladnja vhodne datoteke je NeXTstep/GNUstep ."
"strings\n"
-#: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
-#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
-#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
-#: src/xgettext.c:946
+#: src/msgattrib.c:498 src/msgcat.c: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 "Podrobnosti izpisa:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1209,16 +1215,16 @@ msgstr ""
"»auto«\n"
" ali »html«\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=DATOTEKA-CSS določi slogovna pravila CSS za --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
+#: 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"
@@ -1226,9 +1232,9 @@ msgstr ""
" -e, --no-escape brez ubežnih sekvenc v skladnji jezika C "
"(privzeto)\n"
-#: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
-#: src/msguniq.c:390 src/xgettext.c:956
+#: src/msgattrib.c:508 src/msgcat.c: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"
@@ -1236,28 +1242,28 @@ msgstr ""
" -E, --escape z ubežnimi sekvencami v skladnji C, brez \n"
" razširjenega nabora znakov\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr " --force-po vedno izpišemo datoteko PO, četudi prazno\n"
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr " -i, --indent izpis datoteke PO z zamiki\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
" --no-location brez vrstic »#: datoteka:vrstica« v izpisu\n"
-#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:964
+#: src/msgattrib.c:516 src/msgcat.c: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"
@@ -1265,8 +1271,8 @@ msgstr ""
" -n, --add-location z vrsticami »#: datoteka:vrstica« v izpisu "
"(privzeto)\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c: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"
@@ -1274,32 +1280,32 @@ msgstr ""
" --strict izpis v strogi obliki Uniforum, brez razširitev "
"GNU\n"
-#: src/msgattrib.c:511 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
-#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
-#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
+#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
+#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output zapiši javansko datoteko .properties\n"
-#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
-#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
" --stringtable-output zapiši NeXTstep/GNUstep datoteko .strings\n"
-#: src/msgattrib.c:515 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
-#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
-#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:972
+#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
+#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=ŠTEVILO širina strani pri izpisu, v znakih\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c: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"
@@ -1307,32 +1313,32 @@ msgid ""
msgstr ""
" --no-wrap brez deljenja dolgih sporočil v več vrstic\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output izhod abecedno urejen po sporočilih\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 ""
" -F, --sort-by-file izhod abecedno urejen po izvornih datotekah\n"
-#: 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 "določeni kriteriji izbire niso mogoči (%d < n < %d)"
-#: 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 "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1354,26 +1360,26 @@ 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:848
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr ""
" VHODNA_DATOTEKA ... vhodna datoteka (ali več vhodnih datotek)\n"
-#: 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 ""
" -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: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 "Če je vhodna datoteka enaka -, se bere standardni vhod.\n"
-#: 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"
@@ -1383,7 +1389,7 @@ msgstr ""
"definicij\n"
" (privzeta vrednost je neskončno)\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1393,7 +1399,7 @@ msgstr ""
"definicij\n"
" (privzeta vrednost je 1)\n"
-#: 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"
@@ -1402,8 +1408,8 @@ msgstr ""
" -u, --unique okrajšava za --less-than=2, izpišemo samo\n"
" enolično definirana sporočila\n"
-#: 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"
@@ -1411,8 +1417,8 @@ 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
+#: 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"
@@ -1421,12 +1427,12 @@ msgstr ""
" --stringtable-input skladnja vhodnih datotek je NeXTstep/GNUstep \n"
" .strings\n"
-#: 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 " -t, --to-code=NABOR nabor znakov izhodne datoteke\n"
-#: 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"
@@ -1435,28 +1441,28 @@ msgstr ""
" --use-first uporabimo prvi prevod sporočila, na katerega\n"
" naletimo; ne združujemo več prevodov\n"
-#: 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 " --lang=KATALOG nastavi polje 'Language' v zaglavju\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "vhodni datoteki nista podani"
-#: 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 "potrebni sta natančno dve vhodni datoteki"
-#: 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 "Uporaba: %s [IZBIRA] def.po ref.po\n"
@@ -1488,12 +1494,12 @@ msgstr " def.po prevodi\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot sklici na vire\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "Modifikatorji delovanja:\n"
-#: 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."
@@ -1501,7 +1507,7 @@ msgid ""
msgstr ""
" -m, --multi-domain ref.po uporabimo na vseh domenah iz def.po\n"
-#: 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 " -N, --no-fuzzy-matching ne uporabljamo ohlapnega ujemanja\n"
@@ -1527,17 +1533,17 @@ msgstr "to sporočilo ni prevedeno"
msgid "this message needs to be reviewed by the translator"
msgstr "to sporočilo mora pregledati prevajalec"
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1505
#, c-format
msgid "this message is used but not defined..."
msgstr "to sporočilo je uporabljeno, a ne definirano..."
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1508
#, c-format
msgid "...but this definition is similar"
msgstr "...a ta definicija je podobna"
-#: 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 "to sporočilo je uporabljeno, a ne definirano v %s"
@@ -1547,7 +1553,7 @@ msgstr "to sporočilo je uporabljeno, a ne definirano v %s"
msgid "warning: this message is not used"
msgstr "opozorilo: to sporočilo ni uporabljeno"
-#: src/msgcmp.c:553 src/msgfmt.c: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"
@@ -1556,12 +1562,12 @@ msgstr[1] "%d kritična napaka"
msgstr[2] "%d kritični napaki"
msgstr[3] "%d kritične napake"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "podani morata biti vsaj dve datoteki"
-#: 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"
@@ -1580,7 +1586,7 @@ msgstr ""
"pri izvlačenju se ohranijo samo iz prve datoteke PO, ki jih definira. Položaji\n"
"nizov v datotekah se ohranijo iz vseh datotek PO.\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1590,72 +1596,72 @@ msgstr ""
"definicij\n"
" (privzeta vrednost je 1)\n"
-#: 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 " --omit-header brez glave z vnosom »msgid \"\"«\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr "Pretvarjanje kataloga sporočil v drug kodni nabor.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Cilj pretvorbe:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Privzeta vrednost je kodni nabor izbrane krajevne nastavitve.\n"
-#: src/msgconv.c: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 " -i, --indent izpis datoteke PO z zamiki\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\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
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
+#: src/msgmerge.c:588
+#, fuzzy, c-format
msgid ""
-" --add-location preserve '#: filename:line' lines (default)\n"
+" -n, --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
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
" --strict izpis v strogi obliki Uniforum brez "
"razširitev\n"
-#: 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 "vhodna datoteka ni podana"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "zahtevana je natančno ena vhodna datoteka"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Uporaba: %s [IZBIRA] VHODNA_DATOTEKA\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1668,7 +1674,7 @@ msgstr ""
"ukazom xgettext). Neprevedenim sporočilom se pripiše prevod, enak izvirniku\n"
"msgid.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " VHODNA_DATOTEKA vhodna datoteka PO\n"
@@ -1706,7 +1712,7 @@ msgstr ""
"Poseben vgrajen ukaz »0« izpiše prevod in izpis zaključi z znakom s kodo nič.\n"
"Izhod ukaza \"msgexec 0\" je primeren kot vhod za ukaz \"xargs -0\".\n"
-#: src/msgexec.c:281 src/msgfilter.c:401
+#: src/msgexec.c:281 src/msgfilter.c:420
#, c-format
msgid " -i, --input=INPUTFILE input PO file\n"
msgstr " -i, --input=DATOTEKA vhodna datoteka PO\n"
@@ -1716,27 +1722,27 @@ msgstr " -i, --input=DATOTEKA vhodna datoteka PO\n"
msgid "write to stdout failed"
msgstr "izpis na standardni izhod neuspešen"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "manjka ime filtra"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr "podan mora biti vsaj en skript v sed"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Uporaba: %s [IZBIRA] FILTER [IZBIRA-FILTRA]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "Na vsakem prevodu iz kataloga uporabimo dani filter.\n"
-#: src/msgfilter.c:416
+#: src/msgfilter.c:435
#, c-format
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
@@ -1745,18 +1751,18 @@ msgstr ""
"FILTER je lahko ime kateregakoli programa, ki prebere prevod s standardnega\n"
"vhoda in izpiše spremnjen prevod na standardni izhod.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "Uporabne IZBIRE FILTRA, kadar je FILTER »sed«:\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
msgstr " -e, --expression=SKRIPT dodaj SKRIPT med ukaze, ki se izvedejo\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1766,14 +1772,14 @@ msgstr ""
" -f, --file=SKRIPTNA_DATOTEKA dodaj vsebino SKRIPTNE DATOTEKE med ukaze,\n"
" ki se izvedejo\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
" -n, --quiet, --silent brez samodejnega izpisa prostora vzorcev\n"
-#: src/msgfilter.c: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"
@@ -1781,62 +1787,84 @@ msgstr ""
" --no-escape brez ubežnih sekvenc v skladnji jezika C "
"(privzeto)\n"
-#: 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 " --indent izpis datoteke PO z zamiki\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
msgstr ""
" --keep-header ohrani glavo nespremenjeno, ne filtriraj je\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "argument %s mora biti eno samo ločilo"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
msgstr "neveljaven vrstni red bajtov: %s"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c: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 "Ulrich Drepper"
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:439
+#, fuzzy, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr ""
+"Če vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n"
+
+#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
#: src/msgunfmt.c:353
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s zahteva določitev \"-d directory\""
-#: 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 "%s zahteva določitev \"-l locale\""
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:538
+#, fuzzy, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s zahteva določitev \"-l locale\""
+
+#: src/msgfmt.c:545
+#, fuzzy, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s zahteva določitev \"-l locale\""
+
+#: src/msgfmt.c:551
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s in %s se med seboj izključujeta"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s je veljavno edino z %s ali %s"
-#: 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 "%s je veljavno edino z %s, %s ali %s"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
@@ -1845,7 +1873,7 @@ msgstr[1] "%d prevedeno sporočilo"
msgstr[2] "%d prevedeni sporočili"
msgstr[3] "%d prevedena sporočila"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
@@ -1854,7 +1882,7 @@ msgstr[1] ", %d ohlapni prevod"
msgstr[2] ", %d ohlapna prevoda"
msgstr[3] ", %d ohlapni prevodi"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
@@ -1863,17 +1891,17 @@ msgstr[1] ", %d neprevedeno sporočilo"
msgstr[2] ", %d neprevedeni sporočili"
msgstr[3] ", %d neprevedena sporočila"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Uporaba: %s [IZBIRA] datoteka.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "Besedilni opis prevodov pretvorimo v binarni katalog sporočil.\n"
-#: src/msgfmt.c: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"
@@ -1882,17 +1910,17 @@ msgstr ""
"Če je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n"
"tudi za kratko obliko. Enako za neobvezne argumente.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
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:890
+#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Način delovanja:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1901,7 +1929,7 @@ msgstr ""
" -j, --java javanski način: ustvarimo javanski razred\n"
" ResourceBundle\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1910,12 +1938,12 @@ msgstr ""
" --java2 kot --java, privzeta je java2 (JDK 1.2 ali "
"več)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr " --csharp način C#: ustvarimo .NET-datoteko .dll\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -1923,43 +1951,49 @@ msgid ""
msgstr ""
" --csharp-resources način C#: ustvarimo .NET-datoteko z viri\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
" --tcl način tcl: ustvarimo datoteko tcl/msgcat .msg\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt način Qt: ustvarimo datoteko .qm za Qt\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, fuzzy, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr " --qt način Qt: ustvarimo datoteko .qm za Qt\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
" --strict izpis v strogi obliki Uniforum brez razširitev "
"GNU\n"
-#: 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 ""
"Če je izhodna datoteka enaka -, se rezultat izpiše na standardni izhod.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Izbira izhodne datoteke v javanskem načinu:\n"
-#: 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 " -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
+#: 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 "
@@ -1967,13 +2001,21 @@ msgid ""
msgstr ""
" -l, --locale=JJ_DD jezikovno okolje (jezik ali jezik_država)\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, fuzzy, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --tcl način tcl: vhod je datoteka tcl/msgcat .msg\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr " -d IMENIK korenski imenik hierarhije razredov\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1987,12 +2029,12 @@ msgstr ""
"podani\n"
"imenik.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "Položaj izhodne datoteke v načinu C#:\n"
-#: 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 "
@@ -2001,7 +2043,7 @@ msgstr ""
" -d IMENIK korenski imenik za krajevno odvisne datoteke ."
"dll\n"
-#: 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"
@@ -2010,17 +2052,17 @@ msgstr ""
"Izbiri -l in -d sta obvezni. Datoteka .dll se zapiše v podimenik podanega\n"
"imenika; ime podimenika ustreza oznaki izbrane krajevne prilagoditve.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Izbira izhodne datoteke v načinu tcl:\n"
-#: 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 " -d IMENIK korenski imenik hierarhije razredov\n"
-#: 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"
@@ -2028,12 +2070,44 @@ msgid ""
msgstr ""
"Izbiri -l in -d sta obvezni. Datoteka .msg se zapiše v podani imenik.\n"
-#: 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
+#, fuzzy, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr " -d IMENIK korenski imenik hierarhije razredov\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -kBESEDA, --keyword=BESEDA uporabi BESEDO kot dodatno ključo besedo\n"
+" -k, --keyword[=BESEDA] ne uporabljaj privzetih ključnih besed\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "Interpretacija vhodne datoteke:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -2044,20 +2118,20 @@ msgstr ""
" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format preverimo od jezika odvisne formatne nize\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
msgstr " --check-header preverimo obstoj in vsebino glave\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -2066,7 +2140,7 @@ msgstr ""
" --check-domain preverimo morebitna nesoglasja med direktivo\n"
" domene in izbiro --output-file\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2075,7 +2149,7 @@ msgstr ""
" -C, --check-compatibility preverimo združljivost GNU gettext z X/Open "
"msgfmt\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -2085,13 +2159,13 @@ msgstr ""
" --check-accelerators[=ZNAK] preverimo, ali obstajajo bližnjice za\n"
" menujske izbire\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr ""
" -f, --use-fuzzy uporabimo ohlapne samodejno prevedene prevode\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
@@ -2099,7 +2173,7 @@ msgstr ""
" -a, --alignment=ŠTEVILO poravnava nizov na dano ŠTEVILO bajtov "
"(privzeto %d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2113,7 +2187,7 @@ msgstr ""
"strojnega\n"
" okolja)\n"
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
@@ -2121,79 +2195,89 @@ msgstr ""
" --no-hash binarni katalog sporočil bo brez razpršene "
"tabele\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics s statistiko glede prevodov\n"
-#: 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 " -v, --verbose z dodatnimi sporočili med izvajanjem\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "opozorilo: glava datoteke PO ni veljavna ali pa manjka\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "opozorilo: pretvorba v navedeni nabor znakov ne bo delovala\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "opozorilo: glava datoteke PO ni razberljiva\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "opozorilo: starejše izdaje msgfmt bodo pri tem javile napako\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "ime domene \"%s\" ni primerno kot ime datoteke"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "ime domene \"%s\" ni primerno kot ime datoteke: uporabimo predpono"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, c-format
msgid "'domain %s' directive ignored"
msgstr "direktiva »domain %s« ni bila upoštevana"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "prazno polje »msgstr« ni bilo upoštevano"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "ohlapni vnos za polje »msgstr« ni bil upoštevan"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: opozorilo: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c: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 "napaka pri branju \"%s\""
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2201,7 +2285,7 @@ msgid ""
msgstr ""
"izbire »%c« ni moč uporabiti, preden je izbrano »J«, »K«, »T«, »C« ali »X«"
-#: 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"
@@ -2210,7 +2294,7 @@ msgstr ""
"Izvlečemo vsa sporočila iz kataloga prevodov, ki ustrezajo danemu vzorcu ali\n"
"pripadajo dani izvorni datoteki.\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2291,7 +2375,7 @@ msgstr ""
" -v, --invert-match izpiši le sporočila, ki ne ustrezajo nobenemu\n"
" od podanih kriterijev\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2299,12 +2383,12 @@ msgstr ""
" --escape z ubežnimi sekvencami v skladnji C, brez \n"
" razširjenega nabora znakov\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output izhod abecedno urejen po sporočilih\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
@@ -2469,7 +2553,7 @@ msgstr "ciljni nabor \"%s\" ni prenosljivo ime kodnega nabora."
#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:3051
+#: src/xgettext.c:544 src/xgettext.c:3418
#, c-format
msgid "warning: "
msgstr "opozorilo: "
@@ -2692,17 +2776,17 @@ msgstr "rokovanje z množinskimi oblikami je razširitev GNU gettext"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "v msgstr manjka oznaka bližnjice »%c«"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "v msgstr je preveč oznak bližnjic »%c«"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, 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
+#: src/msgl-check.c:820
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "v glavi manjka polje »%s«\n"
@@ -2722,7 +2806,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
msgstr "v vhodni datoteki manjka glava z določilom kodnega nabora"
#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c: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 "
@@ -2741,7 +2825,7 @@ msgstr ""
"msgid postanejo enaki."
#: 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 "
@@ -2750,16 +2834,16 @@ 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
+#: src/msgmerge.c:392 src/msgmerge.c:398
#, c-format
msgid "%s is only valid with %s"
msgstr "%s je veljavno edino z %s"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr "vrsta varnostne kopije"
-#: 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"
@@ -2782,17 +2866,17 @@ msgstr ""
"pa bodo strojno ustvarjeni komentarji in podatki o številki vrstice. Kjer\n"
"natančnega prevoda ni, se uporabi ohlapni (fuzzy) algoritem.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po prevodi\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot sklici na vire\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2802,7 +2886,7 @@ msgstr ""
"navedemo\n"
" lahko več kot eno\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2811,29 +2895,29 @@ msgstr ""
" -U, --update posodobi def.po,\n"
" če je def.po že posodobljen, ne stori nič\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Mesto izhodne datoteke v posodobitvenem načinu:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Rezultat se zapiše nazaj v datoteko def.po.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr ""
" --backup=TIP izdelamo varnostno kopijo datoteke def.po\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
" -S, --suffix=PRIPONA pripona varnostne kopije naj bo PRIPONA\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2852,7 +2936,7 @@ msgstr ""
" sicer enostavne\n"
" simple, never vedno enostavne varnostne kopije\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2862,7 +2946,7 @@ msgstr ""
"Varnostna kopija ima pripono »~«, razen če ni z izbiro --suffix ali\n"
"spremenljivko SIMPLE_BACKUP_SUFFIX nastavljeno drugače. \n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
@@ -2870,22 +2954,22 @@ msgstr ""
" --previous obdržimo prejšnja polja msgid prevedenih "
"sporočil\n"
-#: 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 " -q, --quiet, --silent brez kazalnika poteka\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
msgstr "pri tem sporočilu bi morale biti določene množinske oblike"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
msgstr "pri tem sporočilu ne bi smele biti določene množinske oblike"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2894,7 +2978,7 @@ 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/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -3005,7 +3089,7 @@ msgid " --strict write strict uniforum style\n"
msgstr ""
" --strict izpis v strogi obliki Uniforum, brez razširitev\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -3026,12 +3110,12 @@ msgstr ""
"ohranijo le komentarji prvega prevoda. Ohranijo se vsi podatki o mestu\n"
"sporočila v izvorni datoteki. Z izbiro --unique se podvojena sporočila zavržejo.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated izpišemo le podvojena sporočila\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -3101,27 +3185,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "neskladna raba #~"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, c-format
msgid "missing 'msgstr[]' section"
msgstr "manjkajoč razdelek »msgstr[]«"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, c-format
msgid "missing 'msgid_plural' section"
msgstr "manjkajoč razdelek »msgid_plural«"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, c-format
msgid "missing 'msgstr' section"
msgstr "manjkajoč razdelek »msgstr«"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "prva množinska oblika ima indeks različen od nič"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "množinska oblika ima napačen indeks"
@@ -3131,7 +3215,7 @@ msgstr "množinska oblika ima napačen indeks"
msgid "too many errors, aborting"
msgstr "preveč napak, nadaljevanje ni možno"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c: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 "neveljavno večzložno zaporedje"
@@ -3175,16 +3259,16 @@ 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:1023
+#: src/read-catalog.c:318 src/xgettext.c:1046
#, c-format
msgid "this file may not contain domain directives"
msgstr "ta datoteka morda ne vsebuje direktiv domene"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "podvojena definicija sporočila"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "to je kraj prve definicije"
@@ -3384,19 +3468,19 @@ msgstr "prevajanje razreda C# neuspešno, poskusite z --verbose"
msgid "compilation of C# class failed"
msgstr "prevajanje razreda C# neuspešno"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "ni veljavno javansko ime razreda: %s"
-#: 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 ""
"prevajanje javanskega razreda neuspešno, uporabite --verbose ali nastavite "
"$JAVAC"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr "prevajanje javanskega razreda neuspešno, poskusite nastaviti $JAVAC"
@@ -3406,14 +3490,14 @@ msgstr "prevajanje javanskega razreda neuspešno, poskusite nastaviti $JAVAC"
msgid "error while opening \"%s\" for writing"
msgstr "napaka pri odpiranju \"%s\" za pisanje"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr ""
"internacionalizirana sporočila ne smejo vsebovati ubežne sekvence »\\%c«"
-#: src/write-po.c: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"
@@ -3427,7 +3511,7 @@ msgstr ""
"vi. Razmislite o uporabi sporočil v naboru znakov ASCII.\n"
"%s\n"
-#: 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"
@@ -3509,7 +3593,7 @@ msgstr ""
"katalog sporočil vsebuje množinske oblike, vendar katalog sporočil TCL\n"
"ne podpira množinskih oblik\n"
-#: src/x-awk.c:341 src/x-javascript.c: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 "%s:%d: opozorilo: nezaključen niz"
@@ -3519,17 +3603,22 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, fuzzy, c-format
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: opozorilo: neveljavni unikodni znak"
+
+#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: opozorilo: nezaključena znakovna konstanta"
-#: 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 "%s:%d: opozorilo: nezaključen niz"
-#: 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 "Prosim, določite vhodni nabor znakov z izbiro --from-code."
@@ -3583,7 +3672,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:1335
+#: src/x-csharp.c:1390 src/x-python.c:1138
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: opozorilo: neveljavni unikodni znak"
@@ -3605,22 +3694,22 @@ msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr ""
"%s:%d: opozorilo: zaviti zaklepaj »}« na mestu, kjer pričakujemo zaklepaj »)«"
-#: src/x-glade.c:561
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
+msgstr "Manjkajoči kontekst za niz, izvlečen iz elementa »%s«"
-#: 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 ""
+msgstr "Krovni element <%s> ni dovoljen v veljavni datoteki glade"
-#: 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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3635,58 +3724,67 @@ 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."
+msgstr "Prosim, določite vhodni nabor znakov z izbiro --from-code\n"
#: src/x-javascript.c:275
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
"%s:%d: Neveljavno večbajtno zaporedje.\n"
-"Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
+"Prosim, določite vhodni nabor znakov z izbiro --from-code\n"
#: src/x-javascript.c:291
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
"%s:%d: Nepopolno dolgo večbajtno zaporedje.\n"
-"Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
+"Prosim, določite vhodni nabor znakov z izbiro --from-code\n"
#: src/x-javascript.c:303
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of file.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
"%s:%d: Nezaključeno večbajtno zaporedje na koncu datoteke.\n"
-"Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
+"Prosim, določite vhodni nabor znakov z izbiro --from-code\n"
#: src/x-javascript.c:312
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of line.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
"%s:%d: Nezaključeno večbajtno zaporedje na koncu vrstice.\n"
-"Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
+"Prosim, določite vhodni nabor znakov z izbiro --from-code\n"
#: src/x-javascript.c:344
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the source encoding through --from-code\n"
msgstr ""
"%s:%d: Neveljavno večbajtno zaporedje.\n"
-"Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
+"Prosim, določite vhodni nabor znakov z izbiro --from-code\n"
-#: src/x-javascript.c:1147
-#, fuzzy, c-format
+#: src/x-javascript.c:954
+#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: opozorilo: RegExp literal prekinjen predčasno"
+
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: opozorilo: neveljavni unikodni znak"
+
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
msgstr "%s:%d: opozorilo: nezaključen niz"
#: src/x-perl.c:308
@@ -3822,33 +3920,38 @@ msgstr ""
"%s:%lu: opozorilo: skladnja $\"...\" je odsvetovana iz varnostnih razlogov, "
"uporabite raje eval_gettext"
-#: src/x-vala.c:558
-#, fuzzy, c-format
+#: src/x-vala.c:413
+#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: opozorilo: nezaključen niz"
+msgstr "%s:%d: opozorilo: regularni izraz prekinjen predčasno"
-#: 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 "pri izpisu na standardni izhod ne moremo uporabiti --join-existing"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, 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:785
+#: src/xgettext.c:808
#, 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"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "Iz vhodnih datotek izvlečemo prevedljive nize znakov.\n"
-#: src/xgettext.c:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3856,25 +3959,25 @@ msgid ""
msgstr ""
" -d, --default-domain=DOMENA namesto messages.po je privzeta DOMENA.po\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr ""
" -o, --output-file=DATOTEKA izhod zapisujemo v navedeno DATOTEKO\n"
-#: src/xgettext.c:863
+#: src/xgettext.c:886
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr ""
" -p, --output-dir=IMENIK izhodne datoteke pišemo v navedeni IMENIK\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Izbira vhodnega jezika:\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, fuzzy, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3884,7 +3987,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=JEZIK obravnavaj vhodno datoteko v danem JEZIKU\n"
" (C, C++, predmetni C, PO, ukazna lupina,\n"
@@ -3894,21 +3997,21 @@ msgstr ""
"awk,\n"
" YCP, TCL, perl, PHP, GCC-vir, "
"NXStringTable,\n"
-" RST, glade)\n"
+" RST, glade, lua, javascript, vala)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ okrajšava za --language=C++\n"
-#: 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 "Privzeto se jezik poskusi uganiti iz pripone vhodne datoteke.\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3917,24 +4020,24 @@ msgstr ""
" --from-code=NABOR nabor znakov vhodnih datotek\n"
" (razen za Python, Tcl in Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, 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:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
" -j, --join-existing združi sporočila z obstoječo datoteko\n"
-#: src/xgettext.c:894
+#: src/xgettext.c:917
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr ""
" -x, --exclude-file=DATOTEKA.po vnosov iz navedene DATOTEKE ne izvlečemo\n"
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -3949,18 +4052,18 @@ msgstr ""
" -c, --add-comments postavi vse komentarje pred vrsticami s \n"
" ključnimi besedami v izhodno datoteko\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Izbire, specifične za jezik:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all iz datotek potegnemo vse nize\n"
-#: src/xgettext.c:906 src/xgettext.c:914
-#, fuzzy, c-format
+#: src/xgettext.c:929
+#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, "
@@ -3972,18 +4075,28 @@ msgstr ""
"lupina,\n"
" python, lisp, emacs lisp, librep, scheme, "
"java,\n"
-" C#, awk, TCL, perl, PHP, GCC-vir, glade)\n"
+" C#, awk, TCL, perl, PHP, GCC-vir, glade, "
+"lua,\n"
+" javascript, vala)\n"
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:937
+#, fuzzy, 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 ""
-" -kBESEDA, --keyword=BESEDA uporabi BESEDO kot dodatno ključo besedo\n"
-" -k, --keyword[=BESEDA] ne uporabljaj privzetih ključnih besed\n"
+" (samo jeziki C, C++, predmetni C, ukazna "
+"lupina,\n"
+" python, lisp, emacs lisp, librep, scheme, "
+"java,\n"
+" C#, awk, TCL, perl, PHP, GCC-vir, glade, "
+"lua,\n"
+" javascript, vala)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3993,8 +4106,8 @@ msgstr ""
" --flag=BESEDA:ARG:STIKALO dodatno stikalo za nize znotraj argumenta\n"
" številka ARG ključne besede BESEDA\n"
-#: src/xgettext.c:922
-#, fuzzy, c-format
+#: src/xgettext.c:945
+#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, "
@@ -4006,39 +4119,40 @@ msgstr ""
"lupina,\n"
" python, lisp, emacs lisp, librep, scheme, "
"java,\n"
-" C#, awk, YCP, TCL, perl, PHP, GCC-vir)\n"
+" C#, awk, YCP, TCL, perl, PHP, GCC-vir, lua,\n"
+" javascript, vala)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, 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:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr " (samo jeziki C, C++ in predmetni C)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt prepoznaj oblikovne nize Qt\n"
-#: 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 " (samo jezik C++)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --kde prepoznaj oblikovne nize KDE 4\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --boost prepoznaj oblikovne nize Boost\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
@@ -4046,19 +4160,19 @@ msgstr ""
" --debug bolj razčlenjen rezultat razpoznave\n"
" oblikovnega niza\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output zapiši javansko datoteko .properties\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
" --copyright-holder=NIZ v izhodu nastavimo nosilca avtorskih pravic "
"na NIZ\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -4066,18 +4180,18 @@ msgstr ""
" --foreign-user brez copyrighta FSF v izpisu za tuje "
"uporabnike\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, 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:989
+#: src/xgettext.c:1012
#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr ""
" --package-version=NIZ v izhodu nastavimo različico paketa na NIZ\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
@@ -4085,7 +4199,7 @@ msgstr ""
" --msgid-bugs-address=EPOŠTA@NASLOV naslov za sporočila o napakah "
"msgid\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -4095,7 +4209,7 @@ msgstr ""
" -m[NIZ], --msgstr-prefix[=NIZ] uporabi NIZ ali \"\" kot predpono za "
"msgstr\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -4104,7 +4218,7 @@ msgid ""
msgstr ""
" -m[NIZ], --msgstr-prefix[=NIZ] uporabi NIZ ali \"\" kot pripono za msgstr\n"
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4112,31 +4226,31 @@ msgid ""
msgstr ""
"Argument --flag nima skladnje <ključna-beseda>:<št-arg>:[pass-]<stikalo>: %s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr "standardni vhod"
-#: src/xgettext.c:2020
+#: src/xgettext.c:2071
#, c-format
msgid "Non-ASCII character at %s%s."
msgstr "Ne-ASCII znak pri %s%s."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr "Ne-ASCII komentar pri ali okoli %s%s."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr "Ne-ASCII niz pri %s%s."
-#: 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 "%s%s: opozorilo: "
-#: 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 "
@@ -4145,7 +4259,7 @@ msgstr ""
"Čeprav je uporabljen na mestu oblikovnega niza, %s ni veljaven oblikovni niz "
"%s. Razlog: %s\n"
-#: 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: "
@@ -4154,7 +4268,7 @@ msgstr ""
"Čeprav je deklariran kot tak, %s ni veljaven oblikovni niz za %s. Razlog: "
"%s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4167,7 +4281,7 @@ msgstr ""
"Prosimo, razmislite o uporabi oblikovnega niza s poimenovanimi argumenti\n"
"ter preslikave namesto n-terčka argumentov.\n"
-#: 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"
@@ -4177,28 +4291,28 @@ msgstr ""
"gettext(\"\") vrne glavo z metapodatki, ne pa\n"
"praznega niza.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "dvoumno določen argument za ključno besede »%.*s«"
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "opozorilo: manjkajoči kontekst za ključno besedo »%.*s«"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr ""
"opozorilo: manjkajoči kontekst za množinski argument ključne besede »%.*s«"
-#: src/xgettext.c:2942
+#: src/xgettext.c:3052
#, c-format
msgid "context mismatch between singular and plural form"
msgstr "neujemanje kontekstov med edninsko in množinsko obliko"
-#: 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"
@@ -4210,7 +4324,7 @@ msgstr ""
"spremenljivko MSGID_BUGS_ADDRESS tam, sicer pa \n"
"z izbiro --msgid-bugs-address v ukazni vrstici.\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, c-format
msgid "language '%s' unknown"
msgstr "jezik »%s« ni poznan"
diff --git a/gettext-tools/po/sr.po b/gettext-tools/po/sr.po
index 28ee09e..9276976 100644
--- a/gettext-tools/po/sr.po
+++ b/gettext-tools/po/sr.po
@@ -1,31 +1,33 @@
-# Serbian translation of gettext-tools
+# Serbian translation of gettext-tools, 2003—2014.
# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-# Danilo Segan <dsegan@gmx.net>, 2003, 2004.
-#
+# This file is distributed under the same license as the gettext package.
+# Danilo Segan <dsegan@gmx.net>, 2003—2004.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2013—2014.
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.14\n"
+"Project-Id-Version: gettext-tools-0.19-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2014-05-12 21:59+0200\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+"Language-Team: Serbian <(nothing)>\n"
"Language: sr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1\n"
#: gnulib-lib/argmatch.c:133
-#, fuzzy, c-format
+#, c-format
msgid "invalid argument %s for %s"
-msgstr "неисправан аргумент „%s“ за %s"
+msgstr "неисправан аргумент „%s“ за „%s“"
#: gnulib-lib/argmatch.c:134
-#, fuzzy, c-format
+#, c-format
msgid "ambiguous argument %s for %s"
-msgstr "неједнозначан аргумент „%s“ за %s"
+msgstr "нејасан аргумент „%s“ за „%s“"
#: gnulib-lib/argmatch.c:153
msgid "Valid arguments are:"
@@ -34,54 +36,55 @@ 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
msgid "cannot create a temporary directory using template \"%s\""
-msgstr "не могу да направим привремени директоријум помоћу шаблона „%s“"
+msgstr "не могу да направим привремени директоријум користећи шаблон „%s“"
#: gnulib-lib/clean-temp.c:442
-#, fuzzy, c-format
+#, c-format
msgid "cannot remove temporary file %s"
-msgstr "не могу да направим излазну датотеку „%s“"
+msgstr "не могу да уклоним привремену датотеку „%s“"
#: gnulib-lib/clean-temp.c:457
-#, fuzzy, c-format
+#, c-format
msgid "cannot remove temporary directory %s"
-msgstr "не могу да направим привремени директоријум помоћу шаблона „%s“"
+msgstr "не могу да уклоним привремени директоријум „%s“"
#: gnulib-lib/closeout.c:66
msgid "write error"
-msgstr "грешка уписа"
+msgstr "грешка писања"
#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
#, c-format
msgid "preserving permissions for %s"
-msgstr ""
+msgstr "причувавам овлашћења за %s"
#: gnulib-lib/copy-file.c:194
-#, fuzzy, c-format
+#, c-format
msgid "error while opening %s for reading"
msgstr "грешка приликом отварања „%s“ за читање"
#: gnulib-lib/copy-file.c:198
-#, fuzzy, c-format
+#, c-format
msgid "cannot open backup file %s for writing"
-msgstr "не могу да отворим резервну датотеку „%s“ ради уписа"
+msgstr "не могу да отворим датотеку резерве „%s“ за упис"
#: gnulib-lib/copy-file.c:202
-#, fuzzy, c-format
+#, c-format
msgid "error reading %s"
-msgstr "грешка при читању „%s“"
+msgstr "грешка читања „%s“"
#: gnulib-lib/copy-file.c:206
-#, fuzzy, c-format
+#, c-format
msgid "error writing %s"
-msgstr "грешка при упису „%s“"
+msgstr "грешка писања „%s“"
#: gnulib-lib/copy-file.c:210
-#, fuzzy, c-format
+#, c-format
msgid "error after reading %s"
msgstr "грешка након читања „%s“"
@@ -91,171 +94,166 @@ msgstr "грешка након читања „%s“"
#: src/read-tcl.c:110 src/write-resources.c:77
#, c-format
msgid "fdopen() failed"
-msgstr "неуспешан fdopen()"
+msgstr "није успела функција „fdopen()“"
#: gnulib-lib/csharpcomp.c:571
-#, fuzzy, c-format
+#, c-format
msgid "C# compiler not found, try installing pnet"
-msgstr ""
-"Нисам нашао Јава преводилац, покушајте да инсталирате gcj или поставите "
-"$JAVAC"
+msgstr "нисам нашао Ц# преводиоца, покушајте да инсталирате пнет"
#: gnulib-lib/csharpexec.c:343
-#, fuzzy, c-format
+#, c-format
msgid "C# virtual machine not found, try installing pnet"
-msgstr ""
-"Нисам нашао виртуелну Јава машину, покушајте да инсталирате gij или да "
-"поставите $JAVA"
+msgstr "нисам нашао Ц# виртуелну машину, покушајте да инсталирате пнет"
#: gnulib-lib/error.c:188
msgid "Unknown system error"
-msgstr "Непозната системска грешка"
+msgstr "Непозната грешка система"
#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
-msgstr "%s: неуспешан подпроцес"
+msgstr "%s потпроцес није успео"
#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: опција „%s“ није једнозначна\n"
+msgstr "%s: опција „%s“ је нејасна; могућности:"
#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: опција „--%s“ не дозвољава аргументе\n"
+msgstr "%s: опција „--%s“ не дозвољава аргумент\n"
#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: опција „%c%s“ не дозвољава аргументе\n"
+msgstr "%s: опција „%c%s“ не дозвољава аргумент\n"
#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: опција „%s“ захтева аргумент\n"
+msgstr "%s: опција „--%s“ захтева аргумент\n"
#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '--%s'\n"
msgstr "%s: непозната опција „--%s“\n"
#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756
-#, fuzzy, c-format
+#, c-format
msgid "%s: unrecognized option '%c%s'\n"
msgstr "%s: непозната опција „%c%s“\n"
#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808
-#, fuzzy, c-format
+#, c-format
msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: неисправна опција -- %c\n"
+msgstr "%s: неисправна опција -- „%c“\n"
#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
#: gnulib-lib/getopt.c:1106
-#, fuzzy, c-format
+#, c-format
msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: опција захтева аргумент -- %c\n"
+msgstr "%s: опција захтева аргумент -- „%c“\n"
#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: опција „-W %s“ није једнозначна\n"
+msgstr "%s: опција „-W %s“ је нејасна\n"
#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '-W %s' doesn't allow an argument\n"
msgstr "%s: опција „-W %s“ не дозвољава аргумент\n"
#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: опција „%s“ захтева аргумент\n"
+msgstr "%s: опција „-W %s“ захтева аргумент\n"
#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
#: gnulib-lib/javacomp.c:156
#, c-format
msgid "invalid source_version argument to compile_java_class"
-msgstr ""
+msgstr "неисправан аргумент издања_извора за преведи_јава_разред"
#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
#, c-format
msgid "invalid target_version argument to compile_java_class"
-msgstr ""
+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 "не могу да направим „%s“"
+msgstr "нисам успео да направим „%s“"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: 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 "грешка при писању датотеке „%s“"
+msgstr "грешка приликом писања датотеке „%s“"
#: gnulib-lib/javacomp.c:2343
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr ""
-"Нисам нашао Јава преводилац, покушајте да инсталирате gcj или поставите "
-"$JAVAC"
+"Нисам нашао Јава преводиоца, покушајте да инсталирате гцј или поставите "
+"„$JAVAC“"
#: gnulib-lib/javaexec.c:417
#, c-format
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr ""
-"Нисам нашао виртуелну Јава машину, покушајте да инсталирате gij или да "
-"поставите $JAVA"
+"Нисам нашао виртуелну машину Јаве, покушајте да инсталирате гиј или да "
+"поставите „$JAVA“"
#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
#: src/msginit.c:1140
#, c-format
msgid "%s subprocess I/O error"
-msgstr "У/И грешка подпроцеса %s"
+msgstr "У/И грешка %s потпроцеса"
-#: 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 "меморија исцрпљена"
+msgstr "меморија је потрошена"
#: gnulib-lib/pipe-filter-ii.c:192
-#, fuzzy, c-format
+#, c-format
msgid "creation of threads failed"
-msgstr ""
-"неуспешно изграђивање Јава класе, пробајте --verbose или поставите $JAVAC"
+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 "неуспешан упис у подпроцес %s"
+msgstr "писање у %s потпроцес није успело"
#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
#, c-format
msgid "read from %s subprocess failed"
-msgstr "неуспешно читање из подпроцеса %s"
+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
msgid "communication with %s subprocess failed"
-msgstr "неуспешно споразумевање са подпроцесом %s"
+msgstr "комуницирање са %s потпроцесом није успело"
#: gnulib-lib/pipe-filter-ii.c:449
#, c-format
msgid "%s subprocess terminated with exit code %d"
-msgstr "подпроцес %s је прекинут уз повратни код %d"
+msgstr "%s потпроцес је окончан са излазном шифром %d"
#. TRANSLATORS:
#. Get translations for open and closing quotation marks.
@@ -280,65 +278,65 @@ msgstr "подпроцес %s је прекинут уз повратни код
#. and use glyphs suitable for your language.
#: gnulib-lib/quotearg.c:312
msgid "`"
-msgstr ""
+msgstr "„"
#: gnulib-lib/quotearg.c:313
msgid "'"
-msgstr ""
+msgstr "“"
#: gnulib-lib/set-acl.c:46
#, c-format
msgid "setting permissions for %s"
-msgstr ""
+msgstr "подешавам овлашћења за %s"
+#
#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
#, c-format
msgid "cannot create pipe"
-msgstr "не могу да направим цевку"
+msgstr "не могу да направим спојку"
#: gnulib-lib/w32spawn.h:43
#, c-format
msgid "_open_osfhandle failed"
-msgstr "неуспешан _open_osfhandle"
+msgstr "„_open_osfhandle“ није успело"
#: gnulib-lib/w32spawn.h:84
-#, fuzzy, c-format
+#, c-format
msgid "cannot restore fd %d: dup2 failed"
-msgstr "не могу да направим излазну датотеку „%s“"
+msgstr "не могу да повратим фд %d: „dup2“ није успело"
#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
#: gnulib-lib/wait-process.c:317
#, c-format
msgid "%s subprocess"
-msgstr "подпроцес од %s"
+msgstr "%s потпроцес"
#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
#, c-format
msgid "%s subprocess got fatal signal %d"
-msgstr "подпроцес од %s је примио кобни сигнал %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: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 "грешка приликом отварања „%s“ за читање"
#: src/format.c:151
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
-msgstr "„%s“ није исправна ниска формата %s, за разлику од „msgid“. Разлог: %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
-#, fuzzy, c-format
+#, c-format
msgid ""
"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
-msgstr ""
-"спецификација формата за %u. аргумент, као у „%s“, не постоји у „msgid“"
+msgstr "особеност записа за %u. аргумент, као у „%s“, не постоји у „%s“"
#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
#: src/format-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235
@@ -346,7 +344,7 @@ msgstr ""
#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
#, c-format
msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "спецификација формата за %u. аргумент не постоји у „%s“"
+msgstr "особеност записа за %u. аргумент не постоји у „%s“"
#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
#: src/format-elisp.c:379 src/format-gcc-internal.c:658
@@ -354,14 +352,14 @@ msgstr "спецификација формата за %u. аргумент не
#: 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
+#, c-format
msgid "format specifications in '%s' and '%s' for argument %u are not the same"
-msgstr "спецификације формата у „msgid“ и „%s“ за %u. аргумент нису исте"
+msgstr "спецификације записа у „%s“ и „%s“ за %u. аргумент нису исте"
#: src/format-boost.c:449
-#, fuzzy, c-format
+#, c-format
msgid "The directive number %u starts with | but does not end with |."
-msgstr "У %u. директиви, „~;“ се користи на неисправном положају."
+msgstr "Број одреднице %u почиње са | али се не завршава са |."
#: src/format-c.c:36
#, c-format
@@ -369,156 +367,155 @@ 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."
+"У смерници број %u, члан након „<“ не представља назив макроа спецификације "
+"записа. Исправни називи макроа су пописани у ИСО Це 99, одељак 7.8.1."
#: src/format-c.c:39
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "У %u. директиви, члан након „<“ није праћен „>“."
+msgstr "У смерници број %u, члан након „<“ није праћен „>“."
#: src/format-c.c:42 src/format-gfc-internal.c:289
#, c-format
msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "Ниска позива %u. аргумент, али занемарује %u. аргумент."
+msgstr "Ниска упућује на %u. аргумент, али занемарује %u. аргумент."
#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
#: src/format-javascript.c:215 src/format-python.c:515
#: src/format-qt-plural.c:110
-#, fuzzy, c-format
+#, c-format
msgid "number of format specifications in '%s' and '%s' does not match"
-msgstr "не поклапа се број спецификација формата у „msgid“ и „%s“"
+msgstr "не подудара се број особености записа у „%s“ и „%s“"
#: src/format-csharp.c:88 src/format-java.c:205
#, c-format
msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "У %u. директиви, „{“ није праћено бројем аргумента."
+msgstr "У смерници број %u, иза { не следи број аргумента."
#: src/format-csharp.c:109
-#, fuzzy, c-format
+#, c-format
msgid "In the directive number %u, ',' is not followed by a number."
-msgstr "У %u. директиви, „{“ није праћено бројем аргумента."
+msgstr "У смерници број %u, иза , не следи број аргумента."
#: src/format-csharp.c:130 src/format-java.c:191
msgid ""
"The string ends in the middle of a directive: found '{' without matching '}'."
-msgstr "Ниска се завршава усред директиве: нађох „{“ без одговарајућег „}“."
+msgstr "Ниска се завршава у сред смернице: нађох { без одговарајуће }."
#: src/format-csharp.c:139
-#, fuzzy, c-format
+#, c-format
msgid ""
"The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "У %u. директиви, знак „%c“ не представља цифру између 1 и 9."
+msgstr "Смерница број %u се завршава неисправним знаком „%c“ уместо }."
#: src/format-csharp.c:140
-#, fuzzy, c-format
+#, c-format
msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "У %u. директиви, „~;“ се користи на неисправном положају."
+msgstr "Смерница број %u се завршава неисправним знаком уместо }."
#: src/format-csharp.c:161 src/format-java.c:346
msgid ""
"The string starts in the middle of a directive: found '}' without matching "
"'{'."
-msgstr "Ниска почиње усред директиве: нађох „}“ без одговарајућег „{“."
+msgstr "Ниска почиње у сред смернице: нађох } без одговарајуће {."
#: src/format-csharp.c:162
-#, fuzzy, c-format
+#, c-format
msgid "The string contains a lone '}' after directive number %u."
-msgstr "Ниска се завршава усред директиве."
+msgstr "Ниска садржи усамљену } након смернице број %u."
#: src/format-gcc-internal.c:255
-#, fuzzy, c-format
+#, c-format
msgid "In the directive number %u, the flags combination is invalid."
-msgstr "У %u. директиви, %d. аргумент је негативан."
+msgstr "У смерници број %u, комбинација обележја није исправна."
#: src/format-gcc-internal.c:292
-#, fuzzy, c-format
+#, c-format
msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr "У %u. директиви, нису дозвољене назнаке пре „%c“."
+msgstr "У смерници број %u, тачност није дозвољена пре „%c“."
#: src/format-gcc-internal.c:334
-#, fuzzy, c-format
+#, c-format
msgid ""
"In the directive number %u, the argument number for the precision must be "
"equal to %u."
-msgstr "У %u. директиви, аргумент са бројем 0 није позитиван цео број."
+msgstr "У смерници број %u, број аргумента за тачност мора бити једнак %u."
#: src/format-gcc-internal.c:398
-#, fuzzy, c-format
+#, c-format
msgid ""
"In the directive number %u, a precision specification is not allowed before "
"'%c'."
-msgstr "У %u. директиви, нису дозвољене назнаке пре „%c“."
+msgstr "У смерници број %u, особеност тачности није дозвољена пре „%c“."
#: src/format-gcc-internal.c:406
-#, fuzzy, c-format
+#, c-format
msgid "In the directive number %u, the precision specification is invalid."
-msgstr "У %u. директиви, %d. аргумент је негативан."
+msgstr "У смерници број %u, особеност тачности није исправна."
#: src/format-gcc-internal.c:463
#, c-format
msgid "In the directive number %u, flags are not allowed before '%c'."
-msgstr "У %u. директиви, нису дозвољене назнаке пре „%c“."
+msgstr "У смерници број %u, обележја нису дозвољена пре „%c“."
#: src/format-gcc-internal.c:677
#, c-format
msgid "'%s' uses %%m but '%s' doesn't"
-msgstr ""
+msgstr "„%s“ користи %%m али „%s“ не"
#: src/format-gcc-internal.c:680
#, c-format
msgid "'%s' does not use %%m but '%s' uses %%m"
-msgstr ""
+msgstr "„%s“ не користи %%m али „%s“ користи %%m"
#: src/format-gfc-internal.c:383
#, c-format
msgid "'%s' uses %%C but '%s' doesn't"
-msgstr ""
+msgstr "„%s“ користи %%C али „%s“ не"
#: src/format-gfc-internal.c:386
#, c-format
msgid "'%s' does not use %%C but '%s' uses %%C"
-msgstr ""
+msgstr "„%s“ не користи %%C али „%s“ користи %%C"
#: src/format-invalid.h:22
msgid "The string ends in the middle of a directive."
-msgstr "Ниска се завршава усред директиве."
+msgstr "Ниска се завршава у сред смернице."
#: src/format-invalid.h:25
msgid ""
"The string refers to arguments both through absolute argument numbers and "
"through unnumbered argument specifications."
msgstr ""
-"Ниска се позива на аргументе и помоћу апсолутног броја аргумента и помоћу "
-"обичних спецификација аргумената."
+"Ниска упућује на аргументе и помоћу апсолутног броја аргумента и помоћу "
+"обичних особености аргумената."
#: src/format-invalid.h:28
#, c-format
msgid ""
"In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "У %u. директиви, аргумент са бројем 0 није позитиван цео број."
+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. директиви, ширина нултог аргумента није позитиван цео број."
+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. директиви, прецизност нултог аргумента није позитиван цео број."
+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“ не представља исправну ознаку за претварање."
+msgstr "У смерници број %u, знак „%c“ није исправан одредник претварања."
#: src/format-invalid.h:37
#, c-format
@@ -526,12 +523,12 @@ msgid ""
"The character that terminates the directive number %u is not a valid "
"conversion specifier."
msgstr ""
-"Знак који завршава %u. директиву не представља исправну ознаку за претварање."
+"Знак којим се завршава смерница број %u није исправан одредник претварања."
#: src/format-invalid.h:40
#, c-format
msgid "The string refers to argument number %u in incompatible ways."
-msgstr "Ниска се позива на %u. аргумент на несагласне начине."
+msgstr "Ниска упућује на аргумент бр. %u на несагласне начине."
#: src/format-java.c:240
#, c-format
@@ -539,18 +536,19 @@ msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
"style."
msgstr ""
-"У %u. директиви, подниска „%s“ не представља исправан стил датума и времена."
+"У смерници број %u, подниска „%s“ не представља исправан стил датума и "
+"времена."
#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr "У %u. директиви, „%s“ није праћено запетом."
+msgstr "У смерници број %u, након „%s“ не следи запета."
#: src/format-java.c:274
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "У %u. директиви, подниска „%s“ не представља исправан стил бројева."
+msgstr "У смерници број %u, подниска „%s“ не представља исправан стил бројева."
#: src/format-java.c:323
#, c-format
@@ -558,38 +556,38 @@ msgid ""
"In the directive number %u, the argument number is not followed by a comma "
"and one of \"%s\", \"%s\", \"%s\", \"%s\"."
msgstr ""
-"У %u. директиви, број аргумента није праћен запетом и неким од „%s“, „%s“, "
-"„%s“, „%s“."
+"У смерници број %u, након броја аргумента не следи запета и неки од „%s“, "
+"„%s“, „%s“, „%s“."
#: src/format-java.c:572
#, c-format
msgid "In the directive number %u, a choice contains no number."
-msgstr "У %u. директиви, избор не садржи број."
+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“."
+msgstr ""
+"У смерници број %u, избор садржи број након кога не следи „<“, „#“ или „%s“."
#: src/format-java.c:745
-#, fuzzy, c-format
+#, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr ""
-"спецификација формата за аргумент {%u}, као у „%s“, не постоји у „msgid“"
+msgstr "особеност записа за аргумент {%u}, као у „%s“, не постоји у „%s“"
#: src/format-java.c:756
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "спецификација формата за аргумент {%u} не постоји у „%s“"
+msgstr "особеност записа за аргумент {%u} не постоји у „%s“"
#: src/format-java.c:776
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "нису једнаке спецификације формата у „msgid“ и „%s“ за аргумент {%u}"
+msgstr "спецификације записа у „%s“ и „%s“ за аргумент {%u} нису исте"
#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
#: src/format-scheme.c:2375
@@ -598,8 +596,8 @@ msgid ""
"In the directive number %u, parameter %u is of type '%s' but a parameter of "
"type '%s' is expected."
msgstr ""
-"У %u. директиви, %u. параметар је типа „%s“ а очекиван је параметар типа "
-"„%s“."
+"У смерници број %u, параметар %u је врсте „%s“ али је очекиван параметар "
+"врсте „%s“."
#: src/format-lisp.c:2372 src/format-scheme.c:2398
#, c-format
@@ -610,64 +608,66 @@ msgid_plural ""
"In the directive number %u, too many parameters are given; expected at most "
"%u parameters."
msgstr[0] ""
-"У %u. директиви, дато је превише параметара; очекивах највише %u параметар."
+"У смерници број %u, дато је превише параметара; очекивах највише %u "
+"параметар."
msgstr[1] ""
-"У %u. директиви, дато је превише параметара; очекивах највише %u параметра."
+"У смерници број %u, дато је превише параметара; очекивах највише %u "
+"параметра."
msgstr[2] ""
-"У %u. директиви, дато је превише параметара; очекивах највише %u параметара."
+"У смерници број %u, дато је превише параметара; очекивах највише %u "
+"параметара."
#: src/format-lisp.c:2496 src/format-scheme.c:2499
#, c-format
msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr "У %u. директиви, „%c“ није праћено цифром."
+msgstr "У смерници број %u, након „%c“ не следи цифра."
#: src/format-lisp.c:2736 src/format-scheme.c:2754
#, c-format
msgid "In the directive number %u, the argument %d is negative."
-msgstr "У %u. директиви, %d. аргумент је негативан."
+msgstr "У смерници број %u, %d. аргумент је негативан."
#: src/format-lisp.c:2805
msgid "The string ends in the middle of a ~/.../ directive."
-msgstr "Ниска се завршава усред директиве ~/.../."
+msgstr "Ниска се завршава у сред смернице ~/.../."
#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
#, c-format
msgid "Found '~%c' without matching '~%c'."
-msgstr "Нађох „~%c“ без одговарајућег „~%c“."
+msgstr "Нађох „~%c“ без поклапања „~%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 "У %u. директиви, дата су оба измењивача „@“ и „:“."
+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. директиви, „~:[“ није праћено са две наредбе, раздвојене помоћу „~;“."
+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."
-msgstr "Ниска се позива на неке аргументе на несагласан начин."
+msgstr "Ниска упућује на неке аргументе на несагласан начин."
#: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, fuzzy, c-format
+#, c-format
msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "спецификације формата у „msgid“ и „%s“ нису еквивалентне"
+msgstr "спецификације записа у „%s“ и „%s“ нису еквивалентне"
#: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, fuzzy, c-format
+#, c-format
msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr "спецификакције формата у „%s“ не представљају подскуп оних из „msgid“"
+msgstr "спецификакције записа у „%s“ не представљају подскуп оних из „%s“"
#: src/format-perl.c:433
#, c-format
@@ -675,82 +675,79 @@ msgid ""
"In the directive number %u, the size specifier is incompatible with the "
"conversion specifier '%c'."
msgstr ""
-"У %u. директиви, ознака величине је несагласна са ознаком претварања „%c“."
+"У смерници број %u, одредник величине је несагласан са одредником претварања "
+"„%c“."
#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-python-brace.c:434 src/format-python-brace.c:447
#: src/format-sh.c:308
#, c-format
msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "спецификација формата за аргумент „%s“ не постоји у „%s“"
+msgstr "особеност записа за аргумент „%s“ не постоји у „%s“"
#: src/format-python.c:115
msgid ""
"The string refers to arguments both through argument names and through "
"unnamed argument specifications."
msgstr ""
-"Ниска позива аргументе и кроз имена аргумената и кроз неименоване наводе "
-"аргумената."
+"Ниска упућује на аргументе и кроз називе аргумената и кроз неименоване "
+"наводе аргумената."
#: src/format-python.c:354
#, c-format
msgid "The string refers to the argument named '%s' in incompatible ways."
-msgstr "Ниска позива аргумент са именом „%s“ на несагласне начине."
+msgstr "Ниска упућује на аргумент назива „%s“ на несагласне начине."
#: src/format-python.c:430
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
-msgstr ""
-"спецификација формата у „msgid“ очекује мапирање, а они у „%s“ очекују н-"
-"торку"
+msgstr "особеност записа у „%s“ очекује мапирање, а они у „%s“ очекују н-торку"
#: src/format-python.c:437
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
-msgstr ""
-"спецификација формата у „msgid“ очекује н-торку, а они у „%s“ очекују "
-"мапирање"
+msgstr "особеност записа у „%s“ очекује н-торку, а они у „%s“ очекују мапирање"
#: src/format-python.c:460 src/format-sh.c:297
-#, fuzzy, c-format
+#, c-format
msgid ""
"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr ""
-"спецификација формата за аргумент „%s“, као у „%s“, не постоји у „msgid“"
+msgstr "особеност записа за аргумент „%s“, као у „%s“, не постоји у „%s“"
#: src/format-python.c:494
-#, fuzzy, c-format
+#, c-format
msgid ""
"format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "нису исте спецификације формата у „msgid“ и „%s“ за аргумент „%s“"
+msgstr "спецификације записа у „%s“ и „%s“ за аргумент „%s“ нису исте"
-#: src/format-python-brace.c:136
-#, fuzzy, c-format
+#: src/format-python-brace.c:137
+#, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "У %u. директиви, „%c“ није праћено цифром."
+msgstr "У смерници број %u, „%c“ не не може да започне назив поља."
-#: src/format-python-brace.c:149
-#, fuzzy, c-format
+#: src/format-python-brace.c:150
+#, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "У %u. директиви, „{“ није праћено бројем аргумента."
+msgstr "У смерници број %u, „%c“ не не може да започне аргумент „getattr“."
-#: src/format-python-brace.c:164
-#, fuzzy, c-format
+#: src/format-python-brace.c:165
+#, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "У %u. директиви, „%c“ није праћено цифром."
+msgstr "У смерници број %u, „%c“ не не може да започне аргумент „getitem“."
-#: src/format-python-brace.c:184
-#, fuzzy, c-format
+#: src/format-python-brace.c:185
+#, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "У %u. директиви, нису дозвољене назнаке пре „%c“."
+msgstr ""
+"У смерници број %u, није дозвољено више угнежђавања у одреднику записа."
-#: src/format-python-brace.c:210
-#, fuzzy, c-format
+#: src/format-python-brace.c:270
+#, c-format
msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "У %u. директиви, %d. аргумент је негативан."
+msgstr "У смерници број %u, постоји неокончана смерница записа."
#: src/format-qt.c:152
#, c-format
@@ -758,17 +755,19 @@ 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 "Ниска позива променљиву љуске помоћу не-АСКРИ имена."
+msgstr "Ниска упућује на променљиву љуске помоћу не-АСКРИ назива."
#: src/format-sh.c:81
msgid ""
"The string refers to a shell variable with complex shell brace syntax. This "
"syntax is unsupported here due to security reasons."
msgstr ""
-"Ниска позива променљиву љуске помоћу сложене синтаксе заграда љуске. Ова "
+"Ниска упућује на променљиву љуске помоћу сложене синтаксе заграда љуске. Ова "
"синтакса овде није подржана из безбедносних разлога."
#: src/format-sh.c:83
@@ -776,32 +775,32 @@ msgid ""
"The string refers to a shell variable whose value may be different inside "
"shell functions."
msgstr ""
-"Ниска позива променљиву љуске чија вредност може бити другачија у функцијама "
-"љуске."
+"Ниска упућује на променљиву љуске чија вредност може бити другачија у "
+"функцијама љуске."
#: src/format-sh.c:85
msgid "The string refers to a shell variable with an empty name."
-msgstr "Ниска позива променљиву љуске празног имена."
+msgstr "Ниска упућује на променљиву љуске празног назива."
#: src/format-ycp.c:90
#, c-format
msgid ""
"In the directive number %u, the character '%c' is not a digit between 1 and "
"9."
-msgstr "У %u. директиви, знак „%c“ не представља цифру између 1 и 9."
+msgstr "У смерници број %u, знак „%c“ не представља цифру између 1 и 9."
#: src/format-ycp.c:91
#, c-format
msgid ""
"The character that terminates the directive number %u is not a digit between "
"1 and 9."
-msgstr "Знак који завршава %u. директиву није цифра између 1 и 9."
+msgstr "Знак којим се завршава смерница број %u није цифра између 1 и 9."
-#: src/hostname.c:178 src/msgattrib.c:344 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
-#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
-#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:599
+#: 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"
@@ -809,35 +808,39 @@ msgid ""
"This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
+"Ауторска права (C) %s Задужбина слободног софтвера, Инк.\n"
+"Лиценца ОЈЛв3+: ГНУ ОЈЛ издање 3 или касније <http://gnu.org/licenses/gpl.html>.\n"
+"Ово је слободан софтвер: слободни сте да га мењате и расподељујете.\n"
+"Не постоји НИКАКВА ГАРАНЦИЈА, у оквирима дозвољеним законом.\n"
-#: 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 "Написа %s.\n"
+msgstr "Написао је %s.\n"
#. 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 ""
+msgstr "Бруно Хејбл"
#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
msgstr "превише аргумената"
-#: src/hostname.c:207 src/msgattrib.c:410 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
-#: src/msgfilter.c:384 src/msgfmt.c:650 src/msggrep.c:507 src/msginit.c:358
-#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:828
-#, fuzzy, c-format
+#: 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 "Пробајте „%s --help“ за више података.\n"
@@ -849,17 +852,17 @@ msgstr "Употреба: %s [ОПЦИЈА]\n"
#: src/hostname.c:215
#, c-format
msgid "Print the machine's hostname.\n"
-msgstr "Испиши име машине.\n"
+msgstr "Испишите назив рачунара.\n"
#: src/hostname.c:218
#, c-format
msgid "Output format:\n"
-msgstr "Излазни облик:\n"
+msgstr "Запис излаза:\n"
#: src/hostname.c:220
#, c-format
msgid " -s, --short short host name\n"
-msgstr " -s, --short кратко име рачунара\n"
+msgstr " -s, --short кратак назив рачунара\n"
#: src/hostname.c:222
#, c-format
@@ -868,148 +871,145 @@ msgid ""
"domain\n"
" name, and aliases\n"
msgstr ""
-" -f, --fqdn, --long дуго име рачунара, садржи пуно име домена и \n"
-" надимке\n"
+" -f, --fqdn, --long дуги назив рачунара, садржи пуни назив домена\n"
+" и надимке\n"
#: src/hostname.c:225
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
-msgstr " -i, --ip-address адресе за име рачунара\n"
+msgstr " -i, --ip-address адресе за назив рачунара\n"
-#: src/hostname.c:228 src/msgattrib.c:525 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
-#: src/msgfilter.c:476 src/msgfmt.c:775 src/msggrep.c:623 src/msginit.c:420
-#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
+#: src/hostname.c: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 "Обавештајни излаз:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
-msgstr " -h, --help прикажи ову помоћ и заврши\n"
+msgstr " -h, --help приказује ову помоћ и излази\n"
-#: 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 " -V, --version испиши податке о издању и заврши\n"
+msgstr " -V, --version исписује податке о издању и излази\n"
#. TRANSLATORS: The placeholder indicates the bug-reporting address
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/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 "Пријавите грешке на <bug-gnu-gettext@gnu.org>.\n"
+msgstr "Грешке пријавите на <bug-gnu-gettext@gnu.org>.\n"
#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
#, c-format
msgid "could not get host name"
-msgstr "не могу да сазнам име домаћина"
+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 "дозвољена највише једна улазна датотека"
+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 "%s и %s су међусобно искључиви"
+msgstr "%s и %s се међусобно искључују"
-#: src/msgattrib.c:414 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
-msgstr "Употреба: %s [ОПЦИЈА] [УЛАЗНА-ДАТОТЕКА]\n"
+msgstr "Употреба: %s [ОПЦИЈА]... [УЛАЗНАДАТОТЕКА]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
"and manipulates the attributes.\n"
msgstr ""
-"Филтрира поруке каталога превода према њиховим особинама, и барата\n"
+"Издвајајте поруке каталога превода према њиховим особинама, и управљајте\n"
"тим особинама.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
+#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msguniq.c:342
#, c-format
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "Обавезни аргументи дугих опција су обавезни и за кратке опције.\n"
+msgstr ""
+"Обавезни аргументи за дуге опције су такође обавезни и за кратке опције.\n"
-#: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
-#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
-#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
-#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
+#: src/msgattrib.c:433 src/msgcat.c: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 "Путања до улазне датотеке:\n"
+msgstr "Место улазне датотеке:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
-msgstr " УЛАЗНА-ДАТОТЕКА улазна PO датотека\n"
+msgstr " УЛАЗНАДАТОТЕКА улазна по датотека\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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 ""
-" -D, --directory=ДИР додај ДИР у списак за тражење улазних "
+" -D, --directory=ДИР додаје ДИР у списак за тражење улазних "
"датотека\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
-msgstr ""
-"Уколико није дата улазна датотека или је „-“, чита се стандардни улаз.\n"
+msgstr "Ако није дата улазна датотека или ако је „-“, чита стандардни улаз.\n"
-#: src/msgattrib.c: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 "Путања излазне датотеке:\n"
+msgstr "Место излазне датотеке:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 " -o, --output-file=ДАТОТЕКА испиши излаз у наведену датотеку\n"
+msgstr " -o, --output-file=ДАТОТЕКА исписује излаз у наведену датотеку\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1017,153 +1017,173 @@ msgid ""
msgstr ""
"Резултати се пишу на стандардни излаз ако није наведена излазна датотека "
"или\n"
-"ако је она „-“.\n"
+"ако је „-“.\n"
-#: 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 "Избор поруке:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
msgstr ""
-" --translated задржи преведене, уклони непреведене поруке\n"
+" --translated задржава преведене, уклања непреведене "
+"поруке\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
msgstr ""
-" --untranslated задржи непреведене, уклони преведене поруке\n"
+" --untranslated задржава непреведене, уклања преведене "
+"поруке\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
-msgstr " --no-fuzzy уклони поруке означене као „нејасне“\n"
+msgstr ""
+" --no-fuzzy уклања поруке означене као „нејасне“\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
-msgstr " --only-fuzzy задржи поруке означене као „нејасне“\n"
+msgstr ""
+" --only-fuzzy задржава поруке означене као „нејасне“\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
-msgstr " --no-obsolete уклони застареле поруке #~\n"
+msgstr " --no-obsolete уклања застареле поруке #~\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
-msgstr " --only-obsolete задржи застареле поруке #~\n"
+msgstr " --only-obsolete задржава застареле поруке #~\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
-msgstr "Баратање особинама:\n"
+msgstr "Управљање особинама:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
-msgstr " --set-fuzzy означи све поруке као „нејасне“\n"
+msgstr " --set-fuzzy означава све поруке као „нејасне“\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
-msgstr " --clear-fuzzy означи све поруке као не-„нејасне“\n"
+msgstr ""
+" --clear-fuzzy означава све поруке као не-„нејасне“\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
-msgstr " --set-obsolete означи све поруке као застареле\n"
+msgstr " --set-obsolete означава све поруке као застареле\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
-msgstr " --clear-obsolete означи све поруке као не-застареле\n"
+msgstr ""
+" --clear-obsolete означава све поруке као не-застареле\n"
-#: src/msgattrib.c:468
-#, fuzzy, c-format
+#: src/msgattrib.c:475
+#, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
" of translated messages.\n"
msgstr ""
-" --translated задржи преведене, уклони непреведене поруке\n"
+" --previous када означава „нејасне“, задржава претходни "
+"„msgids“\n"
+" преведених порука.\n"
-#: src/msgattrib.c:471
-#, fuzzy, c-format
+#: src/msgattrib.c:478
+#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
"messages\n"
-msgstr " --clear-fuzzy означи све поруке као не-„нејасне“\n"
+msgstr ""
+" --clear-previous уклања претходни „msgid“ сасвих порука\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+" --empty када уклања „нејасне“, такође подешава "
+"„msgstr“ празним\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
msgstr ""
-" --only-file=ДАТОТЕКА.po баратај једино пољима уписаним у ДАТОТЕКА.po\n"
+" --only-file=ДАТОТЕКА.po управља једино пољима уписаним у ДАТОТЕЦИ."
+"po\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
msgstr ""
-" --ignore-file=ДАТОТЕКА.po баратај једино пољима која нису у ДАТОТЕКА."
+" --ignore-file=ДАТОТЕКА.po управља једино пољима која нису у ДАТОТЕЦИ."
"po\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
-msgstr " --fuzzy исто што и --only-fuzzy --clear-fuzzy\n"
+msgstr ""
+" --fuzzy исто што и --only-fuzzy --clear-fuzzy\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
msgstr ""
-" --obsolete исто што и --only-obsolete --clear-obsolete\n"
+" --obsolete исто што и --only-obsolete --clear-"
+"obsolete\n"
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c: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 "Синтакса улазне датотеке:\n"
+msgstr "Склоп улазне датотеке:\n"
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
-" -P, --properties-input улазна датотека је у синтакси Јава ."
-"properties\n"
+" -P, --properties-input улазна датотека је у склопу „Јава ."
+"properties“\n"
-#: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
-#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
#, c-format
msgid ""
" --stringtable-input input file is in NeXTstep/GNUstep .strings "
"syntax\n"
msgstr ""
-" --stringtable-input улазна датотека је у синтакси NeXTstep/"
+" --stringtable-input улазна датотека је у склопу „NeXTstep/"
"GNUstep\n"
-" .strings\n"
+" .strings“\n"
-#: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
-#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
-#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
-#: src/xgettext.c:946
+#: src/msgattrib.c:498 src/msgcat.c: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 "Детаљи излаза:\n"
+msgstr "Појединости излаза:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1171,133 +1191,146 @@ msgid ""
" WHEN may be 'always', 'never', 'auto', or "
"'html'.\n"
msgstr ""
+" --color увек користи боје и остале особине текста\n"
+" --color=КАДА користи боје и остале особине текста ако је "
+"КАДА.\n"
+" КАДА може бити „always“ (увек), "
+"„never“ (никада),\n"
+" „auto“ (самостално), или „html“.\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr ""
+" --style=ИЗГЛЕДДАТОТЕКЕ наводи датотеку правила ЦСС изгледа за --"
+"color\n"
-#: src/msgattrib.c:497 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
-#: src/xgettext.c:954
+#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:977
#, c-format
msgid ""
" -e, --no-escape do not use C escapes in output (default)\n"
msgstr ""
-" -e, --no-escape не користи C истицање у излазу "
-"(подразумевано)\n"
+" -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
+#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
msgstr ""
-" -E, --escape користи C истицање у излазу, без проширених \n"
-" знакова\n"
+" -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
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
-msgstr " --force-po испиши ПО датотеку чак и ако је празна\n"
+msgstr ""
+" --force-po записује по датотеку чак и ако је празна\n"
-#: src/msgattrib.c: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 ""
-" -i, --indent испиши ПО датотеку користећи стил увлачења\n"
+" -i, --indent записује .по датотеку користећи увучени "
+"изглед\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
-msgstr " --no-location не исписуј редове „#: датотека:ред“\n"
+msgstr ""
+" --no-location не исписује редове „#: датотека:ред“\n"
-#: src/msgattrib.c: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 ""
-" -n, --add-location образуј редове „#: датотека:"
+" -n, --add-location образује редове „#: датотека:"
"ред“ (подразумевано)\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
+#: src/xgettext.c:989
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
-" --strict испиши ПО датотеку строго сагласну са "
+" --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
-#: 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 " -p, --properties-output испиши Јава .properties датотеку\n"
+msgstr ""
+" -p, --properties-output исписује датотеку „Јава .properties“\n"
-#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
-#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
-" --stringtable-output испиши NeXTstep/GNUstep .strings датотеку\n"
+" --stringtable-output исписује датотеку „NeXTstep/GNUstep ."
+"strings“\n"
-#: src/msgattrib.c:515 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
-#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
-#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:972
+#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
+#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
-msgstr " -w, --width=БРОЈ постави ширину излазне странице\n"
+msgstr " -w, --width=БРОЈ поставља ширину излазне странице\n"
-#: src/msgattrib.c: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 ""
-" --no-wrap не преламај дуге редове порука, дуже од "
-"ширине \n"
-" излазне странице, у више редова\n"
+" --no-wrap не прекида редове дуге поруке, дуже од "
+"ширине\n"
+" излазне странице, на неколико редова\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output образуј поређани излаз\n"
+msgstr " -s, --sort-output ствара уређени излаз\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 " -F, --sort-by-file поређај излаз по положају у датотеци\n"
+msgstr " -F, --sort-by-file ређа излаз према месту датотеке\n"
-#: 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 "дат је немогућ критеријум избора (%d < n < %d)"
+msgstr "наведен је немогућ услов избора (%d < n < %d)"
-#: 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 "Употреба: %s [ОПЦИЈА] [УЛАЗНА-ДАТОТЕКА]...\n"
+msgstr "Употреба: %s [ОПЦИЈА]... [УЛАЗНАДАТОТЕКА]...\n"
-#: src/msgcat.c:371
-#, fuzzy, c-format, no-wrap
+#: src/msgcat.c:372
+#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
"Find messages which are common to two or more of the specified PO files.\n"
@@ -1309,118 +1342,119 @@ msgid ""
"that if --use-first is specified, they will be taken from the first PO file\n"
"to define them.\n"
msgstr ""
-"Прилепљује и спаја наведене ПО датотеке.\n"
-"Проналати поруке које су заједничке за две или више ПО датотеке.\n"
-"Употребом опције --more-than, може се тражити већа учесталост пре исписа\n"
-"порука. Насупрот томе, опција --less-than се може користити за тражење\n"
-"мање учесталости пре исписа порука (нпр. --less-than=2 ће исписати само \n"
-"јединствене поруке). Преводи, примедбе и извучене примедбе се гомилају,\n"
-"осим ако се користи --use-first, када се узимају из прве ПО датотеке \n"
-"која их дефинише. Положаји у датотекама из свих ПО датотека се гомилају.\n"
+"Прилепите и стопите наведене ПО датотеке.\n"
+"Пронађите поруке које су заједничке за две или више ПО датотека.\n"
+"Употребом опције „--more-than“, можете тражити већу учесталост пре исписа\n"
+"порука. Насупрот томе, опцију „--less-than“ можете користити за тражење\n"
+"мање учесталости пре исписа порука (нпр. „--less-than=2“ ће исписати само \n"
+"јединствене поруке). Преводи, примедбе, извучене примедбе и положаји\n"
+"датотека ће се збрајати, осим ако не користите „--use-first“, тада се\n"
+"узимају из прве ПО датотеке која их одређује.\n"
-#: 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 " УЛАЗНА-ДАТОТЕКА ... улазне датотеке\n"
+msgstr " УЛАЗНАДАТОТЕКА ... улазне датотеке\n"
-#: 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 ""
-" -f, --files-from=ДАТОТЕКА преузми списак улазних датотека из ДАТОТЕКА\n"
+" -f, --files-from=ДАТОТЕКА добавља списак улазних датотека из ДАТОТЕКЕ\n"
-#: 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 "Уколико је улазна датотека „-“, чита се стандардни улаз.\n"
+msgstr "Ако је улазна датотека „-“, чита се стандардни улаз.\n"
-#: 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 ""
-" -<, --less-than=БРОЈ испиши поруке са мање од оволико дефиниција,\n"
-" уобичајено је бесконачно ако није постављено\n"
+" -<, --less-than=БРОЈ исписује поруке са мање од оволико одредница,\n"
+" подразумева се бесконачно ако није постављено\n"
-#: 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 ""
-" -<, --more-than=БРОЈ испиши поруке са више од оволико дефиниција,\n"
-" уобичајено је 0 ако није постављено\n"
+" -<, --more-than=БРОЈ исписује поруке са више од оволико одредница,\n"
+" подразумева се 0 ако није постављено\n"
-#: 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 ""
-" -u, --unique скраћено за --less-than=2, захтева да\n"
-" се испишу једино јединствене поруке\n"
+" -u, --unique скраћеница за „--less-than=2“, захтева\n"
+" штампање само јединствених порука\n"
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:739
-#: src/msgmerge.c:557
+#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
+#: src/msgmerge.c:562
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
-" -P, --properties-input улазне датотеке користе синтаксу за Јава ."
-"properties\n"
+" -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
+#: 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 ""
-" --stringtable-input улазне датотеке користе синтаксу за NeXTstep/"
+" --stringtable-input улазне датотеке су у синтакси „NeXTstep/"
"GNUstep \n"
-" .strings датотеке\n"
+" .strings“\n"
-#: 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 " -t, --to-code=ИМЕ кодирање за излаз\n"
+msgstr " -t, --to-code=НАЗИВ кодирање за излаз\n"
-#: 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 ""
" --use-first користи први доступни превод за сваку поруку,\n"
-" не спајај више превода\n"
+" не спаја више превода\n"
-#: 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 ""
+" --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
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
-msgstr ""
+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 "нису дате улазне датотеке"
+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 "неопходне су тачно две улазне датотеке"
+msgstr "потребне су тачно 2 улазне датотеке"
-#: 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 "Употреба: %s [ОПЦИЈА] подр.po реф.pot\n"
+msgstr "Употреба: %s [МОГУЋНОСТ] деф.po реф.pot\n"
#: src/msgcmp.c:218
#, c-format, no-wrap
@@ -1432,83 +1466,82 @@ msgid ""
"you have translated each and every message in your program. Where an exact\n"
"match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
msgstr ""
-"Пореди две ПО датотеке Унифорум стила ради провере да ли оба садрже исти\n"
-"скуп оригиналних ниски. Датотека подр.po је постојећа ПО датотека са \n"
-"преводима. Датотека реф.pot је последње направљена ПО датотека или ПО шаблон\n"
-"(обично направљен помоћу xgettext-а). Ово је корисно за проверу да ли сте \n"
-"превели баш сваку поруку вашег програма. Када не може да нађе тачно \n"
-"поклапање, користи се нејасно поклапање ради боље дијагностике.\n"
+"Поредите две ПО датотеке Унифорум стила да проверите да ли обе садрже\n"
+"исти скуп оригиналних ниски. Датотека деф.po је постојећа ПО датотека\n"
+"са преводима. Датотека реф.pot је последња направљена ПО датотека или\n"
+"ПО шаблон (обично направљен „xgettext“-ом). Ово је корисно да проверите\n"
+"да ли сте превели сваку поруку вашег програма. Када неко тачно поклапање\n"
+"не може бити пронађено, користи се нејасно поклапање ради боље дијагностике.\n"
#: src/msgcmp.c:232
#, c-format
msgid " def.po translations\n"
-msgstr " подр.po преводи\n"
+msgstr " def.po преводи\n"
#: src/msgcmp.c:234
#, c-format
msgid " ref.pot references to the sources\n"
-msgstr " реф.pot референце на изворне поруке\n"
+msgstr " ref.pot упуте на изворе\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "Измењивачи рада:\n"
-#: 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 ""
-" -m, --multi-domain примени реф.pot на сваки домен у подр.po\n"
+" -m, --multi-domain примењује реф.pot на сваки домен у деф.po\n"
-#: 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 " -N, --no-fuzzy-matching не користи нејасно поклапање\n"
#: src/msgcmp.c:245
-#, fuzzy, c-format
+#, c-format
msgid " --use-fuzzy consider fuzzy entries\n"
-msgstr " -f, --use-fuzzy користи нејасне преводе у излазу\n"
+msgstr " --use-fuzzy узима у обзир нејасне ставке\n"
#: src/msgcmp.c:247
-#, fuzzy, c-format
+#, c-format
msgid " --use-untranslated consider untranslated entries\n"
-msgstr ""
-" --untranslated задржи непреведене, уклони преведене поруке\n"
+msgstr " --use-untranslated узима у обзир непреведене ставке\n"
#: src/msgcmp.c:324
-#, fuzzy, c-format
+#, c-format
msgid "this message is untranslated"
-msgstr "упозорење: ова порука се не користи"
+msgstr "ова порука није преведена"
#: src/msgcmp.c:330
#, c-format
msgid "this message needs to be reviewed by the translator"
-msgstr ""
+msgstr "ову поруку би преводилац требао да прегледа"
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1505
#, c-format
msgid "this message is used but not defined..."
-msgstr "ова порука се користи али није дефинисана..."
+msgstr "ова порука се користи али није одређена..."
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1508
#, c-format
msgid "...but this definition is similar"
-msgstr "...али ова дефиниција је слична"
+msgstr "...али ова одредница је слична"
-#: src/msgcmp.c:377 src/msgmerge.c:1531
+#: src/msgcmp.c:377 src/msgmerge.c:1536
#, c-format
msgid "this message is used but not defined in %s"
-msgstr "ова порука се користи али није дефинисана у %s"
+msgstr "ова порука се користи али није одређена у „%s“"
#: src/msgcmp.c:546
#, c-format
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"
@@ -1516,13 +1549,13 @@ msgstr[0] "нађох %d кобну грешку"
msgstr[1] "нађох %d кобне грешке"
msgstr[2] "нађох %d кобних грешака"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
-msgstr "обавезно је навести бар две датотеке"
+msgstr "најмање две датотеке морају бити наведене"
-#: src/msgcomm.c:363
-#, fuzzy, c-format, no-wrap
+#: src/msgcomm.c:364
+#, c-format, no-wrap
msgid ""
"Find messages which are common to two or more of the specified PO files.\n"
"By using the --more-than option, greater commonality may be requested\n"
@@ -1533,86 +1566,86 @@ msgid ""
"PO file to define them. File positions from all PO files will be\n"
"cumulated.\n"
msgstr ""
-"Налази поруке заједничке за две или више ПО датотека. Употребом опције\n"
-"--more-than, захтева се већа учесталост пре исписа порука. Насупрот томе,\n"
-"опција --less-than се користи за мању учесталост пре исписа порука (нпр.\n"
-"--less-than=2 ће исписати само јединствене поруке). Преводи, примедбе и\n"
-"извучене примедбе ће се очувати, али само из прве ПО датотеке која их \n"
-"дефинише. Положаји у датотекама из свих ПО датотека ће се гомилати.\n"
+"Пронађите поруке које су заједничке за две или више ПО датотека.\n"
+"Употребом опције „--more-than“, можете тражити већу учесталост пре\n"
+"исписа порука. Насупрот томе, опцију „--less-than“ можете користити\n"
+"за тражење мање учесталости пре исписа порука (нпр. „--less-than=2“\n"
+"ће исписати само јединствене поруке). Преводи, примедбе и извучене\n"
+"примедбе ће бити сачуване, али само из прве ПО датотеке која их\n"
+"одређује. Положаји датотека из свих ПО датотека ће се збрајати.\n"
-#: 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 ""
-" ->, --more-than=БРОЈ испиши поруке са више од оволико дефиниција,\n"
-" уобичајено је 1 ако није постављено\n"
+" ->, --more-than=БРОЈ исписује поруке са више од оволико одредница,\n"
+" подразумева се 1 ако није постављено\n"
-#: src/msgcomm.c:451 src/xgettext.c:981
-#, fuzzy, c-format
+#: src/msgcomm.c:452 src/xgettext.c:1004
+#, c-format
msgid ""
" --omit-header don't write header with 'msgid \"\"' entry\n"
msgstr ""
-" --omit-header изостави заглавље са пољем „msgid \"\"“\n"
+" --omit-header изоставља заглавље са пољем „msgid \"\"“\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
-msgstr "Претвара каталог превода у друго кодирање знакова.\n"
+msgstr "Претворите текст превода из једног кодирања у друго.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
-msgstr "Одредиште претварања:\n"
+msgstr "Мета претварања:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
-msgstr "Подразумевано кодирање је кодирање текућег локалитета.\n"
+msgstr "Задато кодирање је кодирање текућег локалитета.\n"
-#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
#, c-format
msgid " -i, --indent indented output style\n"
-msgstr " -i, --indent стил излаза са увлачењем\n"
+msgstr " -i, --indent увучени изглед излаза\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
-msgstr " --no-location избаци редове „#: датотека:ред“\n"
+msgstr " --no-location избацује редове „#: датотека:ред“\n"
-#: src/msgconv.c: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 ""
-" --add-location сачувај редове „#: датотека:"
-"ред“ (подразумевано)\n"
+" -n, --add-location чува редове „#: датотека:ред“ (основно)\n"
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
-msgstr " --strict строги Унифорум стил исписа\n"
+msgstr " --strict изричито Униорумски стил излаза\n"
-#: 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 "није наведена улазна датотека"
+msgstr "није дата улазна датотека"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
-msgstr "неопходна је тачно једна улазна датотека"
+msgstr "потребна је тачно једна улазна датотека"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
-msgstr "Употреба: %s [ОПЦИЈА] УЛАЗНА-ДАТОТЕКА\n"
+msgstr "Употреба: %s [ОПЦИЈА]... УЛАЗНАДАТОТЕКА\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1620,20 +1653,20 @@ msgid ""
"xgettext). Untranslated entries are assigned a translation that is\n"
"identical to the msgid.\n"
msgstr ""
-"Образује каталог енглеског превода. Улазна датотека је последње \n"
-"направљена енглеска ПО датотека, или датотека са ПО шаблоном (обично\n"
-"направљена помоћу xgettext-а). Непреведена поља добијају превод \n"
-"идентичан са msgid.\n"
+"Направите каталог енглеског превода. Улазна датотека је последња\n"
+"направљена енглеска ПО датотека, или датотека ПО шаблона (обично\n"
+"направљена „xgettext“-ом). Непреведеним пољима се додељује превод\n"
+"идентичан са „msgid“.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
-msgstr " УЛАЗНА-ДАТОТЕКА улазна PO или POT датотека\n"
+msgstr " УЛАЗНАДАТОТЕКА улазна по или пот датотека\n"
#: src/msgexec.c:196
#, c-format
msgid "missing command name"
-msgstr "недостаје име наредбе"
+msgstr "недостаје назив наредбе"
#: src/msgexec.c:257
#, c-format
@@ -1649,10 +1682,10 @@ msgid ""
"msgexec's output. msgexec's return code is the maximum return code\n"
"across all invocations.\n"
msgstr ""
-"Примењује наредбу на све преводе у каталогу превода. НАРЕДБА може бити\n"
+"Примените наредбу на све преводе у каталогу превода. НАРЕДБА може бити\n"
"било који програм који чита превод са стандардног улаза. Покреће се по\n"
-"једном за сваки превод. Његов излаз постаје улаз msgexec-а. Повратни\n"
-"код msgexec-а је највећи повратни код кроз све позиве програма.\n"
+"једном за сваки превод. Његов излаз постаје улаз „msgexec“-а. Повратни\n"
+"код „msgexec“-а је највећи повратни код кроз све позиве програма.\n"
#: src/msgexec.c:271
#, c-format, no-wrap
@@ -1663,137 +1696,159 @@ msgstr ""
"Нарочита уграђена наредба звана „0“ исписује превод, праћен нула-бајтом.\n"
"Излаз „msgexec 0“ је погодан као улаз за „xargs -0“.\n"
-#: 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 " -i, --input=УЛАЗНА-ДАТОТЕКА улазна ПО датотека\n"
+msgstr " -i, --input=УЛАЗНА-ДАТОТЕКА улазна ПО датотека\n"
#: src/msgexec.c:345
#, c-format
msgid "write to stdout failed"
-msgstr "неуспешан упис на стандардни излаз"
+msgstr "није успело писање на стандардни излаз"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
-msgstr "недостаје име филтера"
+msgstr "недостаје назив пропусника"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
-msgstr "обавезно је навести бар један sed спис"
+msgstr "најмање један седов спис мора бити наведен"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr "Употреба: %s [ОПЦИЈА] ФИЛТЕР [ОПЦИЈЕ-ФИЛТЕРА]\n"
+msgstr "Употреба: %s [ОПЦИЈА] ПРОПУСНИК [ОПЦИЈА-ПРОПУСНИКА]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr "Примењује филтер на све преводе из каталога превода.\n"
+msgstr "Примените пропусник на све преводе из каталога превода.\n"
-#: 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 ""
-"ФИЛТЕР може бити било који програм који чита превод са стандардног улаза\n"
-"и уписује измењени превод на стандардни излаз.\n"
+"ПРОПУСНИК може бити било који програм који чита превод са стандардног\n"
+"улаза и пише измењени превод на стандардни излаз.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
-msgstr "Корисне ОПЦИЈЕ-ФИЛТЕРа када је ФИЛТЕР „sed“:\n"
+msgstr "Корисне ОПЦИЈЕ-ПРОПУСНИКА када је сед ПРОПУСНИК:\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
-msgstr " -e, --expression=СПИС додај СПИС међу наредбе за извршавање\n"
+msgstr ""
+" -e, --expression=СПИС додаје СПИС наредбама да би биле извршене\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
"commands\n"
" to be executed\n"
msgstr ""
-" -f, --file=ДАТОТЕКА-СПИСА додај садржај ДАТОТЕКА-СПИСА међу наредбе\n"
-" које се извршавају\n"
+" -f, --file=ДАТОТЕКАСПИСА додаје садржај ДАТОТЕКЕСПИСА наредбама\n"
+" да би биле извршене\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
-" -n, --quiet, --silent избаци аутоматски испис простора шаблона\n"
+" -n, --quiet, --silent обуставља аутоматски испис простора образаца\n"
-#: 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 ""
-" --no-escape не користи C истицање у излазу "
-"(подразумевано)\n"
+" --no-escape не користи Ц знаке промене реда у излазу "
+"(задато)\n"
-#: 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 " --indent стил излаза са увлачењем\n"
+msgstr " --indent увучени изглед излаза\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
msgstr ""
" --keep-header не мењај поље са заглављем, не филтрирај га\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
-msgstr "аргумент за %s треба да буде један интерпункцијски знак"
+msgstr "аргумент за „%s“ треба да буде знак једне тачке"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
-msgstr ""
+msgstr "неисправан поредак од мањег: %s"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
+#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
msgid "Ulrich Drepper"
-msgstr ""
+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 "не треба бити дата ниједна улазна датотека ако су наведени „%s“ и „%s“"
+
+#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
#: src/msgunfmt.c:353
#, c-format
msgid "%s requires a \"-d directory\" specification"
-msgstr "за %s је обавезно навести „-d директоријум“"
+msgstr "„%s“ захтева одредницу „-d директоријум“"
-#: 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 "за %s је обавезно навести „-l локалитет“"
+msgstr "„%s“ захтева одредницу „-l језик“"
-#: 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 "„%s“ захтева одредницу „--template шаблон“"
+
+#: src/msgfmt.c:545
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "„%s“ захтева одредницу „-o датотека“"
+
+#: src/msgfmt.c:551
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "„%s“ и „%s“ се међусобно искључују у „%s“"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
-msgstr "%s је једино исправно уз %s или %s"
+msgstr "%s је исправно само са %s или %s"
-#: 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 "%s је једино исправно уз %s, %s или %s"
+msgstr "%s је исправно само са %s, %s или %s"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
-msgstr ""
+msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
@@ -1801,15 +1856,15 @@ msgstr[0] "%d преведена порука"
msgstr[1] "%d преведене поруке"
msgstr[2] "%d преведених порука"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
-msgstr[0] ", %d нејасна порука"
-msgstr[1] ", %d нејасне поруке"
-msgstr[2] ", %d нејасних порука"
+msgstr[0] ", %d нејсан превод"
+msgstr[1] ", %d нејасна превода"
+msgstr[2] ", %d нејсаних превода"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
@@ -1817,116 +1872,136 @@ msgstr[0] ", %d непреведена порука"
msgstr[1] ", %d непреведене поруке"
msgstr[2] ", %d непреведених порука"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Употреба: %s [ОПЦИЈА] датотека.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
-msgstr "Образуј бинарни каталог порука из текстуалног описа превода.\n"
+msgstr "Створите бинарни каталог порука из текстуалног описа превода.\n"
-#: 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 ""
-"Обавезни аргументи за дуге опције су обавезни и за кратке опције.\n"
-"Слично за необавезне аргументе.\n"
+"Обавезни аргументи за дуге опције су такође обавезни и за кратке опције.\n"
+"Слично и за аргументе избора.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
msgid " filename.po ... input files\n"
msgstr " датотека.po ... улазне датотеке\n"
-#: 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 "Режим рада:\n"
+msgstr "Начин рада:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
"class\n"
msgstr ""
-" -j, --java Јава режим: образуј Јава класу ResourceBundle\n"
+" -j, --java режим Јаве: ствара Јавин разред „Група "
+"изворишта“\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
"higher)\n"
msgstr ""
-" --java2 налик --java, и претпостави Јава2 (JDK 1.2 или "
+" --java2 као --java, и претпоставља Јаву2 (ЈДК 1.2 или "
"новији)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
-msgstr " --csharp C# режим: образуј .NET .dll датотеку\n"
+msgstr ""
+" --csharp Ц# режим: ствара .НЕТ-ову „.dll“ датотеку\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
"file\n"
msgstr ""
-" --csharp-resources Режим са C# ресурсима: образује .NET ."
-"resources датотеку\n"
+" --csharp-resources Режим Ц# изворишта: ствара .НЕТ-ову „."
+"resources“ датотеку\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
-" --tcl Tcl режим: образуј tcl/msgcat .msg датотеку\n"
+" --tcl Тцл режим: ствара тцл/мсгкат-ову „.msg“ "
+"датотеку\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
-msgstr " --qt Qt режим: образуј Qt .qm датотеку\n"
+msgstr ""
+" --qt Кут режим: ствара Кутову „.qm“ датотеку\n"
+
+#: src/msgfmt.c:811
+#, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+" --desktop Режим Десктоп уноса: ствара „.desktop“ "
+"датотеку\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
-msgstr " --strict омогући строг Унифорум режим\n"
+msgstr " --strict укључује изричити режим Унифорума\n"
-#: 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 "Уколико је излазна датотека „-“, испис се врши на стандардни излаз.\n"
+msgstr "Ако је излазна датотека -, излаз се записује на стандардни излаз.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Путања излазне датотеке у Јава режиму:\n"
-#: 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 " -r, --resource=РЕСУРС име ресурса\n"
+msgstr " -r, --resource=ИЗВОРИШТЕ назив изворишта\n"
-#: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
-#: src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
+#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr ""
-" -l, --locale=ЛОКАЛИТЕТ име локалитета, или језик или језик_ДРЖАВА\n"
+" -l, --locale=ЛОКАЛИТЕТ назив локалитета, било језик или језик_ДРЖАВА\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --source ствара датотеку „.java“ уместо „.class“\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
" -d ДИРЕКТОРИЈУМ основни директоријум за хијерархију \n"
-" директоријума класе\n"
+" директоријума разреда\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1934,44 +2009,46 @@ msgid ""
"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
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
-msgstr "Путања излазне датотеке у C# режиму:\n"
+msgstr "Путања излазне датотеке у Ц# режиму:\n"
-#: 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 ""
-" -d ДИРЕКТОРИЈУМ основни директоријум за .dll за локалитет\n"
+" -d ДИРЕКТОРИЈУМ основни директоријум за .dll датотеке од "
+"локалитета зависне\n"
-#: 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 ""
-"Опције -l и -d су обавезне. Датотека .dll се уписује у поддиректоријум \n"
-"датог директоријума чије име зависи од локалитета.\n"
+"Опције -l и -d су обавезне. Датотека .dll се уписује у поддиректоријум\n"
+"датог директоријума чији назив зависи од локалитета.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
-msgstr "Путања излазне датотеке у Tcl режиму:\n"
+msgstr "Путања излазне датотеке у Тцл режиму:\n"
-#: 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 ""
-" -d ДИРЕКТОРИЈУМ основни директоријум .msg каталога порука\n"
+" -d ДИРЕКТОРИЈУМ основни директоријум каталога .msg порука\n"
-#: 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"
@@ -1979,77 +2056,118 @@ msgid ""
msgstr ""
"Опције -l и -d су обавезне. Датотека .msg се уписује у дати директоријум.\n"
-#: src/msgfmt.c:745 src/xgettext.c:882
+#: src/msgfmt.c:861
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr "Могућности режима Десктоп уноса:\n"
+
+#: src/msgfmt.c:867
+#, c-format
+msgid " --template=TEMPLATE a .desktop file used as a template\n"
+msgstr ""
+" --template=ШАБЛОН „.desktop“ датотека која се користи као "
+"шаблон\n"
+
+#: src/msgfmt.c:869
+#, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr ""
+" -d ДИРЕКТОРИЈУМ основни директоријум „.po“ датотека\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -kРЕЧ, --keyword=РЕЧ тражи РЕЧ као додатну кључну реч\n"
+" -k, --keyword не користи задате кључне речи\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+"Опције „-l“, „-o“ и „--template“ су обавезне. Ако је наведено „-D“, улазне\n"
+"датотеке се читају из директоријума уместо из аргумената линије наредби.\n"
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
-msgstr "Обрада улазне датотеке:\n"
+msgstr "Тумачење улазне датотеке:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
" --check-format, --check-header, --check-"
"domain\n"
msgstr ""
-" -c, --check изврши све провере које подразумевају\n"
-" --check-format, --check-header, --check-"
+" -c, --check извршава све провере које подразумевају\n"
+" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
-" --check-format провери ниске формата у зависности од језика\n"
+" --check-format проверава ниске записа у зависности од "
+"језика\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
-msgstr " --check-header провери присуство и садржај заглавља\n"
+msgstr ""
+" --check-header проверава присуство и садржај заглавља\n"
-#: 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 ""
-" --check-domain провери сударе међу директивама домена и\n"
-" опције --output-file\n"
+" --check-domain проверава сукобе међу смерницама домена "
+"и\n"
+" опције „--output-file“\n"
-#: 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 ""
-" -C, --check-compatibility провери да ли се ГНУ msgfmt понаша као \n"
-" X/Open msgfmt\n"
+" -C, --check-compatibility проверава да ли се Гнуов мсгфмт понаша "
+"као \n"
+" Икс/Опен мсгфмт\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
"for\n"
" menu items\n"
msgstr ""
-" --check-accelerators[=ЗНАК] провери присуство пречица са тастатуре "
-"у \n"
-" ставкама менија\n"
+" --check-accelerators[=ЗНАК] проверава присуство пречица тастатуре "
+"у ставкама изборника\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
-msgstr " -f, --use-fuzzy користи нејасне преводе у излазу\n"
+msgstr " -f, --use-fuzzy користи нејасне уносе на излазу\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
-" -a, --alignment=БРОЈ поравнај ниске на БРОЈ бајтова (обично: %d)\n"
+" -a, --alignment=БРОЈ поравнава ниске на БРОЈ бајтова (обично: "
+"%d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2057,95 +2175,111 @@ msgid ""
" (big or little, default depends on "
"platform)\n"
msgstr ""
+" --endianness=ПОРЕДАКБАЈТОВА пише 32-битне бројеве по датом редоследу "
+"бајтова\n"
+" (велики или мали, у зависности од "
+"платформе)\n"
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
-" --no-hash бинарна датотека неће садржати хеш табелу\n"
+" --no-hash бинарна датотека неће садржати хеш "
+"табелу\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
-msgstr " --statistics испиши статистичке податке о преводима\n"
+msgstr " --statistics исписује статистику о преводима\n"
-#: 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 " -v, --verbose опширнији испис\n"
+msgstr " -v, --verbose повећава ниво опширности\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
-msgstr "упозорење: недостаје или је неисправно заглавље PO датотеке\n"
+msgstr "упозорење: заглавље по датотеке недостаје или је неисправно\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "упозорење: претварање скупа знакова неће радити\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
-msgstr "упозорење: заглавље PO датотеке је нејасно\n"
+msgstr "упозорење: заглавље по датотеке је нејасно\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "упозорење: старија издања msgfmt-а ће овде наићи на грешку\n"
+msgstr "упозорење: старија издања мсгфмт-а ће овде наићи на грешку\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
-msgstr "име домена „%s“ није прикладно за име датотеке"
+msgstr "назив домена „%s“ није прикладан за назив датотеке"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "име домена „%s“ није прикладно за име датотеке: користићу префикс"
+msgstr "назив домена „%s“ није прикладан за назив датотеке: користићу префикс"
-#: src/msgfmt.c:955
-#, fuzzy, c-format
+#: src/msgfmt.c:1095
+#, c-format
msgid "'domain %s' directive ignored"
-msgstr "занемарена директива „domain %s“"
+msgstr "смерница „domain %s“ је занемарена"
-#: src/msgfmt.c:1015
-#, fuzzy, c-format
+#: src/msgfmt.c:1155
+#, c-format
msgid "empty 'msgstr' entry ignored"
-msgstr "занемарен унос са празним „msgstr“"
+msgstr "празан „msgstr“ унос је занемарен"
-#: src/msgfmt.c:1016
-#, fuzzy, c-format
+#: src/msgfmt.c:1156
+#, c-format
msgid "fuzzy 'msgstr' entry ignored"
-msgstr "занемарен нејасан „msgstr“ унос"
+msgstr "нејасан „msgstr“ унос је занемарен"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s: упозорење: изворна датотека садржи нејасне преводе"
+msgstr "%s: упозорење: изворна датотека садржи нејасан превод"
+
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr "Не постоји „%s“"
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr "„%s“ постоји али је не могу прочитати"
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-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 "грешка при читању „%s“"
-#: src/msggrep.c:496
-#, fuzzy, c-format
+#: src/msggrep.c:501
+#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
"specified"
msgstr ""
-"опција „%c“ се не може користити пре него што се наведе „K“, „Т“ или „C“"
+"опција „%c“ се не може користити пре него што се наведе „J“ или „K“ или „T“ "
+"или „C“ или „X“"
-#: 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"
@@ -2154,8 +2288,8 @@ msgstr ""
"Извлачи све поруке из каталога превода које одговарају датом шаблону\n"
"или припадају одређеним изворним датотекама.\n"
-#: src/msggrep.c:542
-#, fuzzy, c-format, no-wrap
+#: src/msggrep.c:547
+#, c-format, no-wrap
msgid ""
"Message selection:\n"
" [-N SOURCEFILE]... [-M DOMAINNAME]...\n"
@@ -2194,51 +2328,58 @@ msgid ""
" selection criterion\n"
msgstr ""
"Избор поруке:\n"
-" [-N ИЗВОР]... [-M ИМЕ-ДОМЕНА]...\n"
-" [-K MSGID-ШАБЛОН] [-T MSGSTR-ШАБЛОН] [-C ШАБЛОН-ПРИМЕДБЕ]\n"
-"Порука се бира уколико долази из неке од изабраних изворних датотека, или\n"
-"ако долази из неког од наведених домена, или\n"
-"ако је дато -K и њен кључ (msgid или msgid_plural) одговара MSGID-ШАБЛОН, или\n"
-"ако је дато -T и њен превод (msgstr) одговара MSGSTR-ШАБЛОН, или\n"
-"ако је дато -C и примедба за преводиоце одговара ШАБЛОН-ПРИМЕДБЕ.\n"
+" [-N ИЗВОРНАДАТОТЕКА]... [-M НАЗИВДОМЕНА]...\n"
+" [-J МСГЦТХТ-ШАБЛОН] [-K МСГИД-ШАБЛОН] [-T МСГСТР-ШАБЛОН]\n"
+" [-C ШАБЛОН-НАПОМЕНЕ] [-X ШАБЛОН-ИЗВУЧЕНЕ-НАПОМЕНЕ]\n"
+"Порука је изабрана ако долази из једне од наведених изворних датотека,\n"
+"или ако долази из из једног од наведених домена,\n"
+"или ако је дато -J и његов контекст (msgctxt) одговара МСГЦТХТ-ШАБЛОНУ,\n"
+"или ако је дато -K и његов кључ (msgid или msgid_plural) одговара МСГИД-ШАБЛОНУ,\n"
+"или ако је дато -T и његов превод (msgstr) одговара МСГСТР-ШАБЛОНУ,\n"
+"или ако је дато -C и напомена преводиоца одговара ШАБЛОНУ-НАПОМЕНЕ,\n"
+"или ако је дато -X и извучена напомена одговараШАБЛОНУ-ИЗВУЧЕНЕ-НАПОМЕНЕ.\n"
"\n"
-"Када је наведено више од једног критеријума избора, скуп изабраних порука\n"
-"чини унију изабраних порука помоћу сваког критеријума.\n"
+"Када је наведено више од једног услова избора, скуп изабраних порука\n"
+"је унија изабраних порука сваког услова.\n"
"\n"
-"Синтакса за MSGID-ШАБЛОН или MSGSTR-ШАБЛОН:\n"
+"синтакса МСГЦТХТ-ШАБЛОНА или МСГИД-ШАБЛОНА или МСГСТР-ШАБЛОНА или ШАБЛОНА-НАПОМЕНЕ\n"
+"или ШАБЛОНА-ИЗВУЧЕНЕ-НАПОМЕНЕ:\n"
" [-E | -F] [-e ШАБЛОН | -f ДАТОТЕКА]...\n"
-"ШАБЛОНи су обично основни регуларни изрази, или проширени регуларни изрази\n"
-"када је дато -E, или дословне ниске када је дато -F.\n"
+"ШАБЛОНИ су подразумевано основни регуларни изрази, или проширени регуларни изрази\n"
+"ако је дато -E, или сталне ниске ако је дато -F.\n"
"\n"
-" -N, --location=ИЗВОР изабери поруке извучене из ИЗВОРа\n"
-" -M, --domain=ИМЕ-ДОМЕНА изабери поруке које припадају домену ИМЕ-ДОМЕНА\n"
-" -K, --msgid почетак шаблона за msgid\n"
-" -T, --msgstr почетак шаблона за msgstr\n"
-" -C, --comment почетак шаблона за примедбе преводиоцима\n"
-" -E, --extended-regexp ШАБЛОН је проширени регуларни израз\n"
-" -F, --fixed-strings ШАБЛОН је скуп ниски у посебним редовима\n"
-" -e, --regexp=ШАБЛОН користи ШАБЛОН као регуларни израз\n"
-" -f, --file=ДАТОТЕКА преузми ШАБЛОН из ДАТОТЕКА\n"
-" -i, --ignore-case занемари разлике величине слова\n"
-
-#: src/msggrep.c:597
+" -N, --location=ИЗВОРНАДАТОТЕКА бира поруке извучене из ИЗВОРНЕДАТОТЕКЕ\n"
+" -M, --domain=НАЗИВДОМЕНА бира поруке које припадају домену НАЗИВДОМЕНА\n"
+" -J, --msgctxt почетак шаблона за мсгцтхт\n"
+" -K, --msgid почетак шаблона за мсгид\n"
+" -T, --msgstr почетак шаблона за мсгстр\n"
+" -C, --comment почетак шаблона за напомене преводиоца\n"
+" -X, --extracted-comment почетак шаблона за извучену напомену\n"
+" -E, --extended-regexp ШАБЛОН је проширени регуларни израз\n"
+" -F, --fixed-strings ШАБЛОН је скуп ниски раздвојених новим редом\n"
+" -e, --regexp=ШАБЛОН користи ШАБЛОН као регуларан израз\n"
+" -f, --file=ДАТОТЕКА доноси ШАБЛОН из ДАТОТЕКЕ\n"
+" -i, --ignore-case занемарује разликовање величине слова\n"
+" -v, --invert-match исписује само поруке које не одговарају\n"
+" ни једном услову избора\n"
+
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
msgstr ""
-" --escape користи C истицање у излазу, без проширених \n"
-" знакова\n"
+" --escape користи Ц знаке промене реда у излазу, без "
+"проширених знакова\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
-msgstr " --sort-output образуј поређан излаз\n"
+msgstr " --sort-output ствара уређени излаз\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
-msgstr ""
-" --sort-by-file поређај излаз према положају у датотеци\n"
+msgstr " --sort-by-file ређа излаз према месту датотеке\n"
#: src/msginit.c:297
msgid ""
@@ -2246,8 +2387,8 @@ msgid ""
"your LANG environment variable, as described in the ABOUT-NLS\n"
"file. This is necessary so you can test your translations.\n"
msgstr ""
-"Користите окружење независно од језика. Поставите променљиву \n"
-"окружења LANG, како је описано у датотеци ABOUT-NLS. Ово је\n"
+"Ви користите окружење независно од језика. Поставите променљиву \n"
+"окружења „LANG“, како је описано у датотеци „ABOUT-NLS“. Ово је\n"
"неопходно ради испробавања ваших превода.\n"
#: src/msginit.c:321
@@ -2264,7 +2405,7 @@ msgstr ""
#: src/msginit.c:347
#, c-format
msgid "Created %s.\n"
-msgstr "Направих %s.\n"
+msgstr "Направио је %s.\n"
#: src/msginit.c:367
#, c-format, no-wrap
@@ -2272,13 +2413,13 @@ msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr ""
-"Образујем нову ПО датотеку, постављајући мета податке помоћу вредности из \n"
-"окружења корисника.\n"
+"Стварам нову ПО датотеку, постављајући мета податке помоћу вредности из\n"
+"корисничког окружења.\n"
#: src/msginit.c:377
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
-msgstr " -i, --input=УЛАЗНА-ДАТОТЕКА улазна ПОТ датотека\n"
+msgstr " -i, --input=УЛАЗНАДАТОТЕКА улазна ПОТ датотека\n"
#: src/msginit.c:379
#, c-format
@@ -2287,13 +2428,13 @@ msgid ""
"file.\n"
"If it is -, standard input is read.\n"
msgstr ""
-"Уколико није дата улазна датотека, тражићу ПОТ датотеку у текућем \n"
-"директоријуму. Уколико је „-“, читам стандардни улаз.\n"
+"Уколико улазна датотека није дата, текући директоријум се претражује за\n"
+"ПОТ датотеком. Уколико је „-“, чита се стандардни улаз.\n"
#: src/msginit.c:385
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
-msgstr " -o, --output-file=ДАТОТЕКА испиши излаз у наведену ПО датотеку\n"
+msgstr " -o, --output-file=ДАТОТЕКА исписује излаз у наведену ПО датотеку\n"
#: src/msginit.c:387
#, c-format
@@ -2301,49 +2442,49 @@ 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"
-"подешавања корисниковог локалитета. Ако је „-“, резултат исписујем на\n"
+"Уколико излазна датотека није дата, зависи од опције „--locale“ или од\n"
+"подешавања корисничког локалитета. Ако је „-“, резултат се исписује на\n"
"стандардни излаз.\n"
#: src/msginit.c:400
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
-msgstr " -l, --locale=ЈЈ_ДД постави одредишни локалитет\n"
+msgstr " -l, --locale=ЈЈ_ДД поставља одредишни локалитет\n"
#: src/msginit.c:402
#, c-format
msgid ""
" --no-translator assume the PO file is automatically generated\n"
msgstr ""
-" --no-translator претпостави да је ПО датотека самоизграђена\n"
+" --no-translator претпоставља да је ПО датотека самоизграђена\n"
#: src/msginit.c:468
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-"Нађох више од једне .pot датотеке.\n"
-"Наведите улазну .pot датотеку помоћу опције --input.\n"
+"Нађох више од једне .пот датотеке.\n"
+"Наведите улазну .пот датотеку помоћу опције „--input“.\n"
#: src/msginit.c:476 src/msginit.c:481
#, c-format
msgid "error reading current directory"
-msgstr "грешка при читању текућег директоријума"
+msgstr "грешка читања текућег директоријума"
#: src/msginit.c:489
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
msgstr ""
-"Не нађох .pot датотеку у текућем директоријуму.\n"
-"Наведите улазну .pot датотеку помоћу опције --input.\n"
+"Не нађох .пот датотеку у текућем директоријуму.\n"
+"Наведите улазну .пот датотеку помоћу опције „--input“.\n"
#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
-msgstr "неуспешан подпроцес %s са повратним кодом %d"
+msgstr "%s: потпроцес није успео са излазном шифром %d"
#: src/msginit.c:1118
msgid ""
@@ -2353,10 +2494,11 @@ msgid ""
"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 ...",
@@ -2364,12 +2506,12 @@ msgstr ""
#: src/msginit.c:1534
#, c-format
msgid "English translations for %s package"
-msgstr "енглески преводи за пакет %s"
+msgstr "Преводи на српски језик за пакет „%s“"
#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
#, c-format
msgid "present charset \"%s\" is not a portable encoding name"
-msgstr "присутни скуп знакова „%s“ не чини име преносивог кодирања"
+msgstr "присутни скуп знакова „%s“ није назив преносивог кодирања"
#: src/msgl-cat.c:188 src/msgl-iconv.c:259
#, c-format
@@ -2377,13 +2519,13 @@ msgid "two different charsets \"%s\" and \"%s\" in input file"
msgstr "два различита скупа знакова „%s“ и „%s“ у улазној датотеци"
#: src/msgl-cat.c:203
-#, fuzzy, c-format
+#, c-format
msgid ""
"input file '%s' doesn't contain a header entry with a charset specification"
msgstr "улазна датотека „%s“ не садржи поље заглавља са ознаком скупа знакова"
#: src/msgl-cat.c:207
-#, fuzzy, c-format
+#, c-format
msgid ""
"domain \"%s\" in input file '%s' doesn't contain a header entry with a "
"charset specification"
@@ -2394,11 +2536,11 @@ msgstr ""
#: 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
-#: src/xgettext.c:3051
+#: src/xgettext.c:544 src/xgettext.c:3418
#, c-format
msgid "warning: "
msgstr "упозорење: "
@@ -2409,7 +2551,8 @@ msgid ""
"Input files contain messages in different encodings, UTF-8 among others.\n"
"Converting the output to UTF-8.\n"
msgstr ""
-"Улазне датотеке садрже поруке у разним кодирањима, између осталих и УТФ-8.\n"
+"Улазне датотеке садрже поруке у разним кодирањима, између осталих и у "
+"УТФ-8.\n"
"Претварам излаз у УТФ-8.\n"
#: src/msgl-cat.c:449
@@ -2420,10 +2563,10 @@ msgid ""
"Converting the output to UTF-8.\n"
"To select a different output encoding, use the --to-code option.\n"
msgstr ""
-"Улазне датотеке садрже поруке у разним кодирањима, између осталих у %s и "
+"Улазне датотеке садрже поруке у разним кодирањима, између осталих и у %s и "
"%s.\n"
"Претварам излаз у УТФ-8.\n"
-"Да изаберете другачије кодирање излаза, користите опцију --to-code.\n"
+"Да изаберете другачије кодирање излаза, користите опцију „--to-code“.\n"
#: src/msgl-cat.c:488
#, c-format
@@ -2433,6 +2576,10 @@ 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 кодирање мења\n"
+"неке мсгид или мсгцтхт поруке.\n"
+"Или промените све мсгид и мсгцтхт поруке у чисти АСКРИ, или осигурајте\n"
+"да су од самог почетка кодиране у УТФ-8, тј. већ вашим изворним датотекама.\n"
#: src/msgl-charset.c:93
#, c-format
@@ -2444,13 +2591,13 @@ msgid ""
msgstr ""
"Скуп знакова „%s“ локалитета се разликује од \n"
"улазног скупа знакова „%s“.\n"
-"Излаз „%s“-а може бити нетачан.\n"
+"Излаз за „%s“ може бити нетачан.\n"
"Могућа решења су:\n"
#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr "- Поставите LC_ALL на локалитет са кодирањем %s.\n"
+msgstr "— Поставите „LC_ALL“ на локалитет са кодирањем %s.\n"
#: src/msgl-charset.c:105
#, c-format
@@ -2471,7 +2618,7 @@ msgid ""
" then apply '%s',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-"— Поставите LC_ALL на локалитет са кодирањем %s,\n"
+"— Поставите „LC_ALL“ на локалитет са кодирањем %s,\n"
" претворите каталог превода у %s помоћу „msgconv“,\n"
" затим примените „%s“,\n"
" и онда претворите назад у %s помоћу „msgconv“.\n"
@@ -2483,9 +2630,9 @@ msgid ""
"Output of '%s' might be incorrect.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-"Скуп знакова локалитета „%s“ не чини преносно име кодирања.\n"
-"Излаз из „%s“-а може бити нетачан.\n"
-"Могуће решење је да поставите LC_ALL=C.\n"
+"Скуп знакова локалитета „%s“ не чини преносни назив кодирања.\n"
+"Излаз за „%s“ може бити нетачан.\n"
+"Могуће решење је да поставите „LC_ALL=C“.\n"
#: src/msgl-check.c:130
msgid "plural expression can produce negative values"
@@ -2494,15 +2641,15 @@ 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"
-msgstr "израз за множине може проузроковати дељење нулом"
+msgstr "израз за множине може дати дељење нулом"
#: src/msgl-check.c:192
msgid "plural expression can produce integer overflow"
-msgstr "израз за множине може проузроковати прекорачење опсега целих бројева"
+msgstr "израз за множине може проузроковати прекорачење целих бројева"
#: src/msgl-check.c:197
msgid ""
@@ -2512,51 +2659,48 @@ msgstr ""
"израз за множине може проузроковати аритметичке изузетке, нпр. дељење нулом"
#: src/msgl-check.c:266
-#, fuzzy, c-format
+#, c-format
msgid "Try using the following, valid for %s:"
-msgstr "Покушајте да користите следеће, исправно за %s:\n"
+msgstr "Покушајте да користите следеће, исправно за %s:"
#: src/msgl-check.c:358 src/msgl-check.c:382
-#, fuzzy
msgid "message catalog has plural form translations"
-msgstr "каталог порука садржи преводе облика за множину..."
+msgstr "каталог порука садржи преводе облика за множину"
#: src/msgl-check.c:360
-#, fuzzy
msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr "...али у заглављу недостаје поље „plural=ИЗРАЗ“"
+msgstr "али у заглављу недостаје поље „plural=ИЗРАЗ“"
#: src/msgl-check.c:384
-#, fuzzy
msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr "...али у заглављу недостаје поље „nplurals=БРОЈ“"
+msgstr "али у заглављу недостаје поље „nplurals=БРОЈ“"
#: src/msgl-check.c:420
msgid "invalid nplurals value"
-msgstr "недозвољена вредност за nplurals"
+msgstr "неисправна вредност за број множина"
#: src/msgl-check.c:442
msgid "invalid plural expression"
-msgstr "недозвољен израз за plural"
+msgstr "неисправан израз множине"
#: src/msgl-check.c:472 src/msgl-check.c:488
-#, fuzzy, c-format
+#, c-format
msgid "nplurals = %lu"
-msgstr "nplurals = %lu..."
+msgstr "nplurals = %lu"
#: src/msgl-check.c:474
-#, fuzzy, c-format
+#, c-format
msgid "but some messages have only one plural form"
msgid_plural "but some messages have only %lu plural forms"
-msgstr[0] "али неке поруке имају само један облик за множину"
+msgstr[0] "али неке поруке имају само %lu облик за множину"
msgstr[1] "али неке поруке имају само %lu облика за множину"
msgstr[2] "али неке поруке имају само %lu облика за множину"
#: src/msgl-check.c:490
-#, fuzzy, c-format
+#, c-format
msgid "but some messages have one plural form"
msgid_plural "but some messages have %lu plural forms"
-msgstr[0] "али неке поруке имају један облик за множину"
+msgstr[0] "али неке поруке имају %lu облик за множину"
msgstr[1] "али неке поруке имају %lu облика за множину"
msgstr[2] "али неке поруке имају %lu облика за множину"
@@ -2569,81 +2713,77 @@ msgstr ""
"Forms: nplurals=БРОЈ; plural=ИЗРАЗ;“"
#: src/msgl-check.c:611
-#, fuzzy
msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
-msgstr "не почиње и „msgid“ и „msgid_plural“ са „\\n“"
+msgstr "„msgid“ и „msgid_plural“ не почињу оба са „\\n“"
#: src/msgl-check.c:619
-#, fuzzy, c-format
+#, c-format
msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "не почиње и „msgid“ и „msgstr[%u]“ са „\\n“"
+msgstr "„msgid“ и „msgstr[%u]“ не почињу оба са „\\n“"
#: src/msgl-check.c:634
-#, fuzzy
msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
-msgstr "не почиње и „msgid“ и „msgstr“ са „\\n“"
+msgstr "„msgid“ и „msgstr“ не почињу оба са „\\n“"
#: src/msgl-check.c:652
-#, fuzzy
msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
-msgstr "не завршава се и „msgid“ и „msgid_plural“ са „\\n“"
+msgstr "„msgid“ и „msgid_plural“ не завршавају се оба са „\\n“"
#: src/msgl-check.c:660
-#, fuzzy, c-format
+#, c-format
msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
-msgstr "не завршава се и „msgid“ и „msgstr[%u]“ са „\\n“"
+msgstr "„msgid“ и „msgstr[%u]“ не завршавају се оба са „\\n“"
#: src/msgl-check.c:675
-#, fuzzy
msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
-msgstr "не завршава се и „msgid“ и „msgstr“ са „\\n“"
+msgstr "„msgid“ и „msgstr“ не завршавају се оба са „\\n“"
#: src/msgl-check.c:687
msgid "plural handling is a GNU gettext extension"
-msgstr "баратање множинама је Гнуово проширење gettext-а"
+msgstr "баратање множинама је проширење Гнуовог геттекста"
#: src/msgl-check.c:729
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr "У msgstr недостаје ознака пречице са тастатуре „%c“"
+msgstr "У мсгстр недостаје ознака пречице тастатуре „%c“"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr "У msgstr има превише ознака пречица са тастатуре „%c“"
+msgstr "У мсгстр има превише ознака пречица тастатуре „%c“"
-#: src/msgl-check.c:801
-#, fuzzy, c-format
+#: src/msgl-check.c:804
+#, c-format
msgid "header field '%s' still has the initial default value\n"
-msgstr "нека поља заглавља и даље садрже почетне подразумеване вредности\n"
+msgstr "поље заглавља „%s“ и даље садржи почетну задату вредност\n"
-#: src/msgl-check.c:816
-#, fuzzy, c-format
+#: src/msgl-check.c:820
+#, c-format
msgid "header field '%s' missing in header\n"
-msgstr "недостаје поље „%s“ у заглављу\n"
+msgstr "у заглављу недостаје поље заглавља „%s“\n"
#: src/msgl-iconv.c:65
#, c-format
msgid "%s: input is not valid in \"%s\" encoding"
-msgstr ""
+msgstr "%s: улаз није исправан у „%s“ кодирању"
#: src/msgl-iconv.c:69
-#, fuzzy, c-format
+#, c-format
msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "грешка приликом отварања „%s“ за читање"
+msgstr "%s: грешка приликом претварања „%s“ кодирања у „%s“ кодирање"
#: src/msgl-iconv.c:290
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 "
"not support this conversion."
msgstr ""
-"Не могу да претворим из „%s“ у „%s“. %s се ослања на iconv(), а iconv() не "
+"Не могу да претворим из „%s“ у „%s“. %s се ослања на иконв(), а иконв() не "
"подржава ово претварање."
#: src/msgl-iconv.c:335
@@ -2652,29 +2792,29 @@ msgid ""
"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
"msgids become equal."
msgstr ""
-"Претварање из „%s“ у „%s“ уводи понављања: неки различити msgid-ови постају "
-"једнаки."
+"Претварање из „%s“ у „%s“ уводи понављања: неке различите мсгид поруке "
+"постају једнаке."
#: 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 ""
-"Не могу да претворим из „%s“ у „%s“. %s се ослања на iconv(). Ово издање је "
-"изграђено без iconv()-а."
+"Не могу да претворим из „%s“ у „%s“. %s се ослања на иконв(). Ово издање је "
+"изграђено без иконв()-еа."
-#: 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 "%s је једино исправно уз %s"
+msgstr "%s је исправно само са %s"
-#: 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"
@@ -2687,66 +2827,65 @@ msgid ""
"comments and file positions will be preserved. Where an exact match\n"
"cannot be found, fuzzy matching is used to produce better results.\n"
msgstr ""
-"Спаја две .po датотеке у Унифорум стилу. Датотека подр.po је постојећа ПО\n"
-"датотека са преводима који ће бити пренети у новостворену датотеку док год\n"
-"се они поклапају; примедбе ће бити очуване, али извучене примедбе и \n"
-"положаји у датотеци ће бити занемарени. Датотека реф.pot је последња ПО \n"
-"датотека са освеженим изворним референцама али старим преводима, или шаблон\n"
-"ПО датотеке (обично направљен помоћу xgettext-а); сви преводи или примедбе \n"
-"из ове датотеке ће бити занемарени, али ће се сачувати извучене примедбе и \n"
-"положаји у датотекама. Када нема тачног поклапања, користи се нејасно \n"
-"поклапање ради добијања бољих резултата.\n"
+"Спајајте две .по датотеке у Унифорум стилу. Датотека деф.по је постојећа\n"
+"ПО датотека са преводима који ће бити пренети у новостворену датотеку\n"
+"док год се они поклапају; примедбе ће бити очуване, али извучене примедбе\n"
+"и положаји у датотеци ће бити занемарени. Датотека реф.пот је последња\n"
+"ПО датотека са освеженим изворним референцама али старим преводима, или\n"
+"шаблон ПО датотеке (обично направљен помоћу xgettext-а); сви преводи или\n"
+"примедбе из ове датотеке ће бити занемарени, али ће се сачувати извучене\n"
+"примедбе и положаји у датотекама. Када нема тачног поклапања, користи се\n"
+"нејасно поклапање ради добијања бољих резултата.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
-msgstr ""
-" подр.po преводи који одговарају старом изворном коду\n"
+msgstr " def.po преводи који упућују на старе изворе\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
-msgstr " реф.pot позива нове изворне поруке\n"
+msgstr " ref.pot упуте на нове изворе\n"
-#: 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 ""
" -C, --compendium=ДАТОТЕКА додатна библиотека превода порука, може се\n"
-" навести више него једном\n"
+" навести више пута\n"
-#: 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 ""
-" -U, --update освежи подр.po,\n"
-" не ради ништа ако је већ усклађен подр.po\n"
+" -U, --update освежава деф.по,\n"
+" не ради ништа ако је деф.по већ освежена\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Путања излазне датотеке у режиму освежавања:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
-msgstr "Резултат се уписује назад у подр.po.\n"
+msgstr "Резултат се уписује назад у деф.по.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
-msgstr " --backup=УПРАВЉАЊЕ сачини резерву за подр.po\n"
+msgstr " --backup=УПРАВЉАЊЕ прави резерву за деф.по\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
-msgstr " --suffix=СУФИКС измени уобичајени суфикс за резерве\n"
+msgstr " --suffix=СУФИКС мења уобичајени суфикс за резерве\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2757,56 +2896,57 @@ msgid ""
" existing, nil numbered if numbered backups exist, simple otherwise\n"
" simple, never always make simple backups\n"
msgstr ""
-"Начин управљања издањима се може изабрати помоћу опције --backup или кроз \n"
-"променљиву окружења VERSION_CONTROL. Овде су дозвољене вредности:\n"
-" none, off не прави резерве (чак и ако је наведено --backup)\n"
+"Начин управљања издањима се може изабрати помоћу опције „--backup“ или "
+"кроз \n"
+"променљиву окружења „VERSION_CONTROL“. Овде су дозвољене вредности:\n"
+" none, off не прави резерве (чак и ако је наведено „--backup“)\n"
" numbered, t прави побројане резерве\n"
" existing, nil побројане ако већ постоје побројане резерве, иначе обичне\n"
" simple, never увек прави обичне резерве\n"
-#: src/msgmerge.c:541
-#, fuzzy, c-format
+#: src/msgmerge.c:546
+#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
"SIMPLE_BACKUP_SUFFIX\n"
"environment variable.\n"
msgstr ""
-"Суфикс за резерве је „~“, осим ако је постављен помоћу --suffix или "
-"променљиве \n"
-"окружења SIMPLE_BACKUP_SUFFIX.\n"
+"Суфикс за резерве је „~“, осим ако је постављен помоћу „--suffix“ или "
+"променљивом\n"
+"окружења „SIMPLE_BACKUP_SUFFIX“.\n"
-#: src/msgmerge.c:552
-#, fuzzy, c-format
+#: src/msgmerge.c:557
+#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
msgstr ""
-" --translated задржи преведене, уклони непреведене поруке\n"
+" --previous задржава претходне мсгид-се преведених порука\n"
-#: 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 " -q, --quiet, --silent искључи обавештавање о напретку\n"
+msgstr " -q, --quiet, --silent потискује указиваче напредовања\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
-msgstr "ова порука треба да дефинише облике множине"
+msgstr "ова порука треба да одреди облике множине"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
-msgstr "ова порука не треба да дефинише облике множине"
+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 ""
-"%sПрочитах %ld старих + %ld референтних, спојих %ld, нејасних %ld, недостаје "
-"%ld, превазиђених %ld.\n"
+"%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/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2815,7 +2955,7 @@ msgstr " готово.\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 "%s и изричито име датотеке су међу собом искључиви"
+msgstr "%s и изричити називи датотека се међусобно искључују"
#: src/msgunfmt.c:427
#, c-format
@@ -2825,7 +2965,7 @@ msgstr "Употреба: %s [ОПЦИЈА] [ДАТОТЕКА]...\n"
#: src/msgunfmt.c:431
#, c-format
msgid "Convert binary message catalog to Uniforum style .po file.\n"
-msgstr "Претвори бинарни каталог порука у .po датотеку Унифорум стила.\n"
+msgstr "Претворите бинарни каталог порука у .по датотеку Унифорум стила.\n"
#: src/msgunfmt.c:440
#, c-format
@@ -2833,12 +2973,14 @@ msgid ""
" -j, --java Java mode: input is a Java ResourceBundle "
"class\n"
msgstr ""
-" -j, --java Јава режим: улаз је Јава класа ResourceBundle\n"
+" -j, --java Јава режим: улаз је Јавин разред „Група "
+"изворишта“\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 Ц# режим: улаз је .НЕТ-ова „.dll“ датотека\n"
#: src/msgunfmt.c:444
#, c-format
@@ -2846,20 +2988,21 @@ msgid ""
" --csharp-resources C# resources mode: input is a .NET .resources "
"file\n"
msgstr ""
-" --csharp-resources Режим за C# ресурсе: улаз је .NET .resources "
-"датотека\n"
+" --csharp-resources Режим Ц# изворишта: улаз је .НЕТ-ова „."
+"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"
+" --tcl Тцл режим: улаз је тцл/мсгкат-ова „.msg“ "
+"датотека\n"
#: src/msgunfmt.c:451
#, c-format
msgid " FILE ... input .mo files\n"
-msgstr " ДАТОТЕКА ... улазне .mo датотеке\n"
+msgstr " ДАТОТЕКА ... улазне .мо датотеке\n"
#: src/msgunfmt.c:456
#, c-format
@@ -2873,13 +3016,13 @@ msgid ""
"name,\n"
"separated with an underscore. The class is located using the CLASSPATH.\n"
msgstr ""
-"Име класе се одређујем надодавањем имена локалитета на име ресурса, \n"
-"раздвојено подвлаком. Класа се проналази помоћу CLASSPATH.\n"
+"Назив разреда се одређује надодавањем назива локалитета на назив изворишта,\n"
+"раздвојених подвлаком. Разред се проналази помоћу „CLASSPATH“.\n"
#: src/msgunfmt.c:467
#, c-format
msgid "Input file location in C# mode:\n"
-msgstr "Путања улазне датотеке у C# режиму:\n"
+msgstr "Путања улазне датотеке у Ц# режиму:\n"
#: src/msgunfmt.c:475
#, c-format
@@ -2888,12 +3031,12 @@ msgid ""
"subdirectory of the specified directory whose name depends on the locale.\n"
msgstr ""
"Опције -l и -d су обавезне. Датотека .dll се налази у поддиректоријуму \n"
-"датог директоријума чије име зависи од локалитета.\n"
+"датог директоријума чији назив зависи од локалитета.\n"
#: src/msgunfmt.c:479
#, c-format
msgid "Input file location in Tcl mode:\n"
-msgstr "Путања улазне датотеке у Tcl режиму:\n"
+msgstr "Путања улазне датотеке у Тцл режиму:\n"
#: src/msgunfmt.c:485
#, c-format
@@ -2901,19 +3044,20 @@ msgid ""
"The -l and -d options are mandatory. The .msg file is located in the\n"
"specified directory.\n"
msgstr ""
-"Опције -l и -d су обавезне. Датотека .msg се налази у датом директоријуму.\n"
+"Опције -l и -d су обавезне. Датотека „.msg“ се налази у датом "
+"директоријуму.\n"
#: src/msgunfmt.c:511
#, c-format
msgid " -i, --indent write indented output style\n"
-msgstr " -i, --indent стил исписа са увлачењем\n"
+msgstr " -i, --indent записује увучени изглед излаза\n"
#: src/msgunfmt.c:513
#, c-format
msgid " --strict write strict uniforum style\n"
-msgstr " --strict испис у строгом стилу унифорума\n"
+msgstr " --strict пише изричитим стилом унифорума\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -2925,33 +3069,34 @@ msgid ""
"specified, they will be taken from the first translation. File positions\n"
"will be cumulated. When using the --unique option, duplicates are discarded.\n"
msgstr ""
-"Сједињује поновљене преводе у каталогу превода. Проналази двоструке преводе\n"
-"са истим ИД-ом поруке. Такви дупликати су неисправан улаз за остале програме\n"
-"као што је msgfmt, msgmerge или msgcat. Уобичајено се поновљени преводи \n"
-"спајају. Када се користи опција --repeated, исписују се само поновљени, а \n"
-"остале поруке се занемарују. Примедбе и извучене примедбе ће се гомилати, \n"
-"осим ако је наведено --use-first, када ће се користити оне из првог превода.\n"
-"Положаји у датотеци ће се такође гомилати. Када се користи опција --unique,\n"
-"поновљени преводи се занемарују.\n"
+"Обједините поновљене преводе у каталогу превода. Пронађите двоструке\n"
+"преводе са истим ИБ-ом поруке. Такви дупликати су неисправан улаз за\n"
+"остале програме као што је „msgfmt“, „msgmerge“ или „msgcat“. У основи,\n"
+"поновљени преводи се спајају. Када се користи опција „--repeated“,\n"
+"исписују се само поновљене, а остале поруке се занемарују. Примедбе и\n"
+"извучене примедбе ће се збрајати, осим ако је наведено „--use-first“,\n"
+"када ће се користити оне из првог превода. Положаји у датотеци ће се\n"
+"такође збрајати. Када се користи опција „--unique“, поновљени преводи\n"
+"се занемарују.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
-msgstr " -d, --repeated испиши само поновљене\n"
+msgstr " -d, --repeated исписује само дупликате\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
"duplicates\n"
msgstr ""
-" -u, --unique испиши само јединствене поруке, занемари "
-"поновљене\n"
+" -u, --unique исписује само јединствене поруке, одбацујући "
+"дупликате\n"
#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
#: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
msgid "<stdin>"
-msgstr "<стдул>"
+msgstr "<стдулаз>"
#: src/po-charset.c:489
#, c-format
@@ -2959,8 +3104,8 @@ msgid ""
"Charset \"%s\" is not a portable encoding name.\n"
"Message conversion to user's charset might not work.\n"
msgstr ""
-"Скуп знакова „%s“ не чини преносно име кодирања.\n"
-"Претварање порука у скуп знакова корисника можда неће радити.\n"
+"Скуп знакова „%s“ не чини преносив назив кодирања.\n"
+"Претварање порука у корисников скуп знакова можда неће радити.\n"
#: src/po-charset.c:557
#, c-format
@@ -2968,20 +3113,20 @@ msgid ""
"Charset \"%s\" is not supported. %s relies on iconv(),\n"
"and iconv() does not support \"%s\".\n"
msgstr ""
-"Скуп знакова „%s“ није подржан. %s се ослања на iconv(),\n"
-"а iconv() не подржава „%s“.\n"
+"Скуп знакова „%s“ није подржан. %s се ослања на „iconv()“,\n"
+"а „iconv()“ не подржава „%s“.\n"
#: src/po-charset.c:564 src/po-charset.c:612
msgid ""
"Installing GNU libiconv and then reinstalling GNU gettext\n"
"would fix this problem.\n"
msgstr ""
-"Инсталирање Гнуовог libiconv-а и затим поновно инсталирање Гнуовог\n"
-"gettext-а ће средити овај проблем.\n"
+"Инсталирање Гнуовог „libiconv“-а и затим поновно инсталирање Гнуовог\n"
+"„gettext“-а ће средити овај проблем.\n"
#: src/po-charset.c:578 src/po-charset.c:616
msgid "Continuing anyway, expect parse errors."
-msgstr "Ипак настављам, очекујте грешке при рашчлањивању."
+msgstr "Ипак настављам, очекујте грешке обраде."
#: src/po-charset.c:580
msgid "Continuing anyway."
@@ -2993,8 +3138,8 @@ msgid ""
"Charset \"%s\" is not supported. %s relies on iconv().\n"
"This version was built without iconv().\n"
msgstr ""
-"Скуп знакова „%s“ није подржан. %s се ослања на iconv().\n"
-"Ово издање је изграђено без iconv()-а.\n"
+"Скуп знакова „%s“ није подржан. %s се ослања на „iconv()“.\n"
+"Ово издање је изграђено без „iconv()“-а.\n"
#: src/po-charset.c:644
msgid ""
@@ -3002,34 +3147,34 @@ msgid ""
"Message conversion to user's charset will not work.\n"
msgstr ""
"Недостаје скуп знакова у заглављу.\n"
-"Претварање порука у скуп знакова корисника неће радити.\n"
+"Претварање порука у корисников скуп знакова неће радити.\n"
#: src/po-gram-gen.y:93
#, c-format
msgid "inconsistent use of #~"
-msgstr "недоследна употреба #~"
+msgstr "недоследно стање за #~"
-#: src/po-gram-gen.y:240
-#, fuzzy, c-format
+#: src/po-gram-gen.y:243
+#, c-format
msgid "missing 'msgstr[]' section"
msgstr "недостаје одељак „msgstr[]“"
-#: src/po-gram-gen.y:249
-#, fuzzy, c-format
+#: src/po-gram-gen.y:252
+#, c-format
msgid "missing 'msgid_plural' section"
msgstr "недостаје одељак „msgid_plural“"
-#: src/po-gram-gen.y:257
-#, fuzzy, c-format
+#: src/po-gram-gen.y:260
+#, c-format
msgid "missing 'msgstr' section"
msgstr "недостаје одељак „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 "облик множине има погрешан индекс"
@@ -3037,122 +3182,113 @@ msgstr "облик множине има погрешан индекс"
#: src/po-lex.c:90 src/po-lex.c:109
#, c-format
msgid "too many errors, aborting"
-msgstr "превише грешака, одустајем"
+msgstr "превише грешака, прекидам"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:740 src/write-po.c:869
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
#, c-format
msgid "invalid multibyte sequence"
-msgstr "неисправан вишебајтни низ"
+msgstr "неисправан низ мултибајтова"
#: src/po-lex.c:465
#, c-format
msgid "incomplete multibyte sequence at end of file"
-msgstr "недовршен вишебајтни низ на крају датотеке"
+msgstr "непотпун низ мултибајтова на крају датотеке"
#: src/po-lex.c:475
#, c-format
msgid "incomplete multibyte sequence at end of line"
-msgstr "недовршен вишебајтни низ на крају реда"
+msgstr "непотпун низ мултибајтова на крају реда"
#: src/po-lex.c:487
msgid "iconv failure"
-msgstr "неуспех iconv-а"
+msgstr "неуспех иконв-а"
#: src/po-lex.c:744
#, c-format
msgid "keyword \"%s\" unknown"
-msgstr "непозната кључна реч „%s“"
+msgstr "кључна реч „%s“ је непозната"
#: src/po-lex.c:854
#, c-format
msgid "invalid control sequence"
-msgstr "неисправан контролни низ"
+msgstr "неисправан низ управљања"
#: src/po-lex.c:981
#, c-format
msgid "end-of-file within string"
-msgstr "крај датотеке унутар ниске"
+msgstr "знак за крај датотеке унутар ниске"
#: src/po-lex.c:987
#, c-format
msgid "end-of-line within string"
-msgstr "крај реда унутар ниске"
+msgstr "знак за крај реда унутар ниске"
#: src/po-lex.c:1008
#, c-format
msgid "context separator <EOT> within string"
-msgstr ""
+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 "ова датотека не сме садржати директиве за домен"
+msgstr "ова датотека не може да садржи смернице домена"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
-msgstr "двострука дефиниција поруке"
+msgstr "одредница удвостручене поруке"
-#: src/read-catalog.c:379
-#, fuzzy
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
-msgstr "...ово је положај прве дефиниције"
+msgstr "ово је место прве одреднице"
#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
#, c-format
msgid "file \"%s\" is truncated"
-msgstr "датотека „%s“ је одсечена"
+msgstr "датотека „%s“ је скраћена"
#: src/read-mo.c:129
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
-msgstr "датотека „%s“ садржи ниску која се не завршава NUL-ом"
+msgstr "датотека „%s“ садржи ниску која није окончана НУЛ-ом"
#: src/read-mo.c:165 src/read-mo.c:274
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
-msgstr "датотека „%s“ није у Гнуовом .mo облику"
+msgstr "датотека „%s“ није у Гнуовом .mo запису"
#: src/read-mo.c:178
#, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr "датотека „%s“ садржи ниску која се не завршава NUL-ом, на %s"
+msgstr "датотека „%s“ садржи ниску која није окончана НУЛ-ом, на %s"
#: src/read-properties.c:227
-#, fuzzy
msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "%s:%lu: упозорење: неисправна синтакса \\uxxxx за Уникод знак"
+msgstr "упозорење: неисправна синтакса „\\uxxxx“ за Уникод знак"
-# bug: there are similar messages with "%s:%lu: warning:"
#: src/read-stringtable.c:802
-#, fuzzy
msgid "warning: unterminated string"
-msgstr "%s:%d: упозорење: неокончана ниска"
+msgstr "упозорење: неокончана ниска"
#: src/read-stringtable.c:810
-#, fuzzy
msgid "warning: syntax error"
-msgstr "%s:%lu: упозорење: грешка у синтакси"
+msgstr "упозорење: грешка синтаксе"
#: src/read-stringtable.c:871 src/read-stringtable.c:893
-#, fuzzy
msgid "warning: unterminated key/value pair"
-msgstr "%s:%lu: упозорење: неокончан пар кључ/вредност"
+msgstr "упозорење: неокончан пар кључ/вредност"
#: src/read-stringtable.c:939
-#, fuzzy
msgid "warning: syntax error, expected ';' after string"
-msgstr "%s:%lu: упозорење: грешка у синтакси, очекивао сам „;“ након ниске"
+msgstr "упозорење: грешка синтаксе, очекивах ; након ниске"
#: src/read-stringtable.c:948
-#, fuzzy
msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr ""
-"%s:%lu: упозорење: грешка у синтакси, очекивао сам „=“ или „;“ након ниске"
+msgstr "упозорење: грешка синтаксе, очекивах = или ; након ниске"
#: src/recode-sr-latin.c:116
-#, fuzzy, c-format
+#, c-format
msgid "Written by %s and %s.\n"
-msgstr "Написа %s.\n"
+msgstr "Написали су %s и %s.\n"
#. TRANSLATORS: This is a proper name. The last name is
#. (with Unicode escapes) "\u0160egan" or (with HTML entities)
@@ -3160,12 +3296,12 @@ msgstr "Написа %s.\n"
#. This is a proper name. See the gettext manual, section Names.
#: src/recode-sr-latin.c:120
msgid "Danilo Segan"
-msgstr ""
+msgstr "Данило Шеган"
#: src/recode-sr-latin.c:153
#, c-format, no-wrap
msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr ""
+msgstr "Пребаците српски текст са ћириличног на латинично писмо.\n"
#: src/recode-sr-latin.c:156
#, c-format, no-wrap
@@ -3173,16 +3309,18 @@ msgid ""
"The input text is read from standard input. The converted text is output to\n"
"standard output.\n"
msgstr ""
+"Улазни текст се чита са стандардног улаза. Претворени текст је излаз\n"
+"стандардног излаза.\n"
#: src/recode-sr-latin.c:339
#, c-format
msgid "input is not valid in \"%s\" encoding"
-msgstr ""
+msgstr "улаз није исправан у „%s“ кодирању"
#: src/recode-sr-latin.c:367
-#, fuzzy, c-format
+#, c-format
msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "грешка приликом отварања „%s“ за читање"
+msgstr "грешка приликом претварања „%s“ кодирања у „%s“ кодирање"
#: src/urlget.c:159
#, c-format
@@ -3200,18 +3338,18 @@ msgid ""
"Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n"
"the locally accessible FILE is used instead.\n"
msgstr ""
-"Преузимам и исписујем садржај адресе. Уколико не могу да приступим адреси,\n"
-"користи се локално доступна ДАТОТЕКА уместо ње.\n"
+"Преузима и исписује садржај адресе. Уколико не може да приступи адреси,\n"
+"користи се месно доступна ДАТОТЕКА уместо ње.\n"
#: src/urlget.c:228
#, c-format
msgid "error reading \"%s\""
-msgstr "грешка при читању „%s“"
+msgstr "грешка читања „%s“"
#: src/urlget.c:234
#, c-format
msgid "error writing stdout"
-msgstr "грешка при писању на стандардни излаз"
+msgstr "грешка записивања стандардног излаза"
#: src/urlget.c:238
#, c-format
@@ -3221,43 +3359,40 @@ msgstr "грешка након читања „%s“"
#: src/urlget.c:264
#, c-format
msgid "Retrieving %s..."
-msgstr ""
+msgstr "Довлачим „%s“..."
#: src/urlget.c:308
#, c-format
msgid " timed out.\n"
-msgstr ""
+msgstr " истекло је време.\n"
#: src/urlget.c:445
#, c-format
msgid " failed.\n"
-msgstr ""
+msgstr " нисам успео.\n"
#: src/write-catalog.c:126
-#, fuzzy
msgid ""
"Cannot output multiple translation domains into a single file with the "
"specified output format. Try using PO file syntax instead."
msgstr ""
-"Не могу да испишем више домена превода у једну датотеку према синтакси Јава ."
-"properties датотека. Користите PO синтаксу уместо тога."
+"Не могу да испишем више домена превода у једну датотеку са наведеним записом "
+"излаза. Покушајте да користите синтаксу ПО датотеке уместо тога."
#: src/write-catalog.c:129
-#, fuzzy
msgid ""
"Cannot output multiple translation domains into a single file with the "
"specified output format."
msgstr ""
-"Не могу да испишем више домена превода у једну датотеку према синтакси "
-"NeXTstep/GNUstep .strings датотека."
+"Не могу да испишем више домена превода у једну датотеку са наведеним записом "
+"излаза."
#: src/write-catalog.c:162
-#, fuzzy
msgid ""
"message catalog has context dependent translations, but the output format "
"does not support them."
msgstr ""
-"каталог порука садржи преводе са облицима множине, али излазни облик их не "
+"каталог порука садржи преводе зависне од садржаја, али запис излаза их не "
"подржава."
#: src/write-catalog.c:197
@@ -3266,86 +3401,85 @@ msgid ""
"support them. Try generating a Java class using \"msgfmt --java\", instead "
"of a properties file."
msgstr ""
-"каталог порука садржи преводе са облицима множине, али излазни облик их не "
-"подржава. Покушајте да образујете Јава класу помоћу „msgfmt --java“ уместо "
-"датотеке са особинама (.properties)."
+"каталог порука садржи преводе са облицима множине, али запис излаза их не "
+"подржава. Покушајте да створите разред Јаве користећи „msgfmt --java“ уместо "
+"датотеке особина."
#: src/write-catalog.c:202
msgid ""
"message catalog has plural form translations, but the output format does not "
"support them."
msgstr ""
-"каталог порука садржи преводе са облицима множине, али излазни облик их не "
+"каталог порука садржи преводе са облицима множине, али запис излаза их не "
"подржава."
#: src/write-catalog.c:231 src/write-catalog.c:275
#, c-format
msgid "cannot create output file \"%s\""
-msgstr "не могу да направим излазну датотеку „%s“"
+msgstr "не могу да створим излазну датотеку „%s“"
#: src/write-catalog.c:239 src/write-catalog.c:283
msgid "standard output"
msgstr "стандардни излаз"
#: src/write-csharp.c:703
-#, fuzzy, c-format
+#, c-format
msgid "failed to create directory \"%s\""
-msgstr "не могу да направим „%s“"
+msgstr "нисам успео да направим директоријум „%s“"
#: src/write-csharp.c:766
-#, fuzzy, c-format
+#, c-format
msgid "compilation of C# class failed, please try --verbose"
-msgstr ""
-"неуспешно изграђивање Јава класе, пробајте --verbose или поставите $JAVAC"
+msgstr "изграђивање Ц# разреда није успело, пробајте „--verbose“"
#: src/write-csharp.c:768
-#, fuzzy, c-format
+#, c-format
msgid "compilation of C# class failed"
-msgstr ""
-"неуспешно изграђивање Јава класе, пробајте --verbose или поставите $JAVAC"
+msgstr "изграђивање Ц# разреда није успело"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
-msgstr "није исправно име Јава класе: %s"
+msgstr "неисправан назив разреда Јаве: %s"
-#: 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 ""
-"неуспешно изграђивање Јава класе, пробајте --verbose или поставите $JAVAC"
+"изграђивање разреда Јаве није успело, пробајте „--verbose“ или поставите "
+"„$JAVAC“"
-#: src/write-java.c:1168
-#, fuzzy, c-format
+#: src/write-java.c:1213
+#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr ""
-"неуспешно изграђивање Јава класе, пробајте --verbose или поставите $JAVAC"
+msgstr "изграђивање разреда Јаве није успело, пробајте да поставите „$JAVAC“"
#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
#, c-format
msgid "error while opening \"%s\" for writing"
-msgstr "грешка при отварању датотеке „%s“ ради уписа"
+msgstr "грешка приликом отварања „%s“ за писање"
-#: src/write-po.c:803
-#, fuzzy, c-format
+#: src/write-po.c:875
+#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "интернационализоване поруке не треба да садрже „\\%c“ низове истицања"
+msgstr ""
+"интернационализоване поруке не треба да садрже „\\%c“ низове за крај реда"
-#: src/write-po.c:1254 src/write-po.c:1383
-#, fuzzy, c-format
+#: src/write-po.c:1326 src/write-po.c:1450
+#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
"This will cause problems to translators who use a character encoding\n"
"different from yours. Consider using a pure ASCII msgctxt instead.\n"
"%s\n"
msgstr ""
-"Следећи msgid садржи не-АСКРИ знакове.\n"
+"Следећи мсгцтхт садржи не-АСКРИ знакове.\n"
"Ово ће изазвати проблеме преводиоцима који користе кодирање\n"
-"другачије од вашег. Пробајте да користите АКСРИ msgid.\n"
+"другачије од вашег. Пробајте да користите чисти АСКРИ мсгцтхт.\n"
"%s\n"
-#: 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"
@@ -3353,9 +3487,9 @@ msgid ""
"different from yours. Consider using a pure ASCII msgid instead.\n"
"%s\n"
msgstr ""
-"Следећи msgid садржи не-АСКРИ знакове.\n"
+"Следећи мсгид садржи не-АСКРИ знакове.\n"
"Ово ће изазвати проблеме преводиоцима који користе кодирање\n"
-"другачије од вашег. Пробајте да користите АКСРИ msgid.\n"
+"другачије од вашег. Пробајте да користите чисти АСКРИ мсгид.\n"
"%s\n"
#: src/write-qt.c:667
@@ -3364,19 +3498,18 @@ msgid ""
"but the Qt message catalog format doesn't support plural handling\n"
msgstr ""
"каталог порука садржи преводе облика множине\n"
-"али облик Qt каталога порука не подржава баратање множинама\n"
+"али запис каталога порука Кут-а не подржава руковање множинама\n"
#: src/write-qt.c:693
-#, fuzzy
msgid ""
"message catalog has msgctxt strings containing characters outside "
"ISO-8859-1\n"
"but the Qt message catalog format supports Unicode only in the translated\n"
"strings, not in the context strings\n"
msgstr ""
-"каталог порука садржи msgid ниске са знаковима изван ISO-8859-1 скупа\n"
-"а облик Qt каталога порука подржава Уникод једино у преведним нискама,\n"
-"не у непреведним нискама\n"
+"каталог порука садржи мсгцтхт ниске са знаковима ван ISO-8859-1\n"
+"скупа али запис каталога порука Кут-а подржава Уникод једино у\n"
+"преведним нискама, не у садржајним нискама\n"
#: src/write-qt.c:717
msgid ""
@@ -3384,41 +3517,38 @@ 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"
-"не у непреведним нискама\n"
+"каталог порука садржи мсгид ниске са знаковима ван ISO-8859-1\n"
+"скупа али запис каталога порука Кут-а подржава Уникод једино у\n"
+"преведним нискама, не у непреведним нискама\n"
#: src/write-resources.c:94
-#, fuzzy, c-format
+#, c-format
msgid "error while writing to %s subprocess"
-msgstr "грешка при писању датотеке „%s“"
+msgstr "грешка приликом уписа у подпроцес „%s“"
#: src/write-resources.c:131
-#, fuzzy
msgid ""
"message catalog has context dependent translations\n"
"but the C# .resources format doesn't support contexts\n"
msgstr ""
-"каталог порука садржи преводе облика множине\n"
-"али облик Qt каталога порука не подржава баратање множинама\n"
+"каталог порука садржи преводе зависне од садржаја,\n"
+"али запис Ц# „.resources“ не подржава садржаје\n"
#: src/write-resources.c:150
-#, fuzzy
msgid ""
"message catalog has plural form translations\n"
"but the C# .resources format doesn't support plural handling\n"
msgstr ""
"каталог порука садржи преводе облика множине\n"
-"али облик Qt каталога порука не подржава баратање множинама\n"
+"али запис Ц# „.resources“ не подржава руковање множинама\n"
#: src/write-tcl.c:157
-#, fuzzy
msgid ""
"message catalog has context dependent translations\n"
"but the Tcl message catalog format doesn't support contexts\n"
msgstr ""
-"каталог порука садржи преводе облика множине\n"
-"али облик Tcl каталога порука не подржава баратање множинама\n"
+"каталог порука садржи преводе зависне од садржаја,\n"
+"али запис каталога порука Тцл-а не подржава садржаје\n"
#: src/write-tcl.c:176
msgid ""
@@ -3426,10 +3556,9 @@ msgid ""
"but the Tcl message catalog format doesn't support plural handling\n"
msgstr ""
"каталог порука садржи преводе облика множине\n"
-"али облик Tcl каталога порука не подржава баратање множинама\n"
+"али запис каталога порука Тцл-а не подржава руковање множинама\n"
-# bug: there are similar messages with "%s:%lu: warning:"
-#: 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 "%s:%d: упозорење: неокончана ниска"
@@ -3437,182 +3566,190 @@ msgstr "%s:%d: упозорење: неокончана ниска"
#: src/x-awk.c:592
#, c-format
msgid "%s:%d: warning: unterminated regular expression"
-msgstr "%s:%d: упозорење: неокончан регуларни израз"
+msgstr "%s:%d: упозорење: неокончани регуларни израз"
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:762
+#: src/x-c.c: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 "%s:%d: упозорење: неокончана знаковна константа"
+msgstr "%s:%d: упозорење: константа знака није окончана"
-#: 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 "%s:%d: упозорење: неокончана дословна ниска"
+msgstr "%s:%d: упозорење: литерал ниске није окончан"
-#: src/x-csharp.c:224 src/xgettext.c:2055
-#, fuzzy
+#: src/x-csharp.c:224 src/xgettext.c:2106
msgid "Please specify the source encoding through --from-code."
-msgstr ""
-"Не-АСКРИ ниска на %s%s.\n"
-"Наведите кодирање извора помоћу --from-code.\n"
+msgstr "Наведите кодирање извора помоћу „--from-code“."
#: src/x-csharp.c:269
-#, fuzzy, c-format
+#, 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"
+"%s:%d: Неисправан низ мултибајтова.\n"
+"Наведите исправно кодирање извора помоћу „--from-code“.\n"
#: src/x-csharp.c:285
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code.\n"
msgstr ""
-"Не-АСКРИ ниска на %s%s.\n"
-"Наведите кодирање извора помоћу --from-code.\n"
+"%s:%d: Дуги недовршени низ мултибајтова.\n"
+"Наведите исправно кодирање извора помоћу „--from-code“.\n"
#: src/x-csharp.c:297
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of file.\n"
"Please specify the correct source encoding through --from-code.\n"
msgstr ""
-"Не-АСКРИ ниска на %s%s.\n"
-"Наведите кодирање извора помоћу --from-code.\n"
+"%s:%d: Недовршени низ мултибајтова на крају датотеке.\n"
+"Наведите исправно кодирање извора помоћу „--from-code“.\n"
#: src/x-csharp.c:306
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of line.\n"
"Please specify the correct source encoding through --from-code.\n"
msgstr ""
-"Не-АСКРИ ниска на %s%s.\n"
-"Наведите кодирање извора помоћу --from-code.\n"
+"%s:%d: Недовршени низ мултибајтова на крају реда.\n"
+"Наведите исправно кодирање извора помоћу „--from-code“.\n"
#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
-#, fuzzy, c-format
+#, c-format
msgid "%s:%d: iconv failure"
-msgstr "неуспех iconv-а"
+msgstr "%s:%d: неуспех иконв-а"
#: src/x-csharp.c:338
-#, fuzzy, c-format
+#, 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"
+"%s:%d: Неисправан низ мултибајтова.\n"
+"Наведите кодирање извора помоћу „--from-code“.\n"
-#: 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 "%s:%d: упозорење: неисправан Уникод знак"
+msgstr "%s:%d: упозорење: неисправан знак Уникода"
-# bug: there are similar messages with "%s:%lu: warning:"
#: src/x-csharp.c:1512 src/x-java.c:875
#, c-format
msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: упозорење: неокончана константна ниска"
+msgstr "%s:%d: упозорење: константа ниске није окончана"
#: src/x-csharp.c:2020 src/x-java.c:1369
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: упозорење: нађох „)“ где очекивах „}“"
+msgstr "%s:%d: упозорење: нађох ) где очекивах }"
#: src/x-csharp.c:2054 src/x-java.c:1403
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: упозорење: нађох „}“ где очекивах „)“"
+msgstr "%s:%d: упозорење: нађох } где очекивах )"
-#: src/x-glade.c:561
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
-msgstr ""
+msgstr "Недостаје садржај за ниску извучену из елемента „%s“"
-#: 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 ""
+msgstr "Корени елемент <%s> није дозвољен у исправној датотеци Глејда"
-#: src/x-glade.c:841 src/x-glade.c:848
-#, fuzzy, c-format
+#: src/x-glade.c:572 src/x-glade.c:579
+#, c-format
msgid "%s:%lu:%lu: %s"
-msgstr "%s:%d:%d: %s"
+msgstr "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
"This version was built without expat.\n"
msgstr ""
-"Језик „glade“ није подржан. %s се ослања на expat-у.\n"
-"Ово издање је изграђено без expat-а.\n"
+"Језик „glade“ није подржан. %s се ослања на „expat“.\n"
+"Ово издање је изграђено без „expat“-а.\n"
# bug: there are similar messages with "%s:%lu: warning:"
#: src/x-java.c:494
-#, fuzzy, c-format
+#, c-format
msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: упозорење: неокончана ниска"
+msgstr "%s:%d: упозорење: усамљена замена „U+%04X“"
#: src/x-javascript.c:230
-#, fuzzy
msgid "Please specify the source encoding through --from-code\n"
-msgstr ""
-"Не-АСКРИ ниска на %s%s.\n"
-"Наведите кодирање извора помоћу --from-code.\n"
+msgstr "Наведите кодирање извора помоћу „--from-code“\n"
#: src/x-javascript.c:275
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
-"Не-АСКРИ ниска на %s%s.\n"
-"Наведите кодирање извора помоћу --from-code.\n"
+"%s:%d: Неисправан низ мултибајтова.\n"
+"Наведите исправно кодирање извора помоћу „--from-code“\n"
#: src/x-javascript.c:291
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
-"Не-АСКРИ ниска на %s%s.\n"
-"Наведите кодирање извора помоћу --from-code.\n"
+"%s:%d: Дуги недовршени низ мултибајтова.\n"
+"Наведите исправно кодирање извора помоћу „--from-code“\n"
#: src/x-javascript.c:303
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of file.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
-"Не-АСКРИ ниска на %s%s.\n"
-"Наведите кодирање извора помоћу --from-code.\n"
+"%s:%d: Недовршени низ мултибајтова на крају датотеке.\n"
+"Наведите исправно кодирање извора помоћу „--from-code“\n"
#: src/x-javascript.c:312
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of line.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
-"Не-АСКРИ ниска на %s%s.\n"
-"Наведите кодирање извора помоћу --from-code.\n"
+"%s:%d: Недовршени низ мултибајтова на крају реда.\n"
+"Наведите исправно кодирање извора помоћу „--from-code“\n"
#: src/x-javascript.c:344
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the source encoding through --from-code\n"
msgstr ""
-"Не-АСКРИ ниска на %s%s.\n"
-"Наведите кодирање извора помоћу --from-code.\n"
+"%s:%d: Неисправан низ мулти бајтова.\n"
+"Наведите кодирање извора помоћу „--from-code“\n"
-#: src/x-javascript.c:1147
-#, fuzzy, c-format
+#: src/x-javascript.c:954
+#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: упозорење: неокончана дословна ниска"
+msgstr "%s:%d: упозорење: литерал Регизраза је окончан прерано"
+
+#: src/x-javascript.c:1055
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: упозорење: „%s“ није дозвољено"
+
+#: src/x-javascript.c:1069
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: упозорење: неокончана ниска"
#: src/x-perl.c:308
#, c-format
@@ -3623,101 +3760,105 @@ msgstr ""
#: src/x-perl.c:1043
#, c-format
msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr "%s:%d: недостаје десна заграда у \\x{ХЕКСАДЕКАДНИ-БРОЈ}"
+msgstr "%s:%d: недостаје десна заграда у „\\x{ХЕКСАДЕКАДНИ-БРОЈ}“"
#: src/x-perl.c:1163
#, c-format
msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr "%s:%d: неисправна интерполација („\\l“) 8-битног знака „%c“"
+msgstr "%s:%d: неисправно уметање („\\l“) 8-битног знака „%c“"
#: src/x-perl.c:1183
#, c-format
msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr "%s:%d: неисправна интерполација („\\u“) 8-битног знака „%c“"
+msgstr "%s:%d: неисправно уметање („\\u“) 8-битног знака „%c“"
#: src/x-perl.c:1217
#, c-format
msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s:%d: неисправно вредновање променљивих на „%c“"
+msgstr "%s:%d: неисправно уметање променљиве на „%c“"
#: src/x-perl.c:1230
#, c-format
msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr "%s:%d: неисправна интерполација („\\L“) 8-битног знака „%c“"
+msgstr "%s:%d: неисправно уметање („\\L“) 8-битног знака „%c“"
#: src/x-perl.c:1247
#, c-format
msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
-msgstr "%s:%d: неисправна интерполација („\\U“) 8-битног знака „%c“"
+msgstr "%s:%d: неисправно уметање („\\U“) 8-битног знака „%c“"
#: 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 ""
-"Не-АСКРИ ниска на %s%s.\n"
-"Наведите кодирање извора помоћу --from-code.\n"
+"Наведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
+"као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
#: src/x-python.c:324
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"Не-АСКРИ ниска на %s%s.\n"
-"Наведите кодирање извора помоћу --from-code.\n"
+"%s:%d: Неисправан низ мултибајтова.\n"
+"Наведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
+"као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
#: src/x-python.c:341
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"Не-АСКРИ ниска на %s%s.\n"
-"Наведите кодирање извора помоћу --from-code.\n"
+"%s:%d: Дуги недовршени низ мултибајтова.\n"
+"Наведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
+"као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
#: src/x-python.c:354
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of file.\n"
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"Не-АСКРИ ниска на %s%s.\n"
-"Наведите кодирање извора помоћу --from-code.\n"
+"%s:%d: Недовршени низ мултибајтова на крају датотеке.\n"
+"Наведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
+"као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
#: src/x-python.c:364
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Incomplete multibyte sequence at end of line.\n"
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"Не-АСКРИ ниска на %s%s.\n"
-"Наведите кодирање извора помоћу --from-code.\n"
+"%s:%d: Недовршени низ мултибајтова на крају реда.\n"
+"Наведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
+"као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
#: src/x-python.c:397
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the source encoding through --from-code or through a comment\n"
"as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"Не-АСКРИ ниска на %s%s.\n"
-"Наведите кодирање извора помоћу --from-code.\n"
+"%s:%d: Неисправан низ мултибајтова.\n"
+"Наведите кодирање извора помоћу „--from-code“ или помоћу напомене\n"
+"као што је наведено у „http://www.python.org/peps/pep-0263.html“.\n"
#: src/x-python.c:722
#, c-format
msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
-msgstr ""
+msgstr "Непознато кодирање „%s“. Настављам са АСКРИ-јем."
#: src/x-rst.c:108
#, c-format
msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: неисправна дефиниција ниске"
+msgstr "%s:%d: неисправна одредница датотеке"
#: src/x-rst.c:172
#, c-format
@@ -3727,7 +3868,7 @@ msgstr "%s:%d: недостаје број након #"
#: src/x-rst.c:207
#, c-format
msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: неисправна ниска са изразом"
+msgstr "%s:%d: неисправан израз ниске"
#: src/x-sh.c:1074
#, c-format
@@ -3736,63 +3877,70 @@ msgid ""
"use eval_gettext instead"
msgstr ""
"%s:%lu: упозорење: синтакса $\"...\" је превазиђена из безбедносних разлога; "
-"уместо тога користите eval_gettext"
+"уместо тога користите „eval_gettext“"
-#: src/x-vala.c:558
-#, fuzzy, c-format
+#: src/x-vala.c:413
+#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: упозорење: неокончана дословна ниска"
+msgstr "%s:%d: упозорење: литерал регуларног израза је окончан прерано"
+
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr "„%s“ није исправан назив кодирања. Користићу АСКРИ.\n"
-#: src/xgettext.c:636
+#: src/xgettext.c:648
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
-"--join-existing се не може користити када се излаз исписује на стандардни "
+"„--join-existing“ се не може користити када се излаз исписује на стандардни "
"излаз"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
-msgstr "xgettext не може да ради без кључних речи које тражи"
+msgstr "„xgettext“ не може да ради без кључних речи које тражи"
-#: src/xgettext.c:785
-#, fuzzy, c-format
+#: src/xgettext.c:808
+#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr "упозорење: екстензија „%2$s“ датотеке „%1$s“ је непозната; пробаћу C"
+msgstr "упозорење: проширење „%2$s“ датотеке „%1$s“ није познато; пробаћу Ц"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
-msgstr "Извуци преводиве ниске из датих улазних датотека.\n"
+msgstr "Извуците преводиве ниске из датих улазних датотека.\n"
-#: 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 ""
-" -d, --default-domain=ИМЕ користи ИМЕ.po за излаз (уместо messages.po)\n"
+" -d, --default-domain=НАЗИВ користи НАЗИВ.po за излаз (уместо "
+"messages.po)\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
-msgstr " -o, --output=ДАТОТЕКА испиши излаз у наведену датотеку\n"
+msgstr ""
+" -o, --output=ДАТОТЕКА исписује излаз у наведену датотеку\n"
-#: src/xgettext.c:863
+#: src/xgettext.c:886
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr ""
-" -p, --output-dir=ДИР излазне датотеке се смештају у директоријум "
-"ДИР\n"
+" -p, --output-dir=ДИР излазне датотеке се смештају у "
+"директоријум ДИР\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Избор језика улазне датотеке:\n"
-#: src/xgettext.c:870
-#, fuzzy, c-format
+#: src/xgettext.c:893
+#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3801,54 +3949,57 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
-" -L, --language=ИМЕ препознавање наведеног језика\n"
-" (C, C++, ObjectiveC, PO, Shell, Питон, "
-"Лисп,\n"
-" ЕмаксЛисп, librep, Smalltalk, Јава,\n"
-" JavaProperties, C#, awk, YCP, Tcl, Перл, "
-"PHP,\n"
-" GCC-извор, NXStringTable, RST, Глејд)\n"
+" -L, --language=НАЗИВ препознаје наведени језик\n"
+" (Ц, Ц++, ОбјектниЦ, ПО, Љуска, Питон,\n"
+" Лисп, ЕмаксЛисп, либреп, Шема, Смолток,\n"
+" Јава, ЈаваОсобине, Ц#, авк, УЦП, Тцл,\n"
+" Перл, ПХП, ГЦЦ-извор, НИксНискеТабела,\n"
+" РСТ, Глејд, Луа, ЈаваСпис, Вала, "
+"Десктоп)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
-msgstr " -C, --c++ пречица за --language=C++\n"
+msgstr " -C, --c++ скраћеница за „--language=Ц++“\n"
-#: 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 "Подразумева се погађање језика на основу проширења имена датотеке.\n"
+msgstr ""
+"Подразумева се погађање језика на основу проширења назива улазне датотеке.\n"
-#: 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 ""
-" --from-code=ИМЕ кодирање улазних датотека\n"
-" (осим за Питон, Tcl, Глејд)\n"
+" --from-code=НАЗИВ кодирање улазних датотека\n"
+" (осим за Питона, Тцл-а, Глејд-а)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr "Подразумева се да су улазне датотеке у АСКРИ запису.\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
-msgstr " -j, --join-existing споји поруке са постојећом датотеком\n"
+msgstr ""
+" -j, --join-existing спаја поруке са постојећом датотеком\n"
-#: src/xgettext.c:894
+#: src/xgettext.c:917
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
-msgstr " -x, --exclude-file=ДАТОТЕКА.po поља из ДАТОТЕКА.po се не извлаче\n"
+msgstr ""
+" -x, --exclude-file=ДАТОТЕКА.po поља из ДАТОТЕКЕ.po се не извлаче\n"
-#: src/xgettext.c:896
-#, fuzzy, c-format
+#: src/xgettext.c:919
+#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
" preceding keyword lines in output file\n"
@@ -3856,23 +4007,26 @@ msgid ""
"lines\n"
" in output file\n"
msgstr ""
-" -c, --add-comments[=ОЗНАКА] постави блок примедбу помоћу ОЗНАКА (или оне \n"
-" које претходе редовима кључне речи) у "
-"излазној \n"
-" датотеци\n"
+" -cОЗНАКА, --add-comments=ОЗНАКА поставља блокове напомене почевши са "
+"ОЗНАКОМ и\n"
+" претходи редове кључних речи у излазној "
+"датотеци\n"
+" -c, --add-comments поставља све блокове напомена пре "
+"редова\n"
+" кључних речи у излазној датотеци\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
-msgstr "Посебне опције за језик:\n"
+msgstr "Посебне наредбе језика:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
-msgstr " -a, --extract-all извуци све ниске\n"
+msgstr " -a, --extract-all извлачи све ниске\n"
-#: src/xgettext.c:906 src/xgettext.c:914
-#, fuzzy, c-format
+#: src/xgettext.c:929
+#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, "
@@ -3880,34 +4034,39 @@ msgid ""
" 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"
+" (само језици Ц, Ц++, ОбјектниЦ, Љуска,\n"
+" Питон, Лисп, ЕмаксЛисп, либреп, Шема,\n"
+" Јава, Ц#, авк, Тцл, Перл, ПХП, ГЦЦ-"
+"извор,\n"
+" Луа, ЈаваСпис, Вала)\n"
-#: src/xgettext.c:911
-#, fuzzy, c-format
+#: 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 ""
-" -k, --keyword[=РЕЧ] додатне кључне речи које да тражим "
-"(изостављање\n"
-" РЕЧ означава употребу подразумеваних кључних \n"
-" речи)\n"
+" (само језици Ц, Ц++, ОбјектниЦ, Љуска,\n"
+" Питон, Лисп, ЕмаксЛисп, либреп, Шема,\n"
+" Јава, Ц#, авк, Тцл, Перл, ПХП, ГЦЦ-"
+"извор,\n"
+" Луа, ЈаваСпис, Вала, Десктоп)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
"argument\n"
" number ARG of keyword WORD\n"
msgstr ""
-" --flag=РЕЧ:АРГ:ОЗНАКА додатне ознаке за ниске као аргумент са "
-"бројем \n"
-" АРГ кључне речи РЕЧ\n"
+" --flag=РЕЧ:АРГ:ОБЕЛЕЖЈЕ додатно обележје за ниске унутар броја\n"
+" аргумента АРГ кључне речи РЕЧ\n"
-#: src/xgettext.c:922
-#, fuzzy, c-format
+#: src/xgettext.c:945
+#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
" Python, Lisp, EmacsLisp, librep, Scheme, "
@@ -3915,155 +4074,161 @@ msgid ""
" 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"
+" (само језици Ц, Ц++, ОбјектниЦ, Љуска,\n"
+" Питон, Лисп, ЕмаксЛисп, либреп, Шема,\n"
+" Јава, Ц#, авк, ЈЦП, Тцл, Перл, ПХП,\n"
+" ГЦЦ-извор, Луа, ЈаваСпис, Вала)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
-msgstr " -T, --trigraphs разумевање АНСИ C триграфа за улаз\n"
+msgstr " -T, --trigraphs разуме АНСИ Ц триграфе за улаз\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
-msgstr " (једино језици C, C++, ObjectiveC)\n"
+msgstr " (само језици Ц, Ц++, ОбјектниЦ)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
-msgstr " --qt препознај Qt ниске формата\n"
+msgstr " --qt препознаје ниске записа Кут-а\n"
-#: 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 " (једино језик C++)\n"
+msgstr " (само језик Ц++)\n"
-#: src/xgettext.c:935
-#, fuzzy, c-format
+#: src/xgettext.c:958
+#, c-format
msgid " --kde recognize KDE 4 format strings\n"
-msgstr " --qt препознај Qt ниске формата\n"
+msgstr " --qt препознаје ниске записа КДЕ-а 4\n"
-#: src/xgettext.c:939
-#, fuzzy, c-format
+#: src/xgettext.c:962
+#, c-format
msgid " --boost recognize Boost format strings\n"
-msgstr " --qt препознај Qt ниске формата\n"
+msgstr " --boost препознаје ниске записа Буст-а\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
-" --debug детаљнији резултат препознавања ниске формата\n"
+" --debug опширнији резултат препознавања записа "
+"ниске\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
-msgstr " --properties-output испиши Јава .properties датотеку\n"
+msgstr ""
+" --properties-output исписује датотеку Јава „.properties“\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
-" --copyright-holder=НИСКА постави носиоца ауторских права у излазу\n"
+" --copyright-holder=НИСКА поставља носиоца ауторских права у "
+"излазу\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
msgstr ""
-" --foreign-user избаци FSF ауторска права у излазу за стране \n"
-" кориснике\n"
+" --foreign-user избацује ауторска права ФСФ у излазу за "
+"стране кориснике\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, c-format
msgid " --package-name=PACKAGE set package name in output\n"
-msgstr ""
+msgstr " --package-name=ПАКЕТ поставља назив пакета на излазу\n"
-#: src/xgettext.c:989
-#, fuzzy, c-format
+#: src/xgettext.c:1012
+#, c-format
msgid " --package-version=VERSION set package version in output\n"
-msgstr ""
-" --copyright-holder=НИСКА постави носиоца ауторских права у излазу\n"
+msgstr " --package-version=ИЗДАЊЕ поставља издање пакета на излазу\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
-" --msgid-bugs-address=АДРЕСА@Е-ПОШТЕ постави адресу за пријављивање \n"
-" грешака у msgid-има\n"
+" --msgid-bugs-address=АДРЕСА@ЕЛ.ПОШТЕ поставља адресу за "
+"пријављивање \n"
+" грешака у мсгид-овима\n"
-#: src/xgettext.c:993
-#, fuzzy, c-format
+#: src/xgettext.c:1016
+#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
"msgstr\n"
" values\n"
msgstr ""
-" -m, --msgstr-prefix[=НИСКА] користи НИСКА или „“ за префикс msgstr поља\n"
+" -m[НИСКА], --msgstr-prefix[=НИСКА] користи НИСКА или „“ за префикс поља "
+"мсгстр-а\n"
-#: src/xgettext.c:996
-#, fuzzy, c-format
+#: src/xgettext.c:1019
+#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
"msgstr\n"
" values\n"
msgstr ""
-" -M, --msgstr-suffix[=НИСКА] користи НИСКА или „“ за суфикс msgstr поља\n"
+" -M[НИСКА], --msgstr-suffix[=НИСКА] користи НИСКА или „“ за суфикс поља "
+"мсгстр-а\n"
-#: 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 ""
-"A --flag аргумент не користи синтаксу <кључна-реч>:<брарг>:"
-"[пролаз-]<ознака>: %s"
+"Аргумент „--flag“ не користи синтаксу <кључна-реч>:<бр.арг>:"
+"[пролаз-]<обележје>: %s"
-#: 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 ""
+msgstr "Не-АСКРИ знак на %s%s."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
-msgstr ""
+msgstr "Не-АСКРИ напомена на или пре %s%s."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
-msgstr ""
+msgstr "Не-АСКРИ ниска на %s%s."
-#: 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 "%s%s: упозорење: "
-#: 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 ""
-"Иако се користи на месту ниске формата, %s не представља исправну ниску "
-"формата %s. Разлог: %s\n"
+"Иако се користи на месту ниске записа, %s не представља исправну ниску "
+"записа %s. Разлог: %s\n"
-#: 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 ""
-"Иако је објављена као таква, %s не представља исправну ниску формата %s. "
+"Иако је објављена као таква, %s не представља исправну ниску записа %s. "
"Разлог: %s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4071,151 +4236,79 @@ msgid ""
"Please consider using a format string with named arguments,\n"
"and a mapping instead of a tuple for the arguments.\n"
msgstr ""
+"„%s“ запис ниске са неименованим аргументима не може бити исправно "
+"локализован:\n"
+"Преводилац не може да промени поредак аргумената.\n"
+"Размотрите употребу ниску заоиса са именованим аргументима,\n"
+"и са мапирањем уместо н-торке за аргументе.\n"
-#: 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 ""
-"Празан msgid. Ово је задржано за потребе ГНУ gettext-а:\n"
-"gettext(\"\") враћа поље заглавља са мета-подацима, а не \n"
+"Празан мсгид. Ово је задржано за потребе Гнуовог геттекста-а:\n"
+"„gettext(\"\")“ исписује поље заглавља са мета-подацима, а не\n"
"празну ниску.\n"
-#: src/xgettext.c:2869
-#, fuzzy, c-format
+#: src/xgettext.c:2979
+#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "неједнозначан аргумент „%s“ за %s"
+msgstr "нејасана особеност аргумента за кључну реч „%.*s“"
-#: src/xgettext.c:2896
-#, fuzzy, c-format
+#: src/xgettext.c:3006
+#, c-format
msgid "warning: missing context for keyword '%.*s'"
-msgstr "неједнозначан аргумент „%s“ за %s"
+msgstr "упозорење: недостаје контекст за кључниу реч „%.*s“"
-#: src/xgettext.c:2921
-#, fuzzy, c-format
+#: src/xgettext.c:3031
+#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "неједнозначан аргумент „%s“ за %s"
+msgstr "упозорење: недостаје контекст за аргумент множине кључне речи „%.*s“"
-#: src/xgettext.c:2942
+#: src/xgettext.c:3052
#, c-format
msgid "context mismatch between singular and plural form"
-msgstr ""
+msgstr "контекст се разликује између облика за једнину и множину"
-#: src/xgettext.c:3052
-#, fuzzy
+#: src/xgettext.c:3419
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a 'Makevars' file, please specify\n"
"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
"specify an --msgid-bugs-address command line option.\n"
msgstr ""
-"Није наведена опција --msgid-bugs-address.\n"
-"Уколико користите датотеку „Makevars“, наведите тамо\n"
-"променљиву MSGID_BUGS_ADDRESS; иначе, наведите опцију\n"
-"--msgid-bugs-address у наредби.\n"
+"Није наведена опција „--msgid-bugs-address“.\n"
+"Уколико користите датотеку „Makevars“, тамо наведите\n"
+"променљиву „MSGID_BUGS_ADDRESS“; у супротном наведите\n"
+"опцију „--msgid-bugs-address“ у наредби.\n"
-#: src/xgettext.c:3267
-#, fuzzy, c-format
+#: src/xgettext.c:3638
+#, c-format
msgid "language '%s' unknown"
-msgstr "језик „%s“ није познат"
+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"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: неисправна опција %c\n"
+msgstr "<неименован>"
#~ msgid "DuplicateHandle failed with error code 0x%08x"
-#~ msgstr "Неуспешан DuplicateHandle са грешком 0x%08x"
+#~ msgstr "Руковање дупликатима није успело са грешком 0x%08x"
-#~ msgid "Not yet implemented."
-#~ msgstr "Још увек није направљено."
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "поље „%s“ у заглављу треба да почне на почетку реда\n"
#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "поља „%s“ и даље садржи почетну подразумевану вредност\n"
-
-#~ msgid "Multiple references to %%%c."
-#~ msgstr "Вишеструко позивање %%%c."
+#~ msgstr "поља „%s“ и даље садржи почетну задату вредност\n"
-#~ msgid ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions. There is "
-#~ "NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
-#~ "PURPOSE.\n"
-#~ msgstr ""
-#~ "Сва права задржана © %s Free Software Foundation, Inc.\n"
-#~ "Ово је слободан софтвер; погледајте изворни код за услове умножавања. "
-#~ "НЕМА\n"
-#~ "гаранције; чак ни за употребљивост или одређену намену.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "message catalog has context dependent translations\n"
-#~ "but the C# .dll format doesn't support contexts\n"
-#~ msgstr ""
-#~ "каталог порука садржи преводе облика множине\n"
-#~ "али облик Qt каталога порука не подржава баратање множинама\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "message catalog has context dependent translations\n"
-#~ "but the Java ResourceBundle format doesn't support contexts\n"
-#~ msgstr ""
-#~ "каталог порука садржи преводе облика множине\n"
-#~ "али облик Qt каталога порука не подржава баратање множинама\n"
-
-#~ msgid "Which is your email address?"
-#~ msgstr "Која је ваша е-адреса?"
-
-#~ msgid "Please choose the number, or enter your email address."
-#~ msgstr "Унесите број или вашу е-адресу."
-
-#~ msgid "Invalid email address: invalid character."
-#~ msgstr "Неисправна е-адреса: недозвољен знак."
+#~ msgid "%s:%d: fatal: plural message seen before singular message\n"
+#~ msgstr "%s:%d: кобно: порука множине је испред поруке једнине\n"
#~ msgid ""
#~ "Invalid email address: need a fully qualified host name or domain name."
-#~ msgstr "Неисправна е-адреса: неопходно је пуно име домаћина или домен."
-
-#~ msgid "Invalid email address: missing @"
-#~ msgstr "Неисправна е-адреса: недостаје @"
-
-#~ msgid "Is the following your email address?"
-#~ msgstr "Да ли је ово ваша е-адреса?"
+#~ msgstr ""
+#~ "Неисправна адреса ел. поште: потребно је пуно име домаћина или домен."
#~ msgid "Please confirm by pressing Return, or enter your email address."
-#~ msgstr "Потврдите притиском на Ентер, или унесите вашу е-адресу."
-
-#~ msgid "Couldn't find out about your email address."
-#~ msgstr "Не могу да сазнам ништа о вашој е-адреси."
-
-#~ msgid "Please enter your email address."
-#~ msgstr "Унесите вашу е-адресу."
-
-#~ msgid "%s: warning: "
-#~ msgstr "%s: упозорење: "
-
-#~ msgid "%s\n"
-#~ msgstr "%s\n"
-
-#~ msgid "%s:%lu: warning: unterminated string"
-#~ msgstr "%s:%lu: упозорење: неокончана ниска"
-
-#~ msgid "%s:%d: fatal: plural message seen before singular message\n"
-#~ msgstr "%s:%d: кобно: порука у множини је испред поруке у једнини\n"
-
-#~ msgid "conversion failure"
-#~ msgstr "неуспешно претварање"
-
-#~ msgid "write to grep subprocess failed"
-#~ msgstr "неуспешан упис у подпроцес grep"
+#~ msgstr "Потврдите притиском на Унеси, или унесите вашу адресу ел. поште."
diff --git a/gettext-tools/po/sv.po b/gettext-tools/po/sv.po
index 42e1b7b..30b3cf1 100644
--- a/gettext-tools/po/sv.po
+++ b/gettext-tools/po/sv.po
@@ -1,14 +1,14 @@
# Swedish messages for gettext-tools
-# Copyright © 1996, 1997, 1998, 2001, 2002, 2003, 2007, 2010, 2013 Free Software Foundation, Inc.
+# Copyright © 1996, 1997, 1998, 2001, 2002, 2003, 2007, 2010, 2013, 2014 Free Software Foundation, Inc.
# This file is distributed under the same license as the gettext package.
-# Jan Djärv <jan.h.d@swipnet.se>, 1998, 2001, 2002, 2003, 2006, 2007, 2010, 2013
+# Jan Djärv <jan.h.d@swipnet.se>, 1998, 2001, 2002, 2003, 2006, 2007, 2010, 2013, 2014
#
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.18.3\n"
+"Project-Id-Version: gettext-tools 0.19-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-07-07 18:21+0900\n"
-"PO-Revision-Date: 2013-07-01 19:25+0200\n"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2014-05-17 09:18+0200\n"
"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -179,17 +179,17 @@ msgstr "ogiltigt värde på argumentet source_version till compile_java_class"
#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
#, c-format
msgid "invalid target_version argument to compile_java_class"
-msgstr "ogiltigt värde på argumentet target_version till compile_java_clas"
+msgstr "ogiltigt värde på argumentet target_version till compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
-#: src/write-java.c:1143
+#: gnulib-lib/javacomp.c: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 "misslyckades med att skapa \"%s\""
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: 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 "fel vid skrivning till filen \"%s\""
@@ -211,9 +211,9 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr "I/O-fel i %s-barnprocess"
-#: 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 "minnet slut"
@@ -224,7 +224,7 @@ msgid "creation of threads failed"
msgstr "skapa trådar misslyckades"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "skrivning till %s-barnprocess misslyckades"
@@ -237,7 +237,7 @@ msgstr "läsning från %s-barnprocess misslyckades"
#: gnulib-lib/pipe-filter-ii.c:298
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "kan inte initiera oblockerande I/O till subrocess %s"
+msgstr "kan inte initiera icke-blockerande I/O till barnprocess %s"
#: gnulib-lib/pipe-filter-ii.c:329
#, c-format
@@ -311,8 +311,8 @@ msgid "%s subprocess got fatal signal %d"
msgstr "%s-barnprocess fick ödesdiger 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: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 "fel uppstod när \"%s\" öppnades för läsning"
@@ -564,7 +564,7 @@ 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"
+"I direktiv nummer %u följs inte argumentnumret av ett komma och en av \"%s"
"\", \"%s\", \"%s\", \"%s\"."
#: src/format-java.c:572
@@ -688,7 +688,7 @@ msgstr ""
"\"%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-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'"
@@ -735,22 +735,22 @@ msgid ""
msgstr ""
"formateringsdirektiv i \"%s\" och \"%s\" för argument \"%s\" är inte likadana"
-#: 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 "I direktiv nummer %u kan inte \"%c\" inleda ett fältnamn."
-#: 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 "I direktiv nummer %u kan inte \"%c\" inleda ett getattr-argument."
-#: 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 "I direktiv nummer %u kan inte \"%c\" inleda ett getitem-argument."
-#: 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."
@@ -758,7 +758,7 @@ msgstr ""
"I direktiv nummer %u är ytterligare nästling inte tillåten i en "
"formatspecifikation."
-#: 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 "I direktiv nummer %u finns ett oavslutat formatdirektiv."
@@ -811,11 +811,11 @@ msgid ""
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
-#: 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"
@@ -828,19 +828,19 @@ msgstr ""
"Detta program är fri programvara. Du kan modifiera och distribuera den.\n"
"Det finns inte NÅGON SOM HELST GARANTI, till den grad som lagen tillåter.\n"
-#: src/hostname.c:184 src/msgattrib.c: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 "Skrivet av %s.\n"
#. 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 "Bruno Haible"
@@ -850,11 +850,11 @@ msgstr "Bruno Haible"
msgid "too many arguments"
msgstr "för många argument"
-#: 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 "Försök med \"%s --help\" för mer information.\n"
@@ -894,29 +894,29 @@ msgstr ""
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address adresser för värdnamnet\n"
-#: src/hostname.c:228 src/msgattrib.c: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 "Informativ utskrift:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help visa denna hjälptext och avsluta\n"
-#: 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 " -V, --version visa versionsinformation och avsluta\n"
@@ -925,11 +925,11 @@ msgstr " -V, --version visa versionsinformation och avsluta\n"
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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 ""
"Rapportera fel till <bug-gnu-gettext@gnu.org>.\n"
@@ -941,30 +941,27 @@ msgstr ""
msgid "could not get host name"
msgstr "kunde inte hämta värdnamn"
-#: 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 "högst en infil tillåten"
-#: 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 "%s och %s är ömsesidigt uteslutande"
-#: 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 "Användning: %s [FLAGGA] [INFIL]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -973,62 +970,62 @@ msgstr ""
"Filtrerar meddelanden i en meddelandekatalog efter deras attribut och\n"
"manipulerar attributen.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c: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 ""
"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
-#: 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 "Plats för infiler:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " INFIL PO-infil\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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 " -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
-#: 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 "Om ingen infil är given eller om den är - läses standard in.\n"
-#: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
-#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
-#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
-#: src/xgettext.c:857
+#: src/msgattrib.c:442 src/msgcat.c: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 "Plats för utfil:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 " -o, --output-file=FIL skriv resultat till angiven fil\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1036,12 +1033,12 @@ msgid ""
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
+#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
#, c-format
msgid "Message selection:\n"
msgstr "Meddelandeval:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
@@ -1049,7 +1046,7 @@ msgstr ""
" --translated behåll översatta, ta bort oöversatta "
"meddelanden\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
@@ -1057,59 +1054,59 @@ msgstr ""
" --untranslated behåll oöversatta, ta bort översatta "
"meddelanden\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr ""
" --no-fuzzy ta bort meddelanden markerade som \"fuzzy\"\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr ""
" --only-fuzzy behåll meddelanden markerade som \"fuzzy\"\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete ta bort föråldrade #~ meddelanden\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete behåll föråldrade #~ meddelanden\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Attributmanipulation:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr " --set-fuzzy markera alla meddelanden som \"fuzzy\"\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr ""
" --clear-fuzzy ta bort \"fuzzy\"-markering från alla "
"meddelanden\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr ""
" --set-obsolete markera alla meddelanden som föråldrade\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr ""
" --clear-obsolete ta bort föråldradmarkering från alla "
"meddelanden\n"
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
@@ -1118,7 +1115,7 @@ msgstr ""
" --previous när \"fuzzy\" är satt, behåll föregående\n"
" \"msgid\" för översatta meddelanden\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
@@ -1127,49 +1124,57 @@ msgstr ""
" --clear-previous ta bort \"previous msgid\" från alla "
"meddelanden\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+" --empty när \"fuzzy\" tas bort, sätt msgstr till tom "
+"sträng\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
msgstr ""
" --only-file=FIL.po bearbeta bara poster som finns i FIL.po\n"
-#: 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 ""
" --ignore-file=FIL.po bearbeta bara poster som inte finns i FIL.po\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr " --fuzzy samma som --only-fuzzy --clear-fuzzy\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
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
-#: 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 "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
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr " -P, --properties-input 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
+#: 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 "
@@ -1178,17 +1183,17 @@ 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
-#: 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 "Resultatdetaljer:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1203,16 +1208,16 @@ msgstr ""
"\"auto\"\n"
" eller \"html\".\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=STILMALL ange CSS stillmallsfil för --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
+#: 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"
@@ -1220,38 +1225,38 @@ msgstr ""
" -e, --no-escape använd inte C-kontrollsekvenser i resultatet\n"
" (normalläge)\n"
-#: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
-#: src/msguniq.c:390 src/xgettext.c:956
+#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
msgstr ""
" -E, --escape använd C-kontrollsekvenser i resultatet, men\n"
-" inte \\v aller \\a\n"
+" inte \\v eller \\a\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr " --force-po skriv PO-fil även om den är tom\n"
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr " -i, --indent indentera resultatet\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
" --no-location 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
+#: 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"
@@ -1259,39 +1264,39 @@ 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
+#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
+#: src/xgettext.c:989
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr " --strict strikt Uniforum-format på resultatet\n"
-#: src/msgattrib.c:511 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
-#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
-#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
+#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
+#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output skriv en \"Java .properties\"-fil\n"
-#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
-#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
" --stringtable-output 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
-#: 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 " -w, --width=ANTAL välj antal kolumner i resultatet\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c: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"
@@ -1300,31 +1305,31 @@ msgstr ""
" --no-wrap dela inte meddelanden som är längre än\n"
" resultatets kolumnantal i flera rader\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output sortera resultatet\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 " -F, --sort-by-file sortera resultatet efter filposition\n"
-#: 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 "omöjligt urvalskriterium angivet (%d < n < %d)"
-#: 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 "Användning: %s [FLAGGA] [INFIL]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1339,7 +1344,7 @@ msgid ""
msgstr ""
"Slår ihop de angivna PO-filerna.\n"
"Hitta meddelanden som förekommer i två eller flera angivna PO-filer.\n"
-"Genom att använda --more-than kan begärs att meddelanden\n"
+"Genom att använda --more-than kan begäras att meddelanden\n"
"förekommer i flera filer innan de skrivs ut. På motsvarande sätt\n"
"används --less-than till att ange meddelanden som förekommer i\n"
"färre filer (--less-than=2 skriver endast de meddelanden som är unika).\n"
@@ -1347,23 +1352,23 @@ msgstr ""
"ihop, utom om --use-first ges. Då tas de endast från den första PO-filen som\n"
"definierar dem.\n"
-#: src/msgcat.c: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 " INFIL ... infiler\n"
-#: 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 " -f, --files-from=FIL läs lista av infiler från FIL\n"
-#: 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 "Om infil är - läses standard in.\n"
-#: 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"
@@ -1372,7 +1377,7 @@ msgstr ""
" -<, --less-than=ANTAL skriv meddelanden med färre än ANTAL\n"
" definitioner. Standardvärde: oändligt\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1381,7 +1386,7 @@ msgstr ""
" ->, --more-than=ANTAL skriv meddelanden med fler än ANTAL\n"
" definitioner. Standardvärde: 0\n"
-#: 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"
@@ -1390,16 +1395,16 @@ msgstr ""
" -u, --unique samma som --less-than=2, begär att\n"
" endast unika meddelanden skrivs\n"
-#: src/msgcat.c:419 src/msgcmp.c: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 ""
" -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
+#: 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"
@@ -1408,12 +1413,12 @@ msgstr ""
" --stringtable-input infiler har NeXTstep/GNUstep \".strings\"-"
"syntax\n"
-#: 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 " -t, --to-code=NAMN kodning för resultatet\n"
-#: 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"
@@ -1422,28 +1427,28 @@ msgstr ""
" --use-first använd först hittade översättning för varje\n"
" meddelande, slå inte ihop översättningar\n"
-#: src/msgcat.c:432 src/msgen.c: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 " --lang=KATALOGNAMN sätt \"Language\"-fältet i huvudet\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "inga infiler givna"
-#: 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 "exakt 2 infiler krävs"
-#: 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 "Användning: %s [FLAGGA] def.po ref.pot\n"
@@ -1476,12 +1481,12 @@ msgstr " def.po översättningar\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot referenser till källkod\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "Bearbetningsvarianter:\n"
-#: 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."
@@ -1489,7 +1494,7 @@ msgid ""
msgstr ""
" -m, --multi-domain tillämpa ref.pot till alla domäner i def.po\n"
-#: 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 " -N, --no-fuzzy-matching använd inte luddig jämförelse\n"
@@ -1514,17 +1519,17 @@ msgstr "detta meddelande är oöversatt"
msgid "this message needs to be reviewed by the translator"
msgstr "detta meddelande behöver granskas av översättaren"
-#: 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 "detta meddelande används men är inte definierat..."
-#: 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 "...men denna definition är likartad"
-#: 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 "detta meddelande används men är inte definierat i %s"
@@ -1534,19 +1539,19 @@ msgstr "detta meddelande används men är inte definierat i %s"
msgid "warning: this message is not used"
msgstr "varning: detta meddelande används inte"
-#: src/msgcmp.c:553 src/msgfmt.c: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] "%d allvarligt fel hittat"
msgstr[1] "%d allvarliga fel hittades"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "minst två filer måste anges"
-#: 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"
@@ -1567,7 +1572,7 @@ msgstr ""
"endast från den första PO-filen som definierar dem. Filpositioner från\n"
"alla filer bevaras.\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1576,70 +1581,70 @@ msgstr ""
" ->, --more-than=ANTAL skriv meddelanden med fler än ANTAL\n"
" definitioner. Standardvärde: 1\n"
-#: 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 " --omit-header skriv inte ut huvudet med `msgid \"\"'\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr "Konverterar en meddelandekatalog till en annan teckenkodning.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Konverteringsmål:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Standardvärde är nuvarande lokals kodning.\n"
-#: src/msgconv.c: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 " -i, --indent indentera resultatet\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\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
+#: 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 ""
-" --add-location skriv rader med \"#: filnamn:rad"
+" -n, --add-location bevara 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
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict strikt Uniforum-format på resultatet\n"
-#: 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 "inga infiler givna"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "exakt en infil krävs"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Användning: %s [FLAGGA] INFIL\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1651,7 +1656,7 @@ msgstr ""
"engelska PO-filen eller en PO-mönsterfil (ofta skapad med xgettext).\n"
"Oöversatta poster ges en översättning som är identisk med msgid.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " INFIL PO- eller POT-infil\n"
@@ -1691,7 +1696,7 @@ msgstr ""
"av ett nolltecken. Utdata för \"msgexec 0\" är lämpligt som indata för\n"
"\"xargs -O\"\n"
-#: 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 " -i, --input=INFIL PO-infil\n"
@@ -1701,27 +1706,27 @@ msgstr " -i, --input=INFIL PO-infil\n"
msgid "write to stdout failed"
msgstr "skrivning till standard ut misslyckades"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "filternamn saknas"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr "minst ett sed-skript måste anges"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Användning: %s [FLAGGA] FILTER [FILTERFLAGGOR]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "Tillämpar ett filter på alla översättningar i en meddelandekatalog.\n"
-#: src/msgfilter.c:416
+#: src/msgfilter.c:435
#, c-format
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
@@ -1730,19 +1735,19 @@ msgstr ""
"FILTER kan vara vilket program som helst som läser en översättning från\n"
"standard in och skriver den modifierade översättningen till standard ut.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "Användbara FILTERFLAGGOR när FILTER är \"sed\":\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
msgstr ""
" -e, --expression=SKRIPT lägg till SKRIPT till kommandon att exekvera\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1753,7 +1758,7 @@ msgstr ""
"kommandon\n"
" att exekvera\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
@@ -1761,7 +1766,7 @@ msgstr ""
" -n, --quiet, --silent undertryck automatisk utskrift av "
"mönsterutrymmet\n"
-#: 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"
@@ -1769,12 +1774,12 @@ msgstr ""
" --no-escape använd inte C-kontrollsekvenser i resultatet\n"
" (normalläge)\n"
-#: 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 " --indent indentera resultatet\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
@@ -1782,82 +1787,103 @@ msgstr ""
" --keep-header bevara huvudrader oförändrade, filtrera dem "
"inte\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "argumentet till %s ska vara ett enskilt skiljetecken"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
msgstr "ogiltig byteordning: %s"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
+#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
msgid "Ulrich Drepper"
msgstr "Ulrich Drepper"
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:439
+#, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr "ingen infil ska anges om %s och %s är givna"
+
+#: src/msgfmt.c: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 "%s kräver att \"-d katalog\" anges"
-#: 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 "%s kräver att \"-l lokal\" anges"
-#: 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 "%s kräver att \"--template mall\" anges"
+
+#: src/msgfmt.c:545
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s kräver att \"-o fil\" anges"
+
+#: src/msgfmt.c:551
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s och %s är ömsesidigt uteslutande i %s"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s är endast giltig med %s eller %s"
-#: 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 "%s är endast giltig med %s, %s eller %s"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d översatt meddelande"
msgstr[1] "%d översatta meddelanden"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d luddig översättning"
msgstr[1] ", %d luddiga översättningar"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d oöversatt meddelande"
msgstr[1] ", %d oöversatta meddelanden"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Användning: %s [FLAGGA] filnamn.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr ""
"Generera en binär meddelandekatalog från en textuell meddelandekatalog.\n"
-#: 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"
@@ -1866,17 +1892,17 @@ msgstr ""
"Obligatoriska argument för långa flaggor är obligatoriska även för korta.\n"
"Motsvarande gäller för frivilliga argument.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
msgid " filename.po ... input files\n"
msgstr " filnamn.po ... infiler\n"
-#: 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 "Körläge:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1885,7 +1911,7 @@ msgstr ""
" -j, --java Javaläge: generera en Java ResourceBundle-"
"klass\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1894,12 +1920,12 @@ msgstr ""
" --java2 som --java, och anta Java2 (JDK 1.2 eller "
"högre)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr " --csharp C#-läge: generera en .NET .dll-fil\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -1908,7 +1934,7 @@ msgstr ""
" --csharp-resources C#-resursläge: generera en .NET .resources-"
"fil\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -1916,33 +1942,41 @@ msgstr ""
" --tcl Tcl-läge: generera en .msg-fil av tcl/msgcat-"
"typ\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt Qt-läge: generera en Qt .qm-fil\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+" --desktop \"Desktop Entry\"-läge: generera en .desktop-"
+"fil\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict strikt Uniforum-format på resultatet\n"
-#: 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 "Om UTFIL är - skrivs resultatet till standard ut.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Plats för utfil i Javaläge:\n"
-#: 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 " -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
+#: 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 "
@@ -1950,13 +1984,22 @@ msgid ""
msgstr ""
" -l, --locale=LOKAL lokalnamn, antingen språk eller språk_LAND\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --source generera en .java-fil istället för en .class-"
+"fil\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr " -d KATALOG startkatalog för klassers katalogträd\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1968,12 +2011,12 @@ msgstr ""
"avskiljt med ett understreck. Flaggan -d är obligatorisk. Klassen skrivs\n"
"till den givna katalogen.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "Plats för utfil i C#-läge:\n"
-#: 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 "
@@ -1981,7 +2024,7 @@ msgid ""
msgstr ""
" -d KATALOG startkatalog för lokalberoende .dll-filer\n"
-#: 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"
@@ -1991,18 +2034,18 @@ msgstr ""
"underkatalog\n"
"till den givna katalogen. Underkatalogens namn beror på lokalen.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Plats för utfil i Tcl-läge:\n"
-#: 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 ""
" -d KATALOG startkatalog för .msg-meddelandekataloger\n"
-#: 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"
@@ -2011,12 +2054,46 @@ msgstr ""
"Flaggorna -l och -d är obligatoriska. .msg-filen skrivs till den givna\n"
"katalogen.\n"
-#: src/msgfmt.c:745 src/xgettext.c:882
+#: src/msgfmt.c:861
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr "Flaggor för \"Desktop Entry\"-läge\n"
+
+#: src/msgfmt.c:867
+#, c-format
+msgid " --template=TEMPLATE a .desktop file used as a template\n"
+msgstr " --template=MALL en .desktop-fil att använda som mall\n"
+
+#: src/msgfmt.c:869
+#, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr " -d KATALOG baskatalog för .po-filer\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -kORD, --keyword[=ORD] sök efter ORD som ett extra nyckelord\n"
+" -k, --keyword använd inte standardnyckelord\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+"Flaggorna -l, -o och --template är obligatoriska. Om -D är given så läses\n"
+"indatafiler från katalogen och inte från kommandoradsargument.\n"
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "Tolkning av infil:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -2027,13 +2104,13 @@ msgstr ""
" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format kontrollera språkberoende formatsträngar\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -2041,7 +2118,7 @@ msgid ""
msgstr ""
" --check-header verifiera närvaro och innehåll av huvudrader\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -2050,7 +2127,7 @@ msgstr ""
" --check-domain kontrollera konflikter mellan domändirektiv\n"
" och flaggan --output-file\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2059,7 +2136,7 @@ msgstr ""
" -C, --check-compatibility kontrollera att GNU msgfmt uppför sig som\n"
" X/Open msgfmt\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -2070,19 +2147,19 @@ msgstr ""
"tangentkortkommandon\n"
" för menyer\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr " -f, --use-fuzzy använd luddiga poster i resultatet\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
" -a, --alignment=TAL lägg strängar på jämna TAL byte (normalt: %d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2094,87 +2171,97 @@ msgstr ""
" (big eller little, standard beror på "
"plattform)\n"
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr " --no-hash binärfil innehåller inte hashtabellen\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics skriv ut statistik om översättningarna\n"
-#: 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 " -v, --verbose öka mängden information i meddelanden\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "varning: PO-filens huvudrader saknas eller är ogiltiga\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr ""
"varning: konvertering till användarens teckenuppsättning kommer att "
"misslyckas.\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "varning: PO-filens huvudrader är luddiga\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "varning: äldre versioner av msgfmt ger ett fel för detta\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "domännamnet \"%s\" är inte lämpligt som filnamn"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "domännamnet \"%s\" är inte lämpligt som filnamn: använder ett prefix"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, c-format
msgid "'domain %s' directive ignored"
msgstr "direktivet \"domain %s\" ignoreras"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "tom \"msgstr\"-rad ignorerad"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "luddig \"msgstr\"-rad ignorerad"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: varning: källfilen innehåller luddiga översättningar"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr "%s finns inte"
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr "%s finns men kan inte läsas"
+
#: 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 "fel uppstod då \"%s\" lästes"
-#: 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 "
@@ -2183,7 +2270,7 @@ msgstr ""
"flagga \"%c\" kan inte användas förrän \"J\", \"K\", \"T\" \"C\" eller \"X\" "
"angivits"
-#: 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"
@@ -2192,7 +2279,7 @@ msgstr ""
"Extraherar alla meddelanden i en meddelandekatalog som matchar ett visst\n"
"mönster eller hör till någon given källkodsfil.\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2244,7 +2331,7 @@ msgstr ""
"eller om -X ges och den extraherade kommentaren matchar EXTRAHERAD-KOMMENTARSMÖNSTER.\n"
"\n"
"När fler än ett utvalskriteria anges är mängden valda meddelanden unionen\n"
-"av utvalda meddelanden för varje enskilt kriteria.\n"
+"av utvalda meddelanden för varje enskilt kriterium.\n"
"\n"
"Syntax för MSGCTXT-MÖNSTER, MSGID-MÖNSTER, MSGSTR-MÖNSTER, KOMMENTARSMÖNSTER\n"
"eller EXTRAHERAD-KOMMENTARSMÖNSTER:\n"
@@ -2268,7 +2355,7 @@ msgstr ""
" -v, --invert-match skriv ut endast de meddelanden som inte matchar\n"
" något urvalskriteria.\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2276,12 +2363,12 @@ msgstr ""
" --escape använd C-kontrollsekvenser i resultatet, men\n"
" inte \\v eller \\a\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output sortera resultatet\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file sortera resultatet efter filposition\n"
@@ -2398,7 +2485,7 @@ msgid ""
"contact\n"
"you in case of unexpected technical problems.\n"
msgstr ""
-"Den nya meddelandekatalogen bör innehålla din e-postaddress så att\n"
+"Den nya meddelandekatalogen bör innehålla din e-postadress så att\n"
"användare kan komma med åsikter om översättningarna och underhållare kan\n"
"kontakta dig ifall det blir oväntade tekniska problem.\n"
@@ -2441,7 +2528,7 @@ msgstr "målteckenuppsättning \"%s\" är inte ett portabelt kodningsnamn"
#: 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 "varning: "
@@ -2644,17 +2731,17 @@ msgstr "hantering av plural är en utökning i GNU gettext"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr saknar märket \"%c\" för tangentkortkommandon"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr har för många märken \"%c\" för tangentkortkommandon"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "huvudrad \"%s\" har kvar initialt standardvärde\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "huvudrad \"%s\" saknas i huvudet\n"
@@ -2676,7 +2763,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
msgstr "infilen saknar en huvudrad som anger teckenuppsättning"
#: src/msgl-iconv.c:305 src/recode-sr-latin.c: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 "
@@ -2695,7 +2782,7 @@ msgstr ""
"sig blir lika."
#: 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 "
@@ -2704,16 +2791,16 @@ msgstr ""
"Kan inte konvertera från \"%s\" till \"%s\". %s beror på iconv().\n"
"Denna version byggdes utan iconv()."
-#: 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 "%s är endast giltig med %s"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr "säkerhetskopieringstyp"
-#: 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"
@@ -2730,25 +2817,25 @@ msgstr ""
"existerande PO-fil som innehåller de gamla översättningarna som kommer att\n"
"flyttas över till den nya filen om de är lika. Kommentarer bevaras men\n"
"extraheringskommentarer och filpositioner kastas bort.\n"
-"Filen ref.pot är den senast skapade PO-filen med aktuella källkodreferenser\n"
+"Filen ref.pot är den senast skapade PO-filen med aktuella källkodsreferenser\n"
"men gamla översättningar, eller en PO-mönsterfil (i allmänhet skapad med\n"
"xgettext). Alla översättningar och kommentarer i filen kastas bort,\n"
"dock bevaras punktkommentarer och filpositioner. Om en exakt likhet\n"
"inte kan hittas används luddig jämförelse för att ge bättre resultat.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
" def.po översättningar som refererar till gamla "
"källkoden\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot referenser till den nya källkoden\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2757,36 +2844,36 @@ msgstr ""
" -C, --compendium=FIL ytterligare kataloger med översättningar,\n"
" kan anges flera gånger\n"
-#: 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 ""
-" -U, --update updatera def.po,\n"
+" -U, --update uppdatera def.po,\n"
" gör ingenting om def.po redan är aktuell\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Plats för utfil i uppdateringsläge:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Resultatet skrivs tillbaka till def.po.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=KONTROLL gör en säkerhetskopia av def.po\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=SUFFIX använd ett annat suffix än det vanliga\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2805,7 +2892,7 @@ msgstr ""
"annars\n"
" simple, never gör alltid enkla säkerhetskopior\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2815,7 +2902,7 @@ msgstr ""
"Suffix för säkerhetskopior är \"~\", om den inte sätts med --suffix eller\n"
"miljövariabeln SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
@@ -2823,22 +2910,22 @@ msgstr ""
" --previous behåll föregående \"msgid\" för översatta "
"meddelanden\n"
-#: 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 " -q, --quiet, --silent visa inte förloppsindikatorer\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
msgstr "detta meddelande ska definiera pluralformer"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
msgstr "detta meddelande ska inte definiera pluralformer"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2847,7 +2934,7 @@ 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/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2959,7 +3046,7 @@ msgstr " -i, --indent indentera resultatet\n"
msgid " --strict write strict uniforum style\n"
msgstr " --strict strikt Uniforum-format på resultatet\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -2981,12 +3068,12 @@ msgstr ""
"översättningen. Filpositioner samlas ihop.\n"
"När flaggan --unique anges kastas duplikat bort.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated skriv bara duplicerade meddelanden\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -3056,27 +3143,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "inkonsekvent användning av #~"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, c-format
msgid "missing 'msgstr[]' section"
msgstr "\"msgstr[]\"-delen saknas"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, c-format
msgid "missing 'msgid_plural' section"
msgstr "\"msgid_plural\"-delen saknas"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, c-format
msgid "missing 'msgstr' section"
msgstr "\"msgstr\"-delen saknas"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "första pluralformen har index som inte är noll"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "pluralform har fel index"
@@ -3086,7 +3173,7 @@ msgstr "pluralform har fel index"
msgid "too many errors, aborting"
msgstr "för många fel, avbryter körningen"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c: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 "ogiltig flerbytesekvens"
@@ -3130,16 +3217,16 @@ msgstr "radslut inne i en sträng"
msgid "context separator <EOT> within string"
msgstr "kontextseparator <EOT> inne i sträng"
-#: 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 "denna fil kan inte innehålla domändirektiv"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "meddelandedefinitionen är dubblerad"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "detta är platsen för den första definitionen"
@@ -3298,7 +3385,7 @@ msgid ""
"does not support them."
msgstr ""
"meddelandekatalog har kontextberoende översättningar, men resultatformatet "
-"stödjer inte dem."
+"stöder inte dem."
#: src/write-catalog.c:197
msgid ""
@@ -3307,7 +3394,7 @@ msgid ""
"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"
+"stöder inte dem. Försök generera en Java-klass med \"msgfmt --java\"\n"
"istället för en \"properties\"-fil."
#: src/write-catalog.c:202
@@ -3342,18 +3429,18 @@ msgstr "kompilering av C#-klass misslyckades, försök med --verbose"
msgid "compilation of C# class failed"
msgstr "kompilering av C#-klass misslyckades"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "inte ett giltigt Javaklassnamn: %s"
-#: 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 ""
"kompilering av Javaklass misslyckades, försök med --verbose eller sätt $JAVAC"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr "kompilering av Javaklass misslyckades, försök sätta $JAVAC"
@@ -3363,14 +3450,14 @@ msgstr "kompilering av Javaklass misslyckades, försök sätta $JAVAC"
msgid "error while opening \"%s\" for writing"
msgstr "fel uppstod när \"%s\" öppnades för skrivning"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr ""
"internationaliserade meddelanden bör inte ha kontrollsekvensen \"\\%c\""
-#: 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"
@@ -3383,7 +3470,7 @@ msgstr ""
"teckenuppsättning än du. Försök använda en ren ASCII-msgctxt istället.\n"
"%s\n"
-#: 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"
@@ -3428,7 +3515,7 @@ msgstr ""
#: src/write-resources.c:94
#, c-format
msgid "error while writing to %s subprocess"
-msgstr "fel vid skrivning till subprocess %s"
+msgstr "fel vid skrivning till barnprocess %s"
#: src/write-resources.c:131
msgid ""
@@ -3436,7 +3523,7 @@ msgid ""
"but the C# .resources format doesn't support contexts\n"
msgstr ""
"meddelandekatalog har kontextberoende översättningar men formatet för\n"
-"C# .resources stödjer inte kontexter\n"
+"C# .resources stöder inte kontexter\n"
#: src/write-resources.c:150
msgid ""
@@ -3452,7 +3539,7 @@ msgid ""
"but the Tcl message catalog format doesn't support contexts\n"
msgstr ""
"meddelandekatalog har kontextberoende översättningar men formatet för\n"
-"Tcl-meddelandekataloger stödjer inte kontexter\n"
+"Tcl-meddelandekataloger stöder inte kontexter\n"
#: src/write-tcl.c:176
msgid ""
@@ -3462,7 +3549,7 @@ msgstr ""
"meddelandekatalog har översättningar med pluralformer men formatet för\n"
"Tcl-meddelandekataloger stöder inte pluralhantering\n"
-#: src/x-awk.c:341 src/x-javascript.c: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 "%s:%d: varning: oavslutad sträng"
@@ -3472,17 +3559,22 @@ msgstr "%s:%d: varning: oavslutad sträng"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: varning: oavslutat reguljärt uttryck"
-#: 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 "varning: ogiltigt Unicodetecken"
+
+#: 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 "%s:%d: varning: oavslutad teckenkonstant"
-#: 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 "%s:%d: varning: oavslutad sträng"
-#: 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 "Ange källkodning med --from-code."
@@ -3501,7 +3593,7 @@ msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code.\n"
msgstr ""
-"%s:%d: Lång ogiltig multibytesekvens.\n"
+"%s:%d: Lång ofullständig multibytesekvens.\n"
"Ange korrekt källkodning med --from-code.\n"
"\n"
@@ -3539,7 +3631,7 @@ msgstr ""
"Ange korrekt källkodning med --from-code.\n"
"\n"
-#: 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 "%s:%d: varning: ogiltigt Unicodetecken"
@@ -3559,22 +3651,22 @@ msgstr "%s:%d: varning: \")\" hittades där \"}\" förväntades"
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: varning: \"}\" hittades där \")\" förväntades"
-#: src/x-glade.c:561
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
msgstr "Kontext saknas för strängen extraherad från element \"%s\""
-#: 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 "Rotelementet <%s> är inte tillåten i en giltig Glade-fil"
-#: 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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3607,7 +3699,7 @@ msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
-"%s:%d: Lång ogiltig multibytesekvens.\n"
+"%s:%d: Lång ofullständig multibytesekvens.\n"
"Ange korrekt källkodning med --from-code\n"
#: src/x-javascript.c:303
@@ -3637,10 +3729,20 @@ msgstr ""
"%s:%d: Ogiltig multibytesekvens.\n"
"Ange korrekt källkodning med --from-code\n"
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
-msgstr "%s:%d: varning: RegExp-uttryck avlutas för tidigt"
+msgstr "%s:%d: varning: RegExp-uttryck avslutas för tidigt"
+
+#: src/x-javascript.c:1055
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: varning: %s tillåts inte"
+
+#: src/x-javascript.c:1069
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: varning: oavslutad XML-tagg."
#: src/x-perl.c:308
#, c-format
@@ -3769,33 +3871,39 @@ msgstr ""
"%s:%lu: varning: syntaxen $\"...\" kommer att tas bort av säkerhetsskäl; "
"använd eval_gettext istället"
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
-msgstr "%s:%d: varning: reguljärt uttryck avlutas för tidigt"
+msgstr "%s:%d: varning: reguljärt uttryck avslutas för tidigt"
-#: src/xgettext.c:636
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr ""
+"%s är inte ett giltigt kodningsnamn. Använder ASCII som reservalternativ\n"
+
+#: src/xgettext.c:648
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"--join-existing kan inte användas då resultatet skrivs till standard ut"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext måste ha nyckelord att söka efter för att fungera"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr "varning: filtyp \"%s\" med suffix \"%s\" är okänd; försöker med C"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "Extrahera översättbara strängar från givna infiler.\n"
-#: src/xgettext.c:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3804,23 +3912,23 @@ msgstr ""
" -d, --default-domain=NAMN använd NAMN.po som utfil (i st.f. messages."
"po) \n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr " -o, --output=FIL skriv resultatet till FIL\n"
-#: 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 " -p, --output-dir=KATALOG utfiler placeras i katalogen KATALOG\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Språkval i infiler:\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3830,7 +3938,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=NAMN känn igen angivet språk\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3839,21 +3947,21 @@ msgstr ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ samma som --language=C++\n"
-#: 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 "I normalläge gissas språket från filändelsen på infilen.\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3862,23 +3970,23 @@ msgstr ""
" --from-code=NAMN kodning av infiler\n"
" (utom för Python, Tcl, Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr "Normalt antas att filer är i ASCII-format.\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
" -j, --join-existing slå ihop meddelanden med existerande fil\n"
-#: 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 " -x, --exclude-file=FIL.po rader från FIL tas inte ut\n"
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -3894,17 +4002,17 @@ msgstr ""
"nyckelordsrader\n"
" till resultatet\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Språkspecifika val:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all extrahera alla strängar\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3919,16 +4027,22 @@ msgstr ""
" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
" Lua, JavaScript, Vala)\n"
-#: 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 ""
-" -kORD, --keyword[=ORD] sök efter ORD som ett extra nyckelord\n"
-" -k, --keyword använd inte standardnyckelord\n"
+" (bara språken C, C++, ObjectiveC, Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+" Lua, JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3938,7 +4052,7 @@ msgstr ""
" --flag=ORD:NR:FLAGGA extra FLAGGA för strängar inne i argument\n"
" nummer NR för nyckelord ORD\n"
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3953,73 +4067,73 @@ msgstr ""
" C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
" Lua, JavaScript, Vala)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
" -T, --trigraphs hantera ANSI C treteckenssekvenser i infiler\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr " (bara språken C, C++, ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt känn igen Qt-formatsträngar\n"
-#: 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 " (bara språket C++)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --kde känn igen KDE 4 formatsträngar\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --boost känn igen Boost-formatsträngar\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
" --debug mer detaljerad igenkänning av formatsträngar\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output skriv en \"Java .properties\"-fil\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
" --copyright-holder=STRÄNG sätt copyrightinnehavare i resultatet\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
msgstr ""
" --foreign-user utelämna FSF copyrighttext i resultatet\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, c-format
msgid " --package-name=PACKAGE set package name in output\n"
msgstr " --package-name=PAKET sätt paketnamn i utdata\n"
-#: src/xgettext.c:989
+#: src/xgettext.c:1012
#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr " --package-version=VERSION sätt paketversion i utdata\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
@@ -4027,7 +4141,7 @@ msgstr ""
" --msgid-bugs-address=EPOST@ADRESS sätt mottagare för msgid-"
"felrapporter\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -4037,7 +4151,7 @@ msgstr ""
" -m[STRÄNG], --msgstr-prefix[=STRÄNG] inled översatta strängar med STRÄNG "
"eller \"\"\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -4047,7 +4161,7 @@ msgstr ""
" -M[STRÄNG], --msgstr-suffix[=STRÄNG] avsluta översatta strängar med "
"STRÄNG eller \"\"\n"
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4055,31 +4169,31 @@ msgid ""
msgstr ""
"Ett \"--flag\"-argument har inte <ord>:<nummer>:[pass-]<flagga> syntax: %s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr "standard in"
-#: src/xgettext.c:2020
+#: src/xgettext.c:2071
#, c-format
msgid "Non-ASCII character at %s%s."
msgstr "Icke-ASCII-tecken vid %s%s."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr "Icke-ASCII-kommentar vid eller före %s%s."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr "Icke-ASCII-sträng vid %s%s."
-#: 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 "%s%s: varning: "
-#: 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 "
@@ -4088,7 +4202,7 @@ msgstr ""
"%s är inte en giltig formatsträng för %s trots att den används i en "
"formatsträngsposition. Orsak: %s\n"
-#: src/xgettext.c:2139
+#: src/xgettext.c:2190
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4097,7 +4211,7 @@ msgstr ""
"%s är inte en giltig formatsträng för %s trots att den är deklarerad som en. "
"Orsak: %s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4111,7 +4225,7 @@ msgstr ""
"Överväg att istället använda en formatsträng med namngivna argument\n"
"och en mappning istället för en lista för argumenten.\n"
-#: src/xgettext.c:2232
+#: src/xgettext.c:2283
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
@@ -4121,27 +4235,27 @@ msgstr ""
"gettext(\"\") returnerar huvudet med metainformation,\n"
"inte den tomma strängen.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "tvetydig argumentspecifikation för nyckelord \"%.*s\""
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "varning: kontext saknas för nyckelordet \"%.*s\""
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr "varning: kontext saknas för pluralargumentet till nyckelordet \"%.*s\""
-#: src/xgettext.c:2942
+#: src/xgettext.c:3052
#, c-format
msgid "context mismatch between singular and plural form"
msgstr "kontext misstämmer mellan singular- och pluralformen"
-#: 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"
@@ -4153,7 +4267,7 @@ msgstr ""
"på variabeln MSGID_BUGS_ADDRESS där, annars ange\n"
"flaggan --msgid-bugs-address på kommandoraden.\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, c-format
msgid "language '%s' unknown"
msgstr "språket \"%s\" okänt"
diff --git a/gettext-tools/po/tr.po b/gettext-tools/po/tr.po
index 3139d56..461f58b 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: 2013-07-07 18:21+0900\n"
+"POT-Creation-Date: 2014-06-01 11:19+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"
@@ -181,15 +181,15 @@ msgstr "compile_java_class'ın source_version argümanı geçersiz"
msgid "invalid target_version argument to compile_java_class"
msgstr "compile_java_class'ın target_version argümanı geçersiz"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c: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 "\"%s\" oluşturulamadı"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c: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 "\"%s\" dosyasına yazarken hata"
@@ -213,20 +213,20 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr "%s alt süreci G/Ç hatası"
-#: 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 "bellek tükendi"
#: gnulib-lib/pipe-filter-ii.c:192
-#, fuzzy, c-format
+#, c-format
msgid "creation of threads failed"
-msgstr "C# sınıfı derlenemedi, lütfen --verbose seçeneğini deneyin"
+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 "%s alt sürecine yazılamadı"
@@ -313,8 +313,8 @@ 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: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 "\"%s\" okunmak için açılırken hata"
@@ -692,7 +692,7 @@ msgstr ""
"değil."
#: 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'"
@@ -739,29 +739,29 @@ 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
+#: src/format-python-brace.c:137
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
msgstr "%u numaralı yönergede, '%c' den sonra bir rakam gelmiyor."
-#: src/format-python-brace.c:149
+#: src/format-python-brace.c:150
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
msgstr ""
"%u numaralı yönergede, '{' ayracından sonra bir argüman numarası gelmiyor."
-#: src/format-python-brace.c:164
+#: src/format-python-brace.c:165
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
msgstr "%u numaralı yönergede, '%c' den sonra bir rakam gelmiyor."
-#: src/format-python-brace.c:184
+#: src/format-python-brace.c:185
#, fuzzy, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
msgstr "%u numaralı yönergede, '%c' den önce bir hassasiyet olmamalı."
-#: src/format-python-brace.c:210
+#: src/format-python-brace.c:270
#, fuzzy, c-format
msgid "In the directive number %u, there is an unterminated format directive."
msgstr "%u numaralı yönergede, %d. argüman negatif."
@@ -813,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: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"
@@ -826,19 +826,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 "%s tarafından yazıldı.\n"
#. 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 "Bruno Haible"
@@ -848,11 +848,11 @@ msgstr "Bruno Haible"
msgid "too many arguments"
msgstr "çok fazla argüman"
-#: 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
#, fuzzy, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Daha fazla bilgilendirilmek için `%s --help' yazınız.\n"
@@ -892,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: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 "Bilgilendirme çıktısı:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help bu yardım iletisini gösterir ve çıkar\n"
-#: 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 " -V, --version Sürüm bilgilerini gösterir ve çıkar\n"
@@ -923,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: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 ""
"Yazılım hatalarını <bug-gnu-utils@gnu.org> adresine,\n"
@@ -938,30 +938,27 @@ msgstr ""
msgid "could not get host name"
msgstr "makina ismi alınamadı"
-#: 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 "en fazla bir girdi dosyasına izin var"
-#: 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 "%s ile %s bağdaşmıyor"
-#: 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 "Kullanımı: %s [SEÇENEK] [GİRDİDOSYASI]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -970,33 +967,33 @@ msgstr ""
"Çeviri kataloğundaki iletileri belirtilen özelliklere göre süzer,\n"
"ve özellikleri uygular.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c: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 ""
"Uzun seçeneklerdeki zorunlu argümanlar kısa seçenekler için de zorunludur.\n"
-#: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
-#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
-#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
-#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
+#: src/msgattrib.c:433 src/msgcat.c: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 "Girdi dosyasının yeri:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " GİRDİDOSYASI girdi olan PO dosyası\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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"
@@ -1004,30 +1001,30 @@ msgstr ""
" -D, --directory=DİZİN girdi dosyasının arandığı listeye DİZİNi "
"ekler\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c: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 "Bir DOSYA verilmemişse ya da - verilmişse standart girdi okunur.\n"
-#: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
-#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
-#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
-#: src/xgettext.c:857
+#: src/msgattrib.c:442 src/msgcat.c: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 "Çıktı dosyasının yeri:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 " -o, --output-file=DOSYA çıktıyı DOSYAya yazar\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1035,12 +1032,12 @@ msgid ""
msgstr ""
"Sonuçlar DOSYA verilmezse ya da - verilirse standart çıktıya yazılır.\n"
-#: 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 "İleti seçimi:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
@@ -1048,7 +1045,7 @@ msgstr ""
" --translated çevrilmiş iletileri tutar çevrilmemişleri "
"siler\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
@@ -1056,54 +1053,54 @@ msgstr ""
" --untranslated çevrilmemiş iletileri tutar çevrilmişleri "
"siler\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr " --no-fuzzy 'fuzzy' imli iletileri siler\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr " --only-fuzzy 'fuzzy' imli iletileri tutar\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete kullanımdışı olan #~ iletilerini siler\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete kullanımdışı olan #~ iletilerini tutar\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Nitelik değiştirme:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr " --set-fuzzy tüm iletileri 'fuzzy' olarak imler\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr " --clear-fuzzy tüm 'fuzzy' imlerini kaldırır\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr " --set-obsolete tüm iletileri kullanımdışı yapar\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr ""
" --clear-obsolete kullanımdışı iletilerin tümünü kullanıma "
"sokar\n"
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, fuzzy, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
@@ -1111,7 +1108,7 @@ msgid ""
msgstr ""
" --previous çevrilmiş iletinin eski msgid'sini tutar\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
@@ -1119,14 +1116,20 @@ msgid ""
msgstr ""
" --clear-previous tüm iletilerden eski msgid'ler kaldırılır\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, fuzzy, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr " --no-fuzzy 'fuzzy' imli iletileri siler\n"
+
+#: src/msgattrib.c:482
#, 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:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
@@ -1134,29 +1137,29 @@ msgstr ""
" --ignore-file=DOSYA.po sadece DOSYA.po içinde bulunmayan girdileri\n"
" değiştirir\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr ""
" --fuzzy --only-fuzzy --clear-fuzzy ile eşanlamlı\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
msgstr ""
" --obsolete --only-obsolete --clear-obsolete ile eşanlamlı\n"
-#: 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 "Girdi dosyası sözdizimi:\n"
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c: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"
@@ -1164,8 +1167,8 @@ msgstr ""
" -P, --properties-input girdi dosyası Java .properties "
"sözdizimindedir\n"
-#: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
-#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c: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 "
@@ -1174,17 +1177,17 @@ msgstr ""
" --stringtable-input NeXTstep/GNUstep .strings sözdizimli girdi "
"dosyası\n"
-#: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
-#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
-#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
-#: src/xgettext.c:946
+#: src/msgattrib.c:498 src/msgcat.c: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 "Çıktı ayrıntıları:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1193,16 +1196,16 @@ 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"
@@ -1210,9 +1213,9 @@ msgstr ""
" -e, --no-escape çıktıda C öncelemeleri kullanılmaz "
"(öntanımlı)\n"
-#: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
-#: src/msguniq.c:390 src/xgettext.c:956
+#: src/msgattrib.c:508 src/msgcat.c: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"
@@ -1221,28 +1224,28 @@ msgstr ""
"karakterler\n"
" yorumlanmaz\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr " --force-po boş bile olsa PO dosyasını yazar\n"
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr " -i, --indent .po dosyasını girintili tarzda yazar\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
" --no-location '#: dosyaismi:satır' satırları yazılmaz\n"
-#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:964
+#: src/msgattrib.c:516 src/msgcat.c: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"
@@ -1250,25 +1253,25 @@ msgstr ""
" -n, --add-location '#: dosyaismi:satır' satırları üretilir\n"
" (öntanımlı\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
+#: src/xgettext.c:989
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
" --strict .po dosyasının bilinen biçeminde yazar.\n"
-#: src/msgattrib.c:511 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
-#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
-#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
+#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
+#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr ""
" -p, --properties-output çıktıyı bir Java .properties dosyasına yazar\n"
-#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
-#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970
+#: src/msgattrib.c:522 src/msgcat.c: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"
@@ -1276,16 +1279,16 @@ msgstr ""
" --stringtable-output çıktıyı bir NeXTstep/GNUstep .strings\n"
" dosyasına yazar\n"
-#: src/msgattrib.c:515 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
-#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
-#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:972
+#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
+#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=SAYI sayfa genişliğini SAYIya ayarlar\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c: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"
@@ -1294,31 +1297,31 @@ msgstr ""
" --no-wrap sayfa genişliğine sığmayan satırların taşan\n"
" kısmı bir alt satıra indirilmez\n"
-#: src/msgattrib.c: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 " -s, --sort-output sıralı çıktı üretir\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 " -F, --sort-by-file çıktıyı dosyadaki yerine göre sıralar\n"
-#: 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 "belirtilen seçim kriteri mümkün değil (%d < n < %d)"
-#: 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 "Kullanımı: %s [SEÇENEK] [GİRDİDOSYASI]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, fuzzy, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1342,24 +1345,24 @@ 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:848
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
#, 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: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 ""
" -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: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 "Girdi dosyası - ise, standart girdi okunur.\n"
-#: 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"
@@ -1368,7 +1371,7 @@ msgstr ""
" -<, --less-than=SAYI bu SAYIdan daha fazla olan iletileri basmaz,\n"
" belirtilmezse öntanımlı sonsuzdur.\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1377,7 +1380,7 @@ msgstr ""
" ->, --more-than=NUMBER bu SAYIdan daha az olan iletileri basmaz,\n"
" belirtilmezse öntanımlı 0 dır.\n"
-#: 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"
@@ -1386,8 +1389,8 @@ msgstr ""
" -u, --unique --less-than=2 için kısaltmadır, sadece\n"
" eşi olmayan iletiler basılır\n"
-#: src/msgcat.c: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"
@@ -1395,8 +1398,8 @@ msgstr ""
" -P, --properties-input girdi dosyaları Java .properties "
"sözdizimlidir\n"
-#: 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"
@@ -1405,12 +1408,12 @@ msgstr ""
" --stringtable-input NeXTstep/GNUstep .strings sözdizimli girdi\n"
" dosyaları\n"
-#: 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 " -t, --to-code=İSİM çıktı için kodlama\n"
-#: 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"
@@ -1419,28 +1422,28 @@ msgstr ""
" --use-first her ileti için mevcut olan ilk kullanılır,\n"
" çok sayıda çeviri varsa bile alınmaz.\n"
-#: src/msgcat.c:432 src/msgen.c: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 "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "hiçbir girdi dosyası verilmemiş"
-#: 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 "tam olarak 2 girdi dosyası gerekli"
-#: 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 "Kullanımı: %s [SEÇENEK] def.po ref.pot\n"
@@ -1471,12 +1474,12 @@ msgstr " def.po çeviriler\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot kaynaklara bağlantılar\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "İşlem değiştiriciler:\n"
-#: 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."
@@ -1484,7 +1487,7 @@ msgid ""
msgstr ""
" -m, --multi-domain ref.pot'u tüm def.po dosyalarına uygular\n"
-#: 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 " -N, --no-fuzzy-matching fuzzy eşleşmeler kullanılmaz\n"
@@ -1510,17 +1513,17 @@ msgstr "bu ileti çevrilmemiş"
msgid "this message needs to be reviewed by the translator"
msgstr "bu iletiyi çevirmenin gözden geçirmesi lazım"
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1505
#, c-format
msgid "this message is used but not defined..."
msgstr "bu ileti kullanıldı ama tanımlı değil..."
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1508
#, c-format
msgid "...but this definition is similar"
msgstr "...ama bu tanımlama benzer"
-#: 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 "bu ileti kullanıldı ama %s'de tanımlı değil"
@@ -1530,19 +1533,19 @@ msgstr "bu ileti kullanıldı ama %s'de tanımlı değil"
msgid "warning: this message is not used"
msgstr "uyarı: bu ileti kullanılmamış"
-#: 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] "%d ölümcül hata bulundu"
msgstr[1] "%d ölümcül hata bulundu"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "en az iki dosya belirtilmelidir"
-#: src/msgcomm.c:363
+#: src/msgcomm.c:364
#, fuzzy, c-format, no-wrap
msgid ""
"Find messages which are common to two or more of the specified PO files.\n"
@@ -1564,7 +1567,7 @@ msgstr ""
"çıkarma yorumları korunmuş olacaktır. Tüm PO dosyalarındaki dosya konumları\n"
"korunmuş olacaktır.\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1573,71 +1576,71 @@ msgstr ""
" ->, --more-than=SAYI SAYIdan daha fazla olan iletileri basar,\n"
" verilmezse öntanımlı 1 dir\n"
-#: src/msgcomm.c:451 src/xgettext.c:981
+#: src/msgcomm.c:452 src/xgettext.c:1004
#, fuzzy, c-format
msgid ""
" --omit-header don't write header with 'msgid \"\"' entry\n"
msgstr ""
" --omit-header başlıktaki `msgid \"\"' girdisini yazmaz\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr "Bir çeviri kataloğunu başka bir karakter kodlamasına dönüştürür.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Dönüşüm hedefi:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Öntanımlı kodlama mevcut yerelin kodlamasıdır.\n"
-#: src/msgconv.c: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 " -i, --indent girintili çıktı tarzı\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
" --no-location '#: dosyaismi:satır' satırlarını engeller\n"
-#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
-#: src/msgmerge.c:583
-#, c-format
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
+#: src/msgmerge.c:588
+#, fuzzy, c-format
msgid ""
-" --add-location preserve '#: filename:line' lines (default)\n"
+" -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
" --add-location '#: dosyaismi:satır' satırları korunur\n"
" (öntanımlı)\n"
-#: src/msgconv.c: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 " --strict çıktı bilinen biçemde yazılır\n"
-#: 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 "hiç girdi dosyası verilmemiş"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "tam olarak 1 girdi dosyası gerekli"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Kullanımı: %s [SEÇENEK] GİRDİDOSYASI\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1650,7 +1653,7 @@ msgstr ""
"PO Şablon dosyasıdır. Çevirisiz girdilere msgid ile uyuşan bir çeviri\n"
"yerleştirilir ve fuzzy olarak imlenir.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " GİRDİDOSYASI PO ya da POT dosyası\n"
@@ -1689,7 +1692,7 @@ msgstr ""
"'0' özel bir yerleşik komuttur ve bir null bayt ile sonlanan çeviri\n"
"çıktılar. \"msgexec 0\"ın çıktısı \"xargs -0\"a girdi olarak elverişlidir.\n"
-#: src/msgexec.c:281 src/msgfilter.c:401
+#: src/msgexec.c:281 src/msgfilter.c:420
#, c-format
msgid " -i, --input=INPUTFILE input PO file\n"
msgstr " -i, --input=GİRDİDOSYASI PO dosyası\n"
@@ -1699,27 +1702,27 @@ msgstr " -i, --input=GİRDİDOSYASI PO dosyası\n"
msgid "write to stdout failed"
msgstr "standart çıktıya yazılamadı"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "süzgeç ismi eksik"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr "en az bir sed betiği belirtilmelidir"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Kullanımı: %s [SEÇENEK] SÜZGEÇ [SÜZGEÇ-SEÇENEĞİ]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "Bir çeviri kataloğunun tüm çevirilerine bir süzgeç uygular.\n"
-#: src/msgfilter.c:416
+#: src/msgfilter.c:435
#, c-format
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
@@ -1728,18 +1731,18 @@ msgstr ""
"SÜZGEÇ çeviriyi standart girdiden okuyabilen ve değiştirilmiş çeviriyi\n"
"standart çıktıya yazabilen herhangi bir programdır.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "SÜZGEÇ 'sed' iken kullanılan SÜZGEÇ-SEÇENEKleri:\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
msgstr " -e, --expression=BETİK BETİK çalıştırılacak komutlara eklenir\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1749,14 +1752,14 @@ msgstr ""
" -f, --file=BETİK BETİK dosyasının içeriğini çalıştırılacak\n"
" komutlara ekler\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr ""
" -n, --quiet, --silent kalıp alanının otomatik basılmasını engeller\n"
-#: src/msgfilter.c: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"
@@ -1764,92 +1767,113 @@ msgstr ""
" --no-escape çıktıda C öncelemeleri kullanılmaz "
"(öntanımlı)\n"
-#: 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 " --indent girintili çıktı tarzı\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
msgstr " --keep-header başlık değiştirilmeden korunur\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "%s argümanı bir noktalama işareti olmalıydı"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
msgstr "bayt sırası geçersiz: %s"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
+#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
msgid "Ulrich Drepper"
msgstr "Ulrich Drepper"
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:439
+#, fuzzy, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr "Bir DOSYA verilmemişse ya da - verilmişse standart girdi okunur.\n"
+
+#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
#: src/msgunfmt.c:353
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s bir \"-d dizin\" uygulanmasını gerektiriyor"
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c: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 "%s bir \"-l yerel\" belirtilmesini gerektiriyor"
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:538
+#, fuzzy, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s bir \"-l yerel\" belirtilmesini gerektiriyor"
+
+#: src/msgfmt.c:545
+#, fuzzy, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s bir \"-l yerel\" belirtilmesini gerektiriyor"
+
+#: src/msgfmt.c:551
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s ile %s bağdaşmıyor"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s sadece %s ya da %s ile geçerlidir"
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:571 src/msgfmt.c:577
#, c-format
msgid "%s is only valid with %s, %s or %s"
msgstr "%s sadece %s, %s ya da %s ile geçerlidir"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c: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] "%d çevrilmiş ileti"
msgstr[1] "%d çevrilmiş ileti"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d belirsiz çeviri"
msgstr[1] ", %d belirsiz çeviri"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d çevrilmemiş ileti"
msgstr[1] ", %d çevrilmemiş ileti"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Kullanımı: %s [SEÇENEK] dosyaismi.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "Çevirilerin bulunduğu dosyadan ikilik ileti kataloğunu üretir.\n"
-#: src/msgfmt.c: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"
@@ -1858,17 +1882,17 @@ msgstr ""
"Uzun seçeneklerdeki zorunlu argümanlar kısa seçeneklerde de zorunludur.\n"
"Benzer durum seçimlik argümanlar içinde geçerlidir.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
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:890
+#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "İşlem kipi:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1877,7 +1901,7 @@ msgstr ""
" -j, --java Java kipi: bir Java ResourceBundle sınıfı "
"üretir\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1887,13 +1911,13 @@ msgstr ""
"yüksek)\n"
" kabul edilir\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr ""
" --csharp C# kipi: bir .NET .dll dosyası üretilir\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -1902,53 +1926,67 @@ msgstr ""
" --csharp-resources C# özkaynak kipi: bir .NET .resources dosyası\n"
" üretilir\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
" --tcl Tcl kipi:bir tcl/msgcat .msg dosyası üretilir\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt Qt kipi: bir Qt .qm dosyası üretir\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, fuzzy, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr " --qt Qt kipi: bir Qt .qm dosyası üretir\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict bilinen kip etkinleştirilir\n"
-#: 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 "Çıktı dosyası - verilmişse, standard çıktı kullanılır.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Java kipinde çıktı dosyasının yeri:\n"
-#: 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 " -r, --resource=ÖZKAYNAK özkaynak ismi\n"
-#: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
-#: src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
+#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr " -l, --locale=YEREL yerel ismi, \"tr\" ya da \"tr_TR\"\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, fuzzy, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --tcl Tcl kipi: girdi bir tcl/msgcat .msg dosyasıdır\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr " -d DİZİN sınıf ana dizini\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1959,12 +1997,12 @@ msgstr ""
"Sınıf ismi, özkaynak ismine yerel isminin bir altçizgi ile eklenmesiyle\n"
"saptanır. Sınıf DİZİNe yazılacağından -d seçeneği zorunludur.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "C# kipinde çıktı dosyasının yeri:\n"
-#: 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 "
@@ -1972,7 +2010,7 @@ msgid ""
msgstr ""
" -d DİZİN yerele bağımlı .dll dosyaları için kök dizin\n"
-#: 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"
@@ -1982,17 +2020,17 @@ msgstr ""
"belirlenen\n"
"dizinin bir altdizinine yazılır.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Tcl kipte çıktı dosyasının yeri:\n"
-#: 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 " -d DİZİN .msg ileti kataloglarının ana dizini\n"
-#: 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"
@@ -2000,12 +2038,45 @@ msgid ""
msgstr ""
"-l ve -d seçenekleri zorunludur. .msg dosyası belirtilen dizine yazılır.\n"
-#: 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
+#, fuzzy, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr " -d DİZİN .msg ileti kataloglarının ana dizini\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, fuzzy, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -k, --keyword[=SÖZCÜK] aranan ek anahtar sözcük (SÖZCÜK için "
+"öntanımlı\n"
+" anahtar sözcükler kullanılmamalıdır)\n"
+
+#: 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 "Girdi dosyası yorumlaması:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -2016,13 +2087,13 @@ msgstr ""
"domain\n"
" için kısaltma\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format dile bağlı biçem dizgeleri kontrol edilir\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -2031,7 +2102,7 @@ msgstr ""
" --check-header başlık girdilerilerinin varlığı ve içeriği\n"
" kontrol edilir\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -2040,7 +2111,7 @@ msgstr ""
" --check-domain --output-file seçeneği ile paket yönergeleri\n"
" arasındaki çelişkiler kontrol edilir\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2048,7 +2119,7 @@ msgid ""
msgstr ""
" -C, --check-compatibility GNU msgfmt, X/Open msgfmt gibi mi davranıyor\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -2058,19 +2129,19 @@ msgstr ""
" --check-accelerators[=KRKT] menü öğeleri için tuş belirticiler\n"
" kontrol edilir\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr " -f, --use-fuzzy çıktıda fuzzy girdiler kullanılır\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
" -a, --alignment=SAYI dizgeleri SAYI bayta ayarlar (öntanımlı: %d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2079,87 +2150,97 @@ 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 ""
" --no-hash ikilik dosya saçılma tablosunu içermeyecek\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr ""
" --statistics çeviriler hakkındaki istatistikleri basar\n"
-#: 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 " -v, --verbose daha ayrıntılı çıktı verilir\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "uyarı: PO dosya başlığı ya yok ya da geçersiz\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "uyarı: Kullanıcının karakter kümesinde ileti dönüşümü yapılamayacak.\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "uyarı: PO dosya başlığı fuzzy\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "uyarı: msgfmt'ın eski sürümleri bu dosyada hata verecektir.\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "dosya ismi olarak paket ismi \"%s\" uygun değil"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "dosya ismi olarak paket ismi \"%s\" uygun değil: önek kullanılacak"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "'domain %s' directive ignored"
msgstr "`domain %s' yönergesi yoksayıldı"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, fuzzy, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "boş `msgstr' girdisi yoksayıldı"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, fuzzy, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "fuzzy `msgstr' girdisi yoksayıldı"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: uyarı: kaynak dosya fuzzy çeviriler içeriyor"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c: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 "\"%s\" okunurken hata"
-#: 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 "
@@ -2168,7 +2249,7 @@ msgstr ""
"'%c' seçeneği 'J', 'K', 'T', 'C' veya 'X' harflerinden biri belirtilmeden "
"önce kullanılamaz"
-#: 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"
@@ -2177,7 +2258,7 @@ msgstr ""
"Verilen bir kalıp ile uyuşan ya da verilen kaynak dosyalarına ait olan\n"
"bir çeviri kataloğunun tüm iletilerini çıkarır.\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2255,7 +2336,7 @@ msgstr ""
" -v, --invert-match sadece bir seçim kriteri ile eşleşmeyen iletiler\n"
" çıktılanır\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2264,12 +2345,12 @@ msgstr ""
"karakterler\n"
" yorumlanmaz\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output sıralı çıktı üretir\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file sıralama dosyanın yerine göre yapılır\n"
@@ -2430,7 +2511,7 @@ msgstr "hedef karakter kümesi \"%s\" kabul görmüş bir kodlama ismi değil."
#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:3051
+#: src/xgettext.c:544 src/xgettext.c:3418
#, c-format
msgid "warning: "
msgstr "uyarı: "
@@ -2639,17 +2720,17 @@ msgstr "çoğul biçemler bir GNU gettext özelliğidir"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "içinde '%c' tuş kısayolu eksik"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "çok fazla '%c' tuş kısayolu içeriyor"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, fuzzy, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "bazı başlık alanları hala öntanımlı ilk değere sahip\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, fuzzy, c-format
msgid "header field '%s' missing in header\n"
msgstr "başlıkta `%s' başlık alanı yok\n"
@@ -2669,7 +2750,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: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 "
@@ -2688,7 +2769,7 @@ msgstr ""
"oluyor."
#: 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 "
@@ -2697,16 +2778,16 @@ msgstr ""
"\"%s\" \"%s\" e dönüştürülemiyor. %s iconv()ye bağlı.\n"
"Bu sürüm iconv() olmaksızın kurgulanmış."
-#: src/msgmerge.c:383 src/msgmerge.c:389
+#: src/msgmerge.c:392 src/msgmerge.c:398
#, c-format
msgid "%s is only valid with %s"
msgstr "%s sadece %s ile geçerlidir"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr "yedekleme türü"
-#: 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"
@@ -2729,17 +2810,17 @@ msgstr ""
"Daha iyi sonuçlar elde edebilmek için zorunlu eşleşmeler bulunamadığında\n"
"belirsiz eşleşmeler kullanılmıştır.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po eski kaynaklara bağlı çeviriler\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot yeni kaynaklara bağlar\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2748,7 +2829,7 @@ msgstr ""
" -C, --compendium=DOSYA ileti çevirileri için ek veritabanı, birden\n"
" fazla belirtilebilir\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2757,27 +2838,27 @@ msgstr ""
" -U, --update def.po dosyasını günceller,\n"
" def.po zaten güncelse bir şey yapmaz\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Güncelleme kipinde çıktı dosyasının yeri:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Sonuç gerisin geri def.po'ya yazılır.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=KONTROL def.po'nun yedeklemesini yapar\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=SONEK yedekleme sonek kullanarak yapılır\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2796,7 +2877,7 @@ msgstr ""
" yedekleme yapılır\n"
" simple, never daima basit yedekleme yapılır\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, fuzzy, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2806,29 +2887,29 @@ msgstr ""
"--suffix seçeneği ile ya da SIMPLE_BACKUP_SUFFIX ortam değişkeni ile\n"
"belrtilmedikçe yedeklenen dosyanın soneki `~' dir.\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
msgstr ""
" --previous çevrilmiş iletinin eski msgid'sini tutar\n"
-#: 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 " -q, --quiet, --silent işlemin ilerleyişi gösterilmez\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
msgstr ".bu ileti çoğul biçem olmalıydı"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
msgstr "bu ileti çoğul biçem olmamalıydı"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2837,7 +2918,7 @@ msgstr ""
"%s%ld eski + %ld referans, %ld katışık, %ld fuzzy, %ld eksik, %ld artık "
"kullanılmayan ileti okundu.\n"
-#: 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"
@@ -2947,7 +3028,7 @@ msgstr " -i, --indent girintili çıktı tarzı kullanılır\n"
msgid " --strict write strict uniforum style\n"
msgstr " --strict bilinen biçemde yazılır\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -2968,12 +3049,12 @@ msgstr ""
"onlar ilk çeviriden alınır. Dosya konumları korunur. --unique seçeneği\n"
"kullanıldığında tekrarlananlar iptal edilir.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated sadece yinelenenler yazılır\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -3043,27 +3124,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "#~ kullanımı aykırı"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, fuzzy, c-format
msgid "missing 'msgstr[]' section"
msgstr "`msgstr[]' bölümü yok"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, fuzzy, c-format
msgid "missing 'msgid_plural' section"
msgstr "`msgid_plural' bölümü yok"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, fuzzy, c-format
msgid "missing 'msgstr' section"
msgstr "`msgstr' bölümü yok"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "ilk çoğul biçemin indeksi sıfır değil"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "çoğul biçemin indeksi hatalı"
@@ -3073,7 +3154,7 @@ msgstr "çoğul biçemin indeksi hatalı"
msgid "too many errors, aborting"
msgstr "hatalar çok fazla, bunları düzeltince programı tekrar çalıştırın"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c: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 "çoklu bayt dizisi geçersiz"
@@ -3117,16 +3198,16 @@ 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:1023
+#: src/read-catalog.c:318 src/xgettext.c:1046
#, c-format
msgid "this file may not contain domain directives"
msgstr "bu dosya paket yönergelerini içermeyebilir"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "ileti iki defa tanımlanmış"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "bu ilk tanımlamanın konumu"
@@ -3326,19 +3407,19 @@ msgstr "C# sınıfı derlenemedi, lütfen --verbose seçeneğini deneyin"
msgid "compilation of C# class failed"
msgstr "C# sınıfı derlenemedi, lütfen --verbose seçeneğini deneyin"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "Geçerli bir Java sınıfı ismi değil: %s"
-#: src/write-java.c:1165
+#: src/write-java.c:1210
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
"Java sınıfı derlenemedi, lütfen --verbose seçeneğini kullanın ya da\n"
"$JAVAC ortam değişkenine uygun değeri atayın."
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, fuzzy, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr ""
@@ -3350,13 +3431,13 @@ msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "\"%s\" yazılmak için açılırken hata"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, fuzzy, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr "i18n iletileri `\\%c' öncelem dizilerini içeremez"
-#: 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"
@@ -3369,7 +3450,7 @@ msgstr ""
"olabilir. Salt ASCII msgctxt kullanmanız önerilir.\n"
"%s\n"
-#: 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"
@@ -3450,7 +3531,7 @@ msgstr ""
"ileti kataloğu çoğul çeviriler içermesine rağmen Tcl ileti kataloğu\n"
"biçemi çoğul çevirileri desteklemiyor\n"
-#: src/x-awk.c:341 src/x-javascript.c: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 "%s:%d: uyarı: sonlandırılmamış dizge"
@@ -3460,17 +3541,22 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, fuzzy, c-format
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: uyarı: Unicode karakter geçersiz"
+
+#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
#, 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-vala.c:832
+#: src/x-c.c:1345 src/x-vala.c:752
#, 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:2055
+#: src/x-csharp.c:224 src/xgettext.c:2106
#, fuzzy
msgid "Please specify the source encoding through --from-code."
msgstr ""
@@ -3527,7 +3613,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:1335
+#: src/x-csharp.c:1390 src/x-python.c:1138
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: uyarı: Unicode karakter geçersiz"
@@ -3547,22 +3633,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: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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3628,11 +3714,21 @@ 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
+#: src/x-javascript.c:954
#, fuzzy, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: uyarı: Unicode karakter geçersiz"
+
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: uyarı: sonlandırılmamış dizge"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3769,32 +3865,37 @@ msgstr ""
"%s:%lu: uyarı: güvenlikle ilgili sebeplerden dolayı $\"...\" sözdizimi artık "
"kullanılmayacak; yerine eval_gettext kullanın"
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, fuzzy, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: uyarı: sonlandırılmamış dizge sabiti"
-#: src/xgettext.c: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 "standart çıktıya yazılırken --join-existing kullanılamaz"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext anahtar sözcükler olmaksızın bulamaz"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, 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:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "Belirtilen girdi dosyalarından çevrilebilir dizgeleri çıkartır.\n"
-#: src/xgettext.c:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3802,23 +3903,23 @@ msgid ""
msgstr ""
" -d, --default-domain=İSİM çıktıda messages.po yerine İSİM.po kullanılır\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, 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:863
+#: src/xgettext.c:886
#, 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:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Girdi dosyası dilinin seçimi:\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, fuzzy, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3828,7 +3929,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=İSİM belirtilen dil tanınır:\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3838,19 +3939,19 @@ msgstr ""
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ --language=C++ ile aynı\n"
-#: 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 "Öntanımlı olarak dil, girdi dosyasının uzantısına bakarak saptanır.\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3859,24 +3960,24 @@ msgstr ""
" --from-code=İSİM girdi dosyası için yerel kodlaması\n"
" (Python, Tcl, Glade dışında)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, 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:892
+#: src/xgettext.c:915
#, 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:894
+#: src/xgettext.c:917
#, 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:896
+#: src/xgettext.c:919
#, fuzzy, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -3887,17 +3988,17 @@ msgid ""
msgstr ""
" -c, --add-comments[=ETİTET] ETİKETli yorum bloğunu çıktı dosyasına yazar\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Dile özel seçenekler:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all tüm dizgeler çıkarılır\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3911,17 +4012,21 @@ msgstr ""
"Java,\n"
" C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
-#: src/xgettext.c:911
+#: src/xgettext.c:937
#, fuzzy, 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 ""
-" -k, --keyword[=SÖZCÜK] aranan ek anahtar sözcük (SÖZCÜK için "
-"öntanımlı\n"
-" anahtar sözcükler kullanılmamalıdır)\n"
+" (sadece bu diller: C, C++, ObjectiveC, Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+" C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3931,7 +4036,7 @@ msgstr ""
" --flag=SÖZCÜK:ARG:İM SÖZCÜK anahtar sözcüğünün ARG numaralı\n"
" argümanının içindeki dizge için ek im\n"
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3946,56 +4051,56 @@ msgstr ""
"Java,\n"
" C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, 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:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
" (sadece bu diller: C, C++, ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt Qt biçim dizgeleri tanınır\n"
-#: 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 " (sadece C++)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, fuzzy, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --qt Qt biçim dizgeleri tanınır\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --boost Boost biçim dizgeleri tanınır\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, 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:968
+#: src/xgettext.c:991
#, 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:983
+#: src/xgettext.c:1006
#, 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:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -4003,17 +4108,17 @@ msgstr ""
" --foreign-user yabancı kullanıcılar için FSF telif hakkı\n"
" çıktıda atlanır\n"
-#: 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
#, 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:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
@@ -4021,7 +4126,7 @@ msgstr ""
" --msgid-bugs-address=EPOSTA@ADRESİ\n"
" msgid hatalarının bildirileceği adres\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, fuzzy, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -4031,7 +4136,7 @@ msgstr ""
" -m, --msgstr-prefix[=DİZGE] msgstr girdilerinde önek olarak \"\" yerine\n"
" DİZGE kullanılır\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, fuzzy, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -4041,7 +4146,7 @@ msgstr ""
" -M, --msgstr-suffix[=DİZGE] msgstr girdilerinde sonek olarak \"\" yerine\n"
" DİZGE kullanılır\n"
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4049,31 +4154,31 @@ msgid ""
msgstr ""
"Bir --flag argümanı <sözcük>:<argnum>:[pass-]<im> sözdiziminde olmaz: %s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr "standart girdi"
-#: 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 "%s%s: uyarı: "
-#: 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 "
@@ -4082,7 +4187,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:2139
+#: src/xgettext.c:2190
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4091,7 +4196,7 @@ msgstr ""
"Böyle bildirilebilirse de %s, %s biçim dizgesi içinde geçerli değil. Sebebi: "
"%s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4104,7 +4209,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:2232
+#: src/xgettext.c:2283
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
@@ -4114,27 +4219,27 @@ msgstr ""
"gettext(\"\") ile başlık girdilerindeki bilgileri\n"
"döndürür. Boş dizge değildir.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, 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:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "uyarı: anahtar sözcük '%.*s' için bağlam eksik"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, 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:2942
+#: src/xgettext.c:3052
#, 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:3052
+#: src/xgettext.c:3419
#, fuzzy
msgid ""
"The option --msgid-bugs-address was not specified.\n"
@@ -4147,7 +4252,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:3267
+#: src/xgettext.c:3638
#, fuzzy, c-format
msgid "language '%s' unknown"
msgstr "dil `%s' bilinmiyor"
@@ -4156,25 +4261,12 @@ 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"
#~ msgid "DuplicateHandle failed with error code 0x%08x"
#~ msgstr "DuplicateHandle 0x%08x hata kodu vererek başarısız oldu"
-#~ msgid "Not yet implemented."
-#~ msgstr "Henüz çalışmıyor."
-
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "`%s' başlık alanı hala öntanımlı ilk değere sahip\n"
-
#~ msgid "Multiple references to %%%c."
#~ msgstr "%%%c için çoklu başvuru."
@@ -4191,6 +4283,15 @@ msgstr "<isimsiz>"
#~ "Hiçbir garantisi yoktur; hatta SATILABİLİRLİĞİ veya ŞAHSİ KULLANIMINIZA\n"
#~ "UYGUNLUĞU için bile garanti verilmez.\n"
+#~ msgid "Not yet implemented."
+#~ msgstr "Henüz çalışmıyor."
+
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "`%s' başlık alanı satırın başında olmalıydı\n"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "`%s' başlık alanı hala öntanımlı ilk değere sahip\n"
+
#~ msgid ""
#~ "message catalog has context dependent translations\n"
#~ "but the C# .dll format doesn't support contexts\n"
diff --git a/gettext-tools/po/uk.po b/gettext-tools/po/uk.po
index fff8403..022070a 100644
--- a/gettext-tools/po/uk.po
+++ b/gettext-tools/po/uk.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the gettext package.
#
# Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2004-2007.
-# Yuri Chornoivan <yurchor@ukr.net>, 2011, 2013.
+# Yuri Chornoivan <yurchor@ukr.net>, 2011, 2013, 2014.
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.18.3\n"
+"Project-Id-Version: gettext-tools 0.19-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-07-07 18:21+0900\n"
-"PO-Revision-Date: 2013-06-25 16:16+0300\n"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2014-05-10 17:41+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
"Language: uk\n"
@@ -184,15 +184,15 @@ msgstr "некоректний аргумент source_version для compile_ja
msgid "invalid target_version argument to compile_java_class"
msgstr "некоректний аргумент target_version для compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c: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 "не вдається створити «%s»"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: 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 "помилка запису файлу «%s»"
@@ -216,9 +216,9 @@ msgstr ""
msgid "%s subprocess I/O error"
msgstr "помилка вводу-виводу у дочірньому процесі %s"
-#: 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 "пам'ять вичерпано"
@@ -229,7 +229,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 "не вдається записати у дочірній процес %s"
@@ -317,8 +317,8 @@ 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: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 "помилка при відкриванні «%s» для читання"
@@ -700,7 +700,7 @@ msgstr ""
"перетворення «%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-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'"
@@ -746,22 +746,22 @@ msgid ""
"format specifications in '%s' and '%s' for argument '%s' are not the same"
msgstr "специфікації форматів у «%s» і «%s» для аргументу «%s» не збігаються"
-#: 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 "У директиві з номером %u «%c» не може розпочинати назву поля."
-#: 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 "У директиві з номером %u «%c» не може розпочинати аргумент getattr."
-#: 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 "У директиві з номером %u «%c» не може розпочинати аргумент getitem."
-#: 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."
@@ -769,7 +769,7 @@ msgstr ""
"У директиві з номером %u у визначенні форматування не можна використовувати "
"більший рівень вкладеності."
-#: 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 ""
@@ -822,11 +822,11 @@ msgid ""
"1 and 9."
msgstr "Символ, що завершує директиву з номером %u, не є цифрою від 1 до 9."
-#: src/hostname.c:178 src/msgattrib.c:344 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
-#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
-#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:599
+#: 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"
@@ -839,19 +839,19 @@ msgstr ""
"Це вільне програмне забезпечення: ви можете вільно змінювати і поширювати його.\n"
"Вам не надається ЖОДНИХ ГАРАНТІЙ, окрім гарантій передбачених законодавством.\n"
-#: 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 "Автор програми %s.\n"
#. 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 "Bruno Haible"
@@ -861,11 +861,11 @@ msgstr "Bruno Haible"
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 "Віддайте команду «%s --help», щоб дізнатися більше.\n"
@@ -906,29 +906,29 @@ msgstr ""
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address адреси системи\n"
-#: src/hostname.c:228 src/msgattrib.c:525 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
-#: src/msgfilter.c:476 src/msgfmt.c:775 src/msggrep.c:623 src/msginit.c:420
-#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
+#: src/hostname.c: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 "Інформативний вивід:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help вивести цю довідку та вийти\n"
-#: 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 " -V, --version вивести інформацію про версію та вийти\n"
@@ -937,11 +937,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: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 "Про помилки повідомляйте на <bug-gnu-gettext@gnu.org>.\n"
@@ -950,30 +950,27 @@ msgstr "Про помилки повідомляйте на <bug-gnu-gettext@gnu
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 "%s та %s є взаємовиключними"
-#: src/msgattrib.c:414 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Використання: %s [ПАРАМЕТР] [ВХІДНИЙ_ФАЙЛ]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -982,33 +979,33 @@ msgstr ""
"Фільтрує повідомлення каталогу перекладів у відповідності до їх атрибутів,\n"
"та маніпулює цими атрибутами.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
+#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msguniq.c:342
#, c-format
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
"Аргументи, обов'язкові для довгих ключів, є обов'язковими й для коротких.\n"
-#: src/msgattrib.c: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 "Розташування вхідного файлу:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " ВХІДНИЙ_ФАЙЛ вхідний файл PO\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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"
@@ -1016,32 +1013,32 @@ msgstr ""
" -D, --directory=КАТАЛОГ додати КАТАЛОГ до списку вхідних файлів "
"пошуку\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr ""
"Якщо вхідний файл не вказаний, або якщо вказано -, використовується "
"стандартний ввід.\n"
-#: 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 "Розташування файлу виводу:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 " -o, --output-file=ФАЙЛ записати вивід у вказаний файл\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1051,75 +1048,75 @@ msgstr ""
"записується\n"
" у стандартний вивід.\n"
-#: 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 "Вибір повідомлень:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
msgstr ""
" --translated зберегти перекладені, видалити неперекладені\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
msgstr ""
" --untranslated зберегти неперекладені, видалити перекладені\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr ""
" --no-fuzzy видалити повідомлення, позначені як 'fuzzy'\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr ""
" --only-fuzzy зберегти повідомлення, позначені як 'fuzzy'\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete видалити застарілі #~ повідомлення\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete зберегти застарілі #~ повідомлення\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Керування атрибутами:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr " --set-fuzzy позначити всі повідомлення як 'fuzzy'\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr ""
" --clear-fuzzy позначити всі повідомлення як не 'fuzzy'\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr " --set-obsolete позначити всі повідомлення застарілими\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr ""
" --clear-obsolete позначити всі повідомлення не застарілими\n"
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
@@ -1129,7 +1126,7 @@ msgstr ""
"msgid\n"
" перекладених повідомлень\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
@@ -1138,14 +1135,21 @@ msgstr ""
" --clear-previous видалити \"previous msgid\" з усіх "
"повідомлень\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+" --empty під час вилучення «fuzzy» спрожняти msgstr\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
msgstr ""
" --only-file=ФАЙЛ.po обробляти лише елементи перелічені у ФАЙЛ.po\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
@@ -1153,36 +1157,36 @@ msgstr ""
" --ignore-file=ФАЙЛ.po обробляти лише елементи не перелічені у ФАЙЛ."
"po\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr " --fuzzy синонім для --only-fuzzy --clear-fuzzy\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
msgstr ""
" --obsolete синонім для --only-obsolete --clear-obsolete\n"
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c: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 "Синтаксис вхідного файлу:\n"
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
" -P, --properties-input вхідний файл має синтаксис Java .properties\n"
-#: 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 "
@@ -1191,17 +1195,17 @@ msgstr ""
" --stringtable-input вхідний файл має синтаксис NeXTstep/GNUstep ."
"strings\n"
-#: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
-#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
-#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
-#: src/xgettext.c:946
+#: src/msgattrib.c:498 src/msgcat.c: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 "Подробиці виводу:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1216,17 +1220,17 @@ msgstr ""
" УМОВА може мати значення «always», «never», "
"«auto» або «html».\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr ""
" --style=ФАЙЛ_СТИЛЮ вказати файл правил стилю CSS для --color\n"
-#: 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"
@@ -1235,9 +1239,9 @@ msgstr ""
"екранування\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
+#: 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"
@@ -1245,30 +1249,30 @@ msgstr ""
" -E, --escape використовувати у виводі символи екранування\n"
" мови C, без розширених символів\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr " --force-po записувати файл PO, навіть порожній\n"
-#: 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 ""
" -i, --indent записати файл .po, вживаючи стиль з "
"відступами\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
" --no-location не записувати рядки '#: назва_файлу:рядок'\n"
-#: 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"
@@ -1276,8 +1280,8 @@ msgstr ""
" -n, --add-location створювати рядки '#: назва_файлу:"
"рядок' (типово)\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c: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"
@@ -1285,32 +1289,32 @@ msgstr ""
" --strict записувати файл .po, точно відповідний "
"Uniforum\n"
-#: src/msgattrib.c:511 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
-#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
-#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
+#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
+#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output записати файл Java .properties\n"
-#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
-#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
" --stringtable-output записати файл NeXTstep/GNUstep .strings\n"
-#: 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 " -w, --width=NUMBER встановити ширину сторінки виводу\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c: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"
@@ -1319,32 +1323,32 @@ msgstr ""
" --no-wrap не розривати на декілька рядків довгі рядки\n"
" повідомлень, що довші за ширину сторінки\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output сортувати вивід\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 ""
" -F, --sort-by-file сортувати вивід за розташуванням файлів\n"
-#: 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 "вказано неможливий критерій відбору (%d < n < %d)"
-#: 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 "Використання: %s [ПАРАМЕТР] [ВХІДНИЙ_ФАЙЛ]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1367,23 +1371,23 @@ msgstr ""
"вказано --use-first, коментарі беруться з першого файла PO, у якому їх було\n"
"визначено.\n"
-#: 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 " ВХІДНИЙ_ФАЙЛ ... вхідні файли\n"
-#: 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 " -f, --files-from=ФАЙЛ отримати перелік вхідних файлів з ФАЙЛ\n"
-#: 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 "Якщо назвою вхідного файлу є -, використовується стандартний ввід.\n"
-#: 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"
@@ -1394,7 +1398,7 @@ msgstr ""
" кількість разів, якщо значення не вказано,\n"
" типове значення - нескінченість\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1405,7 +1409,7 @@ msgstr ""
" кількість разів, якщо не вказано, типове\n"
" значення дорівнює 0\n"
-#: 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"
@@ -1414,16 +1418,16 @@ msgstr ""
" -u, --unique скорочення для --less-than=2, вказує\n"
" виводити лише унікальні повідомлення\n"
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:739
-#: src/msgmerge.c:557
+#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
+#: src/msgmerge.c:562
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
" -P, --properties-input вхідні файли мають синтаксис Java .properties\n"
-#: 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"
@@ -1432,12 +1436,12 @@ msgstr ""
" --stringtable-input вхідні файли мають синтаксис NeXTstep/GNUstep\n"
" .strings\n"
-#: 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 " -t, --to-code=НАЗВА кодування виводу\n"
-#: 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"
@@ -1447,7 +1451,7 @@ msgstr ""
" кожного повідомлення, не об'єднувати декілька\n"
" перекладів\n"
-#: 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"
@@ -1456,21 +1460,21 @@ msgstr ""
"заголовка\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
msgstr "Peter Miller"
-#: 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 "потрібно рівно 2 вхідні файли"
-#: 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 "Використання: %s [ПАРАМЕТР] def.po ref.pot\n"
@@ -1502,12 +1506,12 @@ msgstr " def.po переклад\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot посилання на джерело\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "Модифікатори режиму роботи:\n"
-#: 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."
@@ -1516,7 +1520,7 @@ msgstr ""
" -m, --multi-domain застосувати ref.pot до кожного домену з def."
"po\n"
-#: 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 ""
@@ -1542,17 +1546,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 "це повідомлення використовується, але не було визначене у %s"
@@ -1562,7 +1566,7 @@ 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"
@@ -1570,12 +1574,12 @@ msgstr[0] "знайдено %d критичну помилку"
msgstr[1] "знайдено %d критичні помилки"
msgstr[2] "знайдено %d критичних помилок"
-#: 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"
@@ -1596,7 +1600,7 @@ msgstr ""
"беруться з першого файла PO, у якому вони були визначені. Коментарі з назвою\n"
"файлу та номером рядка зберігаються для усіх файлів PO.\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1606,69 +1610,70 @@ msgstr ""
" кількістю визначень, якщо число не вказано,\n"
" типове значення дорівнює 1\n"
-#: 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 ""
" --omit-header не записувати заголовок у записі «msgid \"\"»\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr "Перетворює каталог перекладів у інше кодування.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Результат перетворення:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Типовим кодуванням є кодування поточної локалі.\n"
-#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent стиль виводу з відступами\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\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
+#: 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 ""
-" --add-location зберігати '#: filename:line' рядки (типово)\n"
+" -n, --add-location зберігати рядки «#: назва файла:рядок» (типова "
+"поведінка)\n"
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict стиль виводу Uniforum\n"
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
+#: src/msgen.c:258 src/msgfmt.c: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 "Використання: %s [ПАРАМЕТР] ВХІДНИЙ_ФАЙЛ\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1680,7 +1685,7 @@ msgstr ""
"файл PO або файл POT (зазвичай створений xgettext). Неперекладеним елементам\n"
"призначається переклад, ідентичний до вмісту msgid.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " ВХІДНИЙ_ФАЙЛ вхідний PO або POT файл\n"
@@ -1719,7 +1724,7 @@ msgstr ""
"Спеціальна вбудована команда з назвою '0' виводить переклад, який завершується\n"
"нульовим байтом. Вивід команди \"msgexec 0\" підходить як ввід команди \"xargs -0\".\n"
-#: 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 " -i, --input=ВХІДНИЙ_ФАЙЛ вхідний файл PO\n"
@@ -1729,27 +1734,27 @@ msgstr " -i, --input=ВХІДНИЙ_ФАЙЛ вхідний файл PO\n"
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 "необхідно вказати принаймні один сценарій для sed"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Використання: %s [ПАРАМЕТР] ФІЛЬТР [ПАРАМЕТРИ-ФІЛЬТРУ]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "Застосовує фільтр до всіх перекладів у каталозі.\n"
-#: 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"
@@ -1759,18 +1764,18 @@ msgstr ""
"вводу\n"
"та записує змінений переклад у стандартний вивід.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "Корисні ПАРАМЕТРИ-ФІЛЬТРУ якщо ФІЛЬТР є 'sed':\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
msgstr " -e, --expression=СЦЕНАРІЙ додати СЦЕНАРІЙ до виконуваних команд\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1780,13 +1785,13 @@ msgstr ""
" -f, --file=ФАЙЛ_СЦЕНАРІЮ додати вміст ФАЙЛУ_СЦЕНАРІЮ до виконуваних "
"команд\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr " -n, --quiet, --silent не виводити автоматично шаблони\n"
-#: src/msgfilter.c:446 src/msggrep.c:595
+#: src/msgfilter.c:465 src/msggrep.c:600
#, c-format
msgid ""
" --no-escape do not use C escapes in output (default)\n"
@@ -1794,12 +1799,12 @@ msgstr ""
" --no-escape вимкнути у виводі екранування у стилі C "
"(типово)\n"
-#: 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 " --indent стиль виводу з відступами\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
@@ -1807,50 +1812,71 @@ msgstr ""
" --keep-header залишити заголовок незмінним, не фільтрувати "
"його\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "аргумент %s повинен бути поодиноким знаком пунктуації"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
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:605
+#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
msgid "Ulrich Drepper"
msgstr "Ulrich Drepper"
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:439
+#, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr "якщо вказано %s та %s, файл вхідних даних вказувати не слід"
+
+#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
#: src/msgunfmt.c:353
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s вимагає вказати параметр \"-d каталог\""
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c: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 "%s вимагає вказати параметр \"-l локаль\""
-#: 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 "для %s слід вказати специфікацію «--template шаблон»"
+
+#: src/msgfmt.c:545
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "для %s слід вказати специфікацію «-o файл»"
+
+#: src/msgfmt.c:551
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "не можна одночасно використовувати %s та %s у %s"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s допускається лише з %s або %s"
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:571 src/msgfmt.c:577
#, c-format
msgid "%s is only valid with %s, %s or %s"
msgstr "%s допускається лише з %s, %s або %s"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
@@ -1858,7 +1884,7 @@ msgstr[0] "%d перекладене повідомлення"
msgstr[1] "%d перекладених повідомлення"
msgstr[2] "%d перекладених повідомлень"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
@@ -1866,7 +1892,7 @@ msgstr[0] ", %d неточний переклад"
msgstr[1] ", %d неточних переклади"
msgstr[2] ", %d неточних перекладів"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
@@ -1874,17 +1900,17 @@ msgstr[0] ", %d неперекладене повідомлення"
msgstr[1] ", %d неперекладених повідомлення"
msgstr[2] ", %d неперекладених повідомлень"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Використання: %s [ПАРАМЕТР] назва_файлу.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "Створює двійковий каталог повідомлень з текстового опису.\n"
-#: 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"
@@ -1893,17 +1919,17 @@ msgstr ""
"Аргументи, обов'язкові для довгих ключів, є обов'язковими й для коротких.\n"
"Те ж саме й для необов'язкових аргументів.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
msgid " filename.po ... input files\n"
msgstr " назва_файлу.po ... вхідні файли\n"
-#: 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 "Режим роботи:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1911,7 +1937,7 @@ msgid ""
msgstr ""
" -j, --java режим Java: створює Java ResourceBundle клас\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1920,12 +1946,12 @@ msgstr ""
" --java2 як і --java, вважається Java2 (JDK 1.2 чи "
"вище)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr " --csharp режим C#: створює файли .NET .dll\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -1934,56 +1960,71 @@ msgstr ""
" --csharp-resources режим C# ресурсів: створює файл .NET ."
"resources\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr ""
" --tcl режим Tcl: створює файл tcl/msgcat .msg\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt режим Qt: створює файл Qt .qm\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+" --desktop режим запису до desktop: створити файл ."
+"desktop\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
" --strict перейти у режим відповідності до Uniforum\n"
-#: 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 ""
"Якщо як файл виводу вказано -, вивід відбуватиметься у стандартний вивід.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Розташування вхідного файлу у режимі Java:\n"
-#: src/msgfmt.c:703 src/msgfmt.c:717 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr " -r, --resource=РЕСУРС назва ресурсу\n"
-#: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
-#: src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
+#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
#, c-format
msgid ""
" -l, --locale=LOCALE locale name, either language or "
"language_COUNTRY\n"
msgstr " -l, --locale=ЛОКАЛЬ назва локалі, або мова або мова_КРАЇНА\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr " --source створити файл .java, а не файл .class\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr ""
" -d КАТАЛОГ базовий каталог ієрархії каталогів класів\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1995,12 +2036,12 @@ msgstr ""
"після знаку підкреслення. Параметр -d є обов'язковим. Клас записується\n"
"у вказаний каталог.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "Розташування вхідного файлу у режимі C#:\n"
-#: 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 "
@@ -2009,7 +2050,7 @@ msgstr ""
" -d КАТАЛОГ базовий каталог залежних від локалі .dll "
"файлів\n"
-#: 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"
@@ -2018,18 +2059,18 @@ msgstr ""
"Параметри -l та -d є обов'язковими. Файл .dll записується у підкаталог\n"
"вказаного каталогу, назва якого залежить від локалі.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Розташування вхідного файлу у режимі Tcl:\n"
-#: 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 ""
" -d КАТАЛОГ базовий каталог каталогів .msg повідомлень\n"
-#: 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"
@@ -2038,12 +2079,49 @@ msgstr ""
"Параметри -l та -d є обов'язковими. Файл .msg записується у вказаний "
"каталог.\n"
-#: src/msgfmt.c:745 src/xgettext.c:882
+#: src/msgfmt.c:861
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr "Параметри режиму запису desktop:\n"
+
+#: src/msgfmt.c:867
+#, c-format
+msgid " --template=TEMPLATE a .desktop file used as a template\n"
+msgstr ""
+" --template=ШАБЛОН файл .desktop, який слід використати як "
+"шаблон\n"
+
+#: src/msgfmt.c:869
+#, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr " -d КАТАЛОГ базовий каталог для файлів .po\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -kСЛОВО, --keyword=СЛОВО шукати СЛОВО як додаткове ключове слово\n"
+" -k, --keyword не використовувати типових ключових слів\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+"Параметри -l, -o та --template є обов’язковими. Якщо вказано параметр -D\n"
+"файли вхідних даних буде прочитано з каталогу, а не з аргументів командного\n"
+"рядка.\n"
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "Інтерпретація вхідного файлу:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -2054,13 +2132,13 @@ msgstr ""
" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format перевірити залежний від мови формат рядків\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
@@ -2069,7 +2147,7 @@ msgstr ""
" --check-header перевірити наявність та вміст елементу "
"заголовка\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -2079,7 +2157,7 @@ msgstr ""
"та\n"
" параметром --output-file\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2088,7 +2166,7 @@ msgstr ""
" -C, --check-compatibility перевірити, що GNU msgfmt поводиться як X/Open "
"msgfmt\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -2099,12 +2177,12 @@ msgstr ""
"у\n"
" пунктах меню\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr " -f, --use-fuzzy виводити елементи неточного перекладу\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
@@ -2112,7 +2190,7 @@ msgstr ""
" -a, --alignment=ЧИСЛО форматувати рядки по ЧИСЛО байт у рядку "
"(типово: %d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2125,88 +2203,98 @@ msgstr ""
" (зворотний (big) або прямий (little),\n"
" типовий залежить від платформи)\n"
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
" --no-hash двійковий файл не буде включати хеш-таблицю\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics вивести статистику про переклад\n"
-#: src/msgfmt.c:783 src/msgmerge.c:607 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose збільшити рівень докладності виводу\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "попередження: заголовок файла PO відсутній або некоректний\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "попередження: перетворення кодувань символів не працюватиме\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "попередження: заголовок файла PO позначений як нечіткий переклад\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "попередження: старі версії msgfmt сприйматимуть це як помилку\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "назва домену «%s» не може використовуватись як назва файлу"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr ""
"назва домену «%s» не може використовуватись як назва файлу: буде використано "
"префікс"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, c-format
msgid "'domain %s' directive ignored"
msgstr "директиву «domain %s» проігноровано"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "порожній елемент «msgstr» проігноровано"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "елемент з нечітким перекладом «msgstr» проігноровано"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: попередження: вихідний файл містить нечіткий переклад"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr "%s не існує"
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr "%s існує, але непридатний до читання"
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-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 "помилка при читанні «%s»"
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2215,7 +2303,7 @@ msgstr ""
"параметр «%c» не може використовуватись перед символами 'J', 'K', 'T', 'C' "
"чи 'X'"
-#: 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"
@@ -2224,7 +2312,7 @@ msgstr ""
"Отримати усі повідомлення з каталогу перекладу, які відповідають вказаному\n"
"шаблону або належать до певних вказаних вхідних файлів.\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2299,7 +2387,7 @@ msgstr ""
" -v, --invert-match виводити лише повідомлення, які не відповідають\n"
" жодному критерію відбору\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2307,12 +2395,12 @@ msgstr ""
" --escape використовувати у виводі екранування у стилі "
"C, без розширених символів\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output сортувати інформацію, що виводиться\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file сортувати за розташуванням у файлах\n"
@@ -2474,7 +2562,7 @@ msgstr "цільове кодування «%s» не є переносною н
#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:3051
+#: src/xgettext.c:544 src/xgettext.c:3418
#, c-format
msgid "warning: "
msgstr "попередження: "
@@ -2686,17 +2774,17 @@ msgstr "обробка множинних форм є розширенням GNU
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "у msgstr відсутній символ клавішного акселератора «%c»"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr містить надто багато символів клавішних акселераторів «%c»"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "поле заголовка «%s» все ще містить початкове типове значення\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "у заголовку немає поля «%s»\n"
@@ -2716,7 +2804,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 "
@@ -2735,7 +2823,7 @@ 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 "
@@ -2744,16 +2832,16 @@ msgstr ""
"Не вдається перетворити з «%s» у «%s». %s використовує iconv(). Ця версія "
"скомпільована без iconv()."
-#: 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 "%s є допустимим лише разом з %s"
-#: 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"
@@ -2776,17 +2864,17 @@ msgstr ""
"у файл будуть збережені. Якщо неможливо знайти точну відповідність,\n"
"для отримання кращого результату використовується неточна відповідність.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po переклади з посиланнями на старий код\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot посилання на новий код\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2795,7 +2883,7 @@ msgstr ""
" -C, --compendium=ФАЙЛ додаткова бібліотека перекладів повідомлень,\n"
" може бути вказано більш ніж один раз\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2804,29 +2892,29 @@ msgstr ""
" -U, --update оновити def.po,\n"
" нічого не робить, якщо def.po вже оновлений\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Розташування файлу виводу у режимі оновлення:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Результат записується назад у def.po.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=КОНТРОЛЬ зробити резервну копію def.po\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
" --suffix=СУФІКС перевизначити звичайний суфікс резервної "
"копії\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2845,7 +2933,7 @@ msgstr ""
"прості\n"
" simple, never завжди використовувати прості резервні копії\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2856,7 +2944,7 @@ msgstr ""
"suffix\n"
"або змінною середовища SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
@@ -2864,22 +2952,22 @@ msgstr ""
" --previous зберегти попередні msgid перекладених "
"повідомлень\n"
-#: 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 " -q, --quiet, --silent не виводити індикатор поступу\n"
-#: 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, "
@@ -2888,7 +2976,7 @@ 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/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -3001,7 +3089,7 @@ msgid " --strict write strict uniforum style\n"
msgstr ""
" --strict виводити у точній відповідності до uniforum\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -3022,12 +3110,12 @@ msgstr ""
"параметр --use-first, вони беруться від першого перекладу. Позиції у файлах\n"
"будуть зібрані до купи. При використанні --unique, дублікати відкидаються.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated виводити лише дублікати\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -3098,27 +3186,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 "пропущено розділ «msgstr[]»"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, c-format
msgid "missing 'msgid_plural' section"
msgstr "пропущено розділ «msgid_plural»"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, c-format
msgid "missing 'msgstr' section"
msgstr "пропущено розділ «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 "множинна форма має неправильний індекс"
@@ -3128,7 +3216,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 "неправильна мультибайтна послідовність"
@@ -3172,16 +3260,16 @@ msgstr "кінець рядка посеред рядка"
msgid "context separator <EOT> within string"
msgstr "розділювач контексту <EOT> посеред рядка"
-#: 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 "це місце першого визначення"
@@ -3381,18 +3469,18 @@ msgstr "помилка при компіляції класу C#, спробуй
msgid "compilation of C# class failed"
msgstr "помилка при компіляції класу C#"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "не є правильною назвою класу Java: %s"
-#: 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 ""
"помилка при компіляції класу Java, спробуйте --verbose або встановіть $JAVAC"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr ""
@@ -3403,7 +3491,7 @@ msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "помилка при відкриванні «%s» для запису"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
@@ -3411,7 +3499,7 @@ msgstr ""
"інтернаціоналізовані повідомлення не повинні містити керівну послідовність "
"«\\%c»"
-#: 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"
@@ -3424,7 +3512,7 @@ msgstr ""
"вашого кодування символів. Використовуйте лише ASCII символи у msgctxt.\n"
"%s\n"
-#: 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"
@@ -3506,7 +3594,7 @@ msgstr ""
"каталог повідомлень містить переклад з множинними формами\n"
"але формат каталогу повідомлень Tcl не підтримує множинні форми\n"
-#: 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 "%s:%d: попередження: незавершений рядок"
@@ -3516,17 +3604,22 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, c-format
+msgid "warning: invalid Unicode character"
+msgstr "попередження: некоректний символ Unicode"
+
+#: 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 "%s:%d: попередження: незавершена символьна константа"
-#: 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 "%s:%d: попередження: незавершений символьний літерал"
-#: 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 "Вкажіть вхідне кодування у параметрі --from-code."
@@ -3580,7 +3673,7 @@ msgstr ""
"%s:%d: Неправильна мультибайтова послідовність.\n"
"Вкажіть вхідне кодування у параметрі --from-code.\n"
-#: 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 "%s:%d: попередження: неправильний символ Юнікоду"
@@ -3600,23 +3693,23 @@ msgstr "%s:%d: попередження: знайдено ')' там де очі
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: попередження: знайдено «}» там де очікувалась ')'"
-#: src/x-glade.c:561
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
msgstr "Для рядка, видобутого з елемента «%s», не вказано контексту"
-#: 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 ""
"У коректному файлі Glade не можна використовувати кореневий елемент <%s>"
-#: 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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3679,11 +3772,21 @@ msgstr ""
"%s:%d: Неправильна мультибайтова послідовність.\n"
"Вкажіть вхідне кодування у параметрі --from-code.\n"
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: попередження: літерал формального виразу завершено передчасно"
+#: src/x-javascript.c:1055
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: попередження: не можна використовувати %s"
+
+#: src/x-javascript.c:1069
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: попередження: незавершена розмітка XML"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3811,35 +3914,42 @@ msgstr ""
"%s:%lu: попередження: синтаксис $\"...\" є забороненим з міркувань безпеки; "
"натомість використовуйте eval_gettext"
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: попередження: літерал формального виразу завершено передчасно"
-#: src/xgettext.c:636
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr ""
+"«%s» не є коректною назвою кодування. Використовуємо резервне кодування "
+"ASCII.\n"
+
+#: src/xgettext.c:648
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"--join-existing не може використовуватись, якщо вивід направляється у "
"стандартний вивід"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext не може працювати без вказаних ключових слів для пошуку"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr ""
"попередження: у файлі «%s» невідоме розширення «%s»; спроба використати C"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "Витягує рядки для перекладу з вказаних вхідних файлів.\n"
-#: src/xgettext.c:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3848,12 +3958,12 @@ msgstr ""
" -d, --default-domain=НАЗВА виводити у файл НАЗВА.po (замість messages."
"po)\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr " -o, --output=ФАЙЛ записувати вивід у вказаний файл\n"
-#: src/xgettext.c:863
+#: src/xgettext.c:886
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
@@ -3861,12 +3971,12 @@ msgstr ""
" -p, --output-dir=КАТАЛОГ файли виводу будуть створені у каталозі "
"КАТАЛОГ\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Вибір мови вхідного файлу:\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3876,7 +3986,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=НАЗВА розпізнавати вказану мову\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3885,21 +3995,21 @@ msgstr ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ скорочення для --language=C++\n"
-#: 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 "Типово, мова визначається за розширенням назви вхідного файлу.\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3908,24 +4018,24 @@ msgstr ""
" --from-code=НАЗВА кодування для вхідних файлів\n"
" (за винятком Python, Tcl, Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr "Типово, вважається, що вхідні файли у кодуванні ASCII.\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr ""
" -j, --join-existing об'єднати повідомлення з існуючим файлом\n"
-#: 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 ""
" -x, --exclude-file=ФАЙЛ.po елементи з ФАЙЛ.po не будуть витягуватись\n"
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -3942,17 +4052,17 @@ msgstr ""
"рядки\n"
" ключових слів у файлі виведених даних\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Параметри особливі для мови:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all витягнути усі рядки\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3967,16 +4077,22 @@ msgstr ""
" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
" Lua, JavaScript, Vala)\n"
-#: 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 ""
-" -kСЛОВО, --keyword=СЛОВО шукати СЛОВО як додаткове ключове слово\n"
-" -k, --keyword не використовувати типових ключових слів\n"
+" (лише мови C, C++, ObjectiveC, Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+" C#, awk, Tcl, Perl, PHP, GCC-код, Glade,\n"
+" Lua, JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3986,7 +4102,7 @@ msgstr ""
" --flag=СЛОВО:АРГ:ОЗНАКА додаткова ознака для рядків посеред номера\n"
" аргументу АРГ ключового слова СЛОВО\n"
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4001,55 +4117,55 @@ msgstr ""
" C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
" Lua, JavaScript, Vala)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr ""
" -T, --trigraphs розпізнавати ANSI C trigraph-и на вході\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr " (лише мови C, C++, ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt розпізнавати рядки у Qt форматі\n"
-#: 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 " (лише мова C++)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --kde розпізнати рядки у форматуванні KDE 4\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --boost розпізнавати рядки у форматі Boost\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr ""
" --debug докладніший результат пошуку рядків формату\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output виводити у файл Java .properties\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr " --copyright-holder=РЯДОК встановити власника авторських прав\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -4057,20 +4173,20 @@ msgstr ""
" --foreign-user пропускати у виводі FSF copyright для "
"сторонніх користувачів\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, c-format
msgid " --package-name=PACKAGE set package name in output\n"
msgstr ""
" --package-name=ПАКУНОК встановити назву пакунка у виведених даних\n"
-#: src/xgettext.c:989
+#: src/xgettext.c:1012
#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr ""
" --package-version=ВЕРСІЯ встановити версію пакунка у виведених "
"даних\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
@@ -4078,7 +4194,7 @@ msgstr ""
" --msgid-bugs-address=EMAIL@АДРЕСА адреса звітування про помилки у "
"msgid\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -4089,7 +4205,7 @@ msgstr ""
"елементів\n"
" msgstr\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -4100,7 +4216,7 @@ msgstr ""
"елементів\n"
" msgstr\n"
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4109,31 +4225,31 @@ msgstr ""
"Аргумент --flag не підтримує синтаксис <ключове_слово>:<argnum>:"
"[pass-]<flag>: %s"
-#: 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 "Символ, що не належить до ASCII, у %s%s."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr "Коментар не у форматі ASCII на позиції або перед %s%s."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr "Рядок не у форматі ASCII на позиції %s%s."
-#: 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 "%s%s: попередження: "
-#: 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 "
@@ -4142,7 +4258,7 @@ msgstr ""
"Хоча й використовується у позиції рядку формату, %s не є правильним %s "
"рядком формату. Причина: %s\n"
-#: 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: "
@@ -4151,7 +4267,7 @@ msgstr ""
"Хоча й заявлений як такий, %s не є правильним %s рядком формату. Причина: "
"%s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4164,7 +4280,7 @@ msgstr ""
"Замість кортежу аргументів, використовуйте рядок формату з аргументами,\n"
"що мають назву та їх підстановку.\n"
-#: 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"
@@ -4174,29 +4290,29 @@ msgstr ""
"gettext(\"\") повертає елемент заголовку\n"
"метаінформації, а не порожній рядок.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "неоднозначно вказане ключове слово '%.*s'"
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "попередження: відсутній контекст для ключового слова '%.*s'"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr ""
"попередження: відсутній контекст для множинного аргументу ключового слова "
"'%.*s'"
-#: 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"
@@ -4208,7 +4324,7 @@ msgstr ""
"тут змінну MSGID_BUGS_ADDRESS; у іншому випадку\n"
"вкажіть --msgid-bugs-address аргумент командного рядка.\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, c-format
msgid "language '%s' unknown"
msgstr "невідома мова «%s»"
diff --git a/gettext-tools/po/vi.po b/gettext-tools/po/vi.po
index 52fb2c6..98ddb38 100644
--- a/gettext-tools/po/vi.po
+++ b/gettext-tools/po/vi.po
@@ -1,15 +1,16 @@
# Vietnamese Translation for gettext-tools.
-# Copyright © 2013 Free Software Foundation, Inc.
+# Bản dịch tiếng Việt dành cho gettext-tools.
+# Copyright © 2014 Free Software Foundation, Inc.
# This file is distributed under the same license as the gettext package.
# Clytie Siddall <clytie@riverland.net.au>, 2005-2010.
-# Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2013.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2014.
#
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.18.3\n"
+"Project-Id-Version: gettext-tools 0.19-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-07-07 18:21+0900\n"
-"PO-Revision-Date: 2013-06-26 07:49+0700\n"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2014-05-11 07:45+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
"Language: vi\n"
@@ -17,7 +18,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
+"X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
"X-Poedit-SourceCharset: UTF-8\n"
"X-Generator: Poedit 1.5.5\n"
@@ -189,15 +190,15 @@ 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
+#: 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 "gặp lỗi khi tạo “%s”"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: 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 "gặp lỗi khi ghi tập tin “%s”"
@@ -219,9 +220,9 @@ msgstr "Không tìm thấy cơ chế ảo Java, hãy thử cài đặt gcj hoặ
msgid "%s subprocess I/O error"
msgstr "%s lỗi V/R tiến trình con"
-#: 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 "cạn bộ nhớ"
@@ -232,7 +233,7 @@ msgid "creation of threads failed"
msgstr "việc tạo tuyến trình gặp lỗi"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "gặp lỗi khi ghi vào tiến trình phụ %s"
@@ -319,8 +320,8 @@ msgid "%s subprocess got fatal signal %d"
msgstr "%s tiến trình con nhận được tín hiệu nghiêm trọng %d"
#: src/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 "gặp lỗi khi mở “%s” để đọc"
@@ -507,7 +508,7 @@ msgstr ""
#, c-format
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."
+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
@@ -693,7 +694,7 @@ msgstr ""
"“%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-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'"
@@ -744,24 +745,24 @@ msgid ""
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
+#: src/format-python-brace.c:137
#, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
msgstr "Trong chỉ thị số %u, “%c” không thể bắt đầu bằng một tên trường."
-#: 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 ""
"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
+#: src/format-python-brace.c:165
#, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
msgstr "Trong chỉ thị số %u, “%c” không thể bắt đầu bằng một đối số getitem."
-#: 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."
@@ -769,7 +770,7 @@ 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
+#: src/format-python-brace.c:270
#, c-format
msgid "In the directive number %u, there is an unterminated format directive."
msgstr "Trong chỉ thị số %u, có một chỉ thị định dạng chưa được kết thúc."
@@ -820,11 +821,11 @@ msgid ""
"1 and 9."
msgstr "Ký tự kết thúc chỉ thị số %u không phải chữ số nằm giữa 1 và 9."
-#: src/hostname.c:178 src/msgattrib.c: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"
@@ -837,20 +838,20 @@ msgstr ""
"Đây là phần mềm tự do: bạn có quyền thay đổi và phát hành lại nó.\n"
"KHÔNG CÓ BẢO HÀNH GÌ CẢ, với điều kiện được pháp luật cho phép.\n"
-#: src/hostname.c:184 src/msgattrib.c: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 "Viết bởi %s.\n"
# Name: don't translate / Tên: đừng dịch
#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c: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 "Bruno Haible"
@@ -860,11 +861,11 @@ msgstr "Bruno Haible"
msgid "too many arguments"
msgstr "quá nhiều đối số"
-#: 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 "Hãy thử lệnh “%s --help” (trợ giúp) để xem thông tin thêm.\n"
@@ -904,29 +905,29 @@ msgstr ""
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address các địa chỉ cho tên máy đó\n"
-#: src/hostname.c:228 src/msgattrib.c: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 "Kết xuất thông tin:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help hiện trợ giúp này rồi thoát\n"
-#: 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 " -V, --version xuất thông tin phiên bản rồi thoát\n"
@@ -935,11 +936,11 @@ msgstr " -V, --version xuất thông tin phiên bản rồi thoá
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c: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 ""
"Hãy thông báo lỗi cho <bug-gnu-gettext@gnu.org>.\n"
@@ -951,30 +952,27 @@ msgstr ""
msgid "could not get host name"
msgstr "không thể lấy tên máy"
-#: 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 "cho phép nhiều nhất một tập tin đầu vào"
-#: 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 "%s và %s loại từ lẫn nhau"
-#: 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 "Cách dùng: %s [TÙY_CHỌN] [TẬP_TIN_ĐẦU_VÀO]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -983,10 +981,10 @@ msgstr ""
"Lọc các chuỗi của phân loại thông dịch tùy theo thuộc tính,\n"
"cũng thao tác thuộc tính.\n"
-#: src/msgattrib.c: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"
@@ -994,23 +992,23 @@ 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
-#: 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 "Vị trí tập tin đầu vào:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " TẬP_TIN_ĐẦU_VÀO tập tin PO đầu vào\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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"
@@ -1018,31 +1016,31 @@ msgstr ""
" -D, --directory=THƯ_MỤC thêm THƯ MỤC này vào danh sách để tìm kiếm\n"
" tập tin đầu vào\n"
-#: src/msgattrib.c: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 ""
"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
-#: 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 "Vị trí tập tin đầu ra:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 " -o, --output-file=TẬP_TIN ghi kết xuất vào TẬP TIN này\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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"
@@ -1051,19 +1049,19 @@ msgstr ""
"Kết quả được ghi ra đầu ra tiêu chuẩn nếu không chỉ ra tập tin kết xuất,\n"
"hoặc nếu nó là “-”.\n"
-#: src/msgattrib.c: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 "Chọn chuỗi:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
msgstr ""
" --translated giữ các chuỗi đã dịch, bỏ các chuỗi chưa dịch\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
@@ -1071,65 +1069,65 @@ msgstr ""
" --untranslated giữ các chuỗi chưa dịch,\n"
" bỏ các chuỗi đã dịch\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr ""
" --no-fuzzy loại bỏ các chuỗi được đánh dấu là “fuzzy”\n"
" (tạm dịch), các chuỗi này trở thành đã dịch\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr " --only-fuzzy giữ các chuỗi được đánh dấu là “fuzzy”\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete loại bỏ các chuỗi đã cũ (có dấu #~)\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete giữ các chuỗi đã cũ (có dấu #~)\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Thao tác thuộc tính:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr " --set-fuzzy đặt mọi chuỗi là “fuzzy” (tạm dịch)\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr ""
" --clear-fuzzy đặt mọi chuỗi là không-“fuzzy” (tạm dịch)\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
-msgstr " --set-obsolete đặt mọi chuỗi là cũ\n"
+msgstr " --set-obsolete đặt mọi chuỗi là cũ không dùng nữa\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr " --clear-obsolete đặt mọi chuỗi là chưa quá cũ\n"
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
" of translated messages.\n"
msgstr ""
-" --previous khi đặt 'fuzzy' thì giữ lại các chuỗi gốc "
+" --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
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
@@ -1137,7 +1135,15 @@ msgid ""
msgstr ""
" --clear-previous lại bỏ “previous msgid” ra khỏi mọi chuỗi\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr ""
+" --empty khi loại bỏ các chuỗi được đánh dấu là “fuzzy”\n"
+" (tạm dịch), xóa trống chuỗi này\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
@@ -1145,7 +1151,7 @@ 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
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
@@ -1153,13 +1159,13 @@ msgstr ""
" --ignore-file=T_TIN.po thao tác chỉ những mục không được liệt kê\n"
" trong tập tin này\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr ""
" --fuzzy tương đương với “--only-fuzzy --clear-fuzzy”\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
@@ -1167,16 +1173,16 @@ 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
-#: 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 "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
+#: 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"
@@ -1184,8 +1190,8 @@ msgstr ""
" -P, --properties-input tập tin đầu vào có cú pháp .properties\n"
" (thuộc tính) của Java\n"
-#: src/msgattrib.c: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 "
@@ -1194,17 +1200,17 @@ msgstr ""
" --stringtable-input tập tin đầu vào có cú pháp .strings kiểu\n"
" 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
-#: 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 "Chi tiết kết xuất:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1222,18 +1228,18 @@ msgstr ""
" • auto tự động\n"
" • html HTML.\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr ""
" --style=TẬP_TIN chỉ định tập tin quy tắc kiểu dáng CSS cho\n"
" --color (màu)\n"
-#: src/msgattrib.c: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"
@@ -1241,9 +1247,9 @@ 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
+#: 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"
@@ -1251,30 +1257,30 @@ msgstr ""
" -E, --escape dùng ký tự thoát C trong kết xuất,\n"
" không dùng ký tự mở rộng\n"
-#: src/msgattrib.c: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 ""
" --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
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr " -i, --indent ghi ra tập tin PO có thụt lề\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr ""
" --no-location 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
+#: 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"
@@ -1283,26 +1289,26 @@ msgstr ""
"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
+#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
+#: src/xgettext.c:989
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
" --strict xuất tập tin PO tùy theo Uniforum chính xác\n"
-#: 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 ""
" -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
+#: 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"
@@ -1310,16 +1316,17 @@ msgstr ""
" --stringtable-output ghi ra tập tin .strings (chuỗi)\n"
" kiểu 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
+#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
+#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
-msgstr " -w, --width=SỐ đặt chiều rộng của trang kết xuất\n"
+msgstr ""
+" -w, --width=SỐ đặt chiều rộng của trang kết xuất\n"
-#: src/msgattrib.c: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"
@@ -1329,31 +1336,31 @@ msgstr ""
"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
-#: 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 " -s, --sort-output tạo ra kết xuất được sắp xếp\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 " -F, --sort-by-file sắp xếp kết xuất theo vị trí tập tin\n"
-#: 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 "xác định tiêu chuẩn lựa chọn không thể sử dụng được (%d < n < %d)"
-#: 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 "Cách dùng: %s [TÙY_CHỌN] [TẬP_TIN_ĐẦU_VÀO]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1378,43 +1385,44 @@ msgstr ""
"chúng sẽ được lấy từ tập tin PO thứ nhất có chuỗi được dịch.\n"
"Vị trí tập tin từ mọi tập tin PO sẽ được tích lũy.\n"
-#: src/msgcat.c: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 " 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
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
#, c-format
msgid " -f, --files-from=FILE get list of input files from FILE\n"
msgstr ""
" -f, --files-from=TẬP_TIN lấy từ tập tin này danh sách các tập tin đầu "
"vào\n"
-#: 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 "Nếu tập tin đầu vào là “-” thì đọc từ đầu vào tiêu chuẩn.\n"
-#: 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 ""
-" -<, --less-than=SỐ in ra các chuỗi có ít hơn SỐ các lời\n"
+" -<, --less-than=SỐ in ra các chuỗi có ít hơn SỐ các lời\n"
" định nghĩa; không bật thì mặc định là vô hạn\n"
-#: src/msgcat.c: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 ""
-" ->, --more-than=SỐ in ra các chuỗi có nhiều hơn SỐ các lời\n"
+" ->, --more-than=SỐ in ra các chuỗi có nhiều hơn SỐ các "
+"lời\n"
" định nghĩa; không bật thì mặc định là 0\n"
-#: src/msgcat.c: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"
@@ -1424,8 +1432,8 @@ msgstr ""
"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
+#: 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"
@@ -1433,8 +1441,8 @@ msgstr ""
" -P, --properties-input tập tin đầu vào có cú pháp kiểu .properties\n"
" (thuộc tính) của Java\n"
-#: src/msgcat.c: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"
@@ -1443,12 +1451,12 @@ msgstr ""
" --stringtable-input tập tin đầu vào có cú pháp .strings (chuỗi)\n"
" kiểu NeXTstep/GNUstep\n"
-#: src/msgcat.c: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 " -t, --to-code=MÃ bộ ký tự cho kết xuất\n"
-#: 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"
@@ -1457,7 +1465,7 @@ msgstr ""
" --use-first dùng bản dịch đầu tiên cho mỗi chuỗi,\n"
" không trộn nhiều bản dịch\n"
-#: src/msgcat.c: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"
@@ -1467,21 +1475,21 @@ msgstr ""
# Name: don't translate / Tên: đừng dịch
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:370
#, c-format
msgid "no input files given"
msgstr "chưa đưa ra tập tin đầu vào"
-#: 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 "cần chính xác 2 tập tin đầu vào"
-#: 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 "Cách dùng: %s [TÙY_CHỌN] cũ.po mới.pot\n"
@@ -1516,12 +1524,12 @@ 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
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "Sửa đổi thao tác:\n"
-#: 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."
@@ -1530,7 +1538,7 @@ 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
+#: src/msgcmp.c:243 src/msgmerge.c:555
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching không dùng khả năng khớp mờ (fuzzy)\n"
@@ -1555,17 +1563,17 @@ msgstr "chuỗi này chưa được dịch"
msgid "this message needs to be reviewed by the translator"
msgstr "chuỗi này cần phải được xem xét lại bởi dịch giả"
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1505
#, c-format
msgid "this message is used but not defined..."
msgstr "chuỗi này được dùng nhưng còn chưa được định nghĩa..."
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1508
#, c-format
msgid "...but this definition is similar"
msgstr "...nhưng mà định nghĩa này vẫn tương tự"
-#: src/msgcmp.c: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 "chuỗi này được dùng còn chưa được định nghĩa trong %s"
@@ -1575,18 +1583,18 @@ msgstr "chuỗi này được dùng còn chưa được định nghĩa trong %s"
msgid "warning: this message is not used"
msgstr "cảnh báo: chuỗi này không được dùng"
-#: src/msgcmp.c:553 src/msgfmt.c: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] "tìm thấy %d lỗi nghiêm trọng"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "phải chỉ ra ít nhất hai tập tin"
-#: src/msgcomm.c: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"
@@ -1607,79 +1615,80 @@ msgstr ""
"trích sẽ được bảo tồn, nhưng chỉ từ tập tin PO thứ nhất đã định nghĩa chúng.\n"
"Vị trí tập tin từ mọi tập tin PO này sẽ được tích lũy.\n"
-#: src/msgcomm.c: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 ""
-" ->, --more-than=SỐ in các chuỗi chứa nhiều định nghĩa hơn\n"
+" ->, --more-than=SỐ in các chuỗi chứa nhiều định nghĩa hơn\n"
" SỐ này; không bật thì mặc định là 1\n"
-#: src/msgcomm.c: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 " --omit-header không ghi dòng đầu có mục “msgid \"\"” \n"
+msgstr ""
+" --omit-header không ghi dòng đầu có mục tin “msgid \"\"” \n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr "Chuyển đổi phân loại thông dịch sang một bảng mã ký tự khác.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Đích chuyển đổi:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Mã ký tự mặc định theo bảng mã ký tự của miền địa phương hiện có.\n"
-#: src/msgconv.c: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 " -i, --indent thụt lề cho kết xuất\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr ""
" --no-location thu hồi dòng kiểu “#: tên_tập_tin:số_dòng”\n"
-#: 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 ""
-" --add-location giữ lại dòng kiểu “#: tên_tập_tin:số_dòng”\n"
-" (mặc định)\n"
+" -n, --add-location giữ lại dòng “#: tên_tập_tin:số_dòng” (mặc "
+"định)\n"
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict xuất dữ liệu kiểu Uniforum chính xác\n"
-#: src/msgen.c: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 "chưa đưa ra tập tin đầu vào"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "cần chính xác một tập tin đầu vào"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Cách dùng: %s [TÙY_CHỌN] TẬP_TIN_ĐẦU_VÀO\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1692,7 +1701,7 @@ msgstr ""
"(POT: thường do xgettext tạo). Mục chưa dịch sẽ được gán\n"
"bằng chuỗi gốc (msgid).\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " TẬP_TIN_ĐẦU_VÀO tập tin dạng .po hay .pot đầu vào\n"
@@ -1732,7 +1741,7 @@ msgstr ""
"với một byte null theo sau. Kết xuất của tiến trình “msgexec 0”\n"
"thích hợp là đầu vào cho lệnh “xargs -0”.\n"
-#: src/msgexec.c:281 src/msgfilter.c:401
+#: src/msgexec.c:281 src/msgfilter.c:420
#, c-format
msgid " -i, --input=INPUTFILE input PO file\n"
msgstr " -i, --input=TẬP_TIN_ĐẦU_VÀO tập tin .po đầu vào\n"
@@ -1742,27 +1751,27 @@ msgstr " -i, --input=TẬP_TIN_ĐẦU_VÀO tập tin .po đầu vào\n"
msgid "write to stdout failed"
msgstr "gặp lỗi khi ghi vào đầu ra tiêu chuẩn"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "thiếu tên bộ lọc"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr "phải đưa ra ít nhất một văn lệnh sed"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Cách dùng: %s [TÙY_CHỌN] BỘ_LỌC [TÙY_CHỌN_LỌC]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "Áp dụng một bộ lọc cho mọi chuỗi dịch của một catalog bản dịch.\n"
-#: src/msgfilter.c:416
+#: src/msgfilter.c:435
#, c-format
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
@@ -1772,12 +1781,12 @@ msgstr ""
"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
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "TÙY CHỌN LỌC hữu ích khi BỘ LỌC là “sed”:\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
@@ -1785,7 +1794,7 @@ 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
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1796,13 +1805,13 @@ msgstr ""
" thêm nội dung của TẬP TIN VĂN LỆNH này\n"
" vào những lệnh cần thực hiện\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr " -n, --quiet, --silent thu hồi khả năng tự động in miền mẫu\n"
-#: 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"
@@ -1810,12 +1819,12 @@ msgstr ""
" --no-escape không dùng ký tự thoát C trong kết xuất\n"
" (mặc định)\n"
-#: src/msgfilter.c:452 src/msggrep.c:601
+#: src/msgfilter.c:471 src/msggrep.c:606
#, c-format
msgid " --indent indented output style\n"
msgstr " --indent kiểu dáng kết xuất đã thụt lề\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
@@ -1823,79 +1832,100 @@ 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
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "đối số cho “%s” nên là một ký tự chấm câu riêng lẻ"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
msgstr "thứ tự xếp các byte (biểu diễn số nguyên) không hợp lệ: %s"
# Name: don't translate / Tên: đừng dịch
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c: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 "Ulrich Drepper"
-#: 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 "không đưa ra tập tin đầu vào nếu “%s” và “%s” được chỉ định"
+
+#: 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 "%s cần một đặc tả “-d directory” (thư mục)"
-#: 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 "%s cần một đặc tả “-l locale” (miền địa phương)"
-#: 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 "%s cần một đặc tả “--template template”"
+
+#: src/msgfmt.c:545
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s cần một đặc tả “-o tập-tin”"
+
+#: src/msgfmt.c:551
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s và %s loại từ lẫn nhau trong %s"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s chỉ hợp lệ với %s hay %s"
-#: src/msgfmt.c: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 "%s chỉ hợp lệ với %s, %s hay %s"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d chuỗi đã dịch"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ", %d chuỗi tạm dịch"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ", %d chuỗi chưa dịch"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Cách dùng: %s [TÙY_CHỌN] tên_tập_tin.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "Tạo ra catalog bản dịch nhị phân từ mô tả thông dịch kiểu văn bản.\n"
-#: src/msgfmt.c: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"
@@ -1904,17 +1934,17 @@ msgstr ""
"Tất cả đối số bắt buộc phải có với tùy chọn dài cũng bắt buộc với tùy chọn ngắn.\n"
"Cũng vậy với đối số kiểu tùy chọn.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
msgid " filename.po ... input files\n"
msgstr " tên_tập_tin.po ... những tập tin đầu vào\n"
-#: src/msgfmt.c: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 "Chế độ thao tác:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1923,7 +1953,7 @@ 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
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1932,13 +1962,13 @@ msgstr ""
" --java2 giống như --java, và coi là Java2\n"
" (JDK 1.2 hay sau)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr ""
" --csharp chế độ C#: tạo ra một tập tin .dll kiểu .NET\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -1948,7 +1978,7 @@ msgstr ""
"resources\n"
" (tài nguyên) kiểu .NET\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
@@ -1956,35 +1986,43 @@ msgstr ""
" --tcl chế độ Tcl: tạo ra một tập tin .msg kiểu tcl/"
"msgcat\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr ""
" --qt chế độ Qt: tạo ra một tập tin .qm kiểu Qt\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr ""
+" --desktop chế độ Desktop Entry: tạo một tập tin ."
+"desktop\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr ""
" --strict bật chế độ Uniforum chính xác (chặt chẽ)\n"
-#: 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 "Nếu tập tin xuất là “-” thì kết xuất được ghi vào đầu ra tiêu chuẩn.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Vị trí của tập tin xuất trong chế độ Java:\n"
-#: src/msgfmt.c: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 " -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
+#: 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 "
@@ -1993,13 +2031,22 @@ 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
+#: src/msgfmt.c:829
+#, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --source sản sinh tập tin .java, thay cho tập tin ."
+"class\n"
+
+#: src/msgfmt.c:831
#, c-format
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"
+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
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -2011,21 +2058,21 @@ msgstr ""
"vào tên tài nguyên, định giới bằng dấu gạch dưới. Tùy chọn “-d” bắt buộc\n"
"phải sử dụng. Lớp được ghi dưới thư mục đã chỉ ra.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "Vị trí của tập tin xuất trong chế độ C#:\n"
-#: src/msgfmt.c: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 ""
-" -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"
+" -d THƯ_MỤC thư mục cơ sở cho tập tin dạng .dll\n"
+" phụ thuộc vào miền địa phương\n"
-#: src/msgfmt.c:723
+#: src/msgfmt.c:847
#, c-format
msgid ""
"The -l and -d options are mandatory. The .dll file is written in a\n"
@@ -2035,18 +2082,18 @@ msgstr ""
"Tập tin .dll được ghi trong thư mục con của thư mục đã đưa ra\n"
"có tên phụ thuộc vào miền địa phương.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Vị trí của tập tin xuất trong chế độ Tcl:\n"
-#: src/msgfmt.c: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 ""
" -d THƯ_MỤC thư mục cơ sở của catalog bản dịch dạng .msg\n"
-#: 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"
@@ -2055,12 +2102,47 @@ msgstr ""
"Hai tùy chọn “-l” và “-d” bắt buộc phải sử dụng.\n"
"Tập tin dạng .msg được ghi trong thư mục đã cho.\n"
-#: src/msgfmt.c:745 src/xgettext.c:882
+#: src/msgfmt.c:861
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr "Các tùy chọn dành cho chế độ Desktop Entry:\n"
+
+#: src/msgfmt.c:867
+#, c-format
+msgid " --template=TEMPLATE a .desktop file used as a template\n"
+msgstr " --template=MẪU tập tin .desktop được dùng làm mẫu\n"
+
+#: src/msgfmt.c:869
+#, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr " -d THƯ_MỤC thư mục cơ sở của tập tin .po\n"
+
+#: src/msgfmt.c: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 ""
+" -kTỪ, --keyword=TỪ quét tìm TỪ này như là một từ khoá bổ sung\n"
+" -k, --keyword không dùng từ khoá mặc định\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+"Các tùy chọn -l, -o, và --template là bắt buộc. Nếu chỉ ra tùy chọn -D, tập "
+"tin\n"
+"đầu vào sẽ đọc từ thư mục thay cho đối số dòng lệnh.\n"
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "Giải thích tập tin đầu vào:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -2072,21 +2154,22 @@ msgstr ""
" --check-header (kiểm tra phần đầu)\n"
" --check-domain (kiểm tra miền)\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr ""
" --check-format kiểm tra các chuỗi có định dạng\n"
" phụ thuộc vào ngôn ngữ\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
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"
+msgstr ""
+" --check-header kiểm tra xem mục tin phần đầu có đúng không\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -2095,7 +2178,7 @@ msgstr ""
" --check-domain kiểm tra nếu có sự xung đột giữa chỉ thị miền\n"
" và tùy chọn “--output-file” (tập tin xuất)\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -2104,22 +2187,22 @@ msgstr ""
" -C, --check-compatibility kiểm tra msgfmt của GNU ứng xử\n"
" giống như msgfmt của X/Open\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --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"
+" --check-accelerators[=K.TỰ] kiểm tra có ký tự tăng tốc bàn phím\n"
" cho mục trình đơn\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
-msgstr " -f, --use-fuzzy dùng mục nhập tạm dịch trong kết xuất\n"
+msgstr " -f, --use-fuzzy dùng mục tin tạm dịch trong kết xuất\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
@@ -2127,7 +2210,7 @@ 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
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -2141,88 +2224,97 @@ msgstr ""
" (byte đứng trước là lớn hay nhỏ. Intel "
"thường là little)\n"
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr ""
-" --no-hash tập tin nhị phân sẽ không chứa bảng băm duy "
-"nhất\n"
+" --no-hash tập tin nhị phân sẽ không chứa bảng băm\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics in ra thống kê về các chuỗi dịch\n"
-#: src/msgfmt.c: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 " -v, --verbose gia tăng mức chi tiết\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "cảnh báo: phần đầu của tập tin .po còn thiếu hay không hợp lệ\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "cảnh báo: việc chuyển đổi bộ ký tự sẽ không hoạt động được\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "cảnh báo: phần đầu tập tin PO thiếu thông tin\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr ""
"cảnh báo: phiên bản msgfmt cũ hơn sẽ thông báo lỗi trong trường hợp này.\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "tên miền “%s” không thích hợp làm tên tập tin"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "tên miền “%s” không thích hợp làm tên tập tin: sẽ dùng tiền tố"
+msgstr "tên miền “%s” không thích hợp làm tên tập tin: nên sẽ dùng tiền tố"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, c-format
msgid "'domain %s' directive ignored"
msgstr "chỉ thị “domain %s” bị bỏ qua"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, c-format
msgid "empty 'msgstr' entry ignored"
-msgstr "mục nhập “msgstr” rỗng bị bỏ qua"
+msgstr "mục tin “msgstr” rỗng bị bỏ qua"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "chuỗi “msgstr” tạm dịch bị bỏ qua"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: cảnh báo: tập tin nguồn chứa chuỗi tạm dịch"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr "%s không tồn tại"
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr "có %s nhưng không thể đọc nó"
+
#: 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 "gặp lỗi khi đọc “%s”"
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2231,7 +2323,7 @@ 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
+#: src/msggrep.c:521
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2240,7 +2332,7 @@ msgstr ""
"Trích ra mọi chuỗi trong catalog bản dịch tương ứng với mẫu đã cho\n"
"hay thuộc về một số tập tin nguồn đã cho.\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2323,7 +2415,7 @@ msgstr ""
" -v, --invert-match\n"
"\txuất chỉ những chuỗi không khớp với tiêu chuẩn lựa chọn nào\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2331,12 +2423,12 @@ msgstr ""
" --escape dùng ký tự thoát dạng C trong kết xuất,\n"
" không có ký tự đã mở rộng\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output tạo ra kết xuất được sắp xếp\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr ""
@@ -2367,7 +2459,7 @@ msgstr ""
#: src/msginit.c:347
#, c-format
msgid "Created %s.\n"
-msgstr "%s đã được tạo.\n"
+msgstr "Đã tạo %s.\n"
#: src/msginit.c:367
#, c-format, no-wrap
@@ -2439,14 +2531,14 @@ msgid ""
"Please specify the input .pot file through the --input option.\n"
msgstr ""
"Không tìm thấy tập tin dạng .pot trong thư mục hiện thời.\n"
-"Hãy đưa ra tập tin .pot đầu vào, bằng tùy chọn “--input” (đầu vào)\n"
+"Hãy đưa ra tập tin .pot đầu vào, bằng tùy chọn “--input”\n"
#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
-msgstr "tiến trình phụ %s bị lỗi với mã thoát %d"
+msgstr "tiến trình con %s bị lỗi với mã thoát %d"
#: src/msginit.c:1118
msgid ""
@@ -2458,7 +2550,8 @@ msgid ""
msgstr ""
"Catalog bản dịch mới nên chứa địa chỉ thư điện tử của bạn,\n"
"để người dùng gửi cho bạn thông tin phản hồi về bản dịch,\n"
-"cũng cho nhà duy trì liên lạc trong trường hợp gặp lối kỹ thuật bất thường.\n"
+"cũng giúp cho nhà duy trì liên lạc trong trường hợp gặp lỗi kỹ thuật bất "
+"thường.\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
@@ -2466,7 +2559,7 @@ msgstr ""
#: src/msginit.c:1534
#, c-format
msgid "English translations for %s package"
-msgstr "Bản dịch tiếng Việt cho gói %s"
+msgstr "Bản dịch Tiếng Việt dành cho gói %s"
#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
#, c-format
@@ -2482,7 +2575,7 @@ msgstr "tập tin đầu vào chứa hai bộ ký tự khác nhau “%s” và
#, c-format
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ự"
+msgstr "tập tin đầu vào “%s” không chứa mục tin phần đầu xác định bộ ký tự"
#: src/msgl-cat.c:207
#, c-format
@@ -2499,7 +2592,7 @@ msgstr "bộ ký tự đích “%s” không phải tên bảng mã khả chuy
#: 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 "cảnh báo: "
@@ -2557,7 +2650,7 @@ msgstr ""
#: src/msgl-charset.c:100
#, c-format
msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr "• Đặt LC_ALL thành miền địa phương có bảng mã ký tự %s.\n"
+msgstr "- Đặt LC_ALL thành miền địa phương có bảng mã ký tự %s.\n"
#: src/msgl-charset.c:105
#, c-format
@@ -2566,7 +2659,7 @@ msgid ""
" then apply '%s',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-"• Chuyển đổi phân loại thông dịch sang %s bằng “msgconv”,\n"
+"- Chuyển đổi phân loại thông dịch sang %s bằng “msgconv”,\n"
" rồi áp dụng “%s”,\n"
" rồi chuyển đổi lại về %s bằng “msgconv”.\n"
@@ -2578,7 +2671,7 @@ msgid ""
" then apply '%s',\n"
" then convert back to %s using 'msgconv'.\n"
msgstr ""
-"• Đặt LC_ALL thành miền địa phương có bảng mã ký tự %s,\n"
+"- Đặt LC_ALL thành miền địa phương có bảng mã ký tự %s,\n"
" chuyển đổi phân loại thông dịch sang %s bằng “msgconv”,\n"
" rồi áp dụng “%s”,\n"
" rồi chuyển đổi lại về %s bằng “msgconv”.\n"
@@ -2592,31 +2685,31 @@ msgid ""
msgstr ""
"Bộ ký tự của miền địa phương “%s” không phải tên bảng mã khả chuyển.\n"
"Kết xuất của “%s” có thể không đúng.\n"
-"Chỉnh sửa có thể là đặt “LC_ALL=C”\n"
+"Cách giải quyết có thể là đặt “LC_ALL=C”\n"
#: src/msgl-check.c:130
msgid "plural expression can produce negative values"
-msgstr "biểu thức số nhiều có thể cung cấp giá trị âm"
+msgstr "dạng thức số nhiều có thể cung cấp giá trị âm"
#: src/msgl-check.c:141
#, c-format
msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr "“nplurals = %lu” nhưng biểu thức số nhiều có thể tạo giá trị đến %lu"
+msgstr "“nplurals = %lu” nhưng dạng thức số nhiều có thể tạo giá trị đến %lu"
#: src/msgl-check.c:187
msgid "plural expression can produce division by zero"
-msgstr "biểu thức số nhiều có thể gây ra trường hợp chia cho số không"
+msgstr "dạng thức số nhiều có thể gây ra trường hợp chia cho số không"
#: src/msgl-check.c:192
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"
+msgstr "dạng thức số nhiều có thể gây ra trường hợp tràn số nguyên"
#: src/msgl-check.c:197
msgid ""
"plural expression can produce arithmetic exceptions, possibly division by "
"zero"
msgstr ""
-"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 "
+"dạng thức số nhiều có thể gây ra trường hợp ngoại lệ tính toán, có lẽ chia "
"cho số không"
#: src/msgl-check.c:266
@@ -2631,13 +2724,13 @@ 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 "
+"nhưng mà mục tin phần đầu tập tin còn thiếu thuộc tính số nhiều "
"“plural=BIỂU_THỨC”"
#: src/msgl-check.c:384
msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
msgstr ""
-"nhưng mà mục nhập phần đầu tập tin còn thiếu thuộc tính số nhiều "
+"nhưng mà mục tin phần đầu tập tin còn thiếu thuộc tính số nhiều "
"“plural=SỐ_NGUYÊN”"
#: src/msgl-check.c:420
@@ -2646,7 +2739,7 @@ msgstr "giá trị nplurals (số dạng số nhiều) không hợp lệ"
#: src/msgl-check.c:442
msgid "invalid plural expression"
-msgstr "biểu thức số nhiều không hợp lệ"
+msgstr "dạng thức số nhiều không hợp lệ"
# Literal: don't translate / Nghĩa chữ: đừng dịch
#: src/msgl-check.c:472 src/msgl-check.c:488
@@ -2671,7 +2764,7 @@ 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 "
+"catalog bản dịch chứa chuỗi dịch ở số nhiều, nhưng còn thiếu mục tin phần "
"đầu chứa dòng\n"
"\"Plural-Forms: nplurals=SỐ_NGUYÊN; plural=BIỂU_THỨC\"\n"
"Với tiếng Việt, bạn có thể dùng:\n"
@@ -2679,29 +2772,29 @@ msgstr ""
#: src/msgl-check.c:611
msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"
-msgstr "cả hai mục nhập “msgid” và “msgid_plural” đều không bắt đầu với “\\n”"
+msgstr "cả hai mục tin “msgid” và “msgid_plural” đều không bắt đầu với “\\n”"
#: src/msgl-check.c:619
#, c-format
msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "cả hai mục nhập “msgid” và “msgstr[%u]” đều không bắt đầu với “\\n”"
+msgstr "cả hai mục tin “msgid” và “msgstr[%u]” đều không bắt đầu với “\\n”"
#: src/msgl-check.c:634
msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"
-msgstr "cả hai mục nhập “msgid” và “msgstr” đều không bắt đầu với “\\n”"
+msgstr "cả hai mục tin “msgid” và “msgstr” đều không bắt đầu với “\\n”"
#: src/msgl-check.c:652
msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"
-msgstr "cả hai mục nhập “msgid” và “msgid_plural” đều không kết thúc với “\\n”"
+msgstr "cả hai mục tin “msgid” và “msgid_plural” đều không kết thúc với “\\n”"
#: src/msgl-check.c:660
#, c-format
msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"
-msgstr "cả hai mục nhập “msgid” và “msgstr[%u]” đều không kết thúc với “\\n”"
+msgstr "cả hai mục tin “msgid” và “msgstr[%u]” đều không kết thúc với “\\n”"
#: src/msgl-check.c:675
msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"
-msgstr "cả hai mục nhập “msgid” và “msgstr” đều không kết thúc với “\\n”"
+msgstr "cả hai mục tin “msgid” và “msgstr” đều không kết thúc với “\\n”"
#: src/msgl-check.c:687
msgid "plural handling is a GNU gettext extension"
@@ -2714,17 +2807,17 @@ msgstr ""
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "chuỗi dịch msgstr còn thiếu ký tự phím tắt “%c”"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "chuỗi dịch msgstr có quá nhiều ký tự phím tắt “%c”"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, c-format
msgid "header field '%s' still has the initial default value\n"
-msgstr "trường phần đầu “%s” vẫn còn chứa giá trị khởi tạo mặc định (sửa đi)\n"
+msgstr "trường “%s” ở phần vẫn có giá trị khởi tạo mặc định (sửa đi)\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "trường “%s” còn thiếu trong phần đầu\n"
@@ -2742,10 +2835,10 @@ msgstr ""
#: src/msgl-iconv.c:290
msgid "input file doesn't contain a header entry with a charset specification"
-msgstr "tập tin đầu vào không chứa mục nhập phần đầu xác định bộ ký tự"
+msgstr "tập tin đầu vào không chứa mục tin phần đầu xác định bộ ký tự"
#: src/msgl-iconv.c:305 src/recode-sr-latin.c: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 "
@@ -2764,7 +2857,7 @@ msgstr ""
"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
+#: src/xgettext.c:727
#, c-format
msgid ""
"Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2773,16 +2866,16 @@ msgstr ""
"Không thể chuyển đổi từ “%s” sang “%s”. %s phụ thuộc vào iconv() nhưng phiên "
"bản này đã được xây dựng không có iconv()."
-#: src/msgmerge.c:383 src/msgmerge.c:389
+#: src/msgmerge.c:392 src/msgmerge.c:398
#, c-format
msgid "%s is only valid with %s"
msgstr "%s chỉ hợp lệ với %s"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:453
msgid "backup type"
msgstr "kiểu sao lưu"
-#: 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"
@@ -2806,17 +2899,17 @@ msgstr ""
"Khi không tìm thấy chuỗi dịch khớp chính xác, khả năng khớp mờ được dùng\n"
"để cung cấp kết quả hữu ích hơn.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " cũ.po chuỗi dịch tham chiếu đến nguồn cũ\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " mới.pot tham chiếu đến nguồn mới\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:513
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2826,7 +2919,7 @@ msgstr ""
"định\n"
" nhiều lần (bản trích yếu)\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2835,28 +2928,28 @@ msgstr ""
" -U, --update cập nhật tập tin cũ.po ; không làm gì\n"
" nếu nó đã cập nhật rồi\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Vị trí của tập tin xuất trong chế độ cập nhật:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Kết quả được ghi về tập tin cũ.po\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=ĐIỀU_KHIỂN sao lưu tập tin cũ.po (_sao lưu_)\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
" --suffix=HẬU_TỐ có quyền cao hơn hậu tố sao lưu bình thường\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2880,7 +2973,7 @@ msgstr ""
" simple, never luôn luôn tạo bản sao lưu đơn giản\n"
"(đơn giản, không bao giờ)\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2890,7 +2983,7 @@ msgstr ""
"Hậu tố sao lưu là “~” trừ khi được đặt bằng tùy chọn “--suffix” (hậu tố)\n"
"hoặc bằng biến môi trường “SIMPLE_BACKUP_SUFFIX” (hậu tố sao lưu đơn giản).\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
@@ -2898,22 +2991,22 @@ 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
+#: src/msgmerge.c:614 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent không hiển thị tiến trình\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1609
#, c-format
msgid "this message should define plural forms"
msgstr "chuỗi này nên dùng ở dạng thức số nhiều"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1632
#, c-format
msgid "this message should not define plural forms"
msgstr "chuỗi này không nên dùng ở dạng thức số nhiều"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2035
#, c-format
msgid ""
"%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2922,11 +3015,11 @@ 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/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
-msgstr " hoàn tất.\n"
+msgstr " xong.\n"
#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340
#, c-format
@@ -3038,7 +3131,7 @@ msgid " --strict write strict uniforum style\n"
msgstr ""
" --strict ghi kiểu Uniforum chính xác (_chặt chẽ_)\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -3060,12 +3153,12 @@ msgstr ""
"chúng được lấy từ bản dịch thứ nhất. Vị trí tập tin sẽ được tích lũy.\n"
"Dùng tùy chọn “--unique” (duy nhất) thì các bản sao bị hủy.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated in ra chỉ bản sao (trùng nhau)\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -3137,27 +3230,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "dấu #~ được dùng không thống nhất"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, c-format
msgid "missing 'msgstr[]' section"
msgstr "thiếu phần “msgstr[]”"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, c-format
msgid "missing 'msgid_plural' section"
msgstr "thiếu phần “msgid_plural”"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, c-format
msgid "missing 'msgstr' section"
msgstr "thiếu phần “msgstr”"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "dạng thức số nhiều đầu tiên có chỉ số là khác không"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "dạng thức số nhiều có chỉ số không đúng"
@@ -3167,7 +3260,7 @@ msgstr "dạng thức số nhiều có chỉ số không đúng"
msgid "too many errors, aborting"
msgstr "quá nhiều lỗi nên hủy bỏ"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c: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 "chuỗi nối tiếp đa byte không hợp lệ"
@@ -3211,16 +3304,16 @@ msgstr "kết thúc dòng bên trong chuỗi"
msgid "context separator <EOT> within string"
msgstr "gặp dấu định giới ngữ cảnh <EOT> bên trong chuỗi"
-#: src/read-catalog.c:332 src/xgettext.c:1023
+#: src/read-catalog.c:318 src/xgettext.c:1046
#, c-format
msgid "this file may not contain domain directives"
msgstr "tập tin này có thể không chứa chỉ thị miền"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "chuỗi gốc bị trùng lặp"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "đây là vị trí của chuỗi nơi nó lần đầu được định nghĩa"
@@ -3422,19 +3515,19 @@ msgstr "lỗi biên dịch lớp C#, hãy thử tùy chọn “--verbose” (xu
msgid "compilation of C# class failed"
msgstr "lỗi biên dịch lớp C#"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "không phải tên lớp Java hợp lệ: %s"
-#: src/write-java.c:1165
+#: src/write-java.c:1210
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr ""
"lỗi biên dịch lớp Java, hãy thử tùy chọn “--verbose” (xuất chi tiết) hoặc "
"đặt biến $JAVAC"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr "lỗi biên dịch lớp Java, hãy thử đặt biến $JAVAC"
@@ -3444,13 +3537,13 @@ msgstr "lỗi biên dịch lớp Java, hãy thử đặt biến $JAVAC"
msgid "error while opening \"%s\" for writing"
msgstr "gặp lỗi khi mở “%s” để ghi"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, c-format
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
+#: src/write-po.c:1326 src/write-po.c:1450
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3463,7 +3556,7 @@ msgstr ""
"Đề nghị bạn nhập chuỗi ngữ cảnh msgctxt hoàn toàn ASCII thay thế.\n"
"%s\n"
-#: src/write-po.c: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"
@@ -3483,7 +3576,7 @@ msgid ""
msgstr ""
"catalog bản dịch chứa chuỗi ở dạng thức số nhiều,\n"
"còn định dạng catalog bản dịch kiểu Qt không hỗ trợ\n"
-"khả năng thao tác cách ở số nhiều.\n"
+"khả năng xử lý dạng số nhiều.\n"
#: src/write-qt.c:693
msgid ""
@@ -3529,7 +3622,7 @@ msgid ""
msgstr ""
"catalog bản dịch chứa chuỗi ở dạng thức số nhiều,\n"
"còn định dạng .resources (tài nguyên) kiểu C# không\n"
-"hỗ trợ khả năng thao tác cách ở số nhiều.\n"
+"hỗ trợ khả năng xử lý dạng số nhiều.\n"
#: src/write-tcl.c:157
msgid ""
@@ -3547,9 +3640,9 @@ msgid ""
msgstr ""
"catalog bản dịch chứa chuỗi ở dạng thức số nhiều,\n"
"còn định dạng kiểu Tcl không hỗ trợ khả năng thao tác\n"
-"cách ở số nhiều.\n"
+"dạng thức số nhiều.\n"
-#: 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 "%s:%d: cảnh báo: chuỗi chưa được kết thúc"
@@ -3559,17 +3652,22 @@ msgstr "%s:%d: cảnh báo: chuỗi chưa được kết thúc"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: cảnh báo: biểu thức chính quy chưa được kết thúc"
-#: src/x-c.c: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 "cảnh báo: ký tự Unicode không hợp lệ"
+
+#: 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 "%s:%d: cảnh báo: hằng ký tự chưa được kết thúc"
-#: 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 "%s:%d: cảnh báo: kiểu chuỗi văn chưa được kết thúc"
-#: 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 "Hãy đưa ra bảng mã ký tự nguồn bằng tùy chọn “--from-code” (từ mã)."
@@ -3623,7 +3721,7 @@ msgstr ""
"%s:%d: chuỗi đa byte không hợp lệ.\n"
"Hãy đưa ra bảng mã ký tự nguồn dùng “--from-code” (từ mã).\n"
-#: 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 "%s:%d: cảnh báo: ký tự Unicode không hợp lệ"
@@ -3645,23 +3743,23 @@ 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 “)”"
-#: src/x-glade.c:561
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
-msgstr "Thiếu nội dung cho chuỗi được rút trích từ phần tử '%s'"
+msgstr "Thiếu nội dung cho chuỗi được rút trích từ phần tử “%s”"
-#: 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 "Phần tử gốc <%s> là không được phép trong một tập tin Glade hợp lệ"
# Variable: do not translate/ biến: đừng dịch
-#: 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 "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3727,11 +3825,21 @@ msgstr ""
"%s:%d: Chuỗi đa byte không hợp lệ. Hãy chỉ định\n"
"bảng mã ký tự nguồn dùng tùy chọn “--from-code” (từ mã).\n"
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: cảnh báo: Gặp kết thúc BTCQ quá sớm"
+#: src/x-javascript.c:1055
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: cảnh báo: không cho phép %s"
+
+#: src/x-javascript.c:1069
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: cảnh báo: đánh dấu XML chưa được hoàn tất"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3857,7 +3965,7 @@ msgstr "%s:%d: thiếu con số nằm sau dấu #"
#: src/x-rst.c:207
#, c-format
msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: biểu thức chuỗi không hợp lệ"
+msgstr "%s:%d: dạng thức chuỗi không hợp lệ"
#: src/x-sh.c:1074
#, c-format
@@ -3868,34 +3976,39 @@ 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
+#: src/x-vala.c:413
#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: cảnh báo: gặp kết thúc biểu thức chính quy quá sớm"
-#: src/xgettext.c:636
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr "“%s” không phải là tên bảng mã. Quay lại dùng ASCII.\n"
+
+#: src/xgettext.c:648
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr ""
"không cho phép dùng tùy chọn “--join-existing” (nối lại tồn tại) khi kết "
"xuất được ghi vào đầu ra tiêu chuẩn"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "phần mềm xgettext không thể hoạt động khi không có từ khóa cần tìm"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr "cảnh báo: không biết tập tin “%s” có phần mở rộng “%s”; nên thử C"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "Trích các chuỗi có thể dịch ra những tập tin đầu vào đã cho.\n"
-#: src/xgettext.c:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3904,24 +4017,24 @@ 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"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr " -o, --output=TẬP_TIN ghi kết xuất vào tập tin này\n"
-#: src/xgettext.c:863
+#: src/xgettext.c:886
#, c-format
msgid ""
" -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr ""
" -p, --output-dir=THƯ_MỤC các tập tin xuất sẽ được để vào thư mục này\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Chọn ngôn ngữ của tập tin đầu vào:\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3931,24 +4044,24 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
-" -L, --language=TÊN chỉ định ngôn ngữ. Các giá trị có thể là:\n"
+" -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"
" EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr ""
" -C, --c++ dạng viết tắt cho tùy chọn “--language=C++”\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:902
#, c-format
msgid ""
"By default the language is guessed depending on the input file name "
@@ -3957,7 +4070,7 @@ 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
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3966,24 +4079,24 @@ msgstr ""
" --from-code=MÃ bảng mã ký tự của tập tin đầu vào\n"
" (trừ Python, Tcl, Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr "Mặc định là giả sử tập tin đầu vào có bộ ký tự ASCII.\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr " -j, --join-existing nối lại các chuỗi với tập tin đã có\n"
-#: src/xgettext.c:894
+#: src/xgettext.c:917
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr ""
-" -x, --exclude-file=TẬP_TIN.po mục nhập từ tập tin này sẽ không được trích "
+" -x, --exclude-file=TẬP_TIN.po mục tin từ tập tin này sẽ không được trích "
"ra\n"
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -3997,17 +4110,17 @@ msgstr ""
" -c, --add-comments để vào tập tin kết xuất các khối ghi chú nằm\n"
" trước dòng từ khoá\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Tùy chọn đặc trưng cho ngôn ngữ:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all trích ra mọi chuỗi\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4022,26 +4135,32 @@ msgstr ""
" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
" Lua, JavaScript, Vala)\n"
-#: 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 ""
-" -kTỪ, --keyword=TỪ quét tìm TỪ này như là một từ khoá bổ sung\n"
-" -k, --keyword không dùng từ khoá mặc định\n"
+" (chỉ ngôn ngữ C, C++, ObjectiveC, Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, "
+"Java,\n"
+" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+" Lua, JavaScript, Vala, Desktop)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
"argument\n"
" number ARG of keyword WORD\n"
msgstr ""
-" --flag=TỪ:ĐỐI_SỐ:CỜ cờ phụ thêm cho chuỗi nằm bên trong đối số\n"
-" có số ĐỐI SỐ của từ khoá TỪ\n"
+" --flag=TỪ:ĐỐI_SỐ:CỜ cờ phụ thêm cho chuỗi nằm bên trong đối số\n"
+" có số ĐỐI SỐ của từ khoá TỪ\n"
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -4056,38 +4175,38 @@ msgstr ""
" C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
" Lua, JavaScript, Vala)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr " -T, --trigraphs hiểu chữ ba C kiểu ANSI để nhập vào\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr ""
" (chỉ những ngôn ngữ C, C++, ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt chấp nhận chuỗi định dạng Qt\n"
-#: src/xgettext.c: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 " (chỉ ngôn ngữ C++)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --kde chấp nhận chuỗi định dạng KDE4\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --boost chấp nhận chuỗi định dạng Boost\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
@@ -4095,20 +4214,20 @@ 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
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr ""
" --properties-output ghi ra tập tin .properties\n"
-" thuộc tính) kiểu Java\n"
+" thuộc tính) kiểu Java\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr ""
" --copyright-holder=CHUỖI đặt người giữ tác quyền trong kết xuất\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -4116,18 +4235,18 @@ 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"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, c-format
msgid " --package-name=PACKAGE set package name in output\n"
msgstr " --package-name=GÓI đặt tên gói trong kết xuất\n"
-#: src/xgettext.c:989
+#: src/xgettext.c:1012
#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr ""
" --package-version=PHIÊN_BẢN đặt phiên bản của gói trong kết xuất\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
@@ -4136,7 +4255,7 @@ msgstr ""
" đặt địa chỉ thông báo lỗi trong chuỗi gốc "
"msgid\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -4146,7 +4265,7 @@ msgstr ""
" -m[CHUỖI], --msgstr-prefix[=CHUỖI] dùng CHUỖI này hay \"\"\n"
" làm tiền tố cho giá trị msgstr\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -4156,7 +4275,7 @@ msgstr ""
" -M[CHUỖI], --msgstr-suffix[=CHUỖI] dùng chuỗi này hay \"\" làm hậu tố\n"
" cho giá trị msgstr\n"
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid ""
"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -4164,31 +4283,31 @@ msgid ""
msgstr ""
"Đối số “--flag” (cờ) không có cú pháp <từ khóa>:<số đối số>:[qua-]<cờ>: %s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr "đầu vào tiêu chuẩn"
-#: src/xgettext.c:2020
+#: src/xgettext.c:2071
#, c-format
msgid "Non-ASCII character at %s%s."
msgstr "Gặp một ký tự khác ASCII tại %s%s."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr "Gặp một ghi chú khác ASCII nằm tại hay trước %s%s."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr "Gặp một chuỗi khác ASCII tại %s%s."
-#: 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 "%s%s: cảnh báo: "
-#: 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 "
@@ -4197,7 +4316,7 @@ 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
+#: src/xgettext.c:2190
#, c-format
msgid ""
"Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4206,7 +4325,7 @@ 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
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4218,9 +4337,9 @@ msgstr ""
"không thể được bản địa hóa cho đúng:\n"
"dịch giả không thể sắp xếp lại những đối số.\n"
"Đề nghị bạn dùng chuỗi định dạng có đối số có tên,\n"
-"và sự ánh xạ thay cho tuple nhiều thành phần cho những đối số.\n"
+"và sự ánh xạ thay cho bản ghi nhiều thành phần cho những đối số.\n"
-#: src/xgettext.c:2232
+#: src/xgettext.c:2283
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
@@ -4231,27 +4350,27 @@ msgstr ""
"gettext(\"\") sẽ đưa ra siêu thông tin (thông tin đặc biệt),\n"
"không phải chuỗi trống rỗng.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "đặc tả đối chưa rõ ràng cho từ khoá “%.*s”"
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "cảnh báo: thiếu ngữ cảnh cho từ khoá “%.*s”"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr "cảnh báo: thiếu ngữ cảnh cho đối số ở số nhiều của từ khoá “%.*s”"
-#: src/xgettext.c:2942
+#: src/xgettext.c:3052
#, c-format
msgid "context mismatch between singular and plural form"
-msgstr "ngữ cảnh xung đột giữa cách ở số ít và số nhiều"
+msgstr "ngữ cảnh xung đột giữa dạng số ít và số nhiều"
-#: 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"
@@ -4263,7 +4382,7 @@ msgstr ""
"hãy chỉ định biến MSGID_BUGS_ADDRESS trong đó;\n"
"không thì đưa ra tùy chọn dòng lệnh “--msgid-bugs-address”.\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, c-format
msgid "language '%s' unknown"
msgstr "không nhận ra ngôn ngữ “%s”"
diff --git a/gettext-tools/po/zh_CN.po b/gettext-tools/po/zh_CN.po
index 566f52d..a8dca84 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: 2013-07-07 18:21+0900\n"
+"POT-Creation-Date: 2014-06-01 11:19+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"
@@ -181,15 +181,15 @@ msgstr "compile_java_class 中有无效的 source_version 参数"
msgid "invalid target_version argument to compile_java_class"
msgstr "compile_java_class 中有无效的 target_version 参数"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c: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 "创建“%s”失败"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: 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 "写入“%s”出错"
@@ -210,9 +210,9 @@ msgstr "未找到 Java 虚拟机,试着安装 gij 或设置 $JAVA"
msgid "%s subprocess I/O error"
msgstr "%s 子进程 I/O 错误"
-#: 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 "内存耗尽"
@@ -223,7 +223,7 @@ msgid "creation of threads failed"
msgstr "线程创建失败"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "写入 %s 子进程失败"
@@ -310,8 +310,8 @@ 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: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 "打开“%s”读取时出错"
@@ -651,7 +651,7 @@ msgid ""
msgstr "第 %u 条指令中,大小指定符与转换指定符“%c”不兼容。"
#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-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 "“%s”和“%s”中对参数“%s”的格式指定不同"
-#: src/format-python-brace.c:136
+#: src/format-python-brace.c:137
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
msgstr "第 %u 条指令中,“%c”后面没有数字。"
-#: src/format-python-brace.c:149
+#: src/format-python-brace.c:150
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
msgstr "第 %u 条指令中,“{”后没有参数编号。"
-#: src/format-python-brace.c:164
+#: src/format-python-brace.c:165
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
msgstr "第 %u 条指令中,“%c”后面没有数字。"
-#: src/format-python-brace.c:184
+#: src/format-python-brace.c:185
#, fuzzy, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
msgstr "第 %u 条指令中,“%c”前不允许有精度。"
-#: src/format-python-brace.c:210
+#: src/format-python-brace.c:270
#, fuzzy, c-format
msgid "In the directive number %u, there is an unterminated format directive."
msgstr "第 %u 条指令中,参数 %d 为负数。"
@@ -761,11 +761,11 @@ msgid ""
"1 and 9."
msgstr "终止第 %u 条指令的字符不是介于 1 和 9 之间的数字。"
-#: src/hostname.c:178 src/msgattrib.c:344 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
-#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
-#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:599
+#: 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"
@@ -778,19 +778,19 @@ msgstr ""
"This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
-#: src/hostname.c:184 src/msgattrib.c: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 "由 %s 编写。\n"
#. 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 "Bruno Haible"
@@ -800,11 +800,11 @@ msgstr "Bruno Haible"
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 "试试“%s --help”查看帮助信息。\n"
@@ -842,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: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 "信息性输出:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help 显示此帮助并退出\n"
-#: 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 " -V, --version 输出版本信息并退出\n"
@@ -873,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: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 "将错误报告至 <bug-gnu-gettext@gnu.org>。\n"
@@ -886,213 +886,216 @@ msgstr "将错误报告至 <bug-gnu-gettext@gnu.org>。\n"
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 "%s 和 %s 互相排斥"
-#: src/msgattrib.c:414 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "用法:%s [选项] [输入文件]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
"and manipulates the attributes.\n"
msgstr "根据消息的属性过滤一个翻译库里的消息,并处理消息的属性。\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
+#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msguniq.c:342
#, c-format
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
msgstr "长选项必须用的参数在使用短选项时也是必须的。\n"
-#: src/msgattrib.c: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 "输入文件的位置:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " 输入文件 做为输入的 PO 文件\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c: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 " -D, --directory=目录 在<目录>中查找输入文件\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr "如果没有指定输入文件或输入文件是 -,则读取标准输入。\n"
-#: 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 "输出文件位置:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 " -o, --output-file=文件 将输出写入指定文件\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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 "如果没有指定输出文件或输出文件是 -,则将结果写入至标准输出。\n"
-#: 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 "消息选择:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
msgstr " --translated 保留已翻译的,去掉未翻译的消息\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
msgstr " --untranslated 保留未翻译的,去掉已翻译的消息\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr " --no-fuzzy 删除标为模糊的消息\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr " --only-fuzzy 保留标为模糊的消息\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete 移除过时 #~ 的消息\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete 保留过时 #~ 的消息\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "属性操纵:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr " --set-fuzzy 全部消息设为“模糊”\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr " --clear-fuzzy 全部消息清除“模糊”属性\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr " --set-obsolete 全部消息设为过时\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr " --clear-obsolete 全部消息清除过时属性\n"
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, fuzzy, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
" of translated messages.\n"
msgstr " --previous 保留已翻译条目的 msgids\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
"messages\n"
msgstr " --clear-previous 从所有条目中删除“previous msgid”\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, fuzzy, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr " --no-fuzzy 删除标为模糊的消息\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
msgstr " --only-file=文件.po 只处理列在 文件.po 中的项\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
msgstr " --ignore-file=文件.po 只处理未列在 文件.po 中的项\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr " --fuzzy 等于 --only-fuzzy --clear-fuzzy\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
msgstr " --obsolete 等于 --only-obsolete --clear-obsolete\n"
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c: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 "输入文件的语法:\n"
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr " -P, --properties-input 输入文件以 Java .properties 语法给出\n"
-#: 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 "
@@ -1100,17 +1103,17 @@ msgid ""
msgstr ""
" --stringtable-input 输入文件以 NeXTstep/GNUstep .strings 语法给出\n"
-#: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
-#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
-#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
-#: src/xgettext.c:946
+#: src/msgattrib.c:498 src/msgcat.c: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 "输出细节:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1123,119 +1126,119 @@ msgstr ""
" WHEN 可以"
"是‘always’,‘never’,‘auto’或‘html’。\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
+#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=STYLEFILE 为 --color 参数指定 CSS 样式文件\n"
-#: 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 " -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
+#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid ""
" -E, --escape use C escapes in output, no extended chars\n"
msgstr " -E, --escape 在输出中使用 C 转码序列,没有扩展字符\n"
-#: 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 " --force-po 就算为空也写入 PO 文件\n"
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr " -i, --indent 使用缩进风格写入 .po 文件\n"
-#: 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 " --no-location 不写入“#: 文件名:行号”位置行\n"
-#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:964
+#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
+#: src/xgettext.c:987
#, c-format
msgid ""
" -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr " -n, --add-location 生成“#: 文件名:行号”位置行(默认)\n"
-#: 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 ""
" --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
-#: 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 " -p, --properties-output 写出 Java .properties 文件\n"
-#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
-#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr " --stringtable-output 写出 NeXTstep/GNUstep .strings 文件\n"
-#: 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 " -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
-#: 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 " --no-wrap 不将超过输出页宽度的长消息行断为多行\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output 输出前排序\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 " -F, --sort-by-file 按文件位置排序输出\n"
-#: 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 "不可能出现的选择条件 (%d < n < %d)"
-#: 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 "用法:%s [选项] [输入文件]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1258,23 +1261,23 @@ msgstr ""
"翻译内容、自行加上的批注和源程序代码批注,以及文件中的位置等都会累积,\n"
"除非使用了 --use-first选项,那样则会由第一个包含该翻译条目的文件获取数据。\n"
-#: 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 " 输入文件 ... 输入文件\n"
-#: 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 " -f, --files-from=文件 由<文件>读入输入文件的列表\n"
-#: 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 "如果输入文件为 -,则将读取标准输入。\n"
-#: 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"
@@ -1283,7 +1286,7 @@ msgstr ""
" -<, --less-than=数字 只打印出现次数少于指定次数的消息,若没有\n"
" 指定次数则默认值为无穷大\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1292,7 +1295,7 @@ msgstr ""
" ->, --more-than=数字 只打印出现次数多于指定次数的消息,若没有\n"
" 指定次数则默认值为 0\n"
-#: 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"
@@ -1301,15 +1304,15 @@ msgstr ""
" -u, --unique --less-than=2 的缩写,要求只列出出现一次\n"
" 的消息\n"
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:739
-#: src/msgmerge.c:557
+#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
+#: src/msgmerge.c:562
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr " -P, --properties-input 输入文件以 Java .properties 语法给出\n"
-#: 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"
@@ -1317,12 +1320,12 @@ msgid ""
msgstr ""
" --stringtable-input 输入文件以 NeXTstep/GNUstep .strings 语法给出\n"
-#: 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 " -t, --to-code=名称 输出的编码\n"
-#: 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"
@@ -1331,28 +1334,28 @@ msgstr ""
" --use-first 对每条消息均使用第一个可用的翻译,不合并若干\n"
" 种翻译\n"
-#: 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 " --lang=CATALOGNAME 在文件头中设定 'Language'\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
msgid "Peter Miller"
msgstr "Peter Miller"
-#: 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 "用法:%s [选项] def.po ref.pot\n"
@@ -1383,19 +1386,19 @@ msgstr " def.po 翻译\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot 对源文件的引用\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "操作修饰:\n"
-#: 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 " -m, --multi-domain 将 ref.pot 应用到 def.po 的每个域上\n"
-#: 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 " -N, --no-fuzzy-matching 不使用模糊匹配\n"
@@ -1420,17 +1423,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 "此消息已使用,但未定义于 %s 中"
@@ -1440,18 +1443,18 @@ msgstr "此消息已使用,但未定义于 %s 中"
msgid "warning: this message is not used"
msgstr "警告:此消息未使用"
-#: src/msgcmp.c:553 src/msgfmt.c:545
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "发现 %d 处致命错误"
-#: 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"
@@ -1471,7 +1474,7 @@ msgstr ""
"但只会保留最先定义这些信息的 PO 文件中的内容。\n"
"所有 PO 文件中的翻译条目的文件位置都会累积下来。\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1480,67 +1483,67 @@ msgstr ""
" ->, --more-than=数字 只打印出现次数多于指定次数的消息,若没有\n"
" 指定次数则默认值为 1\n"
-#: 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 " --omit-header 不写入带有“msgid \"\"”项的文件头项\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr "将一个翻译库的编码转换为另一种文字编码。\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "转换目标:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "默认编码为当前区域设置的编码。\n"
-#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent 缩进的输出风格\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\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
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
+#: src/msgmerge.c:588
+#, fuzzy, c-format
msgid ""
-" --add-location preserve '#: filename:line' lines (default)\n"
+" -n, --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
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict 严格的 Uniforum 输出风格\n"
-#: 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 "用法:%s [选项] 输入文件\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1552,7 +1555,7 @@ msgstr ""
"(通常由 xgettext 创建)。未翻译的条目会填上和 msgid 一样的字符串,\n"
"并标记为模糊。\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " 输入文件 输入 PO 或 POT 文件\n"
@@ -1591,7 +1594,7 @@ msgstr ""
"有一个称为“0”的特殊内置命令,它会输出翻译条目,并随后加上一个 null\n"
"字节。“msgexec 0”的输出适用于作为“xargs -0”的输入。\n"
-#: 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 " -i, --input=输入文件 输入的 PO 文件\n"
@@ -1601,27 +1604,27 @@ msgstr " -i, --input=输入文件 输入的 PO 文件\n"
msgid "write to stdout failed"
msgstr "写入 stdout 失败"
-#: 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 "必须指定至少一个 sed 脚本"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "用法:%s [选项] 过滤器 [过滤器选项]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "对于翻译库中的所有翻译条目进行过滤。\n"
-#: 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"
@@ -1630,18 +1633,18 @@ msgstr ""
"<过滤器>可以是任何由标准输入读入翻译条目\n"
"并将修改后的翻译写进标准输出的程序。\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "当过滤器是“sed”时可用的过滤选项:\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid ""
" -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
msgstr " -e, --expression=脚本 将<脚本>添加到欲执行的命令中\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the "
@@ -1649,101 +1652,122 @@ msgid ""
" to be executed\n"
msgstr " -f, --file=脚本文件 将<脚本文件>的内容添加到欲执行的命令中\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid ""
" -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr " -n, --quiet, --silent 禁用对模式空白的自动打印\n"
-#: src/msgfilter.c:446 src/msggrep.c:595
+#: src/msgfilter.c:465 src/msggrep.c:600
#, c-format
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
+#: src/msgfilter.c:471 src/msggrep.c:606
#, c-format
msgid " --indent indented output style\n"
msgstr " --indent 缩进的输出风格\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
msgstr " --keep-header 保持文件头项不变,不过滤它\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "%s 的参数应该是一个标点符号"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
msgstr "无效的 endianness:%s"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
+#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
msgid "Ulrich Drepper"
msgstr "Ulrich Drepper"
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:439
+#, fuzzy, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr "如果没有指定输入文件或输入文件是 -,则读取标准输入。\n"
+
+#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
#: src/msgunfmt.c:353
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s 需要指定“-d 目录”选项"
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c: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 "%s 需要指定“-l locale”选项"
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:538
+#, fuzzy, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s 需要指定“-l locale”选项"
+
+#: src/msgfmt.c:545
+#, fuzzy, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s 需要指定“-l locale”选项"
+
+#: src/msgfmt.c:551
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s 和 %s 互相排斥"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s 只能配合 %s 或 %s 一起使用才有效"
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:571 src/msgfmt.c:577
#, c-format
msgid "%s is only valid with %s, %s or %s"
msgstr "%s 只能配合 %s、%s 或 %s 一起使用才有效"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
msgstr[0] "%d 条已翻译消息"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ",%d 条模糊消息"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ",%d 条未翻译消息"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "用法:%s [选项] 文件名.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "由文字模式描述生成二进制消息文件。\n"
-#: 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"
@@ -1752,24 +1776,24 @@ msgstr ""
"长选项必须用的参数在使用短选项时也是必须的。\n"
"可选参数也是如此。\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
msgid " filename.po ... input files\n"
msgstr " 文件名.po ... 输入文件\n"
-#: 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 "操作模式:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
"class\n"
msgstr " -j, --java Java 模式:生成 Java 资源包类\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1778,51 +1802,57 @@ msgstr ""
" --java2 类似 --java,但假设是 Java2 (JDK 1.2 或较新\n"
" 的版本)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr " --csharp C# 模式:生成 .NET .dll 文件\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
"file\n"
msgstr " --csharp-resources C# 资源模式:生成 .NET .resources 文件\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr " --tcl Tcl 模式:生成 tcl/msgcat .msg 文件\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt Qt 模式:生成 Qt .qm 文件\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, fuzzy, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr " --qt Qt 模式:生成 Qt .qm 文件\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict 使用严格的 Uniforum 模式\n"
-#: 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 "如果输出文件是 -,则会将结果写入至标准输出。\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "以 Java 模式输出文件位置:\n"
-#: src/msgfmt.c:703 src/msgfmt.c:717 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr " -r, --resource=资源 资源名称\n"
-#: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
-#: src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c: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 "
@@ -1830,13 +1860,20 @@ msgid ""
msgstr ""
" -l, --locale=语系 语系名称,必须是“语言”或“语言_国家”的格式\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, fuzzy, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr " --tcl Tcl 模式:输入为 tcl/msgcat .msg 文件\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr " -d 目录 类目录层次的基本目录\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1847,19 +1884,19 @@ msgstr ""
"类名称是由资源名称连同语系名称共同决定的,两者之间会用下划线分隔。\n"
"-d 选项是必须的。class 文件会存放在指定的目录。\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "以 C# 模式输出文件位置:\n"
-#: 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 " -d 目录 依赖语系的 .dll 文件的的基本目录\n"
-#: 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"
@@ -1868,29 +1905,61 @@ msgstr ""
"-l 和 -d 选项是必要的。.dll 文件会写入指定目录的子目录,而子目录的名称取决于"
"语系。\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "以 Tcl 模式输出文件位置:\n"
-#: 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 " --d 目录 .msg 消息库的基本目录\n"
-#: 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 "-l 和 -d 选项是必要的。所生成的 .msg 文件会存放在指定的目录。\n"
-#: 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
+#, fuzzy, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr " --d 目录 .msg 消息库的基本目录\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -kWORD, --keyword=WORD 查找 WORD 作为一个额外的关键字\n"
+" -k, --keyword 不使用默认关键字\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "输入文件的解释:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1900,19 +1969,19 @@ msgstr ""
" -c, --check 同时进行 --check-format、--check-header 和\n"
" --check-domain 三种检查\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr " --check-format 检查和语言有关的格式字符串\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
msgstr " --check-header 检查文件头项是否存在及检查其内容\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -1921,7 +1990,7 @@ msgstr ""
" --check-domain 检查 domain 指令和 --output-file 选项之间\n"
" 是否冲突\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -1929,7 +1998,7 @@ msgid ""
msgstr ""
" -C, --check-compatibility 让 GNU msgfmt 以 X/Open msgfmt 的方式检查文件\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -1938,19 +2007,19 @@ msgid ""
msgstr ""
" --check-accelerators[=CHAR] 检查菜单项目中的快捷键标记是否存在\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr " -f, --use-fuzzy 在输出中使用模糊的翻译条目\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
" -a, --alignment=数字 以<数字>个字节为单位对齐字符串(默认:%d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -1961,99 +2030,109 @@ msgstr ""
" --endianness=BYTEORDER 以指定字节序输出 32位数\n"
" (big 还是 little 是系统平台默认的)\n"
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid ""
" --no-hash binary file will not include the hash table\n"
msgstr " --no-hash 二进制文件将不包含哈希表\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics 打印关于翻译的统计\n"
-#: src/msgfmt.c:783 src/msgmerge.c:607 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose 增加输出的详细程度\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "警告:PO 文件头丢失或无效\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "警告:字符集转换无法工作\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "警告:PO 文件头模糊\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "警告:旧版本的 msgfmt 将在此时给出错误\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "域名“%s”无法用于文件名"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "域名“%s”无法用于文件名:将使用前缀"
-#: 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 "忽略了空的“msgstr”项"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "忽略了模糊的“msgstr”项"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s:警告:源文件包含模糊的翻译条目"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c: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 "读取“%s”出错"
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
"specified"
msgstr "未指定“J”、“K”、“T”、“C”或“X”前不能使用选项“%c”"
-#: src/msggrep.c:516
+#: src/msggrep.c:521
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr "提取翻译库中的消息,这些消息符合某个给出的模式或属于某个给出的源文件。\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2127,18 +2206,18 @@ msgstr ""
" -i, --ignore-case 忽略大小写区别\n"
" -v, --invert-match 仅输出不符合任何条件的消息\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
msgstr " --escape 在输出中使用 C 转义字符,没有扩展字符\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output 生成排序输出\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file 根据文件位置排序输出\n"
@@ -2293,7 +2372,7 @@ msgstr "目标字符集编码“%s”不是通用的编码名称。"
#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:3051
+#: src/xgettext.c:544 src/xgettext.c:3418
#, c-format
msgid "warning: "
msgstr "警告:"
@@ -2489,17 +2568,17 @@ msgstr "复数处理是 GNU gettext 的扩展功能"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr 缺少快捷键标记“%c”"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr 包含过多的快捷键标记“%c”"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "文件头\"%s\"仍然是默认值未改变\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "头部缺少文件头\"%s\"\n"
@@ -2519,7 +2598,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 "
@@ -2534,23 +2613,23 @@ msgid ""
msgstr "从“%s”转换为“%s”出现了重复项:某些原本不同的 msgid 变成了相同项。"
#: 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 "无法从“%s”转换为“%s”。%s 需要 iconv()。此版本创建时未包含 iconv()。"
-#: 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 "%s 只能和 %s 配合一起使用才有效"
-#: 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"
@@ -2571,24 +2650,24 @@ msgstr ""
"在程序执行的过程中找不到完全匹配的文字,则会使用模糊的匹配以求达到较好的\n"
"效果。\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po 根据旧源文件进行的翻译成果\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot 对新源文件的引用\n"
-#: 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 " -C, --compendium=文件 消息翻译的额外库,可指定多个\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:519
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2597,27 +2676,27 @@ msgstr ""
" -U, --update 更新 def.po,\n"
" 如果 def.po 已经是最新则不作任何事\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "以更新模式输出文件位置:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "结果将写回 def.po 中。\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=备份方法 备份 def.po\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=后缀 覆盖默认备份后缀\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2635,7 +2714,7 @@ msgstr ""
" existing, nil 如果编号备份存在则继续编号,否则执行简单备份\n"
" simple, never 总是制作简单的备份\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2644,28 +2723,28 @@ msgid ""
msgstr ""
"除非以 --suffix 或 SIMPLE_BACKUP_SUFFIX 环境变量设置, 备份文件后缀总是\"~\"\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
msgstr " --previous 保留已翻译条目的 msgids\n"
-#: 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 " -q, --quiet, --silent 隐藏进度指示\n"
-#: 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, "
@@ -2674,7 +2753,7 @@ 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/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2777,7 +2856,7 @@ msgstr " -i, --indent 写出缩进的输出风格\n"
msgid " --strict write strict uniforum style\n"
msgstr " --strict 写出严格的 Uniforum 风格\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -2796,12 +2875,12 @@ msgstr ""
"累积起来,但如果指定了 --use-first 选项,则会从第一个翻译中取得注释。文件位置\n"
"将会累积。如果使用了 --unique 选项,重复项将会被忽略。\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated 只打印重复项\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -2867,27 +2946,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 "缺少“msgstr[]”区"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, c-format
msgid "missing 'msgid_plural' section"
msgstr "缺少“msgid_plural”区"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, c-format
msgid "missing 'msgstr' section"
msgstr "缺少“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 "复数形式的索引出错"
@@ -2897,7 +2976,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 "无效的多字节序列"
@@ -2941,16 +3020,16 @@ msgstr "字符串内遇到行尾"
msgid "context separator <EOT> within string"
msgstr "上下文分隔符 <EOT> 出现于字符串中"
-#: 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 "这是第一次定义的位置"
@@ -3139,17 +3218,17 @@ msgstr "编译 C# 类失败,试试 --verbose"
msgid "compilation of C# class failed"
msgstr "编译 C# 类失败"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "不是有效的 Java 类名:%s"
-#: 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 "编译 Java 类失败,试试 --verbose 或设置 $JAVAC 变量"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr "编译 Java 类失败,请尝试设置 $JAVAC 变量"
@@ -3159,13 +3238,13 @@ msgstr "编译 Java 类失败,请尝试设置 $JAVAC 变量"
msgid "error while opening \"%s\" for writing"
msgstr "打开“%s”写入出错"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr "国际化的消息不应包含“\\%c”转码序列"
-#: 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"
@@ -3178,7 +3257,7 @@ msgstr ""
"用纯 ASCII 的 msgctxt。\n"
"%s\n"
-#: 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"
@@ -3256,7 +3335,7 @@ msgstr ""
"消息库有复数翻译\n"
"但是 Tcl 消息库不支持复数处理\n"
-#: 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 "%s:%d:警告:未结束的字符串"
@@ -3266,17 +3345,22 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, fuzzy, c-format
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d:警告:无效的 Unicode 字符"
+
+#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d:警告:未结束的字符常量"
-#: 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 "%s:%d:警告:未结束的字符串字面"
-#: 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 "请用 --from-code 指定源编码"
@@ -3330,7 +3414,7 @@ msgstr ""
"%s:%d:无效的多字节序列。\n"
"请通过 --from-code 指定源文件的编码。\n"
-#: 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 "%s:%d:警告:无效的 Unicode 字符"
@@ -3350,22 +3434,22 @@ msgstr "%s:%d:警告:期待“}”却发现了“)”"
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d:警告:期待“)”却发现了“}”"
-#: 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 "%s:%lu:%lu:%s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3429,11 +3513,21 @@ msgstr ""
"%s:%d:无效的多字节序列。\n"
"请通过 --from-code 指定源文件的编码。\n"
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, fuzzy, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d:警告:未结束的字符串字面"
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d:警告:无效的 Unicode 字符"
+
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d:警告:未结束的字符串"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3559,55 +3653,60 @@ msgid ""
"use eval_gettext instead"
msgstr "%s:%lu:警告:为安全起见,语法 $“...”不被推荐;请换用 eval_gettext"
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, fuzzy, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d:警告:未结束的字符串字面"
-#: 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 "输出写到 stdout 时无法使用 --join-existing"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "没有指定关键字 xgettext 将无法工作"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr "警告:文件“%s”扩展名“%s”未知; 将试试 C"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "从给定的输入文件中提取可翻译的字符串。\n"
-#: 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 " -d, --default-domain=名称 使用<名称.po>输出(而不是 messages.po)\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr " -o, --output=文件 将输出写入指定文件\n"
-#: 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 " -p, --output-dir=目录 输出文件将会存放在<目录>中\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "选择输入文件所用的语言:\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, fuzzy, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3617,7 +3716,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=名称 识别指定语言\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3627,19 +3726,19 @@ msgstr ""
"PHP,\n"
" GCC-源, NXStringTable, RST, Glade)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ --language=C++ 的简写\n"
-#: 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 "默认情况下,所使用的语言是根据输入文件的扩展名猜测的。\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3648,22 +3747,22 @@ msgstr ""
" --from-code=名称 输入文件的编码\n"
" (除了 Python, Tcl, Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr "默认情况下,输入文件都认为是纯 ASCII 文件。\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr " -j, --join-existing 将消息加入已有文件\n"
-#: 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 " -x, --exclude-file=文件.po 文件.po中的项不提取\n"
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -3677,17 +3776,17 @@ msgstr ""
" -c, --add-comments 在输出文件中以关键词开启一行,\n"
" 并放置所有注释块\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "语言特定选项:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all 提取所有字符串\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3702,16 +3801,22 @@ msgstr ""
"Tcl,\n"
" Perl, PHP, GCC-源, Glade 语言)\n"
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:937
+#, fuzzy, 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 ""
-" -kWORD, --keyword=WORD 查找 WORD 作为一个额外的关键字\n"
-" -k, --keyword 不使用默认关键字\n"
+" (仅 C, C++, ObjectiveC, Shell, Python, "
+"Lisp,\n"
+" EmacsLisp, librep, Scheme, Java, C#, awk, "
+"Tcl,\n"
+" Perl, PHP, GCC-源, Glade 语言)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3722,7 +3827,7 @@ msgstr ""
"标\n"
" 志\n"
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3737,75 +3842,75 @@ msgstr ""
"Tcl,\n"
" Perl, PHP, GCC-源语言)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr " -T, --trigraphs 理解输入时的 ANSI C 分段\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr " (仅 C, C++, ObjectiveC 语言)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt 识别 Qt 格式字符串\n"
-#: 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 " (仅 C++ 语言)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --kde 识别 KDE 4 格式字符串\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --boost 识别 Boost 格式字符串\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr " --debug 更详细的格式字符串识别结果\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output 写出 Java .properties 文件\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr " --copyright-holder=字符串 在输出中设置版权占位符\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
msgstr " --foreign-user 为外语用户省略 FSF 版权\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, c-format
msgid " --package-name=PACKAGE set package name in output\n"
msgstr " --package-name=PACKAGE 输出时设定软件包名字\n"
-#: src/xgettext.c:989
+#: src/xgettext.c:1012
#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr " --package-version=VERSION 输出时设定软件包版本\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr " --msgid-bugs-address=EMAIL@ADDRESS 设置报告 msgid 错误的地址\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -3815,7 +3920,7 @@ msgstr ""
" -m[STRING], --msgstr-prefix[=STRING] 使用 STRING 或 \"\" 作为\n"
" msgstr 内容的前缀\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for "
@@ -3825,38 +3930,38 @@ msgstr ""
" -M[STRING], --msgstr-suffix[=字符串] 使用<字符串>或\"\"作为 msgstr 项的后"
"缀\n"
-#: 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 "--flag 参数并非以 <关键字>:<参数编号>:[遍数-]<标志> 的语法给出:%s"
-#: 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 "%s%s 处有非 ASCII 码字符。"
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr "%s%s 处或之前位置有非 ASCII 码注释。"
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr "%s%s 处有非 ASCII 字符串。"
-#: 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 "%s%s:警告:"
-#: 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 "
@@ -3864,14 +3969,14 @@ msgid ""
msgstr ""
"尽管在格式字符串的位置使用,但 %s 仍不是有效的 %s 格式字符串。原因:%s\n"
-#: 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 "以所声明的语言 %2$s 来看,%1$s 不是有效的格式字符串。原因:%3$s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3883,7 +3988,7 @@ msgstr ""
"翻译者无法重新编排参数的顺序。\n"
"请考虑使用带有命名参数和映射的格式字符串,而不是使用参数数组。\n"
-#: 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"
@@ -3893,27 +3998,27 @@ msgstr ""
"gettext(\"\") 将返回文件头项,而不\n"
"是空字符串。\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "关键字“%.*s”的参数指定含糊"
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "警告:关键字“%.*s”缺少上下文"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr "警告:关键字“%.*s”缺少复数参数上下文"
-#: 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"
@@ -3925,7 +4030,7 @@ msgstr ""
" MSGID_BUGS_ADDRESS 变量;\n"
"否则,请指定 --msgid-bugs-address 命令行选项。\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, c-format
msgid "language '%s' unknown"
msgstr "语言“%s”未知"
diff --git a/gettext-tools/po/zh_TW.po b/gettext-tools/po/zh_TW.po
index d32723c..fbcb31a 100644
--- a/gettext-tools/po/zh_TW.po
+++ b/gettext-tools/po/zh_TW.po
@@ -1,16 +1,18 @@
-# traditional Chinese translation for gettext.
+# Traditional Chinese translation for gettext.
# Copyright (C) 1998, 2001, 2002, 2005 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gettext package.
# Pofeng Lee <pofeng@linux.org.tw>, 2001-2002.
# Yuan-Chung Cheng <platin@ms.ccafps.khc.edu.tw>, 1998.
# Abel Cheung <abelcheung@gmail.com>, 2002, 2005.
+# Wei-Lun Chao <bluebat@member.fsf.org>, 2013.
#
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.14.5\n"
+"Project-Id-Version: gettext-tools 0.18.3\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\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"
+"POT-Creation-Date: 2014-06-01 11:19+0900\n"
+"PO-Revision-Date: 2013-09-03 13:00+0800\n"
+"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
"Language: zh_TW\n"
"MIME-Version: 1.0\n"
@@ -21,16 +23,16 @@ msgstr ""
#: gnulib-lib/argmatch.c:133
#, c-format
msgid "invalid argument %s for %s"
-msgstr "%2$s 的參數 %1$s 無效"
+msgstr "%2$s 的引數 %1$s 無效"
#: gnulib-lib/argmatch.c:134
#, c-format
msgid "ambiguous argument %s for %s"
-msgstr "%2$s 的參數 %1$s 不明確"
+msgstr "%2$s 的引數 %1$s 不明確"
#: gnulib-lib/argmatch.c:153
msgid "Valid arguments are:"
-msgstr "有效的參數為:"
+msgstr "有效的引數為:"
#: gnulib-lib/clean-temp.c:332
#, c-format
@@ -40,17 +42,17 @@ msgstr "找不到暫存檔目錄,正嘗試設定 $TMPDIR"
#: gnulib-lib/clean-temp.c:346
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
-msgstr "無法根據目錄名稱樣式 “%s” 建立暫存檔目錄"
+msgstr "無法根據目錄名稱樣式 %s 建立暫存檔目錄"
#: gnulib-lib/clean-temp.c:442
-#, fuzzy, c-format
+#, c-format
msgid "cannot remove temporary file %s"
-msgstr "無法產生輸出檔 “%s”"
+msgstr "無法刪除暫存檔 %s"
#: gnulib-lib/clean-temp.c:457
-#, fuzzy, c-format
+#, c-format
msgid "cannot remove temporary directory %s"
-msgstr "無法根據目錄名稱樣式 “%s” 建立暫存檔目錄"
+msgstr "無法刪除暫存目錄 %s"
#: gnulib-lib/closeout.c:66
msgid "write error"
@@ -63,29 +65,29 @@ 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:194
-#, fuzzy, c-format
+#, c-format
msgid "error while opening %s for reading"
-msgstr "當開啟檔案 “%s” 準備讀取時發生錯誤"
+msgstr "當開啟檔案 %s 準備讀取時發生錯誤"
#: gnulib-lib/copy-file.c:198
-#, fuzzy, c-format
+#, c-format
msgid "cannot open backup file %s for writing"
-msgstr "無法開啟備份檔 “%s” 來寫入內容"
+msgstr "無法開啟備份檔 %s 來寫入內容"
#: gnulib-lib/copy-file.c:202
-#, fuzzy, c-format
+#, c-format
msgid "error reading %s"
-msgstr "讀取 “%s” 時發生錯誤"
+msgstr "讀取 %s 時發生錯誤"
#: gnulib-lib/copy-file.c:206
-#, fuzzy, c-format
+#, c-format
msgid "error writing %s"
-msgstr "寫入 “%s” 時發生錯誤"
+msgstr "寫入 %s 時發生錯誤"
#: gnulib-lib/copy-file.c:210
-#, fuzzy, c-format
+#, c-format
msgid "error after reading %s"
-msgstr "完成讀取 “%s” 後發生錯誤"
+msgstr "完成讀取 %s 後發生錯誤"
#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
@@ -114,27 +116,27 @@ msgstr "系統出現不明錯誤"
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
-msgstr "%s 副進程發生錯誤"
+msgstr "%s 副行程發生錯誤"
#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s:選項 ‘%s’ 不明確\n"
+msgstr "%s:選項 ‘%s’ 不明確;可能選項包括:"
#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628
-#, fuzzy, c-format
+#, c-format
msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s:選項 ‘--%s’ 不可配合參數使用\n"
+msgstr "%s:選項 --%s 不可配合引數使用\n"
#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642
#, fuzzy, c-format
msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s:選項 ‘%c%s’ 不可配合參數使用\n"
+msgstr "%s:選項 ‘%c%s’ 不可配合引數使用\n"
#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704
#, fuzzy, c-format
msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s:選項 ‘%s’ 需要參數\n"
+msgstr "%s:選項 ‘%s’ 需要引數\n"
#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745
#, fuzzy, c-format
@@ -155,7 +157,7 @@ msgstr "%s:選項無效 -- %c\n"
#: gnulib-lib/getopt.c:1106
#, fuzzy, c-format
msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s:選項需要參數 -- %c\n"
+msgstr "%s:選項需要引數 -- %c\n"
#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950
#, fuzzy, c-format
@@ -165,12 +167,12 @@ msgstr "%s:選項 ‘-W %s’ 不明確\n"
#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992
#, fuzzy, c-format
msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s:選項 ‘-W %s’ 不可配合參數使用\n"
+msgstr "%s:選項 ‘-W %s’ 不可配合引數使用\n"
#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031
#, fuzzy, c-format
msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s:選項 ‘%s’ 需要參數\n"
+msgstr "%s:選項 ‘%s’ 需要引數\n"
#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
#: gnulib-lib/javacomp.c:156
@@ -183,18 +185,18 @@ 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 "無法建立 “%s”"
#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: 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 "當寫入檔案 “%s” 時發生錯誤"
+msgstr "當寫入檔案 %s 時發生錯誤"
#: gnulib-lib/javacomp.c:2343
#, c-format
@@ -210,45 +212,45 @@ msgstr "找不到 Java virtual machine,請安裝 gij 或是設定 $JAVA 環境
#: src/msginit.c:1140
#, c-format
msgid "%s subprocess I/O error"
-msgstr "%s 副進程輸出/輸入錯誤"
+msgstr "%s 副行程輸出/輸入錯誤"
-#: 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 "記憶體耗盡"
#: gnulib-lib/pipe-filter-ii.c:192
-#, fuzzy, c-format
+#, c-format
msgid "creation of threads failed"
-msgstr "編譯 C# class 檔出現錯誤,請嘗試使用 --verbose 選項"
+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 "寫入至 %s 副進程時發生錯誤"
+msgstr "寫入至 %s 副行程時發生錯誤"
#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
#, c-format
msgid "read from %s subprocess failed"
-msgstr "由 %s 副進程讀入資料時出現錯誤"
+msgstr "由 %s 副行程讀入資料時出現錯誤"
#: gnulib-lib/pipe-filter-ii.c:298
#, c-format
msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "無法和 %s 副進程建立非專用的 I/O"
+msgstr "無法和 %s 副行程建立非專用的 I/O"
#: gnulib-lib/pipe-filter-ii.c:329
#, c-format
msgid "communication with %s subprocess failed"
-msgstr "和 %s 副進程溝通時出現錯誤"
+msgstr "和 %s 副行程溝通時出現錯誤"
#: gnulib-lib/pipe-filter-ii.c:449
#, c-format
msgid "%s subprocess terminated with exit code %d"
-msgstr "%s 副進程已終止,錯誤碼為 %d"
+msgstr "%s 副行程已終止,錯誤碼為 %d"
#. TRANSLATORS:
#. Get translations for open and closing quotation marks.
@@ -304,20 +306,20 @@ msgstr "無法產生輸出檔 “%s”"
#: gnulib-lib/wait-process.c:317
#, c-format
msgid "%s subprocess"
-msgstr "%s 副進程"
+msgstr "%s 副行程"
#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
#, c-format
msgid "%s subprocess got fatal signal %d"
-msgstr "%s 副進程出現代表嚴重錯誤的訊號 %d"
+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: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 "當開啟檔案 “%s” 準備讀取時發生錯誤"
+msgstr "當開啟檔案 %s 準備讀取時發生錯誤"
#: src/format.c:151
#, fuzzy, c-format
@@ -331,7 +333,7 @@ msgstr "和 ‘msgid’ 不同,‘%s’ 的 %s 格式字串無效。原因:%
#, fuzzy, c-format
msgid ""
"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
-msgstr "‘%2$s’ 中第 %1$u 個參數的規格在 ‘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-lua.c:235
@@ -339,7 +341,7 @@ msgstr "‘%2$s’ 中第 %1$u 個參數的規格在 ‘msgid’ 中並不存在
#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
#, c-format
msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "第 %u 個參數的規格在‘%s’中並不存在"
+msgstr "第 %u 個引數的規格在‘%s’中並不存在"
#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146
#: src/format-elisp.c:379 src/format-gcc-internal.c:658
@@ -349,12 +351,12 @@ msgstr "第 %u 個參數的規格在‘%s’中並不存在"
#: 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 個參數的規格並不相同"
+msgstr "‘msgid’和‘%s’的第 %u 個引數的規格並不相同"
#: src/format-boost.c:449
#, fuzzy, 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
@@ -362,25 +364,25 @@ 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 個參數,‘<’ 之後的關鍵字不是正確的變數規格。如果想獲知正確的變數規格"
+"在第 %u 個指令,‘<’ 之後的關鍵字不是正確的變數規格。如果想獲知正確的變數規格"
"名稱,請參考 ISO C 99 規格第 7.8.1 節。"
#: src/format-c.c:39
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "在第 %u 個參數,‘<’ 之後的關鍵字後面缺少了 ‘>’。"
+msgstr "在第 %u 個指令,‘<’ 之後的關鍵字後面缺少了 ‘>’。"
#: src/format-c.c:42 src/format-gfc-internal.c:289
#, c-format
msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "字串中有提及第 %u 個參數,但忽略了第 %u 個。"
+msgstr "字串中有提及第 %u 個引數,但忽略了第 %u 個。"
#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
#: src/format-javascript.c:215 src/format-python.c:515
#: src/format-qt-plural.c:110
#, fuzzy, c-format
msgid "number of format specifications in '%s' and '%s' does not match"
-msgstr "‘msgid’ 和 ‘%s’ 的參數數目不符"
+msgstr "‘msgid’ 和 ‘%s’ 的格式規格數目不符"
#: src/format-csharp.c:88 src/format-java.c:205
#, c-format
@@ -390,7 +392,7 @@ msgstr ""
#: src/format-csharp.c:109
#, c-format
msgid "In the directive number %u, ',' is not followed by a number."
-msgstr "在第 %u 個參數,‘,’ 後面的不是數字。"
+msgstr "在第 %u 個指令,‘,’ 後面的不是數字。"
#: src/format-csharp.c:130 src/format-java.c:191
msgid ""
@@ -401,12 +403,12 @@ msgstr ""
#, c-format
msgid ""
"The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "第 %u 個參數結束的字元是 ‘%c’ 而不是 ‘}’。"
+msgstr "第 %u 個指令結束的字元是 ‘%c’ 而不是 ‘}’。"
#: src/format-csharp.c:140
#, c-format
msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "第 %u 個參數結束的不是 ‘}’,而是不合法的字元。"
+msgstr "第 %u 個指令結束的不是 ‘}’,而是不合法的字元。"
#: src/format-csharp.c:161 src/format-java.c:346
msgid ""
@@ -417,36 +419,36 @@ msgstr ""
#: src/format-csharp.c:162
#, c-format
msgid "The string contains a lone '}' after directive number %u."
-msgstr "第 %u 個參數後出現單獨的 ‘}’。"
+msgstr "第 %u 個指令後出現單獨的 ‘}’。"
#: src/format-gcc-internal.c:255
#, fuzzy, c-format
msgid "In the directive number %u, the flags combination is invalid."
-msgstr "第 %u 個參數的子字串 “%s” 是無效的數字格式。"
+msgstr "第 %u 個指令的子字串 %s 是無效的數字格式。"
#: src/format-gcc-internal.c:292
#, fuzzy, c-format
msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr "第 %u 個參數的 “%s” 後面缺少了逗號。"
+msgstr "第 %u 個指令的 %s 後面缺少了逗號。"
#: src/format-gcc-internal.c:334
#, fuzzy, c-format
msgid ""
"In the directive number %u, the argument number for the precision must be "
"equal to %u."
-msgstr "第 %u 個參數中的數字 0 不是正整數。"
+msgstr "第 %u 個指令中的數字 0 不是正整數。"
#: src/format-gcc-internal.c:398
#, fuzzy, c-format
msgid ""
"In the directive number %u, a precision specification is not allowed before "
"'%c'."
-msgstr "第 %u 個參數的 “%s” 後面缺少了逗號。"
+msgstr "在第 %u 個指令,‘<’ 之後的關鍵字後面缺少了 ‘>’。"
#: src/format-gcc-internal.c:406
#, fuzzy, c-format
msgid "In the directive number %u, the precision specification is invalid."
-msgstr "第 %u 個參數的子字串 “%s” 是無效的數字格式。"
+msgstr "第 %u 個指令的子字串 %s 是無效的數字格式。"
#: src/format-gcc-internal.c:463
#, c-format
@@ -475,19 +477,19 @@ msgstr "‘msgid’ 沒有使用 %%m 但 ‘%s’ 有使用 %%m。"
#: src/format-invalid.h:22
msgid "The string ends in the middle of a directive."
-msgstr "在參數中間,字串突然結束"
+msgstr "在指令中間,字串突然結束"
#: src/format-invalid.h:25
msgid ""
"The string refers to arguments both through absolute argument numbers and "
"through unnumbered argument specifications."
-msgstr "字串中同時出現了有硬性規定和沒有硬性規定位置的參數"
+msgstr "字串中同時出現了有硬性規定和沒有硬性規定位置的引數"
#: src/format-invalid.h:28
#, c-format
msgid ""
"In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "第 %u 個參數中的數字 0 不是正整數。"
+msgstr "第 %u 個指令中的數字 0 不是正整數。"
#: src/format-invalid.h:30
#, c-format
@@ -508,37 +510,37 @@ msgstr ""
msgid ""
"In the directive number %u, the character '%c' is not a valid conversion "
"specifier."
-msgstr "第 %u 個參數的 ‘%c’ 字元屬於無效的列印格式。"
+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 個參數的字元屬於無效的列印格式。"
+msgstr "用來結束第 %u 個指令的字元屬於無效的列印格式。"
#: src/format-invalid.h:40
#, c-format
msgid "The string refers to argument number %u in incompatible ways."
-msgstr "字串採用了不相容的方法來表示第 %u 個參數。"
+msgstr "字串採用了不相容的方法來表示第 %u 個引數。"
#: src/format-java.c:240
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid date/time "
"style."
-msgstr "第 %u 個參數的子字串 “%s” 是無效的日期/時間格式。"
+msgstr "第 %u 個指令的子字串 %s 是無效的日期/時間格式。"
#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
#, c-format
msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr "第 %u 個參數的 “%s” 後面缺少了逗號。"
+msgstr "第 %u 個指令的 %s 後面缺少了逗號。"
#: src/format-java.c:274
#, c-format
msgid ""
"In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "第 %u 個參數的子字串 “%s” 是無效的數字格式。"
+msgstr "第 %u 個指令的子字串 %s 是無效的數字格式。"
#: src/format-java.c:323
#, c-format
@@ -563,18 +565,18 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
-msgstr "‘%2$s’ 中的參數 {%1$u} 的格式在 ‘msgid’ 中並不存在"
+msgstr "‘%2$s’ 中的引數 {%1$u} 的格式在 ‘msgid’ 中並不存在"
#: src/format-java.c:756
#, c-format
msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "參數 {%u} 的規格在 ‘%s’ 中並不存在"
+msgstr "引數 {%u} 的規格在 ‘%s’ 中並不存在"
#: src/format-java.c:776
#, fuzzy, c-format
msgid ""
"format specifications in '%s' and '%s' for argument {%u} are not the same"
-msgstr "‘msgid’ 和 ‘%s’ 的參數 {%u} 規格並不相同"
+msgstr "‘msgid’ 和 ‘%s’ 的引數 {%u} 規格並不相同"
#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
#: src/format-scheme.c:2375
@@ -640,12 +642,12 @@ msgstr ""
#: src/format-lisp.c:3474 src/format-scheme.c:3397
#, fuzzy, c-format
msgid "format specifications in '%s' and '%s' are not equivalent"
-msgstr "‘msgid’ 和 ‘%s’ 的參數規格並非同等"
+msgstr "‘msgid’ 和 ‘%s’ 的格式規格並非同等"
#: src/format-lisp.c:3490 src/format-scheme.c:3413
#, fuzzy, c-format
msgid "format specifications in '%s' are not a subset of those in '%s'"
-msgstr "‘%s’ 的參數規格並非 ‘msgid’ 的參數規格的一部份"
+msgstr "‘%s’ 的格式規格並非 ‘msgid’ 的格式規格的一部份"
#: src/format-perl.c:433
#, c-format
@@ -655,11 +657,11 @@ 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'"
-msgstr "參數 ‘%s’ 的規格在 ‘%s’ 中並不存在"
+msgstr "格式 ‘%s’ 的規格在 ‘%s’ 中並不存在"
#: src/format-python.c:115
msgid ""
@@ -690,39 +692,39 @@ msgstr ""
#, fuzzy, c-format
msgid ""
"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
-msgstr "‘%2$s’ 中的參數 ‘%1$s’ 的格式在 ‘msgid’ 中並不存在"
+msgstr "‘%2$s’ 中的引數 ‘%1$s’ 的格式在 ‘msgid’ 中並不存在"
#: src/format-python.c:494
#, fuzzy, c-format
msgid ""
"format specifications in '%s' and '%s' for argument '%s' are not the same"
-msgstr "‘msgid’和‘%s’的參數‘%s’的格式並不相同"
+msgstr "‘msgid’和‘%s’的引數‘%s’的格式並不相同"
-#: src/format-python-brace.c:136
+#: src/format-python-brace.c:137
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
-msgstr "在第 %u 個參數,‘,’ 後面的不是數字。"
+msgstr "在第 %u 個指令,‘,’ 後面的不是數字。"
-#: src/format-python-brace.c:149
+#: src/format-python-brace.c:150
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
-msgstr "在第 %u 個參數,‘,’ 後面的不是數字。"
+msgstr "在第 %u 個指令,‘,’ 後面的不是數字。"
-#: src/format-python-brace.c:164
+#: src/format-python-brace.c:165
#, fuzzy, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
-msgstr "在第 %u 個參數,‘,’ 後面的不是數字。"
+msgstr "在第 %u 個指令,‘,’ 後面的不是數字。"
-#: src/format-python-brace.c:184
+#: src/format-python-brace.c:185
#, fuzzy, c-format
msgid ""
"In the directive number %u, no more nesting is allowed in a format specifier."
-msgstr "第 %u 個參數的 “%s” 後面缺少了逗號。"
+msgstr "在第 %u 個指令,‘,’ 後面的不是數字。"
-#: src/format-python-brace.c:210
+#: src/format-python-brace.c:270
#, fuzzy, c-format
msgid "In the directive number %u, there is an unterminated format directive."
-msgstr "第 %u 個參數的子字串 “%s” 是無效的數字格式。"
+msgstr "第 %u 個指令中的數字 0 不是正整數。"
#: src/format-qt.c:152
#, c-format
@@ -757,20 +759,20 @@ msgstr "字串中的 shell 變數沒有名稱。"
msgid ""
"In the directive number %u, the character '%c' is not a digit between 1 and "
"9."
-msgstr "第 %u 個參數的字元‘%c’不是 1 至 9 之間的整數。"
+msgstr "第 %u 個指令的字元‘%c’不是 1 至 9 之間的整數。"
#: src/format-ycp.c:91
#, c-format
msgid ""
"The character that terminates the directive number %u is not a digit between "
"1 and 9."
-msgstr "第 %u 個參數最後一個字元不是 1 至 9 之間的整數。"
+msgstr "第 %u 個指令最後一個字元不是 1 至 9 之間的整數。"
-#: src/hostname.c:178 src/msgattrib.c:344 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
-#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
-#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:599
+#: 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"
@@ -779,19 +781,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 "由 %s 編寫。\n"
#. 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 ""
@@ -799,13 +801,13 @@ msgstr ""
#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
-msgstr "參數過多"
+msgstr "引數過多"
-#: src/hostname.c:207 src/msgattrib.c:410 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
-#: src/msgfilter.c:384 src/msgfmt.c:650 src/msggrep.c:507 src/msginit.c:358
-#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:828
+#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
+#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
#, fuzzy, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "請執行 ‘%s --help’ 顯示額外資訊。\n"
@@ -844,29 +846,29 @@ msgstr ""
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address 主機的 IP 地址\n"
-#: src/hostname.c:228 src/msgattrib.c:525 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
-#: src/msgfilter.c:476 src/msgfmt.c:775 src/msggrep.c:623 src/msginit.c:420
-#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
+#: src/hostname.c: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 "顯示資訊:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
+#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help 顯示本訊息,然後結束\n"
-#: 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 " -V, --version 顯示版本資訊,然後結束\n"
@@ -875,11 +877,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: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 "請向 <bug-gnu-gettext@gnu.org> 匯報錯誤。\n"
@@ -888,213 +890,218 @@ msgstr "請向 <bug-gnu-gettext@gnu.org> 匯報錯誤。\n"
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 "%s 和 %s 兩者是互不相容的"
-#: src/msgattrib.c:414 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "用法:%s [選項] [輸入檔]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
"and manipulates the attributes.\n"
msgstr "根據訊息的屬性過濾翻譯檔裡的條目,並處理這些屬性。\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
+#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msguniq.c:342
#, c-format
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "長選項必須用的參數在使用短選項時也是必須的。\n"
+msgstr "長選項必須用的引數在使用短選項時也是必須的。\n"
-#: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
-#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
-#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
-#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
+#: src/msgattrib.c:433 src/msgcat.c: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 "輸入檔位置:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " INPUTFILE 用作輸入的 PO 檔\n"
-#: 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 " -D, --directory=目錄 搜尋輸入檔時加入指定<目錄>\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr "如果沒有指定輸入檔或輸入檔是 ‘-’,則由標準輸入讀取內容。\n"
-#: 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 "輸出檔位置:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c: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 " -o, --output-file=檔案 將輸出的內容寫入指定<檔案>\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c: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 "如果沒有指定<輸出檔>或<輸出檔>是 ‘-’,則會在標準輸出顯示結果。\n"
-#: 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 "篩選訊息:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid ""
" --translated keep translated, remove untranslated messages\n"
msgstr " --translated 只保留已翻譯條目,刪除未翻譯條目\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid ""
" --untranslated keep untranslated, remove translated messages\n"
msgstr " --untranslated 只保留未翻譯條目,刪除已翻譯條目\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr " --no-fuzzy 刪除加上 'fuzzy' 標記的條目\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr " --only-fuzzy 只保留加上 'fuzzy' 標記的條目\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete 刪除過時的條目 (#~)\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete 只保留過時的條目 (#~) \n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "處理屬性:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr " --set-fuzzy 將所有條目標記為 'fuzzy'\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr " --clear-fuzzy 移除所有條目的 'fuzzy' 狀態\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr " --set-obsolete 將所有條目標記為過時\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr " --clear-obsolete 清除所有條目的過時標記\n"
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, fuzzy, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
" of translated messages.\n"
-msgstr " --translated 只保留已翻譯條目,刪除未翻譯條目\n"
+msgstr ""
+" -u, --unique 等於 --less-than=2,表示只顯示\n"
+" 只有一種翻譯的字句\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, fuzzy, c-format
msgid ""
" --clear-previous remove the \"previous msgid\" from all "
"messages\n"
msgstr " --clear-fuzzy 移除所有條目的 'fuzzy' 狀態\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, fuzzy, c-format
+msgid ""
+" --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr " --no-fuzzy 刪除加上 'fuzzy' 標記的條目\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid ""
" --only-file=FILE.po manipulate only entries listed in FILE.po\n"
msgstr " --only-file=FILE.po 只處理 FILE.po 裡已經有的條目\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid ""
" --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
msgstr " --ignore-file=FILE.po 只處理 FILE.po 裡沒有的條目\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr " --fuzzy 等於 --only-fuzzy --clear-fuzzy\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid ""
" --obsolete synonym for --only-obsolete --clear-obsolete\n"
msgstr " --obsolete 等於 --only-obsolete --clear-obsolete\n"
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c: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 "輸入檔格式:\n"
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
#, c-format
msgid ""
" -P, --properties-input input file is in Java .properties syntax\n"
msgstr " -P, --properties-input 以 Java .properties 格式處理輸入檔\n"
-#: 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 "
@@ -1102,17 +1109,17 @@ msgid ""
msgstr ""
" --stringtable-input 以 NeXTstep/GNUstep .strings 格式處理輸入檔\n"
-#: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
-#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
-#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
-#: src/xgettext.c:946
+#: src/msgattrib.c:498 src/msgcat.c: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 "輸出內容細節:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c: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"
@@ -1121,16 +1128,16 @@ 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"
@@ -1138,9 +1145,9 @@ msgstr ""
" -e, --no-escape 輸出結果不使用 C 轉義控制序列\n"
" (escape sequence),這是預設運作方式\n"
-#: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
-#: src/msguniq.c:390 src/xgettext.c:956
+#: src/msgattrib.c:508 src/msgcat.c: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"
@@ -1149,66 +1156,66 @@ msgstr ""
"sequence)\n"
" ,而不使用非 ASCII 字元\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
msgstr " --force-po 就算沒有內容仍產生 PO 檔\n"
-#: 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 " -i, --indent 寫入的 .po 檔內容會進行縮排\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr " --no-location 不加入類似 '#: 檔案:行號' 的源代碼位置\n"
-#: 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 ""
" -n, --add-location 會加入 '#: 檔案:行號' 格式的源代碼位置 (預設)\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
+#: src/xgettext.c:989
#, c-format
msgid ""
" --strict write out strict Uniforum conforming .po file\n"
msgstr ""
" --strict 產生的 .po 檔內容跟隨嚴格的 Uniforum 格式\n"
-#: 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 " -p, --properties-output 產生 Java .properties 檔案\n"
-#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
-#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
+#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid ""
" --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr " --stringtable-output 產生 NeXTstep/GNUstep .strings 檔案\n"
-#: 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 " -w, --width=NUMBER 指定輸出檔每行寬度\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c: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"
@@ -1216,31 +1223,31 @@ msgid ""
msgstr ""
" --no-wrap 即使輸出的訊息超出頁寬,也不將輸出的訊息斷行\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c: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 " -s, --sort-output 將輸出結果排序\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c: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 " -F, --sort-by-file 根據檔案位置排列輸出結果\n"
-#: 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 "不可能出現的選擇條件 (%d < n <%d)"
-#: 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 "用法:%s [選項] [輸入檔]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, fuzzy, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1261,23 +1268,23 @@ msgstr ""
"--use-first 選項,那樣則會由第一個含有該翻譯條目的檔案取得資料。\n"
"所有 PO 檔中的翻譯條目的檔案位置都會累積下來。\n"
-#: 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 " INPUTFILE ... 輸入檔\n"
-#: 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 " -f, --files-from=FILE 由 FILE 讀取所有輸入檔的位置\n"
-#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:854
+#: src/msgcat.c: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 "如果輸入檔是 - 的話,會由標準輸入讀取資料。\n"
-#: 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"
@@ -1286,7 +1293,7 @@ msgstr ""
" -<, --less-than=NUMBER 當一項條目的不同翻譯少於多少種就會顯示,\n"
" 預設為無限 (即顯示所有條目)\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1295,7 +1302,7 @@ msgstr ""
" ->, --more-than=NUMBER 當一項條目的不同翻譯多於多少種才會顯示,\n"
" 預設為 0 種 (即顯示所有條目)\n"
-#: 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"
@@ -1304,15 +1311,15 @@ msgstr ""
" -u, --unique 等於 --less-than=2,表示只顯示\n"
" 只有一種翻譯的字句\n"
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:739
-#: src/msgmerge.c:557
+#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
+#: src/msgmerge.c:562
#, c-format
msgid ""
" -P, --properties-input input files are in Java .properties syntax\n"
msgstr " -P, --properties-input 輸入檔格式為 Java .properties 格式\n"
-#: 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"
@@ -1320,12 +1327,12 @@ msgid ""
msgstr ""
" --stringtable-input 輸入檔格式為 NeXTstep/GNUstep .strings 格式\n"
-#: 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 " -t, --to-code=名稱 輸出的編碼\n"
-#: 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"
@@ -1334,28 +1341,28 @@ msgstr ""
" --use-first 每句只使用第一個出現的翻譯,而不會將所有\n"
" 翻譯合併起來\n"
-#: 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 "用法:%s [選項] def.po ref.pot\n"
@@ -1386,12 +1393,12 @@ msgstr " def.po 翻譯檔\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot 未翻譯檔案\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:551
#, c-format
msgid "Operation modifiers:\n"
msgstr "運作模式有關選項:\n"
-#: 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."
@@ -1399,7 +1406,7 @@ msgid ""
msgstr ""
" -m, --multi-domain 將 ref.pot 套用於 def.po 中的每一個領域\n"
-#: 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 " -N, --no-fuzzy-matching 不進行模糊字串配對\n"
@@ -1424,17 +1431,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 "這個訊息有使用過但在 %s 中沒有定義"
@@ -1444,18 +1451,18 @@ msgstr "這個訊息有使用過但在 %s 中沒有定義"
msgid "warning: this message is not used"
msgstr "警告:沒有使用這個訊息"
-#: src/msgcmp.c:553 src/msgfmt.c:545
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1437
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
msgstr[0] "找到 %d 個嚴重錯誤"
-#: 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
#, fuzzy, c-format, no-wrap
msgid ""
"Find messages which are common to two or more of the specified PO files.\n"
@@ -1473,7 +1480,7 @@ msgstr ""
"訊息)。翻譯內容、自行加上的註解和原程式碼的註解都會保留,但只會由第一個\n"
"含有該翻譯條目的檔案取得。所有 PO 檔中的翻譯條目的檔案位置都會累積下來。\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1481,67 +1488,67 @@ msgid ""
msgstr ""
" ->, --more-than=NUMBER 顯示出現多於指定次數的字句,預設為 1 次\n"
-#: src/msgcomm.c:451 src/xgettext.c:981
+#: src/msgcomm.c:452 src/xgettext.c:1004
#, fuzzy, c-format
msgid ""
" --omit-header don't write header with 'msgid \"\"' entry\n"
msgstr " --omit-header 不顯示標頭 (即 ‘msgid \"\"’ 項目)\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr "將一個翻譯檔的編碼轉換為另一種文字編碼。\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "轉換目標:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "預設的編碼為目前語言的編碼。\n"
-#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent 將輸出結果進行縮排\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:586
#, c-format
msgid " --no-location suppress '#: filename:line' lines\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
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
+#: src/msgmerge.c:588
+#, fuzzy, c-format
msgid ""
-" --add-location preserve '#: filename:line' lines (default)\n"
+" -n, --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
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:590
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict 嚴格遵從 Uniforum 格式\n"
-#: 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 "用法:%s [選項] 輸入檔\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1552,7 +1559,7 @@ msgstr ""
"產生英文翻譯檔。輸入檔可以是 PO 檔或 POT 檔 (通常由 xgettext 產生)。\n"
"未翻譯的條目會填上和 msgid 一樣的字串。\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " 輸入檔 作為輸入的 PO 或 POT 檔\n"
@@ -1591,7 +1598,7 @@ msgstr ""
"有一個稱為 '0' 的特殊內置指令,它會輸出所有翻譯條目,並隨後加上 null 位元。\n"
"“msgexec 0” 的輸出適用於作為 “xargs -0” 的輸入。\n"
-#: 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 " -i, --input=INPUTFILE 作為輸入的 PO 檔\n"
@@ -1601,27 +1608,27 @@ msgstr " -i, --input=INPUTFILE 作為輸入的 PO 檔\n"
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 "必須指定至少一個 sed script"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "用法:%s [選項] 過濾器 [過濾器選項]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "對於翻譯檔中的所有翻譯條目進行過濾。\n"
-#: 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"
@@ -1630,18 +1637,18 @@ msgstr ""
"<過濾器>可以是任何由標準輸入讀入翻譯條目\n"
"並將修改後的翻譯寫進標準輸出的程式。\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "當<過濾器>是 ‘sed’ 時一些比較有用的選項:\n"
-#: 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 "
@@ -1649,13 +1656,13 @@ 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 " -n, --quiet, --silent 不會自動顯示過濾後的結果\n"
-#: 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"
@@ -1663,106 +1670,127 @@ msgstr ""
" --no-escape 輸出結果不使用 C 轉義控制序列\n"
" (escape sequence),這是預設運作方式\n"
-#: 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 " --indent 將輸出結果進行縮排\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid ""
" --keep-header keep header entry unmodified, don't filter it\n"
msgstr " --keep-header 保護標頭內容,過濾內容時不會被更改\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
-msgstr "%s 的參數應該是一個標點符號"
+msgstr "%s 的引數應該是一個標點符號"
-#: 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
+#, fuzzy, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr "如果沒有指定輸入檔或輸入檔是 ‘-’,則由標準輸入讀取內容。\n"
+
+#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
#: src/msgunfmt.c:353
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s 需要指定 “-d 目錄” 選項"
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c: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 "%s 需要指定 “-l locale” 選項"
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:538
+#, fuzzy, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s 需要指定 “-l locale” 選項"
+
+#: src/msgfmt.c:545
+#, fuzzy, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s 需要指定 “-l locale” 選項"
+
+#: src/msgfmt.c:551
+#, fuzzy, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s 和 %s 兩者是互不相容的"
+
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s 只能配合 %s 或 %s 一起使用才有效"
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:571 src/msgfmt.c:577
#, c-format
msgid "%s is only valid with %s, %s or %s"
msgstr "%s 只能配合 %s、%s 或 %s 一起使用才有效"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c: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] "已翻譯 %d 個條目"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
msgstr[0] ",有 %d 個條目標記為模糊翻譯"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
msgstr[0] ",還有 %d 個條目未翻譯"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "用法:%s [選項] filename.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "由文字模式翻譯檔產生二元碼翻譯檔。\n"
-#: 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 "長選項必要的參數在使用短選項時也是必要的。對於選擇性的參數也一樣。\n"
+msgstr "長選項必要的引數在使用短選項時也是必要的。對於選擇性的引數也一樣。\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
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:890
+#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "操作模式:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid ""
" -j, --java Java mode: generate a Java ResourceBundle "
@@ -1770,7 +1798,7 @@ msgid ""
msgstr ""
" -j, --java Java 模式:產生 Java ResourceBundle class\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid ""
" --java2 like --java, and assume Java2 (JDK 1.2 or "
@@ -1779,12 +1807,12 @@ msgstr ""
" --java2 類似 --java,假設格式為 Java2 (JDK 1.2 或以"
"上)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr " --csharp C# 模式,會產生 .NET .dll 檔\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid ""
" --csharp-resources C# resources mode: generate a .NET .resources "
@@ -1793,39 +1821,45 @@ msgstr ""
" --csharp-resources C# resources 模式,會產生 .NET .resources 檔"
"案\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid ""
" --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr " --tcl Tcl 模式:產生 tcl/msgcat .msg 檔\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt Qt 模式:產生 Qt .qm 檔\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, fuzzy, c-format
+msgid ""
+" --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr " --qt Qt 模式:產生 Qt .qm 檔\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict 強制使用 Uniforum 格式翻譯檔\n"
-#: 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 "如果輸出檔是 - 的話,則會在標準輸出顯示結果。\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Java 模式的輸出檔位置:\n"
-#: src/msgfmt.c:703 src/msgfmt.c:717 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr " -r, --resource=RESOURCE resource 名稱\n"
-#: src/msgfmt.c: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 "
@@ -1834,13 +1868,21 @@ msgstr ""
" -l, --locale=LOCALE 指定語言,可以用語言名稱或者 xy_XY 格式的\n"
" 語言代號\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, fuzzy, c-format
+msgid ""
+" --source produce a .java file, instead of a .class "
+"file\n"
+msgstr ""
+" --tcl Tcl 模式:輸入資料是 tcl/msgcat .msg 檔\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid ""
" -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr " -d 目錄 class 目錄層的基本目錄\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource "
@@ -1851,48 +1893,80 @@ msgstr ""
"class 名稱是由語言名稱和 resource 名稱合併來決定的,兩者之間會用底線分隔。\n"
"-d 選項是必須的。class 檔會存放在指定的目錄。\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "C# 模式的輸出檔位置:\n"
-#: 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 "Tcl 模式的輸出檔位置:\n"
-#: 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
+#, fuzzy, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr " -d 目錄 class 目錄層的基本目錄\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, fuzzy, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -k, --keyword[=WORD] 要留意的額外關鍵字 (如果沒有指定,\n"
+" 表示不使用預設的關鍵字)\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, "
+"input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "輸入檔處理:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1903,19 +1977,19 @@ msgstr ""
" --check-format, --check-header, --check-"
"domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr " --check-format 檢查各種程式語言的格式字串\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid ""
" --check-header verify presence and contents of the header "
"entry\n"
msgstr " --check-header 確保標頭欄位存在和內容正確\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -1924,7 +1998,7 @@ msgstr ""
" --check-domain 檢查 domain 關鍵字和 --output-file 選項之間\n"
" 有沒有衝突\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid ""
" -C, --check-compatibility check that GNU msgfmt behaves like X/Open "
@@ -1933,7 +2007,7 @@ msgstr ""
" -C, --check-compatibility 確保 GNU msgfmt 運作的方式和 X/Open msgfmt 兼"
"容\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators "
@@ -1941,19 +2015,19 @@ msgid ""
" menu items\n"
msgstr " --check-accelerators[=CHAR] 檢查選單項目中代表捷徑鍵的字元\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr " -f, --use-fuzzy 在輸出結果中顯示模糊翻譯\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid ""
" -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr ""
" -a, --alignment=數字 以<數字>個位元組為單位配置字串位置(預設:%d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte "
@@ -1962,100 +2036,110 @@ 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 ""
" --no-hash 二元碼檔不會包含雜湊表 (hash table) 在內\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics 顯示有關翻譯訊息的統計\n"
-#: src/msgfmt.c:783 src/msgmerge.c:607 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose 顯示詳細資訊\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "警告:缺少了 PO 檔的標頭或是格式無效\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "警告:字元集轉換的功能不會生效\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "警告:PO 檔的標頭仍然是模糊狀態\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "警告:較舊版本的 msgfmt 遇到此檔案時會印出錯誤訊息\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
-msgstr "領域名稱 “%s” 不適合作為檔案名稱"
+msgstr "領域名稱 %s 不適合作為檔案名稱"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
-msgstr "領域名稱 “%s” 不適合作為檔案名稱:將使用字首"
+msgstr "領域名稱 %s 不適合作為檔案名稱:將使用字首"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, fuzzy, c-format
msgid "'domain %s' directive ignored"
msgstr "忽略‘domain %s’指令"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, fuzzy, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "忽略空的‘msgstr’欄位"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, fuzzy, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "忽略模糊的‘msgstr’欄位"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s:警告:原始檔包含模糊翻譯條目"
+#: src/msgfmt.c:1318
+#, c-format
+msgid "%s does not exist"
+msgstr ""
+
+#: src/msgfmt.c:1328
+#, c-format
+msgid "%s exists but cannot read"
+msgstr ""
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c: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 "讀取 “%s” 時出現錯誤"
+msgstr "讀取 %s 時出現錯誤"
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, fuzzy, c-format
msgid ""
"option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
"specified"
msgstr "未指定 ‘K’、‘T’ 或 ‘C’ 選項前不能使用選項 ‘%c’"
-#: src/msggrep.c:516
+#: src/msggrep.c:521
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
"or belong to some given source files.\n"
msgstr "抽取翻譯檔中的訊息,而這些訊息符合某種樣式或屬於某個指定的來源檔。\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, fuzzy, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2124,7 +2208,7 @@ msgstr ""
" -f, --file=FILE PATTERN 採用 FILE 的內容 \n"
" -i, --ignore-case 不區分大小寫\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid ""
" --escape use C escapes in output, no extended chars\n"
@@ -2133,12 +2217,12 @@ msgstr ""
"sequence)\n"
" ,而不使用非 ASCII 字元\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output 將訊息排序\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file 根據檔案位置排序\n"
@@ -2241,7 +2325,7 @@ msgstr ""
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
-msgstr "%s 副進程失敗,錯誤碼為 %d"
+msgstr "%s 副行程失敗,錯誤碼為 %d"
#: src/msginit.c:1118
msgid ""
@@ -2260,17 +2344,17 @@ msgstr ""
#: src/msginit.c:1534
#, c-format
msgid "English translations for %s package"
-msgstr "Traditional Chinese translation for %s"
+msgstr "%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 "目前的字元集編碼 “%s” 不是通用的編碼名稱"
+msgstr "目前的字元集編碼 %s 不是通用的編碼名稱"
#: src/msgl-cat.c:188 src/msgl-iconv.c:259
#, c-format
msgid "two different charsets \"%s\" and \"%s\" in input file"
-msgstr "輸入檔有兩種不同的字元集編碼 “%s” 和 “%s”"
+msgstr "輸入檔有兩種不同的字元集編碼 %s 和 “%s”"
#: src/msgl-cat.c:203
#, fuzzy, c-format
@@ -2288,11 +2372,11 @@ msgstr "輸入檔 ‘%2$s’ 的 domain “%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
-#: src/xgettext.c:3051
+#: src/xgettext.c:544 src/xgettext.c:3418
#, c-format
msgid "warning: "
msgstr "警告:"
@@ -2373,7 +2457,7 @@ msgid ""
"Output of '%s' might be incorrect.\n"
"A possible workaround is to set LC_ALL=C.\n"
msgstr ""
-"語言的字元集編碼 “%s” 不是通用的編碼名稱。\n"
+"語言的字元集編碼 %s 不是通用的編碼名稱。\n"
"‘%s’ 的輸出可能有誤。\n"
"設定 LC_ALL=C 是一個可行的解決方法。\n"
@@ -2492,17 +2576,17 @@ msgstr "複數處理是 GNU gettext 的擴展功能"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr 缺少了捷徑鍵標記‘%c’"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr 含有過多的捷徑鍵標記‘%c’"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:804
#, fuzzy, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "某些標頭欄位仍然是預設值\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:820
#, fuzzy, c-format
msgid "header field '%s' missing in header\n"
msgstr "缺少了標頭欄位‘%s’\n"
@@ -2516,21 +2600,21 @@ msgstr ""
#: src/msgl-iconv.c:69
#, fuzzy, c-format
msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "當開啟檔案 “%s” 準備讀取時發生錯誤"
+msgstr "當開啟檔案 %s 準備讀取時發生錯誤"
#: src/msgl-iconv.c:290
msgid "input file doesn't contain a header entry with a charset specification"
msgstr "輸入檔沒有指定字元集的標頭欄位"
#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c: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 "
"not support this conversion."
msgstr ""
-"不支援將字元集由 “%s” 轉換至 “%s”。%s 需要 iconv(),但 iconv() 不支援此種轉換"
-"方式。"
+"不支援將字元集由 %s 轉換至 “%s”。%s 需要 iconv(),但 iconv() 不支援此種轉換方"
+"式。"
#: src/msgl-iconv.c:335
#, c-format
@@ -2538,28 +2622,28 @@ msgid ""
"Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
"msgids become equal."
msgstr ""
-"由 “%s” 轉換至 “%s” 會產生重複訊息:有些本來不同的 msgid 轉換後會變成相同。"
+"由 %s 轉換至 %s 會產生重複訊息:有些本來不同的 msgid 轉換後會變成相同。"
#: 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 ""
-"不支援將字元集由 “%s” 轉換至 “%s”。%s 需要 iconv(),但編譯此程式時沒有 "
-"iconv() 支援。"
+"不支援將字元集由 %s 轉換至 “%s”。%s 需要 iconv(),但編譯此程式時沒有 iconv() "
+"支援。"
-#: 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 "%s 只能和 %s 配合一起使用才有效"
-#: 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"
@@ -2579,51 +2663,51 @@ msgstr ""
"的註解都會被捨棄,但特殊旗標註解和檔案位置都會被保留。比較時如果有不完全\n"
"配合的字串出現,程式會以模糊配對的方式得出較好的結果。\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:507
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po 舊版本的翻譯檔\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:509
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot 新版本程式的翻譯檔\n"
-#: 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 " -C, --compendium=FILE 額外的翻譯記憶庫,選項可以使用多次\n"
-#: 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 " -U, --update 更新 def.po (僅當 def.po 未更新時)\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:531
#, c-format
msgid "Output file location in update mode:\n"
msgstr "更新模式的檔案輸出位置:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:533
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "輸出結果會寫入至 def.po。\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:535
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTROL 將 def.po 備份\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:537
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=SUFFIX 自行指定備份檔名末端的字串\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:539
#, c-format
msgid ""
"The version control method may be selected via the --backup option or "
@@ -2641,7 +2725,7 @@ msgstr ""
" existing, nil 若有數字的備份檔已經存在則使用數字,否則使用一般名稱\n"
" simple, never 永遠使用普通方式備份\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:546
#, fuzzy, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the "
@@ -2651,28 +2735,28 @@ msgstr ""
"備份檔的後置字元為‘~’,除非以 --suffix 選項或是 SIMPLE_BACKUP_SUFFIX\n"
"環境變數指定。\n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:557
#, fuzzy, c-format
msgid ""
" --previous keep previous msgids of translated messages\n"
msgstr " --translated 只保留已翻譯條目,刪除未翻譯條目\n"
-#: 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 " -q, --quiet, --silent 隱藏進度指示\n"
-#: 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, "
@@ -2682,7 +2766,7 @@ msgstr ""
"讀入 %ld 舊翻譯 + %ld 參考條目。合併:%ld,模糊:%ld,未譯:%ld,過時:"
"%ld。\n"
-#: 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"
@@ -2786,7 +2870,7 @@ msgstr " -i, --indent 將輸出結果進行縮排\n"
msgid " --strict write strict uniforum style\n"
msgstr " --strict 輸出結果嚴格遵從 Uniforum 格式\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -2806,12 +2890,12 @@ msgstr ""
"則會由第一個翻譯條目中讀取這些資料。檔案位置是會累積下來的。\n"
"當使用 --unique 選項時,則會捨棄任何重複的翻譯條目。\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated 只顯示重複條目\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid ""
" -u, --unique print only unique messages, discard "
@@ -2878,27 +2962,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "不一致地使用 #~"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, fuzzy, c-format
msgid "missing 'msgstr[]' section"
msgstr "缺少了 ‘msgstr[]’ 段落"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, fuzzy, c-format
msgid "missing 'msgid_plural' section"
msgstr "缺少了 ‘msgid_plural’ 段落"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, fuzzy, c-format
msgid "missing 'msgstr' section"
msgstr "缺少了 ‘msgstr’ 段落"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "第一個複數格式的索引數字不是 0"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "複數格式含有錯誤的索引數字"
@@ -2908,7 +2992,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 "無效的位元組序列"
@@ -2952,16 +3036,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 "此檔案不能含有 domain 指令"
-#: 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
#, fuzzy
msgid "this is the location of the first definition"
msgstr "...這是第一次定義的位置"
@@ -2969,22 +3053,22 @@ msgstr "...這是第一次定義的位置"
#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
#, c-format
msgid "file \"%s\" is truncated"
-msgstr "檔案 “%s” 被截斷了"
+msgstr "檔案 %s 被截斷了"
#: src/read-mo.c:129
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
-msgstr "檔案 “%s” 包含並非以 NUL 為結尾的字串"
+msgstr "檔案 %s 包含並非以 NUL 為結尾的字串"
#: src/read-mo.c:165 src/read-mo.c:274
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
-msgstr "檔案 “%s” 並非 GNU .mo 格式檔案"
+msgstr "檔案 %s 並非 GNU .mo 格式檔案"
#: src/read-mo.c:178
#, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr "檔案 “%s” 在 %s 包含並非以 NUL 為結尾的字串"
+msgstr "檔案 %s 在 %s 包含並非以 NUL 為結尾的字串"
#: src/read-properties.c:227
#, fuzzy
@@ -3050,12 +3134,12 @@ msgstr ""
#: src/recode-sr-latin.c:367
#, fuzzy, c-format
msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "當開啟檔案 “%s” 準備讀取時發生錯誤"
+msgstr "當開啟檔案 %s 準備讀取時發生錯誤"
#: src/urlget.c:159
#, c-format
msgid "expected two arguments"
-msgstr "需要恰好兩個參數"
+msgstr "需要恰好兩個引數"
#: src/urlget.c:176
#, c-format
@@ -3072,7 +3156,7 @@ msgstr "擷取並輸出某網址的內容。如果無法存取該網址,則改
#: src/urlget.c:228
#, c-format
msgid "error reading \"%s\""
-msgstr "讀取 “%s” 時發生錯誤"
+msgstr "讀取 %s 時發生錯誤"
#: src/urlget.c:234
#, c-format
@@ -3082,7 +3166,7 @@ msgstr "寫入至標準輸出時發生錯誤"
#: src/urlget.c:238
#, c-format
msgid "error after reading \"%s\""
-msgstr "完成讀取 “%s” 後發生錯誤"
+msgstr "完成讀取 %s 後發生錯誤"
#: src/urlget.c:264
#, c-format
@@ -3150,7 +3234,7 @@ msgstr "標準輸出"
#: src/write-csharp.c:703
#, c-format
msgid "failed to create directory \"%s\""
-msgstr "無法建立 “%s” 目錄"
+msgstr "無法建立 %s 目錄"
#: src/write-csharp.c:766
#, c-format
@@ -3162,18 +3246,18 @@ msgstr "編譯 C# class 檔出現錯誤,請嘗試使用 --verbose 選項"
msgid "compilation of C# class failed"
msgstr "編譯 C# class 檔出現錯誤,請嘗試使用 --verbose 選項"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "並非有效的 Java class 名稱:%s"
-#: 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 ""
"編譯 Java class 檔出現錯誤,請嘗試使用 --verbose 選項或設定 $JAVAC 環境變數"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, fuzzy, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr ""
@@ -3182,15 +3266,15 @@ msgstr ""
#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
#, c-format
msgid "error while opening \"%s\" for writing"
-msgstr "當開啟檔案 “%s” 來寫入內容時發生錯誤"
+msgstr "當開啟檔案 %s 來寫入內容時發生錯誤"
-#: src/write-po.c:803
+#: src/write-po.c:875
#, fuzzy, c-format
msgid ""
"internationalized messages should not contain the '\\%c' escape sequence"
msgstr "國際化的訊息不應含有 ‘\\%c’ 這個轉義控制序列 (escape sequence)"
-#: src/write-po.c:1254 src/write-po.c:1383
+#: src/write-po.c:1326 src/write-po.c:1450
#, fuzzy, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3203,7 +3287,7 @@ msgstr ""
"請考慮使用只有 ASCII 字元的 msgid。\n"
"%s\n"
-#: 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"
@@ -3245,7 +3329,7 @@ msgstr ""
#: src/write-resources.c:94
#, c-format
msgid "error while writing to %s subprocess"
-msgstr "將內容寫入至 %s 副進程時發生錯誤"
+msgstr "將內容寫入至 %s 副行程時發生錯誤"
#: src/write-resources.c:131
#, fuzzy
@@ -3273,7 +3357,7 @@ msgid ""
"but the Tcl message catalog format doesn't support plural handling\n"
msgstr "翻譯檔含有複數型態的翻譯,但 Tcl 的翻譯檔不能處理複數型態\n"
-#: src/x-awk.c:341 src/x-javascript.c: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 "%s:%d: 警告:字串未完結"
@@ -3283,17 +3367,22 @@ 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-vala.c:762
+#: src/x-c.c:1051
+#, fuzzy, c-format
+msgid "warning: invalid Unicode character"
+msgstr "%s:%d: 警告:Unicode 字元無效"
+
+#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: 警告:字元常數未完結"
-#: 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 "%s:%d: 警告:字串未完結"
-#: src/x-csharp.c:224 src/xgettext.c:2055
+#: src/x-csharp.c:224 src/xgettext.c:2106
#, fuzzy
msgid "Please specify the source encoding through --from-code."
msgstr ""
@@ -3350,7 +3439,7 @@ msgstr ""
"%s:%d: 出現無效的位元組序列。\n"
"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
-#: 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 "%s:%d: 警告:Unicode 字元無效"
@@ -3370,22 +3459,22 @@ msgstr "%s:%d: 應該有 ‘)’ 的地方出現了 ‘}’"
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: 應該有 ‘}’ 的地方出現了 ‘)’"
-#: 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
#, fuzzy, c-format
msgid "%s:%lu:%lu: %s"
msgstr "%s:%d:%d: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3451,11 +3540,21 @@ msgstr ""
"%s:%d: 出現無效的位元組序列。\n"
"請使用 --from-code 選項指定源代碼的正確文字編碼。\n"
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, fuzzy, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: 警告:字串未完結"
+#: src/x-javascript.c:1055
+#, fuzzy, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: 警告:Unicode 字元無效"
+
+#: src/x-javascript.c:1069
+#, fuzzy, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: 警告:字串未完結"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3492,13 +3591,10 @@ msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
msgstr "%s:%d: 8bit 字元 “%c” 的轉換 (“\\U”) 無效"
#: 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 ""
-"%s%s 出現不屬於 ASCII 字元的字串。\n"
-"請使用 --from-code 選項指定源代碼的文字編碼。\n"
#: src/x-python.c:324
#, fuzzy, c-format
@@ -3578,32 +3674,37 @@ msgid ""
msgstr ""
"%s:%lu: 警告:$\"...\" 這種格式因為安全理由已經過時;請改用 eval_gettext"
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, fuzzy, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: 警告:字串未完結"
-#: 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 "當結果被導向至標準輸出時,不可以用 --join-existing 選項"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "若無關鍵字,xgettext 將無法運作"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, fuzzy, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr "警告:無法辨認檔案 ‘%s’ 的副檔名 ‘%s’;會假設是 C 格式來處理"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "由指定的輸入檔抽取可翻譯的字串。\n"
-#: src/xgettext.c:859
+#: src/xgettext.c:882
#, c-format
msgid ""
" -d, --default-domain=NAME use NAME.po for output (instead of messages."
@@ -3611,23 +3712,23 @@ msgid ""
msgstr ""
" -d, --default-domain=NAME 使用 NAME.po 作為輸出檔 (而不是 messages.po)\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr " -o, --output=FILE 將輸出內容寫入至指定檔案\n"
-#: 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 " -p, --output-dir=DIR 輸出檔會存取在指定目錄\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "輸入檔的語言選擇:\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, fuzzy, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3637,7 +3738,7 @@ msgid ""
" JavaProperties, C#, awk, YCP, Tcl, Perl, "
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=語言 辨認指定的程式語言\n"
" (C, C++, ObjectiveC, PO, Shell, Python, "
@@ -3647,19 +3748,19 @@ msgstr ""
"PHP,\n"
" GCC-source, NXStringTable, RST, Glade)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
msgstr " -C, --c++ --language=C++ 的簡寫\n"
-#: 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 "預設的語言是由輸入檔的延伸檔名決定的。\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
@@ -3668,22 +3769,22 @@ msgstr ""
" --from-code=NAME 輸入檔的文字編碼\n"
" (Python, Tcl, Glade 例外)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr "輸入檔內容預設會當作 ASCII 看待。\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
msgstr " -j, --join-existing 合併已存在的訊息檔\n"
-#: 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 " -x, --exclude-file=FILE.po 不取出屬於 FILE.po 的訊息\n"
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -3693,17 +3794,17 @@ msgid ""
" in output file\n"
msgstr ""
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "個別語言特殊選項:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
msgstr " -a, --extract-all 抽取所有字串\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3717,16 +3818,21 @@ msgstr ""
"Java,\n"
" C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
-#: src/xgettext.c:911
+#: src/xgettext.c:937
#, fuzzy, 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 ""
-" -k, --keyword[=WORD] 要留意的額外關鍵字 (如果沒有指定,\n"
-" 表示不使用預設的關鍵字)\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:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the "
@@ -3734,7 +3840,7 @@ msgid ""
" number ARG of keyword WORD\n"
msgstr ""
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, fuzzy, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3748,53 +3854,53 @@ msgstr ""
"Java,\n"
" C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr " -T, --trigraphs 支援讀取輸入內容中的 ANSI C trigraph\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr " (只適用於 C, C++, ObjectiveC)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt 辨認 Qt 格式的字串\n"
-#: 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 " (只適用於 C++)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, fuzzy, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --qt 辨認 Qt 格式的字串\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, fuzzy, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --qt 辨認 Qt 格式的字串\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid ""
" --debug more detailed formatstring recognition result\n"
msgstr " --debug 顯示較詳細的格式字串辨認結果\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output 輸出檔格式為 Java .properties 檔\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr " --copyright-holder=STRING 設定輸出檔的版權所有者\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid ""
" --foreign-user omit FSF copyright in output for foreign user\n"
@@ -3802,24 +3908,24 @@ msgstr ""
" --foreign-user 輸出檔不加上 FSF 的版權宣告,適用於 FSF 以外的"
"專案\n"
-#: 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
#, fuzzy, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr " --copyright-holder=STRING 設定輸出檔的版權所有者\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid ""
" --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
" --msgid-bugs-address=EMAIL@ADDRESS 指定匯報 msgid 問題時的郵件地址\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for "
@@ -3827,7 +3933,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 "
@@ -3835,52 +3941,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 "%s%s: 警告:"
-#: 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 "縱使表面上 %s 宣告了是 %s 格式字串,但實際上不是。原因為:%s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3889,7 +3995,7 @@ 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"
@@ -3899,27 +4005,27 @@ msgstr ""
"gettext(\"\") 會回傳檔案開始部份的資訊,\n"
"並非空白字串。\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, fuzzy, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "%2$s 的參數 %1$s 不明確"
+msgstr "%2$s 的引數 %1$s 不明確"
-#: 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
#, fuzzy
msgid ""
"The option --msgid-bugs-address was not specified.\n"
@@ -3932,7 +4038,7 @@ msgstr ""
"MSGID_BUGS_ADDRESS 變數;否則請在指令中\n"
"使用 --msgid-bugs-address 選項。\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, fuzzy, c-format
msgid "language '%s' unknown"
msgstr "不明的語言 ‘%s’"
@@ -3941,24 +4047,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"
#~ msgid "DuplicateHandle failed with error code 0x%08x"
#~ msgstr "DuplicateHandle 失敗,錯誤碼為 0x%08x"
-#~ msgid "Not yet implemented."
-#~ msgstr "功能尚未編寫。"
-
-#~ msgid "field `%s' still has initial default value\n"
-#~ msgstr "標頭欄位‘%s’仍然是預設值\n"
+#~ msgid "The %%J directive is only allowed at the beginning of the string."
+#~ msgstr "%%J 只允許在字串最開始出現。"
#~ msgid ""
#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -3971,20 +4067,29 @@ msgstr "<未命名>"
#~ "這是自由軟體;請參考原始碼的版權聲明。本軟體不提供任何保證,甚至不會包括\n"
#~ "可售性或適用於任何特定目的的保證。\n"
-#, fuzzy
-#~ msgid ""
-#~ "message catalog has context dependent translations\n"
-#~ "but the C# .dll format doesn't support contexts\n"
-#~ msgstr "翻譯檔含有複數型態的翻譯,但 C# 的翻譯檔不能處理複數型態\n"
+#~ msgid "Not yet implemented."
+#~ msgstr "功能尚未編寫。"
-#, fuzzy
-#~ msgid ""
-#~ "message catalog has context dependent translations\n"
-#~ "but the Java ResourceBundle format doesn't support contexts\n"
-#~ msgstr "翻譯檔含有複數型態的翻譯,但 C# 的翻譯檔不能處理複數型態\n"
+#~ msgid "header field `%s' should start at beginning of line\n"
+#~ msgstr "標頭欄位‘%s’應該位於行首\n"
-#~ msgid "The %%J directive is only allowed at the beginning of the string."
-#~ msgstr "%%J 只允許在字串最開始出現。"
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "標頭欄位‘%s’仍然是預設值\n"
+
+#~ msgid "conversion failure"
+#~ msgstr "轉換錯誤"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s:警告:"
+
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
+
+#~ msgid "%s:%lu: warning: unterminated string"
+#~ msgstr "%s:%lu: 警告:字串未結束"
+
+#~ msgid "%s:%d: fatal: plural message seen before singular message\n"
+#~ msgstr "%s:%d: 嚴重錯誤:複數式出現在單數式之前\n"
#~ msgid "Which is your email address?"
#~ msgstr "請問您的電子郵件地址?"
@@ -4013,18 +4118,3 @@ msgstr "<未命名>"
#~ msgid "Please enter your email address."
#~ msgstr "請自行輸入電子郵件地址。"
-
-#~ msgid "conversion failure"
-#~ msgstr "轉換錯誤"
-
-#~ msgid "%s: warning: "
-#~ msgstr "%s:警告:"
-
-#~ msgid "%s\n"
-#~ msgstr "%s\n"
-
-#~ msgid "%s:%lu: warning: unterminated string"
-#~ msgstr "%s:%lu: 警告:字串未結束"
-
-#~ msgid "%s:%d: fatal: plural message seen before singular message\n"
-#~ msgstr "%s:%d: 嚴重錯誤:複數式出現在單數式之前\n"