gettext 3.0.5 → 3.0.6

data/po/el/gettext.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ruby-gettext 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-20 22:54+0900\n"
+"POT-Creation-Date: 2014-02-02 23:46+0900\n"
 "PO-Revision-Date: 2006-01-06 19:50+0100\n"
 "Last-Translator: damphyr <damphyr@gmx.net>\n"
 "Language-Team: Greek\n"
@@ -29,6 +29,76 @@ msgstr "Η τρίτη παράμετρος είναι λανθασμένη: valu
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 
+#: ../lib/gettext/tools/msgcat.rb:172
+msgid "Usage: %s [OPTIONS] PO_FILE1 PO_FILE2 ..."
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:174
+msgid "Concatenates and merges PO files."
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:176 ../lib/gettext/tools/msgfmt.rb:86
+#: ../lib/gettext/tools/msginit.rb:89 ../lib/gettext/tools/msgmerge.rb:329
+#: ../lib/gettext/tools/xgettext.rb:248
+msgid "Specific options:"
+msgstr "Ειδικές παράμετροι:"
+
+#: ../lib/gettext/tools/msgcat.rb:180
+msgid "(default: the standard output)"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:185 ../lib/gettext/tools/msgcat.rb:202
+#: ../lib/gettext/tools/msgmerge.rb:342 ../lib/gettext/tools/msgmerge.rb:361
+#: ../lib/gettext/tools/xgettext.rb:302
+msgid "Sort output by msgid"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:190 ../lib/gettext/tools/msgcat.rb:195
+#: ../lib/gettext/tools/msgmerge.rb:349 ../lib/gettext/tools/msgmerge.rb:356
+msgid "Sort output by location"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:196 ../lib/gettext/tools/msgmerge.rb:350
+msgid "It is same as --sort-by-location"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:197 ../lib/gettext/tools/msgcat.rb:204
+#: ../lib/gettext/tools/msgmerge.rb:344 ../lib/gettext/tools/msgmerge.rb:351
+msgid "Just for GNU gettext's msgcat compatibility"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:203 ../lib/gettext/tools/msgmerge.rb:343
+msgid "It is same as --sort-by-msgid"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:209
+msgid "Remove location information"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:214
+msgid "Remove all comments"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:219 ../lib/gettext/tools/msgmerge.rb:371
+#: ../lib/gettext/tools/xgettext.rb:312
+msgid "Set output page width"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgmerge.rb:377
+#: ../lib/gettext/tools/xgettext.rb:318
+msgid ""
+"Break long message lines, longer than the output page width, into several line"
+"s"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:236
+msgid "Ignore fuzzy entries"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:241
+msgid "Don't report warning messages"
+msgstr ""
+
 #: ../lib/gettext/tools/msgfmt.rb:65
 #, fuzzy
 msgid "no input files specified."
@@ -42,16 +112,11 @@ msgstr "Χρήση: %s input.po [-o output.mo]"
 msgid "Generate binary message catalog from textual translation description."
 msgstr "Δημιουργία καταλόγου μυνημάτων από τη μετάφραση"
 
-#: ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:89
-#: ../lib/gettext/tools/msgmerge.rb:266 ../lib/gettext/tools/xgettext.rb:218
-msgid "Specific options:"
-msgstr "Ειδικές παράμετροι:"
-
-#: ../lib/gettext/tools/msgfmt.rb:89 ../lib/gettext/tools/xgettext.rb:221
+#: ../lib/gettext/tools/msgfmt.rb:89 ../lib/gettext/tools/xgettext.rb:251
 msgid "write output to specified file"
 msgstr "εγγραφή στο καθορισμένο αρχείο"
 
-#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:271
+#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:349
 msgid "display version information and exit"
 msgstr "πληροφορίες έκδοσης και έξοδος"
 
@@ -79,7 +144,7 @@ msgid ""
 " locale on your environment."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:317
+#: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:398
 msgid "Display this help and exit"
 msgstr ""
 
@@ -108,18 +173,14 @@ msgstr ""
 msgid "file '%s' has already existed."
 msgstr "Το αρχείο '%s' προϋπάρχει."
 
-#: ../lib/gettext/tools/msginit.rb:200
+#: ../lib/gettext/tools/msginit.rb:202
 msgid "Please enter your full name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:229
+#: ../lib/gettext/tools/msginit.rb:231
 msgid "Please enter your email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:255
-msgid "Usage: %s [OPTIONS] definition.po reference.pot"
-msgstr ""
-
 #: ../lib/gettext/tools/msgmerge.rb:258
 #, fuzzy
 msgid ""
@@ -133,125 +194,131 @@ msgstr ""
 "υ κατασκευάστηκε και έχει ενημερωμένες αναφορές κώδικα. Το ref.pot κατασκευάζε"
 "ται γενικά από το rgettext"
 
-#: ../lib/gettext/tools/msgmerge.rb:269
-msgid "Update definition.po"
-msgstr ""
-
 #: ../lib/gettext/tools/msgmerge.rb:274
 #, fuzzy
 msgid "Write output to specified file"
 msgstr "εγγραφή στο καθορισμένο αρχείο"
 
-#: ../lib/gettext/tools/msgmerge.rb:279
-msgid "Generate sorted output"
+#: ../lib/gettext/tools/msgmerge.rb:318
+msgid "Usage: %s [OPTIONS] definition.po reference.pot"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:284
-msgid "Sort output by file location"
-msgstr ""
+#: ../lib/gettext/tools/msgmerge.rb:323
+#, fuzzy
+msgid "Display version information and exit"
+msgstr "πληροφορίες έκδοσης και έξοδος"
 
-#: ../lib/gettext/tools/msgmerge.rb:289
-msgid "Sort output by msgid"
+#: ../lib/gettext/tools/msgmerge.rb:332
+msgid "Update definition.po"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:294
+#: ../lib/gettext/tools/msgmerge.rb:366 ../lib/gettext/tools/xgettext.rb:307
 msgid "Preserve '#: FILENAME:LINE' lines"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:299
-msgid "Set output page width"
+#: ../lib/gettext/tools/msgmerge.rb:388
+msgid "Disable fuzzy matching"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:305
-msgid ""
-"Break long message lines, longer than the output page width, into several line"
-"s"
+#: ../lib/gettext/tools/msgmerge.rb:389
+msgid "(enable)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:323
-#, fuzzy
-msgid "Display version information and exit"
-msgstr "πληροφορίες έκδοσης και έξοδος"
+#: ../lib/gettext/tools/msgmerge.rb:394
+msgid "Don't output obsolete entries"
+msgstr ""
 
 #: ../lib/gettext/tools/parser/glade.rb:32
 msgid "`%{file}' is not glade-2.0 format."
 msgstr "το `%{file}' δεν είναι σε μορφή glade-2.0."
 
-#: ../lib/gettext/tools/xgettext.rb:64
+#: ../lib/gettext/tools/xgettext.rb:65
 msgid "'%{klass}' is ignored."
 msgstr "το %{klass}' θα αγνοηθεί."
 
-#: ../lib/gettext/tools/xgettext.rb:183
+#: ../lib/gettext/tools/xgettext.rb:170
 msgid "Error parsing %{path}"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:194
+#: ../lib/gettext/tools/xgettext.rb:229
 msgid "no input files"
 msgstr "που είναι τα αρχεία εισόδου ρε;"
 
-#: ../lib/gettext/tools/xgettext.rb:212
+#: ../lib/gettext/tools/xgettext.rb:242
 msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
 msgstr "Χρήση: %s input.rb [-r parser.rb] [-o output.pot]"
 
-#: ../lib/gettext/tools/xgettext.rb:215
+#: ../lib/gettext/tools/xgettext.rb:243
+#, fuzzy
+msgid "require the library before executing xgettext"
+msgstr "Κάντε χρήση της βιβλιοθήκης (require) πριν από την εκτέλεση του rgettext"
+
+#: ../lib/gettext/tools/xgettext.rb:245
 msgid "Extract translatable strings from given input files."
 msgstr "Εξαγωγή μεταφράσεων από αρχεία εισόδου."
 
-#: ../lib/gettext/tools/xgettext.rb:226
+#: ../lib/gettext/tools/xgettext.rb:251
+#, fuzzy
+msgid "display this help and exit"
+msgstr "πληροφορίες έκδοσης και έξοδος"
+
+#: ../lib/gettext/tools/xgettext.rb:256
 msgid "set package name in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:231
+#: ../lib/gettext/tools/xgettext.rb:262
 msgid "set package version in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:236
-msgid "set report address for msgid bugs"
+#: ../lib/gettext/tools/xgettext.rb:268
+msgid "set report e-mail address for msgid bugs"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:241
+#: ../lib/gettext/tools/xgettext.rb:274
 msgid "set copyright holder in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:243
-#, fuzzy
-msgid "require the library before executing xgettext"
-msgstr "Κάντε χρήση της βιβλιοθήκης (require) πριν από την εκτέλεση του rgettext"
+#: ../lib/gettext/tools/xgettext.rb:280
+msgid "set copyright year in output"
+msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:246
+#: ../lib/gettext/tools/xgettext.rb:286
 msgid "set encoding for output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:251
-#, fuzzy
-msgid "display this help and exit"
-msgstr "πληροφορίες έκδοσης και έξοδος"
+#: ../lib/gettext/tools/xgettext.rb:292
+msgid "Generate sorted output"
+msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:256
+#: ../lib/gettext/tools/xgettext.rb:297
+msgid "Sort output by file location"
+msgstr ""
+
+#: ../lib/gettext/tools/xgettext.rb:334
 msgid ""
 "If TAG is specified, place comment blocks starting with TAG and precedding key"
 "word lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:257
+#: ../lib/gettext/tools/xgettext.rb:335
 msgid ""
 "If TAG is not specified, place all comment blocks preceing keyword lines in ou"
 "tput file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:258
+#: ../lib/gettext/tools/xgettext.rb:336
 msgid "(default: %s)"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:258
+#: ../lib/gettext/tools/xgettext.rb:336
 msgid "no TAG"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:262
+#: ../lib/gettext/tools/xgettext.rb:340
 msgid "run in debugging mode"
 msgstr "εκτέλεση σε debugging mode"
 
-#: ../lib/gettext/tools/xgettext.rb:320
+#: ../lib/gettext/tools/xgettext.rb:375
 msgid ""
 "Warning: The empty \"\" msgid is reserved by gettext. So gettext(\"\") doesn't ret"
 "urns empty string but the header entry in po file."
@@ -262,19 +329,22 @@ msgid "This message is from hellolib."
 msgstr ""
 
 #: ../samples/hello.rb:17
-msgid "Hello World\n"
+msgid ""
+"Hello World\n"
 msgstr ""
 
 #: ../samples/hello2.rb:19
-msgid "One is %{num}\n"
+msgid ""
+"One is %{num}\n"
 msgstr ""
 
 #: ../samples/hello2.rb:20
-msgid "Hello %{world}\n"
+msgid "World"
 msgstr ""
 
 #: ../samples/hello2.rb:20
-msgid "World"
+msgid ""
+"Hello %{world}\n"
 msgstr ""
 
 #: ../samples/hello_glade2.glade:9 ../test/fixtures/gladeparser.glade:8
@@ -297,16 +367,18 @@ msgid "hello, gtk world"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World"
+msgid "Hello World2"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World2"
+msgid "Hello World"
 msgstr ""
 
 #: ../samples/hello_plural.rb:20
-msgid "There is an apple.\n"
-msgid_plural "There are %{num} apples.\n"
+msgid ""
+"There is an apple.\n"
+msgid_plural ""
+"There are %{num} apples.\n"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -322,7 +394,8 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../test/fixtures/N_.rb:14 ../test/fixtures/_.rb:34
-msgid "aaa\n"
+msgid ""
+"aaa\n"
 msgstr ""
 
 #: ../test/fixtures/N_.rb:18 ../test/fixtures/_.rb:38
@@ -448,11 +521,11 @@ msgid ""
 msgstr ""
 
 #: ../test/fixtures/_/multiple_messages_in_same_line.rb:28
-msgid "multiple"
+msgid "in same line"
 msgstr ""
 
 #: ../test/fixtures/_/multiple_messages_in_same_line.rb:28
-msgid "in same line"
+msgid "multiple"
 msgstr ""
 
 #: ../test/fixtures/_/multiple_same_messages.rb:28
@@ -465,7 +538,8 @@ msgid "one line"
 msgstr ""
 
 #: ../test/fixtures/_/one_new_line.rb:28
-msgid "one new line\n"
+msgid ""
+"one new line\n"
 msgstr ""
 
 #: ../test/fixtures/backslash.rb:27
@@ -539,7 +613,8 @@ msgid "no data"
 msgstr ""
 
 #: ../test/fixtures/n_.rb:33
-msgid "bbb\n"
+msgid ""
+"bbb\n"
 msgid_plural ""
 "ccc2\n"
 "ccc2"
@@ -802,31 +877,18 @@ msgstr[1] ""
 msgid "a translation"
 msgstr ""
 
-#: ../lib/gettext/tools.rb:81
 #~ msgid "Failed to merge with %{defpo}"
 #~ msgstr "Αποτυχία συγχώνευσης με %{defpo}"
-
-#: ../lib/gettext/tools.rb:82
 #~ msgid "New .pot was copied to %{failed_filename}"
 #~ msgstr "Ελέγξτε το καινούργιο .pot στο %{failed_filename}"
-
-#: ../lib/gettext/tools.rb:83
 #~ msgid "Check these po/pot-files. It may have syntax errors or something wrong."
 #~ msgstr "Ελέγξτε τα αρχεία .po/.pot. Μπορεί να υπάρχουν συντακτικά λάθη"
-
-#: ../lib/gettext/tools/msgmerge.rb:453
 #~ msgid "definition po is not given."
 #~ msgstr "το αρχείο ορισμών .po δε δόθηκε."
-
-#: ../lib/gettext/tools/msgmerge.rb:455
 #~ msgid "reference pot is not given."
 #~ msgstr "το αρχείο αναφοράς .pot δε δόθηκε."
-
-#: ../lib/gettext/tools/msgmerge.rb:463
 #~ msgid "Usage: %s def.po ref.pot [-o output.pot]"
 #~ msgstr "Χρήση: %s def.po ref.pot [-o output.pot]"
-
-#: ../lib/gettext/tools/msgmerge.rb:466
 #~ msgid ""
 #~ "Merges two Uniforum style .po files together. The def.po file is an existing P"
 #~ "O file with translations. The ref.pot file is the last created PO file with up"

data/po/eo/gettext.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ruby-gettext 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-20 22:54+0900\n"
+"POT-Creation-Date: 2014-02-02 23:46+0900\n"
 "PO-Revision-Date: 2008-07-13 10:16+0200\n"
 "Last-Translator: Malte Milatz\n"
 "Language-Team: Esperanto\n"
@@ -31,6 +31,76 @@ msgstr "Malĝusta tria parametro: valoro = %{number}"
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 
+#: ../lib/gettext/tools/msgcat.rb:172
+msgid "Usage: %s [OPTIONS] PO_FILE1 PO_FILE2 ..."
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:174
+msgid "Concatenates and merges PO files."
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:176 ../lib/gettext/tools/msgfmt.rb:86
+#: ../lib/gettext/tools/msginit.rb:89 ../lib/gettext/tools/msgmerge.rb:329
+#: ../lib/gettext/tools/xgettext.rb:248
+msgid "Specific options:"
+msgstr "Specifaj opcioj:"
+
+#: ../lib/gettext/tools/msgcat.rb:180
+msgid "(default: the standard output)"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:185 ../lib/gettext/tools/msgcat.rb:202
+#: ../lib/gettext/tools/msgmerge.rb:342 ../lib/gettext/tools/msgmerge.rb:361
+#: ../lib/gettext/tools/xgettext.rb:302
+msgid "Sort output by msgid"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:190 ../lib/gettext/tools/msgcat.rb:195
+#: ../lib/gettext/tools/msgmerge.rb:349 ../lib/gettext/tools/msgmerge.rb:356
+msgid "Sort output by location"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:196 ../lib/gettext/tools/msgmerge.rb:350
+msgid "It is same as --sort-by-location"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:197 ../lib/gettext/tools/msgcat.rb:204
+#: ../lib/gettext/tools/msgmerge.rb:344 ../lib/gettext/tools/msgmerge.rb:351
+msgid "Just for GNU gettext's msgcat compatibility"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:203 ../lib/gettext/tools/msgmerge.rb:343
+msgid "It is same as --sort-by-msgid"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:209
+msgid "Remove location information"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:214
+msgid "Remove all comments"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:219 ../lib/gettext/tools/msgmerge.rb:371
+#: ../lib/gettext/tools/xgettext.rb:312
+msgid "Set output page width"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgmerge.rb:377
+#: ../lib/gettext/tools/xgettext.rb:318
+msgid ""
+"Break long message lines, longer than the output page width, into several line"
+"s"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:236
+msgid "Ignore fuzzy entries"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:241
+msgid "Don't report warning messages"
+msgstr ""
+
 #: ../lib/gettext/tools/msgfmt.rb:65
 #, fuzzy
 msgid "no input files specified."
@@ -44,16 +114,11 @@ msgstr "Uzmaniero: %s en.po [ -o el.mo ]"
 msgid "Generate binary message catalog from textual translation description."
 msgstr "Generu porkomputilan mesaĝaron el la traduktekstoj."
 
-#: ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:89
-#: ../lib/gettext/tools/msgmerge.rb:266 ../lib/gettext/tools/xgettext.rb:218
-msgid "Specific options:"
-msgstr "Specifaj opcioj:"
-
-#: ../lib/gettext/tools/msgfmt.rb:89 ../lib/gettext/tools/xgettext.rb:221
+#: ../lib/gettext/tools/msgfmt.rb:89 ../lib/gettext/tools/xgettext.rb:251
 msgid "write output to specified file"
 msgstr "skribos la produkton en la indikitan dosieron"
 
-#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:271
+#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:349
 msgid "display version information and exit"
 msgstr "montros versi-informon"
 
@@ -81,7 +146,7 @@ msgid ""
 " locale on your environment."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:317
+#: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:398
 msgid "Display this help and exit"
 msgstr ""
 
@@ -110,18 +175,14 @@ msgstr ""
 msgid "file '%s' has already existed."
 msgstr "Dosiero '%s' jam ekzistas."
 
-#: ../lib/gettext/tools/msginit.rb:200
+#: ../lib/gettext/tools/msginit.rb:202
 msgid "Please enter your full name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:229
+#: ../lib/gettext/tools/msginit.rb:231
 msgid "Please enter your email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:255
-msgid "Usage: %s [OPTIONS] definition.po reference.pot"
-msgstr ""
-
 #: ../lib/gettext/tools/msgmerge.rb:258
 #, fuzzy
 msgid ""
@@ -133,126 +194,132 @@ msgstr ""
 "Kunfandos du po-dosierojn `Uniforum'-formatitajn. def.po jam enhavu tradukojn;"
 " ref.pot estu aktuale kreita el la fontkodo per rgettext."
 
-#: ../lib/gettext/tools/msgmerge.rb:269
-msgid "Update definition.po"
-msgstr ""
-
 #: ../lib/gettext/tools/msgmerge.rb:274
 #, fuzzy
 msgid "Write output to specified file"
 msgstr "skribos la produkton en la indikitan dosieron"
 
-#: ../lib/gettext/tools/msgmerge.rb:279
-msgid "Generate sorted output"
+#: ../lib/gettext/tools/msgmerge.rb:318
+msgid "Usage: %s [OPTIONS] definition.po reference.pot"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:284
-msgid "Sort output by file location"
-msgstr ""
+#: ../lib/gettext/tools/msgmerge.rb:323
+#, fuzzy
+msgid "Display version information and exit"
+msgstr "montros versi-informon"
 
-#: ../lib/gettext/tools/msgmerge.rb:289
-msgid "Sort output by msgid"
+#: ../lib/gettext/tools/msgmerge.rb:332
+msgid "Update definition.po"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:294
+#: ../lib/gettext/tools/msgmerge.rb:366 ../lib/gettext/tools/xgettext.rb:307
 msgid "Preserve '#: FILENAME:LINE' lines"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:299
-msgid "Set output page width"
+#: ../lib/gettext/tools/msgmerge.rb:388
+msgid "Disable fuzzy matching"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:305
-msgid ""
-"Break long message lines, longer than the output page width, into several line"
-"s"
+#: ../lib/gettext/tools/msgmerge.rb:389
+msgid "(enable)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:323
-#, fuzzy
-msgid "Display version information and exit"
-msgstr "montros versi-informon"
+#: ../lib/gettext/tools/msgmerge.rb:394
+msgid "Don't output obsolete entries"
+msgstr ""
 
 #: ../lib/gettext/tools/parser/glade.rb:32
 msgid "`%{file}' is not glade-2.0 format."
 msgstr "`%{file}' ne konformas al la formato de glade-2.0."
 
-#: ../lib/gettext/tools/xgettext.rb:64
+#: ../lib/gettext/tools/xgettext.rb:65
 msgid "'%{klass}' is ignored."
 msgstr "ignoras '%{klass}'."
 
-#: ../lib/gettext/tools/xgettext.rb:183
+#: ../lib/gettext/tools/xgettext.rb:170
 msgid "Error parsing %{path}"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:194
+#: ../lib/gettext/tools/xgettext.rb:229
 msgid "no input files"
 msgstr "neniu dosiero donita"
 
-#: ../lib/gettext/tools/xgettext.rb:212
+#: ../lib/gettext/tools/xgettext.rb:242
 msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
 msgstr "Uzmaniero: %s en.rb [ -r analiz.rb ] [ -o el.pot ]"
 
-#: ../lib/gettext/tools/xgettext.rb:215
+# TODO: This translation looks somehow unrelated... What did I do that day?
+#: ../lib/gettext/tools/xgettext.rb:243
+#, fuzzy
+msgid "require the library before executing xgettext"
+msgstr "uzos indikitan opcianalizilon"
+
+#: ../lib/gettext/tools/xgettext.rb:245
 msgid "Extract translatable strings from given input files."
 msgstr "Arigos tradukeblajn frazojn el donitaj dosieroj."
 
-#: ../lib/gettext/tools/xgettext.rb:226
+#: ../lib/gettext/tools/xgettext.rb:251
+#, fuzzy
+msgid "display this help and exit"
+msgstr "montros versi-informon"
+
+#: ../lib/gettext/tools/xgettext.rb:256
 msgid "set package name in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:231
+#: ../lib/gettext/tools/xgettext.rb:262
 msgid "set package version in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:236
-msgid "set report address for msgid bugs"
+#: ../lib/gettext/tools/xgettext.rb:268
+msgid "set report e-mail address for msgid bugs"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:241
+#: ../lib/gettext/tools/xgettext.rb:274
 msgid "set copyright holder in output"
 msgstr ""
 
-# TODO: This translation looks somehow unrelated... What did I do that day?
-#: ../lib/gettext/tools/xgettext.rb:243
-#, fuzzy
-msgid "require the library before executing xgettext"
-msgstr "uzos indikitan opcianalizilon"
+#: ../lib/gettext/tools/xgettext.rb:280
+msgid "set copyright year in output"
+msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:246
+#: ../lib/gettext/tools/xgettext.rb:286
 msgid "set encoding for output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:251
-#, fuzzy
-msgid "display this help and exit"
-msgstr "montros versi-informon"
+#: ../lib/gettext/tools/xgettext.rb:292
+msgid "Generate sorted output"
+msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:256
+#: ../lib/gettext/tools/xgettext.rb:297
+msgid "Sort output by file location"
+msgstr ""
+
+#: ../lib/gettext/tools/xgettext.rb:334
 msgid ""
 "If TAG is specified, place comment blocks starting with TAG and precedding key"
 "word lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:257
+#: ../lib/gettext/tools/xgettext.rb:335
 msgid ""
 "If TAG is not specified, place all comment blocks preceing keyword lines in ou"
 "tput file"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:258
+#: ../lib/gettext/tools/xgettext.rb:336
 msgid "(default: %s)"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:258
+#: ../lib/gettext/tools/xgettext.rb:336
 msgid "no TAG"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:262
+#: ../lib/gettext/tools/xgettext.rb:340
 msgid "run in debugging mode"
 msgstr "sencimiga modo"
 
-#: ../lib/gettext/tools/xgettext.rb:320
+#: ../lib/gettext/tools/xgettext.rb:375
 msgid ""
 "Warning: The empty \"\" msgid is reserved by gettext. So gettext(\"\") doesn't ret"
 "urns empty string but the header entry in po file."
@@ -263,19 +330,22 @@ msgid "This message is from hellolib."
 msgstr ""
 
 #: ../samples/hello.rb:17
-msgid "Hello World\n"
+msgid ""
+"Hello World\n"
 msgstr ""
 
 #: ../samples/hello2.rb:19
-msgid "One is %{num}\n"
+msgid ""
+"One is %{num}\n"
 msgstr ""
 
 #: ../samples/hello2.rb:20
-msgid "Hello %{world}\n"
+msgid "World"
 msgstr ""
 
 #: ../samples/hello2.rb:20
-msgid "World"
+msgid ""
+"Hello %{world}\n"
 msgstr ""
 
 #: ../samples/hello_glade2.glade:9 ../test/fixtures/gladeparser.glade:8
@@ -298,16 +368,18 @@ msgid "hello, gtk world"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World"
+msgid "Hello World2"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World2"
+msgid "Hello World"
 msgstr ""
 
 #: ../samples/hello_plural.rb:20
-msgid "There is an apple.\n"
-msgid_plural "There are %{num} apples.\n"
+msgid ""
+"There is an apple.\n"
+msgid_plural ""
+"There are %{num} apples.\n"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -323,7 +395,8 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../test/fixtures/N_.rb:14 ../test/fixtures/_.rb:34
-msgid "aaa\n"
+msgid ""
+"aaa\n"
 msgstr ""
 
 #: ../test/fixtures/N_.rb:18 ../test/fixtures/_.rb:38
@@ -449,11 +522,11 @@ msgid ""
 msgstr ""
 
 #: ../test/fixtures/_/multiple_messages_in_same_line.rb:28
-msgid "multiple"
+msgid "in same line"
 msgstr ""
 
 #: ../test/fixtures/_/multiple_messages_in_same_line.rb:28
-msgid "in same line"
+msgid "multiple"
 msgstr ""
 
 #: ../test/fixtures/_/multiple_same_messages.rb:28
@@ -466,7 +539,8 @@ msgid "one line"
 msgstr ""
 
 #: ../test/fixtures/_/one_new_line.rb:28
-msgid "one new line\n"
+msgid ""
+"one new line\n"
 msgstr ""
 
 #: ../test/fixtures/backslash.rb:27
@@ -540,7 +614,8 @@ msgid "no data"
 msgstr ""
 
 #: ../test/fixtures/n_.rb:33
-msgid "bbb\n"
+msgid ""
+"bbb\n"
 msgid_plural ""
 "ccc2\n"
 "ccc2"
@@ -803,31 +878,18 @@ msgstr[1] ""
 msgid "a translation"
 msgstr ""
 
-#: ../lib/gettext/tools.rb:81
 #~ msgid "Failed to merge with %{defpo}"
 #~ msgstr "Kunfando kun %{defpo} fiaskis"
-
-#: ../lib/gettext/tools.rb:82
 #~ msgid "New .pot was copied to %{failed_filename}"
 #~ msgstr "Nova pot-dosiero kopiiĝis al %{failed_filename}"
-
-#: ../lib/gettext/tools.rb:83
 #~ msgid "Check these po/pot-files. It may have syntax errors or something wrong."
 #~ msgstr "Kontrolu jenajn po/pot-dosierojn. Estas eble sintaksaj eraroj en ili, aŭ io."
-
-#: ../lib/gettext/tools/msgmerge.rb:453
 #~ msgid "definition po is not given."
 #~ msgstr "ne ricevis po-dosieron."
-
-#: ../lib/gettext/tools/msgmerge.rb:455
 #~ msgid "reference pot is not given."
 #~ msgstr "ne ricevis referencan pot-dosieron."
-
-#: ../lib/gettext/tools/msgmerge.rb:463
 #~ msgid "Usage: %s def.po ref.pot [-o output.pot]"
 #~ msgstr "Uzmaniero: %s def.po ref.pot [ -o el.pot ]"
-
-#: ../lib/gettext/tools/msgmerge.rb:466
 #~ msgid ""
 #~ "Merges two Uniforum style .po files together. The def.po file is an existing P"
 #~ "O file with translations. The ref.pot file is the last created PO file with up"