gettext 3.0.0 → 3.0.1

data/po/gettext.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 3.0.0\n"
+"Project-Id-Version: gettext 3.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-31 20:20+0900\n"
-"PO-Revision-Date: 2013-08-31 20:20+0900\n"
+"POT-Creation-Date: 2013-09-20 22:54+0900\n"
+"PO-Revision-Date: 2013-09-20 22:54+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -38,87 +38,124 @@ msgstr ""
 msgid "Generate binary message catalog from textual translation description."
 msgstr ""
 
-#: ../lib/gettext/tools/msgfmt.rb:86
-#: ../lib/gettext/tools/msgmerge.rb:271
-#: ../lib/gettext/tools/msginit.rb:88
-#: ../lib/gettext/tools/xgettext.rb:218
+#: ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msgmerge.rb:266
+#: ../lib/gettext/tools/msginit.rb:89 ../lib/gettext/tools/xgettext.rb:218
 msgid "Specific options:"
 msgstr ""
 
-#: ../lib/gettext/tools/msgfmt.rb:89
-#: ../lib/gettext/tools/msgmerge.rb:276
-#: ../lib/gettext/tools/xgettext.rb:221
+#: ../lib/gettext/tools/msgfmt.rb:89 ../lib/gettext/tools/xgettext.rb:221
 msgid "write output to specified file"
 msgstr ""
 
-#: ../lib/gettext/tools/msgfmt.rb:93
-#: ../lib/gettext/tools/msgmerge.rb:287
-#: ../lib/gettext/tools/xgettext.rb:271
+#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:271
 msgid "display version information and exit"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:250
-msgid "definition po is not given."
+#: ../lib/gettext/tools/msgmerge.rb:255
+msgid "Usage: %s [OPTIONS] definition.po reference.pot"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:252
-msgid "reference pot is not given."
+#: ../lib/gettext/tools/msgmerge.rb:258
+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"
+" file with up-to-date source references. The reference.pot is generally create"
+"d by rxgettext."
+msgstr ""
+
+#: ../lib/gettext/tools/msgmerge.rb:269
+msgid "Update definition.po"
+msgstr ""
+
+#: ../lib/gettext/tools/msgmerge.rb:274
+msgid "Write output to specified file"
+msgstr ""
+
+#: ../lib/gettext/tools/msgmerge.rb:279
+msgid "Generate sorted output"
+msgstr ""
+
+#: ../lib/gettext/tools/msgmerge.rb:284
+msgid "Sort output by file location"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:260
-msgid "Usage: %s def.po ref.pot [-o output.pot]"
+#: ../lib/gettext/tools/msgmerge.rb:289
+msgid "Sort output by msgid"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:263
-msgid "Merges two Uniforum style .po files together. The def.po file is an existing PO file with translations. The ref.pot file is the last created PO file with up-to-date source references. ref.pot is generally created by rgettext."
+#: ../lib/gettext/tools/msgmerge.rb:294
+msgid "Preserve '#: FILENAME:LINE' lines"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:282
-#: ../lib/gettext/tools/msginit.rb:111
+#: ../lib/gettext/tools/msgmerge.rb:299
+msgid "Set output page width"
+msgstr ""
+
+#: ../lib/gettext/tools/msgmerge.rb:305
+msgid ""
+"Break long message lines, longer than the output page width, into several line"
+"s"
+msgstr ""
+
+#: ../lib/gettext/tools/msgmerge.rb:317 ../lib/gettext/tools/msginit.rb:112
 msgid "Display this help and exit"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:84
-msgid "Create a new .po file from initializing .pot file with user's environment and input."
+#: ../lib/gettext/tools/msgmerge.rb:323
+msgid "Display version information and exit"
+msgstr ""
+
+#: ../lib/gettext/tools/msginit.rb:85
+msgid ""
+"Create a new .po file from initializing .pot file with user's environment and "
+"input."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:90
-msgid "Use INPUT as a .pot file. If INPUT is not specified, INPUT is a .pot file existing the current directory."
+#: ../lib/gettext/tools/msginit.rb:91
+msgid ""
+"Use INPUT as a .pot file. If INPUT is not specified, INPUT is a .pot file exis"
+"ting the current directory."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:97
-msgid "Use OUTPUT as a created .po file. If OUTPUT is not specified, OUTPUT depend on LOCALE or the current locale on your environment."
+#: ../lib/gettext/tools/msginit.rb:98
+msgid ""
+"Use OUTPUT as a created .po file. If OUTPUT is not specified, OUTPUT depend on"
+" LOCALE or the current locale on your environment."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:104
-msgid "Use LOCALE as target locale. If LOCALE is not specified, LOCALE is the current locale on your environment."
+#: ../lib/gettext/tools/msginit.rb:105
+msgid ""
+"Use LOCALE as target locale. If LOCALE is not specified, LOCALE is the current"
+" locale on your environment."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:116
+#: ../lib/gettext/tools/msginit.rb:117
 msgid "Display version and exit"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:134
+#: ../lib/gettext/tools/msginit.rb:135
 msgid ".pot file does not exist in the current directory."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:139
+#: ../lib/gettext/tools/msginit.rb:140
 msgid "file '%s' does not exist."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:151
-msgid "\"Locale '#{language_tag}' is invalid. \"Please check if your specified locale is usable."
+#: ../lib/gettext/tools/msginit.rb:152
+msgid ""
+"\"Locale '#{language_tag}' is invalid. \"Please check if your specified locale i"
+"s usable."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:160
+#: ../lib/gettext/tools/msginit.rb:161
 msgid "file '%s' has already existed."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:199
+#: ../lib/gettext/tools/msginit.rb:200
 msgid "Please enter your full name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:211
+#: ../lib/gettext/tools/msginit.rb:229
 msgid "Please enter your email address"
 msgstr ""
 
@@ -167,11 +204,15 @@ msgid "require the library before executing xgettext"
 msgstr ""
 
 #: ../lib/gettext/tools/xgettext.rb:256
-msgid "If TAG is specified, place comment blocks starting with TAG and precedding keyword lines in output file"
+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
-msgid "If TAG is not specified, place all comment blocks preceing keyword lines in output file"
+msgid ""
+"If TAG is not specified, place all comment blocks preceing keyword lines in ou"
+"tput file"
 msgstr ""
 
 #: ../lib/gettext/tools/xgettext.rb:258
@@ -191,7 +232,9 @@ msgid "display this help and exit"
 msgstr ""
 
 #: ../lib/gettext/tools/xgettext.rb:320
-msgid "Warning: The empty \"\" msgid is reserved by gettext. So gettext(\"\") doesn't returns empty string but the header entry in po file."
+msgid ""
+"Warning: The empty \"\" msgid is reserved by gettext. So gettext(\"\") doesn't ret"
+"urns empty string but the header entry in po file."
 msgstr ""
 
 #: ../lib/gettext/tools/parser/glade.rb:32
@@ -219,16 +262,13 @@ msgid "Hello World2"
 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] ""
 
 #: ../samples/hello.rb:17
-msgid ""
-"Hello World\n"
+msgid "Hello World\n"
 msgstr ""
 
 #: ../samples/hello_glade2.glade:9 ../test/fixtures/gladeparser.glade:8
@@ -244,13 +284,11 @@ msgid "<Hello world>"
 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 "Hello %{world}\n"
 msgstr ""
 
 #: ../samples/hello2.rb:20
@@ -311,8 +349,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../test/test_gettext.rb:155 ../test/test_gettext.rb:159
-#: ../test/fixtures/n_.rb:29 ../test/fixtures/N_.rb:10
-#: ../test/fixtures/_.rb:30
+#: ../test/fixtures/n_.rb:29 ../test/fixtures/N_.rb:10 ../test/fixtures/_.rb:30
 msgid "aaa"
 msgid_plural "aaa2"
 msgstr[0] ""
@@ -373,8 +410,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../test/fixtures/n_.rb:33
-msgid ""
-"bbb\n"
+msgid "bbb\n"
 msgid_plural ""
 "ccc2\n"
 "ccc2"
@@ -424,22 +460,19 @@ msgid_plural "ggg2"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../test/fixtures/n_.rb:63 ../test/fixtures/N_.rb:37
-#: ../test/fixtures/_.rb:57
+#: ../test/fixtures/n_.rb:63 ../test/fixtures/N_.rb:37 ../test/fixtures/_.rb:57
 msgid "ggghhhiii"
 msgid_plural "jjjkkklll"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../test/fixtures/n_.rb:72 ../test/fixtures/N_.rb:43
-#: ../test/fixtures/_.rb:63
+#: ../test/fixtures/n_.rb:72 ../test/fixtures/N_.rb:43 ../test/fixtures/_.rb:63
 msgid "a\"b\"c\""
 msgid_plural "a\"b\"c\"2"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../test/fixtures/n_.rb:76 ../test/fixtures/N_.rb:47
-#: ../test/fixtures/_.rb:67
+#: ../test/fixtures/n_.rb:76 ../test/fixtures/N_.rb:47 ../test/fixtures/_.rb:67
 msgid "d\"e\"f\""
 msgid_plural "d\"e\"f\"2"
 msgstr[0] ""
@@ -505,7 +538,6 @@ msgid ""
 "literal\n"
 msgstr ""
 
-#:
 #: ../test/fixtures/_/literal_concatenation_with_continuation_line.rb:28
 msgid "literal concatenation with continuation line"
 msgstr ""
@@ -521,8 +553,7 @@ 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
@@ -609,8 +640,7 @@ msgid "untranslated"
 msgstr ""
 
 #: ../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
@@ -626,8 +656,8 @@ msgid ""
 "ddd\n"
 msgstr ""
 
-#: ../test/fixtures/N_.rb:29 ../test/fixtures/N_.rb:33
-#: ../test/fixtures/_.rb:49 ../test/fixtures/_.rb:53
+#: ../test/fixtures/N_.rb:29 ../test/fixtures/N_.rb:33 ../test/fixtures/_.rb:49
+#: ../test/fixtures/_.rb:53
 msgid "eee"
 msgstr ""
 
@@ -662,7 +692,9 @@ msgid "<span color=\"red\" weight=\"bold\" size=\"large\">markup </span>"
 msgstr ""
 
 #: ../test/fixtures/gladeparser.glade:94
-msgid "<span color=\"red\">1st line markup </span>\\n<span color=\"blue\">2nd line markup</span>"
+msgid ""
+"<span color=\"red\">1st line markup </span>\\n<span color=\"blue\">2nd line markup<"
+"/span>"
 msgstr ""
 
 #: ../test/fixtures/gladeparser.glade:116

data/po/hr/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: 2012-10-16 16:38+0900\n"
+"POT-Creation-Date: 2013-09-20 22:54+0900\n"
 "PO-Revision-Date: 2007-03-17 16:19+0100\n"
 "Last-Translator: Sanjin Sehic <saserr@gmail.com>\n"
 "Language-Team: Croatian <saserr@gmail.com>\n"
@@ -18,28 +18,16 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4"
+" && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../lib/gettext/tools.rb:81
-#, fuzzy
-msgid "Failed to merge with %{defpo}"
-msgstr "Spajanje sa %{defpo} nije uspjelo - nastavljam dalje!"
-
-#: ../lib/gettext/tools.rb:82
-#, fuzzy
-msgid "New .pot was copied to %{failed_filename}"
-msgstr "Molim da provjerite novi .pot u %{failed_filename}"
-
-#: ../lib/gettext/tools.rb:83
-msgid "Check these po/pot-files. It may have syntax errors or something wrong."
+#: ../lib/gettext/text_domain_manager.rb:148
+msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr ""
 
-#: ../lib/gettext/tools.rb:188
-msgid ""
-"`%{cmd}' can not be found. \n"
-"Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
+#: ../lib/gettext/text_domain_manager.rb:154
+msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 
 #: ../lib/gettext/tools/msgfmt.rb:65
@@ -56,45 +44,43 @@ msgid "Generate binary message catalog from textual translation description."
 msgstr "Generiši binarni katalog poruka iz tekstualnog opisa prevoda"
 
 #: ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:89
-#: ../lib/gettext/tools/msgmerge.rb:474 ../lib/gettext/tools/xgettext.rb:210
+#: ../lib/gettext/tools/msgmerge.rb:266 ../lib/gettext/tools/xgettext.rb:218
 msgid "Specific options:"
 msgstr "Specifične opcije:"
 
-#: ../lib/gettext/tools/msgfmt.rb:89 ../lib/gettext/tools/msgmerge.rb:479
-#: ../lib/gettext/tools/xgettext.rb:213
+#: ../lib/gettext/tools/msgfmt.rb:89 ../lib/gettext/tools/xgettext.rb:221
 msgid "write output to specified file"
 msgstr "zapiši izlaz u specifičnu datoteku"
 
-#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/msgmerge.rb:490
-#: ../lib/gettext/tools/xgettext.rb:256
+#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/xgettext.rb:271
 msgid "display version information and exit"
 msgstr "prikaži informaciju o verziji i završi"
 
 #: ../lib/gettext/tools/msginit.rb:85
 msgid ""
-"Create a new .po file from initializing .pot file with user's environment "
-"and input."
+"Create a new .po file from initializing .pot file with user's environment and "
+"input."
 msgstr ""
 
 #: ../lib/gettext/tools/msginit.rb:91
 msgid ""
-"Use INPUT as a .pot file. If INPUT is not specified, INPUT is a .pot file "
-"existing the current directory."
+"Use INPUT as a .pot file. If INPUT is not specified, INPUT is a .pot file exis"
+"ting the current directory."
 msgstr ""
 
 #: ../lib/gettext/tools/msginit.rb:98
 msgid ""
-"Use OUTPUT as a created .po file. If OUTPUT is not specified, OUTPUT depend "
-"on LOCALE or the current locale on your environment."
+"Use OUTPUT as a created .po file. If OUTPUT is not specified, OUTPUT depend on"
+" LOCALE or the current locale on your environment."
 msgstr ""
 
 #: ../lib/gettext/tools/msginit.rb:105
 msgid ""
-"Use LOCALE as target locale. If LOCALE is not specified, LOCALE is the "
-"current locale on your environment."
+"Use LOCALE as target locale. If LOCALE is not specified, LOCALE is the current"
+" locale on your environment."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:485
+#: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:317
 msgid "Display this help and exit"
 msgstr ""
 
@@ -114,8 +100,8 @@ msgstr "Datoteka '%s' već postoji."
 
 #: ../lib/gettext/tools/msginit.rb:152
 msgid ""
-"\"Locale '#{language_tag}' is invalid. \"Please check if your specified "
-"locale is usable."
+"\"Locale '#{language_tag}' is invalid. \"Please check if your specified locale i"
+"s usable."
 msgstr ""
 
 #: ../lib/gettext/tools/msginit.rb:161
@@ -123,115 +109,172 @@ msgstr ""
 msgid "file '%s' has already existed."
 msgstr "Datoteka '%s' već postoji."
 
-#: ../lib/gettext/tools/msginit.rb:199
+#: ../lib/gettext/tools/msginit.rb:200
 msgid "Please enter your full name"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:211
+#: ../lib/gettext/tools/msginit.rb:229
 msgid "Please enter your email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:453
-msgid "definition po is not given."
-msgstr "definicijski po nije dat."
+#: ../lib/gettext/tools/msgmerge.rb:255
+msgid "Usage: %s [OPTIONS] definition.po reference.pot"
+msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:455
-msgid "reference pot is not given."
-msgstr "referencni po nije dat."
+#: ../lib/gettext/tools/msgmerge.rb:258
+#, fuzzy
+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"
+" file with up-to-date source references. The reference.pot is generally create"
+"d by rxgettext."
+msgstr ""
+"Spaja dvije Uniforum style .po datoteke skupa. def.po datoteka je već postojeć"
+"a PO datoteka sa prevodima. ref.pot je zadnja napravljena PO datoteka sa najno"
+"vijim referencama koda. ref.pot je najčešće napravljen sa rgettext."
 
-#: ../lib/gettext/tools/msgmerge.rb:463
-msgid "Usage: %s def.po ref.pot [-o output.pot]"
-msgstr "Korištenje: %s def.po ref.pot [-o izlaz.pot]"
+#: ../lib/gettext/tools/msgmerge.rb:269
+msgid "Update definition.po"
+msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:466
+#: ../lib/gettext/tools/msgmerge.rb:274
+#, fuzzy
+msgid "Write output to specified file"
+msgstr "zapiši izlaz u specifičnu datoteku"
+
+#: ../lib/gettext/tools/msgmerge.rb:279
+msgid "Generate sorted output"
+msgstr ""
+
+#: ../lib/gettext/tools/msgmerge.rb:284
+msgid "Sort output by file location"
+msgstr ""
+
+#: ../lib/gettext/tools/msgmerge.rb:289
+msgid "Sort output by msgid"
+msgstr ""
+
+#: ../lib/gettext/tools/msgmerge.rb:294
+msgid "Preserve '#: FILENAME:LINE' lines"
+msgstr ""
+
+#: ../lib/gettext/tools/msgmerge.rb:299
+msgid "Set output page width"
+msgstr ""
+
+#: ../lib/gettext/tools/msgmerge.rb:305
 msgid ""
-"Merges two Uniforum style .po files together. The def.po file is an existing "
-"PO file with translations. The ref.pot file is the last created PO file with "
-"up-to-date source references. ref.pot is generally created by rgettext."
+"Break long message lines, longer than the output page width, into several line"
+"s"
 msgstr ""
-"Spaja dvije Uniforum style .po datoteke skupa. def.po datoteka je već "
-"postojeća PO datoteka sa prevodima. ref.pot je zadnja napravljena PO "
-"datoteka sa najnovijim referencama koda. ref.pot je najčešće napravljen sa "
-"rgettext."
+
+#: ../lib/gettext/tools/msgmerge.rb:323
+#, fuzzy
+msgid "Display version information and exit"
+msgstr "prikaži informaciju o verziji i završi"
+
+#: ../lib/gettext/tools/parser/glade.rb:32
+msgid "`%{file}' is not glade-2.0 format."
+msgstr "'%{file}' nije glade-2.0 format."
 
 #: ../lib/gettext/tools/xgettext.rb:64
 msgid "'%{klass}' is ignored."
 msgstr "%{klass} je ignorisan."
 
-#: ../lib/gettext/tools/xgettext.rb:175
+#: ../lib/gettext/tools/xgettext.rb:183
 msgid "Error parsing %{path}"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:186
+#: ../lib/gettext/tools/xgettext.rb:194
 msgid "no input files"
 msgstr "nema ulaznih datoteka"
 
-#: ../lib/gettext/tools/xgettext.rb:204
+#: ../lib/gettext/tools/xgettext.rb:212
 msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
 msgstr "Korištenje: %s ulaz.rb [-r parser.rb] [-o izlaz.pot]"
 
-#: ../lib/gettext/tools/xgettext.rb:207
+#: ../lib/gettext/tools/xgettext.rb:215
 msgid "Extract translatable strings from given input files."
 msgstr "Izvadi niske za prevođenje iz date ulazne datoteke."
 
-#: ../lib/gettext/tools/xgettext.rb:218
+#: ../lib/gettext/tools/xgettext.rb:226
 msgid "set package name in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:223
+#: ../lib/gettext/tools/xgettext.rb:231
 msgid "set package version in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:228
+#: ../lib/gettext/tools/xgettext.rb:236
 msgid "set report address for msgid bugs"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:233
+#: ../lib/gettext/tools/xgettext.rb:241
 msgid "set copyright holder in output"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:238
-msgid "set encoding for output"
-msgstr ""
-
 #: ../lib/gettext/tools/xgettext.rb:243
 #, fuzzy
 msgid "require the library before executing xgettext"
 msgstr "zahtjevaj biblioteku prije izvršavanja rgettext-a"
 
-#: ../lib/gettext/tools/xgettext.rb:247
-msgid "run in debugging mode"
-msgstr "pokreni u modu za nalaženje grešaka"
+#: ../lib/gettext/tools/xgettext.rb:246
+msgid "set encoding for output"
+msgstr ""
 
 #: ../lib/gettext/tools/xgettext.rb:251
 #, fuzzy
 msgid "display this help and exit"
 msgstr "prikaži informaciju o verziji i završi"
 
-#: ../lib/gettext/tools/xgettext.rb:302
+#: ../lib/gettext/tools/xgettext.rb:256
 msgid ""
-"Warning: The empty \"\" msgid is reserved by gettext. So gettext(\"\") "
-"doesn't returns empty string but the header entry in po file."
+"If TAG is specified, place comment blocks starting with TAG and precedding key"
+"word lines in output file"
 msgstr ""
 
-#: ../lib/gettext/tools/parser/glade.rb:76
-msgid "`%{file}' is not glade-2.0 format."
-msgstr "'%{file}' nije glade-2.0 format."
+#: ../lib/gettext/tools/xgettext.rb:257
+msgid ""
+"If TAG is not specified, place all comment blocks preceing keyword lines in ou"
+"tput file"
+msgstr ""
 
-#: ../lib/gettext/runtime/textdomain_manager.rb:148
-msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
+#: ../lib/gettext/tools/xgettext.rb:258
+msgid "(default: %s)"
 msgstr ""
 
-#: ../lib/gettext/runtime/textdomain_manager.rb:154
-msgid "ngettext: 3rd parameter should be a number, not nil."
+#: ../lib/gettext/tools/xgettext.rb:258
+msgid "no TAG"
 msgstr ""
 
-#: ../samples/hello_gtk2.rb:22
-msgid "hello, gtk world"
+#: ../lib/gettext/tools/xgettext.rb:262
+msgid "run in debugging mode"
+msgstr "pokreni u modu za nalaženje grešaka"
+
+#: ../lib/gettext/tools/xgettext.rb:320
+msgid ""
+"Warning: The empty \"\" msgid is reserved by gettext. So gettext(\"\") doesn't ret"
+"urns empty string but the header entry in po file."
 msgstr ""
 
-#: ../samples/hello_tk.rb:15
-msgid "hello, tk world"
+#: ../samples/cgi/hellolib.rb:16
+msgid "This message is from hellolib."
+msgstr ""
+
+#: ../samples/hello.rb:17
+msgid "Hello World\n"
+msgstr ""
+
+#: ../samples/hello2.rb:19
+msgid "One is %{num}\n"
+msgstr ""
+
+#: ../samples/hello2.rb:20
+msgid "Hello %{world}\n"
+msgstr ""
+
+#: ../samples/hello2.rb:20
+msgid "World"
 msgstr ""
 
 #: ../samples/hello_glade2.glade:9 ../test/fixtures/gladeparser.glade:8
@@ -249,12 +292,9 @@ msgstr ""
 msgid "<Hello world>"
 msgstr ""
 
-#: ../samples/hello_plural.rb:19
-msgid "There is an apple.\n"
-msgid_plural "There are %{num} apples.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#: ../samples/hello_gtk2.rb:25
+msgid "hello, gtk world"
+msgstr ""
 
 #: ../samples/hello_noop.rb:13
 msgid "Hello World"
@@ -264,28 +304,172 @@ msgstr ""
 msgid "Hello World2"
 msgstr ""
 
-#: ../samples/hello.rb:16
-msgid "Hello World\n"
+#: ../samples/hello_plural.rb:20
+msgid "There is an apple.\n"
+msgid_plural "There are %{num} apples.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../samples/hello_tk.rb:16
+msgid "hello, tk world"
 msgstr ""
 
-#: ../samples/cgi/hellolib.rb:16
-msgid "This message is from hellolib."
+#: ../test/fixtures/N_.rb:10 ../test/fixtures/_.rb:30 ../test/fixtures/n_.rb:29
+#: ../test/test_gettext.rb:155 ../test/test_gettext.rb:159
+msgid "aaa"
+msgid_plural "aaa2"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../test/fixtures/N_.rb:14 ../test/fixtures/_.rb:34
+msgid "aaa\n"
 msgstr ""
 
-#: ../samples/hello2.rb:18
-msgid "One is %{num}\n"
+#: ../test/fixtures/N_.rb:18 ../test/fixtures/_.rb:38
+msgid ""
+"bbb\n"
+"ccc"
 msgstr ""
 
-#: ../samples/hello2.rb:19
-msgid "Hello %{world}\n"
+#: ../test/fixtures/N_.rb:22 ../test/fixtures/_.rb:42
+msgid ""
+"bbb\n"
+"ccc\n"
+"ddd\n"
 msgstr ""
 
-#: ../samples/hello2.rb:19
-msgid "World"
+#: ../test/fixtures/N_.rb:29 ../test/fixtures/N_.rb:33 ../test/fixtures/_.rb:49
+#: ../test/fixtures/_.rb:53
+msgid "eee"
 msgstr ""
 
-#: ../test/tools/files/simple_translation.rb:3
-msgid "a translation"
+#: ../test/fixtures/N_.rb:33 ../test/fixtures/_.rb:53 ../test/fixtures/n_.rb:55
+#: ../test/fixtures/n_.rb:59
+msgid "fff"
+msgid_plural "fff2"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../test/fixtures/N_.rb:37 ../test/fixtures/_.rb:57 ../test/fixtures/n_.rb:63
+msgid "ggghhhiii"
+msgid_plural "jjjkkklll"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../test/fixtures/N_.rb:43 ../test/fixtures/_.rb:63 ../test/fixtures/n_.rb:72
+msgid "a\"b\"c\""
+msgid_plural "a\"b\"c\"2"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../test/fixtures/N_.rb:47 ../test/fixtures/_.rb:67 ../test/fixtures/n_.rb:76
+msgid "d\"e\"f\""
+msgid_plural "d\"e\"f\"2"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../test/fixtures/N_.rb:51 ../test/fixtures/_.rb:71
+msgid "jjj"
+msgstr ""
+
+#: ../test/fixtures/N_.rb:52 ../test/fixtures/_.rb:72
+msgid "kkk"
+msgstr ""
+
+#: ../test/fixtures/N_.rb:56 ../test/fixtures/_.rb:76
+msgid "lllmmm"
+msgstr ""
+
+#: ../test/fixtures/N_.rb:64 ../test/fixtures/_.rb:84
+msgid ""
+"nnn\n"
+"ooo"
+msgstr ""
+
+#: ../test/fixtures/_.rb:88 ../test/fixtures/_.rb:92
+msgid "#"
+msgstr ""
+
+#: ../test/fixtures/_.rb:96
+msgid "\taaa"
+msgstr ""
+
+#: ../test/fixtures/_.rb:100
+msgid ""
+"Here document1\n"
+"Here document2\n"
+msgstr ""
+
+#. TRANSLATORS: This is a proper name.  See the gettext
+#. manual, section Names.  Note this is actually a non-ASCII
+#. name: The first name is (with Unicode escapes)
+#. "Fran\u00e7ois" or (with HTML entities) "Fran&ccedil;ois".
+#. Pronunciation is like "fraa-swa pee-nar".
+#. This is an example from GNU gettext documentation.
+#: ../test/fixtures/_.rb:120
+msgid "Francois Pinard"
+msgstr ""
+
+#: ../test/fixtures/_.rb:123
+msgid "No TRANSLATORS comment"
+msgstr ""
+
+#: ../test/fixtures/_.rb:128
+msgid "self explaining"
+msgstr ""
+
+#: ../test/fixtures/_.rb:132
+msgid "This is a # including string."
+msgstr ""
+
+#: ../test/fixtures/_/double_quote_in_double_quote.rb:28
+msgid "double \"quote\" in double quote"
+msgstr ""
+
+#: ../test/fixtures/_/double_quote_in_single_quote.rb:28
+msgid "double \"quote\" in single quote"
+msgstr ""
+
+#: ../test/fixtures/_/literal_concatenation_with_continuation_line.rb:28
+msgid "literal concatenation with continuation line"
+msgstr ""
+
+#: ../test/fixtures/_/middle_new_line.rb:28
+msgid ""
+"middle\n"
+"new line"
+msgstr ""
+
+#: ../test/fixtures/_/multiple_lines_literal.rb:28
+msgid ""
+"multiple\n"
+"lines\n"
+"literal\n"
+msgstr ""
+
+#: ../test/fixtures/_/multiple_messages_in_same_line.rb:28
+msgid "multiple"
+msgstr ""
+
+#: ../test/fixtures/_/multiple_messages_in_same_line.rb:28
+msgid "in same line"
+msgstr ""
+
+#: ../test/fixtures/_/multiple_same_messages.rb:28
+#: ../test/fixtures/_/multiple_same_messages.rb:32
+msgid "multiple same messages"
+msgstr ""
+
+#: ../test/fixtures/_/one_line.rb:28
+msgid "one line"
+msgstr ""
+
+#: ../test/fixtures/_/one_new_line.rb:28
+msgid "one new line\n"
+msgstr ""
+
+#: ../test/fixtures/backslash.rb:27
+msgid "You should escape '\\' as '\\\\'."
 msgstr ""
 
 #: ../test/fixtures/gladeparser.glade:29
@@ -318,14 +502,41 @@ msgstr ""
 msgid "duplicated"
 msgstr ""
 
-#: ../test/fixtures/n_.rb:29 ../test/fixtures/_.rb:30
-#: ../test/fixtures/N_.rb:10 ../test/test_gettext.rb:155
-#: ../test/test_gettext.rb:159
-msgid "aaa"
-msgid_plural "aaa2"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#: ../test/fixtures/multi_text_domain.rb:11
+#: ../test/fixtures/multi_text_domain.rb:24
+#: ../test/fixtures/multi_text_domain.rb:43
+#: ../test/fixtures/multi_text_domain.rb:50
+#: ../test/fixtures/multi_text_domain.rb:62
+#: ../test/fixtures/multi_text_domain.rb:75
+#: ../test/fixtures/multi_text_domain.rb:91
+#: ../test/fixtures/multi_text_domain.rb:104
+#: ../test/fixtures/multi_text_domain.rb:108
+#: ../test/fixtures/multi_text_domain.rb:128 ../test/fixtures/simple.rb:10
+#: ../test/test_gettext.rb:64 ../test/test_gettext.rb:297
+#: ../test/test_gettext.rb:299 ../test/test_gettext.rb:302
+#: ../test/test_gettext.rb:306 ../test/test_gettext.rb:309
+#: ../test/test_gettext.rb:322 ../test/test_gettext.rb:325
+#: ../test/test_gettext.rb:328 ../test/test_gettext.rb:336
+#: ../test/test_gettext.rb:339 ../test/test_gettext.rb:351
+#: ../test/test_gettext.rb:358 ../test/test_text_domain_toplevel.rb:9
+#: ../test/test_text_domain_toplevel.rb:15
+#: ../test/test_text_domain_toplevel.rb:18
+#: ../test/test_text_domain_toplevel.rb:23 ../test/test_thread.rb:23
+msgid "language"
+msgstr ""
+
+#: ../test/fixtures/multi_text_domain.rb:14
+#: ../test/fixtures/multi_text_domain.rb:27
+#: ../test/fixtures/multi_text_domain.rb:54
+#: ../test/fixtures/multi_text_domain.rb:65
+#: ../test/fixtures/multi_text_domain.rb:78
+#: ../test/fixtures/multi_text_domain.rb:116 ../test/test_gettext.rb:53
+msgid "LANGUAGE"
+msgstr ""
+
+#: ../test/fixtures/multi_text_domain.rb:120
+msgid "no data"
+msgstr ""
 
 #: ../test/fixtures/n_.rb:33
 msgid "bbb\n"
@@ -334,7 +545,6 @@ msgid_plural ""
 "ccc2"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../test/fixtures/n_.rb:37
 msgid ""
@@ -345,7 +555,6 @@ msgid_plural ""
 "ddd2"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../test/fixtures/n_.rb:42
 msgid ""
@@ -356,7 +565,6 @@ msgid_plural ""
 "eee2\n"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../test/fixtures/n_.rb:48
 msgid ""
@@ -367,125 +575,47 @@ msgid_plural ""
 "eee2"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-
-#: ../test/fixtures/n_.rb:55 ../test/fixtures/n_.rb:59
-#: ../test/fixtures/_.rb:53 ../test/fixtures/N_.rb:33
-msgid "fff"
-msgid_plural "fff2"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
 
 #: ../test/fixtures/n_.rb:59
 msgid "ggg"
 msgid_plural "ggg2"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-
-#: ../test/fixtures/n_.rb:63 ../test/fixtures/_.rb:57
-#: ../test/fixtures/N_.rb:37
-msgid "ggghhhiii"
-msgid_plural "jjjkkklll"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../test/fixtures/n_.rb:72 ../test/fixtures/_.rb:63
-#: ../test/fixtures/N_.rb:43
-msgid "a\"b\"c\""
-msgid_plural "a\"b\"c\"2"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../test/fixtures/n_.rb:76 ../test/fixtures/_.rb:67
-#: ../test/fixtures/N_.rb:47
-msgid "d\"e\"f\""
-msgid_plural "d\"e\"f\"2"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
 
 #: ../test/fixtures/n_.rb:80
 msgid "mmmmmm"
 msgid_plural "mmm2mmm2"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../test/fixtures/n_.rb:81
 msgid "nnn"
 msgid_plural "nnn2"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
-#: ../test/fixtures/n_.rb:86 ../test/fixtures/n_.rb:85
+#: ../test/fixtures/n_.rb:85 ../test/fixtures/n_.rb:86
 msgid "ooo"
 msgid_plural "ppp"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../test/fixtures/n_.rb:90 ../test/fixtures/n_.rb:91
 msgid "qqq"
 msgid_plural "rrr"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
-#. please provide translations for all
+#. TRANSLATORS:please provide translations for all
 #. the plural forms!
 #: ../test/fixtures/n_.rb:97
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-
-#: ../test/fixtures/ns_/custom.rb:28 ../test/fixtures/s_/custom.rb:28
-msgid "context|context$message"
-msgid_plural "context|context$messages"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../test/fixtures/multi_textdomain.rb:11
-#: ../test/fixtures/multi_textdomain.rb:24
-#: ../test/fixtures/multi_textdomain.rb:43
-#: ../test/fixtures/multi_textdomain.rb:50
-#: ../test/fixtures/multi_textdomain.rb:62
-#: ../test/fixtures/multi_textdomain.rb:75
-#: ../test/fixtures/multi_textdomain.rb:91
-#: ../test/fixtures/multi_textdomain.rb:104
-#: ../test/fixtures/multi_textdomain.rb:108
-#: ../test/fixtures/multi_textdomain.rb:128 ../test/fixtures/simple.rb:10
-#: ../test/test_thread.rb:23 ../test/test_textdomain_toplevel.rb:9
-#: ../test/test_textdomain_toplevel.rb:15
-#: ../test/test_textdomain_toplevel.rb:18
-#: ../test/test_textdomain_toplevel.rb:23 ../test/test_gettext.rb:64
-#: ../test/test_gettext.rb:297 ../test/test_gettext.rb:299
-#: ../test/test_gettext.rb:302 ../test/test_gettext.rb:306
-#: ../test/test_gettext.rb:309 ../test/test_gettext.rb:322
-#: ../test/test_gettext.rb:325 ../test/test_gettext.rb:328
-#: ../test/test_gettext.rb:336 ../test/test_gettext.rb:339
-#: ../test/test_gettext.rb:351 ../test/test_gettext.rb:358
-msgid "language"
-msgstr ""
 
-#: ../test/fixtures/multi_textdomain.rb:14
-#: ../test/fixtures/multi_textdomain.rb:27
-#: ../test/fixtures/multi_textdomain.rb:54
-#: ../test/fixtures/multi_textdomain.rb:65
-#: ../test/fixtures/multi_textdomain.rb:78
-#: ../test/fixtures/multi_textdomain.rb:116 ../test/test_gettext.rb:53
-msgid "LANGUAGE"
-msgstr ""
-
-#: ../test/fixtures/multi_textdomain.rb:120
-msgid "no data"
+#: ../test/fixtures/non_ascii.rb:10
+msgid "こんにちは"
 msgstr ""
 
 #: ../test/fixtures/np_.rb:28 ../test/fixtures/np_.rb:29
@@ -495,7 +625,6 @@ msgid "a book"
 msgid_plural "%{num} books"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../test/fixtures/np_.rb:38 ../test/fixtures/np_.rb:39
 msgctxt "Hardcover"
@@ -503,7 +632,6 @@ msgid "a book"
 msgid_plural "%{num} books"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../test/fixtures/np_.rb:43 ../test/fixtures/np_.rb:44
 msgctxt "Magaine"
@@ -511,7 +639,6 @@ msgid "I have a magazine"
 msgid_plural "I have %{num} magazines"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../test/fixtures/np_.rb:48 ../test/fixtures/np_.rb:49
 msgctxt "Hardcover"
@@ -519,157 +646,62 @@ msgid "a picture"
 msgid_plural "%{num} pictures"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-
-#: ../test/fixtures/_/one_line.rb:28
-msgid "one line"
-msgstr ""
-
-#: ../test/fixtures/non_ascii.rb:10
-msgid "こんにちは"
-msgstr ""
-
-#: ../test/fixtures/untranslated.rb:10
-msgid "untranslated"
-msgstr ""
-
-#: ../test/fixtures/_.rb:34 ../test/fixtures/N_.rb:14
-msgid "aaa\n"
-msgstr ""
 
-#: ../test/fixtures/_.rb:38 ../test/fixtures/N_.rb:18
-msgid ""
-"bbb\n"
-"ccc"
-msgstr ""
-
-#: ../test/fixtures/_.rb:42 ../test/fixtures/N_.rb:22
-msgid ""
-"bbb\n"
-"ccc\n"
-"ddd\n"
-msgstr ""
-
-#: ../test/fixtures/_.rb:49 ../test/fixtures/_.rb:53 ../test/fixtures/N_.rb:29
-#: ../test/fixtures/N_.rb:33
-msgid "eee"
-msgstr ""
-
-#: ../test/fixtures/_.rb:71 ../test/fixtures/N_.rb:51
-msgid "jjj"
-msgstr ""
-
-#: ../test/fixtures/_.rb:72 ../test/fixtures/N_.rb:52
-msgid "kkk"
-msgstr ""
-
-#: ../test/fixtures/_.rb:76 ../test/fixtures/N_.rb:56
-msgid "lllmmm"
-msgstr ""
-
-#: ../test/fixtures/_.rb:84 ../test/fixtures/N_.rb:64
-msgid ""
-"nnn\n"
-"ooo"
-msgstr ""
-
-#: ../test/fixtures/_.rb:88 ../test/fixtures/_.rb:92
-msgid "#"
-msgstr ""
-
-#: ../test/fixtures/_.rb:96
-msgid "\taaa"
-msgstr ""
-
-#: ../test/fixtures/_.rb:100
-msgid ""
-"Here document1\n"
-"Here document2\n"
-msgstr ""
-
-#. This is a proper name.  See the gettext
-#. manual, section Names.  Note this is actually a non-ASCII
-#. name: The first name is (with Unicode escapes)
-#. "Fran\u00e7ois" or (with HTML entities) "Fran&ccedil;ois".
-#. Pronunciation is like "fraa-swa pee-nar".
-#. This is an example from GNU gettext documentation.
-#: ../test/fixtures/_.rb:119
-msgid "Francois Pinard"
-msgstr ""
-
-#: ../test/fixtures/_.rb:122
-msgid "No TRANSLATORS comment"
-msgstr ""
-
-#: ../test/fixtures/_.rb:127
-msgid "self explaining"
-msgstr ""
-
-#: ../test/fixtures/_.rb:131
-msgid "This is a # including string."
-msgstr ""
-
-#: ../test/fixtures/ns_.rb:28 ../test/fixtures/s_.rb:28
-#: ../test/fixtures/s_.rb:32 ../test/fixtures/ns_.rb:32
+#: ../test/fixtures/ns_.rb:28 ../test/fixtures/ns_.rb:32
+#: ../test/fixtures/s_.rb:28 ../test/fixtures/s_.rb:32
 #: ../test/test_gettext.rb:119
 msgid "AAA|BBB"
 msgid_plural "CCC"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../test/fixtures/ns_.rb:36 ../test/fixtures/s_.rb:36
 msgid "AAA"
 msgid_plural "BBB"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../test/fixtures/ns_.rb:40 ../test/fixtures/s_.rb:40
 msgid "AAA|CCC"
 msgid_plural "DDD"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../test/fixtures/ns_.rb:44 ../test/fixtures/s_.rb:44
 msgid "AAA|BBB|CCC"
 msgid_plural "DDD"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../test/fixtures/ns_.rb:48 ../test/fixtures/s_.rb:48
 msgid "AAA$BBB"
 msgid_plural "CCC"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../test/fixtures/ns_.rb:52 ../test/fixtures/s_.rb:52
 msgid "AAA$B|BB"
 msgid_plural "CCC"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../test/fixtures/ns_.rb:56 ../test/fixtures/s_.rb:56
 msgid "AAA$B|CC"
 msgid_plural "DDD"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../test/fixtures/ns_.rb:60 ../test/fixtures/s_.rb:60
 msgid "AAA|CCC|BBB"
 msgid_plural "DDD"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
-#: ../test/fixtures/backslash.rb:27
-msgid "You should escape '\\' as '\\\\'."
-msgstr ""
+#: ../test/fixtures/ns_/custom.rb:28 ../test/fixtures/s_/custom.rb:28
+msgid "context|context$message"
+msgid_plural "context|context$messages"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../test/fixtures/p_.rb:29 ../test/fixtures/p_.rb:33
 msgctxt "AAA"
@@ -695,7 +727,7 @@ msgstr ""
 msgid "BBB"
 msgstr ""
 
-#. please translate 'name' in the context of 'program'.
+#. TRANSLATORS:please translate 'name' in the context of 'program'.
 #. Hint: the translation should NOT contain the translation of 'program'.
 #: ../test/fixtures/p_.rb:55
 msgctxt "program"
@@ -706,6 +738,10 @@ msgstr ""
 msgid "one is %d."
 msgstr ""
 
+#: ../test/fixtures/untranslated.rb:10
+msgid "untranslated"
+msgstr ""
+
 #: ../test/test_gettext.rb:59
 msgid "nomsgstr"
 msgstr ""
@@ -740,7 +776,6 @@ msgid "one"
 msgid_plural "two"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../test/test_gettext.rb:231 ../test/test_gettext.rb:232
 #: ../test/test_gettext.rb:233 ../test/test_gettext.rb:236
@@ -754,19 +789,47 @@ msgid "first"
 msgid_plural "second"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
-#: ../test/test_gettext.rb:269 ../test/test_gettext.rb:268
+#: ../test/test_gettext.rb:268 ../test/test_gettext.rb:269
 #: ../test/test_gettext.rb:270 ../test/test_gettext.rb:278
 #: ../test/test_gettext.rb:279 ../test/test_gettext.rb:280
 msgid "single"
 msgid_plural "plural"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
-#~ msgid "Warning: fuzzy message was ignored.\n"
-#~ msgstr "Upozorenje: čudna poruka je ignorisana.\n"
+#: ../test/tools/files/simple_translation.rb:3
+msgid "a translation"
+msgstr ""
+
+#: ../lib/gettext/tools.rb:81
+#, fuzzy
+#~ msgid "Failed to merge with %{defpo}"
+#~ msgstr "Spajanje sa %{defpo} nije uspjelo - nastavljam dalje!"
 
-#~ msgid "Warning: obsolete msgid exists.\n"
-#~ msgstr "Upozorenje: nekorišteni msgid postoji.\n"
+#: ../lib/gettext/tools.rb:82
+#, fuzzy
+#~ msgid "New .pot was copied to %{failed_filename}"
+#~ msgstr "Molim da provjerite novi .pot u %{failed_filename}"
+
+#: ../lib/gettext/tools/msgmerge.rb:453
+#~ msgid "definition po is not given."
+#~ msgstr "definicijski po nije dat."
+
+#: ../lib/gettext/tools/msgmerge.rb:455
+#~ msgid "reference pot is not given."
+#~ msgstr "referencni po nije dat."
+
+#: ../lib/gettext/tools/msgmerge.rb:463
+#~ msgid "Usage: %s def.po ref.pot [-o output.pot]"
+#~ msgstr "Korištenje: %s def.po ref.pot [-o izlaz.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"
+#~ "-to-date source references. ref.pot is generally created by rgettext."
+#~ msgstr ""
+#~ "Spaja dvije Uniforum style .po datoteke skupa. def.po datoteka je već postojeć"
+#~ "a PO datoteka sa prevodima. ref.pot je zadnja napravljena PO datoteka sa najno"
+#~ "vijim referencama koda. ref.pot je najčešće napravljen sa rgettext."