Update for 0.16.

1 files changed, 646 insertions, 563 deletions

diff --git a/gettext-tools/po/en@boldquot.po b/gettext-tools/po/en@boldquot.po
index 4b91b5e..fc42811 100644
--- a/gettext-tools/po/en@boldquot.po
+++ b/gettext-tools/po/en@boldquot.po
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2006-07-01 00:52+0200\n"
-"PO-Revision-Date: 2006-07-01 00:52+0200\n"
+"POT-Creation-Date: 2006-10-23 23:07+0200\n"
+"PO-Revision-Date: 2006-10-23 23:07+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -41,209 +41,256 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/argmatch.c:136
+#: gnulib-lib/argmatch.c:135
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "invalid argument %s for %s"
 
-#: lib/argmatch.c:137
+#: gnulib-lib/argmatch.c:136
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "ambiguous argument %s for %s"
 
-#: lib/argmatch.c:156
+#: gnulib-lib/argmatch.c:155
 #, c-format
 msgid "Valid arguments are:"
 msgstr "Valid arguments are:"
 
-#: lib/closeout.c:64
+#: gnulib-lib/clean-temp.c:322
+#, c-format
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "cannot find a temporary directory, try setting $TMPDIR"
+
+#: gnulib-lib/clean-temp.c:336
+#, c-format
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "cannot create a temporary directory using template “%s”"
+
+#: gnulib-lib/clean-temp.c:432
+#, c-format
+msgid "cannot remove temporary file %s"
+msgstr "cannot remove temporary file %s"
+
+#: gnulib-lib/clean-temp.c:447
+#, c-format
+msgid "cannot remove temporary directory %s"
+msgstr "cannot remove temporary directory %s"
+
+#: gnulib-lib/closeout.c:67
 msgid "write error"
 msgstr "write error"
 
-#: lib/copy-file.c:62 src/file-list.c:56 src/msggrep.c:238 src/open-po.c:122
-#: src/read-mo.c:245 src/read-tcl.c:125 src/urlget.c:198 src/xgettext.c:1754
-#: src/xgettext.c:1767 src/xgettext.c:1777
+#: gnulib-lib/copy-file.c:60 src/file-list.c:56 src/msggrep.c:246
+#: src/open-catalog.c:122 src/read-mo.c:248 src/read-tcl.c:126
+#: src/urlget.c:198 src/xgettext.c:1759 src/xgettext.c:1772
+#: src/xgettext.c:1782
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error while opening “%s” for reading"
 
-#: lib/copy-file.c:69
+#: gnulib-lib/copy-file.c:67
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "cannot open backup file “%s” for writing"
 
-#: lib/copy-file.c:77 src/urlget.c:210
+#: gnulib-lib/copy-file.c:75 src/urlget.c:210
 #, c-format
 msgid "error reading \"%s\""
 msgstr "error reading “%s”"
 
-#: lib/copy-file.c:82 lib/copy-file.c:86
+#: gnulib-lib/copy-file.c:80 gnulib-lib/copy-file.c:84
 #, c-format
 msgid "error writing \"%s\""
 msgstr "error writing “%s”"
 
-#: lib/copy-file.c:88 src/urlget.c:220
+#: gnulib-lib/copy-file.c:86 src/urlget.c:220
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "error after reading “%s”"
 
-#: lib/csharpcomp.c:282 lib/javaversion.c:77 src/msginit.c:773
-#: src/msginit.c:841 src/msginit.c:1000 src/msginit.c:1083
-#: src/read-csharp.c:73 src/read-java.c:71 src/read-resources.c:74
-#: src/read-tcl.c:111 src/write-resources.c:79
+#: gnulib-lib/csharpcomp.c:280 gnulib-lib/javaversion.c:78 src/msginit.c:838
+#: src/msginit.c:906 src/msginit.c:1065 src/msginit.c:1148
+#: src/read-csharp.c:74 src/read-java.c:72 src/read-resources.c:75
+#: src/read-tcl.c:112 src/write-resources.c:79
 #, c-format
 msgid "fdopen() failed"
 msgstr "fdopen() failed"
 
-#: lib/csharpcomp.c:541
+#: gnulib-lib/csharpcomp.c:539
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "C# compiler not found, try installing pnet"
 
-#: lib/csharpexec.c:346
+#: gnulib-lib/csharpexec.c:344
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# virtual machine not found, try installing pnet"
 
-#: lib/error.c:121
+#: gnulib-lib/error.c:125
 msgid "Unknown system error"
 msgstr "Unknown system error"
 
-#: lib/execute.c:183 lib/execute.c:259 lib/execute.c:301 lib/pipe.c:228
-#: lib/pipe.c:346 lib/pipe.c:406 lib/wait-process.c:336 lib/wait-process.c:403
+#: gnulib-lib/execute.c:181 gnulib-lib/execute.c:257 gnulib-lib/execute.c:299
+#: gnulib-lib/pipe.c:226 gnulib-lib/pipe.c:344 gnulib-lib/pipe.c:404
+#: gnulib-lib/wait-process.c:334 gnulib-lib/wait-process.c:401
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s subprocess failed"
 
-#: lib/getopt.c:551 lib/getopt.c:570
+#: gnulib-lib/getopt.c:531 gnulib-lib/getopt.c:547
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: option ‘%s’ is ambiguous\n"
 
-#: lib/getopt.c:603 lib/getopt.c:607
+#: gnulib-lib/getopt.c:580 gnulib-lib/getopt.c:584
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: option ‘--%s’ doesn't allow an argument\n"
 
-#: lib/getopt.c:616 lib/getopt.c:621
+#: gnulib-lib/getopt.c:593 gnulib-lib/getopt.c:598
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: option ‘%c%s’ doesn't allow an argument\n"
 
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#: gnulib-lib/getopt.c:641 gnulib-lib/getopt.c:660 gnulib-lib/getopt.c:976
+#: gnulib-lib/getopt.c:995
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: option ‘%s’ requires an argument\n"
 
-#: lib/getopt.c:727 lib/getopt.c:730
+#: gnulib-lib/getopt.c:698 gnulib-lib/getopt.c:701
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: unrecognized option ‘--%s’\n"
 
-#: lib/getopt.c:738 lib/getopt.c:741
+#: gnulib-lib/getopt.c:709 gnulib-lib/getopt.c:712
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: unrecognized option ‘%c%s’\n"
 
-#: lib/getopt.c:796 lib/getopt.c:799
+#: gnulib-lib/getopt.c:764 gnulib-lib/getopt.c:767
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: illegal option -- %c\n"
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: gnulib-lib/getopt.c:773 gnulib-lib/getopt.c:776
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: invalid option -- %c\n"
 
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#: gnulib-lib/getopt.c:828 gnulib-lib/getopt.c:844 gnulib-lib/getopt.c:1048
+#: gnulib-lib/getopt.c:1066
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: option requires an argument -- %c\n"
 
-#: lib/getopt.c:935 lib/getopt.c:954
+#: gnulib-lib/getopt.c:897 gnulib-lib/getopt.c:913
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: option ‘-W %s’ is ambiguous\n"
 
-#: lib/getopt.c:978 lib/getopt.c:999
+#: gnulib-lib/getopt.c:937 gnulib-lib/getopt.c:955
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: option ‘-W %s’ doesn't allow an argument\n"
 
-#: lib/javacomp.c:125 lib/javacomp.c:139 lib/javacomp.c:155
+#: gnulib-lib/javacomp.c:123 gnulib-lib/javacomp.c:137
+#: gnulib-lib/javacomp.c:153
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
 msgstr "invalid source_version argument to compile_java_class"
 
-#: lib/javacomp.c:170 lib/javacomp.c:191
+#: gnulib-lib/javacomp.c:168 gnulib-lib/javacomp.c:189
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
 msgstr "invalid target_version argument to compile_java_class"
 
-#: lib/javacomp.c:475 src/write-csharp.c:721 src/write-java.c:996
+#: gnulib-lib/javacomp.c:473 src/write-csharp.c:721 src/write-java.c:996
 #: src/write-java.c:1008
 #, c-format
 msgid "failed to create \"%s\""
 msgstr "failed to create “%s”"
 
-#: lib/javacomp.c:482 src/write-csharp.c:730 src/write-java.c:1017
-#: src/write-mo.c:819 src/write-po.c:1214 src/write-qt.c:752
+#: gnulib-lib/javacomp.c:480 src/write-catalog.c:215 src/write-csharp.c:730
+#: src/write-java.c:1017 src/write-mo.c:819 src/write-qt.c:752
 #: src/write-tcl.c:223
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "error while writing “%s” file"
 
-#: lib/javacomp.c:1797
+#: gnulib-lib/javacomp.c:1795
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Java compiler not found, try installing gcj or set $JAVAC"
 
-#: lib/javaexec.c:420
+#: gnulib-lib/javaexec.c:418
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "Java virtual machine not found, try installing gij or set $JAVA"
 
-#: lib/javaversion.c:85 src/msginit.c:781 src/msginit.c:849 src/msginit.c:1008
+#: gnulib-lib/javaversion.c:86 src/msginit.c:846 src/msginit.c:914
+#: src/msginit.c:1073
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s subprocess I/O error"
 
-#: lib/obstack.c:438 lib/obstack.c:441 lib/xmalloc.c:41 lib/xsetenv.c:40
-#: src/gettext-po.c:1140 src/msgl-check.c:450 src/po-lex.c:86 src/po-lex.c:105
-#: src/x-glade.c:406
+#: gnulib-lib/obstack.c:424 gnulib-lib/obstack.c:426 gnulib-lib/xmalloc.c:39
+#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:453 src/po-lex.c:86
+#: src/po-lex.c:105 src/x-glade.c:406 libgettextpo/gettext-po.c:1240
 #, c-format
 msgid "memory exhausted"
 msgstr "memory exhausted"
 
-#: lib/pipe.c:154 lib/pipe.c:157 lib/pipe.c:261 lib/pipe.c:264
+#: gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:259
+#: gnulib-lib/pipe.c:262
 #, c-format
 msgid "cannot create pipe"
 msgstr "cannot create pipe"
 
-#: lib/quotearg.c:239
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: gnulib-lib/quotearg.c:245
 msgid "`"
 msgstr "`"
 
-#: lib/quotearg.c:240
+#: gnulib-lib/quotearg.c:246
 msgid "'"
 msgstr "'"
 
-#: lib/w32spawn.h:48
+#: gnulib-lib/w32spawn.h:48
 #, c-format
 msgid "DuplicateHandle failed with error code 0x%08x"
 msgstr "DuplicateHandle failed with error code 0x%08x"
 
-#: lib/w32spawn.h:53
+#: gnulib-lib/w32spawn.h:53
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle failed"
 
-#: lib/wait-process.c:279 lib/wait-process.c:311 lib/wait-process.c:369
+#: gnulib-lib/wait-process.c:277 gnulib-lib/wait-process.c:309
+#: gnulib-lib/wait-process.c:367
 #, c-format
 msgid "%s subprocess"
 msgstr "%s subprocess"
 
-#: lib/wait-process.c:328 lib/wait-process.c:395
+#: gnulib-lib/wait-process.c:326 gnulib-lib/wait-process.c:393
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s subprocess got fatal signal %d"
@@ -720,20 +767,11 @@ msgstr ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
 
-#: src/gettext-po.c:83
-msgid "<unnamed>"
-msgstr "<unnamed>"
-
-#: src/gettext-po.c:101 src/gettext-po.c:145 src/gettext-po.c:189
-#: src/open-po.c:56
-msgid "<stdin>"
-msgstr "<stdin>"
-
-#: src/hostname.c:180 src/msgattrib.c:313 src/msgcat.c:265 src/msgcmp.c:142
-#: src/msgcomm.c:262 src/msgconv.c:219 src/msgen.c:205 src/msgexec.c:176
-#: src/msgfilter.c:278 src/msgfmt.c:362 src/msggrep.c:392 src/msginit.c:252
-#: src/msgmerge.c:304 src/msgunfmt.c:248 src/msguniq.c:241
-#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:515
+#: src/hostname.c:180 src/msgattrib.c:327 src/msgcat.c:271 src/msgcmp.c:163
+#: src/msgcomm.c:270 src/msgconv.c:225 src/msgen.c:213 src/msgexec.c:180
+#: src/msgfilter.c:286 src/msgfmt.c:367 src/msggrep.c:400 src/msginit.c:260
+#: src/msgmerge.c:323 src/msgunfmt.c:252 src/msguniq.c:249
+#: src/recode-sr-latin.c:112 src/urlget.c:132 src/xgettext.c:517
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -744,38 +782,38 @@ msgstr ""
 "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"
 
-#: src/hostname.c:185 src/msgattrib.c:318 src/msgcat.c:270 src/msgcmp.c:147
-#: src/msgcomm.c:267 src/msgconv.c:224 src/msgen.c:210 src/msgexec.c:181
-#: src/msgfilter.c:283 src/msgfmt.c:367 src/msggrep.c:397 src/msginit.c:257
-#: src/msgmerge.c:309 src/msgunfmt.c:253 src/msguniq.c:246 src/urlget.c:137
-#: src/xgettext.c:520
+#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgcmp.c:168
+#: src/msgcomm.c:275 src/msgconv.c:230 src/msgen.c:218 src/msgexec.c:185
+#: src/msgfilter.c:291 src/msgfmt.c:372 src/msggrep.c:405 src/msginit.c:265
+#: src/msgmerge.c:328 src/msgunfmt.c:257 src/msguniq.c:254 src/urlget.c:137
+#: src/xgettext.c:522
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Written by %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:185 src/msgattrib.c:318 src/msgcat.c:270 src/msgconv.c:224
-#: src/msgen.c:210 src/msgexec.c:181 src/msgfilter.c:283 src/msggrep.c:397
-#: src/msginit.c:257 src/msguniq.c:246 src/recode-sr-latin.c:122
+#: src/hostname.c:185 src/msgattrib.c:332 src/msgcat.c:276 src/msgconv.c:230
+#: src/msgen.c:218 src/msgexec.c:185 src/msgfilter.c:291 src/msggrep.c:405
+#: src/msginit.c:265 src/msguniq.c:254 src/recode-sr-latin.c:122
 #: src/urlget.c:137
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
-#: src/hostname.c:195 src/msginit.c:267 src/recode-sr-latin.c:131
+#: src/hostname.c:195 src/msginit.c:275 src/recode-sr-latin.c:131
 #, c-format
 msgid "too many arguments"
 msgstr "too many arguments"
 
-#: src/hostname.c:208 src/msgattrib.c:374 src/msgcat.c:329 src/msgcmp.c:178
-#: src/msgcomm.c:335 src/msgconv.c:282 src/msgen.c:260 src/msgexec.c:233
-#: src/msgfilter.c:388 src/msgfmt.c:625 src/msggrep.c:488 src/msginit.c:341
-#: src/msgmerge.c:428 src/msgunfmt.c:408 src/msguniq.c:302
-#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:736
+#: src/hostname.c:208 src/msgattrib.c:392 src/msgcat.c:333 src/msgcmp.c:199
+#: src/msgcomm.c:343 src/msgconv.c:287 src/msgen.c:271 src/msgexec.c:237
+#: src/msgfilter.c:396 src/msgfmt.c:627 src/msggrep.c:496 src/msginit.c:349
+#: src/msgmerge.c:449 src/msgunfmt.c:412 src/msguniq.c:310
+#: src/recode-sr-latin.c:144 src/urlget.c:160 src/xgettext.c:738
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Try ‘%s --help’ for more information.\n"
 
-#: src/hostname.c:212 src/msginit.c:345 src/recode-sr-latin.c:149
+#: src/hostname.c:212 src/msginit.c:353 src/recode-sr-latin.c:149
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr "Usage: %s [OPTION]\n"
@@ -811,38 +849,38 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            addresses for the hostname\n"
 
-#: src/hostname.c:229 src/msgattrib.c:478 src/msgcat.c:427 src/msgcmp.c:221
-#: src/msgcomm.c:429 src/msgconv.c:358 src/msgen.c:333 src/msgexec.c:275
-#: src/msgfilter.c:474 src/msgfmt.c:747 src/msggrep.c:598 src/msginit.c:397
-#: src/msgmerge.c:543 src/msgunfmt.c:506 src/msguniq.c:391
-#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:886
+#: src/hostname.c:229 src/msgattrib.c:498 src/msgcat.c:431 src/msgcmp.c:246
+#: src/msgcomm.c:437 src/msgconv.c:363 src/msgen.c:344 src/msgexec.c:279
+#: src/msgfilter.c:482 src/msgfmt.c:749 src/msggrep.c:606 src/msginit.c:405
+#: src/msgmerge.c:566 src/msgunfmt.c:510 src/msguniq.c:399
+#: src/recode-sr-latin.c:162 src/urlget.c:174 src/xgettext.c:888
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Informative output:\n"
 
-#: src/hostname.c:231 src/msgattrib.c:480 src/msgcat.c:429 src/msgcmp.c:223
-#: src/msgcomm.c:431 src/msgconv.c:360 src/msgen.c:335 src/msgexec.c:277
-#: src/msgfilter.c:476 src/msgfmt.c:749 src/msggrep.c:600 src/msginit.c:399
-#: src/msgmerge.c:545 src/msgunfmt.c:508 src/msguniq.c:393
-#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:888
+#: src/hostname.c:231 src/msgattrib.c:500 src/msgcat.c:433 src/msgcmp.c:248
+#: src/msgcomm.c:439 src/msgconv.c:365 src/msgen.c:346 src/msgexec.c:281
+#: src/msgfilter.c:484 src/msgfmt.c:751 src/msggrep.c:608 src/msginit.c:407
+#: src/msgmerge.c:568 src/msgunfmt.c:512 src/msguniq.c:401
+#: src/recode-sr-latin.c:165 src/urlget.c:176 src/xgettext.c:890
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  display this help and exit\n"
 
-#: src/hostname.c:233 src/msgattrib.c:482 src/msgcat.c:431 src/msgcmp.c:225
-#: src/msgcomm.c:433 src/msgconv.c:362 src/msgen.c:337 src/msgexec.c:279
-#: src/msgfilter.c:478 src/msgfmt.c:751 src/msggrep.c:602 src/msginit.c:401
-#: src/msgmerge.c:547 src/msgunfmt.c:510 src/msguniq.c:395
-#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:890
+#: src/hostname.c:233 src/msgattrib.c:502 src/msgcat.c:435 src/msgcmp.c:250
+#: src/msgcomm.c:441 src/msgconv.c:367 src/msgen.c:348 src/msgexec.c:283
+#: src/msgfilter.c:486 src/msgfmt.c:753 src/msggrep.c:610 src/msginit.c:409
+#: src/msgmerge.c:570 src/msgunfmt.c:514 src/msguniq.c:403
+#: src/recode-sr-latin.c:168 src/urlget.c:178 src/xgettext.c:892
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               output version information and exit\n"
 
-#: src/hostname.c:236 src/msgattrib.c:485 src/msgcat.c:434 src/msgcmp.c:228
-#: src/msgcomm.c:436 src/msgconv.c:365 src/msgen.c:340 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:758 src/msggrep.c:605 src/msginit.c:404
-#: src/msgmerge.c:554 src/msgunfmt.c:515 src/msguniq.c:398
-#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:893
+#: src/hostname.c:236 src/msgattrib.c:505 src/msgcat.c:438 src/msgcmp.c:253
+#: src/msgcomm.c:444 src/msgconv.c:370 src/msgen.c:351 src/msgexec.c:286
+#: src/msgfilter.c:489 src/msgfmt.c:760 src/msggrep.c:613 src/msginit.c:412
+#: src/msgmerge.c:577 src/msgunfmt.c:519 src/msguniq.c:406
+#: src/recode-sr-latin.c:171 src/urlget.c:181 src/xgettext.c:895
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 
@@ -851,29 +889,29 @@ msgstr "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "could not get host name"
 
-#: src/msgattrib.c:333 src/msgconv.c:239 src/msgexec.c:148 src/msgfilter.c:208
-#: src/msggrep.c:412 src/msginit.c:190 src/msguniq.c:261
+#: src/msgattrib.c:347 src/msgconv.c:245 src/msgexec.c:152 src/msgfilter.c:216
+#: src/msggrep.c:420 src/msginit.c:198 src/msguniq.c:269
 #, c-format
 msgid "at most one input file allowed"
 msgstr "at most one input file allowed"
 
-#: src/msgattrib.c:339 src/msgattrib.c:343 src/msgcat.c:280 src/msgcat.c:284
-#: src/msgcomm.c:277 src/msgcomm.c:281 src/msgconv.c:245 src/msgconv.c:249
-#: src/msgen.c:232 src/msgen.c:236 src/msgfilter.c:298 src/msgfilter.c:302
-#: src/msgfmt.c:406 src/msgfmt.c:414 src/msgfmt.c:429 src/msgfmt.c:451
-#: src/msggrep.c:418 src/msggrep.c:422 src/msgmerge.c:334 src/msgmerge.c:355
-#: src/msgmerge.c:359 src/msgunfmt.c:284 src/msguniq.c:267 src/msguniq.c:271
-#: src/xgettext.c:530 src/xgettext.c:534 src/xgettext.c:541
+#: src/msgattrib.c:353 src/msgattrib.c:357 src/msgcat.c:286 src/msgcat.c:290
+#: src/msgcomm.c:285 src/msgcomm.c:289 src/msgconv.c:251 src/msgconv.c:255
+#: src/msgen.c:240 src/msgen.c:244 src/msgfilter.c:306 src/msgfilter.c:310
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:426 src/msggrep.c:430 src/msgmerge.c:353 src/msgmerge.c:374
+#: src/msgmerge.c:378 src/msgunfmt.c:288 src/msguniq.c:275 src/msguniq.c:279
+#: src/xgettext.c:532 src/xgettext.c:536 src/xgettext.c:543
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s and %s are mutually exclusive"
 
-#: src/msgattrib.c:378 src/msgconv.c:286 src/msggrep.c:492 src/msguniq.c:306
+#: src/msgattrib.c:396 src/msgconv.c:291 src/msggrep.c:500 src/msguniq.c:314
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr "Usage: %s [OPTION] [INPUTFILE]\n"
 
-#: src/msgattrib.c:383
+#: src/msgattrib.c:401
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
@@ -882,63 +920,63 @@ msgstr ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 
-#: src/msgattrib.c:387 src/msgcat.c:350 src/msgcmp.c:196 src/msgcomm.c:355
-#: src/msgconv.c:294 src/msgen.c:276 src/msgexec.c:256 src/msgfilter.c:400
-#: src/msggrep.c:502 src/msginit.c:355 src/msgmerge.c:449 src/msgunfmt.c:420
-#: src/msguniq.c:322
+#: src/msgattrib.c:405 src/msgcat.c:354 src/msgcmp.c:217 src/msgcomm.c:363
+#: src/msgconv.c:299 src/msgen.c:287 src/msgexec.c:260 src/msgfilter.c:408
+#: src/msggrep.c:510 src/msginit.c:363 src/msgmerge.c:470 src/msgunfmt.c:424
+#: src/msguniq.c:330
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 
-#: src/msgattrib.c:390 src/msgcat.c:353 src/msgcmp.c:199 src/msgcomm.c:358
-#: src/msgconv.c:297 src/msgen.c:279 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msgfmt.c:643 src/msggrep.c:505 src/msginit.c:358 src/msgmerge.c:452
-#: src/msgunfmt.c:434 src/msguniq.c:325 src/xgettext.c:754
+#: src/msgattrib.c:408 src/msgcat.c:357 src/msgcmp.c:220 src/msgcomm.c:366
+#: src/msgconv.c:302 src/msgen.c:290 src/msgexec.c:263 src/msgfilter.c:411
+#: src/msgfmt.c:645 src/msggrep.c:513 src/msginit.c:366 src/msgmerge.c:473
+#: src/msgunfmt.c:438 src/msguniq.c:333 src/xgettext.c:756
 #, c-format
 msgid "Input file location:\n"
 msgstr "Input file location:\n"
 
-#: src/msgattrib.c:392 src/msgconv.c:299 src/msggrep.c:507 src/msguniq.c:327
+#: src/msgattrib.c:410 src/msgconv.c:304 src/msggrep.c:515 src/msguniq.c:335
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   input PO file\n"
 
-#: src/msgattrib.c:394 src/msgcat.c:359 src/msgcmp.c:205 src/msgcomm.c:364
-#: src/msgconv.c:301 src/msgen.c:283 src/msgexec.c:263 src/msgfilter.c:407
-#: src/msgfmt.c:647 src/msggrep.c:509 src/msgmerge.c:458 src/msguniq.c:329
-#: src/xgettext.c:760
+#: src/msgattrib.c:412 src/msgcat.c:363 src/msgcmp.c:226 src/msgcomm.c:372
+#: src/msgconv.c:306 src/msgen.c:294 src/msgexec.c:267 src/msgfilter.c:415
+#: src/msgfmt.c:649 src/msggrep.c:517 src/msgmerge.c:479 src/msguniq.c:337
+#: src/xgettext.c:762
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 
-#: src/msgattrib.c:396 src/msgconv.c:303 src/msgexec.c:265 src/msgfilter.c:409
-#: src/msggrep.c:511 src/msgunfmt.c:438 src/msguniq.c:331
+#: src/msgattrib.c:414 src/msgconv.c:308 src/msgexec.c:269 src/msgfilter.c:417
+#: src/msggrep.c:519 src/msgunfmt.c:442 src/msguniq.c:339
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "If no input file is given or if it is -, standard input is read.\n"
 
-#: src/msgattrib.c:399 src/msgcat.c:364 src/msgcomm.c:369 src/msgconv.c:306
-#: src/msgen.c:288 src/msgfilter.c:412 src/msgfmt.c:667 src/msggrep.c:514
-#: src/msginit.c:366 src/msgmerge.c:470 src/msgunfmt.c:474 src/msguniq.c:334
-#: src/xgettext.c:765
+#: src/msgattrib.c:417 src/msgcat.c:368 src/msgcomm.c:377 src/msgconv.c:311
+#: src/msgen.c:299 src/msgfilter.c:420 src/msgfmt.c:669 src/msggrep.c:522
+#: src/msginit.c:374 src/msgmerge.c:491 src/msgunfmt.c:478 src/msguniq.c:342
+#: src/xgettext.c:767
 #, c-format
 msgid "Output file location:\n"
 msgstr "Output file location:\n"
 
-#: src/msgattrib.c:401 src/msgcat.c:366 src/msgcomm.c:371 src/msgconv.c:308
-#: src/msgen.c:290 src/msgfilter.c:414 src/msgfmt.c:669 src/msggrep.c:516
-#: src/msgmerge.c:472 src/msgunfmt.c:476 src/msguniq.c:336
+#: src/msgattrib.c:419 src/msgcat.c:370 src/msgcomm.c:379 src/msgconv.c:313
+#: src/msgen.c:301 src/msgfilter.c:422 src/msgfmt.c:671 src/msggrep.c:524
+#: src/msgmerge.c:493 src/msgunfmt.c:480 src/msguniq.c:344
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FILE      write output to specified file\n"
 
-#: src/msgattrib.c:403 src/msgcat.c:368 src/msgcomm.c:373 src/msgconv.c:310
-#: src/msgen.c:292 src/msgfilter.c:416 src/msggrep.c:518 src/msgmerge.c:474
-#: src/msgunfmt.c:478 src/msguniq.c:338
+#: src/msgattrib.c:421 src/msgcat.c:372 src/msgcomm.c:381 src/msgconv.c:315
+#: src/msgen.c:303 src/msgfilter.c:424 src/msggrep.c:526 src/msgmerge.c:495
+#: src/msgunfmt.c:482 src/msguniq.c:346
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
@@ -947,114 +985,123 @@ msgstr ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:372 src/msgcomm.c:377 src/msguniq.c:342
+#: src/msgattrib.c:425 src/msgcat.c:376 src/msgcomm.c:385 src/msguniq.c:350
 #, c-format
 msgid "Message selection:\n"
 msgstr "Message selection:\n"
 
-#: src/msgattrib.c:409
+#: src/msgattrib.c:427
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 "      --translated            keep translated, remove untranslated messages\n"
 
-#: src/msgattrib.c:411
+#: src/msgattrib.c:429
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 
-#: src/msgattrib.c:413
+#: src/msgattrib.c:431
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr "      --no-fuzzy              remove ‘fuzzy’ marked messages\n"
 
-#: src/msgattrib.c:415
+#: src/msgattrib.c:433
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr "      --only-fuzzy            keep ‘fuzzy’ marked messages\n"
 
-#: src/msgattrib.c:417
+#: src/msgattrib.c:435
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr "      --no-obsolete           remove obsolete #~ messages\n"
 
-#: src/msgattrib.c:419
+#: src/msgattrib.c:437
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr "      --only-obsolete         keep obsolete #~ messages\n"
 
-#: src/msgattrib.c:422
+#: src/msgattrib.c:440
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr "Attribute manipulation:\n"
 
-#: src/msgattrib.c:424
+#: src/msgattrib.c:442
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr "      --set-fuzzy             set all messages ‘fuzzy’\n"
 
-#: src/msgattrib.c:426
+#: src/msgattrib.c:444
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 
-#: src/msgattrib.c:428
+#: src/msgattrib.c:446
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr "      --set-obsolete          set all messages obsolete\n"
 
-#: src/msgattrib.c:430
+#: src/msgattrib.c:448
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr "      --clear-obsolete        set all messages non-obsolete\n"
 
-#: src/msgattrib.c:432
+#: src/msgattrib.c:450
+#, c-format
+msgid ""
+"      --clear-previous        remove the \"previous msgid\" from all "
+"messages\n"
+msgstr ""
+"      --clear-previous        remove the “previous msgid” from all "
+"messages\n"
+
+#: src/msgattrib.c:452
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 
-#: src/msgattrib.c:434
+#: src/msgattrib.c:454
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 
-#: src/msgattrib.c:436
+#: src/msgattrib.c:456
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 
-#: src/msgattrib.c:438
+#: src/msgattrib.c:458
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 
-#: src/msgattrib.c:441 src/msgcat.c:384 src/msgcmp.c:213 src/msgcomm.c:389
-#: src/msgconv.c:321 src/msgen.c:296 src/msgexec.c:268 src/msgfilter.c:435
-#: src/msgfmt.c:712 src/msggrep.c:561 src/msginit.c:374 src/msgmerge.c:505
-#: src/msguniq.c:349
+#: src/msgattrib.c:461 src/msgcat.c:388 src/msgcmp.c:238 src/msgcomm.c:397
+#: src/msgconv.c:326 src/msgen.c:307 src/msgexec.c:272 src/msgfilter.c:443
+#: src/msgfmt.c:714 src/msggrep.c:569 src/msginit.c:382 src/msgmerge.c:528
+#: src/msguniq.c:357
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Input file syntax:\n"
 
-#: src/msgattrib.c:443 src/msgconv.c:323 src/msgen.c:298 src/msgexec.c:270
-#: src/msgfilter.c:437 src/msggrep.c:563 src/msginit.c:376 src/msguniq.c:351
+#: src/msgattrib.c:463 src/msgconv.c:328 src/msgen.c:309 src/msgexec.c:274
+#: src/msgfilter.c:445 src/msggrep.c:571 src/msginit.c:384 src/msguniq.c:359
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 
-#: src/msgattrib.c:445 src/msgconv.c:325 src/msgen.c:300 src/msgexec.c:272
-#: src/msgfilter.c:439 src/msggrep.c:565 src/msginit.c:378 src/msguniq.c:353
+#: src/msgattrib.c:465 src/msgconv.c:330 src/msgen.c:311 src/msgexec.c:276
+#: src/msgfilter.c:447 src/msggrep.c:573 src/msginit.c:386 src/msguniq.c:361
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1063,55 +1110,55 @@ msgstr ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 
-#: src/msgattrib.c:448 src/msgcat.c:392 src/msgcomm.c:397 src/msgconv.c:328
-#: src/msgen.c:303 src/msgfilter.c:442 src/msgfmt.c:740 src/msggrep.c:568
-#: src/msginit.c:381 src/msgmerge.c:513 src/msgunfmt.c:482 src/msguniq.c:356
-#: src/xgettext.c:844
+#: src/msgattrib.c:468 src/msgcat.c:396 src/msgcomm.c:405 src/msgconv.c:333
+#: src/msgen.c:314 src/msgfilter.c:450 src/msgfmt.c:742 src/msggrep.c:576
+#: src/msginit.c:389 src/msgmerge.c:536 src/msgunfmt.c:486 src/msguniq.c:364
+#: src/xgettext.c:846
 #, c-format
 msgid "Output details:\n"
 msgstr "Output details:\n"
 
-#: src/msgattrib.c:450 src/msgcat.c:399 src/msgcomm.c:399 src/msgconv.c:330
-#: src/msgen.c:305 src/msgmerge.c:515 src/msgunfmt.c:484 src/msguniq.c:363
-#: src/xgettext.c:846
+#: src/msgattrib.c:470 src/msgcat.c:403 src/msgcomm.c:407 src/msgconv.c:335
+#: src/msgen.c:316 src/msgmerge.c:538 src/msgunfmt.c:488 src/msguniq.c:371
+#: src/xgettext.c:848
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 
-#: src/msgattrib.c:452 src/msgcat.c:401 src/msgcomm.c:401 src/msgconv.c:332
-#: src/msgen.c:307 src/msgfilter.c:446 src/msgmerge.c:517 src/msgunfmt.c:486
-#: src/msguniq.c:365 src/xgettext.c:848
+#: src/msgattrib.c:472 src/msgcat.c:405 src/msgcomm.c:409 src/msgconv.c:337
+#: src/msgen.c:318 src/msgfilter.c:454 src/msgmerge.c:540 src/msgunfmt.c:490
+#: src/msguniq.c:373 src/xgettext.c:850
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 
-#: src/msgattrib.c:454 src/msgcat.c:403 src/msgcomm.c:403 src/msgconv.c:334
-#: src/msgen.c:309 src/msgfilter.c:448 src/msggrep.c:574 src/msgmerge.c:519
-#: src/msgunfmt.c:488 src/msguniq.c:367 src/xgettext.c:850
+#: src/msgattrib.c:474 src/msgcat.c:407 src/msgcomm.c:411 src/msgconv.c:339
+#: src/msgen.c:320 src/msgfilter.c:456 src/msggrep.c:582 src/msgmerge.c:542
+#: src/msgunfmt.c:492 src/msguniq.c:375 src/xgettext.c:852
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              write PO file even if empty\n"
 
-#: src/msgattrib.c:456 src/msgcat.c:405 src/msgcomm.c:405 src/msguniq.c:369
-#: src/xgettext.c:852
+#: src/msgattrib.c:476 src/msgcat.c:409 src/msgcomm.c:413 src/msguniq.c:377
+#: src/xgettext.c:854
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                write the .po file using indented style\n"
 
-#: src/msgattrib.c:458 src/msgcat.c:407 src/msgcomm.c:407 src/msguniq.c:371
-#: src/xgettext.c:854
+#: src/msgattrib.c:478 src/msgcat.c:411 src/msgcomm.c:415 src/msguniq.c:379
+#: src/xgettext.c:856
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           do not write ‘#: filename:line’ lines\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:409 src/msgcomm.c:409 src/msguniq.c:373
-#: src/xgettext.c:856
+#: src/msgattrib.c:480 src/msgcat.c:413 src/msgcomm.c:417 src/msguniq.c:381
+#: src/xgettext.c:858
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1119,40 +1166,40 @@ msgstr ""
 "  -n, --add-location          generate ‘#: filename:line’ lines "
 "(default)\n"
 
-#: src/msgattrib.c:462 src/msgcat.c:411 src/msgcomm.c:411 src/msguniq.c:375
-#: src/xgettext.c:858
+#: src/msgattrib.c:482 src/msgcat.c:415 src/msgcomm.c:419 src/msguniq.c:383
+#: src/xgettext.c:860
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 
-#: src/msgattrib.c:464 src/msgcat.c:413 src/msgcomm.c:413 src/msgconv.c:344
-#: src/msgen.c:319 src/msgfilter.c:460 src/msggrep.c:584 src/msginit.c:387
-#: src/msgmerge.c:529 src/msgunfmt.c:494 src/msguniq.c:377
+#: src/msgattrib.c:484 src/msgcat.c:417 src/msgcomm.c:421 src/msgconv.c:349
+#: src/msgen.c:330 src/msgfilter.c:468 src/msggrep.c:592 src/msginit.c:395
+#: src/msgmerge.c:552 src/msgunfmt.c:498 src/msguniq.c:385
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     write out a Java .properties file\n"
 
-#: src/msgattrib.c:466 src/msgcat.c:415 src/msgcomm.c:415 src/msgconv.c:346
-#: src/msgen.c:321 src/msgfilter.c:462 src/msggrep.c:586 src/msginit.c:389
-#: src/msgmerge.c:531 src/msgunfmt.c:496 src/msguniq.c:379 src/xgettext.c:862
+#: src/msgattrib.c:486 src/msgcat.c:419 src/msgcomm.c:423 src/msgconv.c:351
+#: src/msgen.c:332 src/msgfilter.c:470 src/msggrep.c:594 src/msginit.c:397
+#: src/msgmerge.c:554 src/msgunfmt.c:500 src/msguniq.c:387 src/xgettext.c:864
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 
-#: src/msgattrib.c:468 src/msgcat.c:417 src/msgcomm.c:417 src/msgconv.c:348
-#: src/msgen.c:323 src/msgfilter.c:464 src/msggrep.c:588 src/msginit.c:391
-#: src/msgmerge.c:533 src/msgunfmt.c:498 src/msguniq.c:381 src/xgettext.c:864
+#: src/msgattrib.c:488 src/msgcat.c:421 src/msgcomm.c:425 src/msgconv.c:353
+#: src/msgen.c:334 src/msgfilter.c:472 src/msggrep.c:596 src/msginit.c:399
+#: src/msgmerge.c:556 src/msgunfmt.c:502 src/msguniq.c:389 src/xgettext.c:866
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          set output page width\n"
 
-#: src/msgattrib.c:470 src/msgcat.c:419 src/msgcomm.c:419 src/msgconv.c:350
-#: src/msgen.c:325 src/msgfilter.c:466 src/msggrep.c:590 src/msginit.c:393
-#: src/msgmerge.c:535 src/msgunfmt.c:500 src/msguniq.c:383 src/xgettext.c:866
+#: src/msgattrib.c:490 src/msgcat.c:423 src/msgcomm.c:427 src/msgconv.c:355
+#: src/msgen.c:336 src/msgfilter.c:474 src/msggrep.c:598 src/msginit.c:401
+#: src/msgmerge.c:558 src/msgunfmt.c:504 src/msguniq.c:391 src/xgettext.c:868
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1161,31 +1208,31 @@ msgstr ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:422 src/msgcomm.c:422 src/msgconv.c:353
-#: src/msgen.c:328 src/msgfilter.c:469 src/msgmerge.c:538 src/msgunfmt.c:503
-#: src/msguniq.c:386 src/xgettext.c:869
+#: src/msgattrib.c:493 src/msgcat.c:426 src/msgcomm.c:430 src/msgconv.c:358
+#: src/msgen.c:339 src/msgfilter.c:477 src/msgmerge.c:561 src/msgunfmt.c:507
+#: src/msguniq.c:394 src/xgettext.c:871
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           generate sorted output\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:424 src/msgcomm.c:424 src/msgconv.c:355
-#: src/msgen.c:330 src/msgfilter.c:471 src/msgmerge.c:540 src/msguniq.c:388
-#: src/xgettext.c:871
+#: src/msgattrib.c:495 src/msgcat.c:428 src/msgcomm.c:432 src/msgconv.c:360
+#: src/msgen.c:341 src/msgfilter.c:479 src/msgmerge.c:563 src/msguniq.c:396
+#: src/xgettext.c:873
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          sort output by file location\n"
 
-#: src/msgcat.c:290 src/msgcomm.c:307
+#: src/msgcat.c:296 src/msgcomm.c:315
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "impossible selection criteria specified (%d < n < %d)"
 
-#: src/msgcat.c:333 src/msgcomm.c:339 src/xgettext.c:740
+#: src/msgcat.c:337 src/msgcomm.c:347 src/xgettext.c:742
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Usage: %s [OPTION] [INPUTFILE]...\n"
 
-#: src/msgcat.c:338
+#: src/msgcat.c:342
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1208,23 +1255,23 @@ msgstr ""
 "is specified, they will be taken from the first PO file to define them.\n"
 "File positions from all PO files will be cumulated.\n"
 
-#: src/msgcat.c:355 src/msgcomm.c:360 src/xgettext.c:756
+#: src/msgcat.c:359 src/msgcomm.c:368 src/xgettext.c:758
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               input files\n"
 
-#: src/msgcat.c:357 src/msgcomm.c:362 src/xgettext.c:758
+#: src/msgcat.c:361 src/msgcomm.c:370 src/xgettext.c:760
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=FILE       get list of input files from FILE\n"
 
-#: src/msgcat.c:361 src/msgcomm.c:366 src/msgen.c:285 src/msgfmt.c:649
-#: src/xgettext.c:762
+#: src/msgcat.c:365 src/msgcomm.c:374 src/msgen.c:296 src/msgfmt.c:651
+#: src/xgettext.c:764
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "If input file is -, standard input is read.\n"
 
-#: src/msgcat.c:374 src/msgcomm.c:379
+#: src/msgcat.c:378 src/msgcomm.c:387
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1233,7 +1280,7 @@ msgstr ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 
-#: src/msgcat.c:377
+#: src/msgcat.c:381
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1242,7 +1289,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 
-#: src/msgcat.c:380 src/msgcomm.c:385
+#: src/msgcat.c:384 src/msgcomm.c:393
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1251,16 +1298,16 @@ msgstr ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 
-#: src/msgcat.c:386 src/msgcmp.c:215 src/msgcomm.c:391 src/msgfmt.c:714
-#: src/msgmerge.c:507
+#: src/msgcat.c:390 src/msgcmp.c:240 src/msgcomm.c:399 src/msgfmt.c:716
+#: src/msgmerge.c:530
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 
-#: src/msgcat.c:388 src/msgcmp.c:217 src/msgcomm.c:393 src/msgfmt.c:716
-#: src/msgmerge.c:509
+#: src/msgcat.c:392 src/msgcmp.c:242 src/msgcomm.c:401 src/msgfmt.c:718
+#: src/msgmerge.c:532
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1269,12 +1316,12 @@ msgstr ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 
-#: src/msgcat.c:394 src/msgconv.c:316 src/msguniq.c:358
+#: src/msgcat.c:398 src/msgconv.c:321 src/msguniq.c:366
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAME          encoding for output\n"
 
-#: src/msgcat.c:396 src/msguniq.c:360
+#: src/msgcat.c:400 src/msguniq.c:368
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1284,26 +1331,26 @@ msgstr ""
 "                              message, don't merge several translations\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:147 src/msgcomm.c:267 src/msgmerge.c:309
+#: src/msgcmp.c:168 src/msgcomm.c:275 src/msgmerge.c:328
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:158 src/msgmerge.c:320
+#: src/msgcmp.c:179 src/msgmerge.c:339
 #, c-format
 msgid "no input files given"
 msgstr "no input files given"
 
-#: src/msgcmp.c:163 src/msgmerge.c:325
+#: src/msgcmp.c:184 src/msgmerge.c:344
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "exactly 2 input files required"
 
-#: src/msgcmp.c:182 src/msgmerge.c:432
+#: src/msgcmp.c:203 src/msgmerge.c:453
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Usage: %s [OPTION] def.po ref.pot\n"
 
-#: src/msgcmp.c:187
+#: src/msgcmp.c:208
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1320,22 +1367,22 @@ msgstr ""
 "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"
 
-#: src/msgcmp.c:201
+#: src/msgcmp.c:222
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      translations\n"
 
-#: src/msgcmp.c:203
+#: src/msgcmp.c:224
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     references to the sources\n"
 
-#: src/msgcmp.c:208 src/msgmerge.c:498
+#: src/msgcmp.c:229 src/msgmerge.c:519
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Operation modifiers:\n"
 
-#: src/msgcmp.c:210 src/msgmerge.c:500
+#: src/msgcmp.c:231 src/msgmerge.c:521
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1344,39 +1391,59 @@ msgstr ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 
-#: src/msgcmp.c:288 src/msgmerge.c:1097
+#: src/msgcmp.c:233
+#, c-format
+msgid "      --use-fuzzy             consider fuzzy entries\n"
+msgstr "      --use-fuzzy             consider fuzzy entries\n"
+
+#: src/msgcmp.c:235
+#, c-format
+msgid "      --use-untranslated      consider untranslated entries\n"
+msgstr "      --use-untranslated      consider untranslated entries\n"
+
+#: src/msgcmp.c:306
+#, c-format
+msgid "this message is untranslated"
+msgstr "this message is untranslated"
+
+#: src/msgcmp.c:312
+#, c-format
+msgid "this message needs to be reviewed by the translator"
+msgstr "this message needs to be reviewed by the translator"
+
+#: src/msgcmp.c:328 src/msgmerge.c:1214
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "this message is used but not defined..."
 
-#: src/msgcmp.c:291 src/msgmerge.c:1100
+#: src/msgcmp.c:331 src/msgmerge.c:1217
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...but this definition is similar"
 
-#: src/msgcmp.c:296 src/msgmerge.c:1130
+#: src/msgcmp.c:336 src/msgmerge.c:1245
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "this message is used but not defined in %s"
 
-#: src/msgcmp.c:400
+#: src/msgcmp.c:440
 #, c-format
 msgid "warning: this message is not used"
 msgstr "warning: this message is not used"
 
-#: src/msgcmp.c:407 src/msgfmt.c:541
+#: src/msgcmp.c:447 src/msgfmt.c:543
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "found %d fatal error"
 msgstr[1] "found %d fatal errors"
 
-#: src/msgcomm.c:296
+#: src/msgcomm.c:304
 #, c-format
 msgid "at least two files must be specified"
 msgstr "at least two files must be specified"
 
-#: src/msgcomm.c:344
+#: src/msgcomm.c:352
 #, c-format, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -1397,7 +1464,7 @@ msgstr ""
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 
-#: src/msgcomm.c:382
+#: src/msgcomm.c:390
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1406,7 +1473,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 
-#: src/msgcomm.c:426 src/xgettext.c:873
+#: src/msgcomm.c:434 src/xgettext.c:875
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1414,35 +1481,35 @@ msgstr ""
 "      --omit-header           don't write header with ‘msgid \"\"’ "
 "entry\n"
 
-#: src/msgconv.c:290
+#: src/msgconv.c:295
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr "Converts a translation catalog to a different character encoding.\n"
 
-#: src/msgconv.c:314
+#: src/msgconv.c:319
 #, c-format
 msgid "Conversion target:\n"
 msgstr "Conversion target:\n"
 
-#: src/msgconv.c:318
+#: src/msgconv.c:323
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "The default encoding is the current locale's encoding.\n"
 
-#: src/msgconv.c:336 src/msgen.c:311 src/msgmerge.c:521
+#: src/msgconv.c:341 src/msgen.c:322 src/msgmerge.c:544
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                indented output style\n"
 
-#: src/msgconv.c:338 src/msgen.c:313 src/msgfilter.c:454 src/msggrep.c:578
-#: src/msgmerge.c:523
+#: src/msgconv.c:343 src/msgen.c:324 src/msgfilter.c:462 src/msggrep.c:586
+#: src/msgmerge.c:546
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           suppress ‘#: filename:line’ lines\n"
 
-#: src/msgconv.c:340 src/msgen.c:315 src/msgfilter.c:456 src/msggrep.c:580
-#: src/msgmerge.c:525
+#: src/msgconv.c:345 src/msgen.c:326 src/msgfilter.c:464 src/msggrep.c:588
+#: src/msgmerge.c:548
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1450,28 +1517,28 @@ msgstr ""
 "      --add-location          preserve ‘#: filename:line’ lines "
 "(default)\n"
 
-#: src/msgconv.c:342 src/msgen.c:317 src/msgfilter.c:458 src/msggrep.c:582
-#: src/msgmerge.c:527
+#: src/msgconv.c:347 src/msgen.c:328 src/msgfilter.c:466 src/msggrep.c:590
+#: src/msgmerge.c:550
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                strict Uniforum output style\n"
 
-#: src/msgen.c:221 src/msgfmt.c:378 src/xgettext.c:558
+#: src/msgen.c:229 src/msgfmt.c:383 src/xgettext.c:560
 #, c-format
 msgid "no input file given"
 msgstr "no input file given"
 
-#: src/msgen.c:226
+#: src/msgen.c:234
 #, c-format
 msgid "exactly one input file required"
 msgstr "exactly one input file required"
 
-#: src/msgen.c:264
+#: src/msgen.c:275
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Usage: %s [OPTION] INPUTFILE\n"
 
-#: src/msgen.c:269
+#: src/msgen.c:280
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1484,22 +1551,22 @@ msgstr ""
 "xgettext).  Untranslated entries are assigned a translation that is\n"
 "identical to the msgid.\n"
 
-#: src/msgen.c:281
+#: src/msgen.c:292
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INPUTFILE                   input PO or POT file\n"
 
-#: src/msgexec.c:191
+#: src/msgexec.c:195
 #, c-format
 msgid "missing command name"
 msgstr "missing command name"
 
-#: src/msgexec.c:237
+#: src/msgexec.c:241
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 
-#: src/msgexec.c:242
+#: src/msgexec.c:246
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1514,7 +1581,7 @@ msgstr ""
 "msgexec's output.  msgexec's return code is the maximum return code\n"
 "across all invocations.\n"
 
-#: src/msgexec.c:251
+#: src/msgexec.c:255
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1523,42 +1590,42 @@ msgstr ""
 "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"
 
-#: src/msgexec.c:261 src/msgfilter.c:405
+#: src/msgexec.c:265 src/msgfilter.c:413
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       input PO file\n"
 
-#: src/msgexec.c:321
+#: src/msgexec.c:325
 #, c-format
 msgid "write to stdout failed"
 msgstr "write to stdout failed"
 
-#: src/msgexec.c:348 src/msgfilter.c:657
+#: src/msgexec.c:352 src/msgfilter.c:665
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "write to %s subprocess failed"
 
-#: src/msgfilter.c:293
+#: src/msgfilter.c:301
 #, c-format
 msgid "missing filter name"
 msgstr "missing filter name"
 
-#: src/msgfilter.c:317
+#: src/msgfilter.c:325
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "at least one sed script must be specified"
 
-#: src/msgfilter.c:392
+#: src/msgfilter.c:400
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 
-#: src/msgfilter.c:396
+#: src/msgfilter.c:404
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Applies a filter to all translations of a translation catalog.\n"
 
-#: src/msgfilter.c:420
+#: src/msgfilter.c:428
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1567,19 +1634,19 @@ msgstr ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 
-#: src/msgfilter.c:425
+#: src/msgfilter.c:433
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 
-#: src/msgfilter.c:427
+#: src/msgfilter.c:435
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 
-#: src/msgfilter.c:429
+#: src/msgfilter.c:437
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1590,126 +1657,126 @@ msgstr ""
 "commands\n"
 "                                to be executed\n"
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:440
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 
-#: src/msgfilter.c:444 src/msggrep.c:570
+#: src/msgfilter.c:452 src/msggrep.c:578
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             do not use C escapes in output (default)\n"
 
-#: src/msgfilter.c:450 src/msggrep.c:576
+#: src/msgfilter.c:458 src/msggrep.c:584
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                indented output style\n"
 
-#: src/msgfilter.c:452
+#: src/msgfilter.c:460
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 
-#: src/msgfilter.c:580
+#: src/msgfilter.c:588
 #, c-format
 msgid "Not yet implemented."
 msgstr "Not yet implemented."
 
-#: src/msgfilter.c:609
+#: src/msgfilter.c:617
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr "cannot set up nonblocking I/O to %s subprocess"
 
-#: src/msgfilter.c:637
+#: src/msgfilter.c:645
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr "communication with %s subprocess failed"
 
-#: src/msgfilter.c:688
+#: src/msgfilter.c:696
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr "read from %s subprocess failed"
 
-#: src/msgfilter.c:704
+#: src/msgfilter.c:712
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr "%s subprocess terminated with exit code %d"
 
-#: src/msgfmt.c:300
+#: src/msgfmt.c:305
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "the argument to %s should be a single punctuation character"
 
-#: src/msgfmt.c:347
+#: src/msgfmt.c:352
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "invalid endianness: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:367 src/msgunfmt.c:253 src/xgettext.c:520
+#: src/msgfmt.c:372 src/msgunfmt.c:257 src/xgettext.c:522
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:420 src/msgfmt.c:442 src/msgfmt.c:464 src/msgunfmt.c:315
-#: src/msgunfmt.c:338
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:319
+#: src/msgunfmt.c:342
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s requires a “-d directory” specification"
 
-#: src/msgfmt.c:435 src/msgfmt.c:457 src/msgunfmt.c:308 src/msgunfmt.c:331
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:312 src/msgunfmt.c:335
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s requires a “-l locale” specification"
 
-#: src/msgfmt.c:473 src/msgunfmt.c:347 src/msgunfmt.c:353
+#: src/msgfmt.c:478 src/msgunfmt.c:351 src/msgunfmt.c:357
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s is only valid with %s or %s"
 
-#: src/msgfmt.c:479 src/msgfmt.c:485
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s is only valid with %s, %s or %s"
 
-#: src/msgfmt.c:599
+#: src/msgfmt.c:601
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d translated message"
 msgstr[1] "%d translated messages"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:606
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d fuzzy translation"
 msgstr[1] ", %d fuzzy translations"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:611
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d untranslated message"
 msgstr[1] ", %d untranslated messages"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:631
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Usage: %s [OPTION] filename.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:635
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Generate binary message catalog from textual translation description.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:749
+#: src/msgfmt.c:640 src/xgettext.c:751
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1718,17 +1785,17 @@ msgstr ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:647
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             input files\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:464 src/msgunfmt.c:423 src/xgettext.c:797
+#: src/msgfmt.c:654 src/msgmerge.c:485 src/msgunfmt.c:427 src/xgettext.c:799
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Operation mode:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:656
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1737,7 +1804,7 @@ msgstr ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:658
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1746,12 +1813,12 @@ msgstr ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:660
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# mode: generate a .NET .dll file\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:662
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1760,40 +1827,40 @@ msgstr ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:664
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:666
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt mode: generate a Qt .qm file\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:673
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                enable strict Uniforum mode\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:773
+#: src/msgfmt.c:675 src/xgettext.c:775
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "If output file is -, output is written to standard output.\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:678
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Output file location in Java mode:\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:443 src/msgunfmt.c:454
+#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgunfmt.c:447 src/msgunfmt.c:458
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     resource name\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:445
-#: src/msgunfmt.c:456 src/msgunfmt.c:466
+#: src/msgfmt.c:682 src/msgfmt.c:696 src/msgfmt.c:706 src/msgunfmt.c:449
+#: src/msgunfmt.c:460 src/msgunfmt.c:470
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
@@ -1802,14 +1869,14 @@ msgstr ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:684
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:686
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1822,12 +1889,12 @@ msgstr ""
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:692
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Output file location in C# mode:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:458
+#: src/msgfmt.c:698 src/msgunfmt.c:462
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1836,7 +1903,7 @@ msgstr ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:700
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1845,18 +1912,18 @@ msgstr ""
 "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"
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:704
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Output file location in Tcl mode:\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:468
+#: src/msgfmt.c:708 src/msgunfmt.c:472
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORY                base directory of .msg message catalogs\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:710
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1865,12 +1932,12 @@ msgstr ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:789
+#: src/msgfmt.c:722 src/xgettext.c:791
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Input file interpretation:\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:724
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1881,13 +1948,13 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:727
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          check language dependent format strings\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -1896,7 +1963,7 @@ msgstr ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:731
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1905,7 +1972,7 @@ msgstr ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:734
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -1914,7 +1981,7 @@ msgstr ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:736
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1925,86 +1992,86 @@ msgstr ""
 "for\n"
 "                                menu items\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:739
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             use fuzzy entries in output\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:744
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:746
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               binary file will not include the hash table\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:755
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            print statistics about translations\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:549 src/msgunfmt.c:512
+#: src/msgfmt.c:757 src/msgmerge.c:572 src/msgunfmt.c:516
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               increase verbosity level\n"
 
-#: src/msgfmt.c:865
+#: src/msgfmt.c:867
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "warning: PO file header missing or invalid\n"
 
-#: src/msgfmt.c:868
+#: src/msgfmt.c:870
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "warning: charset conversion will not work\n"
 
-#: src/msgfmt.c:878
+#: src/msgfmt.c:880
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "warning: PO file header fuzzy\n"
 
-#: src/msgfmt.c:880
+#: src/msgfmt.c:882
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "warning: older versions of msgfmt will give an error on this\n"
 
-#: src/msgfmt.c:904
+#: src/msgfmt.c:906
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domain name “%s” not suitable as file name"
 
-#: src/msgfmt.c:909
+#: src/msgfmt.c:911
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domain name “%s” not suitable as file name: will use prefix"
 
-#: src/msgfmt.c:923
+#: src/msgfmt.c:925
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "‘domain %s’ directive ignored"
 
-#: src/msgfmt.c:978
+#: src/msgfmt.c:985
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "empty ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:979
+#: src/msgfmt.c:986
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "fuzzy ‘msgstr’ entry ignored"
 
-#: src/msgfmt.c:1028
+#: src/msgfmt.c:1035
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: warning: source file contains fuzzy translation"
 
-#: src/msggrep.c:249 src/po-lex.c:657 src/read-mo.c:79
+#: src/msggrep.c:257 src/po-lex.c:660 src/read-mo.c:82
 #: src/read-properties.c:85 src/read-stringtable.c:100 src/x-awk.c:139
 #: src/x-c.c:414 src/x-csharp.c:159 src/x-elisp.c:145 src/x-glade.c:422
 #: src/x-java.c:172 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:226
@@ -2015,7 +2082,7 @@ msgstr "%s: warning: source file contains fuzzy translation"
 msgid "error while reading \"%s\""
 msgstr "error while reading “%s”"
 
-#: src/msggrep.c:477
+#: src/msggrep.c:485
 #, c-format
 msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
@@ -2024,7 +2091,7 @@ msgstr ""
 "option ‘%c’ cannot be used before ‘J’ or ‘K’ or ‘T’ "
 "or ‘C’ or ‘X’ has been specified"
 
-#: src/msggrep.c:497
+#: src/msggrep.c:505
 #, c-format, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
@@ -2033,7 +2100,7 @@ msgstr ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 
-#: src/msggrep.c:523
+#: src/msggrep.c:531
 #, c-format, no-wrap
 msgid ""
 "Message selection:\n"
@@ -2108,24 +2175,24 @@ msgstr ""
 "  -v, --invert-match          output only the messages that do not match any\n"
 "                              selection criterion\n"
 
-#: src/msggrep.c:572
+#: src/msggrep.c:580
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 "      --escape                use C escapes in output, no extended chars\n"
 
-#: src/msggrep.c:593
+#: src/msggrep.c:601
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
 msgstr "      --sort-output           generate sorted output\n"
 
-#: src/msggrep.c:595
+#: src/msggrep.c:603
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
 msgstr "      --sort-by-file          sort output by file location\n"
 
-#: src/msginit.c:280
+#: src/msginit.c:288
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2135,7 +2202,7 @@ msgstr ""
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 
-#: src/msginit.c:304
+#: src/msginit.c:312
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -2146,12 +2213,12 @@ msgstr ""
 "Please specify the locale through the --locale option or\n"
 "the output .po file through the --output-file option.\n"
 
-#: src/msginit.c:330
+#: src/msginit.c:338
 #, c-format
 msgid "Created %s.\n"
 msgstr "Created %s.\n"
 
-#: src/msginit.c:350
+#: src/msginit.c:358
 #, c-format, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
@@ -2160,12 +2227,12 @@ msgstr ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 
-#: src/msginit.c:360
+#: src/msginit.c:368
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
 msgstr "  -i, --input=INPUTFILE       input POT file\n"
 
-#: src/msginit.c:362
+#: src/msginit.c:370
 #, c-format
 msgid ""
 "If no input file is given, the current directory is searched for the POT "
@@ -2176,12 +2243,12 @@ msgstr ""
 "file.\n"
 "If it is -, standard input is read.\n"
 
-#: src/msginit.c:368
+#: src/msginit.c:376
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
 msgstr "  -o, --output-file=FILE      write output to specified PO file\n"
 
-#: src/msginit.c:370
+#: src/msginit.c:378
 #, c-format
 msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
@@ -2190,19 +2257,19 @@ msgstr ""
 "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"
 
-#: src/msginit.c:383
+#: src/msginit.c:391
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
 msgstr "  -l, --locale=LL_CC          set target locale\n"
 
-#: src/msginit.c:385
+#: src/msginit.c:393
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
 "      --no-translator         assume the PO file is automatically generated\n"
 
-#: src/msginit.c:441
+#: src/msginit.c:449
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2210,12 +2277,12 @@ msgstr ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 
-#: src/msginit.c:449 src/msginit.c:454
+#: src/msginit.c:457 src/msginit.c:462
 #, c-format
 msgid "error reading current directory"
 msgstr "error reading current directory"
 
-#: src/msginit.c:462
+#: src/msginit.c:470
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
@@ -2223,14 +2290,14 @@ msgstr ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 
-#: src/msginit.c:794 src/msginit.c:862 src/msginit.c:1021 src/msginit.c:1100
-#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
-#: src/read-tcl.c:127 src/write-resources.c:105
+#: src/msginit.c:859 src/msginit.c:927 src/msginit.c:1086 src/msginit.c:1165
+#: src/read-csharp.c:84 src/read-java.c:82 src/read-resources.c:85
+#: src/read-tcl.c:128 src/write-resources.c:105
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr "%s subprocess failed with exit code %d"
 
-#: src/msginit.c:986
+#: src/msginit.c:1051
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2247,22 +2314,22 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1373
+#: src/msginit.c:1438
 #, c-format
 msgid "English translations for %s package"
 msgstr "English translations for %s package"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:88 src/msgl-iconv.c:215
+#: src/msgl-cat.c:179 src/msgl-charset.c:88 src/msgl-iconv.c:226
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "present charset “%s” is not a portable encoding name"
 
-#: src/msgl-cat.c:188 src/msgl-iconv.c:227
+#: src/msgl-cat.c:190 src/msgl-iconv.c:238
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "two different charsets “%s” and “%s” in input file"
 
-#: src/msgl-cat.c:203
+#: src/msgl-cat.c:205
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
@@ -2270,7 +2337,7 @@ msgstr ""
 "input file ‘%s’ doesn't contain a header entry with a charset "
 "specification"
 
-#: src/msgl-cat.c:207
+#: src/msgl-cat.c:209
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2279,19 +2346,19 @@ msgstr ""
 "domain “%s” in input file ‘%s’ doesn't contain a header entry "
 "with a charset specification"
 
-#: src/msgl-cat.c:384 src/msgl-iconv.c:331
+#: src/msgl-cat.c:392 src/msgl-iconv.c:343
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "target charset “%s” is not a portable encoding name."
 
-#: src/msgl-cat.c:434 src/msgl-cat.c:440 src/msgl-charset.c:94
+#: src/msgl-cat.c:443 src/msgl-cat.c:449 src/msgl-charset.c:94
 #: src/msgl-charset.c:129 src/po-xerror.c:123 src/po-xerror.c:148
-#: src/xgettext.c:2773
+#: src/xgettext.c:2778
 #, c-format
 msgid "warning: "
 msgstr "warning: "
 
-#: src/msgl-cat.c:435
+#: src/msgl-cat.c:444
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2300,7 +2367,7 @@ msgstr ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 
-#: src/msgl-cat.c:441
+#: src/msgl-cat.c:450
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2313,7 +2380,7 @@ msgstr ""
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 
-#: src/msgl-cat.c:479
+#: src/msgl-cat.c:489
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2457,70 +2524,70 @@ msgstr ""
 "message catalog has plural form translations, but lacks a header entry with "
 "“Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;”"
 
-#: src/msgl-check.c:498
+#: src/msgl-check.c:502
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgid_plural’ entries do not both begin with ‘\\n"
 "[0m’"
 
-#: src/msgl-check.c:506
+#: src/msgl-check.c:510
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgstr[%u]’ entries do not both begin with ‘\\n"
 "[0m’"
 
-#: src/msgl-check.c:521
+#: src/msgl-check.c:525
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgstr’ entries do not both begin with ‘\\n’"
 
-#: src/msgl-check.c:537
+#: src/msgl-check.c:543
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgid_plural’ entries do not both end with ‘\\n"
 "[0m’"
 
-#: src/msgl-check.c:545
+#: src/msgl-check.c:551
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgstr[%u]’ entries do not both end with ‘\\n’"
 
-#: src/msgl-check.c:560
+#: src/msgl-check.c:566
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr ""
 "‘msgid’ and ‘msgstr’ entries do not both end with ‘\\n’"
 
-#: src/msgl-check.c:572
+#: src/msgl-check.c:578
 msgid "plural handling is a GNU gettext extension"
 msgstr "plural handling is a GNU gettext extension"
 
-#: src/msgl-check.c:614
+#: src/msgl-check.c:620
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr lacks the keyboard accelerator mark ‘%c’"
 
-#: src/msgl-check.c:624
+#: src/msgl-check.c:630
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "msgstr has too many keyboard accelerator marks ‘%c’"
 
-#: src/msgl-check.c:664
+#: src/msgl-check.c:670
 #, c-format
 msgid "headerfield `%s' missing in header\n"
 msgstr "headerfield ‘%s’ missing in header\n"
 
-#: src/msgl-check.c:672
+#: src/msgl-check.c:678
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "header field ‘%s’ should start at beginning of line\n"
 
-#: src/msgl-check.c:686
+#: src/msgl-check.c:692
 msgid "some header fields still have the initial default value\n"
 msgstr "some header fields still have the initial default value\n"
 
-#: src/msgl-check.c:699
+#: src/msgl-check.c:705
 #, c-format
 msgid "field `%s' still has initial default value\n"
 msgstr "field ‘%s’ still has initial default value\n"
@@ -2536,12 +2603,12 @@ msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "%s: error while converting from “%s” encoding to “%s” encoding"
 
-#: src/msgl-iconv.c:251
+#: src/msgl-iconv.c:262
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "input file doesn't contain a header entry with a charset specification"
 
-#: src/msgl-iconv.c:273 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
-#: src/x-python.c:618 src/xgettext.c:616
+#: src/msgl-iconv.c:284 src/recode-sr-latin.c:284 src/recode-sr-latin.c:289
+#: src/x-python.c:618 src/xgettext.c:618
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2550,7 +2617,7 @@ msgstr ""
 "Cannot convert from “%s” to “%s”. %s relies on iconv(), and iconv"
 "() does not support this conversion."
 
-#: src/msgl-iconv.c:302
+#: src/msgl-iconv.c:314
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2559,8 +2626,8 @@ msgstr ""
 "Conversion from “%s” to “%s” introduces duplicates: some "
 "different msgids become equal."
 
-#: src/msgl-iconv.c:308 src/recode-sr-latin.c:298 src/x-python.c:625
-#: src/xgettext.c:623
+#: src/msgl-iconv.c:320 src/recode-sr-latin.c:298 src/x-python.c:625
+#: src/xgettext.c:625
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2569,16 +2636,16 @@ msgstr ""
 "Cannot convert from “%s” to “%s”. %s relies on iconv(). This "
 "version was built without iconv()."
 
-#: src/msgmerge.c:342 src/msgmerge.c:348
+#: src/msgmerge.c:361 src/msgmerge.c:367
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s is only valid with %s"
 
-#: src/msgmerge.c:402
+#: src/msgmerge.c:421
 msgid "backup type"
 msgstr "backup type"
 
-#: src/msgmerge.c:437
+#: src/msgmerge.c:458
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2601,17 +2668,17 @@ msgstr ""
 "comments and file positions will be preserved.  Where an exact match\n"
 "cannot be found, fuzzy matching is used to produce better results.\n"
 
-#: src/msgmerge.c:454
+#: src/msgmerge.c:475
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      translations referring to old sources\n"
 
-#: src/msgmerge.c:456
+#: src/msgmerge.c:477
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     references to new sources\n"
 
-#: src/msgmerge.c:460
+#: src/msgmerge.c:481
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2620,7 +2687,7 @@ msgstr ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 
-#: src/msgmerge.c:466
+#: src/msgmerge.c:487
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2629,27 +2696,27 @@ msgstr ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 
-#: src/msgmerge.c:478
+#: src/msgmerge.c:499
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "Output file location in update mode:\n"
 
-#: src/msgmerge.c:480
+#: src/msgmerge.c:501
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "The result is written back to def.po.\n"
 
-#: src/msgmerge.c:482
+#: src/msgmerge.c:503
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        make a backup of def.po\n"
 
-#: src/msgmerge.c:484
+#: src/msgmerge.c:505
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFFIX         override the usual backup suffix\n"
 
-#: src/msgmerge.c:486
+#: src/msgmerge.c:507
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2668,7 +2735,7 @@ msgstr ""
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 
-#: src/msgmerge.c:493
+#: src/msgmerge.c:514
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2679,27 +2746,34 @@ msgstr ""
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 
-#: src/msgmerge.c:502
+#: src/msgmerge.c:523
 #, c-format
 msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 msgstr "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
 
-#: src/msgmerge.c:551
+#: src/msgmerge.c:525
+#, c-format
+msgid ""
+"      --previous              keep previous msgids of translated messages\n"
+msgstr ""
+"      --previous              keep previous msgids of translated messages\n"
+
+#: src/msgmerge.c:574
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       suppress progress indicators\n"
 
-#: src/msgmerge.c:1201
+#: src/msgmerge.c:1318
 #, c-format
 msgid "this message should define plural forms"
 msgstr "this message should define plural forms"
 
-#: src/msgmerge.c:1224
+#: src/msgmerge.c:1341
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "this message should not define plural forms"
 
-#: src/msgmerge.c:1418
+#: src/msgmerge.c:1679
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2708,26 +2782,26 @@ msgstr ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 
-#: src/msgmerge.c:1426
+#: src/msgmerge.c:1687
 msgid " done.\n"
 msgstr " done.\n"
 
-#: src/msgunfmt.c:293 src/msgunfmt.c:302 src/msgunfmt.c:325
+#: src/msgunfmt.c:297 src/msgunfmt.c:306 src/msgunfmt.c:329
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s and explicit file names are mutually exclusive"
 
-#: src/msgunfmt.c:412
+#: src/msgunfmt.c:416
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr "Usage: %s [OPTION] [FILE]...\n"
 
-#: src/msgunfmt.c:416
+#: src/msgunfmt.c:420
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr "Convert binary message catalog to Uniforum style .po file.\n"
 
-#: src/msgunfmt.c:425
+#: src/msgunfmt.c:429
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
@@ -2736,12 +2810,12 @@ msgstr ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 
-#: src/msgunfmt.c:427
+#: src/msgunfmt.c:431
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
 msgstr "      --csharp                C# mode: input is a .NET .dll file\n"
 
-#: src/msgunfmt.c:429
+#: src/msgunfmt.c:433
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
@@ -2750,24 +2824,24 @@ msgstr ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 
-#: src/msgunfmt.c:431
+#: src/msgunfmt.c:435
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 
-#: src/msgunfmt.c:436
+#: src/msgunfmt.c:440
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
 msgstr "  FILE ...                    input .mo files\n"
 
-#: src/msgunfmt.c:441
+#: src/msgunfmt.c:445
 #, c-format
 msgid "Input file location in Java mode:\n"
 msgstr "Input file location in Java mode:\n"
 
-#: src/msgunfmt.c:447
+#: src/msgunfmt.c:451
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -2778,12 +2852,12 @@ msgstr ""
 "name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 
-#: src/msgunfmt.c:452
+#: src/msgunfmt.c:456
 #, c-format
 msgid "Input file location in C# mode:\n"
 msgstr "Input file location in C# mode:\n"
 
-#: src/msgunfmt.c:460
+#: src/msgunfmt.c:464
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
@@ -2792,12 +2866,12 @@ msgstr ""
 "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"
 
-#: src/msgunfmt.c:464
+#: src/msgunfmt.c:468
 #, c-format
 msgid "Input file location in Tcl mode:\n"
 msgstr "Input file location in Tcl mode:\n"
 
-#: src/msgunfmt.c:470
+#: src/msgunfmt.c:474
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
@@ -2806,17 +2880,17 @@ msgstr ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 
-#: src/msgunfmt.c:490
+#: src/msgunfmt.c:494
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
 msgstr "  -i, --indent                write indented output style\n"
 
-#: src/msgunfmt.c:492
+#: src/msgunfmt.c:496
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
 msgstr "      --strict                write strict uniforum style\n"
 
-#: src/msguniq.c:311
+#: src/msguniq.c:319
 #, c-format, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -2837,12 +2911,12 @@ msgstr ""
 "specified, they will be taken from the first translation.  File positions\n"
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 
-#: src/msguniq.c:344
+#: src/msguniq.c:352
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
 msgstr "  -d, --repeated              print only duplicates\n"
 
-#: src/msguniq.c:346
+#: src/msguniq.c:354
 #, c-format
 msgid ""
 "  -u, --unique                print only unique messages, discard "
@@ -2851,6 +2925,11 @@ msgstr ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:103
+#: libgettextpo/gettext-po.c:148 libgettextpo/gettext-po.c:193
+msgid "<stdin>"
+msgstr "<stdin>"
+
 #: src/po-charset.c:490
 #, c-format
 msgid ""
@@ -2907,27 +2986,27 @@ msgstr ""
 msgid "inconsistent use of #~"
 msgstr "inconsistent use of #~"
 
-#: src/po-gram-gen.y:201
+#: src/po-gram-gen.y:241
 #, c-format
 msgid "missing `msgstr[]' section"
 msgstr "missing ‘msgstr[]’ section"
 
-#: src/po-gram-gen.y:209
+#: src/po-gram-gen.y:250
 #, c-format
 msgid "missing `msgid_plural' section"
 msgstr "missing ‘msgid_plural’ section"
 
-#: src/po-gram-gen.y:216
+#: src/po-gram-gen.y:258
 #, c-format
 msgid "missing `msgstr' section"
 msgstr "missing ‘msgstr’ section"
 
-#: src/po-gram-gen.y:278
+#: src/po-gram-gen.y:397
 #, c-format
 msgid "first plural form has nonzero index"
 msgstr "first plural form has nonzero index"
 
-#: src/po-gram-gen.y:280
+#: src/po-gram-gen.y:399
 #, c-format
 msgid "plural form has wrong index"
 msgstr "plural form has wrong index"
@@ -2937,7 +3016,7 @@ msgstr "plural form has wrong index"
 msgid "too many errors, aborting"
 msgstr "too many errors, aborting"
 
-#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:554 src/write-po.c:669
+#: src/po-lex.c:440 src/po-lex.c:510 src/write-po.c:512 src/write-po.c:627
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "invalid multibyte sequence"
@@ -2956,64 +3035,64 @@ msgstr "incomplete multibyte sequence at end of line"
 msgid "iconv failure"
 msgstr "iconv failure"
 
-#: src/po-lex.c:731
+#: src/po-lex.c:747
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "keyword “%s” unknown"
 
-#: src/po-lex.c:841
+#: src/po-lex.c:857
 #, c-format
 msgid "invalid control sequence"
 msgstr "invalid control sequence"
 
-#: src/po-lex.c:949
+#: src/po-lex.c:984
 #, c-format
 msgid "end-of-file within string"
 msgstr "end-of-file within string"
 
-#: src/po-lex.c:955
+#: src/po-lex.c:990
 #, c-format
 msgid "end-of-line within string"
 msgstr "end-of-line within string"
 
-#: src/po-lex.c:976
+#: src/po-lex.c:1011
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "context separator <EOT> within string"
 
-#: src/read-mo.c:98 src/read-mo.c:119 src/read-mo.c:165 src/read-mo.c:192
+#: src/read-catalog.c:328 src/xgettext.c:907
+#, c-format
+msgid "this file may not contain domain directives"
+msgstr "this file may not contain domain directives"
+
+#: src/read-catalog.c:373
+msgid "duplicate message definition"
+msgstr "duplicate message definition"
+
+#: src/read-catalog.c:375
+msgid "this is the location of the first definition"
+msgstr "this is the location of the first definition"
+
+#: src/read-mo.c:101 src/read-mo.c:122 src/read-mo.c:168 src/read-mo.c:195
 #, c-format
 msgid "file \"%s\" is truncated"
 msgstr "file “%s” is truncated"
 
-#: src/read-mo.c:122
+#: src/read-mo.c:125
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
 msgstr "file “%s” contains a not NUL terminated string"
 
-#: src/read-mo.c:158 src/read-mo.c:267
+#: src/read-mo.c:161 src/read-mo.c:270
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
 msgstr "file “%s” is not in GNU .mo format"
 
-#: src/read-mo.c:171
+#: src/read-mo.c:174
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
 msgstr "file “%s” contains a not NUL terminated string, at %s"
 
-#: src/read-po.c:322 src/xgettext.c:905
-#, c-format
-msgid "this file may not contain domain directives"
-msgstr "this file may not contain domain directives"
-
-#: src/read-po.c:364
-msgid "duplicate message definition"
-msgstr "duplicate message definition"
-
-#: src/read-po.c:366
-msgid "this is the location of the first definition"
-msgstr "this is the location of the first definition"
-
 #: src/read-properties.c:223
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
 msgstr "warning: invalid \\uxxxx syntax for Unicode character"
@@ -3026,15 +3105,15 @@ msgstr "warning: unterminated string"
 msgid "warning: syntax error"
 msgstr "warning: syntax error"
 
-#: src/read-stringtable.c:873 src/read-stringtable.c:894
+#: src/read-stringtable.c:873 src/read-stringtable.c:895
 msgid "warning: unterminated key/value pair"
 msgstr "warning: unterminated key/value pair"
 
-#: src/read-stringtable.c:939
+#: src/read-stringtable.c:941
 msgid "warning: syntax error, expected ';' after string"
 msgstr "warning: syntax error, expected ‘;’ after string"
 
-#: src/read-stringtable.c:948
+#: src/read-stringtable.c:950
 msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr "warning: syntax error, expected ‘=’ or ‘;’ after string"
 
@@ -3070,7 +3149,7 @@ msgstr ""
 msgid "input is not valid in \"%s\" encoding"
 msgstr "input is not valid in “%s” encoding"
 
-#: src/recode-sr-latin.c:350
+#: src/recode-sr-latin.c:349
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "error while converting from “%s” encoding to “%s” encoding"
@@ -3099,6 +3178,58 @@ msgstr ""
 msgid "error writing stdout"
 msgstr "error writing stdout"
 
+#: src/write-catalog.c:102
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+msgstr ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format. Try using PO file syntax instead."
+
+#: src/write-catalog.c:105
+msgid ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+msgstr ""
+"Cannot output multiple translation domains into a single file with the "
+"specified output format."
+
+#: src/write-catalog.c:138
+msgid ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+msgstr ""
+"message catalog has context dependent translations, but the output format "
+"does not support them."
+
+#: src/write-catalog.c:173
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using \"msgfmt --java\", instead "
+"of a properties file."
+msgstr ""
+"message catalog has plural form translations, but the output format does not "
+"support them. Try generating a Java class using “msgfmt --java”, "
+"instead of a properties file."
+
+#: src/write-catalog.c:178
+msgid ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+msgstr ""
+"message catalog has plural form translations, but the output format does not "
+"support them."
+
+#: src/write-catalog.c:195
+#, c-format
+msgid "cannot create output file \"%s\""
+msgstr "cannot create output file “%s”"
+
+#: src/write-catalog.c:204
+#, no-c-format
+msgid "standard output"
+msgstr "standard output"
+
 #: src/write-csharp.c:618
 msgid ""
 "message catalog has context dependent translations\n"
@@ -3140,7 +3271,7 @@ msgstr "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgid "error while opening \"%s\" for writing"
 msgstr "error while opening “%s” for writing"
 
-#: src/write-po.c:609
+#: src/write-po.c:567
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -3148,7 +3279,7 @@ msgstr ""
 "internationalized messages should not contain the ‘\\%c’ escape "
 "sequence"
 
-#: src/write-po.c:861 src/write-po.c:951
+#: src/write-po.c:848 src/write-po.c:961
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3161,7 +3292,7 @@ msgstr ""
 "different from yours. Consider using a pure ASCII msgctxt instead.\n"
 "%s\n"
 
-#: src/write-po.c:873 src/write-po.c:963
+#: src/write-po.c:860 src/write-po.c:973
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3174,58 +3305,6 @@ msgstr ""
 "different from yours. Consider using a pure ASCII msgid instead.\n"
 "%s\n"
 
-#: src/write-po.c:1114
-msgid ""
-"Cannot output multiple translation domains into a single file with Java ."
-"properties syntax. Try using PO file syntax instead."
-msgstr ""
-"Cannot output multiple translation domains into a single file with Java ."
-"properties syntax. Try using PO file syntax instead."
-
-#: src/write-po.c:1117
-msgid ""
-"Cannot output multiple translation domains into a single file with NeXTstep/"
-"GNUstep .strings syntax."
-msgstr ""
-"Cannot output multiple translation domains into a single file with NeXTstep/"
-"GNUstep .strings syntax."
-
-#: src/write-po.c:1144
-msgid ""
-"message catalog has context dependent translations, but the output format "
-"does not support them."
-msgstr ""
-"message catalog has context dependent translations, but the output format "
-"does not support them."
-
-#: src/write-po.c:1167
-msgid ""
-"message catalog has plural form translations, but the output format does not "
-"support them. Try generating a Java class using \"msgfmt --java\", instead "
-"of a properties file."
-msgstr ""
-"message catalog has plural form translations, but the output format does not "
-"support them. Try generating a Java class using “msgfmt --java”, "
-"instead of a properties file."
-
-#: src/write-po.c:1172
-msgid ""
-"message catalog has plural form translations, but the output format does not "
-"support them."
-msgstr ""
-"message catalog has plural form translations, but the output format does not "
-"support them."
-
-#: src/write-po.c:1189
-#, c-format
-msgid "cannot create output file \"%s\""
-msgstr "cannot create output file “%s”"
-
-#: src/write-po.c:1198
-#, no-c-format
-msgid "standard output"
-msgstr "standard output"
-
 #: src/write-qt.c:671
 msgid ""
 "message catalog has plural form translations\n"
@@ -3313,7 +3392,7 @@ msgstr "%s:%d: warning: unterminated character constant"
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: warning: unterminated string literal"
 
-#: src/x-csharp.c:216 src/xgettext.c:1849
+#: src/x-csharp.c:216 src/xgettext.c:1854
 #, c-format
 msgid ""
 "Non-ASCII string at %s%s.\n"
@@ -3411,35 +3490,35 @@ msgstr ""
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: can't find string terminator “%s” anywhere before EOF"
 
-#: src/x-perl.c:1032
+#: src/x-perl.c:1033
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: missing right brace on \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1152
+#: src/x-perl.c:1153
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 "%s:%d: invalid interpolation (“\\l”) of 8bit character “%c”"
 
-#: src/x-perl.c:1172
+#: src/x-perl.c:1173
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 "%s:%d: invalid interpolation (“\\u”) of 8bit character “%c”"
 
-#: src/x-perl.c:1206
+#: src/x-perl.c:1207
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: invalid variable interpolation at “%c”"
 
-#: src/x-perl.c:1219
+#: src/x-perl.c:1220
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 "%s:%d: invalid interpolation (“\\L”) of 8bit character “%c”"
 
-#: src/x-perl.c:1236
+#: src/x-perl.c:1237
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
@@ -3540,27 +3619,27 @@ msgstr ""
 "%s:%lu: warning: the syntax $“...” is deprecated due to security "
 "reasons; use eval_gettext instead"
 
-#: src/xgettext.c:545
+#: src/xgettext.c:547
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing cannot be used when output is written to stdout"
 
-#: src/xgettext.c:550
+#: src/xgettext.c:552
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext cannot work without keywords to look for"
 
-#: src/xgettext.c:693
+#: src/xgettext.c:695
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "warning: file ‘%s’ extension ‘%s’ is unknown; will try C"
 
-#: src/xgettext.c:744
+#: src/xgettext.c:746
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Extract translatable strings from given input files.\n"
 
-#: src/xgettext.c:767
+#: src/xgettext.c:769
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3569,24 +3648,24 @@ msgstr ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 
-#: src/xgettext.c:769
+#: src/xgettext.c:771
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           write output to specified file\n"
 
-#: src/xgettext.c:771
+#: src/xgettext.c:773
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 
-#: src/xgettext.c:776
+#: src/xgettext.c:778
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Choice of input file language:\n"
 
-#: src/xgettext.c:778
+#: src/xgettext.c:780
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3605,12 +3684,12 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:784
+#: src/xgettext.c:786
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   shorthand for --language=C++\n"
 
-#: src/xgettext.c:786
+#: src/xgettext.c:788
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3619,7 +3698,7 @@ msgstr ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:793
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3628,22 +3707,22 @@ msgstr ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:794
+#: src/xgettext.c:796
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "By default the input files are assumed to be in ASCII.\n"
 
-#: src/xgettext.c:799
+#: src/xgettext.c:801
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         join messages with existing file\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:803
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 
-#: src/xgettext.c:803
+#: src/xgettext.c:805
 #, c-format
 msgid ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
@@ -3652,17 +3731,17 @@ msgstr ""
 "  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
 "                              preceding keyword lines) in output file\n"
 
-#: src/xgettext.c:807
+#: src/xgettext.c:809
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Language specific options:\n"
 
-#: src/xgettext.c:809
+#: src/xgettext.c:811
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           extract all strings\n"
 
-#: src/xgettext.c:811 src/xgettext.c:818
+#: src/xgettext.c:813 src/xgettext.c:820
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3675,7 +3754,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:815
+#: src/xgettext.c:817
 #, c-format
 msgid ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
@@ -3684,7 +3763,7 @@ msgstr ""
 "  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
 "                              WORD means not to use default keywords)\n"
 
-#: src/xgettext.c:822
+#: src/xgettext.c:824
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3695,7 +3774,7 @@ msgstr ""
 "argument\n"
 "                              number ARG of keyword WORD\n"
 
-#: src/xgettext.c:825
+#: src/xgettext.c:827
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3708,63 +3787,63 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:829
+#: src/xgettext.c:831
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:833
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (only languages C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:833
+#: src/xgettext.c:835
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    recognize Qt format strings\n"
 
-#: src/xgettext.c:835 src/xgettext.c:839
+#: src/xgettext.c:837 src/xgettext.c:841
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (only language C++)\n"
 
-#: src/xgettext.c:837
+#: src/xgettext.c:839
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 recognize Boost format strings\n"
 
-#: src/xgettext.c:841
+#: src/xgettext.c:843
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 more detailed formatstring recognition result\n"
 
-#: src/xgettext.c:860
+#: src/xgettext.c:862
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     write out a Java .properties file\n"
 
-#: src/xgettext.c:875
+#: src/xgettext.c:877
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=STRING  set copyright holder in output\n"
 
-#: src/xgettext.c:877
+#: src/xgettext.c:879
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 
-#: src/xgettext.c:879
+#: src/xgettext.c:881
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 
-#: src/xgettext.c:881
+#: src/xgettext.c:883
 #, c-format
 msgid ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
@@ -3773,7 +3852,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
 "entries\n"
 
-#: src/xgettext.c:883
+#: src/xgettext.c:885
 #, c-format
 msgid ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
@@ -3782,7 +3861,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
 "entries\n"
 
-#: src/xgettext.c:1644
+#: src/xgettext.c:1649
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
@@ -3791,16 +3870,16 @@ msgstr ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
 "s"
 
-#: src/xgettext.c:1745
+#: src/xgettext.c:1750
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:1925 src/xgettext.c:1958 src/xgettext.c:2016
+#: src/xgettext.c:1930 src/xgettext.c:1963 src/xgettext.c:2021
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: warning: "
 
-#: src/xgettext.c:1928
+#: src/xgettext.c:1933
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3809,7 +3888,7 @@ msgstr ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 
-#: src/xgettext.c:1929
+#: src/xgettext.c:1934
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
@@ -3818,7 +3897,7 @@ msgstr ""
 "Although declared as such, the %s is not a valid %s format string. Reason: %"
 "s\n"
 
-#: src/xgettext.c:1960
+#: src/xgettext.c:1965
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3832,7 +3911,7 @@ msgstr ""
 "Please consider using a format string with named arguments,\n"
 "and a mapping instead of a tuple for the arguments.\n"
 
-#: src/xgettext.c:2018
+#: src/xgettext.c:2023
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3842,27 +3921,27 @@ msgstr ""
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 
-#: src/xgettext.c:2621
+#: src/xgettext.c:2626
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "ambiguous argument specification for keyword ‘%.*s’"
 
-#: src/xgettext.c:2648
+#: src/xgettext.c:2653
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "warning: missing context for keyword ‘%.*s’"
 
-#: src/xgettext.c:2673
+#: src/xgettext.c:2678
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "warning: missing context for plural argument of keyword ‘%.*s’"
 
-#: src/xgettext.c:2694
+#: src/xgettext.c:2699
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "context mismatch between singular and plural form"
 
-#: src/xgettext.c:2774
+#: src/xgettext.c:2779
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3874,7 +3953,11 @@ msgstr ""
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 
-#: src/xgettext.c:2975
+#: src/xgettext.c:2978
 #, c-format
 msgid "language `%s' unknown"
 msgstr "language ‘%s’ unknown"
+
+#: libgettextpo/gettext-po.c:85
+msgid "<unnamed>"
+msgstr "<unnamed>"