gettext 2.3.5 → 2.3.6

data/doc/text/news.md

@@ -1,4 +1,18 @@
 # News
+## <a id="2-3-6">2.3.6</a>: 2012-12-19
+
+This is a bug fix release.
+
+### Fixes
+
+  * [POEntry] Fixed the bug that obsolete comment mark (#~) is added
+    to already comment.
+  * [msgmerge] Fixed the bug that no separator (blank line) didn't exist
+    between each obsolete entry.
+  * [msgmerge] Fixed tne bug that obsolete entries in old PO file are
+    added to new PO file. Any obsolete entries in old PO file aren't
+    treated for merging.
+
 ## <a id="2-3-5">2.3.5</a>: 2012-12-11
 
 This is a bug fix release.

data/lib/gettext/tools/msginit.rb

@@ -68,8 +68,7 @@ module GetText
 
         parser = POParser.new
         parser.ignore_fuzzy = false
-        pot = parser.parse_file(@input_file,
-                                GetText::PO.new)
+        pot = parser.parse_file(@input_file, GetText::PO.new)
         po = replace_pot_header(pot)
 
         File.open(@output_file, "w") do |f|
@@ -255,8 +254,7 @@ module GetText
       POT_REVISION_DATE_KEY = /^(PO-Revision-Date:).+/
 
       def replace_pot_revision_date #:nodoc:
-        @entry = @entry.gsub(POT_REVISION_DATE_KEY,
-                             "\\1 #{revision_date}")
+        @entry = @entry.gsub(POT_REVISION_DATE_KEY, "\\1 #{revision_date}")
       end
 
       LANGUAGE_KEY = /^(Language:).+/
@@ -349,8 +347,7 @@ module GetText
       def replace_first_author #:nodoc:
         @comment = @comment.gsub(YEAR_KEY, "\\1 #{year}.")
         unless @translator.nil?
-          @comment = @comment.gsub(FIRST_AUTHOR_KEY,
-                                   "#{@translator}, \\1")
+          @comment = @comment.gsub(FIRST_AUTHOR_KEY, "#{@translator}, \\1")
         end
       end
 

data/lib/gettext/tools/msgmerge.rb

@@ -344,11 +344,12 @@ module GetText
         MAX_FUZZY_DISTANCE = 0.5 # XXX: make sure that its value is proper.
 
         def find_fuzzy_entry(definition, msgid, msgctxt)
+          return nil if msgid == :last
           min_distance_entry = nil
           min_distance = MAX_FUZZY_DISTANCE
 
           same_msgctxt_entries = definition.find_all do |entry|
-            entry.msgctxt == msgctxt
+            entry.msgctxt == msgctxt and not entry.msgid == :last
           end
           same_msgctxt_entries.each do |entry|
             distance = Levenshtein.normalized_distance(entry.msgid, msgid)
@@ -374,14 +375,14 @@ module GetText
 
           obsolete_entries = extract_obsolete_entries(result, definition)
           unless obsolete_entries.empty?
-            obsolete_comment = ""
+            obsolete_comment = []
 
             obsolete_entries.each do |entry|
               obsolete_comment << entry.to_s
             end
             obsolete_entry = POEntry.new(:normal)
             obsolete_entry.msgid = :last
-            obsolete_entry.comment = obsolete_comment
+            obsolete_entry.comment = obsolete_comment.join("\n")
           end
           obsolete_entry
         end
@@ -390,7 +391,7 @@ module GetText
           obsolete_entries = []
           definition.each do |entry|
             id = [entry.msgctxt, entry.msgid]
-            unless result.has_key?(*id)
+            if not result.has_key?(*id) and not entry.msgid == :last
               obsolete_entries << entry
             end
           end

data/lib/gettext/tools/po_entry.rb

@@ -176,7 +176,7 @@ module GetText
       str = ""
       # extracted comments
       if @msgid == :last
-        return format_comment("#~", comment)
+        return format_obsolete_comment(comment)
       end
 
       str << format_translator_comment
@@ -275,6 +275,23 @@ module GetText
       formatted_comment
     end
 
+    def format_obsolete_comment(comment)
+      mark = "#~"
+      return "" if comment.nil?
+
+      formatted_comment = ""
+      comment.each_line do |comment_line|
+        if /\A#[^~]/ =~ comment_line or comment_line.start_with?(mark)
+          formatted_comment << comment_line
+        elsif comment_line == "\n"
+          formatted_comment << "\n"
+        else
+          formatted_comment << "#{mark} #{comment_line.strip}\n"
+        end
+      end
+      formatted_comment
+    end
+
     def format_message(message)
       formatted_message = ""
       if not message.nil? and message.include?("\n")

data/lib/gettext/version.rb

@@ -9,5 +9,5 @@
 =end
 
 module GetText
-  VERSION = "2.3.5"
+  VERSION = "2.3.6"
 end

data/po/ja/gettext.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gettext 2.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-20 14:51+0900\n"
+"POT-Creation-Date: 2012-12-19 15:16+0900\n"
 "PO-Revision-Date: 2012-10-16 16:20+0900\n"
 "Last-Translator: Haruka Yoshihara <yoshihara@clear-code.com>\n"
 "Language-Team: Japanese\n"
@@ -17,6 +17,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ../lib/gettext/runtime/textdomain_manager.rb:148
+msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
+msgstr "ngettext: 3番目のパラメータが不正です。: value = %{number}"
+
+#: ../lib/gettext/runtime/textdomain_manager.rb:154
+msgid "ngettext: 3rd parameter should be a number, not nil."
+msgstr "ngettext: 3番目のパラメータがnilです。数値にしてください。"
+
 #: ../lib/gettext/tools.rb:81
 msgid "Failed to merge with %{defpo}"
 msgstr "%{defpo}のマージに失敗しました。"
@@ -31,7 +39,9 @@ msgstr "po/potファイルをチェックしてください。文法エラーも
 
 #: ../lib/gettext/tools.rb:188
 msgid "`%{cmd}' can not be found. \nInstall GNU Gettext then set PATH or MSGMERGE_PATH correctly."
-msgstr "`%{cmd}'は見つかりませんでした。\nGNU Gettextをインストールし、環境変数PATHかMSGMERGE_PATHを正しく設定してください。"
+msgstr ""
+"`%{cmd}'は見つかりませんでした。\n"
+"GNU Gettextをインストールし、環境変数PATHかMSGMERGE_PATHを正しく設定してください。"
 
 #: ../lib/gettext/tools/msgfmt.rb:65
 msgid "no input files specified."
@@ -45,58 +55,62 @@ msgstr "使い方: %s input.po [-o output.mo]"
 msgid "Generate binary message catalog from textual translation description."
 msgstr "poファイルからバイナリのメッセージカタログファイル（moファイル）を生成します。"
 
-#: ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:89
-#: ../lib/gettext/tools/msgmerge.rb:474 ../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:483
 #: ../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:494
 #: ../lib/gettext/tools/xgettext.rb:256
 msgid "display version information and exit"
 msgstr "バージョンを表示します"
 
-#: ../lib/gettext/tools/msginit.rb:85
+#: ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:88
+#: ../lib/gettext/tools/msgmerge.rb:478
+#: ../lib/gettext/tools/xgettext.rb:210
+msgid "Specific options:"
+msgstr "オプション："
+
+#: ../lib/gettext/tools/msginit.rb:84
 msgid "Create a new .po file from initializing .pot file with user's environment and input."
 msgstr "ユーザの環境や入力からpotファイルを初期化してpoファイルを作成します。"
 
-#: ../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 "INPUTとして指定された値をpotファイルとして使います。potファイルが指定されていない場合は、現在のカレントディレクトリにあるpotファイルを使用します。"
 
-#: ../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 "OUTPUTとして指定されたファイルをpoファイルとして扱います。poファイルが指定されていない場合、LOCALEとして指定された値か、ユーザの現在のロケールをもとにpoファイルの名前を決めます。"
 
-#: ../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 "LOCALEとして指定された値をターゲットのロケールとして扱います。ロケールが指定されていない場合は、ユーザの現在のロケールを使用します。"
 
-#: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:485
+#: ../lib/gettext/tools/msginit.rb:111
+#: ../lib/gettext/tools/msgmerge.rb:489
 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 "現在のカレントディレクトリにpotファイルが存在しません。"
 
-#: ../lib/gettext/tools/msginit.rb:140
+#: ../lib/gettext/tools/msginit.rb:139
 msgid "file '%s' does not exist."
 msgstr "ファイル'%s'は存在しません。"
 
-#: ../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 "'#{language_tag}'というロケールは正しくありません。指定したロケールが使用可能かどうか確認してください。"
 
-#: ../lib/gettext/tools/msginit.rb:161
+#: ../lib/gettext/tools/msginit.rb:160
 msgid "file '%s' has already existed."
 msgstr "ファイル'%s'はすでに存在します。"
 
@@ -108,22 +122,26 @@ msgstr "あなたのフルネームを入力してください"
 msgid "Please enter your email address"
 msgstr "あなたのメールアドレスを入力してください"
 
-#: ../lib/gettext/tools/msgmerge.rb:453
+#: ../lib/gettext/tools/msgmerge.rb:457
 msgid "definition po is not given."
 msgstr "poファイルが指定されていません。"
 
-#: ../lib/gettext/tools/msgmerge.rb:455
+#: ../lib/gettext/tools/msgmerge.rb:459
 msgid "reference pot is not given."
 msgstr "potファイルが指定されていません。"
 
-#: ../lib/gettext/tools/msgmerge.rb:463
+#: ../lib/gettext/tools/msgmerge.rb:467
 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
+#: ../lib/gettext/tools/msgmerge.rb:470
 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 "2つの.poファイルをマージします。def.poファイルはすでにある翻訳済みのPOファイルです。ref.potは最新のPOファイルです。ref.potは通常xgettextから新たに生成されたものです。"
 
+#: ../lib/gettext/tools/parser/glade.rb:76
+msgid "`%{file}' is not glade-2.0 format."
+msgstr "ファイル'%{file}'はglade-2.0のフォーマットではありません。"
+
 #: ../lib/gettext/tools/xgettext.rb:64
 msgid "'%{klass}' is ignored."
 msgstr "'%{klass}'は無視されました。"
@@ -176,80 +194,173 @@ 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 "\"\"というmsgidはgettextによって予約されています。したがって、gettext(\"\")は作成されるpoファイルのヘッダエントリを返しますが、空の文字列は返しません。"
 
-#: ../lib/gettext/tools/parser/glade.rb:76
-msgid "`%{file}' is not glade-2.0 format."
-msgstr "ファイル'%{file}'はglade-2.0のフォーマットではありません。"
-
-#: ../lib/gettext/runtime/textdomain_manager.rb:148
-msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
-msgstr "ngettext: 3番目のパラメータが不正です。: value = %{number}"
+#: ../samples/cgi/hellolib.rb:16
+msgid "This message is from hellolib."
+msgstr ""
 
-#: ../lib/gettext/runtime/textdomain_manager.rb:154
-msgid "ngettext: 3rd parameter should be a number, not nil."
-msgstr "ngettext: 3番目のパラメータがnilです。数値にしてください。"
+#: ../samples/hello.rb:16
+msgid "Hello World\n"
+msgstr ""
 
-#: ../samples/hello_gtk2.rb:22
-msgid "hello, gtk world"
+#: ../samples/hello2.rb:18
+msgid "One is %{num}\n"
 msgstr ""
 
-#: ../samples/hello_tk.rb:15
-msgid "hello, tk world"
+#: ../samples/hello2.rb:19
+msgid "Hello %{world}\n"
 msgstr ""
 
-#: ../samples/hello_glade2.glade:9 ../test/fixtures/gladeparser.glade:8
-msgid "window1"
+#: ../samples/hello2.rb:19
+msgid "World"
 msgstr ""
 
 #: ../samples/hello_glade2.glade:30
-msgid ""
-"first line\n"
-"second line\n"
-"third line"
+msgid "first line\nsecond line\nthird line"
 msgstr ""
 
 #: ../samples/hello_glade2.glade:54
 msgid "<Hello world>"
 msgstr ""
 
+#: ../samples/hello_glade2.glade:9 ../test/fixtures/gladeparser.glade:8
+msgid "window1"
+msgstr ""
+
+#: ../samples/hello_gtk2.rb:22
+msgid "hello, gtk world"
+msgstr ""
+
+#: ../samples/hello_noop.rb:13
+msgid "Hello World2"
+msgstr ""
+
+#: ../samples/hello_noop.rb:13
+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] ""
 
-#: ../samples/hello_noop.rb:13
-msgid "Hello World"
+#: ../samples/hello_tk.rb:15
+msgid "hello, tk world"
 msgstr ""
 
-#: ../samples/hello_noop.rb:13
-msgid "Hello World2"
+#: ../test/fixtures/N_.rb:37
+#: ../test/fixtures/n_.rb:63 ../test/fixtures/_.rb:57
+msgid "ggghhhiii"
+msgid_plural "jjjkkklll"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../test/fixtures/N_.rb:43
+#: ../test/fixtures/n_.rb:72 ../test/fixtures/_.rb:63
+msgid "a\"b\"c\""
+msgid_plural "a\"b\"c\"2"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../test/fixtures/N_.rb:47
+#: ../test/fixtures/n_.rb:76 ../test/fixtures/_.rb:67
+msgid "d\"e\"f\""
+msgid_plural "d\"e\"f\"2"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../test/fixtures/N_.rb:10 ../test/test_gettext.rb:155
+#: ../test/fixtures/n_.rb:29 ../test/fixtures/_.rb:30
+#: ../test/test_gettext.rb:159
+msgid "aaa"
+msgid_plural "aaa2"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../test/fixtures/N_.rb:29 ../test/fixtures/N_.rb:33
+#: ../test/fixtures/_.rb:49 ../test/fixtures/_.rb:53
+msgid "eee"
 msgstr ""
 
-#: ../samples/hello.rb:16
-msgid "Hello World\n"
+#: ../test/fixtures/_.rb:96
+msgid "	aaa"
 msgstr ""
 
-#: ../samples/cgi/hellolib.rb:16
-msgid "This message is from hellolib."
+#: ../test/fixtures/_.rb:100
+msgid "Here document1\nHere document2\n"
 msgstr ""
 
-#: ../samples/hello2.rb:18
-msgid "One is %{num}\n"
+#. 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 ""
 
-#: ../samples/hello2.rb:19
-msgid "Hello %{world}\n"
+#: ../test/fixtures/_.rb:122
+msgid "No TRANSLATORS comment"
 msgstr ""
 
-#: ../samples/hello2.rb:19
-msgid "World"
+#: ../test/fixtures/_.rb:127
+msgid "self explaining"
 msgstr ""
 
-#: ../test/tools/files/simple_translation.rb:3
-msgid "a translation"
+#: ../test/fixtures/_.rb:131
+msgid "This is a # including string."
+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\nccc"
+msgstr ""
+
+#: ../test/fixtures/_.rb:42 ../test/fixtures/N_.rb:22
+msgid "bbb\nccc\nddd\n"
+msgstr ""
+
+#: ../test/fixtures/_.rb:53 ../test/fixtures/N_.rb:33
+#: ../test/fixtures/n_.rb:55 ../test/fixtures/n_.rb:59
+msgid "fff"
+msgid_plural "fff2"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../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\nooo"
+msgstr ""
+
+#: ../test/fixtures/_.rb:88 ../test/fixtures/_.rb:92
+msgid "#"
+msgstr ""
+
+#: ../test/fixtures/_/one_line.rb:28
+msgid "one line"
+msgstr ""
+
+#: ../test/fixtures/backslash.rb:27
+msgid "You should escape '\\' as '\\\\'."
 msgstr ""
 
 #: ../test/fixtures/gladeparser.glade:29
@@ -257,10 +368,7 @@ msgid "normal text"
 msgstr ""
 
 #: ../test/fixtures/gladeparser.glade:50
-msgid ""
-"1st line\n"
-"2nd line\n"
-"3rd line"
+msgid "1st line\n2nd line\n3rd line"
 msgstr ""
 
 #: ../test/fixtures/gladeparser.glade:73
@@ -275,87 +383,89 @@ msgstr ""
 msgid "<span>&quot;markup&quot; with &lt;escaped strings&gt;</span>"
 msgstr ""
 
-#: ../test/fixtures/gladeparser.glade:137 ../test/fixtures/gladeparser.glade:158
+#: ../test/fixtures/gladeparser.glade:137
+#: ../test/fixtures/gladeparser.glade:158
 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] ""
+#: ../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_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_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
+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"
+msgstr ""
 
 #: ../test/fixtures/n_.rb:33
 msgid "bbb\n"
 msgid_plural "ccc2\nccc2"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../test/fixtures/n_.rb:37
 msgid "ddd\nddd"
 msgid_plural "ddd2\nddd2"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../test/fixtures/n_.rb:42
-msgid ""
-"eee\n"
-"eee\n"
-msgid_plural ""
-"eee2\n"
-"eee2\n"
+msgid "eee\neee\n"
+msgid_plural "eee2\neee2\n"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../test/fixtures/n_.rb:48
-msgid ""
-"ddd\n"
-"eee\n"
+msgid "ddd\neee\n"
 msgid_plural "ddd\neee2"
 msgstr[0] ""
-
-#: ../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] ""
 
 #: ../test/fixtures/n_.rb:59
 msgid "ggg"
 msgid_plural "ggg2"
 msgstr[0] ""
-
-#: ../test/fixtures/n_.rb:63 ../test/fixtures/_.rb:57 ../test/fixtures/N_.rb:37
-msgid "ggghhhiii"
-msgid_plural "jjjkkklll"
-msgstr[0] ""
-
-#: ../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] ""
-
-#: ../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] ""
 
 #: ../test/fixtures/n_.rb:80
 msgid "mmmmmm"
 msgid_plural "mmm2mmm2"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../test/fixtures/n_.rb:81
 msgid "nnn"
 msgid_plural "nnn2"
 msgstr[0] ""
-
-#: ../test/fixtures/n_.rb:86 ../test/fixtures/n_.rb:85
-msgid "ooo"
-msgid_plural "ppp"
-msgstr[0] ""
-
-#: ../test/fixtures/n_.rb:90 ../test/fixtures/n_.rb:91
-msgid "qqq"
-msgid_plural "rrr"
-msgstr[0] ""
+msgstr[1] ""
 
 #. please provide translations for all
 #. the plural forms!
@@ -363,195 +473,108 @@ msgstr[0] ""
 msgid "comment"
 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/n_.rb:86 ../test/fixtures/n_.rb:85
+msgid "ooo"
+msgid_plural "ppp"
 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/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/n_.rb:90 ../test/fixtures/n_.rb:91
+msgid "qqq"
+msgid_plural "rrr"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../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 ../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"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../test/fixtures/np_.rb:38 ../test/fixtures/np_.rb:39
 msgctxt "Hardcover"
 msgid "a book"
 msgid_plural "%{num} books"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../test/fixtures/np_.rb:43 ../test/fixtures/np_.rb:44
 msgctxt "Magaine"
 msgid "I have a magazine"
 msgid_plural "I have %{num} magazines"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../test/fixtures/np_.rb:48 ../test/fixtures/np_.rb:49
 msgctxt "Hardcover"
 msgid "a picture"
 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 "こんにちは"
-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\nccc"
-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\nooo"
-msgstr ""
-
-#: ../test/fixtures/_.rb:88 ../test/fixtures/_.rb:92
-msgid "#"
-msgstr ""
-
-#: ../test/fixtures/_.rb:96
-msgid "	aaa"
-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/test_gettext.rb:119
+#: ../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 '\\\\'."
-msgstr ""
-
-#: ../test/fixtures/p_.rb:29 ../test/fixtures/p_.rb:33
-msgctxt "AAA"
-msgid "BBB"
-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:37
 msgctxt "AAA|BBB"
@@ -579,10 +602,19 @@ msgctxt "program"
 msgid "name"
 msgstr ""
 
+#: ../test/fixtures/p_.rb:29 ../test/fixtures/p_.rb:33
+msgctxt "AAA"
+msgid "BBB"
+msgstr ""
+
 #: ../test/fixtures/simple.rb:14
 msgid "one is %d."
 msgstr ""
 
+#: ../test/fixtures/untranslated.rb:10
+msgid "untranslated"
+msgstr ""
+
 #: ../test/test_gettext.rb:59
 msgid "nomsgstr"
 msgstr ""
@@ -591,36 +623,54 @@ msgstr ""
 msgid "test"
 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:251
+#: ../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
+msgid "first"
+msgid_plural "second"
+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] ""
-
-#: ../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
+#: ../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/tools/files/simple_translation.rb:3
+msgid "a translation"
+msgstr ""

data/test/test_po_entry.rb

@@ -199,7 +199,12 @@ msgstr \"Salut\"
 EOC
       po.comment = obsolete_comment
 
-      expected_obsolete_comment = obsolete_comment.gsub(/^/, "#~ ")
+      expected_obsolete_comment = <<-EOC
+# test.rb:10
+#~ msgid "hello"
+#~ msgstr "Salut"
+EOC
+
       assert_equal(expected_obsolete_comment, po.to_s)
     end
 

data/test/tools/test_msgmerge.rb

@@ -134,7 +134,13 @@ EOC
         po[""] = header_entry
         po.set_comment(:last, obsolete_comment)
 
-        expected_obsolete_comment = obsolete_comment.gsub(/^/, "#~ ").chomp
+        expected_obsolete_comment = <<-EOC
+# test.rb:10
+#~ msgid "Hello"
+#~ msgstr "Salut"
+EOC
+        expected_obsolete_comment = expected_obsolete_comment.chomp
+
         expected_po = <<EOP
 #{header_entry_comment}
 msgid \"\"
@@ -307,6 +313,17 @@ EOE
       assert_equal("il", merged_po["he"].msgstr)
     end
 
+    def test_existing_obsolete_entry
+      @po["hello"] = "bonjour"
+      @po[:last] = generate_entry(:msgid => :last,
+                                  :comment => "#~ obsolete_entry")
+      @pot["hello"] = "bonjour"
+      merged_po = @merger.merge(@po, @pot)
+
+      assert_equal("bonjour", merged_po["hello"].msgstr)
+      assert_nil(merged_po[:last])
+    end
+
     def test_different_msgstr
       @po["hello"] = "salut"
       @pot["hello"] = "bonjour"
@@ -502,6 +519,7 @@ EOC
       entry.msgid = options[:msgid]
       entry.msgid_plural = msgid_plural
       entry.msgstr = options[:msgstr]
+      entry.comment = options[:comment]
       entry
     end
   end

data/test/tools/test_po.rb

@@ -477,11 +477,24 @@ EOC
 # test.rb:10
 msgid \"hello\"
 msgstr \"Salut\"
+
+# test.rb:20
+msgid \"hi\"
+msgstr \"Bonjour\"
 EOC
     end
 
     def expected_obsolete_comment
-      obsolete_comment.gsub(/^/, "#~ ").chomp
+      comment = <<EOC
+# test.rb:10
+#~ msgid \"hello\"
+#~ msgstr \"Salut\"
+
+# test.rb:20
+#~ msgid \"hi\"
+#~ msgstr \"Bonjour\"
+EOC
+      comment.chomp
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: locale
@@ -966,7 +966,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2018452385733488601
+      hash: 2516078036789009577
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -975,7 +975,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2018452385733488601
+      hash: 2516078036789009577
 requirements: []
 rubyforge_project: gettext
 rubygems_version: 1.8.23