diff --git a/i18n/ja.po b/i18n/ja.po index 27addd7e8eca18ab1e7b13e2729b5c7699a297c1_aTE4bi9qYS5wbw==..eab27446995210c334c3d06f1a659e3b9b5da769_aTE4bi9qYS5wbw== 100644 --- a/i18n/ja.po +++ b/i18n/ja.po @@ -100,6 +100,7 @@ # largefile(s) 大容é‡ãƒ•ã‚¡ã‚¤ãƒ« # list of .... 列挙ã•ã‚ŒãŸ..../.... ã®ä¸€è¦§ # local (repo) 手元(ã®ãƒªãƒã‚¸ãƒˆãƒª) +# local (at merging) ç¾è¡Œ # lock ãƒãƒƒã‚¯ # manifest マニフェスト or 管ç†å¯¾è±¡(一覧) # merge マージ @@ -127,6 +128,7 @@ # reject(s) å´ä¸‹å·®åˆ† # remote(host) é éš”(ホスト) # remote(repo) 連æºå…ˆ(リãƒã‚¸ãƒˆãƒª) +# remote (at merging) ä»–æ–¹ # remove (構æˆç®¡ç†ã‹ã‚‰ã®)登録除外 # rename 改å # repo(sitory) リãƒã‚¸ãƒˆãƒª/(.hg を指ã™å ´åˆã¯)管ç†é ˜åŸŸ @@ -150,7 +152,7 @@ # tombstone (of censor) 墓碑データ # topological xxxx æ§‹é€ çš„ # tracked xxxx 構æˆç®¡ç†å¯¾è±¡ã® xxxx -# tracked, un 未登録 +# tracked, un 管ç†å¯¾è±¡å¤– # type, xxxxx xxxx 種別 # unknown xxxx 未知㮠xxxx (or 構æˆç®¡ç†å¯¾è±¡å¤–) # URL parameter (of web) URL パスè¦ç´ (å ´åˆã«ã‚ˆã£ã¦ã¯å˜ã« "引数") @@ -163,8 +165,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2016-08-01 06:56+0900\n" -"PO-Revision-Date: 2016-08-01 07:50+0900\n" +"POT-Creation-Date: 2016-10-30 20:25+0900\n" +"PO-Revision-Date: 2016-11-01 03:50+0900\n" "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -638,7 +640,7 @@ "acl: ユーザ \"%s\" ã¯ãƒ•ã‚¡ã‚¤ãƒ« \"%s\" ãŒè¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“(リビジョン \"%s\")" msgid "Check for unrecorded moves at commit time (EXPERIMENTAL)" -msgstr "" +msgstr "ファイル移動ã®ã‚³ãƒŸãƒƒãƒˆæ™‚自動検出 (実験的実装)" msgid "" "This extension checks at commit/amend time if any of the committed files\n" @@ -670,7 +672,6 @@ msgid "log repository events to a blackbox for debugging" msgstr "リãƒã‚¸ãƒˆãƒªã«ãŠã‘るイベントã®è¨˜éŒ²(デãƒãƒƒã‚°ç”¨)" -#, fuzzy msgid "" "Logs event information to .hg/blackbox.log to help debug and diagnose " "problems.\n" @@ -680,8 +681,7 @@ "デãƒãƒƒã‚°ã‚„å•é¡Œè¨ºæ–å‘ã‘ã«ã€ ã‚¤ãƒ™ãƒ³ãƒˆæƒ…å ±ã‚’ .hg/blackbox.log ã«è¨˜éŒ²ã—ã¾ã™ã€‚\n" "記録対象イベント㯠blackbox.track è¨å®šçµŒç”±ã§å¤‰æ›´ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\n" "(※ 訳注: ã“ã“ã§ã® \"blackbox\" ã¯ã€Žå†…容ä¸è©³ã®ä»•çµ„ã¿ã€ã§ã¯ãªãã€\n" -"『フライトレコーダã€ã®æ„味ã§ä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™)\n" -"è¨å®šä¾‹::" +"『フライトレコーダã€ã®æ„味ã§ä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™)" msgid "Examples::" msgstr "記述例::" @@ -695,6 +695,14 @@ " # record the source of log messages\n" " logsource = True" msgstr "" +" [blackbox]\n" +" track = *\n" +" # dirty 指定ã¯å‡¦ç†ã‚³ã‚¹ãƒˆãŒé«˜ã„ã§ã™ (ï¼ é€Ÿåº¦ä½Žä¸‹è¦å› )。\n" +" # 未コミット変更ãŒã‚ã‚‹å ´åˆã€ãƒã‚°ã‚¨ãƒ³ãƒˆãƒªã« `+` ãŒä»˜åŠ ã•ã‚Œã¾ã™ã€‚\n" +" # ('hg id' ã¨åŒæ§˜)\n" +" dirty = True\n" +" # ãƒã‚°ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ç™ºè¡Œä¸»ã®è¨˜éŒ²\n" +" logsource = True" msgid "" " [blackbox]\n" @@ -2029,6 +2037,24 @@ "è¦å‘Šç‰ã‚’発ã›ãšã«ç„¡è¦–ã•ã‚Œã¾ã™ã€‚" msgid "" +"If the terminfo entry for your terminal is missing codes for an effect\n" +"or has the wrong codes, you can add or override those codes in your\n" +"configuration::" +msgstr "" +"端末 (ソフト) ã® terminfo è¨å®šã§ã€ 効果ã«å¯¾å¿œã™ã‚‹ã‚³ãƒ¼ãƒ‰ãŒæœªå®šã®å ´åˆã‚„ã€\n" +"ä¸æ£ãªã‚³ãƒ¼ãƒ‰ãŒå®šç¾©ã•ã‚Œã¦ã„ã‚‹å ´åˆã€ è¿½åŠ è¨å®šã‚„上書ãè¨å®šãŒå¯èƒ½ã§ã™::" + +msgid "" +" [color]\n" +" terminfo.dim = \\E[2m" +msgstr "" +" [color]\n" +" terminfo.dim = \\E[2m" + +msgid "where '\\E' is substituted with an escape character." +msgstr "è¨å®šå€¤ã® '\\E' 部分ã¯ã€ エスケープコードã§ç½®æ›ã•ã‚Œã¾ã™ã€‚" + +msgid "" "Labels\n" "------" msgstr "" @@ -4154,6 +4180,15 @@ " リビジョン指定ãŒ1ã¤ã®å ´åˆã€ 作æ¥é ˜åŸŸãŒæŒ‡å®šãƒªãƒ“ジョンã¨æ¯”較ã•ã‚Œã¾ã™ã€‚\n" " リビジョン指定ãŒãªã„å ´åˆã€ 作æ¥é ˜åŸŸãŒç¬¬1親リビジョンã¨æ¯”較ã•ã‚Œã¾ã™ã€‚" +msgid "" +" Show differences between revisions for the specified files, using\n" +" the following program::" +msgstr "" +" 指定ファイルã«å¯¾ã™ã‚‹ãƒªãƒ“ジョン間差分を〠以下ã®ãƒ—ãƒã‚°ãƒ©ãƒ ã§è¡¨ç¤ºã—ã¾ã™::" + +msgid " %(path)s" +msgstr " %(path)s" + #, python-format msgid "hg %s [OPTION]... [FILE]..." msgstr "hg %s [OPTION]... [FILE]..." @@ -5155,6 +5190,17 @@ msgstr "未知ã®ãƒªãƒ“ジョン %s ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" #, python-format +msgid "%s \"%s\" changeset was not a candidate" +msgstr "改変対象以外ã¸ã®æ“作 %s \"%s\" ãŒæ¤œå‡ºã•ã‚Œã¾ã—ãŸ" + +msgid "only use listed changesets" +msgstr "予ã‚列挙ã•ã‚ŒãŸãƒªãƒ“ジョンã¸ã®æ“作ã®ã¿ã‚’指定ã—ã¦ãã ã•ã„" + +#, python-format +msgid "duplicated command for changeset %s" +msgstr "リビジョン %s ã¸ã®æ“作指定ãŒè¤‡æ•°ã‚ã‚Šã¾ã™" + +#, python-format msgid "Fix up the change (%s %s)" msgstr "è¡çªã‚’解消ã—ã¦ãã ã•ã„ (%s %s)" @@ -5202,6 +5248,13 @@ msgstr "" "%s: ä½µåˆã§ãã¾ã›ã‚“ - 作æ¥é ˜åŸŸã¯ç›´å‰ã®ã‚³ãƒŸãƒƒãƒˆ %s ã®åå«ã§ã¯ã‚ã‚Šã¾ã›ã‚“\n" +#, python-format +msgid "%s \"%s\" changeset was an edited list candidate" +msgstr "%s ã®é©ç”¨å¯¾è±¡ãŒç·¨é›†å¯¾è±¡ãƒªãƒ“ジョン \"%s\" ã§ã™" + +msgid "base must only use unlisted changesets" +msgstr "ã“ã®ç·¨é›†æ“作ã¯äºˆã‚列挙ã•ã‚ŒãŸãƒªãƒ“ジョンã«ã¯é©ç”¨ã§ãã¾ã›ã‚“" + msgid "fold subclass used for when multiple folds happen in a row" msgstr "" @@ -5233,8 +5286,8 @@ msgid "there are ambiguous outgoing revisions" msgstr "紛らã‚ã—ã„åæ˜ å€™è£œãƒªãƒ“ã‚¸ãƒ§ãƒ³ãŒå˜åœ¨ã—ã¾ã™" -msgid "see \"hg help histedit\" for more detail" -msgstr "詳細㯠\"hg help histedit\" ã‚’å‚ç…§" +msgid "see 'hg help histedit' for more detail" +msgstr "詳細㯠'hg help histedit' ã‚’å‚ç…§" msgid "read history edits from the specified file" msgstr "å±¥æ´æ”¹å¤‰æŒ‡ç¤ºã‚’指定ファイルã‹ã‚‰èªã¿è¾¼ã¿" @@ -5508,8 +5561,8 @@ msgid "cannot edit public changeset: %s" msgstr "public フェーズã®ãƒªãƒ“ジョンã¯æ”¹å¤‰ã§ãã¾ã›ã‚“: %s" -msgid "see \"hg help phases\" for details" -msgstr "詳細㯠\"hg help phases\" å‚ç…§" +msgid "see 'hg help phases' for details" +msgstr "詳細㯠'hg help phases' å‚ç…§" #, python-format msgid "malformed line \"%s\"" @@ -5522,25 +5575,6 @@ msgid "warning: histedit rules saved to: .hg/histedit-last-edit.txt\n" msgstr "è¦å‘Š: histedit ã®æ“作指示㯠.hg/histedit-last-edit.txt ã«ä¿å˜\n" -#, python-format -msgid "unknown constraint \"%s\"" -msgstr "未知ã®åˆ¶ç´„ \"%s\"" - -#, python-format -msgid "%s \"%s\" changeset was not a candidate" -msgstr "改変対象以外ã¸ã®æ“作 %s \"%s\" ãŒæ¤œå‡ºã•ã‚Œã¾ã—ãŸ" - -msgid "only use listed changesets" -msgstr "予ã‚列挙ã•ã‚ŒãŸãƒªãƒ“ジョンã¸ã®æ“作ã®ã¿ã‚’指定ã—ã¦ãã ã•ã„" - -#, python-format -msgid "%s \"%s\" changeset was not an edited list candidate" -msgstr "" - -#, python-format -msgid "duplicated command for changeset %s" -msgstr "リビジョン %s ã¸ã®æ“作指定ãŒè¤‡æ•°ã‚ã‚Šã¾ã™" - msgid "no rules provided" msgstr "処ç†å†…容指定ãŒç©ºã§ã™" @@ -5552,10 +5586,10 @@ msgstr "リビジョン %s ã¸ã®æ“作指定ãŒã‚ã‚Šã¾ã›ã‚“" #, python-format -msgid "use \"drop %s\" to discard, see also: \"hg help -e histedit.config\"" -msgstr "" -"ç ´æ£„ã™ã‚‹å ´åˆã¯ \"drop %s\" を使用ã—ã¾ã™ã€‚\"hg help -e histedit.config\"ã‚‚å‚ç…§" -"ã—ã¦ãã ã•ã„。" +msgid "use \"drop %s\" to discard, see also: 'hg help -e histedit.config'" +msgstr "" +"ç ´æ£„ã™ã‚‹å ´åˆã¯ \"drop %s\" を使用ã—ã¾ã™ã€‚'hg help -e histedit.config'ã‚‚å‚ç…§ã—" +"ã¦ãã ã•ã„。" #, python-format msgid "histedit: moving bookmarks %s from %s to %s\n" @@ -5604,7 +5638,7 @@ #, python-format msgid "waiting for lock on %s held by %r\n" -msgstr "%s ã®ãƒãƒƒã‚¯ (%rãŒä¿æŒ) ã®è§£æ”¾ã‚’å¾…ã£ã¦ã„ã¾ã™\n" +msgstr "%s ã®ãƒãƒƒã‚¯ (%r ãŒä¿æŒ) ã®è§£æ”¾ã‚’å¾…ã£ã¦ã„ã¾ã™\n" #, python-format msgid "got lock after %s seconds\n" @@ -6420,8 +6454,8 @@ msgstr "未知㮠OS ã§ã™: %s\n" #, python-format -msgid "unknown %s usercache location\n" -msgstr "ã‚ãƒ£ãƒƒã‚·ãƒ¥æ ¼ç´ä½ç½®ã«é–¢ã™ã‚‹ [%s] usercache ãŒæœªè¨å®šã§ã™\n" +msgid "unknown %s usercache location" +msgstr "ã‚ãƒ£ãƒƒã‚·ãƒ¥æ ¼ç´ä½ç½®ã«é–¢ã™ã‚‹ [%s] usercache ãŒæœªè¨å®šã§ã™" #, python-format msgid "found %s in store\n" @@ -6512,8 +6546,8 @@ msgstr "" "大容é‡ãƒ•ã‚¡ã‚¤ãƒ« %s ã®ãƒžãƒ¼ã‚¸ã§è¡çªãŒæ¤œå‡ºã•ã‚Œã¾ã—ãŸã€‚\n" "共通ã®ç¥–先㯠%s ã§ã™ã€‚\n" -"作æ¥é ˜åŸŸ:(l)ocal å´ã®å†…容をæ„味ã™ã‚‹ %s ã¨\n" -"マージ対象:(o)ther å´ã®å†…容をæ„味ã™ã‚‹ %s ã®\n" +"ç¾è¡Œå´ %s:(l)ocal\n" +"ä»–æ–¹å´ %s:(o)ther\n" "ã©ã¡ã‚‰ã‚’採用ã—ã¾ã™ã‹ï¼Ÿ$$ &Local $$ &Other" msgid "no files to copy" @@ -6545,7 +6579,7 @@ #, python-format msgid "not removing %s: file is already untracked\n" -msgstr "%s ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“: ファイルã¯æ—¢ã«æœªç™»éŒ²ã§ã™\n" +msgstr "%s ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“: 管ç†å¯¾è±¡å¤–ファイルã§ã™\n" msgid "largefiles: no files to upload\n" msgstr "largefiles: 転é€äºˆå®šãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚ã‚Šã¾ã›ã‚“\n" @@ -6644,7 +6678,7 @@ "add all files above this size (in megabytes) as largefiles (default: 10)" msgstr "" "指定サイズ (å˜ä½:MB) 以上ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’〠大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã¨ã—ã¦è¿½åŠ (デフォルト" -"値:10)" +"値: 10)" msgid "verify that all largefiles in current revision exists" msgstr "ç¾ãƒªãƒ“ジョンã®å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ã®å˜åœ¨ã‚’検証" @@ -9178,7 +9212,7 @@ msgstr "書ã出ã—ä¸" msgid "command to delete untracked files from the working directory" -msgstr "作æ¥é ˜åŸŸä¸ã®æœªç™»éŒ²ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰" +msgstr "作æ¥é ˜åŸŸä¸ã®ç®¡ç†å¯¾è±¡å¤–ファイルを削除ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰" msgid "abort if an error occurs" msgstr "エラー発生時ã«ã¯å‡¦ç†ã‚’ä¸æ¢" @@ -9446,7 +9480,6 @@ " (:hg:`help phases` å‚ç…§)。 複製ã«ã‚ˆã‚‹ãƒªãƒ“ジョンã®ç§»æ¤ã«é–¢ã—ã¦ã¯ã€\n" " :hg:`help graft` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" -#, fuzzy msgid "" " If you don't specify a destination changeset (``-d/--dest``), rebase\n" " will use the same logic as :hg:`merge` to pick a destination. if\n" @@ -9458,10 +9491,9 @@ msgstr "" " 移動先リビジョン指定 (``-d/--dest``) ãŒç„¡ã„å ´åˆã€ç§»å‹•å…ˆã®ç®—出ã«ã¯ã€\n" " :hg:`merge` ã§ã®ãƒžãƒ¼ã‚¸å¯¾è±¡ç®—出ã¨ã€ åŒã˜ãƒã‚¸ãƒƒã‚¯ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚\n" -" if the current branch contains exactly one other head, the other head\n" -" is merged with by default.\n" -" ãれ以外ã®å ´åˆã¯ã€ 移動先ã®æ˜Žç¤ºçš„ãªæŒ‡å®šãŒå¿…è¦ã§ã™ã€‚ (移動æ“作ã§ã¯ã€\n" -" 移動先リビジョン自身ã¯æ”¹å¤‰ã•ã‚Œã¾ã›ã‚“ãŒã€ 移動先ã®åå«ã¨ã—ã¦ã€\n" +" ç¾åå‰ä»˜ãブランãƒã«ã€ ä»–ã®ãƒ˜ãƒƒãƒ‰ãŒä¸€ã¤ã—ã‹ãªã„å ´åˆã€ 移動先ã¨ã—ã¦ã€\n" +" 当該ヘッドãŒé¸æŠžã•ã‚Œã¾ã™ã€‚ ãれ以外ã®å ´åˆã¯ã€ 移動先ã®æ˜Žç¤ºãŒå¿…è¦ã§ã™ã€‚\n" +" (移動æ“作ã§ã¯ã€ 移動先自身ã¯ãã®ã¾ã¾ã§ã™ãŒã€ 移動先ã®åå«ã¨ã—ã¦ã€\n" " æ–°è¦ãƒªãƒ“ジョンãŒè¿½åŠ ã•ã‚Œã¾ã™)" msgid " Here are the ways to select changesets:" @@ -11242,6 +11274,11 @@ "%s ã®ãƒãƒ³ãƒ‰ãƒ«ã¯ç ´æã—ã¦ã„ã¾ã™:\n" "%s" +#. i18n: column positioning for "hg summary" +#, python-format +msgid "remote: %s\n" +msgstr "連æºå…ˆåŒæœŸ: %s\n" + msgid "push failed:" msgstr "å±¥æ´åæ˜ ã«å¤±æ•—:" @@ -11414,7 +11451,7 @@ #, python-format msgid "%s: not copying - file is not managed\n" -msgstr "%s: コピー失敗 - ファイルã¯ç™»éŒ²ã•ã‚Œã¦ã„ã¾ã›ã‚“\n" +msgstr "%s: コピーã—ã¾ã›ã‚“ - ファイルã¯ç™»éŒ²ã•ã‚Œã¦ã„ã¾ã›ã‚“\n" #, python-format msgid "%s: not copying - file has been marked for remove\n" @@ -11418,7 +11455,7 @@ #, python-format msgid "%s: not copying - file has been marked for remove\n" -msgstr "%s: コピー失敗 - 削除予定ã®ãƒ•ã‚¡ã‚¤ãƒ«ã§ã™\n" +msgstr "%s: コピーã—ã¾ã›ã‚“ - 削除予定ã®ãƒ•ã‚¡ã‚¤ãƒ«ã§ã™\n" #, python-format msgid "%s: not overwriting - %s collides with %s\n" @@ -11422,10 +11459,10 @@ #, python-format msgid "%s: not overwriting - %s collides with %s\n" -msgstr "%s: 上書ã失敗 - %s 㯠%s ã¨è¡çª\n" +msgstr "%s: 上書ãã—ã¾ã›ã‚“ - %s 㯠%s ã¨è¡çª\n" #, python-format msgid "%s: can't copy - same file\n" msgstr "%s: コピー失敗 - åŒä¸€ãƒ•ã‚¡ã‚¤ãƒ«ã§ã™\n" #, python-format @@ -11426,9 +11463,21 @@ #, python-format msgid "%s: can't copy - same file\n" msgstr "%s: コピー失敗 - åŒä¸€ãƒ•ã‚¡ã‚¤ãƒ«ã§ã™\n" #, python-format +msgid "%s: not overwriting - file already committed\n" +msgstr "%s: 上書ãã—ã¾ã›ã‚“ - コミット済ã¿ãƒ•ã‚¡ã‚¤ãƒ«ãŒå˜åœ¨ã—ã¾ã™\n" + +#, python-format +msgid "(hg rename %s to replace the file by recording a rename)\n" +msgstr "(改åã®è¨˜éŒ²ã«ã¯ %s 付ãã® hg rename 実行)\n" + +#, python-format +msgid "(hg copy %s to replace the file by recording a copy)\n" +msgstr "(複製ã®è¨˜éŒ²ã«ã¯ %s 付ãã® hg copy 実行)\n" + +#, python-format msgid "%s: not overwriting - file exists\n" msgstr "%s: 上書ãã—ã¾ã›ã‚“ - ファイルãŒå˜åœ¨ã—ã¾ã™\n" @@ -11432,5 +11481,11 @@ msgid "%s: not overwriting - file exists\n" msgstr "%s: 上書ãã—ã¾ã›ã‚“ - ファイルãŒå˜åœ¨ã—ã¾ã™\n" +msgid "(hg rename --after to record the rename)\n" +msgstr "(改åã®è¨˜éŒ²ã«ã¯ --after 付ãã® hg rename 実行)\n" + +msgid "(hg copy --after to record the copy)\n" +msgstr "(複製ã®è¨˜éŒ²ã«ã¯ --after 付ãã® hg copy 実行)\n" + #, python-format msgid "%s: not recording move - %s does not exist\n" @@ -11435,6 +11490,6 @@ #, python-format msgid "%s: not recording move - %s does not exist\n" -msgstr "%s: 移動ã¯è¨˜éŒ²ã•ã‚Œã¦ã„ã¾ã›ã‚“ - %s ã¯å˜åœ¨ã—ã¾ã›ã‚“\n" +msgstr "%s: 移動ã¯è¨˜éŒ²ã•ã‚Œã¾ã›ã‚“ - %s ã¯å˜åœ¨ã—ã¾ã›ã‚“\n" #, python-format msgid "%s: not recording copy - %s does not exist\n" @@ -11438,7 +11493,7 @@ #, python-format msgid "%s: not recording copy - %s does not exist\n" -msgstr "%s: 複製ã¯è¨˜éŒ²ã•ã‚Œã¦ã„ã¾ã›ã‚“ - %s ã¯å˜åœ¨ã—ã¾ã›ã‚“\n" +msgstr "%s: 複製ã¯è¨˜éŒ²ã•ã‚Œã¾ã›ã‚“ - %s ã¯å˜åœ¨ã—ã¾ã›ã‚“\n" #, python-format msgid "%s: deleted in working directory\n" @@ -11622,8 +11677,8 @@ #, python-format msgid "not removing %s: file is untracked\n" -msgstr "%s ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“: 未登録ファイルã§ã™\n" +msgstr "%s ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“: 管ç†å¯¾è±¡å¤–ファイルã§ã™\n" msgid "skipping" msgstr "対象ã‹ã‚‰é™¤å¤–" @@ -11626,7 +11681,13 @@ msgid "skipping" msgstr "対象ã‹ã‚‰é™¤å¤–" +#, python-format +msgid "" +"not removing %s: file has been marked for add (use 'hg forget' to undo add)\n" +msgstr "" +"%s ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“: è¿½åŠ ç™»éŒ²å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã§ã™ (å–り消ã—㯠'hg forget')\n" + msgid "failed to mark all new/missing files as added/removed" msgstr "æ–°è¦ãƒ•ã‚¡ã‚¤ãƒ«ã®è¿½åŠ ï¼ä¸åœ¨ãƒ•ã‚¡ã‚¤ãƒ«ã®é™¤å¤–ãŒå¤±æ•—ã—ã¾ã—ãŸ" @@ -12604,34 +12665,6 @@ msgid " See :hg:`help revsets` for more about the `bisect()` keyword." msgstr " `bisect()` ã®è©³ç´°ã¯ :hg:`help revsets` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" -msgid "The first good revision is:\n" -msgstr "最åˆã® good ãªãƒªãƒ“ジョンã¯:\n" - -msgid "The first bad revision is:\n" -msgstr "最åˆã® bad ãªãƒªãƒ“ジョンã¯:\n" - -#, python-format -msgid "" -"Not all ancestors of this changeset have been checked.\n" -"Use bisect --extend to continue the bisection from\n" -"the common ancestor, %s.\n" -msgstr "" -"ã“ã®ãƒªãƒ“ジョンã®ç¥–å…ˆã«å¯¾ã™ã‚‹ç¢ºèªã¯å®Œå…¨ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n" -"共通ã®ç¥–å…ˆ %s ã‹ã‚‰æŽ¢ç´¢ã‚’継続ã™ã‚‹å ´åˆã€\n" -"--extend 付ã㧠\"hg bisect\" を実行ã—ã¦ãã ã•ã„。\n" - -msgid "Due to skipped revisions, the first good revision could be any of:\n" -msgstr "検証çœç•¥ã«ã‚ˆã‚Šã€ 最åˆã® good ãªãƒªãƒ“ジョンã¯ä»¥ä¸‹ã‹ã‚‰é¸æŠžå¯èƒ½ã§ã™:\n" - -msgid "Due to skipped revisions, the first bad revision could be any of:\n" -msgstr "検証çœç•¥ã«ã‚ˆã‚Šã€ 最åˆã® bad ãªãƒªãƒ“ジョンã¯ä»¥ä¸‹ã‹ã‚‰é¸æŠžå¯èƒ½ã§ã™:\n" - -msgid "cannot bisect (no known good revisions)" -msgstr "二分探索ã§ãã¾ã›ã‚“(good リビジョンãŒæœªæŒ‡å®šã§ã™)" - -msgid "cannot bisect (no known bad revisions)" -msgstr "二分探索ã§ãã¾ã›ã‚“(bad リビジョンãŒæœªæŒ‡å®šã§ã™)" - msgid "(use of 'hg bisect <cmd>' is deprecated)\n" msgstr "('hg bisect <cmd>' å½¢å¼ã®å®Ÿè¡Œã¯éžæŽ¨å¥¨ã§ã™)\n" @@ -13009,8 +13042,8 @@ msgid "no commits to bundle" msgstr "リビジョン指定ã¯ç©ºã§ã™" -msgid "see \"hg help bundle\" for supported values for --type" -msgstr "--type ã§æŒ‡å®šå¯èƒ½ãªå€¤ã¯ \"hg help bundle\" ã‚’å‚ç…§ã—ã¦ãã ã•ã„" +msgid "see 'hg help bundle' for supported values for --type" +msgstr "--type ã§æŒ‡å®šå¯èƒ½ãªå€¤ã¯ 'hg help bundle' ã‚’å‚ç…§ã—ã¦ãã ã•ã„" msgid "packed bundles cannot be produced by \"hg bundle\"" msgstr "packed bundle 㯠\"hg bundle\" ã§ã¯ç”Ÿæˆã§ãã¾ã›ã‚“" @@ -13792,6 +13825,10 @@ msgstr " èªã¿è¾¼ã¿å…ƒ: %s\n" #, python-format +msgid " bundled: %s\n" +msgstr " åŒæ¢±: %s\n" + +#, python-format msgid " tested with: %s\n" msgstr " テスト済㿠Mercurial 版: %s\n" @@ -13902,13 +13939,13 @@ msgstr " テンプレートã§å‡ºåŠ›å†…容を整形å¯èƒ½ã§ã™ã€‚ 利用å¯èƒ½ã‚ーワードã¯:" msgid "" -" rev revision number\n" -" chainid delta chain identifier (numbered by unique base)\n" -" chainlen delta chain length to this revision\n" -" prevrev previous revision in delta chain\n" -" deltatype role of delta / how it was computed\n" -" compsize compressed size of revision\n" -" uncompsize uncompressed size of revision\n" -" chainsize total size of compressed revisions in chain\n" -" chainratio total chain size divided by uncompressed revision size\n" +" :``rev``: revision number\n" +" :``chainid``: delta chain identifier (numbered by unique base)\n" +" :``chainlen``: delta chain length to this revision\n" +" :``prevrev``: previous revision in delta chain\n" +" :``deltatype``: role of delta / how it was computed\n" +" :``compsize``: compressed size of revision\n" +" :``uncompsize``: uncompressed size of revision\n" +" :``chainsize``: total size of compressed revisions in chain\n" +" :``chainratio``: total chain size divided by uncompressed revision size\n" " (new delta chains typically start at ratio 2.00)\n" @@ -13914,4 +13951,4 @@ " (new delta chains typically start at ratio 2.00)\n" -" lindist linear distance from base revision in delta chain to " +" :``lindist``: linear distance from base revision in delta chain to " "end\n" " of this revision\n" @@ -13916,9 +13953,9 @@ "end\n" " of this revision\n" -" extradist total size of revisions not part of this delta chain " +" :``extradist``: total size of revisions not part of this delta chain " "from\n" " base of delta chain to end of this revision; a " "measurement\n" " of how much extra data we need to read/seek across to " "read\n" " the delta chain for this revision\n" @@ -13919,10 +13956,10 @@ "from\n" " base of delta chain to end of this revision; a " "measurement\n" " of how much extra data we need to read/seek across to " "read\n" " the delta chain for this revision\n" -" extraratio extradist divided by chainsize; another representation " +" :``extraratio``: extradist divided by chainsize; another representation " "of\n" " how much unrelated data is needed to load this delta " "chain\n" @@ -13957,6 +13994,24 @@ msgstr "Python ライブラリã®æ¤œè¨¼ä¸ (%s)...\n" #, python-format +msgid "checking Python security support (%s)\n" +msgstr "Python ã®ã‚»ã‚ュリティ機能対応ã®æ¤œè¨¼ä¸ (%s)\n" + +msgid "" +" TLS 1.2 not supported by Python install; network connections lack modern " +"security\n" +msgstr "" +" TLS 1.2 ã¯ä½¿ç”¨ä¸ã® Python ã§ã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™: 通信時ã®ã‚»ã‚ュリティレベルãŒ" +"低下ã—ã¾ã™ã€‚\n" + +msgid "" +" SNI not supported by Python install; may have connectivity issues with " +"some servers\n" +msgstr "" +" SNI ã¯ä½¿ç”¨ä¸ã® Python ã§ã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™: サーãƒã¨ã®æŽ¥ç¶šã§å•é¡ŒãŒç™ºç”Ÿã™ã‚‹å¯" +"能性ãŒã‚ã‚Šã¾ã™\n" + +#, python-format msgid "checking Mercurial version (%s)\n" msgstr "Mercurial ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®æ¤œè¨¼ä¸ (%s)\n" @@ -14024,8 +14079,8 @@ msgstr "å•é¡Œã¯æ¤œå‡ºã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ\n" #, python-format -msgid "%s problems detected, please check your install!\n" -msgstr "障害ãŒ%s件検出ã•ã‚Œã¾ã—ãŸã€‚ インストール内容を確èªã—ã¦ãã ã•ã„\n" +msgid "%d problems detected, please check your install!\n" +msgstr "障害㌠%d 件検出ã•ã‚Œã¾ã—ãŸã€‚ インストール内容を確èªã—ã¦ãã ã•ã„\n" msgid "REPO ID..." msgstr "REPO ID..." @@ -14294,10 +14349,19 @@ msgid "show data and statistics about a revlog" msgstr "revlog ファイルã®ãƒ‡ãƒ¼ã‚¿ã¨çµ±è¨ˆæƒ…å ±ã®è¡¨ç¤º" -msgid "print parsed tree after optimizing" -msgstr "最é©åŒ–後ã®è§£æžãƒ„リーã®è¡¨ç¤º" +msgid "print parsed tree after optimizing (DEPRECATED)" +msgstr "最é©åŒ–後ã®è§£æžãƒ„リーã®è¡¨ç¤º (éžæŽ¨å¥¨)" + +msgid "print parsed tree at the given stage" +msgstr "指定解æžæ®µéšŽã«ãŠã‘る解æžãƒ„リーã®è¡¨ç¤º" + +msgid "evaluate tree without optimization" +msgstr "最é©åŒ–ç„¡ã—ã§è§£æžãƒ„リーを評価" + +msgid "verify optimized result" +msgstr "最é©åŒ–çµæžœã‚’検証" msgid "parse and apply a revision specification" msgstr "リビジョン指定記述ã®è§£æžï¼é©ç”¨" msgid "" @@ -14299,14 +14363,34 @@ msgid "parse and apply a revision specification" msgstr "リビジョン指定記述ã®è§£æžï¼é©ç”¨" msgid "" -" Use --verbose to print the parsed tree before and after aliases\n" -" expansion.\n" -" " -msgstr "" -" --verbose 指定時ã¯ã€ 別å (alias) 展開å‰å¾Œã®ã€ 解æžæœ¨ã‚’表示ã—ã¾ã™ã€‚\n" -" " +" Use -p/--show-stage option to print the parsed tree at the given " +"stages.\n" +" Use -p all to print tree at every stage." +msgstr "" +" -p/--show-stage 指定時ã¯ã€ 指定解æžæ®µéšŽã®è§£æžãƒ„リーを表示ã—ã¾ã™ã€‚\n" +" -p all 指定時ã¯ã€ å…¨ã¦ã®è§£æžæ®µéšŽã§è§£æžãƒ„リーを表示ã—ã¾ã™ã€‚" + +msgid "" +" Use --verify-optimized to compare the optimized result with the " +"unoptimized\n" +" one. Returns 1 if the optimized result differs.\n" +" " +msgstr "" +" --verify-optimized 指定時ã¯ã€ 最é©åŒ–å‰å¾Œã®è©•ä¾¡çµæžœã‚’比較ã—ã¾ã™ã€‚\n" +" 最é©åŒ–ã«ã‚ˆã‚Šè©•ä¾¡çµæžœãŒç•°ãªã‚‹å ´åˆã€ コマンド終了値㯠1 ã§ã™ã€‚\n" +" " + +msgid "cannot use --verify-optimized with --no-optimized" +msgstr "--verify-optimized 㨠--no-optimized ã¯ä½µç”¨ã§ãã¾ã›ã‚“" + +msgid "cannot use --optimize with --show-stage" +msgstr "--optimize 㨠--show-stage ã¯ä½µç”¨ã§ãã¾ã›ã‚“" + +#, python-format +msgid "invalid stage name: %s" +msgstr "ä¸æ£ãªè§£æžæ®µéšŽå: %s" msgid "REV1 [REV2]" msgstr "REV1 [REV2]" @@ -14680,11 +14764,8 @@ msgid "end filenames with NUL, for use with xargs" msgstr "ファイルåã‚’NULæ–‡å—(0x00)ã§çµ‚端(xargs ã¨ã®ä½µç”¨å‘ã‘)" -msgid "[OPTION]... [PATTERN]..." -msgstr "[OPTION]... [PATTERN]..." - msgid "list tracked files" msgstr "管ç†å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸€è¦§è¡¨ç¤º" msgid "" " Print files under Mercurial control in the working directory or\n" @@ -14686,20 +14767,19 @@ msgid "list tracked files" msgstr "管ç†å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸€è¦§è¡¨ç¤º" msgid "" " Print files under Mercurial control in the working directory or\n" -" specified revision whose names match the given patterns (excluding\n" -" removed files)." -msgstr "" -" 作æ¥é ˜åŸŸåˆã¯æŒ‡å®šãƒªãƒ“ジョンã«ãŠã‘る〠管ç†å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã‚’一覧表示ã—ã¾ã™\n" -" (登録除外ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ 対象ã‹ã‚‰é™¤å¤–ã•ã‚Œã¾ã™)。" - -msgid "" -" If no patterns are given to match, this command prints the names\n" -" of all files under Mercurial control in the working directory." -msgstr "" -" パターン指定ãŒç„¡ã„å ´åˆã€ 本コマンドã¯æ§‹æˆç®¡ç†å¯¾è±¡ä¸‹ã«ã‚る作æ¥é ˜åŸŸä¸ã®\n" -" å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«åを表示ã—ã¾ã™ã€‚" +" specified revision for given files (excluding removed files).\n" +" Files can be specified as filenames or filesets." +msgstr "" +" 作æ¥é ˜åŸŸåˆã¯æŒ‡å®šãƒªãƒ“ジョンã§ã€ パターンã«åˆè‡´ã™ã‚‹ç®¡ç†å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã€\n" +" 一覧表示ã—ã¾ã™ (登録除外済ã¿ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ 表示対象ã‹ã‚‰é™¤å¤–ã•ã‚Œã¾ã™)。\n" +" パターン指定ã«ã¯ã€ filesets 記述も使用ã§ãã¾ã™ã€‚" + +msgid "" +" If no files are given to match, this command prints the names\n" +" of all files under Mercurial control." +msgstr " パターン指定ãŒç„¡ã„å ´åˆã€ 管ç†å¯¾è±¡ä¸‹ã®å…¨ãƒ•ã‚¡ã‚¤ãƒ«åを表示ã—ã¾ã™ã€‚" msgid " - list all files under the current directory::" msgstr " - ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªé…下ã®å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®åˆ—挙::" @@ -14983,24 +15063,16 @@ msgid "[OPTION]... PATTERN [FILE]..." msgstr "[OPTION]... PATTERN [FILE]..." -msgid "search for a pattern in specified files and revisions" -msgstr "特定ã®ãƒ‘ターンã«åˆè‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã¨ãƒªãƒ“ジョンã®æ¤œç´¢" - -msgid " Search revisions of files for a regular expression." -msgstr " æ£è¦è¡¨ç¾ã«åˆè‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å«ã‚€ãƒªãƒ“ジョンを検索ã—ã¾ã™ã€‚" - -msgid "" -" This command behaves differently than Unix grep. It only accepts\n" -" Python/Perl regexps. It searches repository history, not the\n" -" working directory. It always prints the revision number in which a\n" -" match appears." -msgstr "" -" 本コマンドã®æŒ™å‹•ã¯ Unix ã® grep ã¨ã¯ç•°ãªã‚Šã¾ã™ã€‚\n" -" 解釈å¯èƒ½ãªæ£è¦è¡¨ç¾ã¯ Python/Perl å½¢å¼ã®ã‚‚ã®ã ã‘ã§ã™ã€‚\n" -" 検索対象ã¯ãƒªãƒã‚¸ãƒˆãƒªå†…ã®ãƒ‡ãƒ¼ã‚¿ã®ã¿ã§ã€\n" -" 作æ¥é ˜åŸŸã¯æ¤œç´¢å¯¾è±¡ã«ã¯å«ã¾ã‚Œã¾ã›ã‚“。\n" -" パターンã«åˆè‡´ã™ã‚‹å†…容ãŒç¾ã‚ŒãŸãƒªãƒ“ジョンを表示ã—ã¾ã™ã€‚" - -msgid "" -" By default, grep only prints output for the first revision of a\n" +msgid "search revision history for a pattern in specified files" +msgstr "指定ファイルã®å±¥æ´ã«ãŠã‘ã‚‹æ£è¦è¡¨ç¾åˆè‡´ã®æ¤œç´¢" + +msgid "" +" Search revision history for a regular expression in the specified\n" +" files or the entire project." +msgstr "" +" 指定ファイル〠ã¾ãŸã¯ãƒªãƒã‚¸ãƒˆãƒªå…¨ä½“ã®å±¥æ´ã«å¯¾ã—ã¦ã€ 指定æ£è¦è¡¨ç¾ã¨ã€\n" +" 変更内容ã¨ã®åˆè‡´ã‚’検索ã—ã¾ã™ã€‚" + +msgid "" +" By default, grep prints the most recent revision number for each\n" " file in which it finds a match. To get it to print every revision\n" @@ -15006,14 +15078,28 @@ " file in which it finds a match. To get it to print every revision\n" -" that contains a change in match status (\"-\" for a match that\n" -" becomes a non-match, or \"+\" for a non-match that becomes a match),\n" -" use the --all flag." -msgstr "" -" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ 本コマンドã¯ãƒ‘ターンã«åˆè‡´ã™ã‚‹å†…容ãŒæœ€åˆã«ç¾ã‚ŒãŸ\n" -" リビジョンをå„ファイル毎ã«è¡¨ç¤ºã—ã¾ã™ã€‚ パターンã«åˆè‡´ã™ã‚‹å¤‰æ›´ã®ã‚ã£ãŸ\n" -" å…¨ã¦ã®ãƒªãƒ“ジョンを表示ã™ã‚‹å ´åˆã€ --all を指定ã—ã¾ã™(パターンåˆè‡´éƒ¨ãŒ\n" -" 削除æ“作ãªã‚‰ \"-\"ã€ è¿½åŠ æ“作ãªã‚‰ \"+\" ãŒæ¤œç´¢çµæžœã«è¡¨ç¤º)。" +" that contains a change in match status (\"-\" for a match that becomes\n" +" a non-match, or \"+\" for a non-match that becomes a match), use the\n" +" --all flag." +msgstr "" +" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ æ£è¦è¡¨ç¾åˆè‡´ãŒè¦‹ã¤ã‹ã£ãŸã€ 最新リビジョンã®ã¿ã‚’ã€\n" +" å„ファイル毎ã«è¡¨ç¤ºã—ã¾ã™ã€‚ --all 指定時ã¯ã€ æ£è¦è¡¨ç¾åˆè‡´ãŒè¦‹ã¤ã‹ã£ãŸã€\n" +" 全リビジョンを表示ã—ã¾ã™ (æ£è¦è¡¨ç¾åˆè‡´è¡Œã®å‰Šé™¤ã®å ´åˆã¯ \"-\"ã€\n" +" è¿½åŠ ã®å ´åˆã¯ \"+\" ãŒã€ å„リビジョン毎ã«è¡¨ç¤ºã•ã‚Œã¾ã™)。" + +msgid "" +" PATTERN can be any Python (roughly Perl-compatible) regular\n" +" expression." +msgstr " Python å½¢å¼ã®æ£è¦è¡¨ç¾ (概ã Perl ã®ãã‚Œã¨äº’æ›) ãŒä½¿ç”¨å¯èƒ½ã§ã™ã€‚" + +msgid "" +" If no FILEs are specified (and -f/--follow isn't set), all files in\n" +" the repository are searched, including those that don't exist in the\n" +" current branch or have been deleted in a prior changeset." +msgstr "" +" 対象ファイル (ãŠã‚ˆã³ -f/--follow) ãŒæœªæŒ‡å®šã®å ´åˆã€ å…¨ã¦ã®å±¥æ´ãŒã€\n" +" 検索対象ã¨ãªã‚Šã¾ã™ã€‚ 別ブランãƒã§ã®è¿½åŠ や〠祖先ã«ãŠã‘る登録除外ç‰ã§ã€\n" +" ç¾ä½œæ¥é ˜åŸŸä¸ã«å˜åœ¨ã—ãªã„ファイルã®å±¥æ´ã‚‚〠検索対象ã«å«ã¾ã‚Œã¾ã™ã€‚" msgid "" " Returns 0 if a match is found, 1 otherwise.\n" " " msgstr "" @@ -15015,9 +15101,9 @@ msgid "" " Returns 0 if a match is found, 1 otherwise.\n" " " msgstr "" -" パターンåˆè‡´ãŒã‚ã‚‹å ´åˆã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0〠ãれ以外㯠1 ã§ã™ã€‚\n" +" æ£è¦è¡¨ç¾åˆè‡´ãŒã‚ã‚‹å ´åˆã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0〠ãれ以外㯠1 ã§ã™ã€‚\n" " " #, python-format @@ -15326,10 +15412,10 @@ " resulting changeset has a different ID than the one recorded in\n" " the patch. This will guard against various ways that portable\n" " patch formats and mail systems might fail to transfer Mercurial\n" -" data or metadata. See ':hg: bundle' for lossless transmission." +" data or metadata. See :hg:`bundle` for lossless transmission." msgstr "" " --exact 指定時ã«ã¯ã€ 作æ¥é ˜åŸŸã‚’パッãƒã®è¦ªãƒªãƒ“ジョンã«æ›´æ–°ã—ã¦ã‹ã‚‰ã€\n" " パッãƒã‚’é©ç”¨ã—ã¾ã™ã€‚ パッãƒã«ã‚ˆã‚Šä½œæˆã•ã‚ŒãŸãƒªãƒ“ジョンã®ãƒãƒƒã‚·ãƒ¥å€¤ãŒã€\n" " パッãƒã«è¨˜éŒ²ã•ã‚ŒãŸå€¤ã¨ç•°ãªã‚‹å ´åˆã€ パッãƒã®å–ã‚Šè¾¼ã¿ã¯ä¸æ–ã•ã‚Œã¾ã™ã€‚\n" " パッãƒå½¢å¼é¸æŠžã®å•é¡Œã‚„〠メールé…é€éŽç¨‹ã§ã®å†…容改変ãªã©ã€\n" " 予期ã›ã¬å¤‰æ›´å†…容ãŒã€ é©ç”¨ã•ã‚Œã‚‹ã“ã¨ã‚’防æ¢ã§ãã¾ã™ã€‚ 変更内容をã€\n" @@ -15330,10 +15416,10 @@ msgstr "" " --exact 指定時ã«ã¯ã€ 作æ¥é ˜åŸŸã‚’パッãƒã®è¦ªãƒªãƒ“ジョンã«æ›´æ–°ã—ã¦ã‹ã‚‰ã€\n" " パッãƒã‚’é©ç”¨ã—ã¾ã™ã€‚ パッãƒã«ã‚ˆã‚Šä½œæˆã•ã‚ŒãŸãƒªãƒ“ジョンã®ãƒãƒƒã‚·ãƒ¥å€¤ãŒã€\n" " パッãƒã«è¨˜éŒ²ã•ã‚ŒãŸå€¤ã¨ç•°ãªã‚‹å ´åˆã€ パッãƒã®å–ã‚Šè¾¼ã¿ã¯ä¸æ–ã•ã‚Œã¾ã™ã€‚\n" " パッãƒå½¢å¼é¸æŠžã®å•é¡Œã‚„〠メールé…é€éŽç¨‹ã§ã®å†…容改変ãªã©ã€\n" " 予期ã›ã¬å¤‰æ›´å†…容ãŒã€ é©ç”¨ã•ã‚Œã‚‹ã“ã¨ã‚’防æ¢ã§ãã¾ã™ã€‚ 変更内容をã€\n" -" æ¬ æç„¡ã転é€ã™ã‚‹æ–¹æ³•ï½Žé–¢ã—ã¦ã¯ :hg:`bundle` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" +" æ¬ æç„¡ã転é€ã™ã‚‹æ–¹æ³•ã«é–¢ã—ã¦ã¯ :hg:`bundle` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" msgid "" " Use --partial to ensure a changeset will be created from the patch\n" @@ -15607,6 +15693,9 @@ msgid "print complete paths from the filesystem root" msgstr "ファイルシステムã®ãƒ«ãƒ¼ãƒˆã‹ã‚‰ã®çµ¶å¯¾ãƒ‘スã§è¡¨ç¤º" +msgid "[OPTION]... [PATTERN]..." +msgstr "[OPTION]... [PATTERN]..." + msgid "locate files matching specific patterns (DEPRECATED)" msgstr "指定ã•ã‚ŒãŸãƒ‘ターンã«åˆè‡´ã™ã‚‹åå‰ã‚’æŒã¤ãƒ•ã‚¡ã‚¤ãƒ«ã®ç‰¹å®š (éžæŽ¨å¥¨)" @@ -15627,6 +15716,13 @@ " 対象ã¨ã™ã‚‹å ´åˆã¯ \"--include .\" を指定ã—ã¾ã™ã€‚" msgid "" +" If no patterns are given to match, this command prints the names\n" +" of all files under Mercurial control in the working directory." +msgstr "" +" パターン指定ãŒç„¡ã„å ´åˆã€ 本コマンドã¯æ§‹æˆç®¡ç†å¯¾è±¡ä¸‹ã«ã‚る作æ¥é ˜åŸŸä¸ã®\n" +" å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«åを表示ã—ã¾ã™ã€‚" + +msgid "" " If you want to feed the output of this command into the \"xargs\"\n" " command, use the -0 option to both this command and \"xargs\". This\n" " will avoid the problem of \"xargs\" treating single filenames that\n" @@ -16327,8 +16423,8 @@ msgid "default repository not configured!" msgstr "デフォルトã®é€£æºå…ˆãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“" -msgid "see the \"path\" section in \"hg help config\"" -msgstr "\"hg help config\" ã® \"path\" セクションをå‚ç…§ã—ã¦ãã ã•ã„" +msgid "see 'hg help config.paths'" +msgstr "詳細㯠'hg help config.paths' å‚ç…§" #, python-format msgid "pushing to %s\n" @@ -16842,8 +16938,8 @@ msgid "name to show in web pages (default: working directory)" msgstr "表示å(デフォルト値: 作æ¥é ˜åŸŸã®ãƒ‘ス)" -msgid "name of the hgweb config file (see \"hg help hgweb\")" -msgstr "hgweb è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ä½ç½®(\"hg help hgweb\" å‚ç…§)" +msgid "name of the hgweb config file (see 'hg help hgweb')" +msgstr "hgweb è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ä½ç½® ('hg help hgweb' å‚ç…§)" msgid "name of the hgweb config file (DEPRECATED)" msgstr "hgweb è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ä½ç½® (éžæŽ¨å¥¨)" @@ -16964,7 +17060,7 @@ " unless explicitly requested with -u/--unknown or -i/--ignored." msgstr "" " -q/--quiet 指定ãŒã‚ã‚‹å ´åˆã€ -u/--unknown ã¾ãŸã¯ -i/--ignored\n" -" ãŒæ˜Žç¤ºçš„ã«æŒ‡å®šã•ã‚Œãªã„é™ã‚Šã€ 未登録ファイルã¯è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“。" +" ãŒæ˜Žç¤ºçš„ã«æŒ‡å®šã•ã‚Œãªã„é™ã‚Šã€ 管ç†å¯¾è±¡å¤–ファイルã¯è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“。" msgid "" " :hg:`status` may appear to disagree with diff if permissions have\n" @@ -17201,11 +17297,6 @@ msgstr "åæ˜ å€™è£œãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯ %d 個" #. i18n: column positioning for "hg summary" -#, python-format -msgid "remote: %s\n" -msgstr "連æºå…ˆåŒæœŸ: %s\n" - -#. i18n: column positioning for "hg summary" msgid "remote: (synced)\n" msgstr "連æºå…ˆåŒæœŸ: (åŒæœŸæ¸ˆã¿)\n" @@ -17547,6 +17638,9 @@ "\n" "有効化ã•ã‚Œã¦ã„るエクステンション:" +msgid "external" +msgstr "éžåŒæ¢±" + msgid "internal" msgstr "åŒæ¢± " @@ -17550,9 +17644,6 @@ msgid "internal" msgstr "åŒæ¢± " -msgid "external" -msgstr "éžåŒæ¢±" - #, python-format msgid "extension '%s' overrides commands: %s\n" msgstr "エクステンション '%s' ãŒã‚³ãƒžãƒ³ãƒ‰ã‚’上書ãã—ã¾ã™: %s\n" @@ -17824,7 +17915,7 @@ #, python-format msgid "" -"(committing will reopen the head, use `hg heads .` to see %i other heads)\n" +"(committing will reopen the head, use 'hg heads .' to see %i other heads)\n" msgstr "" "(閉鎖済ã¿ãƒ˜ãƒƒãƒ‰ã§ã®ã‚³ãƒŸãƒƒãƒˆã¯ãƒ˜ãƒƒãƒ‰ã®é–‰éŽ–を解除ã—ã¾ã™ã€‚ä»–ã® %i 個ã®ãƒ˜ãƒƒãƒ‰ã¯ " "'hg heads .' ã§å‚ç…§ã—ã¦ãã ã•ã„)\n" @@ -17881,8 +17972,8 @@ msgid "push creates new branch '%s' with multiple heads" msgstr "複数ヘッドã®æ–°è¦ãƒ–ランム%s ãŒé€£æºå…ˆã«ä½œæˆã•ã‚Œã¾ã™" -msgid "merge or see \"hg help push\" for details about pushing new heads" -msgstr "マージã™ã‚‹ã‹ã€æ–°è¦ãƒ˜ãƒƒãƒ‰ã®åæ˜ ã«é–¢ã—㦠\"hg help push\" ã‚’å‚ç…§" +msgid "merge or see 'hg help push' for details about pushing new heads" +msgstr "マージã™ã‚‹ã‹ã€æ–°è¦ãƒ˜ãƒƒãƒ‰ã®åæ˜ ã«é–¢ã—㦠'hg help push' ã‚’å‚ç…§" #, python-format msgid "push creates new remote head %s on branch '%s'!" @@ -17897,8 +17988,8 @@ msgstr "æ–°ã—ã„ヘッド %s ãŒé€£æºå…ˆã«ä½œæˆã•ã‚Œã¾ã™!" msgid "" -"pull and merge or see \"hg help push\" for details about pushing new heads" -msgstr "å–ã‚Šè¾¼ã¿ï¼‹ãƒžãƒ¼ã‚¸ã™ã‚‹ã‹ã€æ–°è¦ãƒ˜ãƒƒãƒ‰åæ˜ ã«é–¢ã—㦠\"hg help push\" ã‚’å‚ç…§" +"pull and merge or see 'hg help push' for details about pushing new heads" +msgstr "å–ã‚Šè¾¼ã¿ï¼‹ãƒžãƒ¼ã‚¸ã™ã‚‹ã‹ã€æ–°è¦ãƒ˜ãƒƒãƒ‰åæ˜ ã«é–¢ã—㦠'hg help push' ã‚’å‚ç…§" msgid "new remote heads:\n" msgstr "以下ã®æ–°ã—ã„ヘッドãŒé€£æºå…ˆã«ä½œæˆã•ã‚Œã¾ã™:\n" @@ -18079,37 +18170,6 @@ msgid "warning: --repository ignored\n" msgstr "è¦å‘Š: --repository 指定を無視ã—ã¾ã™\n" -#, python-format -msgid "unrecognized profiling format '%s' - Ignored\n" -msgstr "ä¸æ£ãªãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«å½¢å¼ '%s' を無視ã—ã¾ã™\n" - -msgid "" -"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" -"misc/lsprof/" -msgstr "" -"lsprof ãŒåˆ©ç”¨ã§ãã¾ã›ã‚“ - http://codespeak.net/svn/user/arigo/hack/misc/" -"lsprof/ã‹ã‚‰ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„" - -msgid "" -"flamegraph not available - install from https://github.com/evanhempel/python-" -"flamegraph" -msgstr "" -"flamegraph ãŒä½¿ç”¨ã§ãã¾ã›ã‚“ - https://github.com/evanhempel/python-" -"flamegraph ã‹ã‚‰ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„" - -msgid "statprof not available - install using \"easy_install statprof\"" -msgstr "" -"statprof ãŒåˆ©ç”¨ã§ãã¾ã›ã‚“ - \"easy_install statprof\"ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•" -"ã„" - -#, python-format -msgid "invalid sampling frequency '%s' - ignoring\n" -msgstr "ä¸æ£ãªã‚µãƒ³ãƒ—ãƒªãƒ³ã‚°å‘¨æœŸé »åº¦ '%s' を無視ã—ã¾ã™\n" - -#, python-format -msgid "unrecognized profiler '%s' - ignored\n" -msgstr "ä¸æ£ãªãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ©æŒ‡å®š '%s' を無視ã—ã¾ã™\n" - msgid "the extension author." msgstr "エクステンションã®ä½œè€…" @@ -18396,12 +18456,12 @@ " keep as the merged version." msgstr "" "``:prompt``\n" -"作æ¥é ˜åŸŸå´ (`p1()`) ã¨ãƒžãƒ¼ã‚¸å¯¾è±¡ãƒªãƒ“ã‚¸ãƒ§ãƒ³å´ (`p2()`) ã®ã©ã¡ã‚‰ã‚’ã€\n" -" マージçµæžœã¨ã—ã¦æŽ¡ç”¨ã™ã‚‹ã‹ã€ 対話的ã«ç¢ºèªã—ã¾ã™ã€‚" - -#, python-format -msgid "" -"local changed %s which remote deleted\n" +"ç¾è¡Œå´ (`p1()`) ã¨ä»–æ–¹å´ (`p2()`) ã®ã©ã¡ã‚‰ã‚’マージçµæžœã«æŽ¡ç”¨ã™ã‚‹ã‹ã€\n" +" 対話的ã«ç¢ºèªã—ã¾ã™ã€‚" + +#, python-format +msgid "" +"local%(l)s changed %(fd)s which other%(o)s deleted\n" "use (c)hanged version, (d)elete, or leave (u)nresolved?$$ &Changed $$ " "&Delete $$ &Unresolved" msgstr "" @@ -18405,9 +18465,9 @@ "use (c)hanged version, (d)elete, or leave (u)nresolved?$$ &Changed $$ " "&Delete $$ &Unresolved" msgstr "" -"変更ã—ãŸãƒ•ã‚¡ã‚¤ãƒ« %s ãŒã€ãƒžãƒ¼ã‚¸å¯¾è±¡ãƒªãƒ“ジョンã§ç™»éŒ²é™¤å¤–ã•ã‚Œã¦ã„ã¾ã™ã€‚\n" -"変更:(c)hangedã€ç™»éŒ²é™¤å¤–:(d)eleteã€è¡çªæœªè§£æ¶ˆ:(u)nresolved ã®ã„ãšã‚Œã‚’採用ã—ã¾" +"ç¾è¡Œå´%(l)s ã§ã® %(fd)s ã®å¤‰æ›´ãŒä»–æ–¹å´%(o)s ã§ã®ç™»éŒ²é™¤å¤–ã¨è¡çªã—ã¾ã™ã€‚\n" +"変更:(c)hanged, 登録除外:(d)elete, è¡çªæœªè§£æ¶ˆ:(u)nresolved ã®ã„ãšã‚Œã‚’採用ã—ã¾" "ã™ã‹ï¼Ÿ$$ &Changed $$ &Delete $$ &Unresolved" #, python-format msgid "" @@ -18410,8 +18470,8 @@ "ã™ã‹ï¼Ÿ$$ &Changed $$ &Delete $$ &Unresolved" #, python-format msgid "" -"remote changed %s which local deleted\n" +"other%(o)s changed %(fd)s which local%(l)s deleted\n" "use (c)hanged version, leave (d)eleted, or leave (u)nresolved?$$ &Changed $$ " "&Deleted $$ &Unresolved" msgstr "" @@ -18415,9 +18475,9 @@ "use (c)hanged version, leave (d)eleted, or leave (u)nresolved?$$ &Changed $$ " "&Deleted $$ &Unresolved" msgstr "" -"登録除外済ã¿ã®ãƒ•ã‚¡ã‚¤ãƒ« %s ãŒã€ãƒžãƒ¼ã‚¸å¯¾è±¡ãƒªãƒ“ジョンã§å¤‰æ›´ã•ã‚Œã¦ã„ã¾ã™ã€‚\n" -"変更:(c)hangedã€ç™»éŒ²é™¤å¤–:(d)eleteã€è¡çªæœªè§£æ¶ˆ:(u)nresolved ã®ã„ãšã‚Œã‚’採用ã—ã¾" +"ä»–æ–¹å´%(o)s ã§ã® %(fd)s ã®å¤‰æ›´ãŒç¾è¡Œå´%(l)s ã§ã®ç™»éŒ²é™¤å¤–ã¨è¡çªã—ã¾ã™ã€‚\n" +"変更:(c)hanged, 登録除外:(d)elete, è¡çªæœªè§£æ¶ˆ:(u)nresolved ã®ã„ãšã‚Œã‚’採用ã—ã¾" "ã™ã‹ï¼Ÿ$$ &Changed $$ &Delete $$ &Unresolved" #, python-format msgid "" @@ -18420,14 +18480,14 @@ "ã™ã‹ï¼Ÿ$$ &Changed $$ &Delete $$ &Unresolved" #, python-format msgid "" -"no tool found to merge %s\n" -"keep (l)ocal, take (o)ther, or leave (u)nresolved?$$ &Local $$ &Other $$ " -"&Unresolved" -msgstr "" -"ファイル %s ã®ãƒžãƒ¼ã‚¸ã«é©åˆ‡ãªãƒ„ールãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。\n" -"作æ¥é ˜åŸŸ:(l)ocalã€ãƒžãƒ¼ã‚¸å¯¾è±¡:(o)therã€è¡çªæœªè§£æ¶ˆ:(u)nresolved ã®ã„ãšã‚Œã‚’採用" -"ã—ã¾ã™ã‹ï¼Ÿ$$ &Local $$ &Other $$ &Unresolved" +"no tool found to merge %(fd)s\n" +"keep (l)ocal%(l)s, take (o)ther%(o)s, or leave (u)nresolved?$$ &Local $$ " +"&Other $$ &Unresolved" +msgstr "" +"ファイル %(fd)s ã®ãƒžãƒ¼ã‚¸ã«é©åˆ‡ãªãƒ„ールãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。\n" +"ç¾è¡Œå´%(l)s:(l)ocal, ä»–æ–¹å´%(o)s:(o)ther, è¡çªæœªè§£æ¶ˆ:(u)nresolved ã®ã„ãšã‚Œã‚’" +"採用ã—ã¾ã™ã‹ï¼Ÿ$$ &Local $$ &Other $$ &Unresolved" msgid "" "``:local``\n" @@ -18809,15 +18869,15 @@ " サイズãŒæŒ‡å®šæ¡ä»¶ã«åˆè‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã€‚æ¡ä»¶ä¾‹:" msgid "" -" - 1k (files from 1024 to 2047 bytes)\n" -" - < 20k (files less than 20480 bytes)\n" -" - >= .5MB (files at least 524288 bytes)\n" -" - 4k - 1MB (files from 4096 bytes to 1048576 bytes)" -msgstr "" -" - 1k (1024 〜 2047 ãƒã‚¤ãƒˆã®ãƒ•ã‚¡ã‚¤ãƒ«)\n" -" - < 20k (20480 ãƒã‚¤ãƒˆæœªæº€ã®ãƒ•ã‚¡ã‚¤ãƒ«)\n" -" - >= .5MB (524288 ãƒã‚¤ãƒˆä»¥ä¸Šã®ãƒ•ã‚¡ã‚¤ãƒ«)\n" -" - 4k - 1MB (4096 〜 1048576 ãƒã‚¤ãƒˆã®ãƒ•ã‚¡ã‚¤ãƒ«)" +" - size('1k') - files from 1024 to 2047 bytes\n" +" - size('< 20k') - files less than 20480 bytes\n" +" - size('>= .5MB') - files at least 524288 bytes\n" +" - size('4k - 1MB') - files from 4096 bytes to 1048576 bytes" +msgstr "" +" - size('1k') - 1024 〜 2047 ãƒã‚¤ãƒˆã®ãƒ•ã‚¡ã‚¤ãƒ«\n" +" - size('< 20k') - 20480 ãƒã‚¤ãƒˆæœªæº€ã®ãƒ•ã‚¡ã‚¤ãƒ«\n" +" - size('>= .5MB') - 524288 ãƒã‚¤ãƒˆä»¥ä¸Šã®ãƒ•ã‚¡ã‚¤ãƒ«\n" +" - size('4k - 1MB') - 4096 〜 1048576 ãƒã‚¤ãƒˆã®ãƒ•ã‚¡ã‚¤ãƒ«" #. i18n: "size" is a keyword msgid "size requires an expression" @@ -18877,7 +18937,7 @@ #. i18n: "subrepo" is a keyword msgid "subrepo takes at most one argument" -msgstr "subrepo ã®å¼•æ•°ã¯æœ€å¤§ï¼‘ã¤ã§ã™" +msgstr "subrepo ã®å¼•æ•°ã¯ 0 〜 1 個ã§ã™" #. i18n: "subrepo" is a keyword msgid "subrepo requires a pattern or no arguments" @@ -18901,6 +18961,12 @@ msgid "unknown bisect kind %s" msgstr "未知ã®æŽ¢ç´¢ç¨®åˆ¥ %s" +msgid "cannot bisect (no known good revisions)" +msgstr "二分探索ã§ãã¾ã›ã‚“(good リビジョンãŒæœªæŒ‡å®šã§ã™)" + +msgid "cannot bisect (no known bad revisions)" +msgstr "二分探索ã§ãã¾ã›ã‚“(bad リビジョンãŒæœªæŒ‡å®šã§ã™)" + msgid "invalid bisect state" msgstr "探索状態ãŒä¸æ£ã§ã™" @@ -18932,6 +18998,28 @@ msgid "bad (implicit)" msgstr "bad (推定)" +msgid "The first good revision is:\n" +msgstr "最åˆã® good ãªãƒªãƒ“ジョンã¯:\n" + +msgid "The first bad revision is:\n" +msgstr "最åˆã® bad ãªãƒªãƒ“ジョンã¯:\n" + +#, python-format +msgid "" +"Not all ancestors of this changeset have been checked.\n" +"Use bisect --extend to continue the bisection from\n" +"the common ancestor, %s.\n" +msgstr "" +"ã“ã®ãƒªãƒ“ジョンã®ç¥–å…ˆã«å¯¾ã™ã‚‹ç¢ºèªã¯å®Œå…¨ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n" +"共通ã®ç¥–å…ˆ %s ã‹ã‚‰æŽ¢ç´¢ã‚’継続ã™ã‚‹å ´åˆã€\n" +"--extend 付ã㧠\"hg bisect\" を実行ã—ã¦ãã ã•ã„。\n" + +msgid "Due to skipped revisions, the first good revision could be any of:\n" +msgstr "検証çœç•¥ã«ã‚ˆã‚Šã€ 最åˆã® good ãªãƒªãƒ“ジョンã¯ä»¥ä¸‹ã‹ã‚‰é¸æŠžå¯èƒ½ã§ã™:\n" + +msgid "Due to skipped revisions, the first bad revision could be any of:\n" +msgstr "検証çœç•¥ã«ã‚ˆã‚Šã€ 最åˆã® bad ãªãƒªãƒ“ジョンã¯ä»¥ä¸‹ã‹ã‚‰é¸æŠžå¯èƒ½ã§ã™:\n" + #. i18n: "(EXPERIMENTAL)" is a keyword, must be translated consistently msgid "(EXPERIMENTAL)" msgstr "(実験的実装)" @@ -18945,12 +19033,12 @@ msgid " ([+] can be repeated)" msgstr " ([+] å°ä»˜ãã®ã‚ªãƒ—ションã¯è¤‡æ•°å›žæŒ‡å®šå¯èƒ½ã§ã™)" -msgid "container for exchange of repository data" -msgstr "å±¥æ´æƒ…å ±æŽˆå—ã®ãŸã‚ã®ãƒ‡ãƒ¼ã‚¿å½¢å¼" - -msgid "representation of revlog data" -msgstr "revlog データã®è¡¨ç¾å½¢å¼" - -msgid "repository requirements" +msgid "Bundles" +msgstr "bundle フォーマット" + +msgid "Changegroups" +msgstr "changegroups フォーマット" + +msgid "Repository Requirements" msgstr "リãƒã‚¸ãƒˆãƒªã® requires è¨å®š" @@ -18955,7 +19043,10 @@ msgstr "リãƒã‚¸ãƒˆãƒªã® requires è¨å®š" -msgid "revision storage mechanism" -msgstr "å±¥æ´æƒ…å ±æ ¼ç´å½¢å¼" +msgid "Revision Logs" +msgstr "revlog フォーマット" + +msgid "Wire Protocol" +msgstr "通信プãƒãƒˆã‚³ãƒ«" msgid "Configuration Files" msgstr "è¨å®šãƒ•ã‚¡ã‚¤ãƒ«" @@ -19042,8 +19133,8 @@ msgstr "コマンドã®åˆ¥å: hg %s" #, python-format -msgid "(use \"hg help -e %s\" to show help for the %s extension)" -msgstr "(\"hg help -e %s\" ã§ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ %s ã®ãƒ˜ãƒ«ãƒ—を表示)" +msgid "(use 'hg help -e %s' to show help for the %s extension)" +msgstr "('hg help -e %s' ã§ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ %s ã®ãƒ˜ãƒ«ãƒ—を表示)" msgid "options" msgstr "オプション" @@ -19054,10 +19145,10 @@ #, python-format msgid "" "\n" -"(use \"hg %s -h\" to show more help)\n" -msgstr "" -"\n" -"(ヘルプã®è©³ç´°ã®è¡¨ç¤ºã¯ \"hg %s -h\")\n" +"(use 'hg %s -h' to show more help)\n" +msgstr "" +"\n" +"(ヘルプã®è©³ç´°ã®è¡¨ç¤ºã¯ 'hg %s -h')\n" msgid "" "\n" @@ -19087,41 +19178,41 @@ msgid "" "\n" -"(use \"hg help\" for the full list of commands)\n" -msgstr "" -"\n" -"(全コマンドã®ä¸€è¦§è¡¨ç¤ºã¯ \"hg help\")\n" - -msgid "" -"\n" -"(use \"hg help\" for the full list of commands or \"hg -v\" for details)\n" -msgstr "" -"\n" -"(全コマンドã®ä¸€è¦§è¡¨ç¤ºã¯ \"hg help\" ã€ è©³ç´°æƒ…å ±ã¯ --verbose 指定ã§è¡¨ç¤º)\n" - -#, python-format -msgid "" -"\n" -"(use \"hg help %s\" to show the full help text)\n" -msgstr "" -"\n" -"(詳細ãªãƒ˜ãƒ«ãƒ—表示㯠\"hg help %s\")\n" - -#, python-format -msgid "" -"\n" -"(use \"hg help -v -e %s\" to show built-in aliases and global options)\n" -msgstr "" -"\n" -"(組ã¿è¾¼ã¿åˆ¥åãŠã‚ˆã³ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ションã®è¡¨ç¤ºã¯ \"hg help -v -e %s\")\n" - -#, python-format -msgid "" -"\n" -"(use \"hg help -v%s\" to show built-in aliases and global options)\n" -msgstr "" -"\n" -"(組ã¿è¾¼ã¿åˆ¥åãŠã‚ˆã³ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ションã®è¡¨ç¤ºã¯ \"hg -v help%s\")\n" +"(use 'hg help' for the full list of commands)\n" +msgstr "" +"\n" +"(全コマンドã®ä¸€è¦§è¡¨ç¤ºã¯ 'hg help')\n" + +msgid "" +"\n" +"(use 'hg help' for the full list of commands or 'hg -v' for details)\n" +msgstr "" +"\n" +"(全コマンドã®ä¸€è¦§è¡¨ç¤ºã¯ 'hg help'ã€ è©³ç´°æƒ…å ±ã¯ 'hg -v')\n" + +#, python-format +msgid "" +"\n" +"(use 'hg help %s' to show the full help text)\n" +msgstr "" +"\n" +"(より詳細ãªãƒ˜ãƒ«ãƒ—表示㯠'hg help %s')\n" + +#, python-format +msgid "" +"\n" +"(use 'hg help -v -e %s' to show built-in aliases and global options)\n" +msgstr "" +"\n" +"(組ã¿è¾¼ã¿åˆ¥åãŠã‚ˆã³ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ションã®è¡¨ç¤ºã¯ 'hg help -v -e %s')\n" + +#, python-format +msgid "" +"\n" +"(use 'hg help -v%s' to show built-in aliases and global options)\n" +msgstr "" +"\n" +"(組ã¿è¾¼ã¿åˆ¥åãŠã‚ˆã³ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ションã®è¡¨ç¤ºã¯ 'hg help -v%s')\n" msgid "(some details hidden, use --verbose to show complete help)" msgstr "(çœç•¥ã•ã‚ŒãŸãƒ˜ãƒ«ãƒ—ã®è©³ç´°ã¯ --verbose 指定ã§è¡¨ç¤º)" @@ -19129,10 +19220,10 @@ #, python-format msgid "" "\n" -"use \"hg help -c %s\" to see help for the %s command\n" -msgstr "" -"\n" -"\"hg help -c %s\" ã«ã‚ˆã£ã¦ã‚³ãƒžãƒ³ãƒ‰ %s ã®ãƒ˜ãƒ«ãƒ—ãŒè¡¨ç¤ºã•ã‚Œã¾ã™\n" +"use 'hg help -c %s' to see help for the %s command\n" +msgstr "" +"\n" +"'hg help -c %s' ã«ã‚ˆã£ã¦ã‚³ãƒžãƒ³ãƒ‰ %s ã®ãƒ˜ãƒ«ãƒ—ãŒè¡¨ç¤ºã•ã‚Œã¾ã™\n" msgid "no help text available" msgstr "ヘルプã¯ã‚ã‚Šã¾ã›ã‚“" @@ -19141,8 +19232,8 @@ msgid "%s extension - %s" msgstr "%s エクステンション - %s" -msgid "(use \"hg help extensions\" for information on enabling extensions)\n" -msgstr "(有効ãªã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³æƒ…å ±ã®è¡¨ç¤ºã¯ \"hg help extensions\")\n" +msgid "(use 'hg help extensions' for information on enabling extensions)\n" +msgstr "(有効ãªã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³æƒ…å ±ã®è¡¨ç¤ºã¯ 'hg help extensions')\n" #, python-format msgid "'%s' is provided by the following extension:" @@ -19157,11 +19248,11 @@ msgid "no matches" msgstr "該当ã™ã‚‹ãƒ˜ãƒ«ãƒ—トピックã¯ã‚ã‚Šã¾ã›ã‚“" -msgid "try \"hg help\" for a list of topics" -msgstr "ヘルプトピックã®ä¸€è¦§ã¯ \"hg help\" ã§è¡¨ç¤ºã•ã‚Œã¾ã™" +msgid "try 'hg help' for a list of topics" +msgstr "ヘルプトピックã®ä¸€è¦§ã¯ 'hg help' ã§è¡¨ç¤ºã•ã‚Œã¾ã™" #, python-format msgid "no such help topic: %s" msgstr "該当ã™ã‚‹ãƒ˜ãƒ«ãƒ—トピックã¯ã‚ã‚Šã¾ã›ã‚“: %s" #, python-format @@ -19162,11 +19253,11 @@ #, python-format msgid "no such help topic: %s" msgstr "該当ã™ã‚‹ãƒ˜ãƒ«ãƒ—トピックã¯ã‚ã‚Šã¾ã›ã‚“: %s" #, python-format -msgid "try \"hg help --keyword %s\"" -msgstr "\"hg help --keyword %s\" を使用ã—ã¦ã¿ã¦ãã ã•ã„" +msgid "try 'hg help --keyword %s'" +msgstr "'hg help --keyword %s' を使用ã—ã¦ã¿ã¦ãã ã•ã„" msgid "Mercurial Distributed SCM\n" msgstr "Mercurial - 分散構æˆç®¡ç†ãƒ„ール\n" @@ -21470,8 +21561,8 @@ " 対象ホストã®ãƒ›ã‚¹ãƒˆæ¯Žè¨å®šã§ ``fingerprints`` ãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã€\n" " ã“ã®æŒ‡å®šã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚" -msgid " The format of the file is as follows:" -msgstr "" +msgid " The format of the file is as follows::" +msgstr " 以下ã®ãƒ•ã‚¡ã‚¤ãƒ«å½¢å¼ã‚’想定ã—ã¦ã„ã¾ã™::" msgid "" " -----BEGIN CERTIFICATE-----\n" @@ -21598,6 +21689,13 @@ " ``.orig``. With ``ignore``, don't print a warning and back them up as\n" " ``.orig``. (default: ``abort``)" msgstr "" +"``checkignored``\n" +" マージや作æ¥é ˜åŸŸæ›´æ–°ã®éš›ã«ã€ 対象リビジョンã®ç®¡ç†å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ãŒã€\n" +" 作æ¥é ˜åŸŸä¸ã®ç„¡è¦–対象ファイルã¨åŒåã§ã€ 且ã¤å†…容ãŒç•°ãªã‚‹å ´åˆã®æŒ™å‹•ã€‚\n" +" 指定å¯èƒ½ãªå€¤ã¯ ``abort``, ``warn``, ``ignore`` ã§ã™ã€‚ ``abort`` ã¯ã€\n" +" 処ç†ã‚’ä¸æ–ã—ã¾ã™ã€‚ ``warn`` ã¯è¦å‘Šè¡¨ç¤ºã¨ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—作æˆã‚’è¡Œã„ã¾ã™\n" +" (``.orig`` æ‹¡å¼µå付ãファイルã«ä¿å˜)。 ``ignore`` ã¯è¦å‘Šè¡¨ç¤ºã‚‚〠\n" +" ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—作æˆã‚‚è¡Œã„ã¾ã›ã‚“ (デフォルト値: ``abort``)" msgid "" "``checkunknown``\n" @@ -21608,6 +21706,11 @@ "that\n" " are not ignored. (default: ``abort``)" msgstr "" +"``checkunknown``\n" +" マージや作æ¥é ˜åŸŸæ›´æ–°ã®éš›ã«ã€ 対象リビジョンã®ç®¡ç†å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ãŒã€\n" +" 作æ¥é ˜åŸŸä¸ã®ç®¡ç†å¯¾è±¡å¤–ファイルã¨åŒåã§ã€ 且ã¤å†…容ãŒç•°ãªã‚‹å ´åˆã®æŒ™å‹•ã€‚\n" +" ``ignore`` 指定ãŒãªã„他㯠``merge.checkignored`` è¨å®šã¨åŒã˜ã§ã™ã€‚\n" +" (デフォルト値: ``abort``)" msgid "" "``merge-patterns``\n" @@ -22131,6 +22234,18 @@ "プãƒãƒ•ã‚¡ã‚¤ãƒ«æŽ¡å–ã«ã¯ã€ lsprof ãŒç”¨ã„られã¾ã™ã€‚" msgid "" +"``enabled``\n" +" Enable the profiler.\n" +" (default: false)" +msgstr "" +"``enabled``\n" +" プãƒãƒ•ã‚¡ã‚¤ãƒ©ã®æœ‰åŠ¹åŒ–。\n" +" (デフォルト値: false)" + +msgid " This is equivalent to passing ``--profile`` on the command line." +msgstr " true 指定ã¯ã‚³ãƒžãƒ³ãƒ‰è¡Œã§ã® ``--profile`` 指定ã¨ç‰ä¾¡ã§ã™ã€‚" + +msgid "" "``type``\n" " The type of profiler to use.\n" " (default: ls)" @@ -22469,6 +22584,30 @@ msgstr "" msgid "" +"``zliblevel``\n" +" Integer between ``-1`` and ``9`` that controls the zlib compression " +"level\n" +" for wire protocol commands that send zlib compressed output (notably " +"the\n" +" commands that send repository history data)." +msgstr "" + +msgid "" +" The default (``-1``) uses the default zlib compression level, which is\n" +" likely equivalent to ``6``. ``0`` means no compression. ``9`` means\n" +" maximum compression." +msgstr "" + +msgid "" +" Setting this option allows server operators to make trade-offs between\n" +" bandwidth and CPU used. Lowering the compression lowers CPU utilization\n" +" but sends more bytes to clients." +msgstr "" + +msgid " This option only impacts the HTTP server." +msgstr "" + +msgid "" "``smtp``\n" "--------" msgstr "" @@ -22548,7 +22687,7 @@ "or becomes temporarily unavailable. This section lets you define\n" "rewrite rules of the form::" msgstr "" -"連æºå…ˆãƒ›ã‚¹ãƒˆã®å称変更や一時的ãªåœæ¢ãªã©ã§ã€ サブリãƒã‚¸ãƒˆãƒªå‚照先 URL ãŒã€\n" +"連æºå…ˆãƒ›ã‚¹ãƒˆã®å称変更や一時的ãªåœæ¢ãªã©ã§ã€ サブリãƒã‚¸ãƒˆãƒªé€£æºå…ˆ URL ãŒã€\n" "無効ã«ãªã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ 本セクションã§ã¯ã€ å‚照先 URL ã®æ›¸ãæ›ãˆã‚’ã€\n" "以下ã®å½¢å¼ã§è¨˜è¿°ã§ãã¾ã™::" @@ -22599,6 +22738,21 @@ "詳細㯠:hg:`help templates` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" msgid "" +"``templates``\n" +"-------------" +msgstr "" +"``templates``\n" +"-------------" + +#, fuzzy +msgid "" +"Use the ``[templates]`` section to define template strings.\n" +"See :hg:`help templates` for details." +msgstr "" +"テンプレート文å—列ã®å®šç¾©ã¯ ``[templates]`` セクションã§è¡Œã„ã¾ã™ã€‚\n" +"詳細㯠:hg:`help templates` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" + +msgid "" "``trusted``\n" "-----------" msgstr "" @@ -22857,7 +23011,7 @@ msgid "" "``interface.chunkselector``\n" -" Select the interface for change recording (e.g. :hg:`commit` -i).\n" +" Select the interface for change recording (e.g. :hg:`commit -i`).\n" " Possible values are 'text' and 'curses'.\n" " This config overrides the interface specified by ui.interface." msgstr "" @@ -25816,7 +25970,7 @@ "root directory, or any prefix path of that path, is matched against\n" "any pattern in ``.hgignore``." msgstr "" -"未登録ファイルãŒã€ 作æ¥é ˜åŸŸã®ãƒ«ãƒ¼ãƒˆã‹ã‚‰ã®ç›¸å¯¾ãƒ‘スã€\n" +"管ç†å¯¾è±¡å¤–ファイルãŒã€ 作æ¥é ˜åŸŸã®ãƒ«ãƒ¼ãƒˆã‹ã‚‰ã®ç›¸å¯¾ãƒ‘スã€\n" "ã¾ãŸã¯ãã®ãƒ‘スã®å…ˆé 部分ãŒã€ ``.hgignore``\n" "ã«è¨˜è¿°ã•ã‚ŒãŸãƒ‘ターンã¨åˆè‡´ã™ã‚‹å ´åˆã€\n" "ãã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ Mercurial ã‹ã‚‰ã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚" @@ -25826,7 +25980,7 @@ "``a/b/file.c`` inside our repository. Mercurial will ignore ``file.c``\n" "if any pattern in ``.hgignore`` matches ``a/b/file.c``, ``a/b`` or ``a``." msgstr "" -"例ãˆã°ã€ 未登録ファイル ``file.c`` ãŒã€\n" +"例ãˆã°ã€ 管ç†å¯¾è±¡å¤–ファイル ``file.c`` ãŒã€\n" "作æ¥é ˜åŸŸã® ``a/b/file.c`` ã«ä½ç½®ã™ã‚‹ã¨ä»®å®šã—ã¾ã™ã€‚\n" "``a/b/file.c``, ``a/b`` ã¾ãŸã¯ ``a`` ã¨ã„ã£ãŸãƒ‘ターンãŒ\n" "``.hgignore`` ã«è¨˜è¿°ã•ã‚Œã¦ã„ã‚‹å ´åˆã€\n" @@ -26915,6 +27069,13 @@ "ã§å›²ã£ã¦ãã ã•ã„。" msgid "" +"Prefix\n" +"======" +msgstr "" +"å‰ç½®æ¼”ç®—å\n" +"==========" + +msgid "" "``not x``\n" " Changesets not in x. Short form is ``! x``." msgstr "" @@ -26922,6 +27083,13 @@ " x ã«å«ã¾ã‚Œãªã„リビジョン群。 ``! x`` ã¨ã‚‚表記å¯èƒ½ã€‚" msgid "" +"Infix\n" +"=====" +msgstr "" +"äºŒé …æ¼”ç®—å\n" +"==========" + +msgid "" "``x::y``\n" " A DAG range, meaning all changesets that are descendants of x and\n" " ancestors of y, including x and y themselves. If the first endpoint\n" @@ -27001,6 +27169,51 @@ " リビジョン群 x ä¸ã®å„リビジョンã®ã€ 第1親å´ã® n 番目ã®ç¥–先。\n" " ``x~0`` ã¯ãƒªãƒ“ジョン自身〠``x~3`` 㯠``x^^^`` ã¨ç‰ä¾¡ã€‚" +msgid "" +"``x ## y``\n" +" Concatenate strings and identifiers into one string." +msgstr "" +"``x ## y``\n" +" æ–‡å—列やシンボルåを〠å˜ä¸€æ–‡å—列ã«çµåˆã—ã¾ã™ã€‚" + +msgid "" +" All other prefix, infix and postfix operators have lower priority than\n" +" ``##``. For example, ``a1 ## a2~2`` is equivalent to ``(a1 ## a2)~2``." +msgstr "" +" ä»–ã®å…¨ã¦ã®æ¼”ç®—å (å‰ç½®ï¼äºŒé …ï¼å¾Œç½®) よりも〠çµåˆå„ªå…ˆé †ä½ãŒé«˜ããªã‚Šã¾ã™ã€‚\n" +" 例ãˆã° ``a1 ## a2~2`` 㯠``(a1 ## a2)~2`` ã¨ç‰ä¾¡ã§ã™ã€‚" + +msgid " For example::" +msgstr " 記述例を以下ã«ç¤ºã—ã¾ã™::" + +msgid "" +" [revsetalias]\n" +" issue(a1) = grep(r'\\bissue[ :]?' ## a1 ## r'\\b|\\bbug\\(' ## a1 ## " +"r'\\)')" +msgstr "" +" [revsetalias]\n" +" issue(a1) = grep(r'\\bissue[ :]?' ## a1 ## r'\\b|\\bbug\\(' ## a1 ## " +"r'\\)')" + +msgid "" +" ``issue(1234)`` is equivalent to\n" +" ``grep(r'\\bissue[ :]?1234\\b|\\bbug\\(1234\\)')``\n" +" in this case. This matches against all of \"issue 1234\", " +"\"issue:1234\",\n" +" \"issue1234\" and \"bug(1234)\"." +msgstr "" +" 上記ã®åˆ¥åãŒå®šç¾©ã•ã‚Œã¦ã„ã‚‹å ´åˆã€ ``issue(1234)`` ã¨ã„ã†è¨˜è¿°ã¯\n" +" ``grep(r'\\bissue[ :]?1234\\b|\\bbug\\(1234\\)')`` ã¨ç‰ä¾¡ã§ã™ã€‚\n" +" ã“ã®ãƒ‘ターン㯠\"issue 1234\", \"issue:1234\", \"issue1234\" ãŠã‚ˆã³\n" +" \"bug(1234)\" ã®å…¨ã¦ã«åˆè‡´ã—ã¾ã™ã€‚" + +msgid "" +"Postfix\n" +"=======" +msgstr "" +"後置演算å\n" +"==========" + msgid "There is a single postfix operator:" msgstr "使用å¯èƒ½ãªå¾Œç½®å˜é …演算åを以下ã«åˆ—挙ã—ã¾ã™:" @@ -27012,11 +27225,18 @@ " リビジョン群 x ä¸ã®å„リビジョンã®ã€ 第1親リビジョン。 ``x^1`` ã¨ç‰ä¾¡ã€‚" msgid "" -"\n" -"The following predicates are supported:" -msgstr "" -"\n" -"使用å¯èƒ½ãªè¿°èªžã‚’以下ã«åˆ—挙ã—ã¾ã™:" +"Predicates\n" +"==========" +msgstr "" +"述語\n" +"====" + +msgid "" +"Aliases\n" +"=======" +msgstr "" +"別å定義\n" +"========" msgid "" "New predicates (known as \"aliases\") can be defined, using any combination " @@ -27060,38 +27280,11 @@ "``rs(0:tip, author)`` 㯠``reverse(sort(0:tip, author))`` ã¨åŒä¸€ã§ã™ã€‚" msgid "" -"An infix operator ``##`` can concatenate strings and identifiers into\n" -"one string. For example::" -msgstr "" -"äºŒé …æ¼”ç®—å ``##`` ã¯ã€ æ–‡å—列やシンボルåを〠å˜ä¸€æ–‡å—列ã«çµåˆã—ã¾ã™ã€‚\n" -"例ãˆã°::" - -msgid "" -" [revsetalias]\n" -" issue(a1) = grep(r'\\bissue[ :]?' ## a1 ## r'\\b|\\bbug\\(' ## a1 ## " -"r'\\)')" -msgstr "" -" [revsetalias]\n" -" issue(a1) = grep(r'\\bissue[ :]?' ## a1 ## r'\\b|\\bbug\\(' ## a1 ## " -"r'\\)')" - -msgid "" -"``issue(1234)`` is equivalent to ``grep(r'\\bissue[ :]?1234\\b|\\bbug" -"\\(1234\\)')``\n" -"in this case. This matches against all of \"issue 1234\", \"issue:1234\",\n" -"\"issue1234\" and \"bug(1234)\"." -msgstr "" -"上記ã®åˆ¥åãŒå®šç¾©ã•ã‚Œã¦ã„ã‚‹å ´åˆã€ ``issue(1234)`` ã¨ã„ã†è¨˜è¿°ã¯\n" -"``grep(r'\\bissue[ :]?1234\\b|\\bbug\\(1234\\)')`` ã¨ç‰ä¾¡ã§ã™ã€‚\n" -"ã“ã®ãƒ‘ターン㯠\"issue 1234\", \"issue:1234\", \"issue1234\" ãŠã‚ˆã³\n" -"\"bug(1234)\" ã®å…¨ã¦ã«åˆè‡´ã—ã¾ã™ã€‚" - -msgid "" -"All other prefix, infix and postfix operators have lower priority than\n" -"``##``. For example, ``a1 ## a2~2`` is equivalent to ``(a1 ## a2)~2``." -msgstr "" -"ä»–ã®å…¨ã¦ã®æ¼”ç®—å㯠``##`` よりもçµåˆå„ªå…ˆé †ä½ãŒä½Žããªã‚Šã¾ã™ã€‚ 例ãˆã°\n" -"``a1 ## a2~2`` 㯠``(a1 ## a2)~2`` ã¨ç‰ä¾¡ã§ã™ã€‚" +"Equivalents\n" +"===========" +msgstr "" +"ç‰ä¾¡æ€§\n" +"======" msgid "Command line equivalents for :hg:`log`::" msgstr ":hg:`log` ã®ã‚³ãƒžãƒ³ãƒ‰è¡Œã‚ªãƒ—ション指定ã«å¯¾ã™ã‚‹ç‰ä¾¡ãªè¨˜è¿°::" @@ -27115,6 +27308,13 @@ " -P x -> !::x\n" " -l x -> limit(expr, x)" +msgid "" +"Examples\n" +"========" +msgstr "" +"記述例\n" +"======" + msgid "- Changesets on the default branch::" msgstr "- default ブランãƒã®ãƒªãƒ“ジョン群::" @@ -27212,8 +27412,8 @@ ":hg:`serve` can also start a \"command server.\" Clients can connect\n" "to this server and issue Mercurial commands over a special protocol.\n" "For more details on the command server, including links to client\n" -"libraries, see https://mercurial.selenic.com/wiki/CommandServer." +"libraries, see https://www.mercurial-scm.org/wiki/CommandServer." msgstr "" ":hg:`serve` コマンドã¯ã€ 「コマンドサーãƒã€ã®èµ·å‹•ã‚‚å¯èƒ½ã§ã™ã€‚\n" "専用プãƒãƒˆã‚³ãƒ«ã§æŽ¥ç¶šã—ãŸã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‹ã‚‰ã€ コマンドサーãƒä¸Šã§ã® Mercurial\n" "コマンドã®å®Ÿè¡Œã‚’ä¾é ¼ã§ãã¾ã™ã€‚ クライアントå‘ã‘ライブラリã®è©³ç´°ã‚’å«ã‚€ã€\n" @@ -27216,8 +27416,8 @@ msgstr "" ":hg:`serve` コマンドã¯ã€ 「コマンドサーãƒã€ã®èµ·å‹•ã‚‚å¯èƒ½ã§ã™ã€‚\n" "専用プãƒãƒˆã‚³ãƒ«ã§æŽ¥ç¶šã—ãŸã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‹ã‚‰ã€ コマンドサーãƒä¸Šã§ã® Mercurial\n" "コマンドã®å®Ÿè¡Œã‚’ä¾é ¼ã§ãã¾ã™ã€‚ クライアントå‘ã‘ライブラリã®è©³ç´°ã‚’å«ã‚€ã€\n" -"コマンドサーãƒã®æƒ…å ±ã¯ã€ https://mercurial.selenic.com/wiki/CommandServer\n" +"コマンドサーãƒã®æƒ…å ±ã¯ã€ https://www.mercurial-scm.org/wiki/CommandServer\n" "ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" msgid "" @@ -27991,6 +28191,23 @@ msgid ".. functionsmarker" msgstr ".. functionsmarker" +msgid "We provide a limited set of infix arithmetic operations on integers::" +msgstr "整数値ã«å¯¾ã™ã‚‹ä»¥ä¸‹ã®äºŒé …演算åãŒä½¿ç”¨å¯èƒ½ã§ã™::" + +msgid "" +" + for addition\n" +" - for subtraction\n" +" * for multiplication\n" +" / for floor division (division rounded to integer nearest -infinity)" +msgstr "" +" åŠ ç®—ç”¨ã® +\n" +" 減算用㮠-\n" +" 乗算用㮠*\n" +" 除算用㮠/ (除算çµæžœã¯ã€ マイナス無é™å¤§æ–¹å‘ã®æ•´æ•°å€¤ã«ä¸¸ã‚られã¾ã™)" + +msgid "Division fulfils the law x = x / y + mod(x, y)." +msgstr "除算çµæžœã¯ x = x / y + mod(x, y) を満ãŸã—ã¾ã™ã€‚" + msgid "" "Also, for any expression that returns a list, there is a list operator::" msgstr "ã¾ãŸã€ 列挙形å¼ã‚’返㙠expr ã«å¯¾ã—ã¦ã¯ã€ 以下ã®æ§˜ãªè¨˜è¿°ãŒå¯èƒ½ã§ã™::" @@ -28041,6 +28258,26 @@ "上記記述ã¯ã€ ``r`` 㨠``rn`` ã®ï¼’ã¤ã®ã‚·ãƒ³ãƒœãƒ«ã¨ã€ 関数 ``leftpad()``\n" "を別åã¨ã—ã¦å®šç¾©ã—ã¾ã™ã€‚" +msgid "" +"It's also possible to specify complete template strings, using the\n" +"``templates`` section. The syntax used is the general template string syntax." +msgstr "" +"``templates`` セクションã§ã€ テンプレートを丸々定義ã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚\n" +"記述ã®éš›ã®æ–‡æ³•ã¯ã€ 通常ã®ãƒ†ãƒ³ãƒ—レート定義ã®ã‚‚ã®ã¨åŒã˜ã§ã™ã€‚" + +msgid "" +" [templates]\n" +" nodedate = \"{node|short}: {date(date, \"%Y-%m-%d\")}\\n\"" +msgstr "" +" [templates]\n" +" nodedate = \"{node|short}: {date(date, \"%Y-%m-%d\")}\\n\"" + +msgid "defines a template, ``nodedate``, which can be called like::" +msgstr "上記㮠``nodedate`` 定義ã«ã‚ˆã‚Šã€ 以下ã®ã‚³ãƒžãƒ³ãƒ‰å®Ÿè¡ŒãŒå¯èƒ½ã«ãªã‚Šã¾ã™::" + +msgid " $ hg log -r . -Tnodedate" +msgstr " $ hg log -r . -Tnodedate" + msgid "Some sample command line templates:" msgstr "コマンドラインã§ã®ãƒ†ãƒ³ãƒ—レート指定例:" @@ -28056,6 +28293,14 @@ msgid " $ hg log -r 0 --template \"files: {join(files, ', ')}\\n\"" msgstr " $ hg log -r 0 --template \"files: {join(files, ', ')}\\n\"" +msgid "- Join the list of files ending with \".py\" with a \", \"::" +msgstr "- \".py\" æ‹¡å¼µåã‚’æŒã¤ãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã‚’ \", \" ã§é€£çµ::" + +msgid "" +" $ hg log -r 0 --template \"pythonfiles: {join(files('**.py'), ', ')}\\n\"" +msgstr "" +" $ hg log -r 0 --template \"pythonfiles: {join(files('**.py'), ', ')}\\n\"" + msgid "- Separate non-empty arguments by a \" \"::" msgstr "- éžç©ºå¼•æ•°ã®ã¿ã‚’ \" \" ã§é€£çµ::" @@ -28426,10 +28671,6 @@ msgstr "サブリãƒã‚¸ãƒˆãƒªã®æ¤œè¨¼ä¸\n" #, python-format -msgid "%s: %s\n" -msgstr "%s: %s\n" - -#, python-format msgid ".hgsubstate is corrupt in revision %s\n" msgstr "リビジョン %s ã«ãŠã‘ã‚‹ .hgsubstate ãŒä¸æ£ã§ã™\n" @@ -29149,6 +29390,10 @@ msgstr "%d ãŒä½œæ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã«ãªã‚Šã¾ã—ãŸ\n" #, python-format +msgid "waiting for lock on %s held by process %r on host %r\n" +msgstr "%s ã®ãƒãƒƒã‚¯ (プãƒã‚»ã‚¹ %r/ホスト %s ãŒä¿æŒ) ã®è§£æ”¾ã‚’å¾…ã£ã¦ã„ã¾ã™\n" + +#, python-format msgid "repository %s" msgstr "リãƒã‚¸ãƒˆãƒª '%s'" @@ -29167,7 +29412,7 @@ msgstr "ディレクトé…下ã«ä¸€è‡´ã™ã‚‹ã‚‚ã®ãŒã‚ã‚Šã¾ã›ã‚“!" msgid "file not tracked!" -msgstr "ファイルã¯æœªç™»éŒ²ã§ã™!" +msgstr "ファイルã¯ç®¡ç†å¯¾è±¡å¤–ã§ã™!" msgid "cannot partially commit a merge (do not specify files or patterns)" msgstr "マージã®éƒ¨åˆ†ã‚³ãƒŸãƒƒãƒˆã¯ã§ãã¾ã›ã‚“(ファイルåï¼ãƒ‘ターンã¯æŒ‡å®šã§ãã¾ã›ã‚“)" @@ -29185,8 +29430,8 @@ msgid "cannot commit merge with missing files" msgstr "管ç†å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ãŒä¸åœ¨ã®çŠ¶æ³ã§ã¯ã€ãƒžãƒ¼ã‚¸çµæžœã‚’コミットã§ãã¾ã›ã‚“" -msgid "unresolved merge conflicts (see \"hg help resolve\")" -msgstr "未解消ã®è¡çªãŒæ®‹ã£ã¦ã„ã¾ã™ (\"hg help resolve\" ã‚’å‚ç…§)" +msgid "unresolved merge conflicts (see 'hg help resolve')" +msgstr "未解消ã®è¡çªãŒæ®‹ã£ã¦ã„ã¾ã™ ('hg help resolve' ã‚’å‚ç…§)" msgid "driver-resolved merge conflicts" msgstr "" @@ -29313,8 +29558,12 @@ msgstr "マージドライãƒè¨å®šã‚’å…ƒã«æˆ»ã™ã‹ã€ãƒžãƒ¼ã‚¸ã‚’å–ã‚Šæ¢ã‚ã¦ãã ã•ã„" #, python-format -msgid "warning: cannot merge flags for %s\n" -msgstr "è¦å‘Š: ファイル %s ã®å±žæ€§è¨å®šã¯ãƒžãƒ¼ã‚¸ã§ãã¾ã›ã‚“\n" +msgid "" +"warning: cannot merge flags for %s without common ancestor - keeping local " +"flags\n" +msgstr "" +"è¦å‘Š: 共通祖先ã®ãªã„ファイル %s ã®å±žæ€§è¨å®šã¯ãƒžãƒ¼ã‚¸ã§ãã¾ã›ã‚“ - 作æ¥é ˜åŸŸã®å€¤ã‚’" +"ç¶æŒã—ã¾ã™\n" #, python-format msgid "%s.%s not valid ('%s' is none of %s)" @@ -29322,7 +29571,7 @@ #, python-format msgid "%s: untracked file differs\n" -msgstr "%s: 未登録ファイルã«å·®åˆ†ã‚ã‚Š\n" +msgstr "%s: 管ç†å¯¾è±¡å¤–ファイルã«å·®åˆ†ã‚ã‚Š\n" msgid "" "untracked files in working directory differ from files in requested revision" @@ -29326,7 +29575,7 @@ msgid "" "untracked files in working directory differ from files in requested revision" -msgstr "指定リビジョンã§ã®è¨˜éŒ²å†…容ã¨ç•°ãªã‚‹æœªç™»éŒ²ãƒ•ã‚¡ã‚¤ãƒ«ãŒå˜åœ¨ã—ã¾ã™" +msgstr "指定リビジョンã§ã®è¨˜éŒ²å†…容ã¨ç•°ãªã‚‹ç®¡ç†å¯¾è±¡å¤–ファイルãŒå˜åœ¨ã—ã¾ã™" #, python-format msgid "%s: replacing untracked file\n" @@ -29330,7 +29579,7 @@ #, python-format msgid "%s: replacing untracked file\n" -msgstr "%s: 未登録ファイルã®å†…容を書ãæ›ãˆ\n" +msgstr "%s: 管ç†å¯¾è±¡å¤–ファイルã®å†…容を書ãæ›ãˆ\n" #, python-format msgid "case-folding collision between %s and %s" @@ -29390,6 +29639,14 @@ msgstr "%s ã®å‰Šé™¤ã«å¤±æ•—: %s!\n" #, python-format +msgid "" +"current directory was removed\n" +"(consider changing to repo root: %s)\n" +msgstr "" +"ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãŒå‰Šé™¤ã•ã‚Œã¾ã—ãŸ\n" +"(リãƒã‚¸ãƒˆãƒªãƒ«ãƒ¼ãƒˆ %s ã¸ã®ç§»å‹•ã‚’ãŠå‹§ã‚ã—ã¾ã™)\n" + +#, python-format msgid "getting %s\n" msgstr "%s ã®å–å¾—ä¸\n" @@ -29417,6 +29674,6 @@ #, python-format msgid "" -"local changed %s which remote deleted\n" +"local%(l)s changed %(f)s which other%(o)s deleted\n" "use (c)hanged version or (d)elete?$$ &Changed $$ &Delete" msgstr "" @@ -29421,8 +29678,8 @@ "use (c)hanged version or (d)elete?$$ &Changed $$ &Delete" msgstr "" -"変更ã—ãŸãƒ•ã‚¡ã‚¤ãƒ« %s ãŒã€ãƒžãƒ¼ã‚¸å¯¾è±¡ãƒªãƒ“ジョンã§ç™»éŒ²é™¤å¤–ã•ã‚Œã¦ã„ã¾ã™ã€‚\n" +"ç¾è¡Œå´%(l)s ã§ã® %(f)s ã®å¤‰æ›´ãŒä»–æ–¹å´%(o)s ã§ã®ç™»éŒ²é™¤å¤–ã¨è¡çªã—ã¾ã™ã€‚\n" "変更:(c)hanged ã¨ç™»éŒ²é™¤å¤–:(d)elete ã®ã©ã¡ã‚‰ã‚’採用ã—ã¾ã™ã‹ï¼Ÿ$$ &Changed $$ " "&Delete" #, python-format msgid "" @@ -29424,8 +29681,8 @@ "変更:(c)hanged ã¨ç™»éŒ²é™¤å¤–:(d)elete ã®ã©ã¡ã‚‰ã‚’採用ã—ã¾ã™ã‹ï¼Ÿ$$ &Changed $$ " "&Delete" #, python-format msgid "" -"remote changed %s which local deleted\n" +"other%(o)s changed %(f)s which local%(l)s deleted\n" "use (c)hanged version or leave (d)eleted?$$ &Changed $$ &Deleted" msgstr "" @@ -29430,6 +29687,6 @@ "use (c)hanged version or leave (d)eleted?$$ &Changed $$ &Deleted" msgstr "" -"登録除外済ã¿ã®ãƒ•ã‚¡ã‚¤ãƒ« %s ãŒã€ãƒžãƒ¼ã‚¸å¯¾è±¡ãƒªãƒ“ジョンã§å¤‰æ›´ã•ã‚Œã¦ã„ã¾ã™ã€‚\n" +"ä»–æ–¹å´%(o)s ã§ã® %(f)s ã®å¤‰æ›´ãŒç¾è¡Œå´%(l)s ã§ã®ç™»éŒ²é™¤å¤–ã¨è¡çªã—ã¾ã™ã€‚\n" "変更:(c)hanged ã¨ç™»éŒ²é™¤å¤–:(d)elete ã®ã©ã¡ã‚‰ã‚’採用ã—ã¾ã™ã‹ï¼Ÿ$$ &Changed $$ " "&Deleted" @@ -29540,7 +29797,7 @@ #, python-format msgid "%(func)s takes at most %(nargs)d arguments" -msgstr "%(func)s ã®å¼•æ•°ã¯æœ€å¤§ %(nargs)d 個ã§ã™" +msgstr "%(func)s ã®å¼•æ•°ã¯ 0 〜 %(nargs)d 個ã§ã™" #, python-format msgid "%(func)s got an invalid argument" @@ -29603,6 +29860,9 @@ msgid "unable to find '%s' for patching\n" msgstr "パッãƒé©ç”¨å¯¾è±¡ã® '%s' ãŒä¸åœ¨ã§ã™\n" +msgid "(use '--prefix' to apply patch relative to the current directory)\n" +msgstr "(ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªç›¸å¯¾ã§ã®ãƒ‘ッãƒé©ç”¨ã«ã¯ '--prefix' ãŒæœ‰ç”¨ã§ã™)\n" + #, python-format msgid "patching file %s\n" msgstr "ファイル %s ã«ãƒ‘ッãƒé©ç”¨ä¸\n" @@ -29743,6 +30003,10 @@ msgstr "差分æ“作コード(delta opcode) 0 ã¯æƒ³å®šå¤–ã§ã™" #, python-format +msgid "source file '%s' does not exist" +msgstr "é©ç”¨å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ« '%s' ã¯å˜åœ¨ã—ã¾ã›ã‚“" + +#, python-format msgid "cannot create %s: destination already exists" msgstr "%s を作æˆã§ãã¾ã›ã‚“: 対象ファイルãŒæ—¢ã«å˜åœ¨ã—ã¾ã™" @@ -29815,6 +30079,37 @@ msgid "killed by signal %d" msgstr "シグナル %d ã§å¼·åˆ¶çµ‚了ã•ã‚Œã¾ã—ãŸ" +#, python-format +msgid "unrecognized profiling format '%s' - Ignored\n" +msgstr "ä¸æ£ãªãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«å½¢å¼ '%s' を無視ã—ã¾ã™\n" + +msgid "" +"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" +"misc/lsprof/" +msgstr "" +"lsprof ãŒåˆ©ç”¨ã§ãã¾ã›ã‚“ - http://codespeak.net/svn/user/arigo/hack/misc/" +"lsprof/ã‹ã‚‰ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„" + +msgid "" +"flamegraph not available - install from https://github.com/evanhempel/python-" +"flamegraph" +msgstr "" +"flamegraph ãŒä½¿ç”¨ã§ãã¾ã›ã‚“ - https://github.com/evanhempel/python-" +"flamegraph ã‹ã‚‰ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„" + +msgid "statprof not available - install using \"easy_install statprof\"" +msgstr "" +"statprof ãŒåˆ©ç”¨ã§ãã¾ã›ã‚“ - \"easy_install statprof\"ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•" +"ã„" + +#, python-format +msgid "invalid sampling frequency '%s' - ignoring\n" +msgstr "ä¸æ£ãªã‚µãƒ³ãƒ—ãƒªãƒ³ã‚°å‘¨æœŸé »åº¦ '%s' を無視ã—ã¾ã™\n" + +#, python-format +msgid "unrecognized profiler '%s' - ignored\n" +msgstr "ä¸æ£ãªãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ©æŒ‡å®š '%s' を無視ã—ã¾ã™\n" + #. i18n: format XX seconds as "XXs" #, python-format msgid "%02ds" @@ -29867,12 +30162,17 @@ msgstr "ファイル %s ã®ç ´æ£„ã«å¤±æ•—: %s\n" #, python-format -msgid "strip failed, full bundle stored in '%s'\n" -msgstr "リビジョン除外ã«å¤±æ•—: 完全ãªãƒãƒ³ãƒ‰ãƒ«ã‚’ '%s' ã«ä¿å˜\n" - -#, python-format -msgid "strip failed, partial bundle stored in '%s'\n" -msgstr "リビジョンã®é™¤å¤–ã«å¤±æ•—: 部分的ãªãƒãƒ³ãƒ‰ãƒ«ã‚’ '%s' ã«ä¿å˜\n" +msgid "strip failed, backup bundle stored in '%s'\n" +msgstr "リビジョン除外ã«å¤±æ•—: ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ãƒãƒ³ãƒ‰ãƒ«ã‚’ '%s' ã«ä¿å˜\n" + +#, python-format +msgid "strip failed, unrecovered changes stored in '%s'\n" +msgstr "リビジョン除外ã«å¤±æ•—: 復旧ã•ã‚Œãªã„å±¥æ´ã‚’ '%s' ã«ä¿å˜\n" + +#, python-format +msgid "" +"(fix the problem, then recover the changesets with \"hg unbundle '%s'\")\n" +msgstr "(å•é¡Œè§£æ±ºå¾Œã« \"hg unbundle '%s'\" ã§å±¥æ´ã‚’復旧ã—ã¦ãã ã•ã„)\n" msgid "(not rebuilding fncache because repository does not support fncache)\n" msgstr "(fncache 未サãƒãƒ¼ãƒˆã®ãƒªãƒã‚¸ãƒˆãƒªã®ãŸã‚ã€fncache ã®å†æ§‹ç¯‰ã¯çœç•¥)\n" @@ -30072,7 +30372,7 @@ #. i18n: "bookmark" is a keyword msgid "bookmark takes one or no arguments" -msgstr "bookmark ã®å¼•æ•°ã¯æœ€å¤§1ã¤ã§ã™" +msgstr "bookmark ã®å¼•æ•°ã¯ 0 〜 1 個ã§ã™" #. i18n: "bookmark" is a keyword msgid "the argument to bookmark must be a string" @@ -30184,7 +30484,7 @@ #. i18n: "converted" is a keyword msgid "converted takes one or no arguments" -msgstr "converted ã®å¼•æ•°ã¯æœ€å¤§1ã¤ã§ã™" +msgstr "converted ã®å¼•æ•°ã¯ 0 〜 1 個ã§ã™" #. i18n: "converted" is a keyword msgid "converted requires a revision" @@ -30327,8 +30627,8 @@ " limit() 記述ã®åˆ¥å。" #, python-format -msgid "%s takes no arguments or a pattern" -msgstr "%s ã«ã¯å¼•æ•°ã‚„パターンを指定ã§ãã¾ã›ã‚“" +msgid "%s takes no arguments or a pattern and an optional revset" +msgstr "%s ã«ã¯ãƒ‘ターン㨠revset ã—ã‹æŒ‡å®šã§ãã¾ã›ã‚“" #, python-format msgid "%s expected a pattern" @@ -30332,10 +30632,14 @@ #, python-format msgid "%s expected a pattern" -msgstr "%s ã«ã¯ãƒ‘ターンを指定ã—ã¦ãã ã•ã„" - -msgid "" -"``follow([pattern])``\n" +msgstr "%s ã«ã¯ãƒ‘ターン文å—列を指定ã—ã¦ãã ã•ã„" + +#, python-format +msgid "%s expected one starting revision" +msgstr "%s ã«ã¯é–‹å§‹ãƒªãƒ“ジョンを指定ã—ã¦ãã ã•ã„" + +msgid "" +"``follow([pattern[, startrev]])``\n" " An alias for ``::.`` (ancestors of the working directory's first " "parent).\n" " If pattern is specified, the histories of files matching given\n" @@ -30339,7 +30643,7 @@ " An alias for ``::.`` (ancestors of the working directory's first " "parent).\n" " If pattern is specified, the histories of files matching given\n" -" pattern is followed, including copies." -msgstr "" -"``follow([pattern])``\n" +" pattern in the revision given by startrev are followed, including copies." +msgstr "" +"``follow([pattern[, startrev]])``\n" " ``::.`` (作æ¥é ˜åŸŸã®ç¬¬1親ã®ç¥–先リビジョン群) 記述ã®åˆ¥å。\n" @@ -30345,5 +30649,7 @@ " ``::.`` (作æ¥é ˜åŸŸã®ç¬¬1親ã®ç¥–先リビジョン群) 記述ã®åˆ¥å。\n" -" パターン指定ãŒã‚ã‚‹å ´åˆã€ åˆè‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®å±¥æ´ (複製å«ã‚€) を辿りã¾ã™ã€‚" +" パターン指定ãŒã‚ã‚‹å ´åˆã€ åˆè‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®å±¥æ´ (複製å«ã‚€) を辿りã¾ã™ã€‚\n" +" パターンåˆè‡´ã®åˆ¤å®šã¯ã€ 起点リビジョン (startrev åˆã¯ä½œæ¥é ˜åŸŸã®ç¬¬1親)\n" +" 時点ã®ç®¡ç†å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦è¡Œã‚ã‚Œã¾ã™ã€‚" msgid "" "``all()``\n" @@ -30446,7 +30752,7 @@ #. i18n: "limit" is a keyword msgid "limit requires one to three arguments" -msgstr "limit ã®å¼•æ•°ã¯1〜3ã§ã™" +msgstr "limit ã®å¼•æ•°ã¯ 1 〜 3 個ã§ã™" #. i18n: "limit" is a keyword msgid "limit requires a number" @@ -30468,7 +30774,7 @@ #. i18n: "last" is a keyword msgid "last requires one or two arguments" -msgstr "last ã®å¼•æ•°ã¯1ã¤ã¾ãŸã¯2ã¤ã§ã™" +msgstr "last ã®å¼•æ•°ã¯ 1 〜 2 個ã§ã™" #. i18n: "last" is a keyword msgid "last requires a number" @@ -30568,7 +30874,7 @@ #. i18n: "id" is a keyword msgid "id requires one argument" -msgstr "id ã®å¼•æ•°ã¯1ã¤ã§ã™" +msgstr "id ã®å¼•æ•°ã¯1個ã§ã™" #. i18n: "id" is a keyword msgid "id requires a string" @@ -30601,7 +30907,7 @@ #. i18n: "only" is a keyword msgid "only takes one or two arguments" -msgstr "only ã®å¼•æ•°ã¯1ã¤ã¾ãŸã¯2ã¤ã§ã™" +msgstr "only ã®å¼•æ•°ã¯ 1 〜 2 個ã§ã™" msgid "" "``origin([set])``\n" @@ -30632,7 +30938,7 @@ #. i18n: "outgoing" is a keyword msgid "outgoing takes one or no arguments" -msgstr "outgoing ã®å¼•æ•°ã¯æœ€å¤§1ã¤ã§ã™" +msgstr "outgoing ã®å¼•æ•°ã¯ 0 〜 1 個ã§ã™" #. i18n: "outgoing" is a keyword msgid "outgoing requires a repository path" @@ -30725,7 +31031,7 @@ #. i18n: "remote" is a keyword msgid "remote takes zero, one, or two arguments" -msgstr "remote ã®å¼•æ•°ã¯0ã‹ã‚‰2ã¤ã§ã™" +msgstr "remote ã®å¼•æ•°ã¯ 0 〜 2 個ã§ã™" #. i18n: "remote" is a keyword msgid "remote requires a string id" @@ -30755,7 +31061,7 @@ #. i18n: "rev" is a keyword msgid "rev requires one argument" -msgstr "rev ã®å¼•æ•°ã¯1ã¤ã§ã™" +msgstr "rev ã®å¼•æ•°ã¯1個ã§ã™" #. i18n: "rev" is a keyword msgid "rev requires a number" @@ -30821,7 +31127,7 @@ #. i18n: "matching" is a keyword msgid "matching takes 1 or 2 arguments" -msgstr "matching ã®å¼•æ•°ã¯1ã¤ã‹2ã¤ã§ã™" +msgstr "matching ã®å¼•æ•°ã¯ 1 〜 2 個ã§ã™" #. i18n: "matching" is a keyword msgid "matching requires a string as its second argument" @@ -30849,7 +31155,7 @@ #. i18n: "sort" is a keyword msgid "sort requires one or two arguments" -msgstr "sort ã®å¼•æ•°ã¯1ã¤ã¾ãŸã¯2ã¤ã§ã™" +msgstr "sort ã®å¼•æ•°ã¯ 1 〜 2 個ã§ã™" #. i18n: "sort" is a keyword msgid "sort spec must be a string" @@ -30859,6 +31165,7 @@ msgid "unknown sort key %r" msgstr "未知ã®æ•´åˆ—æ–¹å¼ %r" +#. i18n: "topo" is a keyword msgid "topo sort order cannot be combined with other sort keys" msgstr "整列指定 topo ã¨ä»–ã®æ•´åˆ—指定ã¯ä½µç”¨ã§ãã¾ã›ã‚“" @@ -30862,6 +31169,7 @@ msgid "topo sort order cannot be combined with other sort keys" msgstr "整列指定 topo ã¨ä»–ã®æ•´åˆ—指定ã¯ä½µç”¨ã§ãã¾ã›ã‚“" +#. i18n: "topo" and "topo.firstbranch" are keywords msgid "topo.firstbranch can only be used when using the topo sort key" msgstr "topo.firstbranch ã¯æ•´åˆ—指定 topo 指定時ã®ã¿ä½¿ç”¨å¯èƒ½ã§ã™" @@ -30934,7 +31242,7 @@ #. i18n: "tag" is a keyword msgid "tag takes one or no arguments" -msgstr "tagged ã®å¼•æ•°ã¯æœ€å¤§1ã¤ã§ã™" +msgstr "tagged ã®å¼•æ•°ã¯ 0 〜 1 個ã§ã™" #. i18n: "tag" is a keyword msgid "the argument to tag must be a string" @@ -31012,6 +31320,10 @@ msgid "can only have 1 active background file closer" msgstr "(internal error) can only have 1 active background file closer" +#, python-format +msgid "implementation error: mode %s is not valid for checkambig=True" +msgstr "実装エラー: モード %s 指定㯠checkambig=True ã«å¯¾ã—ã¦ä¸é©åˆ‡ã§ã™" + msgid "" "backgroundclose can only be used when a backgroundclosing context manager is " "active" @@ -31455,6 +31767,48 @@ #, python-format msgid "" +" subrepository sources for %(s)s differ\n" +"use (l)ocal%(l)s source (%(lo)s) or (r)emote%(o)s source (%(ro)s)?$$ &Local $" +"$ &Remote" +msgstr "" +" サブリãƒã‚¸ãƒˆãƒª %(s)s ã®é€£æºå…ˆãŒç•°ãªã£ã¦ã„ã¾ã™ã€‚\n" +"ç¾è¡Œå´%(l)s 連æºå…ˆ (%(lo)s):(l)ocal ã¨ã€ä»–æ–¹å´%(o)s 連æºå…ˆ (%(ro)s):(r)emote " +"ã®ã©ã¡ã‚‰ã‚’採用ã—ã¾ã™ã‹ï¼Ÿ$$ &Local $$ &Remote" + +#, python-format +msgid "" +" subrepository %(s)s diverged (local revision: %(sl)s, remote revision: " +"%(sr)s)\n" +"(M)erge, keep (l)ocal%(l)s or keep (r)emote%(o)s?$$ &Merge $$ &Local $$ " +"&Remote" +msgstr "" +" サブリãƒã‚¸ãƒˆãƒª %(s)s ã®å‚照先ãŒç•°ãªã£ã¦ã„ã¾ã™ (ç¾è¡Œå´: %(sl)s, ä»–æ–¹å´: " +"%(sr)s)\n" +"両者ã®ãƒžãƒ¼ã‚¸:(m)erge, ç¾è¡Œå´%(l)s å‚照先:(l)ocal, ä»–æ–¹å´%(o)s å‚照先:(r)" +"emote ã®ã„ãšã‚Œã‚’採用ã—ã¾ã™ã‹ï¼Ÿ$$ &Merge $$ &Local $$ &Remote" + +#, python-format +msgid "" +" local%(l)s changed subrepository %(s)s which remote%(o)s removed\n" +"use (c)hanged version or (d)elete?$$ &Changed $$ &Delete" +msgstr "" +" ç¾è¡Œå´%(l)s ã§ã®ã‚µãƒ–リãƒã‚¸ãƒˆãƒª %(s)s ã®å¤‰æ›´ãŒã€ä»–æ–¹å´%(o)s ã§ã®å‰Šé™¤ã¨è¡çªã—" +"ã¾ã™\n" +"変更:(c)hanged ã¨ã€å‰Šé™¤:(d)elete ã®ã©ã¡ã‚‰ã‚’採用ã—ã¾ã™ã‹ï¼Ÿ$$ &Changed $$ " +"&Delete" + +#, python-format +msgid "" +" remote%(o)s changed subrepository %(s)s which local%(l)s removed\n" +"use (c)hanged version or (d)elete?$$ &Changed $$ &Delete" +msgstr "" +" ä»–æ–¹å´%(o)s ã§ã®ã‚µãƒ–リãƒã‚¸ãƒˆãƒª %(s)s ã®å¤‰æ›´ãŒã€ç¾è¡Œå´%(l)s ã§ã®å‰Šé™¤ã¨è¡çªã—" +"ã¾ã™\n" +"変更:(c)hanged ã¨ã€å‰Šé™¤:(d)elete ã®ã©ã¡ã‚‰ã‚’採用ã—ã¾ã™ã‹ï¼Ÿ$$ &Changed $$ " +"&Delete" + +#, python-format +msgid "" " subrepository sources for %s differ\n" "use (l)ocal source (%s) or (r)emote source (%s)?$$ &Local $$ &Remote" msgstr "" @@ -31458,39 +31812,12 @@ " subrepository sources for %s differ\n" "use (l)ocal source (%s) or (r)emote source (%s)?$$ &Local $$ &Remote" msgstr "" -" サブリãƒã‚¸ãƒˆãƒª %s ã§é€£æºå…ˆã¨ã®å·®åˆ†ãŒæ¤œå‡ºã•ã‚Œã¾ã—ãŸã€‚\n" -"手元(%s):(l)ocal ã¨é€£æºå…ˆ(%s):(r)emote ã®ã©ã¡ã‚‰ã®å†…容を採用ã—ã¾ã™ã‹ï¼Ÿ$$ " -"&Local $$ &Remote" - -#, python-format -msgid "" -" subrepository %s diverged (local revision: %s, remote revision: %s)\n" -"(M)erge, keep (l)ocal or keep (r)emote?$$ &Merge $$ &Local $$ &Remote" -msgstr "" -" サブリãƒã‚¸ãƒˆãƒª %s ã§åˆ†å²ãŒæ¤œå‡ºã•ã‚Œã¾ã—㟠(手元: %s 分å²å…ˆ: %s)\n" -"マージ実施:(m)erge 手元ã®å†…容:(l)ocal 分å²å…ˆã®å†…容:(r)emote ã®ã©ã‚Œã‚’採用ã—ã¾" -"ã™ã‹ï¼Ÿ$$ &Merge $$ &Local $$ &Remote" - -#, python-format -msgid "" -" local changed subrepository %s which remote removed\n" -"use (c)hanged version or (d)elete?$$ &Changed $$ &Delete" -msgstr "" -" サブリãƒã‚¸ãƒˆãƒªã§å¤‰æ›´ã—ãŸãƒ•ã‚¡ã‚¤ãƒ« %s ã¯é€£æºå…ˆã§ç™»éŒ²é™¤å¤–ã•ã‚Œã¦ã„ã¾ã™ã€‚\n" -"変更:(c)hanged ã¨ç™»éŒ²é™¤å¤–:(d)elete ã®ã©ã¡ã‚‰ã‚’採用ã—ã¾ã™ã‹ï¼Ÿ$$ &Changed $$ " -"&Delete" - -#, python-format -msgid "" -" remote changed subrepository %s which local removed\n" -"use (c)hanged version or (d)elete?$$ &Changed $$ &Delete" -msgstr "" -" サブリãƒã‚¸ãƒˆãƒªã§ç™»éŒ²é™¤å¤–ã—ãŸãƒ•ã‚¡ã‚¤ãƒ« %s ã¯é€£æºå…ˆã§å¤‰æ›´ã•ã‚Œã¦ã„ã¾ã™ã€‚\n" -"変更:(c)hanged ã¨ç™»éŒ²é™¤å¤–:(d)elete ã®ã©ã¡ã‚‰ã‚’採用ã—ã¾ã™ã‹ï¼Ÿ$$ &Changed $$ " -"&Delete" +" サブリãƒã‚¸ãƒˆãƒª %s ã®æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ãŒã€å‚照先更新ã®å½±éŸ¿ã‚’å—ã‘ã¾ã™ã€‚\n" +"ç¾è¡Œå†…容 (%s ベース):(l)ocal ã¨ã€ ä»–æ–¹å´å‚照先 (%s):(r)emote ã®ã©ã¡ã‚‰ã‚’採用ã—" +"ã¾ã™ã‹ï¼Ÿ$$ &Local $$ &Remote" #, python-format msgid "" " subrepository sources for %s differ (in checked out version)\n" "use (l)ocal source (%s) or (r)emote source (%s)?$$ &Local $$ &Remote" msgstr "" @@ -31491,12 +31818,12 @@ #, python-format msgid "" " subrepository sources for %s differ (in checked out version)\n" "use (l)ocal source (%s) or (r)emote source (%s)?$$ &Local $$ &Remote" msgstr "" -" サブリãƒã‚¸ãƒˆãƒª %s ã®ä½œæ¥é ˜åŸŸã§å·®åˆ†ãŒæ¤œå‡ºã•ã‚Œã¾ã—ãŸ\n" -"手元(%s):(l)ocal ã¨é€£æºå…ˆ(%s):(r)emote ã®ã©ã¡ã‚‰ã‚’採用ã—ã¾ã™ã‹ï¼Ÿ$$ &Local $$ " -"&Remote" +" サブリãƒã‚¸ãƒˆãƒª %s ã®å†…容ãŒã€ç•°ãªã‚‹å‚照先ã§æ›´æ–°ã•ã‚Œã¦ã„ã¾ã™ã€‚\n" +"ç¾è¡Œå†…容 (%s):(l)ocal ã¨ã€ä»–æ–¹å´å‚照先 (%s):(r)emote ã®ã©ã¡ã‚‰ã‚’採用ã—ã¾ã™ã‹ï¼Ÿ" +"$$ &Local $$ &Remote" msgid "default path for subrepository not found" msgstr "サブリãƒã‚¸ãƒˆãƒªã®é€£æºå…ˆãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" @@ -32077,8 +32404,8 @@ msgid ":tags: List of strings. Any tags associated with the changeset." msgstr ":tags: æ–‡å—列列挙。 当該リビジョンã«ä»˜ä¸Žã•ã‚ŒãŸã‚¿ã‚°ã®ä¸€è¦§ã€‚" -msgid "integer literal without digits" -msgstr "数値ã®æŒ‡å®šãŒã‚ã‚Šã¾ã›ã‚“" +msgid ":termwidth: Integer. The width of the current terminal." +msgstr ":termwidth: 整数。 端末ã®è¡¨ç¤ºã‚«ãƒ©ãƒ 数。" msgid "unterminated template expansion" msgstr "テンプレート定義ãŒçµ‚端ã—ã¦ã„ã¾ã›ã‚“" @@ -32114,5 +32441,14 @@ msgid "%r is not iterable" msgstr "%r ã«ã¯ãƒªã‚¹ãƒˆå‡¦ç†ã‚’é©ç”¨ã§ãã¾ã›ã‚“" +msgid "negation needs an integer argument" +msgstr "è² å€¤æŒ‡å®šã¯æ•´æ•°å€¤ã«å¯¾ã—ã¦ã®ã¿æœ‰åŠ¹ã§ã™" + +msgid "arithmetic only defined on integers" +msgstr "算術演算ã¯æ•´æ•°å€¤ã«å¯¾ã—ã¦ã®ã¿æœ‰åŠ¹ã§ã™" + +msgid "division by zero is not defined" +msgstr "0 ã§ã®é™¤ç®—ã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™" + #, python-format msgid "filter %s expects one argument" @@ -32117,6 +32453,6 @@ #, python-format msgid "filter %s expects one argument" -msgstr "フィルタ %s ã¯å¼•æ•°ãŒ1ã¤å¿…è¦ã§ã™" +msgstr "フィルタ %s ã®å¼•æ•°ã¯1個ã§ã™" msgid "" ":date(date[, fmt]): Format a date. See :hg:`help dates` for formatting\n" @@ -32130,7 +32466,7 @@ #. i18n: "date" is a keyword msgid "date expects one or two arguments" -msgstr "date ã®å¼•æ•°ã¯1ã¤ã¾ãŸã¯2ã¤ã§ã™" +msgstr "date ã®å¼•æ•°ã¯ 1 〜 2 個ã§ã™" #. i18n: "date" is a keyword msgid "date expects a date information" @@ -32145,7 +32481,19 @@ #. i18n: "diff" is a keyword msgid "diff expects zero, one, or two arguments" -msgstr "diff ã®å¼•æ•°ã¯æœ€å¤§ï¼’ã¤ã§ã™" +msgstr "diff ã®å¼•æ•°ã¯ 0 〜 2 個ã§ã™" + +msgid "" +":files(pattern): All files of the current changeset matching the pattern. " +"See\n" +" :hg:`help patterns`." +msgstr "" +":files(pattern): 当該リビジョンã§ãƒ‘ターンã«åˆè‡´ã™ã‚‹åå‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã€‚\n" +" パターン指定ã®è©³ç´°ã¯ :hg:`help patterns` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" + +#. i18n: "files" is a keyword +msgid "files expects one argument" +msgstr "files ã®å¼•æ•°ã¯1個ã§ã™" msgid "" ":fill(text[, width[, initialident[, hangindent]]]): Fill many\n" @@ -32156,10 +32504,10 @@ #. i18n: "fill" is a keyword msgid "fill expects one to four arguments" -msgstr "fill ã®å¼•æ•°ã¯1ã¤ã‹ã‚‰4ã¤ã®é–“ã§ã™" +msgstr "fill ã®å¼•æ•°ã¯ 1 〜 4 個ã§ã™" #. i18n: "fill" is a keyword msgid "fill expects an integer width" msgstr "fill ã«ã¯æ•°å€¤ã‚’指定ã—ã¦ãã ã•ã„" msgid "" @@ -32160,9 +32508,9 @@ #. i18n: "fill" is a keyword msgid "fill expects an integer width" msgstr "fill ã«ã¯æ•°å€¤ã‚’指定ã—ã¦ãã ã•ã„" msgid "" -":pad(text, width[, fillchar=' '[, right=False]]): Pad text with a\n" +":pad(text, width[, fillchar=' '[, left=False]]): Pad text with a\n" " fill character." msgstr "" @@ -32167,7 +32515,7 @@ " fill character." msgstr "" -":pad(text, width[, fillchar=' '[, right=False]]): fillchar æ–‡å—ã§\n" +":pad(text, width[, fillchar=' '[, left=False]]): fillchar æ–‡å—ã§\n" " text ã‚’ width å¹…ã«å—è©°ã‚ã—ã¾ã™ã€‚" #. i18n: "pad" is a keyword msgid "pad() expects two to four arguments" @@ -32170,8 +32518,8 @@ " text ã‚’ width å¹…ã«å—è©°ã‚ã—ã¾ã™ã€‚" #. i18n: "pad" is a keyword msgid "pad() expects two to four arguments" -msgstr "pad() ã®å¼•æ•°ã¯2ã¤ã‹ã‚‰4ã¤ã®é–“ã§ã™" +msgstr "pad() ã®å¼•æ•°ã¯ 2 〜 4 個ã§ã™" #. i18n: "pad" is a keyword msgid "pad() expects an integer width" @@ -32189,7 +32537,7 @@ #. i18n: "indent" is a keyword msgid "indent() expects two or three arguments" -msgstr "indent() ã¯2ã¾ãŸã¯3ã®å¼•æ•°ãŒå¿…è¦ã§ã™" +msgstr "indent() ã®å¼•æ•°ã¯ 2 〜 3 個ã§ã™" msgid "" ":get(dict, key): Get an attribute/key from an object. Some keywords\n" @@ -32201,7 +32549,7 @@ #. i18n: "get" is a keyword msgid "get() expects two arguments" -msgstr "get() ã®å¼•æ•°ã¯2ã¤ã§ã™" +msgstr "get() ã®å¼•æ•°ã¯2個ã§ã™" #. i18n: "get" is a keyword msgid "get() expects a dict as first argument" @@ -32215,14 +32563,15 @@ #. i18n: "if" is a keyword msgid "if expects two or three arguments" -msgstr "if ã¯2ã¾ãŸã¯3ã®å¼•æ•°ãŒå¿…è¦ã§ã™" - -msgid "" -":ifcontains(search, thing, then[, else]): Conditionally execute based\n" -" on whether the item \"search\" is in \"thing\"." -msgstr "" -":ifcontains(search, thing, then[, else]): \"search\" çµæžœãŒ \"thing\"\n" -" ã«å«ã¾ã‚Œã‚‹ã‹å¦ã‹ã«å¿œã˜ã¦ then ã¾ãŸã¯ else を実施ã—ã¾ã™ã€‚" +msgstr "if ã®å¼•æ•°ã¯ 2 〜 3 個ã§ã™" + +msgid "" +":ifcontains(needle, haystack, then[, else]): Conditionally execute based\n" +" on whether the item \"needle\" is in \"haystack\"." +msgstr "" +":ifcontains(needle, haystack, then[, else]): needle 評価値㌠haystack\n" +" 評価値ã«å«ã¾ã‚Œã‚‹ã‹å¦ã‹ã«å¿œã˜ã¦ then ã¾ãŸã¯ else を実施ã—ã¾ã™ã€‚\n" +" (※ 訳注: needle in haystack ã§ã€Œå¹²è‰ã®å±±ã®ä¸ã®é‡ã€)" #. i18n: "ifcontains" is a keyword msgid "ifcontains expects three or four arguments" @@ -32226,7 +32575,7 @@ #. i18n: "ifcontains" is a keyword msgid "ifcontains expects three or four arguments" -msgstr "ifcontains ã¯3ã¾ãŸã¯4ã®å¼•æ•°ãŒå¿…è¦ã§ã™" +msgstr "ifcontains ã®å¼•æ•°ã¯ 3 〜 4 個ã§ã™" msgid "" ":ifeq(expr1, expr2, then[, else]): Conditionally execute based on\n" @@ -32237,10 +32586,10 @@ #. i18n: "ifeq" is a keyword msgid "ifeq expects three or four arguments" -msgstr "ifeq ã¯3ã¾ãŸã¯4ã®å¼•æ•°ãŒå¿…è¦ã§ã™" +msgstr "ifeq ã®å¼•æ•°ã¯ 3 〜 4 個ã§ã™" msgid ":join(list, sep): Join items in a list with a delimiter." msgstr ":join(list, sep): list ä¸ã®è¦ç´ ã‚’ sep ã§é€£çµã—ã¾ã™ã€‚" #. i18n: "join" is a keyword msgid "join expects one or two arguments" @@ -32241,10 +32590,10 @@ msgid ":join(list, sep): Join items in a list with a delimiter." msgstr ":join(list, sep): list ä¸ã®è¦ç´ ã‚’ sep ã§é€£çµã—ã¾ã™ã€‚" #. i18n: "join" is a keyword msgid "join expects one or two arguments" -msgstr "join ã®å¼•æ•°ã¯1ã¤ã¾ãŸã¯2ã¤ã§ã™" +msgstr "join ã®å¼•æ•°ã¯ 1 〜 2 個ã§ã™" msgid "" ":label(label, expr): Apply a label to generated content. Content with\n" @@ -32256,7 +32605,7 @@ #. i18n: "label" is a keyword msgid "label expects two arguments" -msgstr "label ã®å¼•æ•°ã¯2ã¤ã§ã™" +msgstr "label ã®å¼•æ•°ã¯2個ã§ã™" msgid "" ":latesttag([pattern]): The global tags matching the given pattern on the\n" @@ -32267,7 +32616,7 @@ #. i18n: "latesttag" is a keyword msgid "latesttag expects at most one argument" -msgstr "latesttag ã®å¼•æ•°ã¯æœ€å¤§ï¼‘ã¤ã§ã™" +msgstr "latesttag ã®å¼•æ•°ã¯ 0 〜 1 個ã§ã™" msgid "" ":localdate(date[, tz]): Converts a date to the specified timezone.\n" @@ -32278,7 +32627,7 @@ #. i18n: "localdate" is a keyword msgid "localdate expects one or two arguments" -msgstr "localdate ã®å¼•æ•°ã¯1ã¤ã¾ãŸã¯2ã¤ã§ã™" +msgstr "localdate ã®å¼•æ•°ã¯ 1 〜 2 個ã§ã™" #. i18n: "localdate" is a keyword msgid "localdate expects a date information" @@ -32288,6 +32637,23 @@ msgid "localdate expects a timezone" msgstr "localdate ã®å…¥åŠ›ã«ã¯ã‚¿ã‚¤ãƒ ゾーンを与ãˆã¦ãã ã•ã„" +msgid ":mod(a, b): Calculate a mod b such that a / b + a mod b == a" +msgstr ":mod(a, b): a ã‚’ b ã§é™¤ç®—ã—ãŸä½™ã‚Šå€¤ (a / b + a mod b == a)。" + +#. i18n: "mod" is a keyword +msgid "mod expects two arguments" +msgstr "mod ã®å¼•æ•°ã¯2個ã§ã™" + +msgid "" +":relpath(path): Convert a repository-absolute path into a filesystem path " +"relative to\n" +" the current working directory." +msgstr ":relpath(path): リãƒã‚¸ãƒˆãƒªç›¸å¯¾ãƒ‘スã‹ã‚‰ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªç›¸å¯¾ãƒ‘スã¸ã®å¤‰æ›ã€‚" + +#. i18n: "relpath" is a keyword +msgid "relpath expects one argument" +msgstr "relpath ã®å¼•æ•°ã¯1個ã§ã™" + msgid "" ":revset(query[, formatargs...]): Execute a revision set query. See\n" " :hg:`help revset`." @@ -32297,10 +32663,10 @@ #. i18n: "revset" is a keyword msgid "revset expects one or more arguments" -msgstr "revset ã®å¼•æ•°ã¯1ã¤ã¾ãŸã¯2ã¤ã§ã™" +msgstr "revset ã®å¼•æ•°ã¯1個以上ã§ã™" msgid ":rstdoc(text, style): Format ReStructuredText." msgstr ":rstdoc(text, style): 出力を ReStructuredText ã¨ã—ã¦æ•´å½¢ã—ã¾ã™ã€‚" #. i18n: "rstdoc" is a keyword msgid "rstdoc expects two arguments" @@ -32301,13 +32667,13 @@ msgid ":rstdoc(text, style): Format ReStructuredText." msgstr ":rstdoc(text, style): 出力を ReStructuredText ã¨ã—ã¦æ•´å½¢ã—ã¾ã™ã€‚" #. i18n: "rstdoc" is a keyword msgid "rstdoc expects two arguments" -msgstr "rstdoc ã®å¼•æ•°ã¯2ã¤ã§ã™" +msgstr "rstdoc ã®å¼•æ•°ã¯2個ã§ã™" msgid ":separate(sep, args): Add a separator between non-empty arguments." msgstr ":separate(sep, args): éžç©ºãª args è¦ç´ ã‚’åŒºåˆ‡ã‚Šæ–‡å— sep ã§é€£çµã—ã¾ã™ã€‚" #. i18n: "separate" is a keyword msgid "separate expects at least one argument" @@ -32308,10 +32674,10 @@ msgid ":separate(sep, args): Add a separator between non-empty arguments." msgstr ":separate(sep, args): éžç©ºãª args è¦ç´ ã‚’åŒºåˆ‡ã‚Šæ–‡å— sep ã§é€£çµã—ã¾ã™ã€‚" #. i18n: "separate" is a keyword msgid "separate expects at least one argument" -msgstr "separate ã«ã¯æœ€ä½Ž1ã¤ã®å¼•æ•°ãŒå¿…è¦ã§ã™" +msgstr "separate ã®å¼•æ•°ã¯1個以上ã§ã™" msgid "" ":shortest(node, minlength=4): Obtain the shortest representation of\n" @@ -32322,7 +32688,7 @@ #. i18n: "shortest" is a keyword msgid "shortest() expects one or two arguments" -msgstr "shortest() ã®å¼•æ•°ã¯1ã¤ã¾ãŸã¯2ã¤ã§ã™" +msgstr "shortest() ã®å¼•æ•°ã¯ 1 〜 2 個ã§ã™" #. i18n: "shortest" is a keyword msgid "shortest() expects an integer minlength" @@ -32337,7 +32703,7 @@ #. i18n: "strip" is a keyword msgid "strip expects one or two arguments" -msgstr "strip ã®å¼•æ•°ã¯1ã¤ã¾ãŸã¯2ã¤ã§ã™" +msgstr "strip ã®å¼•æ•°ã¯ 1 〜 2 個ã§ã™" msgid "" ":sub(pattern, replacement, expression): Perform text substitution\n" @@ -32347,7 +32713,7 @@ #. i18n: "sub" is a keyword msgid "sub expects three arguments" -msgstr "sub ã¯å¼•æ•°ãŒ3ã¤å¿…è¦ã§ã™" +msgstr "sub ã®å¼•æ•°ã¯3個ã§ã™" #. i18n: "sub" is a keyword #, python-format @@ -32368,7 +32734,7 @@ #. i18n: "startswith" is a keyword msgid "startswith expects two arguments" -msgstr "startswith ã®å¼•æ•°ã¯2ã¤ã§ã™" +msgstr "startswith ã®å¼•æ•°ã¯2個ã§ã™" msgid ":word(number, text[, separator]): Return the nth word from a string." msgstr "" @@ -32377,7 +32743,7 @@ #. i18n: "word" is a keyword #, python-format msgid "word expects two or three arguments, got %d" -msgstr "word ã¯2ã¾ãŸã¯3ã®å¼•æ•°ãŒå¿…è¦ã§ã™ (実際ã®å¼•æ•°ã¯ %d 個)" +msgstr "word ã®å¼•æ•°ã¯ 2 〜 3 個ã§ã™ (指定ã•ã‚ŒãŸå¼•æ•°ã¯ %d 個)" #. i18n: "word" is a keyword msgid "word expects an integer index" @@ -32626,8 +32992,8 @@ msgstr "ä¸æ£ãªæ—¥ä»˜ã®æŒ‡å®šã§ã™: %s" #, python-format -msgid "%s must be nonnegative (see \"hg help dates\")" -msgstr "%s ã«ã¯æ£ã®å€¤ã‚’指定ã—ã¦ãã ã•ã„ (\"hg help dates\" å‚ç…§)" +msgid "%s must be nonnegative (see 'hg help dates')" +msgstr "%s ã«ã¯æ£ã®å€¤ã‚’指定ã—ã¦ãã ã•ã„ ('hg help dates' å‚ç…§)" #, python-format msgid "invalid regular expression: %s"