gettext 3.0.0 → 3.0.1

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: 2013-04-16 15:11+0900\n"
+"POT-Creation-Date: 2013-09-20 22:54+0900\n"
 "PO-Revision-Date: 2013-04-16 15:07+0900\n"
 "Last-Translator: Haruka Yoshihara <yoshihara@clear-code.com>\n"
 "Language-Team: Japanese\n"
@@ -17,34 +17,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../lib/gettext/runtime/textdomain_manager.rb:148
+#: ../lib/gettext/text_domain_manager.rb:148
 msgid "ngettext: 3rd parmeter is wrong: value = %{number}"
 msgstr "ngettext: 3番目のパラメータが不正です。: value = %{number}"
 
-#: ../lib/gettext/runtime/textdomain_manager.rb:154
+#: ../lib/gettext/text_domain_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}のマージに失敗しました。"
-
-#: ../lib/gettext/tools.rb:82
-msgid "New .pot was copied to %{failed_filename}"
-msgstr "新しい.potファイルを%{failed_filename}にコピーしました。"
-
-#: ../lib/gettext/tools.rb:83
-msgid "Check these po/pot-files. It may have syntax errors or something wrong."
-msgstr "po/potファイルをチェックしてください。文法エラーもしくはその他のエラーがあるかもしれません。"
-
-#: ../lib/gettext/tools.rb:188
-msgid ""
-"`%{cmd}' cannot be found. \n"
-"Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
-msgstr ""
-"`%{cmd}'は見つかりませんでした。\n"
-"GNU Gettextをインストールし、環境変数PATHかMSGMERGE_PATHを正しく設定してください。"
-
 #: ../lib/gettext/tools/msgfmt.rb:65
 msgid "no input files specified."
 msgstr "入力ファイルが指定されていません。"
@@ -57,90 +37,137 @@ msgstr "使い方: %s input.po [-o output.mo]"
 msgid "Generate binary message catalog from textual translation description."
 msgstr "poファイルからバイナリのメッセージカタログファイル（moファイル）を生成します。"
 
-#: ../lib/gettext/tools/msgfmt.rb:89
-#: ../lib/gettext/tools/msgmerge.rb:498
-#: ../lib/gettext/tools/xgettext.rb:213
+#: ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:89
+#: ../lib/gettext/tools/msgmerge.rb:266 ../lib/gettext/tools/xgettext.rb:218
+msgid "Specific options:"
+msgstr "オプション："
+
+#: ../lib/gettext/tools/msgfmt.rb:89 ../lib/gettext/tools/xgettext.rb:221
 msgid "write output to specified file"
 msgstr "出力ファイルを指定します"
 
-#: ../lib/gettext/tools/msgfmt.rb:93
-#: ../lib/gettext/tools/msgmerge.rb:509
-#: ../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 "バージョンを表示します"
 
-#: ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:88
-#: ../lib/gettext/tools/msgmerge.rb:493
-#: ../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."
+#: ../lib/gettext/tools/msginit.rb:85
+msgid ""
+"Create a new .po file from initializing .pot file with user's environment and "
+"input."
 msgstr "ユーザの環境や入力からpotファイルを初期化してpoファイルを作成します。"
 
-#: ../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:91
+msgid ""
+"Use INPUT as a .pot file. If INPUT is not specified, INPUT is a .pot file exis"
+"ting the current directory."
+msgstr ""
+"INPUTとして指定された値をpotファイルとして使います。potファイルが指定されていない場合は、現在のカレントディレクトリにあるpotファイルを使用しま"
+"す。"
 
-#: ../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: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 ""
+"OUTPUTとして指定されたファイルをpoファイルとして扱います。poファイルが指定されていない場合、LOCALEとして指定された値か、ユーザの現在のロケー"
+"ルをもとにpoファイルの名前を決めます。"
 
-#: ../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 "LOCALEとして指定された値をターゲットのロケールとして扱います。ロケールが指定されていない場合は、ユーザの現在のロケールを使用します。"
 
-#: ../lib/gettext/tools/msginit.rb:111
-#: ../lib/gettext/tools/msgmerge.rb:504
+#: ../lib/gettext/tools/msginit.rb:112 ../lib/gettext/tools/msgmerge.rb:317
 msgid "Display this help and exit"
 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 "現在のカレントディレクトリにpotファイルが存在しません。"
 
-#: ../lib/gettext/tools/msginit.rb:139
+#: ../lib/gettext/tools/msginit.rb:140
 msgid "file '%s' does not exist."
 msgstr "ファイル'%s'は存在しません。"
 
-#: ../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 "'#{language_tag}'というロケールは正しくありません。指定したロケールが使用可能かどうか確認してください。"
 
-#: ../lib/gettext/tools/msginit.rb:160
+#: ../lib/gettext/tools/msginit.rb:161
 msgid "file '%s' has already existed."
 msgstr "ファイル'%s'はすでに存在します。"
 
-#: ../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:472
-msgid "definition po is not given."
-msgstr "poファイルが指定されていません。"
+#: ../lib/gettext/tools/msgmerge.rb:255
+msgid "Usage: %s [OPTIONS] definition.po reference.pot"
+msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:474
-msgid "reference pot is not given."
-msgstr "potファイルが指定されていません。"
+#: ../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 ""
+"2つの.poファイルをマージします。def.poファイルはすでにある翻訳済みのPOファイルです。ref.potは最新のPOファイルです。ref.potは通常"
+"xgettextから新たに生成されたものです。"
 
-#: ../lib/gettext/tools/msgmerge.rb:482
-msgid "Usage: %s def.po ref.pot [-o output.pot]"
-msgstr "使用法: %s def.po ref.pot [-o output.pot]"
+#: ../lib/gettext/tools/msgmerge.rb:269
+msgid "Update definition.po"
+msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:485
-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/msgmerge.rb:274
+#, fuzzy
+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: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 ""
+"Break long message lines, longer than the output page width, into several line"
+"s"
+msgstr ""
 
-#: ../lib/gettext/tools/parser/glade.rb:76
+#: ../lib/gettext/tools/msgmerge.rb:323
+#, fuzzy
+msgid "Display version information and exit"
+msgstr "バージョンを表示します"
+
+#: ../lib/gettext/tools/parser/glade.rb:32
 msgid "`%{file}' is not glade-2.0 format."
 msgstr "ファイル'%{file}'はglade-2.0のフォーマットではありません。"
 
@@ -148,81 +175,106 @@ msgstr "ファイル'%{file}'はglade-2.0のフォーマットではありませ
 msgid "'%{klass}' is ignored."
 msgstr "'%{klass}'は無視されました。"
 
-#: ../lib/gettext/tools/xgettext.rb:175
+#: ../lib/gettext/tools/xgettext.rb:183
 msgid "Error parsing %{path}"
 msgstr "%{path}をパース中にエラーが発生しました。"
 
-#: ../lib/gettext/tools/xgettext.rb:186
+#: ../lib/gettext/tools/xgettext.rb:194
 msgid "no input files"
 msgstr "入力ファイルが指定されていません。"
 
-#: ../lib/gettext/tools/xgettext.rb:204
+#: ../lib/gettext/tools/xgettext.rb:212
 msgid "Usage: %s input.rb [-r parser.rb] [-o output.pot]"
 msgstr "使用法: %s input.rb [-r parser.rb] [-o output.pot]"
 
-#: ../lib/gettext/tools/xgettext.rb:207
+#: ../lib/gettext/tools/xgettext.rb:215
 msgid "Extract translatable strings from given input files."
 msgstr "与えられた入力ファイルから翻訳可能な文字列を抜き出します。"
 
-#: ../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 "msgidのバグを報告するアドレスを指定します"
 
-#: ../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
+#: ../lib/gettext/tools/xgettext.rb:246
 msgid "set encoding for output"
 msgstr "出力ファイルのエンコーディングを設定します"
 
-#: ../lib/gettext/tools/xgettext.rb:243
+#: ../lib/gettext/tools/xgettext.rb:251
 msgid "require the library before executing xgettext"
 msgstr "xgettextを実行する前に読み込むライブラリを指定します"
 
-#: ../lib/gettext/tools/xgettext.rb:247
+#: ../lib/gettext/tools/xgettext.rb:256
+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 ou"
+"tput file"
+msgstr ""
+
+#: ../lib/gettext/tools/xgettext.rb:258
+msgid "no TAG"
+msgstr ""
+
+#: ../lib/gettext/tools/xgettext.rb:258
+msgid "(default: %s)"
+msgstr ""
+
+#: ../lib/gettext/tools/xgettext.rb:262
 msgid "run in debugging mode"
 msgstr "デバッグモードで実行します"
 
-#: ../lib/gettext/tools/xgettext.rb:251
+#: ../lib/gettext/tools/xgettext.rb:266
 msgid "display this help and exit"
 msgstr "このヘルプを表示します"
 
-#: ../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/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 ""
+"\"\"というmsgidはgettextによって予約されています。したがって、gettext(\"\")は作成されるpoファイルのヘッダエントリを返しますが、空の文"
+"字列は返しません。"
 
 #: ../samples/cgi/hellolib.rb:16
 msgid "This message is from hellolib."
 msgstr ""
 
-#: ../samples/hello.rb:16
-msgid ""
-"Hello World\n"
+#: ../samples/hello.rb:17
+msgid "Hello World\n"
 msgstr ""
 
-#: ../samples/hello2.rb:18
-msgid ""
-"One is %{num}\n"
+#: ../samples/hello2.rb:19
+msgid "One is %{num}\n"
 msgstr ""
 
-#: ../samples/hello2.rb:19
-msgid ""
-"Hello %{world}\n"
+#: ../samples/hello2.rb:20
+msgid "Hello %{world}\n"
 msgstr ""
 
-#: ../samples/hello2.rb:19
+#: ../samples/hello2.rb:20
 msgid "World"
 msgstr ""
 
+#: ../samples/hello_glade2.glade:9 ../test/fixtures/gladeparser.glade:8
+msgid "window1"
+msgstr ""
+
 #: ../samples/hello_glade2.glade:30
 msgid ""
 "first line\n"
@@ -234,70 +286,106 @@ msgstr ""
 msgid "<Hello world>"
 msgstr ""
 
-#: ../samples/hello_glade2.glade:9 ../test/fixtures/gladeparser.glade:8
-msgid "window1"
-msgstr ""
-
-#: ../samples/hello_gtk2.rb:22
+#: ../samples/hello_gtk2.rb:25
 msgid "hello, gtk world"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World2"
+msgid "Hello World"
 msgstr ""
 
 #: ../samples/hello_noop.rb:13
-msgid "Hello World"
+msgid "Hello World2"
 msgstr ""
 
-#: ../samples/hello_plural.rb:19
-msgid ""
-"There is an apple.\n"
-msgid_plural ""
-"There are %{num} apples.\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:15
+#: ../samples/hello_tk.rb:16
 msgid "hello, tk world"
 msgstr ""
 
-#: ../test/fixtures/N_.rb:37
-#: ../test/fixtures/n_.rb:63 ../test/fixtures/_.rb:57
+#: ../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 ""
+
+#: ../test/fixtures/N_.rb:18 ../test/fixtures/_.rb:38
+msgid ""
+"bbb\n"
+"ccc"
+msgstr ""
+
+#: ../test/fixtures/N_.rb:22 ../test/fixtures/_.rb:42
+msgid ""
+"bbb\n"
+"ccc\n"
+"ddd\n"
+msgstr ""
+
+#: ../test/fixtures/N_.rb:29 ../test/fixtures/N_.rb:33 ../test/fixtures/_.rb:49
+#: ../test/fixtures/_.rb:53
+msgid "eee"
+msgstr ""
+
+#: ../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/n_.rb:72 ../test/fixtures/_.rb:63
+#: ../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/n_.rb:76 ../test/fixtures/_.rb:67
+#: ../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: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:51 ../test/fixtures/_.rb:71
+msgid "jjj"
+msgstr ""
 
-#: ../test/fixtures/N_.rb:29 ../test/fixtures/N_.rb:33
-#: ../test/fixtures/_.rb:49 ../test/fixtures/_.rb:53
-msgid "eee"
+#: ../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 "	aaa"
+msgid "\taaa"
 msgstr ""
 
 #: ../test/fixtures/_.rb:100
@@ -306,7 +394,7 @@ msgid ""
 "Here document2\n"
 msgstr ""
 
-#. This is a proper name.  See the gettext
+#. 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".
@@ -328,57 +416,52 @@ msgstr ""
 msgid "This is a # including string."
 msgstr ""
 
-#: ../test/fixtures/_.rb:34 ../test/fixtures/N_.rb:14
-msgid ""
-"aaa\n"
+#: ../test/fixtures/_/double_quote_in_double_quote.rb:28
+msgid "double \"quote\" in double quote"
 msgstr ""
 
-#: ../test/fixtures/_.rb:38 ../test/fixtures/N_.rb:18
-msgid ""
-"bbb\n"
-"ccc"
+#: ../test/fixtures/_/double_quote_in_single_quote.rb:28
+msgid "double \"quote\" in single quote"
 msgstr ""
 
-#: ../test/fixtures/_.rb:42 ../test/fixtures/N_.rb:22
-msgid ""
-"bbb\n"
-"ccc\n"
-"ddd\n"
+#: ../test/fixtures/_/literal_concatenation_with_continuation_line.rb:28
+msgid "literal concatenation with continuation line"
 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"
+#: ../test/fixtures/_/middle_new_line.rb:28
+msgid ""
+"middle\n"
+"new line"
 msgstr ""
 
-#: ../test/fixtures/_.rb:72 ../test/fixtures/N_.rb:52
-msgid "kkk"
+#: ../test/fixtures/_/multiple_lines_literal.rb:28
+msgid ""
+"multiple\n"
+"lines\n"
+"literal\n"
 msgstr ""
 
-#: ../test/fixtures/_.rb:76 ../test/fixtures/N_.rb:56
-msgid "lllmmm"
+#: ../test/fixtures/_/multiple_messages_in_same_line.rb:28
+msgid "multiple"
 msgstr ""
 
-#: ../test/fixtures/_.rb:84 ../test/fixtures/N_.rb:64
-msgid ""
-"nnn\n"
-"ooo"
+#: ../test/fixtures/_/multiple_messages_in_same_line.rb:28
+msgid "in same line"
 msgstr ""
 
-#: ../test/fixtures/_.rb:88 ../test/fixtures/_.rb:92
-msgid "#"
+#: ../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 ""
@@ -413,46 +496,44 @@ msgstr ""
 msgid "duplicated"
 msgstr ""
 
-#: ../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
+#: ../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_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
+#: ../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_textdomain.rb:120
+#: ../test/fixtures/multi_text_domain.rb:120
 msgid "no data"
 msgstr ""
 
 #: ../test/fixtures/n_.rb:33
-msgid ""
-"bbb\n"
+msgid "bbb\n"
 msgid_plural ""
 "ccc2\n"
 "ccc2"
@@ -507,15 +588,7 @@ msgid_plural "nnn2"
 msgstr[0] ""
 msgstr[1] ""
 
-#. please provide translations for all
-#. the plural forms!
-#: ../test/fixtures/n_.rb:97
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../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] ""
@@ -527,6 +600,14 @@ msgid_plural "rrr"
 msgstr[0] ""
 msgstr[1] ""
 
+#. TRANSLATORS:please provide translations for all
+#. the plural forms!
+#: ../test/fixtures/n_.rb:97
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../test/fixtures/non_ascii.rb:10
 msgid "こんにちは"
 msgstr ""
@@ -560,8 +641,8 @@ msgid_plural "%{num} pictures"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../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"
@@ -616,6 +697,11 @@ msgid_plural "context|context$messages"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../test/fixtures/p_.rb:29 ../test/fixtures/p_.rb:33
+msgctxt "AAA"
+msgid "BBB"
+msgstr ""
+
 #: ../test/fixtures/p_.rb:37
 msgctxt "AAA|BBB"
 msgid "CCC"
@@ -635,18 +721,13 @@ 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"
 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 ""
@@ -663,19 +744,6 @@ msgstr ""
 msgid "test"
 msgstr ""
 
-#: ../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
@@ -703,7 +771,20 @@ msgid_plural "two"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../test/test_gettext.rb:269 ../test/test_gettext.rb:268
+#: ../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: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"
@@ -714,3 +795,44 @@ msgstr[1] ""
 #: ../test/tools/files/simple_translation.rb:3
 msgid "a translation"
 msgstr ""
+
+#: ../lib/gettext/tools.rb:81
+#~ msgid "Failed to merge with %{defpo}"
+#~ msgstr "%{defpo}のマージに失敗しました。"
+
+#: ../lib/gettext/tools.rb:82
+#~ msgid "New .pot was copied to %{failed_filename}"
+#~ msgstr "新しい.potファイルを%{failed_filename}にコピーしました。"
+
+#: ../lib/gettext/tools.rb:83
+#~ msgid "Check these po/pot-files. It may have syntax errors or something wrong."
+#~ msgstr "po/potファイルをチェックしてください。文法エラーもしくはその他のエラーがあるかもしれません。"
+
+#: ../lib/gettext/tools.rb:188
+#~ msgid ""
+#~ "`%{cmd}' cannot be found. \n"
+#~ "Install GNU Gettext then set PATH or MSGMERGE_PATH correctly."
+#~ msgstr ""
+#~ "`%{cmd}'は見つかりませんでした。\n"
+#~ "GNU Gettextをインストールし、環境変数PATHかMSGMERGE_PATHを正しく設定してください。"
+
+#: ../lib/gettext/tools/msgmerge.rb:472
+#~ msgid "definition po is not given."
+#~ msgstr "poファイルが指定されていません。"
+
+#: ../lib/gettext/tools/msgmerge.rb:474
+#~ msgid "reference pot is not given."
+#~ msgstr "potファイルが指定されていません。"
+
+#: ../lib/gettext/tools/msgmerge.rb:482
+#~ msgid "Usage: %s def.po ref.pot [-o output.pot]"
+#~ msgstr "使用法: %s def.po ref.pot [-o output.pot]"
+
+#: ../lib/gettext/tools/msgmerge.rb:485
+#~ 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 ""
+#~ "2つの.poファイルをマージします。def.poファイルはすでにある翻訳済みのPOファイルです。ref.potは最新のPOファイルです。ref.potは通常"
+#~ "xgettextから新たに生成されたものです。"