diff --git a/i18n/ja.po b/i18n/ja.po index b018fd7a089e8e43987d0366b823ce9d8e4864ed_aTE4bi9qYS5wbw==..b7fc9c6df13c741fac5514818719499225dc5f29_aTE4bi9qYS5wbw== 100644 --- a/i18n/ja.po +++ b/i18n/ja.po @@ -1,7 +1,7 @@ # Japanese translation for Mercurial # Mercurial 日本語翻訳 # -# Copyright (C) 2009-2013 the Mercurial team +# Copyright (C) 2009-2014 the Mercurial team # # ======================================== # ã€ç¿»è¨³ç”¨èªžé›†ã€‘ @@ -149,8 +149,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2014-03-31 19:44+0900\n" -"PO-Revision-Date: 2014-03-31 20:11+0900\n" +"POT-Creation-Date: 2014-04-30 22:52+0900\n" +"PO-Revision-Date: 2014-04-30 23:08+0900\n" "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -343,9 +343,6 @@ "è¨å®šä¾‹\n" "------" -msgid "::" -msgstr "::" - msgid " [hooks]" msgstr " [hooks]" @@ -1763,6 +1760,9 @@ msgid "TYPE" msgstr "種別" +msgid "available colors:\n" +msgstr "利用å¯èƒ½ãªè‰²æŒ‡å®š:\n" + msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "ä»–ã®æ§‹æˆç®¡ç†ãƒ„ールã‹ã‚‰ Mercurial ã¸ã®å±¥æ´å–ã‚Šè¾¼ã¿" @@ -2440,8 +2440,8 @@ msgstr "è¦æ±‚ã•ã‚ŒãŸãƒ„ール '%s' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" #, python-format -msgid "splicemap entry %s is not a valid revision identifier" -msgstr "splicemap ã®ã‚¨ãƒ³ãƒˆãƒª %s ã¯æœ‰åŠ¹ãªãƒªãƒ“ジョンã§ã¯ã‚ã‚Šã¾ã›ã‚“" +msgid "%s entry %s is not a valid revision identifier" +msgstr "%s ä¸ã®ã‚¨ãƒ³ãƒˆãƒª %s ã¯æœ‰åŠ¹ãªãƒªãƒ“ジョンè˜åˆ¥åã§ã¯ã‚ã‚Šã¾ã›ã‚“" #, python-format msgid "%s error:\n" @@ -3072,9 +3072,6 @@ " [repository]\n" " native = LF" -msgid ".. note::" -msgstr ".. note::" - msgid "" " The rules will first apply when files are touched in the working\n" " copy, e.g. by updating to null and back to tip to touch all files." @@ -4055,6 +4052,8 @@ msgid "" " # Edit history between c561b4e977df and 7c2fd3b9020c\n" " #\n" +" # Commits are listed from least to most recent\n" +" #\n" " # Commands:\n" " # p, pick = use commit\n" " # e, edit = use commit, but stop for amending\n" @@ -4058,11 +4057,10 @@ " # Commands:\n" " # p, pick = use commit\n" " # e, edit = use commit, but stop for amending\n" -" # f, fold = use commit, but fold into previous commit (combines N and " -"N-1)\n" +" # f, fold = use commit, but combine it with the one above\n" " # d, drop = remove commit from history\n" " # m, mess = edit message without changing commit content\n" " #" msgstr "" " # c561b4e977df ã‹ã‚‰ 7c2fd3b9020c ã«ã‹ã‘ã¦ã®å±¥æ´ã®ç·¨é›†\n" " #\n" @@ -4063,9 +4061,11 @@ " # d, drop = remove commit from history\n" " # m, mess = edit message without changing commit content\n" " #" msgstr "" " # c561b4e977df ã‹ã‚‰ 7c2fd3b9020c ã«ã‹ã‘ã¦ã®å±¥æ´ã®ç·¨é›†\n" " #\n" +" # 対象一覧ã¯ã€ãƒªãƒ“ジョン番å·ã®æ˜‡é † (å¤ã„æ–¹ã‹ã‚‰æ–°ã—ã„æ–¹) ã«ãªã£ã¦ã„ã¾ã™ã€‚\n" +" #\n" " # 指定å¯èƒ½ã‚³ãƒžãƒ³ãƒ‰:\n" " # p, pick = リビジョンを採用\n" " # e, edit = リビジョンを採用: 但ã—ä¿®æ£ã®ãŸã‚ã«ä¸€æ—¦å®Ÿè¡Œã‚’ä¸æ–\n" @@ -4069,8 +4069,7 @@ " # 指定å¯èƒ½ã‚³ãƒžãƒ³ãƒ‰:\n" " # p, pick = リビジョンを採用\n" " # e, edit = リビジョンを採用: 但ã—ä¿®æ£ã®ãŸã‚ã«ä¸€æ—¦å®Ÿè¡Œã‚’ä¸æ–\n" -" # f, fold = リビジョンを採用: 但ã—ç›´å‰ã®ãƒªãƒ“ジョンã«ä½µåˆ\n" -" # (ã“ã®ãƒªãƒ“ジョン㌠N 番目ãªã‚‰ã€N - 1 番目ã«ä½µåˆ)\n" +" # f, fold = リビジョンを採用: 但ã—ç›´å‰(ï¼ ä¸€è¦§ã§ã®ä¸Š)ã®ãƒªãƒ“ジョンã«ä½µåˆ\n" " # d, drop = ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã‚’ç ´æ£„\n" " # m, mess = 変更内容をç¶æŒã—ã¤ã¤ã€ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã‚’ä¿®æ£\n" " #" @@ -4279,6 +4278,8 @@ msgid "" "# Edit history between %s and %s\n" "#\n" +"# Commits are listed from least to most recent\n" +"#\n" "# Commands:\n" "# p, pick = use commit\n" "# e, edit = use commit, but stop for amending\n" @@ -4282,10 +4283,10 @@ "# Commands:\n" "# p, pick = use commit\n" "# e, edit = use commit, but stop for amending\n" -"# f, fold = use commit, but fold into previous commit (combines N and N-1)\n" +"# f, fold = use commit, but combine it with the one above\n" "# d, drop = remove commit from history\n" "# m, mess = edit message without changing commit content\n" "#\n" msgstr "" "# %s ã‹ã‚‰ %s ã«ã‹ã‘ã¦ã®å±¥æ´ã®ç·¨é›†\n" "#\n" @@ -4286,9 +4287,11 @@ "# d, drop = remove commit from history\n" "# m, mess = edit message without changing commit content\n" "#\n" msgstr "" "# %s ã‹ã‚‰ %s ã«ã‹ã‘ã¦ã®å±¥æ´ã®ç·¨é›†\n" "#\n" +"# 対象一覧ã¯ã€ãƒªãƒ“ジョン番å·ã®æ˜‡é † (å¤ã„æ–¹ã‹ã‚‰æ–°ã—ã„æ–¹) ã«ãªã£ã¦ã„ã¾ã™ã€‚\n" +"#\n" "# 指定å¯èƒ½ã‚³ãƒžãƒ³ãƒ‰:\n" "# p, pick = リビジョンを採用\n" "# e, edit = リビジョンを採用: 但ã—ä¿®æ£ã®ãŸã‚ã«ä¸€æ—¦å®Ÿè¡Œã‚’ä¸æ–\n" @@ -4292,8 +4295,7 @@ "# 指定å¯èƒ½ã‚³ãƒžãƒ³ãƒ‰:\n" "# p, pick = リビジョンを採用\n" "# e, edit = リビジョンを採用: 但ã—ä¿®æ£ã®ãŸã‚ã«ä¸€æ—¦å®Ÿè¡Œã‚’ä¸æ–\n" -"# f, fold = リビジョンを採用: 但ã—ç›´å‰ã®ãƒªãƒ“ジョンã«ä½µåˆ\n" -"# (ã“ã®ãƒªãƒ“ジョン㌠N 番目ãªã‚‰ã€N - 1 番目ã«ä½µåˆ)\n" +"# f, fold = リビジョンを採用: 但ã—ç›´å‰(ï¼ ä¸€è¦§ã§ã®ä¸Š)ã®ãƒªãƒ“ジョンã«ä½µåˆ\n" "# d, drop = ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã‚’ç ´æ£„\n" "# m, mess = 変更内容をç¶æŒã—ã¤ã¤ã€ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã‚’ä¿®æ£\n" "#\n" @@ -4427,6 +4429,9 @@ msgid "histedit requires exactly one ancestor revision" msgstr "å±¥æ´æ”¹å¤‰ã«ã¯å˜ä¸€ã®ç¥–先リビジョンを指定ã—ã¦ãã ã•ã„" +msgid "The specified revisions must have exactly one common root" +msgstr "指定リビジョン群ã¯ã€å˜ä¸€ã®å…±é€šç¥–先リビジョンをæŒã¤å¿…è¦ãŒã‚ã‚Šã¾ã™" + #, python-format msgid "%s is not an ancestor of working directory" msgstr "%s ã¯ä½œæ¥é ˜åŸŸã®ç¥–å…ˆã§ã¯ã‚ã‚Šã¾ã›ã‚“" @@ -4489,203 +4494,6 @@ msgid "use 'hg histedit --continue' or 'hg histedit --abort'" msgstr "'hg histedit --continue' ã‹ 'hg histedit --abort' を実施ã—ã¦ãã ã•ã„" -msgid "accelerate status report using Linux's inotify service" -msgstr "Linux ã® inoitfy サービスã«ã‚ˆã‚‹çŠ¶æ…‹å ±å‘Šã®é«˜é€ŸåŒ–" - -msgid "start an inotify server for this repository" -msgstr "リãƒã‚¸ãƒˆãƒªã«å¯¾ã™ã‚‹ inotify サーãƒã®èµ·å‹•" - -msgid "debugging information for inotify extension" -msgstr "inotify エクステンションå‘ã‘デãƒãƒƒã‚°æƒ…å ±" - -msgid "" -" Prints the list of directories being watched by the inotify server.\n" -" " -msgstr "" -" inotify サーãƒã®ç›£è¦–対象ディレクトリを一覧表示ã—ã¾ã™ã€‚\n" -" " - -msgid "directories being watched:\n" -msgstr "監視対象ディレクトリ:\n" - -msgid "run server in background" -msgstr "ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ã§ã®ã‚µãƒ¼ãƒå®Ÿè¡Œ" - -msgid "used internally by daemon mode" -msgstr "(ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰å®Ÿè¡Œæ™‚ã§ã®å†…部用途å‘ã‘)" - -msgid "minutes to sit idle before exiting" -msgstr "終了å‰ã®ã‚¢ã‚¤ãƒ‰ãƒªãƒ³ã‚°å¾…機時間(å˜ä½:分)" - -msgid "name of file to write process ID to" -msgstr "プãƒã‚»ã‚¹IDã®æ›¸ã出ã—先ファイル" - -msgid "hg inserve [OPTION]..." -msgstr "hg inserve [OPTION]..." - -msgid "inotify-client: found dead inotify server socket; removing it\n" -msgstr "inotify-client:無効㪠inotify サーãƒã‚½ã‚±ãƒƒãƒˆã‚’検出ã—ãŸã®ã§å‰Šé™¤ã—ã¾ã™\n" - -#, python-format -msgid "inotify-client: could not start inotify server: %s\n" -msgstr "inotify-client: inotify サーãƒã®èµ·å‹•ã«å¤±æ•—: %s\n" - -#, python-format -msgid "inotify-client: could not talk to new inotify server: %s\n" -msgstr "inotify-client: æ–°è¦ inotify サーãƒã¨ã®é€£æºã«å¤±æ•—: %s\n" - -#, python-format -msgid "inotify-client: failed to contact inotify server: %s\n" -msgstr "inotify-client: inotify サーãƒã¨ã®é€£æºã«å¤±æ•—: %s\n" - -msgid "inotify-client: received empty answer from inotify server" -msgstr "inotify-client: inotify サーãƒã‹ã‚‰ã®ç©ºå¿œç”ã‚’å—ä¿¡" - -#, python-format -msgid "(inotify: received response from incompatible server version %d)\n" -msgstr "(inotify: 互æ›æ€§ã®ç„¡ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %d ã®ã‚µãƒ¼ãƒå¿œç”ã‚’å—ç†)\n" - -#, python-format -msgid "(inotify: received '%s' response when expecting '%s')\n" -msgstr "(inotify: 想定外㮠'%s' å¿œç”ã‚’å—ç†ã€‚ 想定応ç”㯠'%s')\n" - -msgid "this system does not seem to support inotify" -msgstr "ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã§ã¯ inotify ã¯åˆ©ç”¨ã§ããªã„よã†ã«è¦‹ãˆã¾ã™" - -#, python-format -msgid "*** the current per-user limit on the number of inotify watches is %s\n" -msgstr "*** inotify ã®ãƒ¦ãƒ¼ã‚¶æ¯Žç›£è¦–対象上é™æ•°ã¯ %s\n" - -msgid "*** this limit is too low to watch every directory in this repository\n" -msgstr "*** ã“ã®ä¸Šé™ã¯ä½œæ¥é ˜åŸŸã®å…¨ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®ç›£è¦–ã«ã¯å°‘ãªã™ãŽã¾ã™\n" - -msgid "*** counting directories: " -msgstr "*** ディレクトリã®è¨ˆä¸Šä¸: " - -#, python-format -msgid "found %d\n" -msgstr "%d 個ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’検出\n" - -#, python-format -msgid "*** to raise the limit from %d to %d (run as root):\n" -msgstr "*** 上é™ã‚’ %d ã‹ã‚‰ %d ã«ä¸Šã’ã¦ãã ã•ã„(root 権é™ãŒå¿…è¦):\n" - -#, python-format -msgid "*** echo %d > %s\n" -msgstr "*** echo %d > %s\n" - -#, python-format -msgid "cannot watch %s until inotify watch limit is raised" -msgstr "inotify ã®ç›£è¦–対象上é™ãŒä¸ŠãŒã‚‹ã¾ã§ã¯ %s を監視ã§ãã¾ã›ã‚“" - -#, python-format -msgid "inotify service not available: %s" -msgstr "inotify サービスãŒä½¿ç”¨ã§ãã¾ã›ã‚“: %s" - -#, python-format -msgid "watching %r\n" -msgstr "%r を監視\n" - -#, python-format -msgid "watching directories under %r\n" -msgstr "%r é…下ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’監視\n" - -#, python-format -msgid "%s event: created %s\n" -msgstr "イベント %s: %s を作æˆ\n" - -#, python-format -msgid "%s event: deleted %s\n" -msgstr "イベント %s: %s を削除\n" - -#, python-format -msgid "%s event: modified %s\n" -msgstr "イベント %s: %s を変更\n" - -#, python-format -msgid "filesystem containing %s was unmounted\n" -msgstr "%s ã‚’å«ã‚€ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ ãŒæœªãƒžã‚¦ãƒ³ãƒˆã§ã™\n" - -#, python-format -msgid "%s readable: %d bytes\n" -msgstr "%s: èªã¿è¾¼ã¿å¯èƒ½: %d ãƒã‚¤ãƒˆ\n" - -#, python-format -msgid "%s below threshold - unhooking\n" -msgstr "%s: 閾値未満 - ãƒãƒƒã‚¯è§£æ”¾\n" - -#, python-format -msgid "%s reading %d events\n" -msgstr "%s: %d 個ã®ã‚¤ãƒ™ãƒ³ãƒˆèªã¿è¾¼ã¿ä¸\n" - -#, python-format -msgid "%s hooking back up with %d bytes readable\n" -msgstr "%s: èªã¿è¾¼ã¿å¯èƒ½ãª %d ãƒã‚¤ãƒˆã®ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—をフック\n" - -msgid "finished setup\n" -msgstr "セットアップを終了ã—ã¾ã—ãŸ\n" - -#, python-format -msgid "status: %r %s -> %s\n" -msgstr "status: %r %s -> %s\n" - -msgid "rescanning due to .hgignore change\n" -msgstr ".hgignore 変更ã«ä»˜ãå†èµ°æŸ»ä¸\n" - -msgid "cannot start: socket is already bound" -msgstr "ソケットãŒæ—¢ã«ãƒã‚¤ãƒ³ãƒ‰ã•ã‚Œã¦ã„ã‚‹ãŸã‚開始ã§ãã¾ã›ã‚“" - -#, python-format -msgid "answering query for %r\n" -msgstr "%r ã¸ã®å•ã„åˆã‚ã›ã«è¿”ç”ä¸\n" - -#, python-format -msgid "received query from incompatible client version %d\n" -msgstr "互æ›æ€§ã®ç„¡ã„クライアントãƒãƒ¼ã‚¸ãƒ§ãƒ³ %d ã‹ã‚‰ã®å•ã„åˆã‚ã›ã‚’å—ä¿¡\n" - -#, python-format -msgid "unrecognized query type: %s\n" -msgstr "未知ã®å•ã„åˆã‚ã›ç¨®åˆ¥: %s\n" - -msgid "expand expressions into changelog and summaries" -msgstr "コミットãƒã‚°ä¸ã®è¨˜è¿°ã®å±•é–‹" - -msgid "" -"This extension allows the use of a special syntax in summaries, which\n" -"will be automatically expanded into links or any other arbitrary\n" -"expression, much like InterWiki does." -msgstr "" -"本エクステンションã¯ã€ リンクãªã‚Šä»»æ„ã®å¼ã®å½¢å¼ã¸ã¨è‡ªå‹•çš„ã«å¤‰æ›ã•ã‚Œã‚‹\n" -"InterWiki ã®ã‚ˆã†ãªç‰¹åˆ¥ãªæ›¸å¼ã‚’用ã„ãŸã‚³ãƒŸãƒƒãƒˆãƒã‚°ã®è¨˜è¿°ã‚’å¯èƒ½ã«ã—ã¾ã™ã€‚" - -msgid "" -"A few example patterns (link to bug tracking, etc.) that may be used\n" -"in your hgrc::" -msgstr "" -"ãƒã‚°ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ ã¨ã®é€£æºã§ä½¿ç”¨ã•ã‚Œã‚‹ã‚ˆã†ãªãƒ‘ターンをè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã§\n" -"記述ã™ã‚‹ä¾‹ã‚’以下ã«ç¤ºã—ã¾ã™::" - -msgid "" -" [interhg]\n" -" issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" -" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" -"i\n" -" boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" -msgstr "" -" [interhg]\n" -" issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" -" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" -"i\n" -" boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" - -#, python-format -msgid "interhg: invalid pattern for %s: %s\n" -msgstr "interhg: %s ã®ãƒ‘ターンãŒä¸æ£ã§ã™: %s\n" - -#, python-format -msgid "interhg: invalid regexp for %s: %s\n" -msgstr "interhg: %s ã®æ£è¦è¡¨ç¾ãŒä¸æ£ã§ã™: %s\n" - msgid "expand keywords in tracked files" msgstr "構æˆç®¡ç†å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ä¸ã®ã‚ーワード展開" @@ -5272,9 +5080,6 @@ " 連æºå…ˆãŒçœç•¥ã•ã‚ŒãŸå ´åˆã€ 'default' パスãŒé€£æºå…ˆã¨ã—ã¦ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚\n" " 詳細㯠:hg:`help urls` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" -msgid " .. container:: verbose" -msgstr " .. container:: verbose" - msgid " Some examples:" msgstr " 例:" @@ -5539,9 +5344,6 @@ msgid "not removing %s: file is already untracked\n" msgstr "%s ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“: ファイルã¯æ—¢ã«æœªç™»éŒ²ã§ã™\n" -msgid "largefiles: No remote repo\n" -msgstr "largefiles: 連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“\n" - msgid "largefiles: no files to upload\n" msgstr "largefiles: 転é€äºˆå®šãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚ã‚Šã¾ã›ã‚“\n" @@ -6737,9 +6539,6 @@ " 引数指定ãŒç„¡ã„å ´åˆã€ ç¾åœ¨ã®ã‚¬ãƒ¼ãƒ‰è¨å®šã‚’表示ã—ã¾ã™ã€‚\n" " 引数ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定パッãƒã«å¯¾ã—ã¦ã‚¬ãƒ¼ãƒ‰ã‚’è¨å®šã—ã¾ã™ã€‚" -msgid " .. note::" -msgstr " .. note::" - msgid " Specifying negative guards now requires '--'." msgstr " è² ã®ã‚¬ãƒ¼ãƒ‰è¨å®šã«ã¯ã€ ガード指定ã®å‰ã« '--' 引数ãŒå¿…è¦ã§ã™ã€‚" @@ -7947,6 +7746,9 @@ msgid "no changes found\n" msgstr "差分ã¯ã‚ã‚Šã¾ã›ã‚“\n" +msgid "warning: working directory has uncommitted changes\n" +msgstr "è¦å‘Š: 作æ¥é ˜åŸŸã«ã¯æœªã‚³ãƒŸãƒƒãƒˆã®å¤‰æ›´ãŒã‚ã‚Šã¾ã™\n" + msgid "specify at least one changeset with -r or -o" msgstr "-r åˆã¯ -o を使用ã—ã¦ãƒªãƒ“ジョンを指定ã—ã¦ãã ã•ã„" @@ -8399,8 +8201,8 @@ msgid "cannot specify both a revision and a source" msgstr "--rev 㨠--soruce ã¯ä½µç”¨ã§ãã¾ã›ã‚“" -msgid "empty \"rev\" revision set - nothing to rebase" -msgstr "--rev ã§ã®æŒ‡å®šå¯¾è±¡ãŒç©ºã§ã™ - 移動対象ãŒã‚ã‚Šã¾ã›ã‚“" +msgid "empty \"rev\" revision set - nothing to rebase\n" +msgstr "--rev ã§ã®æŒ‡å®šå¯¾è±¡ãŒç©ºã§ã™ - 移動対象ãŒã‚ã‚Šã¾ã›ã‚“\n" msgid "empty \"source\" revision set - nothing to rebase" msgstr "--soruce ã§ã®æŒ‡å®šå¯¾è±¡ãŒç©ºã§ã™ - 移動対象ãŒã‚ã‚Šã¾ã›ã‚“" @@ -8446,6 +8248,10 @@ msgid "see hg help phases for details" msgstr "詳細ã¯ã€€\"hg help phases\" ã‚’å‚ç…§" +#, python-format +msgid "reopening closed branch head %s\n" +msgstr "閉鎖済ã¿ãƒ–ランãƒãƒ˜ãƒƒãƒ‰ %s ã®é–‰éŽ–状態を解除ä¸\n" + msgid "cannot collapse multiple named branches" msgstr "複数ã®åå‰ä»˜ãブランãƒã®å˜ä¸€åŒ–ã¯ã§ãã¾ã›ã‚“" @@ -9040,6 +8846,9 @@ msgid "keep shelve after unshelving" msgstr "復旧後も退é¿æƒ…å ±ã‚’ç¶æŒ" +msgid "set date for temporary commits (DEPRECATED)" +msgstr "一時コミットã®æ—¥ä»˜ã‚’è¨å®š (éžæŽ¨å¥¨)" + msgid "hg unshelve [SHELVED]" msgstr "hg unshelve [SHELVED]" @@ -9099,6 +8908,13 @@ msgid "unshelving change '%s'\n" msgstr "退é¿æƒ…å ± '%s' を復旧ä¸\n" +msgid "" +"temporarily committing pending changes (restore with 'hg unshelve --abort')\n" +msgstr "変更内容を一時的ã«ã‚³ãƒŸãƒƒãƒˆä¸ (ä¸æ–時ã®å¾©æ—§ã¯ 'hg unshelve --abort')\n" + +msgid "rebasing shelved changes\n" +msgstr "退é¿ã—ãŸå¤‰æ›´ã®ç§»å‹• (rebase) ä¸\n" + msgid "unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')" msgstr "" "è¡çªãŒæœªè§£æ¶ˆã§ã™ ('hg resolve' ã§è¡çªè§£æ¶ˆå¾Œã« 'hg unshelve --continue' を実行" @@ -9131,8 +8947,8 @@ msgid "output diffstat-style summary of changes" msgstr "diffstat å½¢å¼ã®å¤‰æ›´æ¦‚è¦ã‚’出力" -msgid "hg shelve" -msgstr "hg shelve" +msgid "hg shelve [OPTION]... [FILE]..." +msgstr "hg shelve [OPTION]... [FILE]..." msgid "save and set aside changes from the working directory" msgstr "作æ¥é ˜åŸŸä¸ã®å¤‰æ›´å†…容を退é¿ã—ãŸä¸Šã§ç ´æ£„" @@ -9667,8 +9483,8 @@ msgid "[win32mbcs] cannot activate on this platform.\n" msgstr "[win32mbcs] エクステンションを有効化ã§ããªã„プラットフォームã§ã™ã€‚\n" -msgid "perform automatic newline conversion" -msgstr "改行形å¼ã®è‡ªå‹•å¤‰æ›" +msgid "perform automatic newline conversion (DEPRECATED)" +msgstr "改行形å¼ã®è‡ªå‹•å¤‰æ› (éžæŽ¨å¥¨)" msgid "" " Deprecation: The win32text extension requires each user to configure\n" @@ -9873,7 +9689,11 @@ msgstr "分å²ã™ã‚‹ãƒ–ックマーク %s ã‚’ %s ã¨ã—ã¦ä¿å˜\n" #, python-format +msgid "bookmark %s does not exist on the local or remote repository!\n" +msgstr "ブックマーク %s ã¯ã„ãšã‚Œã®ãƒªãƒã‚¸ãƒˆãƒªã«ã‚‚å˜åœ¨ã—ã¾ã›ã‚“!\n" + +#, python-format msgid "updating bookmark %s failed!\n" msgstr "ブックマーク %s ã®æ›´æ–°ã«å¤±æ•—!\n" #, python-format @@ -9876,11 +9696,7 @@ msgid "updating bookmark %s failed!\n" msgstr "ブックマーク %s ã®æ›´æ–°ã«å¤±æ•—!\n" #, python-format -msgid "bookmark %s does not exist on the local or remote repository!\n" -msgstr "ブックマーク %s ã¯ã„ãšã‚Œã®ãƒªãƒã‚¸ãƒˆãƒªã«ã‚‚å˜åœ¨ã—ã¾ã›ã‚“!\n" - -#, python-format msgid "exporting bookmark %s\n" msgstr "ブックマーク %s ã®åæ˜ ä¸\n" @@ -9894,6 +9710,16 @@ msgid "no changed bookmarks found\n" msgstr "変更ã•ã‚ŒãŸãƒ–ックマークã¯ã‚ã‚Šã¾ã›ã‚“\n" +msgid "not a Mercurial bundle" +msgstr "Mercurial ã®ãƒãƒ³ãƒ‰ãƒ«å½¢å¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“" + +#, python-format +msgid "unknown bundle version %s" +msgstr "未知ã®ãƒãƒ³ãƒ‰ãƒ«å½¢å¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s" + +msgid "push failed:" +msgstr "å±¥æ´åæ˜ ã«å¤±æ•—:" + msgid "unknown parent" msgstr "未知ã®è¦ª" @@ -9911,14 +9737,6 @@ msgid "invalid chunk length %d" msgstr "ä¸æ£ãªãƒ‡ãƒ¼ã‚¿é•·: %d" -#, python-format -msgid "%s: not a Mercurial bundle" -msgstr "%s: Mercurial ã®ãƒãƒ³ãƒ‰ãƒ«å½¢å¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“" - -#, python-format -msgid "%s: unknown bundle version %s" -msgstr "%s: 未知ã®ãƒãƒ³ãƒ‰ãƒ«å½¢å¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s" - msgid "bundling" msgstr "ãƒãƒ³ãƒ‰ãƒ«ç”Ÿæˆä¸" @@ -9929,6 +9747,43 @@ msgid "empty or missing revlog for %s" msgstr "%s ã«å¯¾ã™ã‚‹ãƒªãƒ“ジョンãƒã‚°ãŒç©ºã¾ãŸã¯ä¸åœ¨ã§ã™" +#, python-format +msgid "%d changesets found\n" +msgstr "%d 個ã®ãƒªãƒ“ジョンãŒã‚ã‚Šã¾ã™\n" + +msgid "received file revlog group is empty" +msgstr "ファイルã®ãƒªãƒ“ジョンãƒã‚°ãŒç©ºã§ã™" + +msgid "received spurious file revlog entry" +msgstr "ファイルã®ãƒªãƒ“ジョンãƒã‚°ãŒä¸æ£ãªæƒ…å ±ã‚’å«ã‚“ã§ã„ã¾ã™" + +#, python-format +msgid "missing file data for %s:%s - run hg verify" +msgstr "%s:%s ã®ãƒ•ã‚¡ã‚¤ãƒ«ãƒ‡ãƒ¼ã‚¿ãŒä¸åœ¨ã§ã™ - hg verify を実施ã—ã¦ãã ã•ã„" + +msgid "adding changesets\n" +msgstr "ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã‚’è¿½åŠ ä¸\n" + +msgid "chunks" +msgstr "ãƒãƒ£ãƒ³ã‚¯" + +msgid "received changelog group is empty" +msgstr "å—ä¿¡ã—ãŸå¤‰æ›´å±¥æ´ã¯ç©ºã§ã™" + +msgid "adding manifests\n" +msgstr "ãƒžãƒ‹ãƒ•ã‚§ã‚¹ãƒˆã‚’è¿½åŠ ä¸\n" + +msgid "adding file changes\n" +msgstr "ファイルã®å¤‰æ›´ã‚’è¿½åŠ ä¸\n" + +#, python-format +msgid " (%+d heads)" +msgstr " (%+d個ã®ãƒ˜ãƒƒãƒ‰)" + +#, python-format +msgid "added %d changesets with %d changes to %d files%s\n" +msgstr "%d 個ã®ãƒªãƒ“ジョン(%d ã®å¤‰æ›´ã‚’ %d ファイルã«é©ç”¨)ã‚’è¿½åŠ %s\n" + msgid "no node" msgstr "ノードãŒã‚ã‚Šã¾ã›ã‚“" @@ -10043,6 +9898,20 @@ msgid "child process failed to start" msgstr "åプãƒã‚»ã‚¹ã®ç”Ÿæˆã«å¤±æ•—" +msgid "applied to working directory" +msgstr "作æ¥é ˜åŸŸã¸ã®é©ç”¨" + +msgid "not a Mercurial patch" +msgstr "Mercurial å‘ã‘ã®ãƒ‘ッãƒã§ã¯ã‚ã‚Šã¾ã›ã‚“" + +msgid "patch is damaged or loses information" +msgstr "パッãƒã«ã¯ç ´æã¾ãŸã¯æƒ…å ±ã®æ¬ è½ãŒã‚ã‚Šã¾ã™" + +#. i18n: refers to a short changeset id +#, python-format +msgid "created %s" +msgstr "%s を作æˆ" + #. i18n: column positioning for "hg log" #, python-format msgid "changeset: %d:%s\n" @@ -10355,8 +10224,8 @@ msgid "STYLE" msgstr "スタイル" -msgid "display using template map file" -msgstr "当該スタイルã§è¡¨ç¤ºã‚’カスタマイズ" +msgid "display using template map file (DEPRECATED)" +msgstr "当該スタイルã§è¡¨ç¤ºã‚’カスタマイズ (éžæŽ¨å¥¨)" msgid "display with template" msgstr "当該テンプレートã§è¡¨ç¤ºã‚’カスタマイズ" @@ -10726,9 +10595,18 @@ " 後ã‹ã‚‰åˆ¥é€”マージã§ãるよã†ã«ã€ 打ã¡æ¶ˆã—リビジョンをã€\n" " ヘッドã®ã¾ã¾æ®‹ã™åƒãã‚’ã—ã¾ã™ã€‚" +msgid "" +" Returns 0 on success, 1 if nothing to backout or there are unresolved\n" +" files.\n" +" " +msgstr "" +" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠打消ã—ãŒå¿…è¦ãªãƒªãƒ“ジョンãŒç„¡ã„å ´åˆã‚„ã€\n" +" 未解消ã®è¡çªãŒç™ºç”Ÿã—ãŸå ´åˆã¯ 1 ã§ã™ã€‚\n" +" " + msgid "please specify just one revision" msgstr "リビジョン指定ã¯1ã¤ã ã‘ã§ã™" msgid "please specify a revision to backout" msgstr "打ã¡æ¶ˆã—対象リビジョンを指定ã—ã¦ãã ã•ã„" @@ -10729,11 +10607,11 @@ msgid "please specify just one revision" msgstr "リビジョン指定ã¯1ã¤ã ã‘ã§ã™" msgid "please specify a revision to backout" msgstr "打ã¡æ¶ˆã—対象リビジョンを指定ã—ã¦ãã ã•ã„" -msgid "cannot backout change on a different branch" -msgstr "ç•°ãªã‚‹ãƒ–ランãƒã«å±žã™ã‚‹ãƒªãƒ“ジョンを打ã¡æ¶ˆã™ã“ã¨ã¯ã§ãã¾ã›ã‚“" +msgid "cannot backout change that is not an ancestor" +msgstr "作æ¥é ˜åŸŸã®ç›´ç³»ã®ç¥–å…ˆã§ã¯ãªã„リビジョンを打ã¡æ¶ˆã™ã“ã¨ã¯ã§ãã¾ã›ã‚“" msgid "cannot backout a change with no parents" msgstr "親ã®ç„¡ã„リビジョンを打ã¡æ¶ˆã™ã“ã¨ã¯ã§ãã¾ã›ã‚“" @@ -11343,13 +11221,12 @@ msgid "" " Output may be to a file, in which case the name of the file is\n" -" given using a format string. The formatting rules are the same as\n" -" for the export command, with the following additions:" -msgstr "" -" 出力先指定ãŒã‚ã‚‹å ´åˆã€ 出力ã¯ãƒ•ã‚¡ã‚¤ãƒ«ã«ä¿å˜ã•ã‚Œã¾ã™ã€‚\n" -" 出力先指定ã§ã¯ã€ :hg:`export` ã§æŒ‡å®šå¯èƒ½ãªã‚‚ã®ã«åŠ ãˆã¦ã€\n" -" 以下ã®ç½®æ›æŒ‡å®šãŒåˆ©ç”¨å¯èƒ½ã§ã™:" - -msgid "" +" given using a format string. The formatting rules as follows:" +msgstr "" +" 出力先指定(ç½®æ›æŒ‡å®šå¯èƒ½)ãŒã‚ã‚‹å ´åˆã€ 出力ã¯ãƒ•ã‚¡ã‚¤ãƒ«ã«ä¿å˜ã•ã‚Œã¾ã™ã€‚\n" +" ç½®æ›æŒ‡å®šã¨ã—ã¦ä»¥ä¸‹ã®ã‚‚ã®ãŒä½¿ç”¨å¯èƒ½ã§ã™:" + +msgid "" +" :``%%``: literal \"%\" character\n" " :``%s``: basename of file being printed\n" " :``%d``: dirname of file being printed, or '.' if in repository root\n" @@ -11354,7 +11231,13 @@ " :``%s``: basename of file being printed\n" " :``%d``: dirname of file being printed, or '.' if in repository root\n" -" :``%p``: root-relative path name of file being printed" -msgstr "" +" :``%p``: root-relative path name of file being printed\n" +" :``%H``: changeset hash (40 hexadecimal digits)\n" +" :``%R``: changeset revision number\n" +" :``%h``: short-form changeset hash (12 hexadecimal digits)\n" +" :``%r``: zero-padded changeset revision number\n" +" :``%b``: basename of the exporting repository" +msgstr "" +" :``%%``: \"%\" æ–‡å—ãã®ã‚‚ã®\n" " :``%s``: 対象ファイルパスã®æœ«å°¾è¦ç´ \n" " :``%d``: 対象ファイルã®æ ¼ç´ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã€ ã¾ãŸã¯ '.'(ルートã®å ´åˆ)\n" " :``%p``: 対象ファイルã®ãƒªãƒã‚¸ãƒˆãƒªãƒ«ãƒ¼ãƒˆã‹ã‚‰ã®ç›¸å¯¾ãƒ‘ス\n" @@ -11358,7 +11241,11 @@ " :``%s``: 対象ファイルパスã®æœ«å°¾è¦ç´ \n" " :``%d``: 対象ファイルã®æ ¼ç´ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã€ ã¾ãŸã¯ '.'(ルートã®å ´åˆ)\n" " :``%p``: 対象ファイルã®ãƒªãƒã‚¸ãƒˆãƒªãƒ«ãƒ¼ãƒˆã‹ã‚‰ã®ç›¸å¯¾ãƒ‘ス\n" -" " +" :``%H``: ãƒãƒƒã‚·ãƒ¥å€¤(40 æ¡ 16 進数)\n" +" :``%R``: リビジョン番å·\n" +" :``%h``: çŸç¸®å½¢å¼ãƒãƒƒã‚·ãƒ¥å€¤(12 æ¡ 16 進数)\n" +" :``%r``: ゼãƒè©°ã‚ã®ãƒªãƒ“ジョン番å·\n" +" :``%b``: 対象リãƒã‚¸ãƒˆãƒªãƒ‘スã®æœ«å°¾è¦ç´ " msgid "the clone will include an empty working copy (only a repository)" msgstr "作æ¥é ˜åŸŸã®æ›´æ–°ç„¡ã—(管ç†é ˜åŸŸã®ã¿ã®è¤‡è£½)" @@ -11566,6 +11453,9 @@ msgid "use the secret phase for committing" msgstr "secret フェーズã§ã‚³ãƒŸãƒƒãƒˆä¸" +msgid "further edit commit message already specified" +msgstr "指定ã•ã‚ŒãŸã‚³ãƒŸãƒƒãƒˆãƒã‚°ã‚’エディタã§æ›´ã«ç·¨é›†" + msgid "commit the specified files or all outstanding changes" msgstr "指定ファイルã¾ãŸã¯å…¨ã¦ã®å¤‰æ›´å†…容ã®ãƒªãƒã‚¸ãƒˆãƒªã¸ã®è¨˜éŒ²" @@ -11663,6 +11553,74 @@ msgid "cannot amend changeset with children" msgstr "åリビジョンをæŒã¤ãƒªãƒ“ジョンã¯æ”¹å¤‰ã§ãã¾ã›ã‚“" +msgid "show untrusted configuration options" +msgstr "ä¿¡é ¼ã§ããªã„è¨å®šé …目も表示" + +msgid "edit user config" +msgstr "ユーザ毎è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã®ç·¨é›†" + +msgid "edit repository config" +msgstr "リãƒã‚¸ãƒˆãƒªæ¯Žè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã®ç·¨é›†" + +msgid "edit global config" +msgstr "システムワイドè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã®ç·¨é›†" + +msgid "[-u] [NAME]..." +msgstr "[-u] [NAME]..." + +msgid "show combined config settings from all hgrc files" +msgstr "å…¨è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚ˆã‚‹æœ€çµ‚çš„ãªè¨å®šå†…容ã®è¡¨ç¤º" + +msgid " With no arguments, print names and values of all config items." +msgstr "" +" 引数指定ãŒç„¡ã„å ´åˆã€ å…¨ã¦ã®è¨å®šé …ç›®ã«å¯¾ã—ã¦ã€ åå‰ã¨å€¤ã‚’表示ã—ã¾ã™ã€‚" + +msgid "" +" With one argument of the form section.name, print just the value\n" +" of that config item." +msgstr "" +" 'section.name' å½¢å¼ã«åˆè‡´ã™ã‚‹å¼•æ•°ã‚’1ã¤ã ã‘指定ã—ãŸå ´åˆã€ ãã®è¨å®šé …ç›®\n" +" 値ã®ã¿ã‚’表示ã—ã¾ã™ã€‚" + +msgid "" +" With multiple arguments, print names and values of all config\n" +" items with matching section names." +msgstr "" +" 複数ã®å¼•æ•°ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ ãれらをセクションåã¨ã¿ãªã—〠該当ã™ã‚‹\n" +" セクションã®è¨å®šé …目を全ã¦è¡¨ç¤ºã—ã¾ã™ã€‚" + +msgid "" +" With --edit, start an editor on the user-level config file. With\n" +" --global, edit the system-wide config file. With --local, edit the\n" +" repository-level config file." +msgstr "" +" --edit 指定ã®ã‚ã‚‹å ´åˆã€ ユーザ毎è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã®ç·¨é›†ã‚’開始ã—ã¾ã™ã€‚\n" +" --global 指定ã®ã‚ã‚‹å ´åˆã¯ã€ システムワイドè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ãŒã€ --local\n" +" 指定ã®ã‚ã‚‹å ´åˆã¯ã€ リãƒã‚¸ãƒˆãƒªæ¯Žè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ãŒã€ 編集対象ã«ãªã‚Šã¾ã™ã€‚" + +msgid "" +" With --debug, the source (filename and line number) is printed\n" +" for each config item." +msgstr "" +" --debug 指定ãŒã‚ã‚‹å ´åˆã€ è¨å®šé …目毎ã«è¨˜è¿°ä½ç½®(ファイルåã¨è¡Œç•ªå·)ãŒ\n" +" 表示ã•ã‚Œã¾ã™ã€‚\n" +" " + +msgid " See :hg:`help config` for more information about config files." +msgstr " è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«é–¢ã™ã‚‹è©³ç´°ã¯ :hg:`help config` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" + +msgid " " +msgstr " " + +msgid "can't use --local and --global together" +msgstr "--local 㨠--global ã¯ä½µç”¨ã§ãã¾ã›ã‚“" + +msgid "can't use --local outside a repository" +msgstr "リãƒã‚¸ãƒˆãƒªã®å¤–å´ã§ã¯ --local を指定ã§ãã¾ã›ã‚“" + +msgid "only one config item permitted" +msgstr "複数ã®è¨å®šé …目指定ã¯ç„¡åŠ¹ã§ã™" + msgid "record a copy that has already occurred" msgstr "手動ã§è¤‡è£½æ¸ˆã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€ 複製ã®æ—¨ã‚’記録" @@ -11989,6 +11947,14 @@ msgstr " (ãƒã‚±ãƒ¼ãƒ«è¨å®šã®å¦¥å½“性を確èªã—ã¦ãã ã•ã„)\n" #, python-format +msgid "checking Python executable (%s)\n" +msgstr "Python ランタイムã®æ¤œè¨¼ä¸ (%s)\n" + +#, python-format +msgid "checking Python version (%s)\n" +msgstr "Python ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®æ¤œè¨¼ä¸ (%s)\n" + +#, python-format msgid "checking Python lib (%s)...\n" msgstr "Python ライブラリã®æ¤œè¨¼ä¸ (%s)...\n" @@ -12006,6 +11972,12 @@ msgid "checking templates (%s)...\n" msgstr "テンプレートã®ç¢ºèªä¸ (%s)...\n" +msgid " template 'default' not found\n" +msgstr " テンプレート 'default' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“\n" + +msgid " no template directories found\n" +msgstr " テンプレートè¨å®šãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãŒå˜åœ¨ã—ã¾ã›ã‚“\n" + msgid " (templates seem to have been installed incorrectly)\n" msgstr " (テンプレートã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãŒä¸é©åˆ‡ãªã‚ˆã†ã§ã™)\n" @@ -12193,6 +12165,9 @@ msgid "show data and statistics about a revlog" msgstr "revlog ファイルã®ãƒ‡ãƒ¼ã‚¿ã¨çµ±è¨ˆæƒ…å ±ã®è¡¨ç¤º" +msgid "print parsed tree after optimizing" +msgstr "最é©åŒ–後ã®è§£æžãƒ„リーã®è¡¨ç¤º" + msgid "parse and apply a revision specification" msgstr "リビジョン指定記述ã®è§£æžï¼é©ç”¨" @@ -13081,20 +13056,6 @@ msgid "cannot use --similarity with --bypass" msgstr "--similarity 㨠--bypass ã¯ä½µç”¨ã§ãã¾ã›ã‚“" -msgid "applied to working directory" -msgstr "作æ¥é ˜åŸŸã¸ã®é©ç”¨" - -msgid "not a Mercurial patch" -msgstr "Mercurial å‘ã‘ã®ãƒ‘ッãƒã§ã¯ã‚ã‚Šã¾ã›ã‚“" - -msgid "patch is damaged or loses information" -msgstr "パッãƒã«ã¯ç ´æã¾ãŸã¯æƒ…å ±ã®æ¬ è½ãŒã‚ã‚Šã¾ã™" - -#. i18n: refers to a short changeset id -#, python-format -msgid "created %s" -msgstr "%s を作æˆ" - msgid "applying patch from stdin\n" msgstr "標準入力ã‹ã‚‰ã®ãƒ‘ッãƒã‚’é©ç”¨ä¸\n" @@ -13146,6 +13107,28 @@ msgid " See pull for valid source format details." msgstr " 対象リãƒã‚¸ãƒˆãƒªã®æŒ‡å®šå½¢å¼ã¯ :hg:`help pull` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" +msgid " - show incoming changes with patches and full description::" +msgstr " - å–ã‚Šè¾¼ã¿å¯¾è±¡ãƒªãƒ“ジョン群ã®å¤‰æ›´å†…容・コミットãƒã‚°å…¨ä½“も表示::" + +msgid " hg incoming -vp" +msgstr " hg incoming -vp" + +msgid " - show incoming changes excluding merges, store a bundle::" +msgstr " - マージ以外ã®å–ã‚Šè¾¼ã¿å¯¾è±¡ãƒªãƒ“ジョン群ã®è¡¨ç¤ºã¨ãƒãƒ³ãƒ‰ãƒ«ã¸ã®æ ¼ç´::" + +msgid "" +" hg in -vpM --bundle incoming.hg\n" +" hg pull incoming.hg" +msgstr "" +" hg in -vpM --bundle incoming.hg\n" +" hg pull incoming.hg" + +msgid " - briefly list changes inside a bundle::" +msgstr " - ãƒãƒ³ãƒ‰ãƒ«å†…ã®ãƒªãƒ“ジョン群ã®ç°¡æ˜“表示::" + +msgid " hg in changes.hg -T \"{desc|firstline}\\n\"" +msgstr " hg in changes.hg -T \"{desc|firstline}\\n\"" + msgid "" " Returns 0 if there are incoming changes, 1 otherwise.\n" " " @@ -13273,6 +13256,19 @@ " コミットãƒã‚°ã®å…¨æ–‡ã‚‚表示ã•ã‚Œã¾ã™ã€‚" msgid "" +" With --graph the revisions are shown as an ASCII art DAG with the most\n" +" recent changeset at the top.\n" +" 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,\n" +" and '+' represents a fork where the changeset from the lines below is a\n" +" parent of the 'o' merge on the same line." +msgstr "" +" --graph 指定ãŒã‚ã‚‹å ´åˆã€ 最新リビジョンを上ã«ã—ãŸå±¥æ´ã‚°ãƒ©ãƒ• (DAG) ã‚’ã€\n" +" ASCII アートã§æç”»ã—ã¾ã™ã€‚ å±¥æ´ã‚°ãƒ©ãƒ•ã«ãŠã‘ã‚‹ 'o' ã¯ãƒªãƒ“ジョンã€\n" +" '@' ã¯ä½œæ¥é ˜åŸŸã®è¦ªã€ 'x' ã¯å»ƒæ¢ (obsoleted) リビジョンをæ„味ã—ã¾ã™ã€‚\n" +" ã¾ãŸ '+' ã¯ã€ åŒä¸€è¡Œã® 'o' ㌠'+' 下方ã®ãƒªãƒ“ジョンを親ã¨ã—ãŸãƒžãƒ¼ã‚¸ã§ã€\n" +" 且ã¤ã“ã®ãƒžãƒ¼ã‚¸ã«ã‚ˆã£ã¦ã€ å±¥æ´ãŒæžåˆ†ã‹ã‚Œã—ã¦ã„ã‚‹ã“ã¨ã‚’表ã—ã¾ã™ã€‚" + +msgid "" " log -p/--patch may generate unexpected diff output for merge\n" " changesets, as it will only compare the merge changeset against\n" " its first parent. Also, only files different from BOTH parents\n" @@ -13868,6 +13864,12 @@ msgid "pushing to %s\n" msgstr "%s ã¸ã®åæ˜ ä¸\n" +msgid "default repository not configured!" +msgstr "デフォルトã®é€£æºå…ˆãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“" + +msgid "see the \"path\" section in \"hg help config\"" +msgstr "\"hg help config\" ã® \"path\" セクションをå‚ç…§ã—ã¦ãã ã•ã„" + msgid "roll back an interrupted transaction" msgstr "ä¸æ–ã•ã‚ŒãŸãƒˆãƒ©ãƒ³ã‚¶ã‚¯ã‚·ãƒ§ãƒ³ã®å–り消ã—" @@ -14299,6 +14301,12 @@ msgid "name of access log file to write to" msgstr "アクセスãƒã‚°ã®æ›¸ã出ã—先ファイル" +msgid "run server in background" +msgstr "ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ã§ã®ã‚µãƒ¼ãƒå®Ÿè¡Œ" + +msgid "used internally by daemon mode" +msgstr "(ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰å®Ÿè¡Œæ™‚ã§ã®å†…部用途å‘ã‘)" + msgid "name of error log file to write to" msgstr "エラーãƒã‚°ã®æ›¸ã出ã—先ファイル" @@ -14326,6 +14334,9 @@ msgid "name of the hgweb config file (DEPRECATED)" msgstr "hgweb è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ä½ç½® (éžæŽ¨å¥¨)" +msgid "name of file to write process ID to" +msgstr "プãƒã‚»ã‚¹IDã®æ›¸ã出ã—先ファイル" + msgid "for remote clients" msgstr "(ホスト間連æºã§ã®å†…部用途å‘ã‘)" @@ -14392,44 +14403,6 @@ msgid "listening at http://%s%s/%s (bound to %s:%d)\n" msgstr "http://%s%s/%s ã§å¾…ã¡å—ã‘開始(ãƒã‚¤ãƒ³ãƒ‰å…ˆã¯ %s:%d)\n" -msgid "show untrusted configuration options" -msgstr "ä¿¡é ¼ã§ããªã„è¨å®šé …目も表示" - -msgid "[-u] [NAME]..." -msgstr "[-u] [NAME]..." - -msgid "show combined config settings from all hgrc files" -msgstr "å…¨è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚ˆã‚‹æœ€çµ‚çš„ãªè¨å®šå†…容ã®è¡¨ç¤º" - -msgid " With no arguments, print names and values of all config items." -msgstr "" -" 引数指定ãŒç„¡ã„å ´åˆã€ å…¨ã¦ã®è¨å®šé …ç›®ã«å¯¾ã—ã¦ã€ åå‰ã¨å€¤ã‚’表示ã—ã¾ã™ã€‚" - -msgid "" -" With one argument of the form section.name, print just the value\n" -" of that config item." -msgstr "" -" 'section.name' å½¢å¼ã«åˆè‡´ã™ã‚‹å¼•æ•°ã‚’1ã¤ã ã‘指定ã—ãŸå ´åˆã€ ãã®è¨å®šé …ç›®\n" -" 値ã®ã¿ã‚’表示ã—ã¾ã™ã€‚" - -msgid "" -" With multiple arguments, print names and values of all config\n" -" items with matching section names." -msgstr "" -" 複数ã®å¼•æ•°ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ ãれらをセクションåã¨ã¿ãªã—〠該当ã™ã‚‹\n" -" セクションã®è¨å®šé …目を全ã¦è¡¨ç¤ºã—ã¾ã™ã€‚" - -msgid "" -" With --debug, the source (filename and line number) is printed\n" -" for each config item." -msgstr "" -" --debug 指定ãŒã‚ã‚‹å ´åˆã€ è¨å®šé …目毎ã«è¨˜è¿°ä½ç½®(ファイルåã¨è¡Œç•ªå·)ãŒ\n" -" 表示ã•ã‚Œã¾ã™ã€‚\n" -" " - -msgid "only one config item permitted" -msgstr "複数ã®è¨å®šé …目指定ã¯ç„¡åŠ¹ã§ã™" - msgid "show status of all files" msgstr "å…¨ã¦ã®çŠ¶æ…‹ã‚’表示" @@ -14517,7 +14490,7 @@ " ! = missing (deleted by non-hg command, but still tracked)\n" " ? = not tracked\n" " I = ignored\n" -" = origin of the previous file listed as A (added)" +" = origin of the previous file (with --copies)" msgstr "" " M = 変更有り(Modified)\n" " A = è¿½åŠ ç™»éŒ²äºˆå®š(Added)\n" @@ -15033,6 +15006,14 @@ msgstr "作æ¥é ˜åŸŸã®è¦ª '%s' ãŒæœªçŸ¥ã®ãƒªãƒ“ジョンã§ã™!" #, python-format +msgid "note: using %s as ancestor of %s and %s\n" +msgstr "備考: %s ã‚’ã€%s 㨠%s ã®ç¥–å…ˆã¨ã—ã¦ä½¿ç”¨ä¸\n" + +#, python-format +msgid " alternatively, use --config merge.preferancestor=%s\n" +msgstr " ã‚ã‚‹ã„㯠--config merge.preferancestor=%s を使用ã—ã¦ãã ã•ã„\n" + +#, python-format msgid "no such file in rev %s" msgstr "リビジョン %s ã«å½“該ファイルã¯å˜åœ¨ã—ã¾ã›ã‚“" @@ -15135,6 +15116,18 @@ msgstr "連æºå…ˆã¸ã®æ–°è¦ãƒ–ランãƒä½œæˆã¯ 'hg push --new-branch'" #, python-format +msgid "and %s others" +msgstr "ãã®ä»– %s 個" + +#, python-format +msgid "remote has heads that are not known locally: %s\n" +msgstr "連æºå…ˆã«ã¯æ–°è¦ãƒ˜ãƒƒãƒ‰ãŒå˜åœ¨ã—ã¾ã™: %s\n" + +#, python-format +msgid "remote has heads on branch '%s' that are not known locally: %s\n" +msgstr "連æºå…ˆã®ãƒ–ランム'%s' ã«ã¯æ–°è¦ãƒ˜ãƒƒãƒ‰ãŒå˜åœ¨ã—ã¾ã™: %s\n" + +#, python-format msgid "push creates new branch '%s' with multiple heads" msgstr "複数ヘッドã®æ–°è¦ãƒ–ランム%s ãŒé€£æºå…ˆã«ä½œæˆã•ã‚Œã¾ã™" @@ -15160,9 +15153,6 @@ msgid "new remote heads on branch '%s':\n" msgstr "以下ã®æ–°ã—ã„ヘッドãŒé€£æºå…ˆã®ãƒ–ランム'%s' ã«ä½œæˆã•ã‚Œã¾ã™:\n" -msgid "note: unsynced remote changes!\n" -msgstr "注æ„: 連æºå…ˆã§ã®å¤‰æ›´ç‚¹ãŒå–ã‚Šè¾¼ã¾ã‚Œã¦ã„ã¾ã›ã‚“!\n" - #, python-format msgid "abort: %s\n" msgstr "ä¸æ¢: %s\n" @@ -15383,6 +15373,52 @@ msgstr "ä¸æ£ãªãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ©æŒ‡å®š '%s' を無視ã—ã¾ã™\n" #, python-format +msgid "%s: not a Mercurial bundle" +msgstr "%s: Mercurial ã®ãƒãƒ³ãƒ‰ãƒ«å½¢å¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“" + +#, python-format +msgid "%s: unknown bundle version %s" +msgstr "%s: 未知ã®ãƒãƒ³ãƒ‰ãƒ«å½¢å¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s" + +msgid "destination does not support push" +msgstr "指定ã®é€£æºå…ˆã«ã¯å±¥æ´ã‚’åæ˜ ã§ãã¾ã›ã‚“" + +#, python-format +msgid "push includes obsolete changeset: %s!" +msgstr "å±¥æ´åæ˜ å¯¾è±¡ã«å»ƒæ¢ (obsolete) リビジョンãŒå«ã¾ã‚Œã¾ã™ï¼: %s" + +#, python-format +msgid "push includes unstable changeset: %s!" +msgstr "å±¥æ´åæ˜ å¯¾è±¡ã«éžæ°¸ç¶š (unstable) リビジョンãŒå«ã¾ã‚Œã¾ã™ï¼: %s" + +#, python-format +msgid "push includes bumped changeset: %s!" +msgstr "" + +#, python-format +msgid "push includes divergent changeset: %s!" +msgstr "å±¥æ´åæ˜ å¯¾è±¡ã«åˆ†å² (divergent) ã—ãŸå¾Œç¶™ãƒªãƒ“ジョンãŒå«ã¾ã‚Œã¾ã™ï¼: %s" + +#, python-format +msgid "updating %s to public failed!\n" +msgstr "%s ã®ãƒ•ã‚§ãƒ¼ã‚ºã® public 化ã«å¤±æ•—!\n" + +#, python-format +msgid "cannot lock source repo, skipping local %s phase update\n" +msgstr "リãƒã‚¸ãƒˆãƒªã‚’ãƒãƒƒã‚¯ã§ããªã„ãŸã‚ã€ãƒãƒ¼ã‚«ãƒ«ã® %s フェーズ更新をçœç•¥\n" + +msgid "failed to push some obsolete markers!\n" +msgstr "リビジョンã®å»ƒæ¢æƒ…å ±ã®åæ˜ ã«å¤±æ•—ã—ã¾ã—ãŸï¼\n" + +msgid "requesting all changes\n" +msgstr "全リビジョンをå–å¾—ä¸\n" + +msgid "" +"partial pull cannot be done because other repository doesn't support " +"changegroupsubset." +msgstr "連æºå…ˆã® changegroupsubset 機能未対応ã«ã‚ˆã‚Šã€ 部分å–ã‚Šè¾¼ã¿ã§ãã¾ã›ã‚“。" + +#, python-format msgid "*** failed to import extension %s from %s: %s\n" msgstr "*** %s ã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã«å¤±æ•— (%s): %s\n" @@ -15942,6 +15978,9 @@ msgid "basic commands:" msgstr "基本コマンド:" +msgid "debug commands (internal and unsupported):" +msgstr "デãƒãƒƒã‚°ç”¨ã‚³ãƒžãƒ³ãƒ‰ (内部用途å‘ã‘ã§æœªä¿è¨¼):" + msgid "list of commands:" msgstr "コマンド一覧:" @@ -16219,7 +16258,7 @@ " Mercurial ã¯è¨˜è¿°é †åºé€šã‚Šã«ã€ å„ä½ç½®ã®ãƒ•ã‚¡ã‚¤ãƒ«æ‰€åœ¨ç¢ºèªã‚’è¡Œã„ã¾ã™ã€‚" msgid "" -".. note:: The registry key ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node" +" The registry key ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node" "\\Mercurial``\n" " is used when running 32-bit Python on 64-bit Windows." msgstr "" @@ -16223,7 +16262,7 @@ "\\Mercurial``\n" " is used when running 32-bit Python on 64-bit Windows." msgstr "" -".. note:: 32-bit Python ã‚’ 64-bit Windows ã§å‹•ä½œã•ã›ã‚‹å ´åˆã¯ã€\n" +" 32-bit Python ã‚’ 64-bit Windows ã§å‹•ä½œã•ã›ã‚‹å ´åˆã¯ã€\n" " ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Mercurial``\n" " レジストリã‚ーãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚" @@ -16477,7 +16516,7 @@ msgstr " stable5 = latest -b stable" msgid "" -".. note:: It is possible to create aliases with the same names as\n" +" It is possible to create aliases with the same names as\n" " existing commands, which will then override the original\n" " definitions. This is almost always a bad idea!" msgstr "" @@ -16481,7 +16520,7 @@ " existing commands, which will then override the original\n" " definitions. This is almost always a bad idea!" msgstr "" -".. note:: æ—¢å˜ã‚³ãƒžãƒ³ãƒ‰ã¨åŒåã®åˆ¥å定義ã¯ã€ æ—¢å˜ã‚³ãƒžãƒ³ãƒ‰ã‚’上書ãã—ã¾ã™ã€‚\n" +" æ—¢å˜ã‚³ãƒžãƒ³ãƒ‰ã¨åŒåã®åˆ¥å定義ã¯ã€ æ—¢å˜ã‚³ãƒžãƒ³ãƒ‰ã‚’上書ãã—ã¾ã™ã€‚\n" " ã“ã®ã‚ˆã†ãªåˆ¥å定義ã¯ã€ 大概悲惨ãªçµæžœã‚’æ‹›ãã¾ã™!" msgid "" @@ -16543,7 +16582,7 @@ "``$HG_ARGS`` 㯠``echo foo`` ã«ç½®æ›ã•ã‚Œã¾ã™ã€‚" msgid "" -".. note:: Some global configuration options such as ``-R`` are\n" +" Some global configuration options such as ``-R`` are\n" " processed before shell aliases and will thus not be passed to\n" " aliases." msgstr "" @@ -16547,7 +16586,7 @@ " processed before shell aliases and will thus not be passed to\n" " aliases." msgstr "" -".. note:: å¹¾ã¤ã‹ã®ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ション (例: ``-R``) ã®å‡¦ç†ã¯ã€\n" +" å¹¾ã¤ã‹ã®ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ション (例: ``-R``) ã®å‡¦ç†ã¯ã€\n" " シェル別åã®è§£é‡ˆå‰ã«å®Ÿæ–½ã•ã‚Œã‚‹ãŸã‚〠シェル別åã«å¯¾ã—ã¦ã€\n" " ã“れらを指定ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。" @@ -16816,7 +16855,7 @@ "ãã‚Œãžã‚Œç½®æ›ã•ã‚Œã¾ã™ã€‚" msgid "" -".. note:: The tempfile mechanism is recommended for Windows systems,\n" +" The tempfile mechanism is recommended for Windows systems,\n" " where the standard shell I/O redirection operators often have\n" " strange effects and may corrupt the contents of your files." msgstr "" @@ -16820,7 +16859,7 @@ " where the standard shell I/O redirection operators often have\n" " strange effects and may corrupt the contents of your files." msgstr "" -".. note:: 標準的ãªã‚·ã‚§ãƒ«ã® I/O リダイレクトãŒã€ 予期ã›ã¬çµæžœã‚„ã€\n" +" 標準的ãªã‚·ã‚§ãƒ«ã® I/O リダイレクトãŒã€ 予期ã›ã¬çµæžœã‚„ã€\n" " ファイル内容ã®ç ´å£Šã«ç¹‹ãŒã‚‹ Windows ã®ã‚ˆã†ãªç’°å¢ƒã§ã¯ã€\n" " tempfile 機構ã®ä½¿ç”¨ãŒãŠå‹§ã‚ã§ã™ã€‚" @@ -17566,9 +17605,9 @@ " 失敗ã—ãŸå ´åˆ (例: è¡çªè§£æ¶ˆã®å¤±æ•—ç‰) 㯠``$HG_ERROR=1`` ãŒè¨å®šã•ã‚Œã¾ã™ã€‚" msgid "" -".. note:: It is generally better to use standard hooks rather than the\n" +" It is generally better to use standard hooks rather than the\n" " generic pre- and post- command hooks as they are guaranteed to be\n" " called in the appropriate contexts for influencing transactions.\n" " Also, hooks like \"commit\" will be called in all contexts that\n" " generate a commit (e.g. tag) and not just the commit command." msgstr "" @@ -17570,12 +17609,12 @@ " generic pre- and post- command hooks as they are guaranteed to be\n" " called in the appropriate contexts for influencing transactions.\n" " Also, hooks like \"commit\" will be called in all contexts that\n" " generate a commit (e.g. tag) and not just the commit command." msgstr "" -".. note:: コマンド実行ã«å¯¾ã™ã‚‹ pre- ã¾ãŸã¯ post- 付ãã®æ±Žç”¨ãƒ•ãƒƒã‚¯ã¯ã€\n" +" コマンド実行ã«å¯¾ã™ã‚‹ pre- ã¾ãŸã¯ post- 付ãã®æ±Žç”¨ãƒ•ãƒƒã‚¯ã¯ã€\n" " トランザクション確定ã®æˆå¦ã«å½±éŸ¿ã—ãªã„状æ³ã§å‘¼ã°ã‚Œã‚‹ãŸã‚ã€\n" " 汎用フックを使用ã™ã‚‹æ–¹ãŒãŠå‹§ã‚ã§ã™ã€‚\n" " \"commit\" ã®ã‚ˆã†ãªãƒ•ãƒƒã‚¯ã¯ã€ :hg:`commit` 実行以外ã«ã‚‚ã€\n" " リビジョンを作æˆã™ã‚‹å¥‘æ©Ÿ (例: :hg:`tag`) å…¨ã¦ã«ãŠã„ã¦å‘¼ã°ã‚Œã¾ã™ã€‚" msgid "" @@ -17576,11 +17615,11 @@ " トランザクション確定ã®æˆå¦ã«å½±éŸ¿ã—ãªã„状æ³ã§å‘¼ã°ã‚Œã‚‹ãŸã‚ã€\n" " 汎用フックを使用ã™ã‚‹æ–¹ãŒãŠå‹§ã‚ã§ã™ã€‚\n" " \"commit\" ã®ã‚ˆã†ãªãƒ•ãƒƒã‚¯ã¯ã€ :hg:`commit` 実行以外ã«ã‚‚ã€\n" " リビジョンを作æˆã™ã‚‹å¥‘æ©Ÿ (例: :hg:`tag`) å…¨ã¦ã«ãŠã„ã¦å‘¼ã°ã‚Œã¾ã™ã€‚" msgid "" -".. note:: Environment variables with empty values may not be passed to\n" +" Environment variables with empty values may not be passed to\n" " hooks on platforms such as Windows. As an example, ``$HG_PARENT2``\n" " will have an empty value under Unix-like platforms for non-merge\n" " changesets, while it will not be available at all under Windows." msgstr "" @@ -17583,8 +17622,8 @@ " hooks on platforms such as Windows. As an example, ``$HG_PARENT2``\n" " will have an empty value under Unix-like platforms for non-merge\n" " changesets, while it will not be available at all under Windows." msgstr "" -".. note:: Windows ã®ã‚ˆã†ãªç’°å¢ƒã§ã¯ã€ 空値ã®ç’°å¢ƒå¤‰æ•°ãŒã€\n" +" Windows ã®ã‚ˆã†ãªç’°å¢ƒã§ã¯ã€ 空値ã®ç’°å¢ƒå¤‰æ•°ãŒã€\n" " 引ã渡ã•ã‚Œãªã„å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ 例ãˆã°ã€ éžãƒžãƒ¼ã‚¸ãƒªãƒ“ジョンã®å ´åˆã€\n" " Unix 系環境ã§ã¯ç©ºå€¤ã® ``$HG_PARENT2`` ãŒå¼•ã渡ã•ã‚Œã¾ã™ãŒã€\n" " Windows 環境ã§ã¯ã€ 環境変数自身ã®å¼•æ¸¡ã—ãŒã‚ã‚Šã¾ã›ã‚“。" @@ -20866,6 +20905,7 @@ ":Manual section: 1\n" ":Manual group: Mercurial Manual" +#. do not translate: .. contents:: msgid "" ".. contents::\n" " :backlinks: top\n" @@ -20939,9 +20979,6 @@ "repository path\n" " ãƒãƒ¼ã‚«ãƒ«ãƒ›ã‚¹ãƒˆä¸Šã®ãƒªãƒã‚¸ãƒˆãƒªã¸ã®ãƒ‘スや〠連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã® URI ã®æŒ‡å®š" -msgid ".. include:: hg.1.gendoc.txt" -msgstr ".. include:: hg.1.gendoc.txt" - msgid "" "Files\n" "\"\"\"\"\"" @@ -21098,9 +21135,6 @@ "本ソフトウェアã¯ã€ ãƒãƒ¼ã‚¸ãƒ§ãƒ³2ã¾ãŸã¯ãれ以é™ã® GNU General\n" "Public License ã®å…ƒã§ã®è‡ªç”±ãªåˆ©ç”¨ãŒä¿è¨¼ã•ã‚Œã¦ã„ã¾ã™ã€‚" -msgid ".. include:: common.txt\n" -msgstr ".. include:: common.txt\n" - msgid "" "==========\n" " hgignore\n" @@ -21130,9 +21164,6 @@ ":Manual section: 5\n" ":Manual group: Mercurial Manual" -msgid ".. include:: hgignore.5.gendoc.txt" -msgstr ".. include:: hgignore.5.gendoc.txt" - msgid "" "Author\n" "======\n" @@ -21169,9 +21200,6 @@ "本ソフトウェアã¯ã€ ãƒãƒ¼ã‚¸ãƒ§ãƒ³2ã¾ãŸã¯ãれ以é™ã® GNU General\n" "Public License ã®å…ƒã§ã®è‡ªç”±ãªåˆ©ç”¨ãŒä¿è¨¼ã•ã‚Œã¦ã„ã¾ã™ã€‚" -msgid ".. include:: common.txt" -msgstr ".. include:: common.txt" - msgid "" "Synopsis\n" "========" @@ -21326,7 +21354,6 @@ "パターン記述を ``^`` ã§é–‹å§‹ã—ã¦ãã ã•ã„。" msgid "" -".. note::\n" " Patterns specified in other than ``.hgignore`` are always rooted.\n" " Please see :hg:`help patterns` for details." msgstr "" @@ -21330,7 +21357,6 @@ " Patterns specified in other than ``.hgignore`` are always rooted.\n" " Please see :hg:`help patterns` for details." msgstr "" -".. note::\n" " ``.hgignore`` 記述ã®å ´åˆã€ 作æ¥é ˜åŸŸãƒ«ãƒ¼ãƒˆã‹ã‚‰ã®ç›¸å¯¾ãƒ‘スã«å¯¾ã—ã¦ã€\n" " 途ä¸è¦ç´ ã®éƒ¨åˆ†ä¸€è‡´ã§ã‚‚åˆè‡´ã¨ã¿ãªã•ã‚Œã¾ã™ãŒã€ 通常ã®ãƒ‘ターン指定ã§ã¯ã€\n" " 相対パスã®å…ˆé ã‹ã‚‰ã®åˆè‡´ãŒè¦æ±‚ã•ã‚Œã¾ã™ã€‚ 詳細㯠:hg:`help patterns`\n" @@ -21400,6 +21426,7 @@ ":Manual section: 5\n" ":Manual group: Mercurial Manual" +#. do not translate: .. contents:: msgid "" ".. contents::\n" " :backlinks: top\n" @@ -21418,9 +21445,6 @@ "説明\n" "====" -msgid ".. include:: hgrc.5.gendoc.txt" -msgstr ".. include:: hgrc.5.gendoc.txt" - msgid "" "Author\n" "======\n" @@ -21741,7 +21765,6 @@ "8. ファイルã®ãƒžãƒ¼ã‚¸ã¯å¤±æ•—ã¨ã¿ãªã•ã‚Œã€ 手動ã§ã® :hg:`resolve` ãŒå¿…è¦ã§ã™ã€‚" msgid "" -".. note::\n" " After selecting a merge program, Mercurial will by default attempt\n" " to merge the files using a simple merge algorithm first. Only if it " "doesn't\n" @@ -21752,7 +21775,6 @@ "by\n" " default unless the file is binary or a symlink." msgstr "" -".. note::\n" " マージツールã®é¸æŠžãŒå®Œäº†ã—ãŸãªã‚‰ã€\n" " ã¾ãšæœ€åˆã« Mercurial ã¯å˜ç´”マージ処ç†ã‚’実施ã—ã¾ã™ã€‚\n" " ã“ã®éš›ã«è¡çªãŒæ¤œå‡ºã•ã‚Œã¦ã€ マージã«å¤±æ•—ã—ãŸå ´åˆã«é™ã‚Š\n" @@ -21819,7 +21841,6 @@ msgstr "別ãªå½¢å¼ã§ã®ãƒ‘ターン記述ã®éš›ã«ã¯ã€ 明示的ã«ç¨®åˆ¥ã‚’指定ã—ã¦ãã ã•ã„。" msgid "" -".. note::\n" " Patterns specified in ``.hgignore`` are not rooted.\n" " Please see :hg:`help hgignore` for details." msgstr "" @@ -21823,7 +21844,6 @@ " Patterns specified in ``.hgignore`` are not rooted.\n" " Please see :hg:`help hgignore` for details." msgstr "" -".. note::\n" " ``.hgignore`` ã§ã®è¨˜è¿°ã§ã¯ã€ 作æ¥é ˜åŸŸãƒ«ãƒ¼ãƒˆã‹ã‚‰ã®ç›¸å¯¾ãƒ‘スã«å¯¾ã—ã¦ã€\n" " 部分一致ã®ã¿ã§åˆè‡´åˆ¤å®šã•ã‚Œã¾ã™ã€‚ 詳細㯠:hg:`help hgignore`\n" " ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" @@ -22031,7 +22051,6 @@ msgstr " - secret フェーズã®ãƒªãƒ“ジョン㯠push/pull/clone 対象ã«ãªã‚‰ãªã„" msgid "" -".. note::\n" " Pulling a draft changeset from a publishing server does not mark it\n" " as public on the server side due to the read-only nature of pull." msgstr "" @@ -22035,7 +22054,6 @@ " Pulling a draft changeset from a publishing server does not mark it\n" " as public on the server side due to the read-only nature of pull." msgstr "" -".. note::\n" " publishing サーãƒã‹ã‚‰ draft フェーズã®ãƒªãƒ“ジョンを pull ã—ãŸå ´åˆã§ã‚‚ã€\n" " 『pull ã¯èªã¿å‡ºã—専用ã€ã®åŽŸå‰‡ã«å‰‡ã‚Šã€ 当該リビジョンã®ãƒ•ã‚§ãƒ¼ã‚ºã¯ã€\n" " サーãƒå´ã§ã¯ draft ã®ã¾ã¾ (public 化ã—ãªã„) ã§ã™ã€‚" @@ -22057,7 +22075,6 @@ " publish = False" msgid "" -".. note::\n" " Servers running older versions of Mercurial are treated as\n" " publishing." msgstr "" @@ -22061,7 +22078,6 @@ " Servers running older versions of Mercurial are treated as\n" " publishing." msgstr "" -".. note::\n" " 旧版㮠Mercurial ã§ç¨¼å‹•ã—ã¦ã„るサーãƒã¯ã€ publishing 実施ã«ç›¸å½“ã—ã¾ã™ã€‚" msgid "" @@ -22065,9 +22081,8 @@ " 旧版㮠Mercurial ã§ç¨¼å‹•ã—ã¦ã„るサーãƒã¯ã€ publishing 実施ã«ç›¸å½“ã—ã¾ã™ã€‚" msgid "" -".. note::\n" " Changesets in secret phase are not exchanged with the server. This\n" " applies to their content: file names, file contents, and changeset\n" " metadata. For technical reasons, the identifier (e.g. d825e4025e39)\n" " of the secret changeset may be communicated to the server." msgstr "" @@ -22069,9 +22084,8 @@ " Changesets in secret phase are not exchanged with the server. This\n" " applies to their content: file names, file contents, and changeset\n" " metadata. For technical reasons, the identifier (e.g. d825e4025e39)\n" " of the secret changeset may be communicated to the server." msgstr "" -".. note::\n" " secret フェーズã®ãƒªãƒ“ジョンã¯ã€ 連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã«ä¼æ¬ã—ã¾ã›ã‚“。\n" " ファイルåã‚„å±¥æ´ãƒ¡ã‚¿ãƒ‡ãƒ¼ã‚¿ç‰ã®ã€ å±¥æ´æƒ…å ±ã‚‚ä¼æ¬å¯¾è±¡ã‹ã‚‰é™¤å¤–ã•ã‚Œã¾ã™ã€‚\n" " 但ã—〠機能実ç¾ä¸Šã®ç†ç”±ã‹ã‚‰ã€ secret フェーズã®ãƒªãƒ“ジョンã®ãƒãƒƒã‚·ãƒ¥å€¤\n" @@ -22489,12 +22503,8 @@ " ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ç”Ÿæˆã¯ã€ 親リãƒã‚¸ãƒˆãƒªã§ã®ã‚³ãƒŸãƒƒãƒˆã®éš›ã«ã€ Mercurial\n" " ã«ã‚ˆã£ã¦è‡ªå‹•çš„ã«å®Ÿæ–½ã•ã‚Œã¾ã™ã€‚" -msgid "" -" .. note::\n" -" The ``.hgsubstate`` file should not be edited manually." -msgstr "" -" .. note::\n" -" ``.hgsubstate`` ã¯æ±ºã—ã¦æ‰‹å‹•ç·¨é›†ã—ãªã„ã§ãã ã•ã„。" +msgid " The ``.hgsubstate`` file should not be edited manually." +msgstr " ``.hgsubstate`` ã¯æ±ºã—ã¦æ‰‹å‹•ç·¨é›†ã—ãªã„ã§ãã ã•ã„。" msgid "" "\n" @@ -22595,6 +22605,13 @@ " å†å¸°çš„ã«ã¯å®Ÿæ–½ã•ã‚Œã¾ã›ã‚“。" msgid "" +":cat: cat currently only handles exact file matches in subrepos.\n" +" Git and Subversion subrepositories are currently ignored." +msgstr "" +":cat: ç¾çŠ¶ã§ã¯ã€ サブリãƒã‚¸ãƒˆãƒªä¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¨åŽ³å¯†ä¸€è‡´ã—ãŸå ´åˆã®ã¿ã€\n" +" 処ç†ã‚’実施ã—ã¾ã™ã€‚ Git ãŠã‚ˆã³ Subversion å½¢å¼ã®å ´åˆã¯ä½•ã‚‚実施ã—ã¾ã›ã‚“。" + +msgid "" ":commit: commit creates a consistent snapshot of the state of the\n" " entire project and its subrepositories. If any subrepositories\n" " have been modified, Mercurial will abort. Mercurial can be made\n" @@ -22831,6 +22848,9 @@ msgid "- if(expr, then[, else])" msgstr "- if(expr, then[, else])" +msgid "- ifcontains(expr, expr, then[, else])" +msgstr "- ifcontains(expr, expr, then[, else])" + msgid "- ifeq(expr, expr, then[, else])" msgstr "- ifeq(expr, expr, then[, else])" @@ -22840,6 +22860,9 @@ msgid "- label(label, expr)" msgstr "- label(label, expr)" +msgid "- revset(query[, formatargs])" +msgstr "- revset(query[, formatargs])" + msgid "- rstdoc(text, style)" msgstr "- rstdoc(text, style)" @@ -22843,6 +22866,9 @@ msgid "- rstdoc(text, style)" msgstr "- rstdoc(text, style)" +msgid "- shortest(node)" +msgstr "- shortest(node)" + msgid "- strip(text[, chars])" msgstr "- strip(text[, chars])" @@ -22917,8 +22943,24 @@ msgid "- Display the contents of the 'extra' field, one per line::" msgstr "- リビジョン㮠'extra' æƒ…å ±ã®å†…容を1è¡Œ1データã§è¡¨ç¤º::" -msgid " $ hg log -r 0 --template \"{join(extras, '\\n')}\\n\"\n" -msgstr " $ hg log -r 0 --template \"{join(extras, '\\n')}\\n\"\n" +msgid " $ hg log -r 0 --template \"{join(extras, '\\n')}\\n\"" +msgstr " $ hg log -r 0 --template \"{join(extras, '\\n')}\\n\"" + +msgid "- Mark the current bookmark with '*'::" +msgstr "- ç¾åœ¨ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªãƒ–ックマーク㫠'*' を表示::" + +msgid "" +" $ hg log --template \"{bookmarks % '{bookmark}{ifeq(bookmark, current, \\" +"\"*\\\")} '}\\n\"" +msgstr "" +" $ hg log --template \"{bookmarks % '{bookmark}{ifeq(bookmark, current, \\" +"\"*\\\")} '}\\n\"" + +msgid "- Mark the working copy parent with '@'::" +msgstr "- 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョン㫠'@' を表示::" + +msgid " $ hg log --template \"{ifcontains(rev, revset('.'), '@')}\\n\"\n" +msgstr " $ hg log --template \"{ifcontains(rev, revset('.'), '@')}\\n\"\n" msgid "Valid URLs are of the form::" msgstr "有効㪠URL 指定ã¯ä»¥ä¸‹ã®å½¢å¼ã§ã™::" @@ -23176,10 +23218,6 @@ msgstr " 更新ファイル数 %dã€ è¿½åŠ %d è¡Œ(+)〠削除 %d è¡Œ(-)\n" #, python-format -msgid "calling hook %s: %s\n" -msgstr "フック %s:%s 呼ã³å‡ºã—ä¸\n" - -#, python-format msgid "%s hook is invalid (\"%s\" not in a module)" msgstr "フック %s ã¯ä¸æ£ã§ã™(モジュールä¸ã« \"%s\" ãŒã‚ã‚Šã¾ã›ã‚“)" @@ -23202,6 +23240,10 @@ msgstr "フック %s ã¯ä¸æ£ã§ã™(\"%s\" ã¯å‘¼ã³å‡ºã—å¯èƒ½ã§ã¯ã‚ã‚Šã¾ã›ã‚“)" #, python-format +msgid "calling hook %s: %s\n" +msgstr "フック %s:%s 呼ã³å‡ºã—ä¸\n" + +#, python-format msgid "error: %s hook failed: %s\n" msgstr "エラー: フック %s ã®å¤±æ•—: %s\n" @@ -23367,6 +23409,10 @@ msgstr "%s ã®ãƒãƒƒã‚¯ (%rãŒä¿æŒ) ã®è§£æ”¾ã‚’å¾…ã£ã¦ã„ã¾ã™\n" #, python-format +msgid "got lock after %s seconds\n" +msgstr "%s 秒é…ã‚Œã§ãƒãƒƒã‚¯ã‚’ç²å¾—\n" + +#, python-format msgid "repository %s" msgstr "リãƒã‚¸ãƒˆãƒª '%s'" @@ -23418,78 +23464,6 @@ msgid "trouble committing %s!\n" msgstr "%s ã®ã‚³ãƒŸãƒƒãƒˆã«å¤±æ•—ã—ã¾ã—ãŸ!\n" -msgid "requesting all changes\n" -msgstr "全リビジョンをå–å¾—ä¸\n" - -msgid "" -"partial pull cannot be done because other repository doesn't support " -"changegroupsubset." -msgstr "連æºå…ˆã® changegroupsubset 機能未対応ã«ã‚ˆã‚Šã€ 部分å–ã‚Šè¾¼ã¿ã§ãã¾ã›ã‚“。" - -msgid "destination does not support push" -msgstr "指定ã®é€£æºå…ˆã«ã¯å±¥æ´ã‚’åæ˜ ã§ãã¾ã›ã‚“" - -#, python-format -msgid "cannot lock source repo, skipping local %s phase update\n" -msgstr "リãƒã‚¸ãƒˆãƒªã‚’ãƒãƒƒã‚¯ã§ããªã„ãŸã‚ã€ãƒãƒ¼ã‚«ãƒ«ã® %s フェーズ更新をçœç•¥\n" - -#, python-format -msgid "push includes obsolete changeset: %s!" -msgstr "å±¥æ´åæ˜ å¯¾è±¡ã«å»ƒæ¢ (obsolete) リビジョンãŒå«ã¾ã‚Œã¾ã™ï¼: %s" - -#, python-format -msgid "push includes unstable changeset: %s!" -msgstr "å±¥æ´åæ˜ å¯¾è±¡ã«éžæ°¸ç¶š (unstable) リビジョンãŒå«ã¾ã‚Œã¾ã™ï¼: %s" - -#, python-format -msgid "push includes bumped changeset: %s!" -msgstr "" - -#, python-format -msgid "push includes divergent changeset: %s!" -msgstr "å±¥æ´åæ˜ å¯¾è±¡ã«åˆ†å² (divergent) ã—ãŸå¾Œç¶™ãƒªãƒ“ジョンãŒå«ã¾ã‚Œã¾ã™ï¼: %s" - -#, python-format -msgid "updating %s to public failed!\n" -msgstr "%s ã®ãƒ•ã‚§ãƒ¼ã‚ºã® public 化ã«å¤±æ•—!\n" - -#, python-format -msgid "%d changesets found\n" -msgstr "%d 個ã®ãƒªãƒ“ジョンãŒã‚ã‚Šã¾ã™\n" - -msgid "adding changesets\n" -msgstr "ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã‚’è¿½åŠ ä¸\n" - -msgid "chunks" -msgstr "ãƒãƒ£ãƒ³ã‚¯" - -msgid "received changelog group is empty" -msgstr "å—ä¿¡ã—ãŸå¤‰æ›´å±¥æ´ã¯ç©ºã§ã™" - -msgid "adding manifests\n" -msgstr "ãƒžãƒ‹ãƒ•ã‚§ã‚¹ãƒˆã‚’è¿½åŠ ä¸\n" - -msgid "adding file changes\n" -msgstr "ファイルã®å¤‰æ›´ã‚’è¿½åŠ ä¸\n" - -#, python-format -msgid " (%+d heads)" -msgstr " (%+d個ã®ãƒ˜ãƒƒãƒ‰)" - -#, python-format -msgid "added %d changesets with %d changes to %d files%s\n" -msgstr "%d 個ã®ãƒªãƒ“ジョン(%d ã®å¤‰æ›´ã‚’ %d ファイルã«é©ç”¨)ã‚’è¿½åŠ %s\n" - -msgid "received file revlog group is empty" -msgstr "ファイルã®ãƒªãƒ“ジョンãƒã‚°ãŒç©ºã§ã™" - -msgid "received spurious file revlog entry" -msgstr "ファイルã®ãƒªãƒ“ジョンãƒã‚°ãŒä¸æ£ãªæƒ…å ±ã‚’å«ã‚“ã§ã„ã¾ã™" - -#, python-format -msgid "missing file data for %s:%s - run hg verify" -msgstr "%s:%s ã®ãƒ•ã‚¡ã‚¤ãƒ«ãƒ‡ãƒ¼ã‚¿ãŒä¸åœ¨ã§ã™ - hg verify を実施ã—ã¦ãã ã•ã„" - msgid "unexpected response from remote server:" msgstr "連æºå…ˆã®ã‚µãƒ¼ãƒã‹ã‚‰äºˆæœŸã—ãªã„返信:" @@ -23592,8 +23566,9 @@ msgid "diff context lines count must be an integer, not %r" msgstr "差分コンテã‚ストã§ã®è¡Œæ•°æŒ‡å®šãŒä¸æ£ã§ã™: %r" -msgid "unsupported merge state record:" -msgstr "未サãƒãƒ¼ãƒˆãªãƒžãƒ¼ã‚¸çŠ¶æ…‹ãŒè¨˜éŒ²ã•ã‚Œã¦ã„ã¾ã™:" +#, python-format +msgid "unsupported merge state record: %s" +msgstr "未サãƒãƒ¼ãƒˆãªãƒžãƒ¼ã‚¸çŠ¶æ…‹ãŒè¨˜éŒ²ã•ã‚Œã¦ã„ã¾ã™: %s" #, python-format msgid "warning: cannot merge flags for %s\n" @@ -23615,24 +23590,6 @@ msgstr "管ç†ãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã®è§£æ±ºä¸\n" #, python-format -msgid "" -"local changed %s which remote deleted\n" -"use (c)hanged version or (d)elete?$$ &Changed $$ &Delete" -msgstr "" -"変更ã—ãŸãƒ•ã‚¡ã‚¤ãƒ« %s ãŒã€ãƒžãƒ¼ã‚¸å¯¾è±¡ãƒªãƒ“ジョンã§ç™»éŒ²é™¤å¤–ã•ã‚Œã¦ã„ã¾ã™ã€‚\n" -"変更:(c)hanged ã¨ç™»éŒ²é™¤å¤–:(d)elete ã®ã©ã¡ã‚‰ã‚’採用ã—ã¾ã™ã‹ï¼Ÿ$$ &Changed $$ " -"&Delete" - -#, python-format -msgid "" -"remote changed %s which local deleted\n" -"use (c)hanged version or leave (d)eleted?$$ &Changed $$ &Deleted" -msgstr "" -"登録除外済ã¿ã®ãƒ•ã‚¡ã‚¤ãƒ« %s ãŒã€ãƒžãƒ¼ã‚¸å¯¾è±¡ãƒªãƒ“ジョンã§å¤‰æ›´ã•ã‚Œã¦ã„ã¾ã™ã€‚\n" -"変更:(c)hanged ã¨ç™»éŒ²é™¤å¤–:(d)elete ã®ã©ã¡ã‚‰ã‚’採用ã—ã¾ã™ã‹ï¼Ÿ$$ &Changed $$ " -"&Deleted" - -#, python-format msgid "update failed to remove %s: %s!\n" msgstr "%s ã®å‰Šé™¤ã«å¤±æ•—: %s!\n" @@ -23655,6 +23612,54 @@ msgid "note: possible conflict - %s was deleted and renamed to:\n" msgstr "備考: è¡çªã®å¯èƒ½æ€§ - 削除ã¨å¹³è¡Œã—㦠%s ã¸ã®æ”¹åãŒã‚ã‚Šã¾ã™:\n" +#, python-format +msgid "note: merging %s and %s using bids from ancestors %s\n" +msgstr "備考: 以下ã®ç¥–å…ˆã®è©•ä¾¡é¸è€ƒã‚’元㫠%s 㨠%s をマージä¸: %s\n" + +#, python-format +msgid "" +"\n" +"calculating bids for ancestor %s\n" +msgstr "" +"\n" +"祖先 %s ã®è©•ä¾¡å€¤ã‚’算出ä¸\n" + +msgid "" +"\n" +"auction for merging merge bids\n" +msgstr "" +"\n" +"評価値ã®é¸è€ƒä¸\n" + +#, python-format +msgid " %s: multiple bids for merge action:\n" +msgstr " %s: マージ処ç†ã®å€™è£œãŒè¤‡æ•°ã‚ã‚Šã‚ã¾ã™:\n" + +#, python-format +msgid " %s: ambiguous merge - picked %s action\n" +msgstr " %s: 複数ã®å‡¦ç†å€™è£œã‹ã‚‰ %s 処ç†ã‚’é¸æŠžã—ã¾ã—ãŸ\n" + +msgid "end of auction" +msgstr "é¸è€ƒçµ‚了" + +#, python-format +msgid "" +"local changed %s which remote deleted\n" +"use (c)hanged version or (d)elete?$$ &Changed $$ &Delete" +msgstr "" +"変更ã—ãŸãƒ•ã‚¡ã‚¤ãƒ« %s ãŒã€ãƒžãƒ¼ã‚¸å¯¾è±¡ãƒªãƒ“ジョンã§ç™»éŒ²é™¤å¤–ã•ã‚Œã¦ã„ã¾ã™ã€‚\n" +"変更:(c)hanged ã¨ç™»éŒ²é™¤å¤–:(d)elete ã®ã©ã¡ã‚‰ã‚’採用ã—ã¾ã™ã‹ï¼Ÿ$$ &Changed $$ " +"&Delete" + +#, python-format +msgid "" +"remote changed %s which local deleted\n" +"use (c)hanged version or leave (d)eleted?$$ &Changed $$ &Deleted" +msgstr "" +"登録除外済ã¿ã®ãƒ•ã‚¡ã‚¤ãƒ« %s ãŒã€ãƒžãƒ¼ã‚¸å¯¾è±¡ãƒªãƒ“ジョンã§å¤‰æ›´ã•ã‚Œã¦ã„ã¾ã™ã€‚\n" +"変更:(c)hanged ã¨ç™»éŒ²é™¤å¤–:(d)elete ã®ã©ã¡ã‚‰ã‚’採用ã—ã¾ã™ã‹ï¼Ÿ$$ &Changed $$ " +"&Deleted" + msgid "merging with a working directory ancestor has no effect" msgstr "作æ¥é ˜åŸŸã®ç¥–å…ˆã¨ã®ãƒžãƒ¼ã‚¸ã¯æ„味ãŒã‚ã‚Šã¾ã›ã‚“" @@ -23723,11 +23728,9 @@ msgid "unknown key: %r" msgstr "未知ã®ã‚ーã§ã™: %r" -msgid "unexpected old value" -msgstr "旧値ã®æŒ‡å®šã¯æƒ³å®šå¤–ã§ã™" - -msgid "failed to push some obsolete markers!\n" -msgstr "リビジョンã®å»ƒæ¢æƒ…å ±ã®åæ˜ ã«å¤±æ•—ã—ã¾ã—ãŸï¼\n" +#, python-format +msgid "unexpected old value for %r" +msgstr "%r ã«å¯¾ã™ã‚‹æ—§å€¤ã®æŒ‡å®šã¯æƒ³å®šå¤–ã§ã™" #, python-format msgid "unexpected token: %s" @@ -23985,7 +23988,7 @@ msgid "" "``ancestor(*changeset)``\n" -" Greatest common ancestor of the changesets." +" A greatest common ancestor of the changesets." msgstr "" "``ancestor(*changeset)``\n" " 指定リビジョン郡ã«å…±é€šãªæœ€æ–°ã®ç¥–先。" @@ -24022,6 +24025,23 @@ msgstr "author ã«ã¯æ–‡å—列を指定ã—ã¦ãã ã•ã„" msgid "" +"``only(set, [set])``\n" +" Changesets that are ancestors of the first set that are not ancestors\n" +" of any other head in the repo. If a second set is specified, the result\n" +" is ancestors of the first set that are not ancestors of the second set\n" +" (i.e. ::<set1> - ::<set2>)." +msgstr "" +"``only(set1, [set2])``\n" +" 第1引数リビジョン群ã®ç¥–å…ˆã§ã€ 且ã¤ç¬¬2引数リビジョン群ã®ç¥–å…ˆã§ãªã„ã‚‚ã®\n" +" (::<set1> - ::<set2> ã¨ç‰ä¾¡)。 第2引数çœç•¥æ™‚ã¯ã€ æ§‹é€ çš„ãƒ˜ãƒƒãƒ‰ã®ä¸ã§ã€\n" +" 第1引数ã¨ãã®åå«ç¾¤ã«å«ã¾ã‚Œãªã„ヘッドãŒã€ 比較対象ã¨ã—ã¦ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚\n" +" (※ 訳注: ::<set1> - ::(heads() - heads(<set2>::)) ã¨ç‰ä¾¡)" + +#. i18n: "only" is a keyword +msgid "only takes one or two arguments" +msgstr "only ã®å¼•æ•°ã¯1ã¤ã¾ãŸã¯2ã¤ã§ã™" + +msgid "" "``bisect(string)``\n" " Changesets marked in the specified bisect status:" msgstr "" @@ -24146,8 +24166,8 @@ msgid "" "``contains(pattern)``\n" -" Revision contains a file matching pattern. See :hg:`help patterns`\n" -" for information about file patterns." +" The revision's manifest contains a file matching pattern (but might not\n" +" modify it). See :hg:`help patterns` for information about file patterns." msgstr "" "``contains(pattern)``\n" " パターンã«åˆè‡´ã™ã‚‹åå‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒå˜åœ¨ã™ã‚‹ãƒªãƒ“ジョン群。\n" @@ -24151,7 +24171,7 @@ msgstr "" "``contains(pattern)``\n" " パターンã«åˆè‡´ã™ã‚‹åå‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒå˜åœ¨ã™ã‚‹ãƒªãƒ“ジョン群。\n" -" パターンã®è©³ç´°ã¯ :hg:`help patterns` ã‚’å‚照。" +" (変更ã®æœ‰ç„¡ã¯åˆ¤å®šã—ã¾ã›ã‚“) パターンã®è©³ç´°ã¯ :hg:`help patterns` ã‚’å‚照。" msgid "" " The pattern without explicit kind like ``glob:`` is expected to be\n" @@ -24297,14 +24317,17 @@ " パターンã«åˆè‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®å¤‰æ›´ã«é–¢é€£ä»˜ã‘られãŸãƒªãƒ“ジョン群。" msgid "" -" For performance reasons, ``filelog()`` does not show every changeset\n" -" that affects the requested file(s). See :hg:`help log` for details. For\n" -" a slower, more accurate result, use ``file()``." -msgstr "" -" 指定ファイルã®é–¢é€£ãƒªãƒ“ジョンã§ã‚ã£ã¦ã‚‚〠``filelog()`` ã«ã‚ˆã£ã¦ã€\n" -" å¿…ãšã—も列挙ã•ã‚Œã‚‹ã¨ã¯é™ã‚‰ãªã„ã®ã¯ã€ 性能上ã®ç†ç”±ã‹ã‚‰ã§ã™ã€‚\n" -" ã“ã®æŒ™å‹•ã®è©³ç´°ã«é–¢ã—ã¦ã¯ :hg:`help log` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n" -" 低速ã§ã‚‚〠æ£ç¢ºãªçµæžœãŒå¿…è¦ãªå ´åˆã¯ ``file()`` を使用ã—ã¦ãã ã•ã„。" +" For performance reasons, visits only revisions mentioned in the file-" +"level\n" +" filelog, rather than filtering through all changesets (much faster, but\n" +" doesn't include deletes or duplicate changes). For a slower, more " +"accurate\n" +" result, use ``file()``." +msgstr "" +" 性能上ã®ç†ç”±ã‹ã‚‰ã€ 全リビジョンã«å¯¾ã™ã‚‹å¤‰æ›´å®Ÿæ–½ã®æœ‰ç„¡ç¢ºèªã§ã¯ãªãã€\n" +" ファイルå˜ä½ã®å±¥æ´è¨˜éŒ²ã‚’å…ƒã«æŠ½å‡ºã—ã¾ã™ (高速ãªä»£ã‚ã‚Šã«ã€ 登録除外やã€\n" +" åŒä¸€å¤‰æ›´ã®è¤‡æ•°å®Ÿæ–½ãªã©ã¯ã€ 検出ã§ãã¾ã›ã‚“)。 実行性能ã®é«˜ã•ã‚ˆã‚Šã‚‚ã€\n" +" æ£ç¢ºãªçµæžœãŒå¿…è¦ãªå ´åˆã¯ ``file()`` を使用ã—ã¦ãã ã•ã„。" #. i18n: "filelog" is a keyword msgid "filelog requires a pattern" @@ -24522,6 +24545,9 @@ "``min(set)``\n" " 指定リビジョン群ä¸ã§ã€ リビジョン番å·ãŒæœ€å°ã®ã‚‚ã®ã€‚" +msgid "_missingancestors requires two arguments" +msgstr "_missingancestors ã®å¼•æ•°ã¯2ã¤ã§ã™" + msgid "" "``modifies(pattern)``\n" " Changesets modifying files matched by pattern." @@ -24942,8 +24968,12 @@ msgstr ".hg/requires ファイルãŒç ´æã—ã¦ã„ã¾ã™" #, python-format -msgid "unknown repository format: requires features '%s' (upgrade Mercurial)" -msgstr "未知ã®ãƒªãƒã‚¸ãƒˆãƒªå½¢å¼ã§ã™: '%s' サãƒãƒ¼ãƒˆãŒå¿…è¦ (è¦ Mercurial æ›´æ–°)" +msgid "repository requires features unknown to this Mercurial: %s" +msgstr "リãƒã‚¸ãƒˆãƒªã®è¦æ±‚ã™ã‚‹æ©Ÿèƒ½ãŒå®Ÿè¡Œä¸ã®Mercurialã«ã¨ã£ã¦æœªçŸ¥ã§ã™: %s" + +msgid "" +"see http://mercurial.selenic.com/wiki/MissingRequirement for more information" +msgstr "詳細㯠http://mercurial.selenic.com/wiki/MissingRequirement å‚ç…§" msgid "searching for changes\n" msgstr "変更点を探索ä¸\n" @@ -25681,6 +25711,9 @@ msgid "fill expects an integer width" msgstr "fill ã«ã¯æ•°å€¤ã‚’指定ã—ã¦ãã ã•ã„" +msgid "pad() expects two to four arguments" +msgstr "pad() ã®å¼•æ•°ã¯2ã¤ã‹ã‚‰4ã¤ã®é–“ã§ã™" + #. i18n: "get" is a keyword msgid "get() expects two arguments" msgstr "get() ã®å¼•æ•°ã¯2ã¤ã§ã™" @@ -25693,6 +25726,10 @@ msgid "if expects two or three arguments" msgstr "if ã¯2ã¾ãŸã¯3ã®å¼•æ•°ãŒå¿…è¦ã§ã™" +#. i18n: "ifcontains" is a keyword +msgid "ifcontains expects three or four arguments" +msgstr "ifcontains ã¯3ã¾ãŸã¯4ã®å¼•æ•°ãŒå¿…è¦ã§ã™" + #. i18n: "ifeq" is a keyword msgid "ifeq expects three or four arguments" msgstr "ifeq ã¯3ã¾ãŸã¯4ã®å¼•æ•°ãŒå¿…è¦ã§ã™" @@ -25701,7 +25738,11 @@ msgid "join expects one or two arguments" msgstr "join ã®å¼•æ•°ã¯1ã¤ã¾ãŸã¯2ã¤ã§ã™" +#. i18n: "revset" is a keyword +msgid "revset expects one or more arguments" +msgstr "revset ã®å¼•æ•°ã¯1ã¤ã¾ãŸã¯2ã¤ã§ã™" + #. i18n: "rstdoc" is a keyword msgid "rstdoc expects two arguments" msgstr "rstdoc ã®å¼•æ•°ã¯2ã¤ã§ã™" @@ -25704,7 +25745,10 @@ #. i18n: "rstdoc" is a keyword msgid "rstdoc expects two arguments" msgstr "rstdoc ã®å¼•æ•°ã¯2ã¤ã§ã™" +msgid "shortest() expects one or two arguments" +msgstr "shortest() ã®å¼•æ•°ã¯1ã¤ã¾ãŸã¯2ã¤ã§ã™" + msgid "strip expects one or two arguments" msgstr "strip ã®å¼•æ•°ã¯1ã¤ã¾ãŸã¯2ã¤ã§ã™" @@ -25745,6 +25789,10 @@ msgid "failed to truncate %s\n" msgstr "%s ã®åˆ‡ã‚Šè©°ã‚ã«å¤±æ•—\n" +#, python-format +msgid "failed to recover %s\n" +msgstr "%s ã®å¾©æ—§ã«å¤±æ•—\n" + msgid "transaction abort!\n" msgstr "トランザクションをä¸æ–ã—ã¾ã™!\n" @@ -25754,6 +25802,10 @@ msgid "rollback failed - please run hg recover\n" msgstr "ãƒãƒ¼ãƒ«ãƒãƒƒã‚¯ã«å¤±æ•—ã—ã¾ã—㟠- 'hg recover' ã—ã¦ãã ã•ã„\n" +#, python-format +msgid "couldn't read journal entry %r!\n" +msgstr "ジャーナルファイルä¸ã®ã‚¨ãƒ³ãƒˆãƒª %r ã®è§£æžã«å¤±æ•—\n" + msgid "already have changeset " msgstr "æ—¢ã«ã‚るリビジョンã§ã™ " @@ -25788,8 +25840,11 @@ msgid "no username found, using '%s' instead\n" msgstr "ユーザåãŒä¸æ˜Žã®ãŸã‚〠'%s' を使用\n" -msgid "no username supplied (see \"hg help config\")" -msgstr "ユーザåãŒæœªæŒ‡å®šã§ã™(\"hg help config\" å‚ç…§)" +msgid "no username supplied" +msgstr "ユーザåãŒæœªæŒ‡å®šã§ã™" + +msgid "use \"hg config --edit\" to set your username" +msgstr "\"hg config --edit\" 実行ã§ãƒ¦ãƒ¼ã‚¶åã‚’è¨å®šã—ã¦ãã ã•ã„" #, python-format msgid "username %s contains a newline\n" @@ -26176,8 +26231,5 @@ msgid "look up remote changes" msgstr "連æºå…ˆã§ã®å¤‰æ›´ã®æ¤œç´¢" -msgid "push failed:" -msgstr "å±¥æ´åæ˜ ã«å¤±æ•—:" - msgid "number of cpus must be an integer" msgstr "CPU æ•°ã«ã¯æ•°å€¤ã‚’指定ã—ã¦ãã ã•ã„"