diff --git a/i18n/ja.po b/i18n/ja.po index 42418c49b0d279581b035d268d249607267fdf7b_aTE4bi9qYS5wbw==..27205c8335b06d8a2718b85c71adfaa3287cec35_aTE4bi9qYS5wbw== 100644 --- a/i18n/ja.po +++ b/i18n/ja.po @@ -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,6 +26128,7 @@ msgid "sub expects three arguments" msgstr "sub ã¯å¼•æ•°ãŒ3ã¤å¿…è¦ã§ã™" +#. i18n: "startswith" is a keyword msgid "startswith expects two arguments" msgstr "startswith ã®å¼•æ•°ã¯2ã¤ã§ã™" @@ -26128,6 +26132,7 @@ 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 個)"