Mercurial > hg
changeset 23423:c6329a0e8f94 stable
i18n-ja: synchronized with edf29f9c15f0
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Sat, 29 Nov 2014 14:32:12 +0900 |
| parents | edf29f9c15f0 |
| children | b97b2fbf525c |
| files | i18n/ja.po |
| diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/ja.po Tue Nov 25 19:40:54 2014 -0800 +++ b/i18n/ja.po Sat Nov 29 14:32:12 2014 +0900 @@ -149,8 +149,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2014-11-01 17:00+0900\n" -"PO-Revision-Date: 2014-11-01 17:57+0900\n" +"POT-Creation-Date: 2014-11-29 14:13+0900\n" +"PO-Revision-Date: 2014-11-29 14:23+0900\n" "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -12292,6 +12292,9 @@ msgid "free the working state lock (DANGEROUS)" msgstr "作業領域の排他の解放 (危険)" +msgid "[OPTION]..." +msgstr "[OPTION]..." + msgid "show or modify state of locks" msgstr "排他状況の表示又は変更" @@ -12508,9 +12511,6 @@ msgid "sort by saved mtime" msgstr "記録された mtime 情報で整列" -msgid "[OPTION]..." -msgstr "[OPTION]..." - msgid "show the contents of the current dirstate" msgstr "現時点の dirstate 内容の表示" @@ -13857,8 +13857,8 @@ msgid "[-P] [-f] [[-r] REV]" msgstr "[-P] [-f] [[-r] REV]" -msgid "merge working directory with another revision" -msgstr "作業領域の内容と他のリビジョンのマージ" +msgid "merge another revision into working directory" +msgstr "他リビジョンを作業領域にマージ" msgid "" " The current working directory is updated with all changes made in\n" @@ -19640,12 +19640,12 @@ msgid "" "``reportoldssl``\n" -" Warn if an SSL certificate is unable to be due to using Python\n" +" Warn if an SSL certificate is unable to be used due to using Python\n" " 2.5 or earlier. True or False. Default is True." msgstr "" "``reportoldssl``\n" " Python 2.5 以前の使用により、 SSL 証明書の処理ができない場合の、\n" -" 警告表示を指定する真偽値。 デフォルト値: True" +" 警告表示の有無を指定する真偽値。 デフォルト値: True" msgid "" "``report_untrusted``\n"