gettext 2.3.8 → 2.3.9

data/doc/text/news.md

@@ -1,5 +1,24 @@
 # News
 
+## <a id="2-3-9">2.3.9</a>: 2013-04-21
+
+This is a msgmerge updated release.
+
+### Improvements
+
+  * [tools] Used the more modern word "cannot" instead of "can
+    not". [GitHub #15] [Patch by Benjamin Kerensa]
+  * Cleared license descriptions. [Suggested by Jérémy Bobbio]
+
+### Fixes
+
+  * Avoided including native extentions in this gem for Windows users.
+
+### Thanks
+
+  * Benjamin Kerensa
+  * Jérémy Bobbio
+
 ## <a id="2-3-8">2.3.8</a>: 2013-04-05
 
 This is a msgmerge improved release.

data/{COPYING → doc/text/ruby-license.txt}

@@ -1,7 +1,7 @@
-gettext is copyrighted free software. See README.rdoc for
-authors.
+gettext is copyrighted free software. See README.rdoc in the top directory
+for authors.
 You can redistribute it and/or modify it under either the terms of the GPL
-version 2 (see the file GPL), or the conditions below:
+version 2 (see the file ./gpl-2.0.txt), or the conditions below:
 
   1. You may make and give away verbatim copies of the source form of the
      software without restriction, provided that you duplicate all of the

data/gettext.gemspec

@@ -20,7 +20,7 @@ So you can use GNU gettext tools for maintaining.
   s.require_paths = ["lib"]
   Dir.chdir(base_dir) do
     s.files = Dir.glob("{locale,bin,data,doc/text,lib,po,samples,src,test}/**/*")
-    s.files += ["COPYING", "README.rdoc", "Rakefile", "gettext.gemspec"]
+    s.files += ["README.rdoc", "Rakefile", "gettext.gemspec"]
     s.files += [".yardopts"]
     s.executables = Dir.chdir("bin") do
       Dir.glob("*")
@@ -29,7 +29,7 @@ So you can use GNU gettext tools for maintaining.
   end
 
   s.add_runtime_dependency("locale")
-  s.add_runtime_dependency("levenshtein")
+  s.add_runtime_dependency("text")
   s.add_development_dependency("rake")
   s.add_development_dependency("racc")
   s.add_development_dependency("yard")

data/lib/gettext/tools.rb

@@ -185,7 +185,7 @@ module GetText
   def ensure_command_exists(cmd)
     `#{cmd} --help`
     unless $? && $?.success?
-      raise _("`%{cmd}' can not be found. \nInstall GNU Gettext then set PATH or MSGMERGE_PATH correctly.") % {:cmd => cmd}
+      raise _("`%{cmd}' cannot be found. \nInstall GNU Gettext then set PATH or MSGMERGE_PATH correctly.") % {:cmd => cmd}
     end
   end
 

data/lib/gettext/tools/msgmerge.rb

@@ -21,7 +21,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require "optparse"
-require "levenshtein"
+require "text"
 require "gettext"
 require "gettext/tools/poparser"
 require "gettext/tools/po"
@@ -357,7 +357,7 @@ module GetText
             entry.msgctxt == msgctxt and not entry.msgid == :last
           end
           same_msgctxt_entries.each do |entry|
-            distance = Levenshtein.normalized_distance(entry.msgid, msgid)
+            distance = normalize_distance(entry.msgid, msgid)
             if min_distance > distance
               min_distance = distance
               min_distance_entry = entry
@@ -367,6 +367,13 @@ module GetText
           min_distance_entry
         end
 
+        def normalize_distance(source, destination)
+          max_size = [source.size, destination.size].max
+
+          return 0.0 if max_size.zero?
+          Text::Levenshtein.distance(source, destination) / max_size.to_f
+        end
+
         def add_obsolete_entry(result, definition)
           obsolete_entry = generate_obsolete_entry(result, definition)
           unless obsolete_entry.nil?

data/lib/gettext/version.rb

@@ -9,5 +9,5 @@
 =end
 
 module GetText
-  VERSION = "2.3.8"
+  VERSION = "2.3.9"
 end

data/po/gettext.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 2.3.3\n"
+"Project-Id-Version: gettext 2.3.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-16 16:38+0900\n"
-"PO-Revision-Date: 2012-10-16 16:38+0900\n"
+"POT-Creation-Date: 2013-04-21 09:37+0900\n"
+"PO-Revision-Date: 2013-04-21 09:37+0900\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -18,22 +18,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../lib/gettext/tools.rb:81
-msgid "Failed to merge with %{defpo}"
-msgstr ""
-
-#: ../lib/gettext/tools.rb:82
-msgid "New .pot was copied to %{failed_filename}"
-msgstr ""
-
-#: ../lib/gettext/tools.rb:83
-msgid "Check these po/pot-files. It may have syntax errors or something wrong."
-msgstr ""
-
-#: ../lib/gettext/tools.rb:188
-msgid "`%{cmd}' can not be found. \\nInstall GNU Gettext then set PATH or MSGMERGE_PATH correctly."
-msgstr ""
-
 #: ../lib/gettext/tools/msgfmt.rb:65
 msgid "no input files specified."
 msgstr ""
@@ -46,58 +30,79 @@ msgstr ""
 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:474 ../lib/gettext/tools/xgettext.rb:210
+#: ../lib/gettext/tools/msgfmt.rb:86
+#: ../lib/gettext/tools/msgmerge.rb:490
+#: ../lib/gettext/tools/msginit.rb:88
+#: ../lib/gettext/tools/xgettext.rb:210
 msgid "Specific options:"
 msgstr ""
 
-#: ../lib/gettext/tools/msgfmt.rb:89 ../lib/gettext/tools/msgmerge.rb:479
+#: ../lib/gettext/tools/msgfmt.rb:89
+#: ../lib/gettext/tools/msgmerge.rb:495
 #: ../lib/gettext/tools/xgettext.rb:213
 msgid "write output to specified file"
 msgstr ""
 
-#: ../lib/gettext/tools/msgfmt.rb:93 ../lib/gettext/tools/msgmerge.rb:490
+#: ../lib/gettext/tools/msgfmt.rb:93
+#: ../lib/gettext/tools/msgmerge.rb:506
 #: ../lib/gettext/tools/xgettext.rb:256
 msgid "display version information and exit"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:85
+#: ../lib/gettext/tools/msgmerge.rb:469
+msgid "definition po is not given."
+msgstr ""
+
+#: ../lib/gettext/tools/msgmerge.rb:471
+msgid "reference pot is not given."
+msgstr ""
+
+#: ../lib/gettext/tools/msgmerge.rb:479
+msgid "Usage: %s def.po ref.pot [-o output.pot]"
+msgstr ""
+
+#: ../lib/gettext/tools/msgmerge.rb:482
+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."
+msgstr ""
+
+#: ../lib/gettext/tools/msgmerge.rb:501
+#: ../lib/gettext/tools/msginit.rb:111
+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."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:91
+#: ../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."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:98
+#: ../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."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:105
+#: ../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."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:485
-msgid "Display this help and exit"
-msgstr ""
-
-#: ../lib/gettext/tools/msginit.rb:117
+#: ../lib/gettext/tools/msginit.rb:116
 msgid "Display version and exit"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:135
+#: ../lib/gettext/tools/msginit.rb:134
 msgid ".pot file does not exist in the current directory."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:140
+#: ../lib/gettext/tools/msginit.rb:139
 msgid "file '%s' does not exist."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:152
+#: ../lib/gettext/tools/msginit.rb:151
 msgid "\"Locale '#{language_tag}' is invalid. \"Please check if your specified locale is usable."
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:161
+#: ../lib/gettext/tools/msginit.rb:160
 msgid "file '%s' has already existed."
 msgstr ""
 
@@ -109,22 +114,6 @@ msgstr ""
 msgid "Please enter your email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:453
-msgid "definition po is not given."
-msgstr ""
-
-#: ../lib/gettext/tools/msgmerge.rb:455
-msgid "reference pot is not given."
-msgstr ""
-
-#: ../lib/gettext/tools/msgmerge.rb:463
-msgid "Usage: %s def.po ref.pot [-o output.pot]"
-msgstr ""
-
-#: ../lib/gettext/tools/msgmerge.rb:466
-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."
-msgstr ""
-
 #: ../lib/gettext/tools/xgettext.rb:64
 msgid "'%{klass}' is ignored."
 msgstr ""
@@ -177,7 +166,7 @@ msgstr ""
 msgid "display this help and exit"
 msgstr ""
 
-#: ../lib/gettext/tools/xgettext.rb:302
+#: ../lib/gettext/tools/xgettext.rb:300
 msgid "Warning: The empty \"\" msgid is reserved by gettext. So gettext(\"\") doesn't returns empty string but the header entry in po file."
 msgstr ""
 
@@ -193,6 +182,22 @@ msgstr ""
 msgid "ngettext: 3rd parameter should be a number, not nil."
 msgstr ""
 
+#: ../lib/gettext/tools.rb:81
+msgid "Failed to merge with %{defpo}"
+msgstr ""
+
+#: ../lib/gettext/tools.rb:82
+msgid "New .pot was copied to %{failed_filename}"
+msgstr ""
+
+#: ../lib/gettext/tools.rb:83
+msgid "Check these po/pot-files. It may have syntax errors or something wrong."
+msgstr ""
+
+#: ../lib/gettext/tools.rb:188
+msgid "`%{cmd}' cannot be found. \\nInstall GNU Gettext then set PATH or MSGMERGE_PATH correctly."
+msgstr ""
+
 #: ../samples/hello_gtk2.rb:22
 msgid "hello, gtk world"
 msgstr ""
@@ -201,16 +206,16 @@ msgstr ""
 msgid "hello, tk world"
 msgstr ""
 
-#: ../samples/hello_glade2.glade:9 ../test/fixtures/gladeparser.glade:8
-msgid "window1"
+#: ../samples/cgi/hellolib.rb:16
+msgid "This message is from hellolib."
 msgstr ""
 
-#: ../samples/hello_glade2.glade:30
-msgid "first line\\nsecond line\\nthird line"
+#: ../samples/hello_noop.rb:13
+msgid "Hello World"
 msgstr ""
 
-#: ../samples/hello_glade2.glade:54
-msgid "<Hello world>"
+#: ../samples/hello_noop.rb:13
+msgid "Hello World2"
 msgstr ""
 
 #: ../samples/hello_plural.rb:19
@@ -219,20 +224,20 @@ msgid_plural "There are %{num} apples.\\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../samples/hello_noop.rb:13
-msgid "Hello World"
+#: ../samples/hello.rb:16
+msgid "Hello World\\n"
 msgstr ""
 
-#: ../samples/hello_noop.rb:13
-msgid "Hello World2"
+#: ../samples/hello_glade2.glade:9 ../test/fixtures/gladeparser.glade:8
+msgid "window1"
 msgstr ""
 
-#: ../samples/hello.rb:16
-msgid "Hello World\\n"
+#: ../samples/hello_glade2.glade:30
+msgid "first line\\nsecond line\\nthird line"
 msgstr ""
 
-#: ../samples/cgi/hellolib.rb:16
-msgid "This message is from hellolib."
+#: ../samples/hello_glade2.glade:54
+msgid "<Hello world>"
 msgstr ""
 
 #: ../samples/hello2.rb:18
@@ -247,41 +252,121 @@ msgstr ""
 msgid "World"
 msgstr ""
 
-#: ../test/tools/files/simple_translation.rb:3
-msgid "a translation"
-msgstr ""
-
-#: ../test/fixtures/gladeparser.glade:29
-msgid "normal text"
+#: ../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
+#: ../test/test_thread.rb:23 ../test/fixtures/simple.rb:10
+#: ../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
+msgid "language"
 msgstr ""
 
-#: ../test/fixtures/gladeparser.glade:50
-msgid "1st line\\n2nd line\\n3rd line"
+#: ../test/tools/files/simple_translation.rb:3
+msgid "a translation"
 msgstr ""
 
-#: ../test/fixtures/gladeparser.glade:73
-msgid "<span color=\"red\" weight=\"bold\" size=\"large\">markup </span>"
+#: ../test/test_gettext.rb:53 ../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
+msgid "LANGUAGE"
 msgstr ""
 
-#: ../test/fixtures/gladeparser.glade:94
-msgid "<span color=\"red\">1st line markup </span>\\n<span color=\"blue\">2nd line markup</span>"
+#: ../test/test_gettext.rb:59
+msgid "nomsgstr"
 msgstr ""
 
-#: ../test/fixtures/gladeparser.glade:116
-msgid "<span>&quot;markup&quot; with &lt;escaped strings&gt;</span>"
+#: ../test/test_gettext.rb:101
+msgid "test"
 msgstr ""
 
-#: ../test/fixtures/gladeparser.glade:137 ../test/fixtures/gladeparser.glade:158
-msgid "duplicated"
-msgstr ""
+#: ../test/fixtures/ns_.rb:28 ../test/test_gettext.rb:119
+#: ../test/fixtures/s_.rb:28 ../test/fixtures/s_.rb:32
+#: ../test/fixtures/ns_.rb:32
+msgid "AAA|BBB"
+msgid_plural "CCC"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../test/fixtures/n_.rb:29 ../test/fixtures/_.rb:30 ../test/fixtures/N_.rb:10
 #: ../test/test_gettext.rb:155 ../test/test_gettext.rb:159
+#: ../test/fixtures/n_.rb:29 ../test/fixtures/N_.rb:10
+#: ../test/fixtures/_.rb:30
 msgid "aaa"
 msgid_plural "aaa2"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../test/test_gettext.rb:179 ../test/test_gettext.rb:180
+#: ../test/test_gettext.rb:181 ../test/test_gettext.rb:184
+#: ../test/test_gettext.rb:185 ../test/test_gettext.rb:186
+#: ../test/test_gettext.rb:189 ../test/test_gettext.rb:190
+#: ../test/test_gettext.rb:191 ../test/test_gettext.rb:194
+#: ../test/test_gettext.rb:195 ../test/test_gettext.rb:196
+#: ../test/test_gettext.rb:197 ../test/test_gettext.rb:200
+#: ../test/test_gettext.rb:201 ../test/test_gettext.rb:202
+#: ../test/test_gettext.rb:203 ../test/test_gettext.rb:206
+#: ../test/test_gettext.rb:207 ../test/test_gettext.rb:208
+#: ../test/test_gettext.rb:211 ../test/test_gettext.rb:212
+#: ../test/test_gettext.rb:213 ../test/test_gettext.rb:216
+#: ../test/test_gettext.rb:217 ../test/test_gettext.rb:218
+#: ../test/test_gettext.rb:221 ../test/test_gettext.rb:222
+#: ../test/test_gettext.rb:223 ../test/test_gettext.rb:224
+#: ../test/test_gettext.rb:225 ../test/test_gettext.rb:252
+#: ../test/test_gettext.rb:253 ../test/test_gettext.rb:254
+#: ../test/test_gettext.rb:260 ../test/test_gettext.rb:261
+#: ../test/test_gettext.rb:262 ../test/test_gettext.rb:271
+#: ../test/test_gettext.rb:272 ../test/test_gettext.rb:273
+#: ../test/test_gettext.rb:281 ../test/test_gettext.rb:282
+#: ../test/test_gettext.rb:283 ../test/test_gettext.rb:292
+msgid "one"
+msgid_plural "two"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../test/test_gettext.rb:231 ../test/test_gettext.rb:232
+#: ../test/test_gettext.rb:233 ../test/test_gettext.rb:236
+#: ../test/test_gettext.rb:237 ../test/test_gettext.rb:238
+#: ../test/test_gettext.rb:240 ../test/test_gettext.rb:241
+#: ../test/test_gettext.rb:242 ../test/test_gettext.rb:244
+#: ../test/test_gettext.rb:245 ../test/test_gettext.rb:246
+#: ../test/test_gettext.rb:249 ../test/test_gettext.rb:250
+#: ../test/test_gettext.rb:251
+msgid "first"
+msgid_plural "second"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../test/test_gettext.rb:269 ../test/test_gettext.rb:268
+#: ../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] ""
+
+#: ../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/n_.rb:33
 msgid "bbb\\n"
 msgid_plural "ccc2\\nccc2"
@@ -306,8 +391,8 @@ msgid_plural "ddd\\neee2"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../test/fixtures/n_.rb:55 ../test/fixtures/n_.rb:59 ../test/fixtures/_.rb:53
-#: ../test/fixtures/N_.rb:33
+#: ../test/fixtures/n_.rb:55 ../test/fixtures/n_.rb:59
+#: ../test/fixtures/N_.rb:33 ../test/fixtures/_.rb:53
 msgid "fff"
 msgid_plural "fff2"
 msgstr[0] ""
@@ -319,19 +404,22 @@ msgid_plural "ggg2"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../test/fixtures/n_.rb:63 ../test/fixtures/_.rb:57 ../test/fixtures/N_.rb:37
+#: ../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/_.rb:63 ../test/fixtures/N_.rb:43
+#: ../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/_.rb:67 ../test/fixtures/N_.rb:47
+#: ../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] ""
@@ -369,39 +457,58 @@ msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../test/fixtures/ns_/custom.rb:28 ../test/fixtures/s_/custom.rb:28
-msgid "context|context$message"
-msgid_plural "context|context$messages"
+#: ../test/fixtures/_/one_line.rb:28
+msgid "one line"
+msgstr ""
+
+#: ../test/fixtures/backslash.rb:27
+msgid "You should escape '\\' as '\\\\'."
+msgstr ""
+
+#: ../test/fixtures/ns_.rb:36 ../test/fixtures/s_.rb:36
+msgid "AAA"
+msgid_plural "BBB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../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/ns_.rb:40 ../test/fixtures/s_.rb:40
+msgid "AAA|CCC"
+msgid_plural "DDD"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../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/ns_.rb:44 ../test/fixtures/s_.rb:44
+msgid "AAA|BBB|CCC"
+msgid_plural "DDD"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../test/fixtures/multi_textdomain.rb:120
-msgid "no data"
-msgstr ""
+#: ../test/fixtures/ns_.rb:48 ../test/fixtures/s_.rb:48
+msgid "AAA$BBB"
+msgid_plural "CCC"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../test/fixtures/ns_.rb:52 ../test/fixtures/s_.rb:52
+msgid "AAA$B|BB"
+msgid_plural "CCC"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../test/fixtures/ns_.rb:56 ../test/fixtures/s_.rb:56
+msgid "AAA$B|CC"
+msgid_plural "DDD"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../test/fixtures/ns_.rb:60 ../test/fixtures/s_.rb:60
+msgid "AAA|CCC|BBB"
+msgid_plural "DDD"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../test/fixtures/np_.rb:28 ../test/fixtures/np_.rb:29 ../test/fixtures/np_.rb:33
-#: ../test/fixtures/np_.rb:34
+#: ../test/fixtures/np_.rb:28 ../test/fixtures/np_.rb:29
+#: ../test/fixtures/np_.rb:33 ../test/fixtures/np_.rb:34
 msgctxt "Magazine"
 msgid "a book"
 msgid_plural "%{num} books"
@@ -429,51 +536,72 @@ msgid_plural "%{num} pictures"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../test/fixtures/_/one_line.rb:28
-msgid "one line"
-msgstr ""
-
-#: ../test/fixtures/non_ascii.rb:10
-msgid "こんにちは"
+#: ../test/fixtures/simple.rb:14
+msgid "one is %d."
 msgstr ""
 
 #: ../test/fixtures/untranslated.rb:10
 msgid "untranslated"
 msgstr ""
 
-#: ../test/fixtures/_.rb:34 ../test/fixtures/N_.rb:14
+#: ../test/fixtures/N_.rb:14 ../test/fixtures/_.rb:34
 msgid "aaa\\n"
 msgstr ""
 
-#: ../test/fixtures/_.rb:38 ../test/fixtures/N_.rb:18
+#: ../test/fixtures/N_.rb:18 ../test/fixtures/_.rb:38
 msgid "bbb\\nccc"
 msgstr ""
 
-#: ../test/fixtures/_.rb:42 ../test/fixtures/N_.rb:22
+#: ../test/fixtures/N_.rb:22 ../test/fixtures/_.rb:42
 msgid "bbb\\nccc\\nddd\\n"
 msgstr ""
 
-#: ../test/fixtures/_.rb:49 ../test/fixtures/_.rb:53 ../test/fixtures/N_.rb:29
-#: ../test/fixtures/N_.rb:33
+#: ../test/fixtures/N_.rb:29 ../test/fixtures/N_.rb:33
+#: ../test/fixtures/_.rb:49 ../test/fixtures/_.rb:53
 msgid "eee"
 msgstr ""
 
-#: ../test/fixtures/_.rb:71 ../test/fixtures/N_.rb:51
+#: ../test/fixtures/N_.rb:51 ../test/fixtures/_.rb:71
 msgid "jjj"
 msgstr ""
 
-#: ../test/fixtures/_.rb:72 ../test/fixtures/N_.rb:52
+#: ../test/fixtures/N_.rb:52 ../test/fixtures/_.rb:72
 msgid "kkk"
 msgstr ""
 
-#: ../test/fixtures/_.rb:76 ../test/fixtures/N_.rb:56
+#: ../test/fixtures/N_.rb:56 ../test/fixtures/_.rb:76
 msgid "lllmmm"
 msgstr ""
 
-#: ../test/fixtures/_.rb:84 ../test/fixtures/N_.rb:64
+#: ../test/fixtures/N_.rb:64 ../test/fixtures/_.rb:84
 msgid "nnn\\nooo"
 msgstr ""
 
+#: ../test/fixtures/gladeparser.glade:29
+msgid "normal text"
+msgstr ""
+
+#: ../test/fixtures/gladeparser.glade:50
+msgid "1st line\\n2nd line\\n3rd line"
+msgstr ""
+
+#: ../test/fixtures/gladeparser.glade:73
+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>"
+msgstr ""
+
+#: ../test/fixtures/gladeparser.glade:116
+msgid "<span>&quot;markup&quot; with &lt;escaped strings&gt;</span>"
+msgstr ""
+
+#: ../test/fixtures/gladeparser.glade:137
+#: ../test/fixtures/gladeparser.glade:158
+msgid "duplicated"
+msgstr ""
+
 #: ../test/fixtures/_.rb:88 ../test/fixtures/_.rb:92
 msgid "#"
 msgstr ""
@@ -492,73 +620,24 @@ msgstr ""
 #. "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
+#: ../test/fixtures/_.rb:120
 msgid "Francois Pinard"
 msgstr ""
 
-#: ../test/fixtures/_.rb:122
+#: ../test/fixtures/_.rb:123
 msgid "No TRANSLATORS comment"
 msgstr ""
 
-#: ../test/fixtures/_.rb:127
+#: ../test/fixtures/_.rb:128
 msgid "self explaining"
 msgstr ""
 
-#: ../test/fixtures/_.rb:131
+#: ../test/fixtures/_.rb:132
 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/test_gettext.rb:119
-msgid "AAA|BBB"
-msgid_plural "CCC"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../test/fixtures/ns_.rb:36 ../test/fixtures/s_.rb:36
-msgid "AAA"
-msgid_plural "BBB"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../test/fixtures/ns_.rb:40 ../test/fixtures/s_.rb:40
-msgid "AAA|CCC"
-msgid_plural "DDD"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../test/fixtures/ns_.rb:44 ../test/fixtures/s_.rb:44
-msgid "AAA|BBB|CCC"
-msgid_plural "DDD"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../test/fixtures/ns_.rb:48 ../test/fixtures/s_.rb:48
-msgid "AAA$BBB"
-msgid_plural "CCC"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../test/fixtures/ns_.rb:52 ../test/fixtures/s_.rb:52
-msgid "AAA$B|BB"
-msgid_plural "CCC"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../test/fixtures/ns_.rb:56 ../test/fixtures/s_.rb:56
-msgid "AAA$B|CC"
-msgid_plural "DDD"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../test/fixtures/ns_.rb:60 ../test/fixtures/s_.rb:60
-msgid "AAA|CCC|BBB"
-msgid_plural "DDD"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../test/fixtures/backslash.rb:27
-msgid "You should escape '\\' as '\\\\'."
+#: ../test/fixtures/multi_textdomain.rb:120
+msgid "no data"
 msgstr ""
 
 #: ../test/fixtures/p_.rb:29 ../test/fixtures/p_.rb:33
@@ -592,51 +671,6 @@ msgctxt "program"
 msgid "name"
 msgstr ""
 
-#: ../test/fixtures/simple.rb:14
-msgid "one is %d."
-msgstr ""
-
-#: ../test/test_gettext.rb:59
-msgid "nomsgstr"
-msgstr ""
-
-#: ../test/test_gettext.rb:101
-msgid "test"
+#: ../test/fixtures/non_ascii.rb:10
+msgid "こんにちは"
 msgstr ""
-
-#: ../test/test_gettext.rb:179 ../test/test_gettext.rb:180 ../test/test_gettext.rb:181
-#: ../test/test_gettext.rb:184 ../test/test_gettext.rb:185 ../test/test_gettext.rb:186
-#: ../test/test_gettext.rb:189 ../test/test_gettext.rb:190 ../test/test_gettext.rb:191
-#: ../test/test_gettext.rb:194 ../test/test_gettext.rb:195 ../test/test_gettext.rb:196
-#: ../test/test_gettext.rb:197 ../test/test_gettext.rb:200 ../test/test_gettext.rb:201
-#: ../test/test_gettext.rb:202 ../test/test_gettext.rb:203 ../test/test_gettext.rb:206
-#: ../test/test_gettext.rb:207 ../test/test_gettext.rb:208 ../test/test_gettext.rb:211
-#: ../test/test_gettext.rb:212 ../test/test_gettext.rb:213 ../test/test_gettext.rb:216
-#: ../test/test_gettext.rb:217 ../test/test_gettext.rb:218 ../test/test_gettext.rb:221
-#: ../test/test_gettext.rb:222 ../test/test_gettext.rb:223 ../test/test_gettext.rb:224
-#: ../test/test_gettext.rb:225 ../test/test_gettext.rb:252 ../test/test_gettext.rb:253
-#: ../test/test_gettext.rb:254 ../test/test_gettext.rb:260 ../test/test_gettext.rb:261
-#: ../test/test_gettext.rb:262 ../test/test_gettext.rb:271 ../test/test_gettext.rb:272
-#: ../test/test_gettext.rb:273 ../test/test_gettext.rb:281 ../test/test_gettext.rb:282
-#: ../test/test_gettext.rb:283 ../test/test_gettext.rb:292
-msgid "one"
-msgid_plural "two"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../test/test_gettext.rb:231 ../test/test_gettext.rb:232 ../test/test_gettext.rb:233
-#: ../test/test_gettext.rb:236 ../test/test_gettext.rb:237 ../test/test_gettext.rb:238
-#: ../test/test_gettext.rb:240 ../test/test_gettext.rb:241 ../test/test_gettext.rb:242
-#: ../test/test_gettext.rb:244 ../test/test_gettext.rb:245 ../test/test_gettext.rb:246
-#: ../test/test_gettext.rb:249 ../test/test_gettext.rb:250 ../test/test_gettext.rb:251
-msgid "first"
-msgid_plural "second"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../test/test_gettext.rb:269 ../test/test_gettext.rb:268 ../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] ""