Mercurial > hg
changeset 21970:27205c8335b0 stable
merge with i18n some more
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 01 Aug 2014 11:45:26 -0500 |
| parents | 42418c49b0d2 (current diff) 2167bddc911c (diff) |
| children | 412ac613fd89 |
| files | |
| diffstat | 1 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/ja.po Fri Aug 01 11:44:50 2014 -0500 +++ b/i18n/ja.po Fri Aug 01 11:45:26 2014 -0500 @@ -149,8 +149,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2014-07-31 19:59+0900\n" -"PO-Revision-Date: 2014-07-31 23:57+0900\n" +"POT-Creation-Date: 2014-08-01 17:00+0900\n" +"PO-Revision-Date: 2014-08-01 17:24+0900\n" "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -2726,8 +2726,8 @@ msgstr "%r オブジェクトが %s から読み込めません" #, python-format -msgid "cannot read %r object at %s: %s" -msgstr "%r オブジェクトが %s から読み込めません: %s" +msgid "cannot read %r object at %s: unexpected size" +msgstr "%r オブジェクトが %s から読み込めません: 想定外のサイズ" #, python-format msgid "cannot read submodules config file in %s" @@ -13127,6 +13127,9 @@ msgid "patch applied partially\n" msgstr "パッチの一部のみが適用されました\n" +msgid "(fix the .rej files and run `hg commit --amend`)\n" +msgstr "(.rej ファイル中の却下差分への対処後に hg commit --amend を推奨)\n" + #, python-format msgid "%s: no diffs found" msgstr "%s: 差分がありません" @@ -26125,9 +26128,11 @@ msgid "sub expects three arguments" msgstr "sub は引数が3つ必要です" +#. i18n: "startswith" is a keyword msgid "startswith expects two arguments" msgstr "startswith の引数は2つです" +#. i18n: "word" is a keyword #, python-format msgid "word expects two or three arguments, got %d" msgstr "word は2または3の引数が必要です (実際の引数は %d 個)"