diff --git a/i18n/ja.po b/i18n/ja.po index 8594d0b3018ed0eb3d747cbfd068d70bc1bb58a4_aTE4bi9qYS5wbw==..b3840fb03dba2d79c06432624b15f00f5c4d65af_aTE4bi9qYS5wbw== 100644 --- a/i18n/ja.po +++ b/i18n/ja.po @@ -159,8 +159,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2015-04-29 18:27+0900\n" -"PO-Revision-Date: 2015-04-29 21:20+0900\n" +"POT-Creation-Date: 2015-06-01 09:53+0900\n" +"PO-Revision-Date: 2015-06-01 10:28+0900\n" "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -1390,18 +1390,6 @@ " * 個人è˜åˆ¥æƒ…å ±ã€ã‚ã‚‹ã„ã¯ãã‚Œã«é¡žã™ã‚‹å€‹äººæƒ…å ±" msgid "" -"Censored file revisions are listed in a tracked file called .hgcensored " -"stored\n" -"in the repository root. The censor command adds an entry to the .hgcensored " -"file\n" -"in the working directory and commits it (much like ``hg tag`` and .hgtags). " -"The\n" -"censored file data is then replaced with a pointer to the new commit, " -"enabling\n" -"verification." -msgstr "" - -msgid "" "Censored nodes can interrupt mercurial's typical operation whenever the " "excised\n" "data needs to be materialized. Some commands, like ``hg cat``/``hg " @@ -1410,11 +1398,10 @@ "and\n" "``hg update``, must be capable of tolerating censored data to continue to\n" "function in a meaningful way. Such commands only tolerate censored file\n" -"revisions if they are allowed by the policy specified by the \"censor.allow" -"\"\n" -"config option.\n" +"revisions if they are allowed by the \"censor.policy=ignore\" config " +"option.\n" msgstr "" "検閲ã«ã‚ˆã£ã¦æ¶ˆåŽ»ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«å†…容ã¯ã€ å‚ç…§ã™ã‚‹ã“ã¨ãŒã§ããªããªã‚Šã¾ã™ã€‚\n" ":hg:`cat` ã‚„ :hg:`revert` ç‰ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã€ å˜ç´”ã«å‡¦ç†ãŒä¸æ–ã•ã‚Œã¾ã™ã€‚\n" ":hg:`verify` ã‚„ :hg:`update` ç‰ã®å ´åˆã€ 検閲済ã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’無視ã—ã¦ã€\n" "処ç†ã‚’継続ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ 検閲済ã¿ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚ˆã‚‹ä¸æ–を回é¿ã™ã‚‹ã«ã¯ã€\n" @@ -1416,9 +1403,9 @@ msgstr "" "検閲ã«ã‚ˆã£ã¦æ¶ˆåŽ»ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«å†…容ã¯ã€ å‚ç…§ã™ã‚‹ã“ã¨ãŒã§ããªããªã‚Šã¾ã™ã€‚\n" ":hg:`cat` ã‚„ :hg:`revert` ç‰ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã€ å˜ç´”ã«å‡¦ç†ãŒä¸æ–ã•ã‚Œã¾ã™ã€‚\n" ":hg:`verify` ã‚„ :hg:`update` ç‰ã®å ´åˆã€ 検閲済ã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’無視ã—ã¦ã€\n" "処ç†ã‚’継続ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ 検閲済ã¿ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚ˆã‚‹ä¸æ–を回é¿ã™ã‚‹ã«ã¯ã€\n" -"``[censor] allow`` è¨å®šã‚’有効ã«ã—ã¦ãã ã•ã„。\n" +"``[censor] policy=ignore`` ã‚’è¨å®šã—ã¦ãã ã•ã„。\n" msgid "REV" msgstr "リビジョン" @@ -1457,9 +1444,9 @@ msgstr "ヘッドリビジョン (%s) ã®å†…容ã¯æ¤œé–²ã§ãã¾ã›ã‚“" msgid "clean/delete and commit first" -msgstr "" +msgstr "検閲対象データã®å‰Šé™¤ã€åˆã¯å½“該ファイルã®ç™»éŒ²é™¤å¤–ã®ã‚³ãƒŸãƒƒãƒˆãŒå¿…è¦" msgid "cannot censor working directory" msgstr "作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã®å†…容ã¯æ¤œé–²ã§ãã¾ã›ã‚“" msgid "clean/delete/update first" @@ -1461,9 +1448,9 @@ msgid "cannot censor working directory" msgstr "作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã®å†…容ã¯æ¤œé–²ã§ãã¾ã›ã‚“" msgid "clean/delete/update first" -msgstr "" +msgstr "対象データ削除(åˆã¯å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ç™»éŒ²é™¤å¤–)済ã¿ãƒªãƒ“ジョンã¸ã®æ›´æ–°ãŒå¿…è¦" #, python-format msgid "censor does not support revlog version %d" @@ -10687,8 +10674,8 @@ msgid "record the specified user as committer" msgstr "指定ユーザをコミットユーザã¨ã—ã¦è¨˜éŒ²" -msgid "display with template (DEPRECATED)" -msgstr "当該テンプレートã§è¡¨ç¤ºã‚’カスタマイズ (éžæŽ¨å¥¨)" +msgid "display with template (EXPERIMENTAL)" +msgstr "当該テンプレートã§è¡¨ç¤ºã‚’カスタマイズ (実験的実装)" msgid "STYLE" msgstr "スタイル" @@ -16035,7 +16022,7 @@ #, python-format msgid "(did you mean %r?)\n" -msgstr "(ã‚‚ã—ã‹ã—㦠%r ã®ã“ã¨ã§ã™ã‹ï¼Ÿ)\n" +msgstr "(推測ã•ã‚Œã‚‹å€™è£œ: %r)\n" #, python-format msgid "(did you mean one of %s?)\n" @@ -16039,7 +16026,7 @@ #, python-format msgid "(did you mean one of %s?)\n" -msgstr "(ã‚‚ã—ã‹ã—㦠%s ã®ã„ãšã‚Œã‹ã®ã“ã¨ã§ã™ã‹ï¼Ÿ)\n" +msgstr "(推測ã•ã‚Œã‚‹å€™è£œ: %s)\n" msgid "entering debugger - type c to continue starting hg or h for help\n" msgstr "デãƒãƒƒã‚¬å‹•ä½œé–‹å§‹ - 継続ãªã‚‰ c 〠ヘルプãªã‚‰ h を入力ã—ã¦ãã ã•ã„\n" @@ -28006,6 +27993,10 @@ msgid "date expects one or two arguments" msgstr "date ã®å¼•æ•°ã¯1ã¤ã¾ãŸã¯2ã¤ã§ã™" +#. i18n: "date" is a keyword +msgid "date expects a date information" +msgstr "date ã®å…¥åŠ›ã«ã¯æ—¥ä»˜æƒ…å ±ã‚’ä¸Žãˆã¦ãã ã•ã„" + msgid "" ":diff([includepattern [, excludepattern]]): Show a diff, optionally\n" " specifying files to include or exclude." @@ -28167,10 +28158,10 @@ msgid ":word(number, text[, separator]): Return the nth word from a string." msgstr "" -":word(number, text[, separator]): text ã®å†’é number 個ã®å˜èªžã‚’抽出ã—ã¾ã™ã€‚" +":word(number, text[, separator]): text ã® number 個目ã®å˜èªžã‚’抽出ã—ã¾ã™ã€‚" #. i18n: "word" is a keyword #, python-format msgid "word expects two or three arguments, got %d" msgstr "word ã¯2ã¾ãŸã¯3ã®å¼•æ•°ãŒå¿…è¦ã§ã™ (実際ã®å¼•æ•°ã¯ %d 個)" @@ -28171,9 +28162,12 @@ #. i18n: "word" is a keyword #, python-format msgid "word expects two or three arguments, got %d" msgstr "word ã¯2ã¾ãŸã¯3ã®å¼•æ•°ãŒå¿…è¦ã§ã™ (実際ã®å¼•æ•°ã¯ %d 個)" +msgid "Use strings like '3' for numbers passed to word function" +msgstr "word 関数ã«ã¯ '3' ã®ã‚ˆã†ãªæ–‡å—列形å¼ã§æ•°å€¤ã‚’指定ã—ã¦ãã ã•ã„" + msgid "unmatched quotes" msgstr "引用符ã®å¯¾å¿œé–¢ä¿‚ãŒä¸æ£ã§ã™"