gettext 3.1.0 → 3.1.1

data/po/sv/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: 2014-02-09 21:39+0900\n"
+"POT-Creation-Date: 2014-02-23 22:20+0900\n"
 "PO-Revision-Date: 2004-11-04 20:49+0100\n"
 "Last-Translator: Nikolai Weibull\n"
 "Language-Team: Swedish\n"
@@ -20,88 +20,100 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/gettext/text_domain_manager.rb:149
+#: ../lib/gettext/text_domain_manager.rb:148
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr ""
 
-#: ../lib/gettext/text_domain_manager.rb:155
+#: ../lib/gettext/text_domain_manager.rb:154
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:172
+#: ../lib/gettext/tools/msgcat.rb:207
 msgid "Usage: %s [OPTIONS] PO_FILE1 PO_FILE2 ..."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:174
+#: ../lib/gettext/tools/msgcat.rb:209
 msgid "Concatenates and merges PO files."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:176 ../lib/gettext/tools/msgfmt.rb:86
-#: ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:329
+#: ../lib/gettext/tools/msgcat.rb:211 ../lib/gettext/tools/msgfmt.rb:86
+#: ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:334
 #: ../lib/gettext/tools/xgettext.rb:248
 msgid "Specific options:"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:179 ../lib/gettext/tools/msgmerge.rb:337
+#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:342
 msgid "Write output to specified file"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:180
+#: ../lib/gettext/tools/msgcat.rb:215
 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/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237
+#: ../lib/gettext/tools/msgmerge.rb:347 ../lib/gettext/tools/msgmerge.rb:366
 #: ../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
+#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230
+#: ../lib/gettext/tools/msgmerge.rb:354 ../lib/gettext/tools/msgmerge.rb:361
 msgid "Sort output by location"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:196 ../lib/gettext/tools/msgmerge.rb:350
+#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:355
 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
+#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239
+#: ../lib/gettext/tools/msgmerge.rb:349 ../lib/gettext/tools/msgmerge.rb:356
 msgid "Just for GNU gettext's msgcat compatibility"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:203 ../lib/gettext/tools/msgmerge.rb:343
+#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:348
 msgid "It is same as --sort-by-msgid"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:209
+#: ../lib/gettext/tools/msgcat.rb:244
 msgid "Remove location information"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:214
+#: ../lib/gettext/tools/msgcat.rb:249
 msgid "Remove all comments"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:219 ../lib/gettext/tools/msgmerge.rb:371
+#: ../lib/gettext/tools/msgcat.rb:254 ../lib/gettext/tools/msgmerge.rb:376
 #: ../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/msgcat.rb:260 ../lib/gettext/tools/msgmerge.rb:382
 #: ../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
+#: ../lib/gettext/tools/msgcat.rb:271
 msgid "Ignore fuzzy entries"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:241
+#: ../lib/gettext/tools/msgcat.rb:276
 msgid "Don't report warning messages"
 msgstr ""
 
+#: ../lib/gettext/tools/msgcat.rb:281 ../lib/gettext/tools/msgmerge.rb:399
+msgid "Don't output obsolete entries"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:286
+msgid "Remove FIELD from header"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:287
+msgid "Specify this option multiple times to remove multiple header fields"
+msgstr ""
+
 #: ../lib/gettext/tools/msgfmt.rb:65
 msgid "no input files specified."
 msgstr ""
@@ -158,7 +170,7 @@ msgstr ""
 msgid "Use EMAIL as translator email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:130 ../lib/gettext/tools/msgmerge.rb:398
+#: ../lib/gettext/tools/msginit.rb:130 ../lib/gettext/tools/msgmerge.rb:403
 msgid "Display this help and exit"
 msgstr ""
 
@@ -192,11 +204,11 @@ msgstr ""
 msgid "Please enter your email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:318
+#: ../lib/gettext/tools/msgmerge.rb:323
 msgid "Usage: %s [OPTIONS] definition.po reference.pot"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:321
+#: ../lib/gettext/tools/msgmerge.rb:326
 msgid ""
 "Merges two Uniforum style .po files together. The definition.po file is an exi"
 "sting PO file with translations. The reference.pot file is the last created PO"
@@ -204,27 +216,23 @@ msgid ""
 "d by rxgettext."
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:332
+#: ../lib/gettext/tools/msgmerge.rb:337
 msgid "Update definition.po"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:366 ../lib/gettext/tools/xgettext.rb:307
+#: ../lib/gettext/tools/msgmerge.rb:371 ../lib/gettext/tools/xgettext.rb:307
 msgid "Preserve '#: FILENAME:LINE' lines"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:388
+#: ../lib/gettext/tools/msgmerge.rb:393
 msgid "Disable fuzzy matching"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:389
-msgid "(enable)"
-msgstr ""
-
 #: ../lib/gettext/tools/msgmerge.rb:394
-msgid "Don't output obsolete entries"
+msgid "(enable)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:404
+#: ../lib/gettext/tools/msgmerge.rb:409
 msgid "Display version information and exit"
 msgstr ""
 
@@ -365,11 +373,11 @@ msgid "hello, gtk world"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World2"
+msgid "Hello World"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World"
+msgid "Hello World2"
 msgstr ""
 
 #: ../samples/hello_plural.rb:20

data/po/uk/gettext.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ruby-gettext 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-09 21:39+0900\n"
+"POT-Creation-Date: 2014-02-23 22:20+0900\n"
 "PO-Revision-Date: 2008-07-14 05:33+0200\n"
 "Last-Translator: Alex Rootoff <rootoff at pisem.net>\n"
 "Language-Team: Ukrainian\n"
@@ -30,80 +30,92 @@ msgstr ""
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "Третій параметр неправильний: value = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:155
+#: ../lib/gettext/text_domain_manager.rb:154
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:172
+#: ../lib/gettext/tools/msgcat.rb:207
 msgid "Usage: %s [OPTIONS] PO_FILE1 PO_FILE2 ..."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:174
+#: ../lib/gettext/tools/msgcat.rb:209
 msgid "Concatenates and merges PO files."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:176 ../lib/gettext/tools/msgfmt.rb:86
-#: ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:329
+#: ../lib/gettext/tools/msgcat.rb:211 ../lib/gettext/tools/msgfmt.rb:86
+#: ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:334
 #: ../lib/gettext/tools/xgettext.rb:248
 msgid "Specific options:"
 msgstr "Додаткові параметри:"
 
-#: ../lib/gettext/tools/msgcat.rb:180
+#: ../lib/gettext/tools/msgcat.rb:215
 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/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237
+#: ../lib/gettext/tools/msgmerge.rb:347 ../lib/gettext/tools/msgmerge.rb:366
 #: ../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
+#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230
+#: ../lib/gettext/tools/msgmerge.rb:354 ../lib/gettext/tools/msgmerge.rb:361
 msgid "Sort output by location"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:196 ../lib/gettext/tools/msgmerge.rb:350
+#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:355
 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
+#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239
+#: ../lib/gettext/tools/msgmerge.rb:349 ../lib/gettext/tools/msgmerge.rb:356
 msgid "Just for GNU gettext's msgcat compatibility"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:203 ../lib/gettext/tools/msgmerge.rb:343
+#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:348
 msgid "It is same as --sort-by-msgid"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:209
+#: ../lib/gettext/tools/msgcat.rb:244
 msgid "Remove location information"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:214
+#: ../lib/gettext/tools/msgcat.rb:249
 msgid "Remove all comments"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:219 ../lib/gettext/tools/msgmerge.rb:371
+#: ../lib/gettext/tools/msgcat.rb:254 ../lib/gettext/tools/msgmerge.rb:376
 #: ../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/msgcat.rb:260 ../lib/gettext/tools/msgmerge.rb:382
 #: ../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
+#: ../lib/gettext/tools/msgcat.rb:271
 msgid "Ignore fuzzy entries"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:241
+#: ../lib/gettext/tools/msgcat.rb:276
 msgid "Don't report warning messages"
 msgstr ""
 
+#: ../lib/gettext/tools/msgcat.rb:281 ../lib/gettext/tools/msgmerge.rb:399
+msgid "Don't output obsolete entries"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:286
+msgid "Remove FIELD from header"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:287
+msgid "Specify this option multiple times to remove multiple header fields"
+msgstr ""
+
 #: ../lib/gettext/tools/msgfmt.rb:65
 #, fuzzy
 msgid "no input files specified."
@@ -166,7 +178,7 @@ msgstr ""
 msgid "Use EMAIL as translator email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:130 ../lib/gettext/tools/msgmerge.rb:398
+#: ../lib/gettext/tools/msginit.rb:130 ../lib/gettext/tools/msgmerge.rb:403
 msgid "Display this help and exit"
 msgstr ""
 
@@ -216,7 +228,7 @@ msgstr ""
 msgid "Write output to specified file"
 msgstr "записати результат у вказаний файл"
 
-#: ../lib/gettext/tools/msgmerge.rb:318
+#: ../lib/gettext/tools/msgmerge.rb:323
 msgid "Usage: %s [OPTIONS] definition.po reference.pot"
 msgstr ""
 
@@ -225,24 +237,20 @@ msgstr ""
 msgid "Display version information and exit"
 msgstr "показати інформацію про версію і завершити роботу"
 
-#: ../lib/gettext/tools/msgmerge.rb:332
+#: ../lib/gettext/tools/msgmerge.rb:337
 msgid "Update definition.po"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:366 ../lib/gettext/tools/xgettext.rb:307
+#: ../lib/gettext/tools/msgmerge.rb:371 ../lib/gettext/tools/xgettext.rb:307
 msgid "Preserve '#: FILENAME:LINE' lines"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:388
+#: ../lib/gettext/tools/msgmerge.rb:393
 msgid "Disable fuzzy matching"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:389
-msgid "(enable)"
-msgstr ""
-
 #: ../lib/gettext/tools/msgmerge.rb:394
-msgid "Don't output obsolete entries"
+msgid "(enable)"
 msgstr ""
 
 #: ../lib/gettext/tools/parser/glade.rb:32
@@ -384,11 +392,11 @@ msgid "hello, gtk world"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World2"
+msgid "Hello World"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World"
+msgid "Hello World2"
 msgstr ""
 
 #: ../samples/hello_plural.rb:20

data/po/vi/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: 2014-02-09 21:39+0900\n"
+"POT-Creation-Date: 2014-02-23 22:20+0900\n"
 "PO-Revision-Date: 2008-07-13 21:28+0900\n"
 "Last-Translator: Ngoc Dao <ngocdaothanh@gmail.com>\n"
 "Language-Team: Vietnamese\n"
@@ -26,80 +26,92 @@ msgstr ""
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "Tham số thứ 3 sai: giá trị = %{number}"
 
-#: ../lib/gettext/text_domain_manager.rb:155
+#: ../lib/gettext/text_domain_manager.rb:154
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:172
+#: ../lib/gettext/tools/msgcat.rb:207
 msgid "Usage: %s [OPTIONS] PO_FILE1 PO_FILE2 ..."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:174
+#: ../lib/gettext/tools/msgcat.rb:209
 msgid "Concatenates and merges PO files."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:176 ../lib/gettext/tools/msgfmt.rb:86
-#: ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:329
+#: ../lib/gettext/tools/msgcat.rb:211 ../lib/gettext/tools/msgfmt.rb:86
+#: ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:334
 #: ../lib/gettext/tools/xgettext.rb:248
 msgid "Specific options:"
 msgstr "Tùy chọn cụ thể:"
 
-#: ../lib/gettext/tools/msgcat.rb:180
+#: ../lib/gettext/tools/msgcat.rb:215
 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/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237
+#: ../lib/gettext/tools/msgmerge.rb:347 ../lib/gettext/tools/msgmerge.rb:366
 #: ../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
+#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230
+#: ../lib/gettext/tools/msgmerge.rb:354 ../lib/gettext/tools/msgmerge.rb:361
 msgid "Sort output by location"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:196 ../lib/gettext/tools/msgmerge.rb:350
+#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:355
 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
+#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239
+#: ../lib/gettext/tools/msgmerge.rb:349 ../lib/gettext/tools/msgmerge.rb:356
 msgid "Just for GNU gettext's msgcat compatibility"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:203 ../lib/gettext/tools/msgmerge.rb:343
+#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:348
 msgid "It is same as --sort-by-msgid"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:209
+#: ../lib/gettext/tools/msgcat.rb:244
 msgid "Remove location information"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:214
+#: ../lib/gettext/tools/msgcat.rb:249
 msgid "Remove all comments"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:219 ../lib/gettext/tools/msgmerge.rb:371
+#: ../lib/gettext/tools/msgcat.rb:254 ../lib/gettext/tools/msgmerge.rb:376
 #: ../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/msgcat.rb:260 ../lib/gettext/tools/msgmerge.rb:382
 #: ../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
+#: ../lib/gettext/tools/msgcat.rb:271
 msgid "Ignore fuzzy entries"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:241
+#: ../lib/gettext/tools/msgcat.rb:276
 msgid "Don't report warning messages"
 msgstr ""
 
+#: ../lib/gettext/tools/msgcat.rb:281 ../lib/gettext/tools/msgmerge.rb:399
+msgid "Don't output obsolete entries"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:286
+msgid "Remove FIELD from header"
+msgstr ""
+
+#: ../lib/gettext/tools/msgcat.rb:287
+msgid "Specify this option multiple times to remove multiple header fields"
+msgstr ""
+
 #: ../lib/gettext/tools/msgfmt.rb:65
 #, fuzzy
 msgid "no input files specified."
@@ -162,7 +174,7 @@ msgstr ""
 msgid "Use EMAIL as translator email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:130 ../lib/gettext/tools/msgmerge.rb:398
+#: ../lib/gettext/tools/msginit.rb:130 ../lib/gettext/tools/msgmerge.rb:403
 msgid "Display this help and exit"
 msgstr ""
 
@@ -211,7 +223,7 @@ msgstr ""
 msgid "Write output to specified file"
 msgstr "ghi ra tập tin được chỉ định"
 
-#: ../lib/gettext/tools/msgmerge.rb:318
+#: ../lib/gettext/tools/msgmerge.rb:323
 msgid "Usage: %s [OPTIONS] definition.po reference.pot"
 msgstr ""
 
@@ -220,24 +232,20 @@ msgstr ""
 msgid "Display version information and exit"
 msgstr "hiện thông tin về phiên bản rồi thoát"
 
-#: ../lib/gettext/tools/msgmerge.rb:332
+#: ../lib/gettext/tools/msgmerge.rb:337
 msgid "Update definition.po"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:366 ../lib/gettext/tools/xgettext.rb:307
+#: ../lib/gettext/tools/msgmerge.rb:371 ../lib/gettext/tools/xgettext.rb:307
 msgid "Preserve '#: FILENAME:LINE' lines"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:388
+#: ../lib/gettext/tools/msgmerge.rb:393
 msgid "Disable fuzzy matching"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:389
-msgid "(enable)"
-msgstr ""
-
 #: ../lib/gettext/tools/msgmerge.rb:394
-msgid "Don't output obsolete entries"
+msgid "(enable)"
 msgstr ""
 
 #: ../lib/gettext/tools/parser/glade.rb:32
@@ -379,11 +387,11 @@ msgid "hello, gtk world"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World2"
+msgid "Hello World"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World"
+msgid "Hello World2"
 msgstr ""
 
 #: ../samples/hello_plural.rb:20