diff --git a/i18n/ja.po b/i18n/ja.po index 288f5b083e09188bc245218dbf83f8d090609b9a_aTE4bi9qYS5wbw==..c65dfc8e7a5767fa47363b9c8dd1cc457264d313_aTE4bi9qYS5wbw== 100644 --- a/i18n/ja.po +++ b/i18n/ja.po @@ -106,6 +106,7 @@ # must(A must B) A 㯠B ã—ã¦ãã ã•ã„ # node リビジョン (ã‚ã‚‹ã„ã¯ã€Œå¯¾è±¡ã€ã¨ã„ã†è¨€ã„回ã—) # note 備考 +# obsolete(obsoleted) 廃æ¢(済ã¿) # patch パッム# phase フェーズ # draft (,) draft (※ 予約語扱ã„) @@ -161,8 +162,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2016-01-01 11:10+0900\n" -"PO-Revision-Date: 2016-01-01 12:11+0900\n" +"POT-Creation-Date: 2016-02-01 22:30+0900\n" +"PO-Revision-Date: 2016-02-01 22:50+0900\n" "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -1464,6 +1465,48 @@ msgid "censor tombstone must be no longer than censored data" msgstr "å·®ã—替ãˆç”¨ã®å¢“碑データã¯ã€æ¤œé–²å¯¾è±¡ãƒ‡ãƒ¼ã‚¿ã‚ˆã‚Šã‚‚çŸãã—ã¦ãã ã•ã„" +msgid "command server extension for cHg (EXPERIMENTAL)" +msgstr "" + +msgid "" +"'S' channel (read/write)\n" +" propagate ui.system() request to client" +msgstr "" + +msgid "" +"'attachio' command\n" +" attach client's stdio passed by sendmsg()" +msgstr "" + +msgid "" +"'chdir' command\n" +" change current directory" +msgstr "" + +msgid "" +"'getpager' command\n" +" checks if pager is enabled and which pager should be executed" +msgstr "" + +msgid "" +"'setenv' command\n" +" replace os.environ completely" +msgstr "" + +#, fuzzy +msgid "" +"'SIGHUP' signal\n" +" reload configuration files\n" +msgstr " (éžæŽ¨å¥¨: è¨å®šãƒ•ã‚¡ã‚¤ãƒ«çµŒç”±ã§æŒ‡å®šã—ã¦ãã ã•ã„)" + +#, fuzzy +msgid "invalid response" +msgstr "引数ãŒä¸æ£ã§ã™" + +#, python-format +msgid "abort: %s\n" +msgstr "ä¸æ¢: %s\n" + msgid "command to display child changesets (DEPRECATED)" msgstr "åリビジョン表示ã®ã‚³ãƒžãƒ³ãƒ‰ (éžæŽ¨å¥¨)" @@ -1487,15 +1530,29 @@ " revision is given via -r/--rev, the children of that revision will\n" " be printed. If a file argument is given, revision in which the\n" " file was last changed (after the working directory revision or the\n" -" argument to --rev if given) is printed.\n" -" " -msgstr "" -" 作æ¥é ˜åŸŸã®åリビジョンを表示ã—ã¾ã™ã€‚ -r/--rev ã«ã‚ˆã‚‹ãƒªãƒ“ジョン指定ãŒ\n" -" ã‚ã‚‹å ´åˆã¯ã€ 指定リビジョンã®åリビジョンを表示ã—ã¾ã™ã€‚ 引数ã¨ã—ã¦\n" -" ファイルãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ ファイルãŒ(作æ¥é ˜åŸŸã®ãƒªãƒ“ジョン〠ã¾ãŸã¯\n" -" --rev ã§æŒ‡å®šã•ã‚ŒãŸãƒªãƒ“ジョンã®å¾Œã§)最後ã«å¤‰æ›´ã•ã‚ŒãŸãƒªãƒ“ジョンを表示\n" -" ã—ã¾ã™ã€‚\n" -" " +" argument to --rev if given) is printed." +msgstr "" +" 作æ¥é ˜åŸŸã®åリビジョンを表示ã—ã¾ã™ã€‚ -r/--rev 指定ãŒã‚ã‚‹å ´åˆã€\n" +" 指定リビジョンã®åリビジョンを表示ã—ã¾ã™ã€‚ ファイルãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€\n" +" ファイル㌠(作æ¥é ˜åŸŸã®è¦ªã€ ã¾ãŸã¯ --rev ã§ã®æŒ‡å®šãƒªãƒ“ジョン後ã«)\n" +" 最後ã«å¤‰æ›´ã•ã‚ŒãŸãƒªãƒ“ジョンを表示ã—ã¾ã™ã€‚" + +msgid " Please use :hg:`log` instead::" +msgstr " 本コマンドã®ä»£ã‚ã‚Šã« :hg:`log` を使ã†ã‚ˆã†ã«ã—ã¦ãã ã•ã„::" + +msgid "" +" hg children => hg log -r 'children()'\n" +" hg children -r REV => hg log -r 'children(REV)'" +msgstr "" +" hg children => hg log -r 'children()'\n" +" hg children -r REV => hg log -r 'children(REV)'" + +msgid " See :hg:`help log` and :hg:`help revsets.children`." +msgstr "" +" 詳細㯠:hg:`help log` ã‚„ :hg:`help revsets.children` ã‚’å‚ç…§ã®ã“ã¨ã€‚" + +msgid " " +msgstr " " msgid "command to display statistics about repository history" msgstr "変更履æ´ã®çµ±è¨ˆæƒ…å ±è¡¨ç¤ºã®ã‚³ãƒžãƒ³ãƒ‰" @@ -1630,7 +1687,7 @@ msgid "skipping malformed alias: %s\n" msgstr "ä¸æ£ãªå½¢å¼ã®åˆ¥åを無視: %s\n" -msgid "advertise pre-generated bundles to seed clones (experimental)" +msgid "advertise pre-generated bundles to seed clones" msgstr "" msgid "" @@ -1693,7 +1750,7 @@ "* Generating bundle files of repository content (typically periodically,\n" " such as once per day).\n" "* A file server that clients have network access to and that Python knows\n" -" how to talk to through its normal URL handling facility (typically a\n" +" how to talk to through its normal URL handling facility (typically an\n" " HTTP server).\n" "* A process for keeping the bundles manifest in sync with available bundle\n" " files." @@ -1729,14 +1786,6 @@ msgstr "" msgid "" -"The list of requirements printed by :hg:`debugcreatestreamclonebundle` " -"should\n" -"be specified in the ``requirements`` parameter of the *bundle specification\n" -"string* for the ``BUNDLESPEC`` manifest property described below. e.g.\n" -"``BUNDLESPEC=none-packed1;requirements%3Drevlogv1``." -msgstr "" - -msgid "" "A server operator is responsible for creating a ``.hg/clonebundles." "manifest``\n" "file containing the list of available bundle files suitable for seeding\n" @@ -1790,6 +1839,13 @@ msgstr "" msgid "" +" :hg:`debugbundle --spec` can be used to print the bundle specification\n" +" string for a bundle file. The output of this command can be used " +"verbatim\n" +" for the value of ``BUNDLESPEC`` (it is already escaped)." +msgstr "" + +msgid "" " Clients will automatically filter out specifications that are unknown or\n" " unsupported so they won't attempt to download something that likely " "won't\n" @@ -1804,7 +1860,8 @@ msgid "" " **Use of this key is highly recommended**, as it allows clients to\n" -" easily skip unsupported bundles." +" easily skip unsupported bundles. If this key is not defined, an old\n" +" client may attempt to apply a bundle that it is incapable of reading." msgstr "" msgid "" @@ -1866,59 +1923,7 @@ "failure\n" "occurs. So server operators should prepare for some people to follow these\n" "instructions when a failure occurs, thus driving more load to the original\n" -"Mercurial server when the bundle hosting service fails." -msgstr "" - -msgid "" -"The following config options influence the behavior of the clone bundles\n" -"feature:" -msgstr "" - -msgid "" -"ui.clonebundleadvertise\n" -" Whether the server advertises the existence of the clone bundles feature\n" -" to compatible clients that aren't using it." -msgstr "" - -msgid "" -" When this is enabled (the default), a server will send a message to\n" -" compatible clients performing a traditional clone informing them of the\n" -" available clone bundles feature. Compatible clients are those that " -"support\n" -" bundle2 and are advertising support for the clone bundles feature." -msgstr "" - -msgid "" -"ui.clonebundlefallback\n" -" Whether to automatically fall back to a traditional clone in case of\n" -" clone bundles failure. Defaults to false for reasons described above." -msgstr "" - -msgid "" -"experimental.clonebundles\n" -" Whether the clone bundles feature is enabled on clients. Defaults to true." -msgstr "" - -msgid "" -"experimental.clonebundleprefers\n" -" List of \"key=value\" properties the client prefers in bundles. " -"Downloaded\n" -" bundle manifests will be sorted by the preferences in this list. e.g.\n" -" the value \"BUNDLESPEC=gzip-v1, BUNDLESPEC=bzip2=v1\" will prefer a " -"gzipped\n" -" version 1 bundle type then bzip2 version 1 bundle type." -msgstr "" - -msgid "" -" If not defined, the order in the manifest will be used and the first\n" -" available bundle will be downloaded.\n" -msgstr "" - -msgid "" -"this server supports the experimental \"clone bundles\" feature that should " -"enable faster and more reliable cloning\n" -"help test it by setting the \"experimental.clonebundles\" config flag to " -"\"true\"" +"Mercurial server when the bundle hosting service fails.\n" msgstr "" msgid "colorize output from some commands" @@ -4035,12 +4040,6 @@ msgid "cleaning up temp directory\n" msgstr "一時ディレクトリã®ç ´æ£„ä¸\n" -msgid "CMD" -msgstr "コマンド" - -msgid "comparison program to run" -msgstr "差分表示プãƒã‚°ãƒ©ãƒ " - msgid "OPT" msgstr "オプション" @@ -4056,6 +4055,12 @@ msgid "compare patches for two revisions" msgstr "2ã¤ã®ãƒªãƒ“ジョンã«å¯¾ã™ã‚‹ãƒ‘ッãƒã®æ¯”較" +msgid "CMD" +msgstr "コマンド" + +msgid "comparison program to run" +msgstr "差分表示プãƒã‚°ãƒ©ãƒ " + msgid "hg extdiff [OPT]... [FILE]..." msgstr "hg extdiff [OPT]... [FILE]..." @@ -4090,9 +4095,9 @@ " revisions are specified, the working directory files are compared\n" " to its parent." msgstr "" -" リビジョンãŒ2ã¤æŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定リビジョン間ã®å·®åˆ†ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n" -" リビジョンãŒ1ã¤æŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 作æ¥é ˜åŸŸã¨ã®é–“ã®å·®åˆ†ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n" -" リビジョンãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ 作æ¥é ˜åŸŸã¨è¦ªã¨ã®å·®åˆ†ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚" +" リビジョン指定ãŒ2ã¤ã®å ´åˆã€ 指定リビジョン間ã®å·®åˆ†ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n" +" リビジョン指定ãŒ1ã¤ã®å ´åˆã€ 作æ¥é ˜åŸŸãŒæŒ‡å®šãƒªãƒ“ジョンã¨æ¯”較ã•ã‚Œã¾ã™ã€‚\n" +" リビジョン指定ãŒãªã„å ´åˆã€ 作æ¥é ˜åŸŸãŒç¬¬1親リビジョンã¨æ¯”較ã•ã‚Œã¾ã™ã€‚" #, python-format msgid "use %(path)s to diff repository (or selected files)" @@ -4385,8 +4390,10 @@ msgid "" "The functionality of this extension has been include in core Mercurial\n" -"since version 2.3." -msgstr "本エクステンションã®æ©Ÿèƒ½ã¯ Mercurial 2.3 ã‹ã‚‰æ¨™æº–機能ã«ãªã‚Šã¾ã—ãŸã€‚" +"since version 2.3. Please use :hg:`log -G ...` instead." +msgstr "" +"本エクステンションã®æ©Ÿèƒ½ã¯ Mercurial 2.3 ã‹ã‚‰æ¨™æº–機能ã«ãªã‚Šã¾ã—ãŸã€‚\n" +":hg:`log -G ...` を使ã†ã‚ˆã†ã«ã—ã¦ãã ã•ã„。" msgid "" "This extension adds a --graph option to the incoming, outgoing and log\n" @@ -4452,10 +4459,14 @@ msgid "" " Nodes printed as an @ character are parents of the working\n" -" directory.\n" -" " -msgstr "" -" @ æ–‡å—ã§è¡¨ç¤ºã•ã‚Œã‚‹ãƒªãƒ“ジョンã¯ã€ 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã§ã™ã€‚\n" +" directory." +msgstr " @ æ–‡å—ã§è¡¨ç¤ºã•ã‚Œã‚‹ãƒªãƒ“ジョンã¯ã€ 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã§ã™ã€‚" + +msgid "" +" This is an alias to :hg:`log -G`.\n" +" " +msgstr "" +" 本コマンド㯠:hg:`log -G` ã®åˆ¥åã§ã™ã€‚\n" " " msgid "hooks for integrating with the CIA.vc notification service" @@ -4779,5 +4790,5 @@ " # m, mess = edit commit message without changing commit content\n" " #" msgstr "" -" # c561b4e977df ã‹ã‚‰ 7c2fd3b9020c ã«ã‹ã‘ã¦ã®å±¥æ´ã®ç·¨é›†\n" +" # リビジョン c561b4e977df ã‹ã‚‰ 7c2fd3b9020c ã«ã‹ã‘ã¦ã®å±¥æ´ã®æ”¹å¤‰\n" " #\n" @@ -4783,5 +4794,5 @@ " #\n" -" # 対象一覧ã¯ã€ãƒªãƒ“ジョン番å·ã®æ˜‡é † (å¤ã„æ–¹ã‹ã‚‰æ–°ã—ã„æ–¹) ã«ãªã£ã¦ã„ã¾ã™ã€‚\n" +" # 改変対象一覧ã¯ã€ãƒªãƒ“ジョン番å·ã®æ˜‡é † (å°â‡’大) ã«ãªã£ã¦ã„ã¾ã™ã€‚\n" " #\n" " # 指定å¯èƒ½ã‚³ãƒžãƒ³ãƒ‰:\n" " # p, pick = リビジョンを採用\n" @@ -4800,7 +4811,7 @@ "before beta, and then wanted to add delta in the same revision as beta, you\n" "would reorganize the file to look like this::" msgstr "" -"ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ä¸ã® ``#`` ã§å§‹ã¾ã‚‹è¡Œã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚ å±¥æ´ç·¨é›†å¯¾è±¡ã«å¯¾ã—ã¦ã€\n" +"ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ä¸ã® ``#`` ã§å§‹ã¾ã‚‹è¡Œã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚ å±¥æ´æ”¹å¤‰å¯¾è±¡ã«å¯¾ã—ã¦ã€\n" "å„リビジョン毎ã®å‡¦ç†å†…容 (rule) を指定ã—ã¦ãã ã•ã„。 例ãˆã° \"Add beta\"\n" "ã«ã‚ˆã‚‹å¤‰æ›´ã‚ˆã‚Šã‚‚ \"Add gamma\" ã«ã‚ˆã‚‹å¤‰æ›´ã‚’å…ˆã«å®Ÿæ–½ã—ãŸä¸Šã§ã€ \"Add\n" "delta\" ã«ã‚ˆã‚‹å¤‰æ›´ã‚’ \"Add beta\" ã¸ã¨ä½µåˆ (fold) ã™ã‚‹å ´åˆãªã‚‰ã€\n" @@ -4923,7 +4934,7 @@ "history." msgstr "" "å±¥æ´æ”¹å¤‰ã«ã‚ˆã‚‹è¡çªãŒ ``histedit`` ã«ã‚ˆã£ã¦ (``pick`` ã‚„ ``fold``\n" -"æ“作ã«ãŠã„ã¦) 検出ã•ã‚ŒãŸå ´åˆã«ã€ 一旦コマンド入力ã«æˆ»ã‚‹ç‚¹ã¯ ``edit``\n" +"æ“作ã®éš›ã«) 検出ã•ã‚ŒãŸå ´åˆã«ã€ 一旦コマンド入力ã«æˆ»ã‚‹ç‚¹ã¯ ``edit``\n" "æ“作ã¨åŒã˜ã§ã™ãŒã€ è¡çªè§£æ¶ˆä½œæ¥ãŒå®Œäº†ã—㦠``hg histedit --continue``\n" "を実行ã—ã¦ã‚‚〠コミットãƒã‚°ã®å•ã„åˆã‚ã›ãŒç„¡ã„点㯠``edit`` ã¨ç•°ãªã‚Šã¾ã™ã€‚\n" "ã“ã®æ™‚点ã§ã€ å±¥æ´æ”¹å¤‰ã«ä¼´ã†ä½œæ¥é‡ã®å•é¡Œã‚„〠間é•ã„ã«æ°—付ã„ãŸå ´åˆã¯ã€\n" @@ -4992,7 +5003,14 @@ "を指定ã™ã‚‹ã“ã¨ã§ã€ 元リãƒã‚¸ãƒˆãƒªã¨ã®é–¢é€£ã‚ã‚Šã¨ã¿ãªã™ã“ã¨ãŒã§ãã¾ã™ã€‚" msgid "" +"Config\n" +"------" +msgstr "" +"è¨å®š\n" +"----" + +msgid "" "Histedit rule lines are truncated to 80 characters by default. You\n" "can customize this behavior by setting a different length in your\n" "configuration file::" msgstr "" @@ -4995,9 +5013,9 @@ "Histedit rule lines are truncated to 80 characters by default. You\n" "can customize this behavior by setting a different length in your\n" "configuration file::" msgstr "" -"histedit ã§ã®æ”¹å¤‰æŒ‡ç¤ºè¡Œã¯ã€ 80 カラムã§ã®åˆ‡ã‚Šè©°ã‚ãŒãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã™ã€‚\n" +"生æˆã•ã‚Œã‚‹æ”¹å¤‰æŒ‡ç¤ºã®è¡Œã¯ã€ 80 カラムã§ã®åˆ‡ã‚Šè©°ã‚ãŒãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã™ã€‚\n" "以下ã®è¨å®šã«ã‚ˆã‚Šã€ 切り詰ã‚ã®ã‚«ãƒ©ãƒ 幅を変更ã§ãã¾ã™::" msgid "" " [histedit]\n" @@ -5000,7 +5018,22 @@ "以下ã®è¨å®šã«ã‚ˆã‚Šã€ 切り詰ã‚ã®ã‚«ãƒ©ãƒ 幅を変更ã§ãã¾ã™::" msgid "" " [histedit]\n" -" linelen = 120 # truncate rule lines at 120 characters\n" +" linelen = 120 # truncate rule lines at 120 characters" +msgstr "" +" [histedit]\n" +" linelen = 120 # 改変指示行を 120 カラムã§åˆ‡ã‚Šè©°ã‚" + +msgid "" +"``hg histedit`` attempts to automatically choose an appropriate base\n" +"revision to use. To change which base revision is used, define a\n" +"revset in your configuration file::" +msgstr "" +":hg:`histedit` ã¯ã€ é©åˆ‡ãªæ”¹å¤‰å¯¾è±¡ãƒªãƒ“ジョンを〠自動的ã«é¸æŠžã—ã¾ã™ã€‚\n" +"対象ã®é¸æŠžæ–¹å¼ã‚’変更ã—ãŸã„å ´åˆã€ è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ä»¥ä¸‹ã®æ§˜ãªè¨˜è¿°ã‚’è¿½åŠ ã—ã¾ã™::" + +msgid "" +" [histedit]\n" +" defaultrev = only(.) & draft()" msgstr "" " [histedit]\n" @@ -5005,35 +5038,35 @@ msgstr "" " [histedit]\n" -" linelen = 120 # 改変指示行を 120 カラムã§åˆ‡ã‚Šè©°ã‚\n" - -#. i18n: command names and abbreviations must remain untranslated -#, python-format -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" -"# f, fold = use commit, but combine it with the one above\n" -"# r, roll = like fold, but discard this commit's description\n" -"# d, drop = remove commit from history\n" -"# m, mess = edit commit message without changing commit content\n" -"#\n" -msgstr "" -"# %s ã‹ã‚‰ %s ã«ã‹ã‘ã¦ã®å±¥æ´ã®ç·¨é›†\n" -"#\n" -"# 対象一覧ã¯ã€ãƒªãƒ“ジョン番å·ã®æ˜‡é † (å¤ã„æ–¹ã‹ã‚‰æ–°ã—ã„æ–¹) ã«ãªã£ã¦ã„ã¾ã™ã€‚\n" -"#\n" -"# 指定å¯èƒ½ã‚³ãƒžãƒ³ãƒ‰:\n" -"# p, pick = リビジョンを採用\n" -"# e, edit = リビジョンを採用: 但ã—ä¿®æ£ã®ãŸã‚ã«ä¸€æ—¦å®Ÿè¡Œã‚’ä¸æ–\n" -"# f, fold = リビジョンを採用: 但ã—ç›´å‰(ï¼ ä¸€è¦§ã§ã®ä¸Š)ã®ãƒªãƒ“ジョンã«ä½µåˆ\n" -"# r, roll = リビジョンを採用: fold åŒæ§˜ä½µåˆã™ã‚‹ãŒã€ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã¯ç ´æ£„\n" -"# d, drop = ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã‚’ç ´æ£„\n" -"# m, mess = リビジョンを採用: 変更内容をç¶æŒã—ã¤ã¤ã€ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã‚’ä¿®æ£\n" -"#\n" +" defaultrev = only(.) & draft()" + +msgid "" +"By default each edited revision needs to be present in histedit commands.\n" +"To remove revision you need to use ``drop`` operation. You can configure\n" +"the drop to be implicit for missing commits by adding:" +msgstr "" +"å…¨ã¦ã®æ”¹å¤‰å¯¾è±¡ãƒªãƒ“ジョンã«å¯¾ã—ã¦ã€ 改変指示ã®è¨˜è¿°ãŒå¿…è¦ã«ãªã‚Šã¾ã™ã€‚\n" +"特定ã®ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã‚’ç ´æ£„ã™ã‚‹å ´åˆã¯ ``drop`` æ“作を指定ã—ã¦ãã ã•ã„。\n" +"以下ã®è¨˜è¿°ã‚’è¿½åŠ ã™ã‚‹ã“ã¨ã§ã€ 改変指示ã®ãªã„リビジョンã«å¯¾ã—ã¦ã€\n" +"``drop`` æ“作を実施ã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™:" + +msgid "" +" [histedit]\n" +" dropmissing = True" +msgstr "" +" [histedit]\n" +" dropmissing = True" + +#, python-format +msgid "Edit history between %s and %s" +msgstr "リビジョン %s ã‹ã‚‰ %s ã«ã‹ã‘ã¦ã®å±¥æ´ã®æ”¹å¤‰" + +#, python-format +msgid "Commits are listed from least to most recent" +msgstr "改変対象一覧ã¯ã€ãƒªãƒ“ジョン番å·ã®æ˜‡é † (å°â‡’大) ã«ãªã£ã¦ã„ã¾ã™ã€‚" + +#, python-format +msgid "Commands:\n" +msgstr "利用å¯èƒ½ã‚³ãƒžãƒ³ãƒ‰:\n" msgid "no histedit in progress" msgstr "実施ä¸ã® histedit ã«ã‚ˆã‚‹å±¥æ´æ”¹å¤‰ã¯ã‚ã‚Šã¾ã›ã‚“" @@ -5042,8 +5075,12 @@ msgid "unknown changeset %s listed" msgstr "未知ã®ãƒªãƒ“ジョン %s ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" -msgid "Fix up the change and run hg histedit --continue" -msgstr "è¡çªè§£æ¶ˆå¾Œã« 'hg histedit --continue' を実行ã—ã¦ãã ã•ã„" +#, python-format +msgid "Fix up the change (%s %s)" +msgstr "è¡çªã‚’解消ã—ã¦ãã ã•ã„ (%s %s)" + +msgid "hg histedit --continue to resume" +msgstr "hg histedit --continue ã§å±¥æ´æ”¹å¤‰ã‚’å†é–‹ã§ãã¾ã™" #, python-format msgid "%s: empty changeset\n" @@ -5053,12 +5090,28 @@ msgid "cannot fold into public change %s" msgstr "public フェーズã®ãƒªãƒ“ジョン %s ã¸ã®ä½µåˆã¯ã§ãã¾ã›ã‚“" -msgid "" -"Make changes as needed, you may commit or record as needed now.\n" -"When you are finished, run hg histedit --continue to resume." -msgstr "" -"å¿…è¦ã«å¿œã˜ã¦å¤‰æ›´ï¼ã‚³ãƒŸãƒƒãƒˆã‚’è¡Œã£ã¦ãã ã•ã„。\n" -"作æ¥å®Œäº†å¾Œã¯ 'hg histedit --continue' 㧠histedit ã‚’å†é–‹ã—ã¾ã™ã€‚" +msgid "working copy has pending changes" +msgstr "作æ¥é ˜åŸŸã®å¤‰æ›´ãŒæœªã‚³ãƒŸãƒƒãƒˆã§ã™" + +msgid "" +"amend, commit, or revert them and run histedit --continue, or abort with " +"histedit --abort" +msgstr "" +"commit (--amend) ã¾ãŸã¯ revert を実施後ã€hg histedit --continue ã‹ hg " +"histedit --abort を実施ã—ã¦ãã ã•ã„" + +msgid "use commit" +msgstr "リビジョンを採用" + +msgid "use commit, but stop for amending" +msgstr "リビジョンを採用: 但ã—ä¿®æ£ã®ãŸã‚ã«ä¸€æ—¦å®Ÿè¡Œã‚’ä¸æ–" + +#, python-format +msgid "Editing (%s), you may commit or record as needed now." +msgstr "変更内容改変 (%s): 変更を実施ã—ã¦ãã ã•ã„ (è¿½åŠ ã‚³ãƒŸãƒƒãƒˆã‚‚å¯)" + +msgid "use commit, but combine it with the one above" +msgstr "リビジョンを採用: 但ã—ç›´å‰(ï¼ ä¸€è¦§ã§ã®ä¸Š)ã®ãƒªãƒ“ジョンã«ä½µåˆ" #, python-format msgid "" @@ -5066,6 +5119,27 @@ msgstr "" "%s: ä½µåˆã§ãã¾ã›ã‚“ - 作æ¥é ˜åŸŸã¯ç›´å‰ã®ã‚³ãƒŸãƒƒãƒˆ %s ã®åå«ã§ã¯ã‚ã‚Šã¾ã›ã‚“\n" +msgid "fold subclass used for when multiple folds happen in a row" +msgstr "" + +msgid "" +" We only want to fire the editor for the folded message once when\n" +" (say) four changes are folded down into a single change. This is\n" +" similar to rollup, but we should preserve both messages so that\n" +" when the last fold operation runs we can show the user all the\n" +" commit messages in their editor.\n" +" " +msgstr "" + +msgid "like fold, but discard this commit's description" +msgstr "リビジョンを採用: fold åŒæ§˜ä½µåˆã™ã‚‹ãŒã€ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã¯ç ´æ£„" + +msgid "remove commit from history" +msgstr "ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã‚’ç ´æ£„" + +msgid "edit commit message without changing commit content" +msgstr "リビジョンを採用: 変更内容をç¶æŒã—ã¤ã¤ã€ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã‚’ä¿®æ£" + #, python-format msgid "comparing with %s\n" msgstr "%s ã¨æ¯”較ä¸\n" @@ -5103,10 +5177,10 @@ msgid "first revision to be edited" msgstr "改変対象ã®æœ€åˆã®ãƒªãƒ“ジョン" -msgid "ANCESTOR | --outgoing [URL]" -msgstr "ANCESTOR | --outgoing [URL]" +msgid "[OPTIONS] ([ANCESTOR] | --outgoing [URL])" +msgstr "[OPTIONS] ([ANCESTOR] | --outgoing [URL])" msgid "interactively edit changeset history" msgstr "対話的ãªå±¥æ´ã®æ”¹å¤‰" msgid "" @@ -5108,42 +5182,162 @@ msgid "interactively edit changeset history" msgstr "対話的ãªå±¥æ´ã®æ”¹å¤‰" msgid "" -" This command edits changesets between ANCESTOR and the parent of\n" -" the working directory." -msgstr "" -" 本コマンドã¯ã€ 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã¨ã€æŒ‡å®šã—ãŸç¥–å…ˆ (ANCESTOR)\n" -" ã¨ã®é–“ã®ãƒªãƒ“ジョン群を改変ã—ã¾ã™ã€‚" - -msgid "" -" With --outgoing, this edits changesets not found in the\n" -" destination repository. If URL of the destination is omitted, the\n" -" 'default-push' (or 'default') path will be used." -msgstr "" -" --outgoing 指定ã®ã‚ã‚‹å ´åˆã€ 連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã¸ã®åæ˜ å€™è£œãƒªãƒ“ã‚¸ãƒ§ãƒ³ãŒã€\n" -" 改変対象ã¨ã—ã¦é¸æŠžã•ã‚Œã¾ã™ã€‚ 連æºå…ˆ URL ãŒçœç•¥ã•ã‚ŒãŸå ´åˆã€\n" -" 'default-push' (ã¾ãŸã¯ 'default') 指定ã®ãƒ‘スãŒå‚ç…§ã•ã‚Œã¾ã™ã€‚" - -msgid "" -" For safety, this command is also aborted if there are ambiguous\n" -" outgoing revisions which may confuse users: for example, if there\n" -" are multiple branches containing outgoing revisions." -msgstr "" -" åæ˜ å€™è£œãƒªãƒ“ã‚¸ãƒ§ãƒ³ãŒã€ 利用者ã«ã¨ã£ã¦ç´›ã‚‰ã‚ã—ã„å ´åˆã€ 安全性ã®ç‚¹ã‹ã‚‰ã€\n" -" å±¥æ´æ”¹å¤‰ã¯ä¸æ¢ã•ã‚Œã¾ã™ã€‚ 紛らã‚ã—ã„例ã¨ã—ã¦ã¯ã€ åæ˜ å€™è£œãƒªãƒ“ã‚¸ãƒ§ãƒ³ãŒã€\n" -" 複数ã®ãƒ–ランãƒä¸Šã«å˜åœ¨ã™ã‚‹ã‚±ãƒ¼ã‚¹ãªã©ãŒã‚ã‚Šã¾ã™ã€‚" - -msgid "" -" Use \"min(outgoing() and ::.)\" or similar revset specification\n" -" instead of --outgoing to specify edit target revision exactly in\n" -" such ambiguous situation. See :hg:`help revsets` for detail about\n" -" selecting revisions." -msgstr "" -" 紛らã‚ã—ã•ã®ãŸã‚ã« --outgoing ãŒä½¿ç”¨ã§ããªã„å ´åˆã€ \"min(outgoing()\n" -" and ::.)\" ã¾ãŸã¯åŒç‰ã® revset 表記を使ã£ã¦ã€ 改変対象リビジョンをã€\n" -" 厳密ã«æŒ‡å®šã—ã¦ãã ã•ã„。 リビジョン指定ã®è©³ç´°ã¯ :hg:`help revsets`\n" -" ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" +" This command lets you edit a linear series of changesets (up to\n" +" and including the working directory, which should be clean).\n" +" You can::" +msgstr "" +" 本コマンドã¯ã€ 作æ¥é ˜åŸŸã®è¦ªã¨ã€ ãã®ç›´ç³»ã®ç¥–å…ˆã®å±¥æ´æ”¹å¤‰ã‚’è¡Œã„ã¾ã™\n" +" (作æ¥é ˜åŸŸä¸ã®å¤‰æ›´ã¯ã€ 事å‰ã«ã‚³ãƒŸãƒƒãƒˆï¼ç ´æ£„ã—ã¦ãã ã•ã„)。\n" +" 利用å¯èƒ½ãªæ”¹å¤‰æ“作機能ã¯ä»¥ä¸‹ã®é€šã‚Šã§ã™::" + +msgid " - `pick` to [re]order a changeset" +msgstr " - `pick` ã§ãƒªãƒ“ジョンを採用" + +msgid " - `drop` to omit changeset" +msgstr " - `drop` ã§ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã‚’ç ´æ£„" + +msgid " - `mess` to reword the changeset commit message" +msgstr " - `mess` ã§ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã‚’ä¿®æ£" + +msgid " - `fold` to combine it with the preceding changeset" +msgstr " - `fold` ã§ç›´å‰ã®ãƒªãƒ“ジョンã«ä½µåˆ" + +msgid " - `roll` like fold, but discarding this commit's description" +msgstr " - `roll` 㧠fold åŒæ§˜ä½µåˆã™ã‚‹ãŒã€ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã¯ç ´æ£„" + +msgid " - `edit` to edit this changeset" +msgstr " - `edit` ã§å¤‰æ›´å†…容をå†ç·¨é›†" + +msgid " There are a number of ways to select the root changset::" +msgstr " 改変対象リビジョンã®æŒ‡å®šã«ã¯ã€ 以下ã®æ§˜ãªæ–¹æ³•ãŒã‚ã‚Šã¾ã™::" + +msgid " - Specify ANCESTOR directly" +msgstr " - 引数ã§æ”¹å¤‰å¯¾è±¡ã®ç¥–å…ˆ (ANCESTOR) を直接指定" + +msgid "" +" - Use --outgoing -- it will be the first linear changeset not\n" +" included in destination. (See :hg:\"help default-push\")" +msgstr "" +" - ``--outgoing`` 指定時ã¯ã€ 連æºå…ˆã¸ã®åæ˜ å€™è£œãƒªãƒ“ã‚¸ãƒ§ãƒ³ã®ã†ã¡ã€\n" +" 作æ¥é ˜åŸŸã®è¦ªã®ç›´ç³»ã®ç¥–先を改変 (:hg:`help default-push` å‚ç…§)" + +msgid "" +" - Otherwise, the value from the \"histedit.defaultrev\" config option\n" +" is used as a revset to select the base revision when ANCESTOR is not\n" +" specified. The first revision returned by the revset is used. By\n" +" default, this selects the editable history that is unique to the\n" +" ancestry of the working directory." +msgstr "" +" - 改変対象ã®æŒ‡å®šãŒãªã„å ´åˆã€ \"histedit.defaultrev\" è¨å®šã‚’使ã£ã¦ã€\n" +" 改変対象ãŒé¸æŠžã•ã‚Œã¾ã™ã€‚ revset 記述ã§å¾—ãŸæœ€åˆã®ãƒªãƒ“ジョンã¨ã€\n" +" ãã®ç›´ç³»ã®åå«ãŒã€ 改変対象ã¨ãªã‚Šã¾ã™ã€‚ 明示的ãªæŒ‡å®šãŒãªã„å ´åˆã€\n" +" 作æ¥é ˜åŸŸã®è¦ªãŒå±žã™ã‚‹ (æ§‹é€ çš„) ブランãƒå›ºæœ‰ã®ãƒªãƒ“ジョンãŒã€\n" +" 改変対象ã¨ãªã‚Šã¾ã™ã€‚" + +msgid "" +" If you use --outgoing, this command will abort if there are " +"ambiguous\n" +" outgoing revisions. For example, if there are multiple branches\n" +" containing outgoing revisions." +msgstr "" +" ``--outgoing`` 指定ã®éš›ã«ã€æ”¹å¤‰å¯¾è±¡ã®é¸æŠžãŒç´›ã‚‰ã‚ã—ã„å ´åˆã€\n" +" å±¥æ´æ”¹å¤‰ã¯ä¸æ¢ã•ã‚Œã¾ã™ã€‚ 例ãˆã°ã€ åæ˜ å€™è£œãƒªãƒ“ã‚¸ãƒ§ãƒ³ãŒã€\n" +" 複数ã®ãƒ–ランãƒä¸Šã«å˜åœ¨ã™ã‚‹ã‚±ãƒ¼ã‚¹ãªã©ã§ã™ã€‚" + +msgid "" +" Use \"min(outgoing() and ::.)\" or similar revset specification\n" +" instead of --outgoing to specify edit target revision exactly in\n" +" such ambiguous situation. See :hg:`help revsets` for detail about\n" +" selecting revisions." +msgstr "" +" 紛らã‚ã—ã•ã®ãŸã‚ã« --outgoing ãŒä½¿ç”¨ã§ããªã„å ´åˆã€ \"min(outgoing()\n" +" and ::.)\" ã¾ãŸã¯åŒç‰ã® revset 表記ã«ã‚ˆã‚Šã€ 改変対象リビジョンをã€\n" +" 厳密ã«æŒ‡å®šã—ã¦ãã ã•ã„。 リビジョン指定ã®è©³ç´°ã¯ :hg:`help revsets`\n" +" ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" + +msgid " Examples:" +msgstr " 例:" + +msgid "" +" - A number of changes have been made.\n" +" Revision 3 is no longer needed." +msgstr "" + +msgid " Start history editing from revision 3::" +msgstr "" + +msgid " hg histedit -r 3" +msgstr " hg histedit -r 3" + +msgid "" +" An editor opens, containing the list of revisions,\n" +" with specific actions specified::" +msgstr "" + +msgid "" +" pick 5339bf82f0ca 3 Zworgle the foobar\n" +" pick 8ef592ce7cc4 4 Bedazzle the zerlog\n" +" pick 0a9639fcda9d 5 Morgify the cromulancy" +msgstr "" +" pick 5339bf82f0ca 3 Zworgle the foobar\n" +" pick 8ef592ce7cc4 4 Bedazzle the zerlog\n" +" pick 0a9639fcda9d 5 Morgify the cromulancy" + +msgid "" +" Additional information about the possible actions\n" +" to take appears below the list of revisions." +msgstr "" + +msgid "" +" To remove revision 3 from the history,\n" +" its action (at the beginning of the relevant line)\n" +" is changed to 'drop'::" +msgstr "" + +msgid "" +" drop 5339bf82f0ca 3 Zworgle the foobar\n" +" pick 8ef592ce7cc4 4 Bedazzle the zerlog\n" +" pick 0a9639fcda9d 5 Morgify the cromulancy" +msgstr "" +" drop 5339bf82f0ca 3 Zworgle the foobar\n" +" pick 8ef592ce7cc4 4 Bedazzle the zerlog\n" +" pick 0a9639fcda9d 5 Morgify the cromulancy" + +msgid "" +" - A number of changes have been made.\n" +" Revision 2 and 4 need to be swapped." +msgstr "" + +msgid " Start history editing from revision 2::" +msgstr "" + +msgid " hg histedit -r 2" +msgstr " hg histedit -r 2" + +msgid "" +" pick 252a1af424ad 2 Blorb a morgwazzle\n" +" pick 5339bf82f0ca 3 Zworgle the foobar\n" +" pick 8ef592ce7cc4 4 Bedazzle the zerlog" +msgstr "" +" pick 252a1af424ad 2 Blorb a morgwazzle\n" +" pick 5339bf82f0ca 3 Zworgle the foobar\n" +" pick 8ef592ce7cc4 4 Bedazzle the zerlog" + +msgid "" +" To swap revision 2 and 4, its lines are swapped\n" +" in the editor::" +msgstr "" + +msgid "" +" pick 8ef592ce7cc4 4 Bedazzle the zerlog\n" +" pick 5339bf82f0ca 3 Zworgle the foobar\n" +" pick 252a1af424ad 2 Blorb a morgwazzle" +msgstr "" +" pick 8ef592ce7cc4 4 Bedazzle the zerlog\n" +" pick 5339bf82f0ca 3 Zworgle the foobar\n" +" pick 252a1af424ad 2 Blorb a morgwazzle" msgid "" " Returns 0 on success, 1 if user intervention is required (not only\n" @@ -5197,8 +5391,17 @@ msgid "%s is not an ancestor of working directory" msgstr "%s ã¯ä½œæ¥é ˜åŸŸã®ç¥–å…ˆã§ã¯ã‚ã‚Šã¾ã›ã‚“" -msgid "working copy still dirty" -msgstr "作æ¥é ˜åŸŸã«æœªã‚³ãƒŸãƒƒãƒˆãªå¤‰æ›´ãŒæ®‹ã£ã¦ã„ã¾ã™" +# this is left untranslated intentionally, because this VERY GENERIC +# word may be used also for something other than histedit +# (by foozy@lares.dti.ne.jp) +msgid "editing" +msgstr "" + +# this is left untranslated intentionally, because this VERY GENERIC +# word may be used also for something other than histedit +# (by foozy@lares.dti.ne.jp) +msgid "changes" +msgstr "" msgid "cannot edit history that would orphan nodes" msgstr "å±¥æ´ãƒ„リーãŒåˆ†æ–ã•ã‚Œã‚‹ã‚ˆã†ãªå±¥æ´æ”¹å¤‰ã¯ã§ãã¾ã›ã‚“" @@ -5217,8 +5420,27 @@ msgid "malformed line \"%s\"" msgstr "ä¸æ£ãªè¡Œ \"%s\"" -msgid "may not use changesets other than the ones listed" -msgstr "対象範囲以外ã®ãƒªãƒ“ジョンã¯æŒ‡å®šã§ãã¾ã›ã‚“" +#, python-format +msgid "unknown action \"%s\"" +msgstr "未知ã®æ“作 \"%s\" ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" + +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" @@ -5222,11 +5444,7 @@ #, python-format msgid "duplicated command for changeset %s" -msgstr "リビジョン %s ã¸ã®ãƒ«ãƒ¼ãƒ«æŒ‡å®šãŒè¤‡æ•°ã‚ã‚Šã¾ã™" - -#, python-format -msgid "unknown action \"%s\"" -msgstr "未知ã®æ“作 \"%s\" ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" +msgstr "リビジョン %s ã¸ã®æ“作指定ãŒè¤‡æ•°ã‚ã‚Šã¾ã™" #, python-format msgid "missing rules for changeset %s" @@ -5230,10 +5448,13 @@ #, python-format msgid "missing rules for changeset %s" -msgstr "リビジョン %s ã¸ã®ãƒ«ãƒ¼ãƒ«æŒ‡å®šãŒã‚ã‚Šã¾ã›ã‚“" - -msgid "do you want to use the drop action?" -msgstr "リビジョンã®ç ´æ£„ã«ã¯ drop コマンド指定ãŒå¿…è¦ã§ã™" +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\"ã‚‚å‚ç…§" +"ã—ã¦ãã ã•ã„。" #, python-format msgid "histedit: moving bookmarks %s from %s to %s\n" @@ -5258,6 +5479,12 @@ msgid "use 'hg histedit --continue' or 'hg histedit --abort'" msgstr "'hg histedit --continue' ã‹ 'hg histedit --abort' を実施ã—ã¦ãã ã•ã„" +msgid "hg histedit --continue" +msgstr "hg histedit --continue" + +msgid "checkout changeset and apply further changesets from there" +msgstr "" + msgid "expand keywords in tracked files" msgstr "構æˆç®¡ç†å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ä¸ã®ã‚ーワード展開" @@ -6017,6 +6244,14 @@ msgid "%s: data corruption in %s with hash %s\n" msgstr "%s: %s (実ãƒãƒƒã‚·ãƒ¥å€¤ %s) ã§ãƒ‡ãƒ¼ã‚¿ç ´æを検出\n" +#, python-format +msgid "%s: largefile %s not available from local store\n" +msgstr "%s: 大容é‡ãƒ•ã‚¡ã‚¤ãƒ« %s ã¯ãƒãƒ¼ã‚«ãƒ«ã«å˜åœ¨ã—ã¾ã›ã‚“\n" + +#, python-format +msgid "%s: file not found!" +msgstr "%s: ファイルãŒä¸åœ¨ã§ã™!" + msgid "finding outgoing largefiles" msgstr "転é€å¯¾è±¡å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ã®æ¤œå‡ºä¸" @@ -7776,9 +8011,8 @@ msgid "mq: (empty queue)\n" msgstr "mq: (ã‚ューã¯ç©ºã§ã™)\n" -msgid "" -"``mq()``\n" -" Changesets managed by MQ." +#, fuzzy +msgid "Changesets managed by MQ." msgstr "" "``mq()``\n" " MQ 管ç†ä¸‹ã«ã‚るリビジョン" @@ -8195,13 +8429,21 @@ "ãã®æ—¨ã‚’明記ã—ã¦ãã ã•ã„。" msgid "" -"The --pager=... option can also be used to control when the pager is\n" -"used. Use a boolean value like yes, no, on, off, or use auto for\n" -"normal behavior." -msgstr "" -"ページャーã®ä½¿ç”¨ã¯ã€ --pager=... ã§ã‚‚制御ã§ãã¾ã™ã€‚\n" -"真å½å€¤ã® yes no on off 以外ã«ã€ 無指定時挙動ã«ç›¸å½“ã™ã‚‹ auto\n" -"を指定ã§ãã¾ã™ã€‚" +"To control whether the pager is used at all for an individual command,\n" +"you can use --pager=<value>::" +msgstr "" +"--pager=<value> を指定ã™ã‚‹ã“ã¨ã§ã€ ページャã®ä½¿ç”¨ã‚’ã€ã‚³ãƒžãƒ³ãƒ‰å®Ÿè¡Œã®éƒ½åº¦ã€\n" +"明示ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™::" + +msgid "" +" - use as needed: `auto`.\n" +" - require the pager: `yes` or `on`.\n" +" - suppress the pager: `no` or `off` (any unrecognized value\n" +" will also work)." +msgstr "" +" - å¿…è¦ã«å¿œã˜ã¦ä½¿ã†: `auto`\n" +" - 使用ã™ã‚‹: `yes` ã¾ãŸã¯ `on`\n" +" - 使用ã—ãªã„: `no` ã¾ãŸã¯ `off` (ä¸æ£ãªå€¤ã¯ `off` 相当ã®æ‰±ã„)" msgid "when to paginate (boolean, always, auto, or never)" msgstr "ページャーã®è¦å¦ (真å½å€¤ã€ always auto ã¾ãŸã¯ never)" @@ -8294,6 +8536,22 @@ "(※ 訳注: :hg:`help config` ã§ã‚‚å‚ç…§å¯èƒ½)" msgid "" +"By default, :hg:`email` will prompt for a ``To`` or ``CC`` header if\n" +"you do not supply one via configuration or the command line. You can\n" +"override this to never prompt by configuring an empty value::" +msgstr "" +"コマンド実行時や〠è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã§ã®æŒ‡å®šãŒãªã„å ´åˆã€ :hg:`email` ã¯\n" +"``To`` ã‚„ ``CC`` ヘッダ値を〠ユーザã«å•ã„åˆã‚ã›ã¾ã™ã€‚ 空値ã®è¨å®šã¯ã€\n" +"å•ã„åˆã‚ã›ã‚’抑æ¢ã—ã¾ã™::" + +msgid "" +" [email]\n" +" cc =" +msgstr "" +" [email]\n" +" cc =" + +msgid "" "You can control the default inclusion of an introduction message with the\n" "``patchbomb.intro`` configuration option. The configuration is always\n" "overwritten by command line flags like --intro and --desc::" @@ -8657,18 +8915,6 @@ msgid "writing" msgstr "書ã出ã—ä¸" -msgid "show progress bars for some actions (DEPRECATED)" -msgstr "処ç†ã«ãŠã‘る進æ—率ã®è¡¨ç¤º (éžæŽ¨å¥¨)" - -msgid "" -"This extension has been merged into core, you can remove it from your " -"config.\n" -"See hg help config.progress for configuration options.\n" -msgstr "" -"本エクステンションã¯ã€ 本体機能ã«å–ã‚Šè¾¼ã¾ã‚Œã¾ã—ãŸã®ã§ã€è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰\n" -"progress 有効化è¨å®šã‚’削除å¯èƒ½ã§ã™ã€‚ 進æ—表示ã®è¨å®šè©³ç´°ã«é–¢ã—ã¦ã¯\n" -"'hg help config.progress' ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n" - msgid "command to delete untracked files from the working directory" msgstr "作æ¥é ˜åŸŸä¸ã®æœªç™»éŒ²ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰" @@ -8852,23 +9098,12 @@ " æžåˆ†ã‹ã‚Œã®ç„¡ã„状態ã«ã—ãŸã„å ´åˆãªã©ã§æœ‰ç”¨ã§ã™ã€‚" msgid "" -" You should not rebase changesets that have already been shared\n" -" with others. Doing so will force everybody else to perform the\n" -" same rebase or they will end up with duplicated changesets after\n" -" pulling in your rebased changesets." -msgstr "" -" ä»–ã®åˆ©ç”¨è€…ã«å…¬é–‹æ¸ˆã¿ã®ãƒªãƒ“ジョンã¯ã€ 移動ã™ã¹ãã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n" -" 公開済ã¿ãƒªãƒ“ジョンã®ç§»å‹•ã¯ã€ çµæžœçš„ã«ã€ ä»–ã®åˆ©ç”¨è€…ã«å¯¾ã—ã¦ã€\n" -" åŒæ§˜ã®ãƒªãƒ“ジョン移動æ“作を強制ã—ã¦ã—ã¾ã£ãŸã‚Šã€ 公開済ã¿ã¨ç§»å‹•å¾Œã®ã€\n" -" 両方ã®ãƒªãƒ“ジョンã®å–ã‚Šè¾¼ã¿ã«ã‚ˆã‚Šã€ リビジョンãŒé‡è¤‡ã—ãŸã‚Šã¨ã„ã£ãŸã€\n" -" 悪影響ãŒã‚ã‚Šã¾ã™ã€‚" - -msgid "" -" In its default configuration, Mercurial will prevent you from\n" -" rebasing published changes. See :hg:`help phases` for details." -msgstr "" -" 通常ã®è¨å®šã§ã¯ã€ 公開済ã¿ãƒªãƒ“ジョンã¯ã€ 移動ã§ãã¾ã›ã‚“。 詳細ã¯\n" -" :hg:`help phases` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" +" Published commits cannot be rebased (see :hg:`help phases`).\n" +" To copy commits, see :hg:`help graft`." +msgstr "" +" public フェーズã®ãƒªãƒ“ジョンã¯ã€ 移動対象ã«æŒ‡å®šã§ãã¾ã›ã‚“\n" +" (:hg:`help phases` å‚ç…§)。 複製ã«ã‚ˆã‚‹ãƒªãƒ“ジョンã®ç§»æ¤ã«é–¢ã—ã¦ã¯ã€\n" +" :hg:`help graft` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" msgid "" " If you don't specify a destination changeset (``-d/--dest``),\n" @@ -8881,71 +9116,60 @@ " (移動先リビジョン自身ã¯æ”¹å¤‰ã•ã‚Œã¾ã›ã‚“ãŒã€ 移動先ã®åå«ã¨ã—ã¦ã€\n" " æ–°è¦ãƒªãƒ“ジョンãŒè¿½åŠ ã•ã‚Œã¾ã™)" -msgid "" -" You can specify which changesets to rebase in two ways: as a\n" -" \"source\" changeset or as a \"base\" changeset. Both are shorthand\n" -" for a topologically related set of changesets (the \"source\n" -" branch\"). If you specify source (``-s/--source``), rebase will\n" -" rebase that changeset and all of its descendants onto dest. If you\n" -" specify base (``-b/--base``), rebase will select ancestors of base\n" -" back to but not including the common ancestor with dest. Thus,\n" -" ``-b`` is less precise but more convenient than ``-s``: you can\n" -" specify any changeset in the source branch, and rebase will select\n" -" the whole branch. If you specify neither ``-s`` nor ``-b``, rebase\n" -" uses the parent of the working directory as the base." -msgstr "" -" 移動対象リビジョンã®æŒ‡å®šã«ã¯ã€ \"source\" 指定㨠\"base\" 指定ã®ã€\n" -" 2ã¤ã®æ–¹æ³•ãŒä½¿ãˆã¾ã™ã€‚ ã„ãšã‚Œã‚‚å±¥æ´ãƒ„リーã‹ã‚‰ç§»å‹•å¯¾è±¡ã‚’抽出ã™ã‚‹ãŸã‚ã®ã€\n" -" 簡易化ã•ã‚ŒãŸæ–¹æ³•ã§ã™ã€‚ \"source\" (``-s/--source``) を指定ã—ãŸå ´åˆã€\n" -" 指定リビジョン〠ãŠã‚ˆã³ãã®åå«å…¨ã¦ã‚’移動ã—ã¾ã™ã€‚ \"base\"\n" -" (``-b/--base``) を指定ã—ãŸå ´åˆã€ 指定リビジョンã‹ã‚‰é¡ã‚Šã€\n" -" 移動先ã¨ã®å…±é€šç¥–å…ˆã¾ã§ã®ç¯„囲を〠移動対象ã¨ã—ã¦é¸æŠžã—ã¾ã™ã€‚\n" -" ``-s`` 指定よりも ``-b`` 指定ã¯ç²¾å¯†ã•ã§åŠ£ã‚Šã¾ã™ãŒã€ ãã®åˆ†ä¾¿åˆ©ã§ã™ã€‚\n" -" 移動元ã®ãƒ–ランãƒã«ãŠã„ã¦ã€ ä»»æ„ã®ãƒªãƒ“ジョンをé¸æŠžã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šã€\n" -" ブランãƒå…¨ä½“ãŒé¸æŠžã•ã‚Œã¾ã™ã€‚ ``-s`` ã‚‚ ``-b`` も指定ã—ãªã„å ´åˆã€\n" -" 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンを \"base\" ã¨ã¿ãªã—ã¾ã™ã€‚" - -msgid "" -" For advanced usage, a third way is available through the ``--rev``\n" -" option. It allows you to specify an arbitrary set of changesets to\n" -" rebase. Descendants of revs you specify with this option are not\n" -" automatically included in the rebase." -msgstr "" -" よりè¸ã¿è¾¼ã‚“ã 対象指定ã¨ã—ã¦ã€ ``--rev`` を使用ã™ã‚‹æ–¹æ³•ãŒã‚ã‚Šã¾ã™ã€‚\n" -" ``--rev`` を使ã†ã“ã¨ã§ã€ä»»æ„ã®ãƒªãƒ“ジョンを〠移動対象ã«æŒ‡å®šã§ãã¾ã™ã€‚\n" -" ã“ã®æ–¹æ³•ã§ãƒªãƒ“ジョンを指定ã—ãŸå ´åˆã€ 指定リビジョンã®åå«ã¯ã€\n" -" 自動的ã«ã¯ç§»å‹•å¯¾è±¡ã«å«ã¾ã‚Œã¾ã›ã‚“。" - -msgid "" -" By default, rebase recreates the changesets in the source branch\n" -" as descendants of dest and then destroys the originals. Use\n" -" ``--keep`` to preserve the original source changesets. Some\n" -" changesets in the source branch (e.g. merges from the destination\n" -" branch) may be dropped if they no longer contribute any change." -msgstr "" -" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ 本コマンドã¯ç§»å‹•å…ƒãƒ–ランãƒã®ãƒªãƒ“ジョンをã€\n" -" 移動先ã®åå«ã¨ã—ã¦å†ç”Ÿæˆã—〠ãã®å¾Œã«å…ƒãƒªãƒ“ã‚¸ãƒ§ãƒ³ã‚’ç ´æ£„ã—ã¾ã™ã€‚\n" -" 移動元リビジョンを残ã™å ´åˆã€ ``--keep`` を指定ã—ã¦ãã ã•ã„。\n" -" 移動元ブランãƒã®ãƒªãƒ“ジョンã®ã†ã¡ã€ 何も貢献ã®ç„¡ã„リビジョン\n" -" (例: 移動先ブランãƒã¨ã®ãƒžãƒ¼ã‚¸å®Ÿæ–½ãƒªãƒ“ジョンç‰) ã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚" - -msgid "" -" One result of the rules for selecting the destination changeset\n" -" and source branch is that, unlike ``merge``, rebase will do\n" -" nothing if you are at the branch tip of a named branch\n" -" with two heads. You need to explicitly specify source and/or\n" -" destination (or ``update`` to the other head, if it's the head of\n" -" the intended source branch)." -msgstr "" -" ç¾è¡Œã®åå‰ä»˜ãブランãƒãŒ2ã¤ã®ãƒ˜ãƒƒãƒ‰ã‚’æŒã¡ã€ 且ã¤ä½œæ¥é ˜åŸŸã®è¦ªãŒã€\n" -" 最新ヘッドå´ã§ã‚ã‚‹å ´åˆã€ 本コマンドã¯ä½•ã‚‚実施ã—ã¾ã›ã‚“。\n" -" 自動的ã«2ã¤ã®ãƒ˜ãƒƒãƒ‰ã‚’é¸æŠžã™ã‚‹ :hg:`merge` ã¨ç•°ãªã‚Šã€\n" -" デフォルトã®ç§»å‹•å…ƒã¨ç§»å‹•å…ˆãŒã€ å…±ã«æœ€æ–°ãƒ˜ãƒƒãƒ‰ã‚’é¸æŠžã™ã‚‹ãŸã‚ã§ã™ã€‚\n" -" ãã®ã‚ˆã†ãªã‚±ãƒ¼ã‚¹ã§ã¯ã€ 移動元ï¼ç§»å‹•å…ˆã‚’明示的ã«æŒ‡å®šã—ã¦ãã ã•ã„。\n" -" (ä»–æ–¹ã®ãƒ˜ãƒƒãƒ‰ãŒç§»å‹•å…ˆãªã‚‰ã€ ãã¡ã‚‰ã« :hg:`update` ã—ã¦ãã ã•ã„)" - -msgid "" -" If a rebase is interrupted to manually resolve a merge, it can be\n" +msgid " Here are the ways to select changesets::" +msgstr " 移動対象リビジョンã®æŒ‡å®šã«ã¯ã€ 以下ã®æ§˜ãªæ–¹æ³•ãŒã‚ã‚Šã¾ã™::" + +msgid " 1. Explicitly select them using ``--rev``." +msgstr " 1. ``--rev`` ã¯ã€ 移動対象ã®ç›´æŽ¥æŒ‡å®š" + +msgid "" +" 2. Use ``--source`` to select a root changeset and include all of its\n" +" descendants." +msgstr " 2. ``--source`` ã¯ã€ 指定リビジョン〠ãŠã‚ˆã³ãã®åå«ã®ç§»å‹•" + +msgid "" +" 3. Use ``--base`` to select a changeset; rebase will find ancestors\n" +" and their descendants which are not also ancestors of the destination." +msgstr "" +" 3. ``--base`` ã¯ã€ 移動「先ã€ã¨æŒ‡å®šãƒªãƒ“ジョンã¨ã®å…±é€šç¥–å…ˆã€\n" +" ãŠã‚ˆã³ãã®åå«ã®ç§»å‹• (但ã—〠移動「先ã€ã®ç¥–å…ˆã¯å«ã¾ãš)" + +msgid "" +" 4. If you do not specify any of ``--rev``, ``source``, or ``--base``,\n" +" rebase will use ``--base .`` as above." +msgstr "" +" 4. 上記 ``--rev``, ``source``, ``--base`` ã®æŒ‡å®šãŒãªã„å ´åˆã€\n" +" ``--base .`` 相当ã®æŒ‡å®šã§ç§»å‹•ã‚’実施" + +msgid "" +" Rebase will destroy original changesets unless you use ``--keep``.\n" +" It will also move your bookmarks (even if you do)." +msgstr "" +" ``--keep`` 指定ãŒãªã„å ´åˆã€ 移動元リビジョンã¯ç ´æ£„ã•ã‚Œã¾ã™ã€‚\n" +" 移動æ“作ã¯ã€ ブックマークã®ç§»å‹•ã‚‚ä¼´ã„ã¾ã™ã€‚" + +msgid "" +" Some changesets may be dropped if they do not contribute changes\n" +" (e.g. merges from the destination branch)." +msgstr "" +" 移動後ã«å¤‰æ›´ã‚’ä¼´ã‚ãªã„リビジョン (例: 移動先ブランãƒã‹ã‚‰ã®ãƒžãƒ¼ã‚¸å®Ÿæ–½)\n" +" ã¯ã€ 移動ã®éš›ã«ç ´æ£„ã•ã‚Œã¾ã™ã€‚" + +msgid "" +" Unlike ``merge``, rebase will do nothing if you are at the branch tip " +"of\n" +" a named branch with two heads. You will need to explicitly specify " +"source\n" +" and/or destination." +msgstr "" +" 作æ¥é ˜åŸŸã®è¦ªãŒã€ åå‰ä»˜ãブランãƒã®æœ€æ–°ãƒªãƒ“ジョンã§ã‚ã‚‹å ´åˆã¯ã€\n" +" 当該ブランãƒã«ã‚‚ã†1ã¤ãƒ˜ãƒƒãƒ‰ãŒã‚ã£ã¦ã‚‚〠本コマンドã¯ä½•ã‚‚ã—ã¾ã›ã‚“。\n" +" ヘッドãŒ2ã¤ã‚ã£ãŸå ´åˆã«ã€ å¿…ãšãƒžãƒ¼ã‚¸ã‚’実施ã™ã‚‹ :hg:`merge` ã¨ã¯ã€\n" +" ã“ã®ç‚¹ã§æŒ™å‹•ãŒç•°ãªã‚Šã¾ã™ã€‚ ã“ã®ã‚ˆã†ãªå ´åˆã¯ã€ 移動元ï¼å…ˆã‚’ã€\n" +" 明示的ã«æŒ‡å®šã—ã¦ãã ã•ã„。" + +msgid "" +" If a rebase is interrupted to manually resolve a conflict, it can be\n" " continued with --continue/-c or aborted with --abort/-a." msgstr "" " 手動マージã«ã‚ˆã‚‹è¡çªè§£æ¶ˆãŒå¿…è¦ãªå ´åˆã€ 移動処ç†ãŒä¸æ–ã•ã‚Œã¾ã™ã®ã§ã€\n" @@ -9008,9 +9232,6 @@ " æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠移動ãŒå¿…è¦ãªãƒªãƒ“ジョンãŒç„¡ã„å ´åˆã‚„ã€\n" " 未解消ã®è¡çªãŒç™ºç”Ÿã—ãŸå ´åˆã¯ 1 ã§ã™ã€‚" -msgid " " -msgstr " " - #, python-format msgid "" "interactive history editing is supported by the 'histedit' extension (see " @@ -9088,6 +9309,20 @@ msgid "use --keep to keep original changesets" msgstr "元リビジョンをç¶æŒã™ã‚‹å ´åˆã¯ --keep を使用ã—ã¦ãã ã•ã„" +msgid "this rebase will cause divergence" +msgstr "ã“ã®ç§»å‹•ã¯åˆ†å² (divergence) を生ã˜ã¾ã™" + +msgid "to force the rebase please set rebase.allowdivergence=True" +msgstr "移動を強制ã™ã‚‹å ´åˆã¯ rebase.allowdivergence=True è¨å®šã—ã¦ãã ã•ã„" + +msgid "all requested changesets have equivalents or were marked as obsolete" +msgstr "移動対象ã¯å»ƒæ¢æ¸ˆã¿ã€ã‚ã‚‹ã„ã¯ãã‚Œã¨åŒç‰ã®ãƒªãƒ“ジョンã§ã™" + +msgid "" +"to force the rebase, set the config experimental.rebaseskipobsolete to False" +msgstr "" +"移動を強制ã™ã‚‹å ´åˆã¯ experimental.rebaseskipobsolete=False è¨å®šã—ã¦ãã ã•ã„" + msgid "nothing to rebase\n" msgstr "移動ã®å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“\n" @@ -9130,6 +9365,10 @@ msgstr "備考: %s ã¯æ—¢ã« %s ã¨ã—ã¦ç§»å‹•æ¸ˆã¿ãªã®ã§ç§»å‹•ã—ã¾ã›ã‚“\n" #, python-format +msgid "note: not rebasing %s, it has no successor\n" +msgstr "備考: 廃æ¢æ¸ˆã¿ã§å¾Œç¶™ãƒªãƒ“ジョンをæŒãŸãªã„ %s ã¯ç§»å‹•ã—ã¾ã›ã‚“\n" + +#, python-format msgid "already rebased %s as %s\n" msgstr "%s 㯠%s ã¨ã—ã¦ç§»å‹•æ¸ˆã¿ã§ã™\n" @@ -9220,6 +9459,9 @@ msgid "use 'hg rebase --continue' or 'hg rebase --abort'" msgstr "'hg rebase --continue' ã‹ 'hg rebase --abort' を実施ã—ã¦ãã ã•ã„" +msgid "hg rebase --continue" +msgstr "hg rebase --continue" + msgid "commands to interactively select changes for commit/qrefresh" msgstr "commit ã‚„ qrefresh ã«ãŠã‘る対話的ãªå¤‰æ›´å–ã‚Šè¾¼ã¿ã®é¸æŠž" @@ -9813,6 +10055,9 @@ msgid "mark new/missing files as added/removed before shelving" msgstr "æ–°è¦ï¼ä¸åœ¨ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã€é€€é¿å‰ã«ç™»éŒ²ï¼é™¤å¤–対象化" +msgid "store unknown files in the shelve" +msgstr "管ç†å¯¾è±¡å¤–ファイルを退é¿å¯¾è±¡ã«å«ã‚ã‚‹" + msgid "delete all shelved changes" msgstr "退é¿æƒ…å ±ã‚’å…¨ã¦ç ´æ£„" @@ -9913,6 +10158,9 @@ msgid "use 'hg unshelve --continue' or 'hg unshelve --abort'" msgstr "'hg unshelve --continue' ã‹ 'hg unshelve --abort' を実施ã—ã¦ãã ã•ã„" +msgid "hg unshelve --continue" +msgstr "hg unshelve --continue" + msgid "strip changesets and their descendants from history" msgstr "指定リビジョンã¨åå«ã®å±¥æ´ã‹ã‚‰ã®ç ´æ£„" @@ -10072,8 +10320,8 @@ msgid "can only omit patchfile if merging" msgstr "マージã®å ´åˆã®ã¿ãƒ‘ッãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’çœç•¥å¯èƒ½" -msgid "fix up the merge and run hg transplant --continue" -msgstr "è¡çªè§£æ¶ˆå¾Œã« 'hg transplant --continue' を実行ã—ã¦ãã ã•ã„" +msgid "fix up the working directory and run hg transplant --continue" +msgstr "作æ¥é ˜åŸŸã§ã®ä½œæ¥å¾Œã« hg transplant --continue を実行ã—ã¦ãã ã•ã„" #, python-format msgid "skipping emptied changeset %s\n" @@ -10252,7 +10500,7 @@ msgid "--continue is incompatible with --branch, --all and --merge" msgstr "--continue 㯠--branch〠--all〠--merge ã¨ä½µç”¨ã§ãã¾ã›ã‚“" -msgid "no source URL, branch revision or revision list provided" +msgid "no source URL, branch revision, or revision list provided" msgstr "å…ƒ URL〠ブランãƒå〠リビジョン一覧ã®ã„ãšã‚Œã‚‚指定ã•ã‚Œã¦ã„ã¾ã›ã‚“" msgid "--all requires a branch revision" @@ -10264,9 +10512,12 @@ msgid "no revision checked out" msgstr "作æ¥é ˜åŸŸãŒæœªæ›´æ–°ã§ã™" +msgid "no transplant to continue" +msgstr "å†é–‹ã™ã¹ã移æ¤æ“作ã¯ã‚ã‚Šã¾ã›ã‚“" + msgid "outstanding uncommitted merges" msgstr "マージãŒæœªã‚³ãƒŸãƒƒãƒˆã§ã™" msgid "outstanding local changes" msgstr "変更ãŒæœªã‚³ãƒŸãƒƒãƒˆã§ã™" @@ -10267,12 +10518,11 @@ msgid "outstanding uncommitted merges" msgstr "マージãŒæœªã‚³ãƒŸãƒƒãƒˆã§ã™" msgid "outstanding local changes" msgstr "変更ãŒæœªã‚³ãƒŸãƒƒãƒˆã§ã™" -msgid "" -"``transplanted([set])``\n" -" Transplanted changesets in set, or all transplanted changesets." +#, fuzzy +msgid "Transplanted changesets in set, or all transplanted changesets." msgstr "" "``transplanted([set])``\n" " set ä¸ã®ç§»æ¤å…ˆãƒªãƒ“ジョン〠ã¾ãŸã¯å…¨ç§»æ¤å…ˆãƒªãƒ“ジョン。" @@ -10618,6 +10868,13 @@ msgid "Seek failed\n" msgstr "seek ã«å¤±æ•—ã—ã¾ã—ãŸ\n" +msgid "" +"bundle contains tree manifests, but local repo is non-empty and does not use " +"tree manifests" +msgstr "" +"éž treemanifests å½¢å¼ã®å±¥æ´ã‚’æŒã¤ãƒªãƒã‚¸ãƒˆãƒªã«ã¯ treemanifests ã®ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡" +"イルをé©ç”¨ã§ãã¾ã›ã‚“" + #, python-format msgid "remote-changegroup: missing \"%s\" param" msgstr "remote-changegroup: パラメータ \"%s\" 指定ãŒã‚ã‚Šã¾ã›ã‚“" @@ -10703,6 +10960,9 @@ msgid "added %d changesets with %d changes to %d files%s\n" msgstr "%d 個ã®ãƒªãƒ“ジョン(%d ã®å¤‰æ›´ã‚’ %d ファイルã«é©ç”¨)ã‚’è¿½åŠ %s\n" +msgid "received dir revlog group is empty" +msgstr "ディレクトリã®ãƒªãƒ“ジョンãƒã‚°ãŒç©ºã§ã™" + msgid "bundling" msgstr "ãƒãƒ³ãƒ‰ãƒ«ç”Ÿæˆä¸" @@ -10872,9 +11132,6 @@ msgid "child process failed to start" msgstr "åプãƒã‚»ã‚¹ã®ç”Ÿæˆã«å¤±æ•—" -msgid "applied to working directory" -msgstr "作æ¥é ˜åŸŸã¸ã®é©ç”¨" - msgid "not a Mercurial patch" msgstr "Mercurial å‘ã‘ã®ãƒ‘ッãƒã§ã¯ã‚ã‚Šã¾ã›ã‚“" @@ -10891,6 +11148,9 @@ msgid "patch is damaged or loses information" msgstr "パッãƒã«ã¯ç ´æã¾ãŸã¯æƒ…å ±ã®æ¬ è½ãŒã‚ã‚Šã¾ã™" +msgid "applied to working directory" +msgstr "作æ¥é ˜åŸŸã¸ã®é©ç”¨" + #. i18n: refers to a short changeset id #, python-format msgid "created %s" @@ -11120,6 +11380,16 @@ msgid "use 'hg update' to get a consistent checkout" msgstr "作æ¥é ˜åŸŸå†…容ã®æ•´åˆæ€§ã‚’å–ã‚‹ã«ã¯ 'hg update' を実行ã—ã¦ãã ã•ã„" +msgid "hg graft --continue" +msgstr "hg graft --continue" + +#, python-format +msgid "continue: %s\n" +msgstr "解消後ã®æŽ¨å¥¨æ“作: %s\n" + +msgid "hg commit" +msgstr "hg commit" + #, python-format msgid "can't close already inactivated backup: dirstate%s" msgstr "éžæ´»æ€§åŒ–済ã¿ã®ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—㯠close ã§ãã¾ã›ã‚“: dirstate%s" @@ -11275,6 +11545,15 @@ msgid "recurse into subrepositories" msgstr "サブリãƒã‚¸ãƒˆãƒªã¸ã®å†å¸°çš„é©ç”¨" +msgid "open changelog" +msgstr "変更履æ´ã®èªã¿è¾¼ã¿" + +msgid "open manifest" +msgstr "マニフェストã®èªã¿è¾¼ã¿" + +msgid "open directory manifest" +msgstr "ディレクトリマニフェストã®èªã¿è¾¼ã¿" + msgid "[OPTION]... [FILE]..." msgstr "[OPTION]... [FILE]..." @@ -11293,35 +11572,60 @@ " 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ 次回ã®ã‚³ãƒŸãƒƒãƒˆã‹ã‚‰æ§‹æˆç®¡ç†å¯¾è±¡ã¨ãªã‚Šã¾ã™ã€‚\n" " è¿½åŠ ç™»éŒ²ã®ã‚³ãƒŸãƒƒãƒˆå‰å–り消ã—㯠:hg:`help forget` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" -msgid " If no names are given, add all files to the repository." -msgstr "" -" ファイルå指定ãŒç„¡ã„å ´åˆã€ 作æ¥é ˜åŸŸä¸ã®å…¨ãƒ•ã‚¡ã‚¤ãƒ«ãŒå¯¾è±¡ã¨ãªã‚Šã¾ã™ã€‚" - -msgid "" -" An example showing how new (unknown) files are added\n" -" automatically by :hg:`add`::" -msgstr "" -" 以下ã®å®Ÿè¡Œä¾‹ã¯ã€ :hg:`add` 実行ã«ãŠã‘ã‚‹(未知ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®)自動的ãª\n" -" è¿½åŠ ã®ä¾‹ã§ã™::" - -msgid "" -" $ ls\n" -" foo.c\n" -" $ hg status\n" -" ? foo.c\n" -" $ hg add\n" -" adding foo.c\n" -" $ hg status\n" -" A foo.c" -msgstr "" -" $ ls\n" -" foo.c\n" -" $ hg status\n" -" ? foo.c\n" -" $ hg add\n" -" foo.c ã‚’è¿½åŠ ç™»éŒ²ä¸\n" -" $ hg status\n" -" A foo.c" +msgid "" +" If no names are given, add all files to the repository (except\n" +" files matching ``.hgignore``)." +msgstr "" +" ファイルå指定ãŒç„¡ã„å ´åˆã€ 作æ¥é ˜åŸŸä¸ã®å…¨ãƒ•ã‚¡ã‚¤ãƒ«ãŒå¯¾è±¡ã¨ãªã‚Šã¾ã™\n" +" (``.hgignore`` ã«ã‚ˆã‚‹ç„¡è¦–指定対象ã¯é™¤ã)。" + +msgid "" +" - New (unknown) files are added\n" +" automatically by :hg:`add`::" +msgstr " - :hg:`add` ã«ã‚ˆã‚‹ unknown 扱ã„ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®è‡ªå‹•çš„ãªè¿½åŠ 登録::" + +msgid "" +" $ ls\n" +" foo.c\n" +" $ hg status\n" +" ? foo.c\n" +" $ hg add\n" +" adding foo.c\n" +" $ hg status\n" +" A foo.c" +msgstr "" +" $ ls\n" +" foo.c\n" +" $ hg status\n" +" ? foo.c\n" +" $ hg add\n" +" adding foo.c\n" +" $ hg status\n" +" a foo.c" + +msgid " - Specific files to be added can be specified::" +msgstr " - ファイルå指定ã«ã‚ˆã‚‹ç‰¹å®šãƒ•ã‚¡ã‚¤ãƒ«ã®è¿½åŠ 登録::" + +msgid "" +" $ ls\n" +" bar.c foo.c\n" +" $ hg status\n" +" ? bar.c\n" +" ? foo.c\n" +" $ hg add bar.c\n" +" $ hg status\n" +" A bar.c\n" +" ? foo.c" +msgstr "" +" $ ls\n" +" bar.c foo.c\n" +" $ hg status\n" +" ? bar.c\n" +" ? foo.c\n" +" $ hg add bar.c\n" +" $ hg status\n" +" a bar.c\n" +" ? foo.c" msgid "" " Returns 0 if all files are successfully added.\n" @@ -11341,13 +11645,13 @@ " è¡Œãªã„ã¾ã™ã€‚" msgid "" -" New files are ignored if they match any of the patterns in\n" -" ``.hgignore``. As with add, these changes take effect at the next\n" -" commit." -msgstr "" -" ``.hgignore`` ã«è¨˜è¿°ã•ã‚ŒãŸãƒ‘ターンã«åˆè‡´ã™ã‚‹æ–°è¦ãƒ•ã‚¡ã‚¤ãƒ«ã¯\n" -" 無視ã•ã‚Œã¾ã™ã€‚ :hg:`add` ã¨åŒæ§˜ã«ã€ 実行効果ãŒç™ºæ®ã•ã‚Œã‚‹ã®ã¯\n" -" 次回コミット時点ã§ã™ã€‚" +" Unless names are given, new files are ignored if they match any of\n" +" the patterns in ``.hgignore``. As with add, these changes take\n" +" effect at the next commit." +msgstr "" +" ``.hgignore`` ä¸ã®è¨˜è¿°ãƒ‘ターンã«åˆè‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€\n" +" 明示的ãªæŒ‡å®šãŒãªã„é™ã‚Šã€ 無視ã•ã‚Œã¾ã™ã€‚ :hg:`add` ã¨åŒæ§˜ã«ã€\n" +" 実行効果ãŒç™ºæ®ã•ã‚Œã‚‹ã®ã¯ã€ 次回㮠:hg:`commit` 時点ã§ã™ã€‚" msgid "" " Use the -s/--similarity option to detect renamed files. This\n" @@ -11369,6 +11673,81 @@ " -s/--similarity 未指定ã®å ´åˆã€ 100 ãŒæŒ‡å®šã•ã‚ŒãŸã‚‚ã®ã¨ã¿ãªã•ã‚Œã€\n" " 内容ãŒå®Œå…¨ã«ä¸€è‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®ã¿ãŒã€ 改åã¨ã¿ãªã•ã‚Œã¾ã™ã€‚" +msgid "" +" - A number of files (bar.c and foo.c) are new,\n" +" while foobar.c has been removed (without using :hg:`remove`)\n" +" from the repository::" +msgstr "" +" - ファイル bar.c ã‚„ foo.c ãŒæ–°è¦ä½œæˆã•ã‚ŒãŸä¸€æ–¹ã§ã€foobar.c\n" +" ãŒä½œæ¥é ˜åŸŸã‹ã‚‰æ‰‹å‹• (:hg:`remove` 実行ãªã—) ã§å‰Šé™¤ã•ã‚ŒãŸã‚±ãƒ¼ã‚¹::" + +msgid "" +" $ ls\n" +" bar.c foo.c\n" +" $ hg status\n" +" ! foobar.c\n" +" ? bar.c\n" +" ? foo.c\n" +" $ hg addremove\n" +" adding bar.c\n" +" adding foo.c\n" +" removing foobar.c\n" +" $ hg status\n" +" A bar.c\n" +" A foo.c\n" +" R foobar.c" +msgstr "" +" $ ls\n" +" bar.c foo.c\n" +" $ hg status\n" +" ! foobar.c\n" +" ? bar.c\n" +" ? foo.c\n" +" $ hg addremove\n" +" adding bar.c\n" +" adding foo.c\n" +" removing foobar.c\n" +" $ hg status\n" +" a bar.c\n" +" a foo.c\n" +" r foobar.c" + +msgid "" +" - A file foobar.c was moved to foo.c without using :hg:`rename`.\n" +" Afterwards, it was edited slightly::" +msgstr "" +" - ファイル foobar.c を手動 (:hg:`rename` ãªã—) ã§æ”¹åã—ãŸä¸Šã§ã€\n" +" 多少ã®å¤‰æ›´ãŒåŠ ãˆã‚‰ã‚ŒãŸã‚±ãƒ¼ã‚¹::" + +msgid "" +" $ ls\n" +" foo.c\n" +" $ hg status\n" +" ! foobar.c\n" +" ? foo.c\n" +" $ hg addremove --similarity 90\n" +" removing foobar.c\n" +" adding foo.c\n" +" recording removal of foobar.c as rename to foo.c (94% similar)\n" +" $ hg status -C\n" +" A foo.c\n" +" foobar.c\n" +" R foobar.c" +msgstr "" +" $ ls\n" +" foo.c\n" +" $ hg status\n" +" ! foobar.c\n" +" ? foo.c\n" +" $ hg addremove --similarity 90\n" +" removing foobar.c\n" +" adding foo.c\n" +" recording removal of foobar.c as rename to foo.c (94% similar)\n" +" $ hg status -c\n" +" a foo.c\n" +" foobar.c\n" +" r foobar.c" + msgid "similarity must be a number" msgstr "類似度ã«ã¯æ•°å€¤ã‚’指定ã—ã¦ãã ã•ã„" @@ -11407,7 +11786,7 @@ msgid "" " List changes in files, showing the revision id responsible for\n" -" each line" +" each line." msgstr " ファイルã®å„行毎ã«ã€ ãã®å†…容ãŒç”±æ¥ã™ã‚‹ãƒªãƒ“ジョンIDを表示ã—ã¾ã™ã€‚" msgid "" @@ -11416,6 +11795,13 @@ msgstr " 本コマンドã¯ã€ 変更ã®å®Ÿæ–½è€…ã¾ãŸã¯å®Ÿæ–½æ™‚期を特定ã™ã‚‹ã®ã«æœ‰ç”¨ã§ã™ã€‚" msgid "" +" If you include --file, --user, or --date, the revision number is\n" +" suppressed unless you also include --number." +msgstr "" +" --file, --user, --date ã®ã„ãšã‚Œã‹ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 明示的㪠--number\n" +" 指定ãŒãªã„é™ã‚Šã€ ç”±æ¥ãƒªãƒ“ジョン番å·ã¯è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“。" + +msgid "" " Without the -a/--text option, annotate will avoid processing files\n" " it detects as binary. With -a, annotate will annotate the file\n" " anyway, although the results will probably be neither useful\n" @@ -11466,9 +11852,9 @@ msgid "" " The archive type is automatically detected based on file\n" -" extension (or override using -t/--type)." -msgstr "" -" アーカイブ種別ã¯ã€ 出力先ファイルã®æ‹¡å¼µåã‹ã‚‰è‡ªå‹•çš„ã«åˆ¤å®šã•ã‚Œã¾ã™ãŒ\n" +" extension (to override, use -t/--type)." +msgstr "" +" アーカイブ種別ã¯ã€ 出力先ファイルã®æ‹¡å¼µåã‹ã‚‰è‡ªå‹•çš„ã«åˆ¤å®šã•ã‚Œã¾ã™ãŒã€\n" " -t/--type ã§å¼·åˆ¶ã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚" msgid " - create a zip file containing the 1.0 release::" @@ -11533,8 +11919,11 @@ msgid "merge with old dirstate parent after backout" msgstr "打ã¡æ¶ˆã—リビジョンをç¾è¦ªãƒªãƒ“ジョンã¨ãƒžãƒ¼ã‚¸" -msgid "commit if no conflicts were encountered" -msgstr "è¡çªãŒæ¤œå‡ºã•ã‚Œãªã„å ´åˆã®ã‚³ãƒŸãƒƒãƒˆå®Ÿæ–½" +msgid "commit if no conflicts were encountered (DEPRECATED)" +msgstr "è¡çªãŒæ¤œå‡ºã•ã‚Œãªã„å ´åˆã®ã‚³ãƒŸãƒƒãƒˆå®Ÿæ–½ (éžæŽ¨å¥¨)" + +msgid "do not commit" +msgstr "コミット実施ã®æŠ‘æ¢" msgid "parent to choose when backing out merge (DEPRECATED)" msgstr "打ã¡æ¶ˆã—リビジョンã¨ã®ãƒžãƒ¼ã‚¸å¯¾è±¡ (éžæŽ¨å¥¨)" @@ -11550,10 +11939,11 @@ msgid "" " Prepare a new changeset with the effect of REV undone in the\n" -" current working directory." -msgstr "" -" 対象リビジョンã§ã®å¤‰æ›´ã‚’打ã¡æ¶ˆã™åŠ¹æžœã‚’æŒã¤å¤‰æ›´ã‚’ã€\n" -" 作æ¥é ˜åŸŸã§ä½œæˆã—ã¾ã™ã€‚" +" current working directory. If no conflicts were encountered,\n" +" it will be committed immediately." +msgstr "" +" 対象リビジョン内容ã®æ‰“ã¡æ¶ˆã—ã«ç›¸å½“ã™ã‚‹å¤‰æ›´ã‚’〠作æ¥é ˜åŸŸã§ä½œæˆã—ã¾ã™ã€‚\n" +" è¡çªãªã—ã§æ‰“ã¡æ¶ˆã—ãŒã§ããŸå ´åˆã¯ã€ 変更内容を自動的ã«ã‚³ãƒŸãƒƒãƒˆã—ã¾ã™ã€‚" msgid "" " If REV is the parent of the working directory, then this new changeset\n" @@ -11557,20 +11947,47 @@ msgid "" " If REV is the parent of the working directory, then this new changeset\n" -" is committed automatically. Otherwise, hg needs to merge the\n" -" changes and the merged result is left uncommitted." -msgstr "" -" 対象リビジョンãŒã€ 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã®å ´åˆã€\n" -" æ–°è¦ä½œæˆã•ã‚ŒãŸæ‰“ã¡æ¶ˆã—リビジョンã¯ã€ 自動的ã«ã‚³ãƒŸãƒƒãƒˆã•ã‚Œã¾ã™ã€‚\n" -" ãれ以外ã®å ´åˆã¯ã€ マージãŒå®Ÿæ–½ã•ã‚Œã¾ã™ãŒã€\n" -" マージçµæžœã¯ã‚³ãƒŸãƒƒãƒˆã•ã‚Œã¾ã›ã‚“。" - -msgid "" -" backout cannot be used to fix either an unwanted or\n" -" incorrect merge." -msgstr "" -" :hg:`backout` ã«ã‚ˆã‚‹æ‰“消ã—機能ã¯ã€ãƒžãƒ¼ã‚¸å®Ÿæ–½ãƒªãƒ“ジョンã«å¯¾ã—ã¦ã¯ã€\n" -" é©ç”¨ã§ãã¾ã›ã‚“。" +" is committed automatically (unless --no-commit is specified)." +msgstr "" +" 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンを打ã¡æ¶ˆã™å ´åˆã€ 打ã¡æ¶ˆã—ã«ç›¸å½“ã™ã‚‹å†…容ã¯ã€\n" +" 自動的ã«ã‚³ãƒŸãƒƒãƒˆã•ã‚Œã¾ã™ (--no-commit 指定時を除ã)。" + +msgid "" +" :hg:`backout` cannot be used to fix either an unwanted or\n" +" incorrect merge." +msgstr "" +" :hg:`backout` ã«ã‚ˆã‚‹æ‰“消ã—機能ã¯ã€ãƒžãƒ¼ã‚¸å®Ÿæ–½ãƒªãƒ“ジョンã«å¯¾ã—ã¦ã¯ã€\n" +" é©ç”¨ã§ãã¾ã›ã‚“。" + +msgid "" +" - Reverse the effect of the parent of the working directory.\n" +" This backout will be committed immediately::" +msgstr "" +" - 作æ¥é ˜åŸŸè¦ªãƒªãƒ“ジョンã®æ‰“ã¡æ¶ˆã—。\n" +" 打ã¡æ¶ˆã—内容ã¯å³æ™‚コミットã•ã‚Œã¾ã™::" + +msgid " hg backout -r ." +msgstr " hg backout -r ." + +msgid " - Reverse the effect of previous bad revision 23::" +msgstr " - 以å‰ã®ãƒªãƒ“ジョン 23 ã§ã®å¤‰æ›´å†…容ã®æ‰“ã¡æ¶ˆã—::" + +msgid " hg backout -r 23" +msgstr " hg backout -r 23" + +msgid "" +" - Reverse the effect of previous bad revision 23 and\n" +" leave changes uncommitted::" +msgstr "" +" - 以å‰ã®ãƒªãƒ“ジョン 23 ã§ã®å¤‰æ›´å†…容ã®æ‰“ã¡æ¶ˆã—ã‚’ã—ã¤ã¤ã€\n" +" 打ã¡æ¶ˆã—内容ã®ã‚³ãƒŸãƒƒãƒˆã¯ä¿ç•™::" + +msgid "" +" hg backout -r 23 --no-commit\n" +" hg commit -m \"Backout revision 23\"" +msgstr "" +" hg backout -r 23 --no-commit\n" +" hg commit -m \"backout revision 23\"" msgid "" " By default, the pending changeset will have one parent,\n" @@ -11614,6 +12031,9 @@ " 未解消ã®è¡çªãŒç™ºç”Ÿã—ãŸå ´åˆã¯ 1 ã§ã™ã€‚\n" " " +msgid "cannot use --commit with --no-commit" +msgstr "--commit 㨠--no-commit ã¯ä½µç”¨ã§ãã¾ã›ã‚“" + msgid "please specify just one revision" msgstr "リビジョン指定ã¯1ã¤ã ã‘ã§ã™" @@ -11884,6 +12304,9 @@ msgid "force" msgstr "強制実施" +msgid "revision for bookmark action" +msgstr "ブックマークæ“作対象リビジョン" + msgid "delete a given bookmark" msgstr "指定ブックマークã®å‰Šé™¤" @@ -12076,6 +12499,6 @@ msgid "" " Use the command :hg:`update` to switch to an existing branch. Use\n" " :hg:`commit --close-branch` to mark this branch head as closed.\n" -" When all heads of the branch are closed, the branch will be\n" +" When all heads of a branch are closed, the branch will be\n" " considered closed." msgstr "" @@ -12080,9 +12503,8 @@ " considered closed." msgstr "" -" 作æ¥é ˜åŸŸã®å†…容を既å˜ãƒ–ランãƒã®å†…容ã§æ›´æ–°ã™ã‚‹å ´åˆã¯ :hg:`update`\n" -" を使用ã—ã¾ã™ã€‚ ç¾ãƒ–ランãƒãƒ˜ãƒƒãƒ‰ã‚’閉鎖ã™ã‚‹å ´åˆã¯\n" -" :hg:`commit --close-branch` を使用ã—ã¾ã™ã€‚ 当該ブランãƒã«ãŠã‘ã‚‹ã€\n" -" 全ブランãƒãƒ˜ãƒƒãƒ‰ã®é–‰éŽ–ã‚’ã‚‚ã£ã¦ã€ ãã®ãƒ–ランãƒã®é–‰éŽ–ã¨ã¿ãªã—ã¾ã™ã€‚" +" 作æ¥é ˜åŸŸã‚’æ—¢å˜ãƒ–ランãƒã®å†…容ã§æ›´æ–°ã™ã‚‹ã«ã¯ :hg:`update` を使用ã—ã¾ã™ã€‚\n" +" ç¾ãƒ–ランãƒãƒ˜ãƒƒãƒ‰ã®é–‰éŽ–ã«ã¯ :hg:`commit --close-branch` を使用ã—ã¾ã™ã€‚\n" +" 全ブランãƒãƒ˜ãƒƒãƒ‰ã®é–‰éŽ–ã‚’ã‚‚ã£ã¦ã€ 当該ブランãƒã®é–‰éŽ–ã¨ã¿ãªã—ã¾ã™ã€‚" #, python-format msgid "reset working directory to branch %s\n" @@ -12166,25 +12588,27 @@ msgstr "ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®ç”Ÿæˆ" msgid "" -" Generate a compressed changegroup file collecting changesets not\n" -" known to be in another repository." -msgstr "" -" 連æºå¯¾è±¡ãƒªãƒã‚¸ãƒˆãƒªã«å˜åœ¨ã—ãªã„リビジョンã®æƒ…å ±ã‚’ã¾ã¨ã‚ã¦ã€\n" -" 圧縮形å¼ã®ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’生æˆã—ã¾ã™ã€‚" - -msgid "" -" If you omit the destination repository, then hg assumes the\n" -" destination will have all the nodes you specify with --base\n" -" parameters. To create a bundle containing all changesets, use\n" -" -a/--all (or --base null)." -msgstr "" -" 連æºå¯¾è±¡ãƒªãƒã‚¸ãƒˆãƒªãŒç„¡æŒ‡å®šã®å ´åˆã€ --base 指定ã•ã‚ŒãŸãƒªãƒ“ジョンãŒã€\n" -" 連æºå¯¾è±¡ãƒªãƒã‚¸ãƒˆãƒªå´ã«å˜åœ¨ã™ã‚‹ã‚‚ã®ã¨ä»®å®šã—ã¾ã™ã€‚\n" -" -a/--all (ã¾ãŸã¯ --base null) 指定ã«ã‚ˆã‚Šã€\n" -" 全リビジョンをå«ã‚€ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ãŒç”Ÿæˆã§ãã¾ã™ã€‚" +" Generate a changegroup file collecting changesets to be added\n" +" to a repository." +msgstr "" +" 連æºå¯¾è±¡ãƒªãƒã‚¸ãƒˆãƒªã«å˜åœ¨ã—ãªã„リビジョンã®æƒ…å ±ã‚’ã€\n" +" ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã«æ›¸ã出ã—ã¾ã™ã€‚" + +msgid "" +" To create a bundle containing all changesets, use -a/--all\n" +" (or --base null). Otherwise, hg assumes the destination will have\n" +" all the nodes you specify with --base parameters. Otherwise, hg\n" +" will assume the repository has all the nodes in destination, or\n" +" default-push/default if no destination is specified." +msgstr "" +" -a/--all (åˆã¯ --base null) 指定ãŒã‚ã‚‹å ´åˆã€ ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã«ã¯ã€\n" +" リãƒã‚¸ãƒˆãƒªã®å…¨ã¦ã®å±¥æ´ãŒæ›¸ã出ã•ã‚Œã¾ã™ã€‚ 明示的㪠--base 指定ã®å ´åˆã€\n" +" 指定リビジョン以é™ã®å±¥æ´ãŒæ›¸ã出ã•ã‚Œã¾ã™ã€‚ ãれ以外ã®å ´åˆã¯ã€\n" +" 指定ã®é€£æºå…ˆ (åˆã¯ paths ã§ã® default-push/default 指定先) ã‹ã‚‰ã€\n" +" 書ã出ã—対象リビジョンを判æ–ã—ã¾ã™ã€‚" msgid "" " You can change bundle format with the -t/--type option. You can\n" " specify a compression, a bundle version or both using a dash\n" " (comp-version). The available compression methods are: none, bzip2,\n" " and gzip (by default, bundles are compressed using bzip2). The\n" @@ -12185,10 +12609,10 @@ msgid "" " You can change bundle format with the -t/--type option. You can\n" " specify a compression, a bundle version or both using a dash\n" " (comp-version). The available compression methods are: none, bzip2,\n" " and gzip (by default, bundles are compressed using bzip2). The\n" -" available format are: v1, v2 (default to most suitable)." +" available formats are: v1, v2 (default to most suitable)." msgstr "" " 出力形å¼ã¯ -t/--type ã§æŒ‡å®šå¯èƒ½ã§ã™ã€‚ 圧縮形å¼å〠ãƒãƒ³ãƒ‰ãƒ«å½¢å¼åã€\n" " ã‚ã‚‹ã„㯠- ã§é€£çµã—ãŸä½µè¨˜å½¢å¼ (`comp-bundle`) ã§æŒ‡å®šã§ãã¾ã™ã€‚\n" @@ -12220,6 +12644,9 @@ " æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0〠変更ãŒæ¤œå‡ºã§ããªã„å ´åˆã¯ 1 ã§ã™ã€‚\n" " " +msgid "no commits to bundle" +msgstr "リビジョン指定ã¯ç©ºã§ã™" + msgid "see \"hg help bundle\" for supported values for --type" msgstr "--type ã§æŒ‡å®šå¯èƒ½ãªå€¤ã¯ \"hg help bundle\" ã‚’å‚ç…§ã—ã¦ãã ã•ã„" @@ -12229,6 +12656,12 @@ msgid "use \"hg debugcreatestreamclonebundle\"" msgstr "\"hg debugcreatestreamclonebundle\" を使用ã—ã¦ãã ã•ã„" +msgid "--all is incompatible with specifying a destination" +msgstr "--all ã¨é€£æºå¯¾è±¡ã¯åŒæ™‚ã«ã¯æŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "ignoring --base because --all was specified\n" +msgstr "--all 指定ãŒã‚ã‚‹ã®ã§ --base 指定を無視ã—ã¾ã™\n" + msgid "--base is incompatible with specifying a destination" msgstr "--base ã¨é€£æºå¯¾è±¡ã¯åŒæ™‚ã«ã¯æŒ‡å®šã§ãã¾ã›ã‚“" @@ -12285,8 +12718,8 @@ msgid "the clone will include an empty working directory (only a repository)" msgstr "複製先ã®ä½œæ¥é ˜åŸŸã‚’空ã«ã™ã‚‹(管ç†é ˜åŸŸã®ã¿ã®è¤‡è£½)" -msgid "revision, tag or branch to check out" -msgstr "作æ¥é ˜åŸŸæ›´æ–°ç”¨ãƒªãƒ“ジョン(ã‚¿ã‚°åï¼ãƒ–ランãƒå)" +msgid "revision, tag, or branch to check out" +msgstr "作æ¥é ˜åŸŸæ›´æ–°ç”¨ãƒªãƒ“ジョン(ã‚¿ã‚°åï¼ãƒ–ランãƒå指定å¯)" msgid "include the specified changeset" msgstr "複製対象ã«å«ã‚るリビジョン" @@ -12326,24 +12759,6 @@ " 作æ¥é ˜åŸŸã®æ›´æ–°ã‚„〠``.hg/hgrc`` ã®ç”Ÿæˆã¯è¡Œã‚ã‚Œã¾ã›ã‚“。" msgid "" -" To pull only a subset of changesets, specify one or more revisions\n" -" identifiers with -r/--rev or branches with -b/--branch. The\n" -" resulting clone will contain only the specified changesets and\n" -" their ancestors. These options (or 'clone src#rev dest') imply\n" -" --pull, even for local source repositories. Note that specifying a\n" -" tag will include the tagged changeset but not the changeset\n" -" containing the tag." -msgstr "" -" -r/--rev ã§ã®ãƒªãƒ“ジョン指定や〠-b/--branch ã§ã®ãƒ–ランãƒæŒ‡å®šã«ã‚ˆã‚Šã€\n" -" 一部ã®ãƒªãƒ“ジョンã®ã¿ã‚’å–り込むã“ã¨ãŒã§ãã¾ã™ã€‚ 複製先ã®ãƒªãƒã‚¸ãƒˆãƒªã¯ã€\n" -" 指定リビジョンã¨ã€ ãã®ç¥–å…ˆã®ã¿ã‚’ä¿æŒã—ã¾ã™ã€‚ ã“れらã®ã‚ªãƒ—ション指定\n" -" (ã‚ã‚‹ã„㯠:hg:`clone src#rev dest` å½¢å¼ã§ã®è¤‡è£½) ãŒã‚ã‚‹å ´åˆã€\n" -" åŒä¸€ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ 上ã®ãƒªãƒã‚¸ãƒˆãƒªã®è¤‡è£½ã§ã‚‚〠--pull 指定時ã¨ã€\n" -" åŒæ§˜ã«æŒ¯èˆžã„ã¾ã™ã€‚ ã‚¿ã‚°åã§ãƒªãƒ“ジョンを指定ã—ãŸå ´åˆã€\n" -" タグ「対処ã€ãƒªãƒ“ジョンã¯ã€ 複製先ã«å–ã‚Šè¾¼ã¾ã‚Œã¾ã™ãŒã€\n" -" タグ「実施ã€ãƒªãƒ“ジョンã¯ã€ 複製先ã«å–ã‚Šè¾¼ã¾ã‚Œã¾ã›ã‚“。" - -msgid "" " If the source repository has a bookmark called '@' set, that\n" " revision will be checked out in the new repository by default." msgstr "" @@ -12358,6 +12773,27 @@ " 作æ¥é ˜åŸŸã«ãƒ‡ãƒ¼ã‚¿ã‚’æŒã¡ãŸããªã„å ´åˆã¯ -U/--noupdate を指定ã—ã¾ã™ã€‚" msgid "" +" To pull only a subset of changesets, specify one or more revisions\n" +" identifiers with -r/--rev or branches with -b/--branch. The\n" +" resulting clone will contain only the specified changesets and\n" +" their ancestors. These options (or 'clone src#rev dest') imply\n" +" --pull, even for local source repositories." +msgstr "" +" -r/--rev ã§ã®ãƒªãƒ“ジョン指定や〠-b/--branch ã§ã®ãƒ–ランãƒæŒ‡å®šã«ã‚ˆã‚Šã€\n" +" 一部ã®ãƒªãƒ“ジョンã®ã¿ã‚’å–り込むã“ã¨ãŒã§ãã¾ã™ã€‚ 複製先ã®ãƒªãƒã‚¸ãƒˆãƒªã¯ã€\n" +" 指定リビジョンã¨ã€ ãã®ç¥–å…ˆã®ã¿ã‚’ä¿æŒã—ã¾ã™ã€‚ ã“れらã®ã‚ªãƒ—ション指定\n" +" (ã‚ã‚‹ã„㯠:hg:`clone src#rev dest` å½¢å¼ã§ã®è¤‡è£½) ãŒã‚ã‚‹å ´åˆã€\n" +" åŒä¸€ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ 上ã®ãƒªãƒã‚¸ãƒˆãƒªã®è¤‡è£½ã§ã‚‚〠--pull 指定時ã¨ã€\n" +" åŒæ§˜ã«æŒ¯èˆžã„ã¾ã™ã€‚" + +msgid "" +" Specifying a tag will include the tagged changeset but not the\n" +" changeset containing the tag." +msgstr "" +" リビジョン指定ã«ã‚¿ã‚°åを用ã„ãŸå ´åˆã€ タグ「対処ã€ãƒªãƒ“ジョンã¯ã€\n" +" 複製先ã«å–ã‚Šè¾¼ã¾ã‚Œã¾ã™ãŒã€ タグ「実施ã€ãƒªãƒ“ジョンã¯å–ã‚Šè¾¼ã¾ã‚Œã¾ã›ã‚“。" + +msgid "" " For efficiency, hardlinks are used for cloning whenever the\n" " source and destination are on the same filesystem (note this\n" " applies only to the repository data, not to the working\n" @@ -12430,6 +12866,25 @@ " h) default ブランãƒã®æœ€æ–°ãƒ˜ãƒƒãƒ‰ãƒªãƒ“ジョン\n" " i) tip" +msgid "" +" When cloning from servers that support it, Mercurial may fetch\n" +" pre-generated data from a server-advertised URL. When this is done,\n" +" hooks operating on incoming changesets and changegroups may fire " +"twice,\n" +" once for the bundle fetched from the URL and another for any " +"additional\n" +" data not fetched from this URL. In addition, if an error occurs, the\n" +" repository may be rolled back to a partial clone. This behavior may\n" +" change in future releases. See :hg:`help -e clonebundles` for more." +msgstr "" +" サーãƒçµŒç”±ã§è¤‡è£½ã—ãŸå ´åˆã€ サーãƒå´ã§äº‹å‰ã«ä½œæˆã•ã‚ŒãŸãƒ‡ãƒ¼ã‚¿ã‚’å…ƒã«ã€\n" +" 複製を行ã†å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ (サーãƒå´è¨å®šæ¬¡ç¬¬)。 ãã®ã‚ˆã†ãªå ´åˆã¯ã€\n" +" incoming, changegroup 系フックãŒã€ 事å‰ä½œæˆãƒ‡ãƒ¼ã‚¿ã®å–ã‚Šè¾¼ã¿ã§ä¸€åº¦ã€\n" +" è¿½åŠ å±¥æ´ã®å–ã‚Šè¾¼ã¿ã§ã‚‚ã†ä¸€åº¦ã€ åˆè¨ˆäºŒåº¦å®Ÿè¡Œã•ã‚Œã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚\n" +" ã¾ãŸã€ エラーã§ã®è¤‡è£½ä¸æ–時も〠複製先ã«å±¥æ´ãŒæ®‹ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚\n" +" ã“ã®æŒ™å‹•ã¯å°†æ¥å¤‰æ›´ã•ã‚Œã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。\n" +" 詳細㯠:hg:`help -e clonebundles` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" + msgid " - clone a remote repository to a new directory named hg/::" msgstr " - é 隔ホストã®ãƒªãƒã‚¸ãƒˆãƒªã‚’ã€ æ–°è¦ hg/ ディレクトリé…下ã«è¤‡è£½::" @@ -12572,11 +13027,29 @@ " public フェーズ (:hg:`help phases` å‚ç…§) ã®ãƒªãƒ“ジョンやã€\n" " æ—¢ã«åリビジョンをæŒã¤ãƒªãƒ“ジョンã¯ã€ 改変ã§ãã¾ã›ã‚“ " -msgid "" -" Returns 0 on success, 1 if nothing changed.\n" -" " -msgstr "" -" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0〠変更ãŒæ¤œå‡ºã§ããªã„å ´åˆã¯ 1 ã§ã™ã€‚\n" +msgid " Returns 0 on success, 1 if nothing changed." +msgstr " æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0〠変更ãŒæ¤œå‡ºã§ããªã„å ´åˆã¯ 1 ã§ã™ã€‚" + +msgid " - commit all files ending in .py::" +msgstr " - .py æ‹¡å¼µåã‚’æŒã¤å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å¤‰æ›´ã‚’記録::" + +msgid " hg commit --include \"set:**.py\"" +msgstr " hg commit --include \"set:**.py\"" + +msgid " - commit all non-binary files::" +msgstr " - å…¨ã¦ã®éžãƒã‚¤ãƒŠãƒªå½¢å¼ãƒ•ã‚¡ã‚¤ãƒ«ã®å¤‰æ›´ã‚’記録::" + +msgid " hg commit --exclude \"set:binary()\"" +msgstr " hg commit --exclude \"set:binary()\"" + +msgid " - amend the current commit and set the date to now::" +msgstr " - 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã®å†ã‚³ãƒŸãƒƒãƒˆ (日付をç¾åœ¨æ™‚刻ã«æ›´æ–°)::" + +msgid "" +" hg commit --amend --date now\n" +" " +msgstr "" +" hg commit --amend --date now\n" " " msgid "cannot amend with --subrepos" @@ -12811,6 +13284,9 @@ msgid "show all details" msgstr "全詳細ã®è¡¨ç¤º" +msgid "print the bundlespec of the bundle" +msgstr "ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®ä»•æ§˜è¡¨ç¤º" + msgid "lists the contents of a bundle" msgstr "ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®å†…容表示" @@ -12912,15 +13388,6 @@ msgid "need repo for changelog dag" msgstr "変更履æ´ã® DAG 出力ã«ã¯ãƒªãƒã‚¸ãƒˆãƒªãŒå¿…è¦ã§ã™" -msgid "open changelog" -msgstr "変更履æ´ã®èªã¿è¾¼ã¿" - -msgid "open manifest" -msgstr "マニフェストã®èªã¿è¾¼ã¿" - -msgid "open directory manifest" -msgstr "ディレクトリマニフェストã®èªã¿è¾¼ã¿" - msgid "-c|-m|FILE REV" msgstr "-c|-m|FILE REV" @@ -13006,8 +13473,23 @@ msgid "unknown bundle type specified with --type" msgstr "--type ã«æœªçŸ¥ã®ãƒãƒ³ãƒ‰ãƒ«ç¨®åˆ¥ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" -msgid "display the combined ignore pattern" -msgstr "無視対象ファイル判定用æ£è¦è¡¨ç¾ã®è¡¨ç¤º" +msgid "display the combined ignore pattern and information about ignored files" +msgstr "無視対象ファイル判定用æ£è¦è¡¨ç¾ã®è¡¨ç¤ºã¨ã€ パターンåˆè‡´ã®åˆ¤å®š" + +msgid " With no argument display the combined ignore pattern." +msgstr "" +" 引数ãªã—ã§ã®å®Ÿè¡Œæ™‚ã¯ã€ 無視対象ファイル判定用æ£è¦è¡¨ç¾ã‚’表示ã—ã¾ã™ã€‚" + +msgid "" +" Given space separated file names, shows if the given file is ignored " +"and\n" +" if so, show the ignore rule (file and line number) that matched it.\n" +" " +msgstr "" +" 指定ã•ã‚ŒãŸå¼•æ•°ã¯ã€ ファイルåã¨ã¿ãªã•ã‚Œã€ 無視指定ã¨ã®åˆè‡´ã®æœ‰ç„¡ã¨ã€\n" +" åˆè‡´ã™ã‚‹ãªã‚‰å½“該パターン指定ã®æƒ…å ± (記述ファイルã¨è¡Œç•ªå·) ã‚’ã€\n" +" 指定ファイル毎ã«è¡¨ç¤ºã—ã¾ã™ã€‚\n" +" " msgid "no ignore patterns found" msgstr "無視対象ファイルã®æŒ‡å®šãŒã‚ã‚Šã¾ã›ã‚“" @@ -13025,6 +13507,9 @@ msgid "unknown format %d" msgstr "未知ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆ: %d" +msgid "-c|-m|FILE" +msgstr "-c|-m|FILE" + msgid "dump an index DAG as a graphviz dot file" msgstr "インデックス DAG ã® graphviz å‘ã‘ .dot ファイルを生æˆ" @@ -13028,6 +13513,40 @@ msgid "dump an index DAG as a graphviz dot file" msgstr "インデックス DAG ã® graphviz å‘ã‘ .dot ファイルを生æˆ" +msgid "dump information about delta chains in a revlog" +msgstr "revlog ã«ãŠã‘ã‚‹ delta chain æƒ…å ±ã®è¡¨ç¤º" + +msgid " Output can be templatized. Available template keywords are:" +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" +" (new delta chains typically start at ratio 2.00)\n" +" lindist linear distance from base revision in delta chain to " +"end\n" +" of this revision\n" +" 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" +" extraratio extradist divided by chainsize; another representation " +"of\n" +" how much unrelated data is needed to load this delta " +"chain\n" +" " +msgstr "" + msgid "test Mercurial installation" msgstr "Mercurial インストールã®æ¤œè¨¼" @@ -13293,7 +13812,7 @@ " The actual working directory content or existing dirstate\n" " information such as adds or removes is not considered." msgstr "" -" 指定リビジョン時点ã®å„ファイルã®å†…容を元ã«ã€€dirstate ãŒè¨å®šã•ã‚Œã¾ã™ã€‚\n" +" 指定リビジョン時点ã®å„ファイルã®å†…容を元㫠dirstate ãŒè¨å®šã•ã‚Œã¾ã™ã€‚\n" " 作æ¥é ˜åŸŸä¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å®Ÿéš›ã®å†…å®¹ã‚„ã€ è¿½åŠ ç™»éŒ²ï¼ç™»éŒ²é™¤å¤–ã®ã‚ˆã†ãªã€\n" " æ—¢å˜ã® dirstate æƒ…å ±ã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚" @@ -13343,9 +13862,6 @@ msgid "dump index data" msgstr "インデックスデータã®ãƒ€ãƒ³ãƒ—" -msgid "-c|-m|FILE" -msgstr "-c|-m|FILE" - msgid "show data and statistics about a revlog" msgstr "revlog ファイルã®ãƒ‡ãƒ¼ã‚¿ã¨çµ±è¨ˆæƒ…å ±ã®è¡¨ç¤º" @@ -13443,7 +13959,7 @@ "which\n" " may also be split, i.e. have multiple successors)." msgstr "" -" 複数ã®ç•°ãªã‚‹æ–¹æ³•ã§æ›¸ãæ›ãˆã‚‰ã‚ŒãŸãƒªãƒ“ジョンを〠\"分å²\" (divergent)\n" +" 複数ã®ç•°ãªã‚‹æ–¹æ³•ã§æ›¸ãæ›ãˆã‚‰ã‚ŒãŸãƒªãƒ“ジョンを〠\"分å²\" (divergent)\n" " ã¨å‘¼ã³ã¾ã™ã€‚ 分å²ãƒªãƒ“ジョンã«ã¯ã€ 複数ã®å¾Œç¶™ã‚»ãƒƒãƒˆãŒå˜åœ¨ã—ã¾ã™ã€‚\n" " (複数ã®å¾Œç¶™ã‚»ãƒƒãƒˆã®ãã‚Œãžã‚ŒãŒã€ 複数ã®å¾Œç¶™ãƒªãƒ“ジョンã‹ã‚‰æ§‹æˆã•ã‚Œã‚‹ã€\n" " 分割後継セットã‹ã‚‚ã—ã‚Œã¾ã›ã‚“)" @@ -13494,7 +14010,7 @@ msgstr " 差分㯠unified diff å½¢å¼ã§è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚" msgid "" -" diff may generate unexpected results for merges, as it will\n" +" :hg:`diff` may generate unexpected results for merges, as it will\n" " default to comparing against the working directory's first\n" " parent changeset if no revisions are specified." msgstr "" @@ -13498,9 +14014,20 @@ " default to comparing against the working directory's first\n" " parent changeset if no revisions are specified." msgstr "" -" マージ実施リビジョンã«å¯¾ã™ã‚‹æœ¬ã‚³ãƒžãƒ³ãƒ‰ã®å·®åˆ†å‡ºåŠ›ãŒã€\n" -" 期待ã¨ç•°ãªã‚‹å ´åˆãŒã‚ã‚‹ã®ã¯ã€ 対象リビジョンãŒç„¡æŒ‡å®šã®å ´åˆã«\n" -" 比較対象ã¨ãªã‚‹ã®ãŒã€ 作æ¥é ˜åŸŸã®ç¬¬1親ã«å›ºå®šã•ã‚Œã¦ã„ã‚‹ãŸã‚ã§ã™ã€‚" +" マージ実施リビジョンã«å¯¾ã™ã‚‹ :hg:`diff` çµæžœãŒã€\n" +" 想定ã¨ç•°ãªã‚‹å ´åˆãŒã‚ã‚‹ã®ã¯ã€ 対象リビジョン無指定時ã®æ¯”較対象ãŒã€\n" +" 作æ¥é ˜åŸŸã®ç¬¬1親ã«å›ºå®šã•ã‚Œã¦ã„ã‚‹ãŸã‚ã§ã™ã€‚" + +msgid "" +" When two revision arguments are given, then changes are shown\n" +" between those revisions. If only one revision is specified then\n" +" that revision is compared to the working directory, and, when no\n" +" revisions are specified, the working directory files are compared\n" +" to its first parent." +msgstr "" +" リビジョン指定ãŒ2ã¤ã®å ´åˆã€ 指定リビジョン間ã®å·®åˆ†ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n" +" リビジョン指定ãŒ1ã¤ã®å ´åˆã€ 作æ¥é ˜åŸŸãŒæŒ‡å®šãƒªãƒ“ジョンã¨æ¯”較ã•ã‚Œã¾ã™ã€‚\n" +" リビジョン指定ãŒãªã„å ´åˆã€ 作æ¥é ˜åŸŸãŒç¬¬1親リビジョンã¨æ¯”較ã•ã‚Œã¾ã™ã€‚" msgid "" " Alternatively you can specify -c/--change with a revision to see\n" @@ -13590,7 +14117,7 @@ " (default 以外ã®å ´åˆã¯)ブランãƒåå‰/ãƒãƒƒã‚·ãƒ¥å€¤/親リビジョン/コミットãƒã‚°" msgid "" -" export may generate unexpected diff output for merge\n" +" :hg:`export` may generate unexpected diff output for merge\n" " changesets, as it will compare the merge changeset against its\n" " first parent only." msgstr "" @@ -13594,9 +14121,9 @@ " changesets, as it will compare the merge changeset against its\n" " first parent only." msgstr "" -" 本コマンドã®å·®åˆ†å‡ºåŠ›ãŒã€ マージ実施リビジョンã«å¯¾ã—ã¦ã¯ã€\n" -" 期待ã¨ç•°ãªã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ 差分出力ã®éš›ã®æ¯”較対象ãŒã€\n" -" 指定リビジョンã®ç¬¬1親ã«å›ºå®šã•ã‚Œã¦ã„ã‚‹ãŸã‚ã§ã™ã€‚" +" マージ実施リビジョンã«å¯¾ã™ã‚‹ :hg:`export` çµæžœãŒã€\n" +" 期待ã¨ç•°ãªã‚‹å ´åˆãŒã‚ã‚‹ã®ã¯ã€ 差分出力ã®éš›ã®æ¯”較対象ãŒã€\n" +" 当該リビジョンã®ç¬¬1親ã«å›ºå®šã•ã‚Œã¦ã„ã‚‹ãŸã‚ã§ã™ã€‚" msgid "" " Output may be to a file, in which case the name of the file is\n" @@ -13813,8 +14340,8 @@ msgid "record the current user as committer" msgstr "ç¾ãƒ¦ãƒ¼ã‚¶ã‚’コミットユーザã¨ã—ã¦è¨˜éŒ²" -msgid "[OPTION]... [-r] REV..." -msgstr "[OPTION]... [-r] REV..." +msgid "[OPTION]... [-r REV]... REV..." +msgstr "[OPTION]... [-r REV]... REV..." msgid "copy changes from other branches onto the current branch" msgstr "別ブランãƒä¸Šã‹ã‚‰ç¾è¡Œãƒ–ランãƒã¸ã®æŒ‡å®šãƒªãƒ“ジョンã®è¤‡è£½" @@ -13863,11 +14390,11 @@ " -c/--continue 指定ã«ã‚ˆã‚Šã€ 未完了ã®ç§»æ¤ã‚’å†é–‹ã—ã¦ãã ã•ã„。" msgid "" -" The -c/--continue option does not reapply earlier options, except\n" -" for --force." -msgstr "" -" -c/--continue ã§ã®ç§»æ¤å†é–‹ã®éš›ã«ã¯ã€ å†åº¦æ˜Žç¤ºçš„ã«æŒ‡å®šã—ãªã„é™ã‚Šã€\n" -" 以å‰ã«æŒ‡å®šã—ãŸã‚ªãƒ—ションã¯é©ç”¨ã•ã‚Œã¾ã›ã‚“ (但㗠--force 除ã)。" +" The -c/--continue option does not reapply earlier options, except\n" +" for --force." +msgstr "" +" -c/--continue ã§ã®ç§»æ¤å†é–‹ã®éš›ã«ã¯ã€ å†åº¦æ˜Žç¤ºçš„ã«æŒ‡å®šã—ãªã„é™ã‚Šã€\n" +" 以å‰ã«æŒ‡å®šã—ãŸã‚ªãƒ—ションã¯é©ç”¨ã•ã‚Œã¾ã›ã‚“ (但㗠--force 除ã)。" msgid "" " - copy a single change to the stable branch and edit its description::" @@ -13899,6 +14426,12 @@ msgid " hg log --debug -r ." msgstr " hg log --debug -r ." +msgid " - show revisions sorted by date::" +msgstr " - 日付ã®æ˜‡é †ã§æ•´åˆ—ã—ãŸå±¥æ´ã®è¡¨ç¤º::" + +msgid " hg log -r 'sort(all(), date)'" +msgstr " hg log -r 'sort(all(), date)'" + msgid "" " See :hg:`help revisions` and :hg:`help revsets` for more about\n" " specifying revisions." @@ -13913,6 +14446,11 @@ " æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0 ã§ã™ã€‚\n" " " +msgid "" +"warning: inconsistent use of --rev might give unexpected revision ordering!\n" +msgstr "" +"è¦å‘Š: 一貫性ã®ãªã„ --rev ã®ä½¿ç”¨ã¯äºˆæœŸã›ã¬é †åºã§ã®ç§»æ¤ã®å±é™ºãŒã‚ã‚Šã¾ã™!\n" + msgid "can't specify --continue and revisions" msgstr "--continue ã¨ãƒªãƒ“ジョンã¯åŒæ™‚ã«æŒ‡å®šã§ãã¾ã›ã‚“" @@ -13948,8 +14486,9 @@ msgid "grafting %s\n" msgstr "%s を移æ¤ä¸\n" -msgid "use hg resolve and hg graft --continue" -msgstr "'hg resolve' ã§ã®è¡çªè§£æ¶ˆå¾Œã«ã€'hg graft --continue'を実行ã—ã¦ãã ã•ã„" +#, python-format +msgid "use hg resolve and hg graft --continue%s" +msgstr "hg resolve ã§ã®è¡çªè§£æ¶ˆå¾Œã« hg graft --continue %s を実行ã—ã¦ãã ã•ã„" #, python-format msgid "note: graft of %d:%s created no changes to commit\n" @@ -14108,8 +14647,11 @@ msgid "show topics matching keyword" msgstr "ã‚ーワードã«åˆè‡´ã™ã‚‹ãƒˆãƒ”ック一覧を表示" -msgid "[-eck] [TOPIC]" -msgstr "[-eck] [TOPIC]" +msgid "show help for specific platform(s)" +msgstr "指定環境ã«å›ºæœ‰ã®ãƒ˜ãƒ«ãƒ—を表示" + +msgid "[-ecks] [TOPIC]" +msgstr "[-ecks] [TOPIC]" msgid "show help for a given topic or a help overview" msgstr "指定ã•ã‚ŒãŸãƒˆãƒ”ックã®ãƒ˜ãƒ«ãƒ—や〠ヘルプ概è¦ã®è¡¨ç¤º" @@ -14203,6 +14745,13 @@ msgid " hg id -r tip http://selenic.com/hg/" msgstr " hg id -r tip http://selenic.com/hg/" +msgid "" +" See :hg:`log` for generating more information about specific revisions,\n" +" including full hash identifiers." +msgstr "" +" è˜åˆ¥ç”¨ãƒãƒƒã‚·ãƒ¥å€¤ç‰ã‚’å«ã‚€ã€ 特定リビジョンã®æƒ…å ±å‚ç…§ã«é–¢ã™ã‚‹è©³ç´°ã¯ã€\n" +" :hg:`log` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" + msgid "can't query remote revision number, branch, or tags" msgstr "リビジョン番å·/ブランãƒ/ã‚¿ã‚°ã¯é éš”å•ã„åˆã‚ã›ã§ãã¾ã›ã‚“" @@ -14252,7 +14801,15 @@ " (--no-commit 指定ãŒç„¡ã„é™ã‚Š) 個別ã«è¡Œã„ã¾ã™ã€‚" msgid "" -" Because import first applies changes to the working directory,\n" -" import will abort if there are outstanding changes." +" To read a patch from standard input, use \"-\" as the patch name. If\n" +" a URL is specified, the patch will be downloaded from there." +msgstr "" +" 標準入力ã‹ã‚‰ãƒ‘ッãƒã‚’å–り込むã«ã¯ã€ パッãƒåã« \"-\" を指定ã—ã¾ã™ã€‚\n" +" URL ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ パッãƒã‚’当該 URL ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—ã¾ã™ã€‚" + +msgid "" +" Import first applies changes to the working directory (unless\n" +" --bypass is specified), import will abort if there are outstanding\n" +" changes." msgstr "" " å–ã‚Šè¾¼ã¿ä½œæ¥ã¯ä½œæ¥é ˜åŸŸã§å®Ÿæ–½ã•ã‚Œã‚‹ãŸã‚〠未コミット変更ãŒã‚ã‚‹å ´åˆã¯ã€\n" @@ -14257,9 +14814,18 @@ msgstr "" " å–ã‚Šè¾¼ã¿ä½œæ¥ã¯ä½œæ¥é ˜åŸŸã§å®Ÿæ–½ã•ã‚Œã‚‹ãŸã‚〠未コミット変更ãŒã‚ã‚‹å ´åˆã¯ã€\n" -" å–ã‚Šè¾¼ã¿æ“作ã¯ä¸æ–ã•ã‚Œã¾ã™ã€‚" +" å–ã‚Šè¾¼ã¿æ“作ã¯ä¸æ–ã•ã‚Œã¾ã™ (--bypass 指定時除ã)。" + +msgid "" +" Use --bypass to apply and commit patches directly to the\n" +" repository, without affecting the working directory. Without\n" +" --exact, patches will be applied on top of the working directory\n" +" parent revision." +msgstr "" +" --bypass 指定時ã¯ã€ 作æ¥é ˜åŸŸå†…容ã®å¤‰æ›´ç„¡ã—ã«ã€ å±¥æ´ã«è¨˜éŒ²ã—ã¾ã™ã€‚\n" +" --exact 指定ãŒç„¡ã„å ´åˆã€ 変更ã¯ä½œæ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã«é©ç”¨ã•ã‚Œã¾ã™ã€‚" msgid "" " You can import a patch straight from a mail message. Even patches\n" " as attachments work (to use the body part, it must have type\n" " text/plain or text/x-patch). From and Subject headers of email\n" " message are used as default committer and commit message. All\n" @@ -14260,10 +14826,10 @@ msgid "" " You can import a patch straight from a mail message. Even patches\n" " as attachments work (to use the body part, it must have type\n" " text/plain or text/x-patch). From and Subject headers of email\n" " message are used as default committer and commit message. All\n" -" text/plain body parts before first diff are added to commit\n" +" text/plain body parts before first diff are added to the commit\n" " message." msgstr "" " æ·»ä»˜ãƒ•ã‚¡ã‚¤ãƒ«å½¢å¼ (但㗠text/plain ã¾ãŸã¯ text/x-patch åž‹é™å®š)\n" @@ -14297,13 +14863,27 @@ " パッãƒå†…容ã®æ¬ æãªã©ã§ã™ã€‚" msgid "" -" Use --bypass to apply and commit patches directly to the\n" -" repository, not touching the working directory. Without --exact,\n" -" patches will be applied on top of the working directory parent\n" -" revision." -msgstr "" -" --bypass 指定時ã¯ã€ 作æ¥é ˜åŸŸå†…容ã®å¤‰æ›´ç„¡ã—ã«ã€ å±¥æ´ã«è¨˜éŒ²ã—ã¾ã™ã€‚\n" -" --exact 指定ãŒç„¡ã„å ´åˆã€ 変更ã¯ä½œæ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã«é©ç”¨ã•ã‚Œã¾ã™ã€‚" +" Use --partial to ensure a changeset will be created from the patch\n" +" even if some hunks fail to apply. Hunks that fail to apply will be\n" +" written to a <target-file>.rej file. Conflicts can then be resolved\n" +" by hand before :hg:`commit --amend` is run to update the created\n" +" changeset. This flag exists to let people import patches that\n" +" partially apply without losing the associated metadata (author,\n" +" date, description, ...)." +msgstr "" +" --partial 指定ã«ã‚ˆã‚Šã€ パッãƒãŒéƒ¨åˆ†çš„ã«ã—ã‹é©ç”¨ã•ã‚Œãªã„å ´åˆã§ã‚‚ã€\n" +" æ–°è¦ãƒªãƒ“ジョンã®ç”ŸæˆãŒä¿è¨¼ã•ã‚Œã¾ã™ã€‚ é©ç”¨å¤±æ•—ã—ãŸãƒ‘ッãƒéƒ¨ä½ã¯ã€\n" +" ``対象ファイル.rej`` ファイルã«ä¿å˜ã•ã‚Œã¾ã™ã€‚ é©ç”¨å¤±æ•—部ä½ã®å•é¡Œã‚’ã€\n" +" 手動ã§è§£æ¶ˆã—ãŸä¸Šã§ã€ :hg:`commit --amend` ã§å–り込むã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚\n" +" --partial ã«ã¯ã€ パッãƒã«å«ã¾ã‚Œã‚‹ãƒ¡ã‚¿ãƒ‡ãƒ¼ã‚¿æƒ…å ± (コミットユーザåã€\n" +" 日付〠コミットãƒã‚°ãªã©) を失ã†ã“ã¨ã‚’回é¿ã™ã‚‹ç›®çš„ãŒã‚ã‚Šã¾ã™ã€‚" + +msgid "" +" When no hunks apply cleanly, :hg:`import --partial` will create\n" +" an empty changeset, importing only the patch metadata." +msgstr "" +" パッãƒé©ç”¨ãŒå®Œå…¨ã«å¤±æ•—ã—ãŸå ´åˆã§ã‚‚〠:hg:`import --partial` ã¯ã€\n" +" メタデータã®ã¿ãŒè¨˜éŒ²ã•ã‚ŒãŸã€ æ–°è¦ãƒªãƒ“ジョンを作æˆã—ã¾ã™ã€‚" msgid "" " With -s/--similarity, hg will attempt to discover renames and\n" @@ -14313,26 +14893,6 @@ " パッãƒã«ã‚ˆã‚‹å¤‰æ›´çµæžœã‹ã‚‰ã€ 改åや複製を検出ã—ã¾ã™ã€‚" msgid "" -" Use --partial to ensure a changeset will be created from the patch\n" -" even if some hunks fail to apply. Hunks that fail to apply will be\n" -" written to a <target-file>.rej file. Conflicts can then be resolved\n" -" by hand before :hg:`commit --amend` is run to update the created\n" -" changeset. This flag exists to let people import patches that\n" -" partially apply without losing the associated metadata (author,\n" -" date, description, ...). Note that when none of the hunk applies\n" -" cleanly, :hg:`import --partial` will create an empty changeset,\n" -" importing only the patch metadata." -msgstr "" -" --partial 指定ã«ã‚ˆã‚Šã€ パッãƒãŒéƒ¨åˆ†çš„ã«ã—ã‹é©ç”¨ã•ã‚Œãªã„å ´åˆã§ã‚‚ã€\n" -" æ–°è¦ãƒªãƒ“ジョンã®ç”ŸæˆãŒä¿è¨¼ã•ã‚Œã¾ã™ã€‚ é©ç”¨å¤±æ•—ã—ãŸãƒ‘ッãƒéƒ¨ä½ã¯ã€\n" -" ``対象ファイル.rej`` ファイルã«ä¿å˜ã•ã‚Œã¾ã™ã€‚ é©ç”¨å¤±æ•—部ä½ã®å•é¡Œã‚’ã€\n" -" 手動ã§è§£æ¶ˆã—ãŸä¸Šã§ã€ :hg:`commit --amend` ã§å–り込むã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚\n" -" --partial ã«ã¯ã€ パッãƒã«å«ã¾ã‚Œã‚‹ãƒ¡ã‚¿ãƒ‡ãƒ¼ã‚¿æƒ…å ± (コミットユーザåã€\n" -" 日付〠コミットãƒã‚°ãªã©) を失ã†ã“ã¨ã‚’回é¿ã™ã‚‹ç›®çš„ãŒã‚ã‚Šã¾ã™ã€‚\n" -" パッãƒé©ç”¨ãŒå®Œå…¨ã«å¤±æ•—ã—ãŸå ´åˆã§ã‚‚〠:hg:`import --partial` ã¯ã€\n" -" メタデータã®ã¿ãŒè¨˜éŒ²ã•ã‚ŒãŸã€ æ–°è¦ãƒªãƒ“ジョンを作æˆã—ã¾ã™ã€‚" - -msgid "" " It is possible to use external patch programs to perform the patch\n" " by setting the ``ui.patch`` configuration option. For the default\n" " internal tool, the fuzz can also be configured via ``patch.fuzz``.\n" @@ -14344,15 +14904,6 @@ " ``patch.fuzz`` è¨å®šã«ã‚ˆã‚Š fuzz 挙動を制御å¯èƒ½ã§ã™ã€‚ è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚„ã€\n" " 上記è¨å®šé …ç›®ã®è©³ç´°ã«é–¢ã—ã¦ã¯ :hg:`help config` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" -msgid "" -" To read a patch from standard input, use \"-\" as the patch name. If\n" -" a URL is specified, the patch will be downloaded from it.\n" -" See :hg:`help dates` for a list of formats valid for -d/--date." -msgstr "" -" 標準入力ã‹ã‚‰ãƒ‘ッãƒã‚’å–り込むã«ã¯ã€ パッãƒåã« \"-\" を指定ã—ã¾ã™ã€‚\n" -" URL ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ パッãƒã‚’当該 URL ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—ã¾ã™ã€‚\n" -" -d/--date ã§ã®æ—¥æ™‚表記㯠:hg:`help dates` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" - msgid " - import a traditional patch from a website and detect renames::" msgstr " - ウェブサイトã‹ã‚‰å…¥æ‰‹ã—ãŸæ¨™æº–çš„ãªãƒ‘ッãƒã®é©ç”¨ã¨æ”¹åã®åˆ¤å®š::" @@ -14671,8 +15222,8 @@ " 且ã¤ã“ã®ãƒžãƒ¼ã‚¸ã«ã‚ˆã£ã¦ã€ å±¥æ´ãŒæžåˆ†ã‹ã‚Œã—ã¦ã„ã‚‹ã“ã¨ã‚’表ã—ã¾ã™ã€‚" msgid "" -" log -p/--patch may generate unexpected diff output for merge\n" +" :hg:`log --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" " will appear in files:." msgstr "" @@ -14675,16 +15226,15 @@ " changesets, as it will only compare the merge changeset against\n" " its first parent. Also, only files different from BOTH parents\n" " will appear in files:." msgstr "" -" -p/--patch 指定ã«ã‚ˆã‚‹å·®åˆ†å‡ºåŠ›ãŒã€ マージ実施リビジョンã«å¯¾ã—ã¦ã¯ã€\n" -" 期待ã¨ç•°ãªã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ 差分出力ã®éš›ã®æ¯”較対象ãŒã€\n" -" 指定リビジョンã®ç¬¬1親ã«å›ºå®šã•ã‚Œã¦ã„ã‚‹ãŸã‚ã§ã™ã€‚ ファイル一覧ãŒã€\n" -" 期待ã¨ç•°ãªã‚‹å ´åˆã‚‚ã‚ã‚Šã¾ã™ã€‚ 更新対象ファイル一覧ã«åˆ—挙ã•ã‚Œã‚‹ã®ã¯ã€\n" -" マージ対象リビジョンã®é–“ã§ã€ 内容ãŒç•°ãªã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®ã¿ãŒã€\n" -" 更新対象ã¨ã—ã¦åˆ—挙ã•ã‚Œã‚‹ãŸã‚ã§ã™ã€‚" - -msgid "" -" for performance reasons, log FILE may omit duplicate changes\n" +" マージ実施リビジョンã«å¯¾ã™ã‚‹ :hg:`log --patch` çµæžœãŒã€\n" +" 期待ã¨ç•°ãªã‚‹å ´åˆãŒã‚ã‚‹ã®ã¯ã€ 差分出力ã®éš›ã®æ¯”較対象ãŒã€\n" +" 当該リビジョンã®ç¬¬1親ã«å›ºå®šã•ã‚Œã¦ã„ã‚‹ãŸã‚ã§ã™ã€‚ ã¾ãŸã€\n" +" 更新ファイル一覧ã«åˆ—挙ã•ã‚Œã‚‹ã®ã¯ã€ マージ実施リビジョンã§ã®å†…容ãŒã€\n" +" 両方ã®è¦ªãƒªãƒ“ジョンã®ã„ãšã‚Œã¨ã‚‚ç•°ãªã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®ã¿ã§ã™ã€‚" + +msgid "" +" For performance reasons, :hg:`log FILE` may omit duplicate changes\n" " made on branches and will not show removals or mode changes. To\n" " see all such changes, use the --removed switch." msgstr "" @@ -14688,10 +15238,10 @@ " made on branches and will not show removals or mode changes. To\n" " see all such changes, use the --removed switch." msgstr "" -" ファイルå指定付ãã§ã®å®Ÿè¡Œã§ã¯ã€ 複数ブランãƒä¸Šã§ã®åŒä¸€å¤‰æ›´ã‚„ã€\n" -" 登録除外ã®å®Ÿæ–½ã€ 実行モード変更ã®å®Ÿæ–½ã«é–¢ã™ã‚‹ãƒªãƒ“ジョンã¯ã€\n" -" 性能劣化防æ¢ã®ç‚¹ã‹ã‚‰è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“。 ã“れらã®å¤‰æ›´ã‚’å«ã‚€ã€\n" -" 全リビジョンを表示ã—ãŸã„å ´åˆã¯ã€ --removed を指定ã—ã¦ãã ã•ã„。" +" :hg:`log FILE` å½¢å¼ã§ã®å®Ÿè¡Œæ™‚ã¯ã€ 実行性能劣化防æ¢ã®è¦³ç‚¹ã‹ã‚‰ã€\n" +" 複数ブランãƒä¸Šã§ã®åŒä¸€å¤‰æ›´ã‚„〠登録除外〠実行モードã®ã¿ã®å¤‰æ›´ã€\n" +" ã¨ã„ã£ãŸãƒªãƒ“ジョンãŒã€ 表示対象ã‹ã‚‰é™¤å¤–ã•ã‚Œã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚\n" +" --removed 指定ã«ã‚ˆã‚Šã€ ã“れらをå«ã‚€å…¨ãƒªãƒ“ジョンãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚" msgid " - changesets with full descriptions and file lists::" msgstr " - 全リビジョンã®ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã¨ãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã®è¡¨ç¤º::" @@ -14731,6 +15281,12 @@ msgid " hg log -k bug --template \"{rev}\\n\"" msgstr " hg log -k bug --template \"{rev}\\n\"" +msgid " - the full hash identifier of the working directory parent::" +msgstr " - 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã®å®Œå…¨ãƒãƒƒã‚·ãƒ¥å€¤ã®è¡¨ç¤º::" + +msgid " hg log -r . --template \"{node}\\n\"" +msgstr " hg log -r . --template \"{node}\\n\"" + msgid " - list available log templates::" msgstr " - 利用å¯èƒ½ãªãƒ†ãƒ³ãƒ—レートスタイル一覧ã®è¡¨ç¤º::" @@ -14758,6 +15314,13 @@ " hg log -r \"last(tagged())::\" --template \"{desc|firstline}\\n\"" msgid "" +" See :hg:`help revisions` and :hg:`help revsets` for more about\n" +" specifying and ordering revisions." +msgstr "" +" リビジョン指定ã®è©³ç´°ã¯ :hg:`help revisions` ãŠã‚ˆã³ :hg:`help revsets`\n" +" ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" + +msgid "" " See :hg:`help templates` for more about pre-packaged styles and\n" " specifying custom templates." msgstr "" @@ -14855,8 +15418,8 @@ " 且ã¤ç¾è¡Œãƒ–ランãƒãŒã‚‚ã†1ã¤ã ã‘ヘッドをæŒã¤å ´åˆã€ ãã®ãƒ˜ãƒƒãƒ‰ãŒãƒžãƒ¼ã‚¸\n" " 対象ã¨ãªã‚Šã¾ã™ã€‚ ãれ以外ã®å ´åˆã¯ã€ 明示的ãªãƒªãƒ“ジョン指定ãŒå¿…è¦ã§ã™ã€‚" -msgid " :hg:`resolve` must be used to resolve unresolved files." -msgstr " è¡çªæœªè§£æ¶ˆãªãƒ•ã‚¡ã‚¤ãƒ«ã¯ :hg:`resolve` ã§ã®è¡çªè§£æ¶ˆãŒå¿…è¦ã§ã™ã€‚" +msgid " See :hg:`help resolve` for information on handling file conflicts." +msgstr " è¡çªã®æ‰±ã„ã«é–¢ã™ã‚‹è©³ç´°ã¯ :hg:`help resolve` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" msgid "" " To undo an uncommitted merge, use :hg:`update --clean .` which\n" @@ -14970,6 +15533,25 @@ " ã•ã‚ŒãŸå ´åˆã€ (作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョン〠ã¾ãŸã¯ --rev 指定ã®ãƒªãƒ“ジョン\n" " 以å‰ã®ã‚‚ã®ã§)ãã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’最後ã«æ›´æ–°ã—ãŸãƒªãƒ“ジョンを表示ã—ã¾ã™ã€‚" +msgid " This command is equivalent to::" +msgstr "" +" 本コマンドã¯ä»¥ä¸‹ã¨ç‰ä¾¡ã§ã™ (※ 訳注: 2ã¤ç›®ä»¥é™ã¯ FILE ã‚„ `--rev REV`\n" +" 指定時ã®æŒ™å‹•ã«å¯¾å¿œã—ã¾ã™)::" + +msgid "" +" hg log -r \"p1()+p2()\" or\n" +" hg log -r \"p1(REV)+p2(REV)\" or\n" +" hg log -r \"max(::p1() and file(FILE))+max(::p2() and file(FILE))\" " +"or\n" +" hg log -r \"max(::p1(REV) and file(FILE))+max(::p2(REV) and file" +"(FILE))\"" +msgstr "" +" hg log -r \"p1()+p2()\"\n" +" hg log -r \"p1(REV)+p2(REV)\"\n" +" hg log -r \"max(::p1() and file(FILE))+max(::p2() and file(FILE))\"\n" +" hg log -r \"max(::p1(REV) and file(FILE))+max(::p2(REV) and file" +"(FILE))\"" + msgid " See :hg:`summary` and :hg:`help revsets` for related information." msgstr "" " é–¢é€£æƒ…å ±ã¯ :hg:`summary` ã‚„ :hg:`help revsets` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" @@ -15015,10 +15597,7 @@ " When ``default-push`` is set, it will be used for push and\n" " ``default`` will be used for pull; otherwise ``default`` is used\n" " as the fallback for both. When cloning a repository, the clone\n" -" source is written as ``default`` in ``.hg/hgrc``. Note that\n" -" ``default`` and ``default-push`` apply to all inbound (e.g.\n" -" :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and\n" -" :hg:`bundle`) operations." +" source is written as ``default`` in ``.hg/hgrc``." msgstr "" " ``default`` ãŠã‚ˆã³ ``default-push`` ã¯ç‰¹åˆ¥ãªæ„味をæŒã¡ã¾ã™ã€‚\n" " push/pull ã®éš›ã«ã‚³ãƒžãƒ³ãƒ‰è¡Œã§é€£æºå…ˆãƒªãƒã‚¸ãƒˆãƒªãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€\n" @@ -15026,10 +15605,16 @@ " ``default-push`` 㯠:hg:`push` ã§ä½¿ç”¨ã•ã‚Œã€ ``default`` ã¯\n" " :hg:`pull` ã§ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚ ``default-push`` ãŒæœªè¨å®šã§ã‚ã‚Œã°ã€\n" " push/pull 共㫠``default`` を使用ã—ã¾ã™ã€‚ リãƒã‚¸ãƒˆãƒªã®è¤‡è£½ã§ã¯ã€\n" -" 複製元リãƒã‚¸ãƒˆãƒªãŒ ``default`` ã¨ã—㦠``.hg/hgrc`` ã«è¨˜éŒ²ã•ã‚Œã¾ã™ã€‚\n" -" ``default`` ãŠã‚ˆã³ ``default-push`` ã¯å…¨ã¦ã®å–り込㿠(例:\n" -" :hg:`incoming`) ãŠã‚ˆã³åæ˜ (例: :hg:`outgoing` 〠:hg:`email` ãŠã‚ˆã³\n" -" :hg:`bundle`) æ“作ã«ãŠã„ã¦é©ç”¨ã•ã‚Œã¾ã™ã€‚" +" 複製元リãƒã‚¸ãƒˆãƒªãŒ ``default`` ã¨ã—㦠``.hg/hgrc`` ã«è¨˜éŒ²ã•ã‚Œã¾ã™ã€‚" + +msgid "" +" ``default`` and ``default-push`` apply to all inbound (e.g.\n" +" :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`\n" +" and :hg:`bundle`) operations." +msgstr "" +" ``default`` ãŠã‚ˆã³ ``default-push`` ã¯å…¨ã¦ã®å–り込㿠(例:\n" +" :hg:`incoming`) ãŠã‚ˆã³åæ˜ (例: :hg:`outgoing` 〠:hg:`email`\n" +" ãŠã‚ˆã³ :hg:`bundle`) æ“作ã«ãŠã„ã¦é©ç”¨ã•ã‚Œã¾ã™ã€‚" msgid " See :hg:`help urls` for more information." msgstr " 詳細㯠:hg:`help urls` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" @@ -15105,12 +15690,8 @@ msgstr "フェーズã®å¤‰æ›´ãªã—\n" #, python-format -msgid "not updating: %s\n" -msgstr "æ›´æ–°ä¸æ–: %s\n" - -#, python-format -msgid "(%s)\n" -msgstr "(%s)\n" +msgid "not updating: %s" +msgstr "更新処ç†ã‚’ä¸æ–: %s" msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n" msgstr "(ヘッド一覧表示㯠'hg heads'〠マージ実施㯠'hg merge')\n" @@ -15225,13 +15806,13 @@ " を使用ã—ã¾ã™ã€‚ ã“ã®ã‚ªãƒ—ションã¯ã€ æ–°è¦ãƒ–ランãƒã®ä½œæˆã®ã¿ã‚’許å¯ã—ã¾ã™ã€‚" msgid "" -" Extra care should be taken with the -f/--force option,\n" -" which will push all new heads on all branches, an action which will\n" -" almost always cause confusion for collaborators." -msgstr "" -" -f/--force を指定ã—ãŸå ´åˆã€ 対象ブランãƒä¸Šã®å…¨ãƒ˜ãƒƒãƒ‰ãƒªãƒ“ジョンãŒã€\n" -" 連æºå…ˆã«åæ˜ ã•ã‚Œã¾ã™ã€‚ ã“ã®æŒ™å‹•ã¯å¤šãã®å ´åˆã€ å…±åŒä½œæ¥è€…ã®é–“ã§ã€\n" -" 無用ãªæ··ä¹±ã®åŽŸå› ã¨ãªã‚Šã¾ã™ã®ã§ã€ 指定ã®éš›ã«ã¯å分ãªæ³¨æ„ãŒå¿…è¦ã§ã™ã€‚" +" Extra care should be taken with the -f/--force option,\n" +" which will push all new heads on all branches, an action which will\n" +" almost always cause confusion for collaborators." +msgstr "" +" -f/--force を指定ã—ãŸå ´åˆã€ 対象ブランãƒä¸Šã®å…¨ãƒ˜ãƒƒãƒ‰ãƒªãƒ“ジョンãŒã€\n" +" 連æºå…ˆã«åæ˜ ã•ã‚Œã¾ã™ã€‚ ã“ã®æŒ™å‹•ã¯å¤šãã®å ´åˆã€ å…±åŒä½œæ¥è€…ã®é–“ã§ã€\n" +" 無用ãªæ··ä¹±ã®åŽŸå› ã¨ãªã‚Šã¾ã™ã®ã§ã€ 指定ã®éš›ã«ã¯å分ãªæ³¨æ„ãŒå¿…è¦ã§ã™ã€‚" msgid "" " If -r/--rev is used, the specified revision and all its ancestors\n" @@ -15366,12 +15947,11 @@ " =============== == == == ==" msgid "" -" Note that remove never deletes files in Added [A] state from the\n" -" working directory, not even if option --force is specified." -msgstr "" -" 作æ¥é ˜åŸŸã«ãŠã‘ã‚‹è¿½åŠ [A] 状態ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«é–¢ã—ã¦ã¯ã€\n" -" --force を指定ã—ãªãã¦ã‚‚ã€\n" -" 登録除外æ“作ã«ã‚ˆã£ã¦ç ´æ£„ã•ã‚Œã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“。" +" :hg:`remove` never deletes files in Added [A] state from the\n" +" working directory, not even if ``--force`` is specified." +msgstr "" +" 作æ¥é ˜åŸŸã«ãŠã‘ã‚‹è¿½åŠ [A] 状態ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«é–¢ã—ã¦ã¯ã€\n" +" :hg:`remove` ãŒç ´æ£„ã™ã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“ (--force 指定時å«ã‚€)" msgid "" " Returns 0 on success, 1 if any warnings encountered.\n" @@ -15485,13 +16065,13 @@ " ``R`` ã¯è§£æ¶ˆæ¸ˆã¿(Resolved)ã‚’æ„味ã—ã¾ã™ã€‚" msgid "" -" Note that Mercurial will not let you commit files with unresolved\n" -" merge conflicts. You must use :hg:`resolve -m ...` before you can\n" -" commit after a conflicting merge." -msgstr "" -" è¡çªæœªè§£æ¶ˆã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚‹é–“ã¯ã‚³ãƒŸãƒƒãƒˆã§ãã¾ã›ã‚“。\n" -" マージã«ãŠã‘ã‚‹è¡çªè§£æ¶ˆã®éš›ã«ã¯ã€ コミットå‰ã«\n" -" :hg:`resolve -m ...` を実施ã—ã¦ãã ã•ã„。" +" Mercurial will not let you commit files with unresolved merge\n" +" conflicts. You must use :hg:`resolve -m ...` before you can\n" +" commit after a conflicting merge." +msgstr "" +" è¡çªæœªè§£æ¶ˆã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚‹é–“ã¯ã‚³ãƒŸãƒƒãƒˆã§ãã¾ã›ã‚“。\n" +" マージã«ãŠã‘ã‚‹è¡çªè§£æ¶ˆã®éš›ã«ã¯ã€ コミットå‰ã«\n" +" :hg:`resolve -m ...` を実施ã—ã¦ãã ã•ã„。" msgid "" " Returns 0 on success, 1 if any files fail a resolve attempt.\n" @@ -15827,10 +16407,6 @@ msgid "cannot use --stdio with --cmdserver" msgstr "--stdio 㨠--cmdserver ã¯ä½µç”¨ã§ãã¾ã›ã‚“" -#, python-format -msgid "listening at http://%s%s/%s (bound to %s:%d)\n" -msgstr "http://%s%s/%s ã§å¾…ã¡å—ã‘開始(ãƒã‚¤ãƒ³ãƒ‰å…ˆã¯ %s:%d)\n" - msgid "show status of all files" msgstr "å…¨ã¦ã®çŠ¶æ…‹ã‚’表示" @@ -15885,8 +16461,8 @@ " ãŒæ˜Žç¤ºçš„ã«æŒ‡å®šã•ã‚Œãªã„é™ã‚Šã€ 未登録ファイルã¯è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“。" msgid "" -" status may appear to disagree with diff if permissions have\n" +" :hg:`status` may appear to disagree with diff if permissions have\n" " changed or a merge has occurred. The standard diff format does\n" " not report permission changes and diff only reports changes\n" " relative to one merge parent." msgstr "" @@ -15889,8 +16465,8 @@ " changed or a merge has occurred. The standard diff format does\n" " not report permission changes and diff only reports changes\n" " relative to one merge parent." msgstr "" -" 権é™è¨å®šã®å¤‰æ›´ã‚„マージãŒè¡Œã‚ã‚ŒãŸå ´åˆã€ 状態表示ã®çµæžœãŒã€\n" +" 権é™è¨å®šã®å¤‰æ›´ã‚„マージãŒè¡Œã‚ã‚ŒãŸå ´åˆã€ :hg:`status` çµæžœãŒã€\n" " 差分表示ã‹ã‚‰æœŸå¾…ã•ã‚Œã‚‹çµæžœã¨ã¯ã€ ç•°ãªã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚\n" " 標準的ãªå·®åˆ†å½¢å¼ã¯ã€ 権é™å¤‰æ›´ã®æƒ…å ±ã‚’å«ã¿ã¾ã›ã‚“ã—ã€\n" " マージ実施リビジョンã§ã®å·®åˆ†è¡¨ç¤ºã¯ã€ 差分出力ã®éš›ã®æ¯”較対象ãŒã€\n" @@ -15894,7 +16470,7 @@ " 差分表示ã‹ã‚‰æœŸå¾…ã•ã‚Œã‚‹çµæžœã¨ã¯ã€ ç•°ãªã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚\n" " 標準的ãªå·®åˆ†å½¢å¼ã¯ã€ 権é™å¤‰æ›´ã®æƒ…å ±ã‚’å«ã¿ã¾ã›ã‚“ã—ã€\n" " マージ実施リビジョンã§ã®å·®åˆ†è¡¨ç¤ºã¯ã€ 差分出力ã®éš›ã®æ¯”較対象ãŒã€\n" -" 指定リビジョンã®ç¬¬1親ã«å›ºå®šã•ã‚Œã¦ã„ã‚‹ãŸã‚ã§ã™ã€‚" +" 当該リビジョンã®ç¬¬1親ã«å›ºå®šã•ã‚Œã¦ã„ã‚‹ãŸã‚ã§ã™ã€‚" msgid "" " If one revision is given, it is used as the base revision.\n" @@ -16000,6 +16576,10 @@ msgstr "ブックマーク:" #, python-format +msgid "warning: merge state has unsupported record types: %s\n" +msgstr "è¦å‘Š: マージ状態記録ã«æœªå¯¾å¿œã®æƒ…å ±ãŒå«ã¾ã‚Œã¦ã„ã¾ã™: %s\n" + +#, python-format msgid "%d modified" msgstr "変更ファイル数 %d" @@ -16035,6 +16615,9 @@ msgid "%d subrepos" msgstr "サブリãƒã‚¸ãƒˆãƒªæ•° %d" +msgid " (graft in progress)" +msgstr " (graft ã«ã‚ˆã‚‹ç§»æ¤ãŒæœªå®Œäº†ã§ã™)" + msgid " (interrupted update)" msgstr " (作æ¥é ˜åŸŸã®æ›´æ–°ãŒä¸æ–ã•ã‚ŒãŸã¾ã¾ã§ã™)" @@ -16065,8 +16648,8 @@ #. i18n: column positioning for "hg summary" #, python-format msgid "update: %d new changesets (update)\n" -msgstr "update 候補: %d ã®æ–°è¦ãƒªãƒ“ジョン(update)\n" +msgstr "update 候補: æ–°è¦ãƒªãƒ“ジョン %d 個 (update)\n" #. i18n: column positioning for "hg summary" #, python-format msgid "update: %d new changesets, %d branch heads (merge)\n" @@ -16069,8 +16652,8 @@ #. i18n: column positioning for "hg summary" #, python-format msgid "update: %d new changesets, %d branch heads (merge)\n" -msgstr "update 候補: %d 個ã®æ–°è¦ãƒªãƒ“ジョンã€%d 個ã®ãƒ–ランãƒãƒ˜ãƒƒãƒ‰(merge)\n" +msgstr "update 候補: æ–°è¦ãƒªãƒ“ジョン %d 個ã€ãƒ–ランãƒãƒ˜ãƒƒãƒ‰ %d 個 (merge)\n" #, python-format msgid "%d draft" @@ -16074,7 +16657,7 @@ #, python-format msgid "%d draft" -msgstr "%d draft リビジョン" +msgstr "draft リビジョン %d 個" #, python-format msgid "%d secret" @@ -16078,9 +16661,9 @@ #, python-format msgid "%d secret" -msgstr "%d secret リビジョン" +msgstr "secret リビジョン %d 個" #, python-format msgid "phases: %s\n" msgstr "フェーズ: %s\n" @@ -16082,10 +16665,22 @@ #, python-format msgid "phases: %s\n" msgstr "フェーズ: %s\n" +#, python-format +msgid "unstable: %d changesets" +msgstr "unstable リビジョン: %d 個" + +#, python-format +msgid "divergent: %d changesets" +msgstr "divergent リビジョン: %d 個" + +#, python-format +msgid "bumped: %d changesets" +msgstr "bumped リビジョン: %d 個" + msgid "1 or more incoming" msgstr "å–ã‚Šè¾¼ã¿å€™è£œãƒªãƒ“ジョンã‚ã‚Š" #, python-format msgid "%d outgoing" @@ -16087,9 +16682,9 @@ msgid "1 or more incoming" msgstr "å–ã‚Šè¾¼ã¿å€™è£œãƒªãƒ“ジョンã‚ã‚Š" #, python-format msgid "%d outgoing" -msgstr "%d 個ã®åæ˜ å€™è£œãƒªãƒ“ã‚¸ãƒ§ãƒ³" +msgstr "åæ˜ å€™è£œãƒªãƒ“ã‚¸ãƒ§ãƒ³ %d 個" #, python-format msgid "%d incoming bookmarks" @@ -16093,7 +16688,7 @@ #, python-format msgid "%d incoming bookmarks" -msgstr "%d 個ã®å–ã‚Šè¾¼ã¿å€™è£œãƒ–ックマーク" +msgstr "å–ã‚Šè¾¼ã¿å€™è£œãƒ–ックマーク %d 個" #, python-format msgid "%d outgoing bookmarks" @@ -16097,7 +16692,7 @@ #, python-format msgid "%d outgoing bookmarks" -msgstr "%d 個ã®åæ˜ å€™è£œãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯" +msgstr "åæ˜ å€™è£œãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯ %d 個" #. i18n: column positioning for "hg summary" #, python-format @@ -16221,7 +16816,8 @@ msgid "" " This lists both regular and local tags. When the -v/--verbose\n" -" switch is used, a third column \"local\" is printed for local tags." +" switch is used, a third column \"local\" is printed for local tags.\n" +" When the -q/--quiet switch is used, only the tag name is printed." msgstr "" " 本コマンドã¯ã€ 通常ã®ã‚¿ã‚°ãŠã‚ˆã³ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚°ã®ä¸¡æ–¹ã‚’一覧表示ã—ã¾ã™ã€‚\n" " -v/--verbose ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚°ã«ã¯ \"local\" 表示ã®\n" @@ -16225,7 +16821,7 @@ msgstr "" " 本コマンドã¯ã€ 通常ã®ã‚¿ã‚°ãŠã‚ˆã³ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚°ã®ä¸¡æ–¹ã‚’一覧表示ã—ã¾ã™ã€‚\n" " -v/--verbose ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚°ã«ã¯ \"local\" 表示ã®\n" -" 第3ã®ã‚«ãƒ©ãƒ ãŒè¿½åŠ ã•ã‚Œã¾ã™ã€‚" +" 第3ã®ã‚«ãƒ©ãƒ ãŒè¿½åŠ ã•ã‚Œã¾ã™ã€‚ -q/--quiet 指定時ã¯ã‚¿ã‚°åã®ã¿è¡¨ç¤ºã—ã¾ã™ã€‚" msgid "[-p] [-g]" msgstr "[-p] [-g]" @@ -16437,7 +17033,7 @@ msgstr "(詳細㯠https://mercurial-scm.org ã‚’å‚ç…§)" msgid "" -"Copyright (C) 2005-2015 Matt Mackall and others\n" +"Copyright (C) 2005-2016 Matt Mackall and others\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" @@ -16441,7 +17037,7 @@ "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -"Copyright (C) 2005-2015 Matt Mackall ä»–\n" +"Copyright (C) 2005-2016 Matt Mackall ä»–\n" "本製å“ã¯ãƒ•ãƒªãƒ¼ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã§ã™ã€‚\n" "é ’å¸ƒæ¡ä»¶ã«é–¢ã—ã¦ã¯åŒæ¢±ã•ã‚Œã‚‹ãƒ©ã‚¤ã‚»ãƒ³ã‚¹æ¡é …ã‚’ãŠèªã¿ãã ã•ã„。\n" "å¸‚å ´é©åˆæ€§ã‚„特定用途ã¸ã®å¯å¦ã‚’å«ã‚〠本製å“ã¯ç„¡ä¿è¨¼ã§ã™ã€‚\n" @@ -16457,10 +17053,6 @@ msgid "unknown command %s" msgstr "未知ã®ã‚³ãƒžãƒ³ãƒ‰ %s" -#, python-format -msgid "abort: %s\n" -msgstr "ä¸æ¢: %s\n" - msgid "unsupported platform" msgstr "未サãƒãƒ¼ãƒˆãªç’°å¢ƒã§ã™" @@ -16763,6 +17355,14 @@ msgstr "以下ã®æ–°ã—ã„ヘッドãŒé€£æºå…ˆã®ãƒ–ランム'%s' ã«ä½œæˆã•ã‚Œã¾ã™:\n" #, python-format +msgid "(did you mean %s?)\n" +msgstr "(推測ã•ã‚Œã‚‹å€™è£œ: %s)\n" + +#, python-format +msgid "(did you mean one of %s?)\n" +msgstr "(推測ã•ã‚Œã‚‹å€™è£œ: %s)\n" + +#, python-format msgid "hg: parse error at %s: %s\n" msgstr "hg: %s ã§ã®è§£æžã‚¨ãƒ©ãƒ¼: %s\n" @@ -16774,12 +17374,8 @@ msgstr "hg: 解æžã‚¨ãƒ©ãƒ¼: %s\n" #, python-format -msgid "(did you mean %r?)\n" -msgstr "(推測ã•ã‚Œã‚‹å€™è£œ: %r)\n" - -#, python-format -msgid "(did you mean one of %s?)\n" -msgstr "(推測ã•ã‚Œã‚‹å€™è£œ: %s)\n" +msgid "(%s)\n" +msgstr "(%s)\n" msgid "entering debugger - type c to continue starting hg or h for help\n" msgstr "デãƒãƒƒã‚¬å‹•ä½œé–‹å§‹ - 継続ãªã‚‰ c 〠ヘルプãªã‚‰ h を入力ã—ã¦ãã ã•ã„\n" @@ -17003,8 +17599,11 @@ msgid "unrecognized profiler '%s' - ignored\n" msgstr "ä¸æ£ãªãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ©æŒ‡å®š '%s' を無視ã—ã¾ã™\n" +msgid "response expected" +msgstr "何らã‹ã®å…¥åŠ›ãŒå¿…è¦ã§ã™" + #, python-format msgid "unknown identifier: %s" msgstr "未知ã®è˜åˆ¥å: %s" #, python-format @@ -17006,8 +17605,16 @@ #, python-format msgid "unknown identifier: %s" msgstr "未知ã®è˜åˆ¥å: %s" #, python-format +msgid "unsupported merge state records: %s" +msgstr "マージ状態記録ã«æœªå¯¾å¿œã®æƒ…å ±ãŒå«ã¾ã‚Œã¦ã„ã¾ã™: %s" + +msgid "" +"see https://mercurial-scm.org/wiki/MergeStateRecords for more information" +msgstr "詳細㯠https://mercurial-scm.org/wiki/MergeStateRecords å‚ç…§" + +#, python-format msgid "invalid bundle specification: missing \"=\" in parameter: %s" msgstr "ä¸æ£ãª bundle 仕様: パラメータä¸ã« \"=\" ãŒã‚ã‚Šã¾ã›ã‚“: %s" @@ -17040,6 +17647,24 @@ msgstr "%s: 未知ã®ãƒãƒ³ãƒ‰ãƒ«å½¢å¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s" #, python-format +msgid "unknown compression algorithm: %s" +msgstr "未知ã®åœ§ç¸®å½¢å¼: %s" + +#, python-format +msgid "changegroup version %s does not have a known bundlespec" +msgstr "ãƒãƒ³ãƒ‰ãƒ«ãƒ‡ãƒ¼ã‚¿å½¢å¼ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s ã¯æœªçŸ¥ã®ã‚‚ã®ã§ã™" + +msgid "try upgrading your Mercurial client" +msgstr "Mercurial コマンドをアップグレードã—ã¦ãã ã•ã„" + +msgid "could not identify changegroup version in bundle" +msgstr "ãƒãƒ³ãƒ‰ãƒ«ãƒ‡ãƒ¼ã‚¿ã«ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ãŒã‚ã‚Šã¾ã›ã‚“" + +#, python-format +msgid "unknown bundle type: %s" +msgstr "未知ã®ãƒãƒ³ãƒ‰ãƒ«å½¢å¼: %s" + +#, python-format msgid "updating bookmark %s failed!\n" msgstr "ブックマーク %s ã®æ›´æ–°ã«å¤±æ•—!\n" @@ -17156,11 +17781,10 @@ msgid "" "if this error persists, consider contacting the server operator or disable " -"clone bundles via \"--config experimental.clonebundles=false\"" -msgstr "" -"ã“ã®ã‚¨ãƒ©ãƒ¼ãŒç¶™ç¶šç™ºç”Ÿã™ã‚‹å ´åˆã€ã‚µãƒ¼ãƒç®¡ç†è€…ã«é€£çµ¡ã™ã‚‹ã‹ã€\"--config " -"experimental.clonebundles=false\" è¨å®šã«ã‚ˆã‚Šclone 用ãƒãƒ³ãƒ‰ãƒ«ã®ä½¿ç”¨ã‚’無効化ã—" -"ã¦ãã ã•ã„" +"clone bundles via \"--config ui.clonebundles=false\"" +msgstr "" +"ã“ã®ã‚¨ãƒ©ãƒ¼ãŒç¶™ç¶šç™ºç”Ÿã™ã‚‹å ´åˆã€ã‚µãƒ¼ãƒç®¡ç†è€…ã«é€£çµ¡ã™ã‚‹ã‹ã€\"--config ui." +"clonebundles=false\" è¨å®šã«ã‚ˆã‚Š clone 用ãƒãƒ³ãƒ‰ãƒ«ã®ä½¿ç”¨ã‚’無効化ã—ã¦ãã ã•ã„" #, python-format msgid "HTTP error fetching bundle: %s\n" @@ -17171,6 +17795,14 @@ msgstr "ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«å–å¾—ã«å¤±æ•—: %s\n" #, python-format +msgid "" +"(third party extension %s requires version %s or newer of Mercurial; " +"disabling)\n" +msgstr "" +"(ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s 以é™ã® Mercurial ãŒå¿…è¦ãªã‚µãƒ¼ãƒ‰ãƒ‘ーティ製エクステンション %s " +"を無効化ã—ã¾ã™)\n" + +#, python-format msgid "*** failed to import extension %s from %s: %s\n" msgstr "*** %s ã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã«å¤±æ•— (%s): %s\n" @@ -17216,12 +17848,33 @@ #, python-format msgid "" -" no tool found to merge %s\n" -"keep (l)ocal or take (o)ther?$$ &Local $$ &Other" -msgstr "" -" %s ã®ãƒžãƒ¼ã‚¸ã«é©åˆ‡ãªãƒ„ールãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。\n" -"作æ¥é ˜åŸŸ:(l)ocal ã¨ãƒžãƒ¼ã‚¸å¯¾è±¡:(o)ther ã®ã©ã¡ã‚‰ã®å†…容を採用ã—ã¾ã™ã‹ï¼Ÿ$$ " -"&Local $$ &Other" +"local changed %s which remote deleted\n" +"use (c)hanged version, (d)elete, or leave (u)nresolved?$$ &Changed $$ " +"&Delete $$ &Unresolved" +msgstr "" +"変更ã—ãŸãƒ•ã‚¡ã‚¤ãƒ« %s ãŒã€ãƒžãƒ¼ã‚¸å¯¾è±¡ãƒªãƒ“ジョンã§ç™»éŒ²é™¤å¤–ã•ã‚Œã¦ã„ã¾ã™ã€‚\n" +"変更:(c)hangedã€ç™»éŒ²é™¤å¤–:(d)eleteã€è¡çªæœªè§£æ¶ˆ:(u)nresolved ã®ã„ãšã‚Œã‚’採用ã—ã¾" +"ã™ã‹ï¼Ÿ$$ &Changed $$ &Delete $$ &Unresolved" + +#, python-format +msgid "" +"remote changed %s which local deleted\n" +"use (c)hanged version, leave (d)eleted, or leave (u)nresolved?$$ &Changed $$ " +"&Deleted $$ &Unresolved" +msgstr "" +"登録除外済ã¿ã®ãƒ•ã‚¡ã‚¤ãƒ« %s ãŒã€ãƒžãƒ¼ã‚¸å¯¾è±¡ãƒªãƒ“ジョンã§å¤‰æ›´ã•ã‚Œã¦ã„ã¾ã™ã€‚\n" +"変更:(c)hangedã€ç™»éŒ²é™¤å¤–:(d)eleteã€è¡çªæœªè§£æ¶ˆ:(u)nresolved ã®ã„ãšã‚Œã‚’採用ã—ã¾" +"ã™ã‹ï¼Ÿ$$ &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" msgid "" "``:local``\n" @@ -17250,9 +17903,9 @@ #, python-format msgid "%s.premerge not valid ('%s' is neither boolean nor %s)" -msgstr "%s.premerge ã¯ç„¡åŠ¹ã§ã™('%s' ã¯çœŸå½ã¾ãŸã¯ %s ã®ã„ãšã‚Œã§ã‚‚ã‚ã‚Šã¾ã›ã‚“)" +msgstr "%s.premerge ã¯ç„¡åŠ¹ã§ã™ (指定値: '%s' 指定å¯èƒ½å€¤: 'true', 'false', %s)" #, python-format msgid "warning: internal %s cannot merge symlinks for %s\n" msgstr "è¦å‘Š: 内部ツール %s ã¯ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ %s をマージã§ãã¾ã›ã‚“\n" @@ -17254,8 +17907,12 @@ #, python-format msgid "warning: internal %s cannot merge symlinks for %s\n" msgstr "è¦å‘Š: 内部ツール %s ã¯ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ %s をマージã§ãã¾ã›ã‚“\n" +#, python-format +msgid "warning: internal %s cannot merge change/delete conflict for %s\n" +msgstr "è¦å‘Š: 内部ツール %s 㯠%s ã¸ã®å¤‰æ›´ã¨ç™»éŒ²é™¤å¤–をマージã§ãã¾ã›ã‚“\n" + msgid "" "``:union``\n" "Uses the internal non-interactive simple merge algorithm for merging\n" @@ -17264,7 +17921,7 @@ msgstr "" "``:union``\n" "éžå¯¾è©±çš„ãªã€ å˜ç´”ãªãƒžãƒ¼ã‚¸å‡¦ç†ã‚’実施ã—ã¾ã™ã€‚ è¡çªãŒã‚ã£ãŸå ´åˆã€\n" -" 両方ã®å¤‰æ›´å†…容ãŒå–ã‚Šè¾¼ã¾ã‚Œã¾ã™ã€‚ è¡çªãƒžãƒ¼ã‚¯ã¯è¨˜éŒ²ã•ã‚Œã¾ã›ã‚“。" +" 両方ã®å¤‰æ›´å†…容ãŒå–ã‚Šè¾¼ã¾ã‚Œã¾ã™ã€‚ è¡çªãƒžãƒ¼ã‚¯ã¯è¨˜éŒ²ã•ã‚Œã¾ã›ã‚“。" #, python-format msgid "" @@ -17282,9 +17939,9 @@ msgstr "" "``:merge``\n" "éžå¯¾è©±çš„ãªã€ å˜ç´”ãªãƒžãƒ¼ã‚¸å‡¦ç†ã‚’実施ã—ã¾ã™ã€‚\n" -" è¡çªãŒã‚ã£ãŸå ´åˆã€ マージ処ç†ã¯å¤±æ•—ã¨ã¿ãªã•ã‚Œã¾ã™ãŒã€\n" -" マージçµæžœãƒ•ã‚¡ã‚¤ãƒ«ã«ã¯ã€ è¡çªãƒžãƒ¼ã‚¯ãŒè¨˜éŒ²ã•ã‚Œã¾ã™ã€‚\n" -" マージ対象ã®2ã¤ã®ãƒªãƒ“ジョンãŒã€ è¡çªæƒ…å ±ã¨ã—ã¦è¨˜éŒ²ã•ã‚Œã¾ã™ã€‚" +" è¡çªãŒã‚ã£ãŸå ´åˆã€ マージ処ç†ã¯å¤±æ•—ã¨ã¿ãªã•ã‚Œã¾ã™ãŒã€\n" +" マージçµæžœãƒ•ã‚¡ã‚¤ãƒ«ã«ã¯ã€ è¡çªãƒžãƒ¼ã‚¯ãŒè¨˜éŒ²ã•ã‚Œã¾ã™ã€‚\n" +" マージ対象ã®2ã¤ã®ãƒªãƒ“ジョンãŒã€ è¡çªæƒ…å ±ã¨ã—ã¦è¨˜éŒ²ã•ã‚Œã¾ã™ã€‚" msgid "" "``:merge3``\n" @@ -17296,14 +17953,10 @@ msgstr "" "``:merge3``\n" "éžå¯¾è©±çš„ãªã€ å˜ç´”ãªãƒžãƒ¼ã‚¸å‡¦ç†ã‚’実施ã—ã¾ã™ã€‚\n" -" è¡çªãŒã‚ã£ãŸå ´åˆã€ マージ処ç†ã¯å¤±æ•—ã¨ã¿ãªã•ã‚Œã¾ã™ãŒã€\n" -" マージçµæžœãƒ•ã‚¡ã‚¤ãƒ«ã«ã¯ã€ è¡çªãƒžãƒ¼ã‚¯ãŒè¨˜éŒ²ã•ã‚Œã¾ã™ã€‚\n" -" マージ対象ã®ï¼’ã¤ã®ãƒªãƒ“ジョンã«åŠ ãˆã¦ã€ 共通祖先ã®æƒ…å ±ãŒã€\n" -" è¡çªæƒ…å ±ã¨ã—ã¦è¨˜éŒ²ã•ã‚Œã¾ã™ã€‚" - -#, python-format -msgid "warning: :merge-%s cannot merge symlinks for %s\n" -msgstr "è¦å‘Š: :merge-%s ã¯ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ %s をマージã§ãã¾ã›ã‚“\n" +" è¡çªãŒã‚ã£ãŸå ´åˆã€ マージ処ç†ã¯å¤±æ•—ã¨ã¿ãªã•ã‚Œã¾ã™ãŒã€\n" +" マージçµæžœãƒ•ã‚¡ã‚¤ãƒ«ã«ã¯ã€ è¡çªãƒžãƒ¼ã‚¯ãŒè¨˜éŒ²ã•ã‚Œã¾ã™ã€‚\n" +" マージ対象ã®ï¼’ã¤ã®ãƒªãƒ“ジョンã«åŠ ãˆã¦ã€ 共通祖先ã®æƒ…å ±ãŒã€\n" +" è¡çªæƒ…å ±ã¨ã—ã¦è¨˜éŒ²ã•ã‚Œã¾ã™ã€‚" msgid "" "``:merge-local``\n" @@ -17349,12 +18002,16 @@ msgstr "" "``:dump``\n" "作æ¥é ˜åŸŸå´ã€ マージ対象リビジョンå´ã€ ãŠã‚ˆã³å…±é€šç¥–先時点ã®ã€\n" -" ãã‚Œãžã‚Œã®å†…容をæŒã¤3ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’生æˆã—ã¾ã™ã€‚\n" -" ã“れらã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€äº‹å¾Œã®æ‰‹å‹•ãƒžãƒ¼ã‚¸ç‰ã§ä½¿ç”¨ã—ã¦ãã ã•ã„。\n" -" 対象ファイルå㌠``a.txt`` ã§ã‚ã£ãŸå ´åˆã€\n" -" 生æˆã•ã‚Œã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãã‚Œãžã‚Œ ``a.txt.local``, ``a.txt.other``\n" -" ãŠã‚ˆã³ ``a.txt.base`` ã¨å‘½åã•ã‚Œã€\n" -" ``a.txt`` ã¨åŒã˜ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«æ ¼ç´ã•ã‚Œã¾ã™ã€‚" +" ãã‚Œãžã‚Œã®å†…容をæŒã¤3ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’生æˆã—ã¾ã™ã€‚\n" +" ã“れらã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€äº‹å¾Œã®æ‰‹å‹•ãƒžãƒ¼ã‚¸ç‰ã§ä½¿ç”¨ã—ã¦ãã ã•ã„。\n" +" 対象ファイルå㌠``a.txt`` ã§ã‚ã£ãŸå ´åˆã€\n" +" 生æˆã•ã‚Œã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãã‚Œãžã‚Œ ``a.txt.local``, ``a.txt.other``\n" +" ãŠã‚ˆã³ ``a.txt.base`` ã¨å‘½åã•ã‚Œã€\n" +" ``a.txt`` ã¨åŒã˜ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«æ ¼ç´ã•ã‚Œã¾ã™ã€‚" + +#, python-format +msgid "warning: %s cannot merge change/delete conflict for %s\n" +msgstr "è¦å‘Š: マージツール %s 㯠%s ã¸ã®å¤‰æ›´ã¨ç™»éŒ²é™¤å¤–をマージã§ãã¾ã›ã‚“\n" #, python-format msgid "merging %s failed!\n" @@ -17395,6 +18052,9 @@ msgid "can't use a list in this context" msgstr "ã“ã“ã§ã¯ãƒªã‚¹ãƒˆã‚’使用ã§ãã¾ã›ã‚“" +msgid "see hg help \"filesets.x or y\"" +msgstr "hg help \"filesets.x or y\" ã‚’å‚ç…§ã—ã¦ãã ã•ã„" + msgid "" "``modified()``\n" " File that is modified according to :hg:`status`." @@ -17430,6 +18090,6 @@ msgid "" "``deleted()``\n" -" File that is deleted according to :hg:`status`." +" Alias for ``missing()``." msgstr "" "``deleted()``\n" @@ -17434,9 +18094,9 @@ msgstr "" "``deleted()``\n" -" :hg:`status` ã§ä¸åœ¨çŠ¶æ…‹ã‚’æŒã¤ãƒ•ã‚¡ã‚¤ãƒ« (※ 訳注: 作æ¥é ˜åŸŸã§ã®ã¿æœ‰åŠ¹)" +" ``missing()`` ã®åˆ¥å。" #. i18n: "deleted" is a keyword msgid "deleted takes no arguments" msgstr "deleted ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" msgid "" @@ -17437,9 +18097,20 @@ #. i18n: "deleted" is a keyword msgid "deleted takes no arguments" msgstr "deleted ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" msgid "" +"``missing()``\n" +" File that is missing according to :hg:`status`." +msgstr "" +"``missing()``\n" +" :hg:`status` ã§ä¸åœ¨çŠ¶æ…‹ã‚’æŒã¤ãƒ•ã‚¡ã‚¤ãƒ« (※ 訳注: 作æ¥é ˜åŸŸå‚照時é™å®š)" + +#. i18n: "missing" is a keyword +msgid "missing takes no arguments" +msgstr "missing ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" "``unknown()``\n" " File that is unknown according to :hg:`status`. These files will only " "be\n" @@ -17717,6 +18388,15 @@ msgid " ([+] can be repeated)" msgstr " ([+] å°ä»˜ãã®ã‚ªãƒ—ションã¯è¤‡æ•°å›žæŒ‡å®šå¯èƒ½ã§ã™)" +msgid "container for exchange of repository data" +msgstr "å±¥æ´æƒ…å ±æŽˆå—ã®ãŸã‚ã®ãƒ‡ãƒ¼ã‚¿å½¢å¼" + +msgid "representation of revlog data" +msgstr "revlog データã®è¡¨ç¾å½¢å¼" + +msgid "revision storage mechanism" +msgstr "å±¥æ´æƒ…å ±æ ¼ç´å½¢å¼" + msgid "Configuration Files" msgstr "è¨å®šãƒ•ã‚¡ã‚¤ãƒ«" @@ -17774,6 +18454,9 @@ msgid "Using Mercurial from scripts and automation" msgstr "スクリプトや自動化ã§ã® Mercurial 利用" +msgid "Technical implementation topics" +msgstr "実装上ã®æŠ€è¡“æƒ…å ±" + #, python-format msgid "" "\n" @@ -17977,11 +18660,11 @@ "ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" msgid "" -"Format\n" -"======" -msgstr "" -"記述形å¼\n" -"========" +"Structure\n" +"=========" +msgstr "" +"ãƒ•ã‚¡ã‚¤ãƒ«å†…æ§‹é€ \n" +"==============" msgid "" "The configuration files use a simple ini-file format. A configuration\n" @@ -18019,10 +18702,7 @@ msgid "" "Mercurial reads configuration data from several files, if they exist.\n" "These files do not exist by default and you will have to create the\n" -"appropriate configuration files yourself: global configuration like\n" -"the username setting is typically put into\n" -"``%USERPROFILE%\\mercurial.ini`` or ``$HOME/.hgrc`` and local\n" -"configuration is put into the per-repository ``<repo>/.hg/hgrc`` file." +"appropriate configuration files yourself:" msgstr "" "Mercurial ã¯è¤‡æ•°ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰è¨å®šæƒ…å ±ã‚’èªã¿è¾¼ã¿ã¾ã™ã€‚\n" "èªã¿è¾¼ã¿å¯¾è±¡ã¨ãªã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ 事å‰ã«å˜åœ¨ã—ã¾ã›ã‚“ã®ã§ã€\n" @@ -18026,11 +18706,20 @@ msgstr "" "Mercurial ã¯è¤‡æ•°ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰è¨å®šæƒ…å ±ã‚’èªã¿è¾¼ã¿ã¾ã™ã€‚\n" "èªã¿è¾¼ã¿å¯¾è±¡ã¨ãªã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ 事å‰ã«å˜åœ¨ã—ã¾ã›ã‚“ã®ã§ã€\n" -"é©åˆ‡ãªä½ç½®ã«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’作æˆã™ã‚‹ã®ã¯ã€ 利用者ã®è²¬ä»»ã¨ãªã‚Šã¾ã™ã€‚\n" -"ユーザåè¨å®šã®ã‚ˆã†ãªã€ 広範囲ã«æ¸¡ã‚‹è¨å®šã¯ã€\n" -"``%USERPROFILE%\\mercurial.ini`` ã‚„ ``$HOME/.hgrc`` ã«ã€\n" -"ã‚‚ã£ã¨ç‹ã„範囲ã«é–¢ã™ã‚‹è¨å®šã¯ã€ å„リãƒã‚¸ãƒˆãƒªæ¯Žã® ``<リãƒã‚¸ãƒˆãƒª>/.hg/hgrc``\n" -"ã«ãŠã„ã¦è¨˜è¿°ã™ã‚‹ã®ãŒä¸€èˆ¬çš„ã§ã™ã€‚" +"é©åˆ‡ãªä½ç½®ã«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’作æˆã™ã‚‹ã®ã¯ã€ 利用者ã®è²¬ä»»ã¨ãªã‚Šã¾ã™:" + +msgid "" +"Local configuration is put into the per-repository ``<repo>/.hg/hgrc`` file." +msgstr "リãƒã‚¸ãƒˆãƒªæ¯Žã®å±€æ‰€çš„ãªè¨å®šã¯ ``<リãƒã‚¸ãƒˆãƒª>/.hg/hgrc`` ã«è¨˜è¿°ã—ã¾ã™ã€‚" + +msgid "Global configuration like the username setting is typically put into:" +msgstr "「ユーザåã€ã®ã‚ˆã†ãªã€ 広範囲ã§æœ‰åŠ¹ãªè¨å®šã¯ã€ 以下ã§è¨˜è¿°ã—ã¾ã™:" + +msgid " ``%USERPROFILE%\\mercurial.ini``" +msgstr " ``%USERPROFILE%\\mercurial.ini``" + +msgid " ``$HOME/.hgrc``" +msgstr " ``$HOME/.hgrc``" msgid "" "The names of these files depend on the system on which Mercurial is\n" @@ -18066,7 +18755,7 @@ " - ``<パッケージ固有>/default.d/*.rc`` (デフォルトè¨å®š)" msgid " On Windows, the following files are consulted:" -msgstr " Windows 環境ã§ã¯ã€ã€€ä»¥ä¸‹ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒèªã¿è¾¼ã¾ã‚Œã¾ã™:" +msgstr " Windows 環境ã§ã¯ã€ 以下ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒèªã¿è¾¼ã¾ã‚Œã¾ã™:" msgid "" " - ``<repo>/.hg/hgrc`` (per-repository)\n" @@ -18098,6 +18787,10 @@ " ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Mercurial``\n" " レジストリã‚ーãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚" +msgid " On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``." +msgstr "" +" Windows 9x 環境ã§ã¯ ``%HOME%`` ã®ä»£ã‚ã‚Šã« ``%APPDATA%`` を使用ã—ã¾ã™ã€‚" + msgid " On Plan9, the following files are consulted:" msgstr " Plan9 環境ã§ã¯ã€ 以下ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒèªã¿è¾¼ã¾ã‚Œã¾ã™:" @@ -18122,10 +18815,7 @@ "Per-repository configuration options only apply in a\n" "particular repository. This file is not version-controlled, and\n" "will not get transferred during a \"clone\" operation. Options in\n" -"this file override options in all other configuration files. On\n" -"Plan 9 and Unix, most of this file will be ignored if it doesn't\n" -"belong to a trusted user or to a trusted group. See\n" -":hg:`help config.trusted` for more details." +"this file override options in all other configuration files." msgstr "" "リãƒã‚¸ãƒˆãƒªæ¯Žè¨å®šã¯ã€ 対象リãƒã‚¸ãƒˆãƒªã«é–¢ã™ã‚‹å®Ÿè¡Œã§ã®ã¿é©ç”¨ã•ã‚Œã¾ã™ã€‚\n" "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ å±¥æ´ç®¡ç†ã®å¯¾è±¡å¤–ã§ã‚り〠:hg:`clone` ã§ã‚‚複製ã•ã‚Œã¾ã›ã‚“。\n" @@ -18129,15 +18819,20 @@ msgstr "" "リãƒã‚¸ãƒˆãƒªæ¯Žè¨å®šã¯ã€ 対象リãƒã‚¸ãƒˆãƒªã«é–¢ã™ã‚‹å®Ÿè¡Œã§ã®ã¿é©ç”¨ã•ã‚Œã¾ã™ã€‚\n" "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ å±¥æ´ç®¡ç†ã®å¯¾è±¡å¤–ã§ã‚り〠:hg:`clone` ã§ã‚‚複製ã•ã‚Œã¾ã›ã‚“。\n" -"ã“ã“ã§ã®è¨å®šã¯ã€ ä»–ã®å…¨ã¦ã®è¨å®šã«å„ªå…ˆã—ã¾ã™ã€‚ Plan9 ã‚„ Unix 環境ã§ã¯ã€\n" -"è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã®æ‰€æœ‰è€…やグループãŒã€ ä¿¡é ¼ã§ãるユーザやグループã§ãªã„å ´åˆã€\n" -"è¨å®šå†…容ã®å¤§åŠãŒç„¡è¦–ã•ã‚Œã¾ã™ã€‚ 詳細㯠:hg:`help config.trusted`\n" -"ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" - -msgid "" -"Per-user configuration file(s) are for the user running Mercurial. On\n" -"Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these\n" -"files apply to all Mercurial commands executed by this user in any\n" +"ã“ã“ã§ã®è¨å®šã¯ã€ ä»–ã®å…¨ã¦ã®è¨å®šã«å„ªå…ˆã—ã¾ã™ã€‚" + +msgid "" +" On Plan 9 and Unix, most of this file will be ignored if it doesn't\n" +" belong to a trusted user or to a trusted group. See\n" +" :hg:`help config.trusted` for more details." +msgstr "" +" Plan9 ã‚„ Unix 環境ã§ã¯ã€ è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã®æ‰€æœ‰è€…やグループãŒã€\n" +" ä¿¡é ¼ã§ãるユーザやグループã§ãªã„å ´åˆã€ è¨å®šå†…容ã®å¤§åŠãŒç„¡è¦–ã•ã‚Œã¾ã™ã€‚\n" +" 詳細㯠:hg:`help config.trusted` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" + +msgid "" +"Per-user configuration file(s) are for the user running Mercurial. Options\n" +"in these files apply to all Mercurial commands executed by this user in any\n" "directory. Options in these files override per-system and per-installation\n" "options." msgstr "" @@ -18141,11 +18836,10 @@ "directory. Options in these files override per-system and per-installation\n" "options." msgstr "" -"ユーザ毎è¨å®šã¯ã€ Mercurial コマンドを実行ã™ã‚‹ãƒ¦ãƒ¼ã‚¶ã«å¯¾ã™ã‚‹è¨å®šã§ã™ã€‚\n" -"Windows 9x 環境ã§ã® ``%HOME%`` 㯠``%APPDATA%`` ã«ç›¸å½“ã—ã¾ã™ã€‚\n" +"ユーザ毎è¨å®šã¯ã€ Mercurial コマンドを実行ã™ã‚‹ãƒ¦ãƒ¼ã‚¶æ¯Žã®è¨å®šã§ã™ã€‚\n" "ã“ã“ã§ã®è¨å®šã¯ã€ 当該ユーザ㮠Mercurial コマンド実行全ã¦ã«é©ç”¨ã•ã‚Œã¾ã™ã€‚\n" "ユーザ毎è¨å®šã¯ã€ã‚·ã‚¹ãƒ†ãƒ 毎ï¼ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«æ¯Žã®è¨å®šã«å„ªå…ˆã—ã¾ã™ã€‚" msgid "" "Per-installation configuration files are searched for in the\n" "directory where Mercurial is installed. ``<install-root>`` is the\n" @@ -18146,13 +18840,10 @@ "ã“ã“ã§ã®è¨å®šã¯ã€ 当該ユーザ㮠Mercurial コマンド実行全ã¦ã«é©ç”¨ã•ã‚Œã¾ã™ã€‚\n" "ユーザ毎è¨å®šã¯ã€ã‚·ã‚¹ãƒ†ãƒ 毎ï¼ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«æ¯Žã®è¨å®šã«å„ªå…ˆã—ã¾ã™ã€‚" msgid "" "Per-installation configuration files are searched for in the\n" "directory where Mercurial is installed. ``<install-root>`` is the\n" -"parent directory of the **hg** executable (or symlink) being run. For\n" -"example, if installed in ``/shared/tools/bin/hg``, Mercurial will look\n" -"in ``/shared/tools/etc/mercurial/hgrc``. Options in these files apply\n" -"to all Mercurial commands executed by any user in any directory." +"parent directory of the **hg** executable (or symlink) being run." msgstr "" "インストール毎è¨å®šã¯ã€ Mercurial ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆã‹ã‚‰èªã¿è¾¼ã¾ã‚Œã¾ã™ã€‚\n" "実行ã•ã‚Œã‚‹ ``hg`` ã‚³ãƒžãƒ³ãƒ‰æ ¼ç´å…ˆã®è¦ªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ ``<インストール先>``\n" @@ -18156,9 +18847,17 @@ msgstr "" "インストール毎è¨å®šã¯ã€ Mercurial ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆã‹ã‚‰èªã¿è¾¼ã¾ã‚Œã¾ã™ã€‚\n" "実行ã•ã‚Œã‚‹ ``hg`` ã‚³ãƒžãƒ³ãƒ‰æ ¼ç´å…ˆã®è¦ªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ ``<インストール先>``\n" -"ã¨ã¿ãªã—ã¾ã™ã€‚ 例ãˆã° ``/shared/tools/bin/hg`` ãŒå®Ÿè¡Œã•ã‚Œã‚‹å ´åˆã€\n" -"``/shared/tools/etc/mercurial/hgrc`` ãŒèªã¿è¾¼ã¾ã‚Œã¾ã™ã€‚ ã“ã“ã§ã®è¨å®šã¯ã€\n" -"実行ユーザï¼å¯¾è±¡ãƒªãƒã‚¸ãƒˆãƒªã«é–¢ã‚らãšé©ç”¨ã•ã‚Œã¾ã™ã€‚" +"ã¨ã¿ãªã—ã¾ã™ã€‚" + +msgid "" +" For example, if installed in ``/shared/tools/bin/hg``, Mercurial\n" +" will look in ``/shared/tools/etc/mercurial/hgrc``. Options in these\n" +" files apply to all Mercurial commands executed by any user in any\n" +" directory." +msgstr "" +" 例ãˆã° ``/shared/tools/bin/hg`` ãŒå®Ÿè¡Œã•ã‚Œã‚‹å ´åˆã€\n" +" ``/shared/tools/etc/mercurial/hgrc`` ã‹ã‚‰èªã¿è¾¼ã¾ã‚Œã¾ã™ã€‚\n" +" ã“ã“ã§ã®è¨å®šã¯ã€ 実行ユーザï¼å¯¾è±¡ãƒªãƒã‚¸ãƒˆãƒªã«é–¢ã‚らãšé©ç”¨ã•ã‚Œã¾ã™ã€‚" msgid "" "Per-installation configuration files are for the system on\n" @@ -18408,7 +19107,7 @@ "keys, and their possible values." msgstr "" "Mercurial ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã§è¨˜è¿°å¯èƒ½ãªå„セクション毎ã®ã€\n" -"用途〠è¨å®šã‚ーã€ã€€ãŠã‚ˆã³è¨å®šå¯èƒ½ãªå€¤ã«ã¤ã„ã¦ä»¥ä¸‹ã§è¿°ã¹ã¾ã™ã€‚" +"用途〠è¨å®šã‚ー〠ãŠã‚ˆã³è¨å®šå¯èƒ½ãªå€¤ã«ã¤ã„ã¦ä»¥ä¸‹ã§è¿°ã¹ã¾ã™ã€‚" msgid "" "``alias``\n" @@ -18973,7 +19672,7 @@ msgstr "" "フィルタã¯ã€ フィルタコマンドを伴ã£ãŸãƒ•ã‚£ãƒ«ã‚¿ãƒ‘ターンã§æŒ‡å®šã•ã‚Œã¾ã™ã€‚\n" "デフォルトã®ãƒ‘ターン指定形å¼ã¯ã€ 作æ¥é ˜åŸŸãƒ«ãƒ¼ãƒˆã‹ã‚‰ã®ç›¸å¯¾ãƒ‘スã«å¯¾ã—ã¦ã€\n" -"パス先é ã‹ã‚‰ã®ãƒ‘ターンåˆè‡´ã§åˆ¤å®šã™ã‚‹ã€ ãƒ¯ã‚¤ãƒ«ãƒ‰ã‚«ãƒ¼ãƒ‰å½¢å¼ (glob) ã§ã™ã€‚\n" +"パス先é ã‹ã‚‰ã®ãƒ‘ターンåˆè‡´ã§åˆ¤å®šã™ã‚‹ã€ ãƒ¯ã‚¤ãƒ«ãƒ‰ã‚«ãƒ¼ãƒ‰å½¢å¼ (glob) ã§ã™ã€‚\n" "例ãˆã°ã€ ルート直下㮠``.txt`` æ‹¡å¼µåã®ãƒ•ã‚¡ã‚¤ãƒ«ã«ã®ã¿åˆè‡´ã•ã›ã‚‹ãƒ‘ターンã¯\n" "``*.txt`` ã¨ãªã‚Šã¾ã™ã€‚ 作æ¥é ˜åŸŸä¸ã® ``.c`` æ‹¡å¼µåã®å…¨ãƒ•ã‚¡ã‚¤ãƒ«ã¸ã®åˆè‡´ã¯ã€\n" "``**.c`` ã¨ãªã‚Šã¾ã™ã€‚ ãã‚Œãžã‚Œã®ãƒ•ã‚¡ã‚¤ãƒ«ã«é©ç”¨ã•ã‚Œã‚‹ãƒ•ã‚£ãƒ«ã‚¿ã¯ã€\n" @@ -19031,13 +19730,13 @@ "ãã‚Œãžã‚Œç½®æ›ã•ã‚Œã¾ã™ã€‚" msgid "" -" 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 "" -" 標準的ãªã‚·ã‚§ãƒ«ã® I/O リダイレクトãŒã€ 予期ã›ã¬çµæžœã‚„ã€\n" -" ファイル内容ã®ç ´å£Šã«ç¹‹ãŒã‚‹ Windows ã®ã‚ˆã†ãªç’°å¢ƒã§ã¯ã€\n" -" tempfile 機構ã®ä½¿ç”¨ãŒãŠå‹§ã‚ã§ã™ã€‚" +" 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 "" +" 標準的ãªã‚·ã‚§ãƒ«ã® I/O リダイレクトãŒã€ 予期ã›ã¬çµæžœã‚„ã€\n" +" ファイル内容ã®ç ´å£Šã«ç¹‹ãŒã‚‹ Windows ã®ã‚ˆã†ãªç’°å¢ƒã§ã¯ã€\n" +" tempfile 機構ã®ä½¿ç”¨ãŒãŠå‹§ã‚ã§ã™ã€‚" msgid "" "This filter mechanism is used internally by the ``eol`` extension to\n" @@ -19336,24 +20035,45 @@ "----------" msgid "" -"``usestore``\n" -" Enable or disable the \"store\" repository format which improves\n" -" compatibility with systems that fold case or otherwise mangle\n" -" filenames. Enabled by default. Disabling this option will allow\n" -" you to store longer filenames in some situations at the expense of\n" -" compatibility and ensures that the on-disk format of newly created\n" -" repositories will be compatible with Mercurial before version 0.9.4." -msgstr "" -"``usestore``\n" -" ファイルåã®æ–‡å—大å°ã‚’èªè˜ã—ãªã„よã†ãªãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ ã¸ã®ã€\n" -" é©å¿œæ€§ã‚’å‘上ã•ã›ã‚‹ã€ \"store\" å½¢å¼ãƒªãƒã‚¸ãƒˆãƒªã®ä½¿ç”¨å¯å¦ã€‚\n" -" デフォルトã§ã¯æœ‰åŠ¹åŒ–ã•ã‚Œã¦ã„ã¾ã™ã€‚ ã“ã®è¨å®šã‚’無効化ã—ãŸå ´åˆã€\n" -" æ–°è¦ä½œæˆã—ãŸãƒªãƒã‚¸ãƒˆãƒªã¯ã€ 0.9.4 以å‰ã® Mercurial ã¨ã€\n" -" ディスク記録形å¼ã§äº’æ›æ€§ãŒä¿ãŸã‚Œã¾ã™ãŒã€ 状æ³æ¬¡ç¬¬ã§ã¯ã€\n" -" é•·ã„ファイルåã§ã®ä¿å˜ãŒå¿…è¦ã«ãªã‚Šã¾ã™ã€‚" +"``usegeneraldelta``\n" +" Enable or disable the \"generaldelta\" repository format which improves\n" +" repository compression by allowing \"revlog\" to store delta against " +"arbitrary\n" +" revision instead of the previous stored one. This provides significant\n" +" improvement for repositories with branches." +msgstr "" +"``usegeneraldelta``\n" +" \"generaldelta\" å½¢å¼ãƒªãƒã‚¸ãƒˆãƒªã®ä½¿ç”¨å¯å¦ã€‚ ã“ã®å½¢å¼ã§ã¯ã€\n" +" \"revlog\" ã§ã®æ ¼ç´ã®éš›ã«ã€ ä»»æ„ã®å¯¾è±¡ã¨ã®å·®åˆ†ã®è¨˜éŒ²ã‚’許ã™ã“ã¨ã§ã€\n" +" データé‡ã®åœ§ç¸®çŽ‡ã‚’å‘上ã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ ブランãƒãŒå¤šã„å ´åˆã«ã€\n" +" ã“ã®å½¢å¼ã®åŠ¹æžœãŒç™ºæ®ã•ã‚Œã¾ã™ã€‚" + +msgid "" +" Repositories with this on-disk format require Mercurial version 1.9." +msgstr " ã“ã®å½¢å¼ã®åˆ©ç”¨ã«ã¯ Mercurial 1.9 以é™ãŒå¿…è¦ã§ã™ã€‚" + +msgid " Enabled by default." +msgstr " 特ã«æŒ‡å®šãŒãªã„å ´åˆã¯æœ‰åŠ¹åŒ–ã•ã‚Œã¾ã™ã€‚" + +msgid "" +"``dotencode``\n" +" Enable or disable the \"dotencode\" repository format which enhances\n" +" the \"fncache\" repository format (which has to be enabled to use\n" +" dotencode) to avoid issues with filenames starting with ._ on\n" +" Mac OS X and spaces on Windows." +msgstr "" +"``dotencode``\n" +" \"dotencode\" å½¢å¼ãƒªãƒã‚¸ãƒˆãƒªã®ä½¿ç”¨å¯å¦ã€‚ ã“ã®å½¢å¼ã§ã¯ã€\n" +" 特定ã®ç’°å¢ƒã§å•é¡Œã‚’生ã˜ã‚‹ ``._`` (Mac OS X) ã‚„ç©ºç™½æ–‡å— (Windows)\n" +" ã§å§‹ã¾ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«åã®å±¥æ´ãŒã€ ã©ã®ç’°å¢ƒã§ã‚‚æ£ã—ãæ ¼ç´ã§ãるよã†ã«ã€\n" +" \"fncache\" å½¢å¼ (本è¨å®šã®æœ‰åŠ¹åŒ–ã«å¿…é ˆ) ã‚’æ‹¡å¼µã—ã¾ã™ã€‚" + +msgid "" +" Repositories with this on-disk format require Mercurial version 1.7." +msgstr " ã“ã®å½¢å¼ã®åˆ©ç”¨ã«ã¯ Mercurial 1.7 以é™ãŒå¿…è¦ã§ã™ã€‚" msgid "" "``usefncache``\n" " Enable or disable the \"fncache\" repository format which enhances\n" " the \"store\" repository format (which has to be enabled to use\n" " fncache) to allow longer filenames and avoids using Windows\n" @@ -19354,11 +20074,9 @@ msgid "" "``usefncache``\n" " Enable or disable the \"fncache\" repository format which enhances\n" " the \"store\" repository format (which has to be enabled to use\n" " fncache) to allow longer filenames and avoids using Windows\n" -" reserved names, e.g. \"nul\". Enabled by default. Disabling this\n" -" option ensures that the on-disk format of newly created\n" -" repositories will be compatible with Mercurial before version 1.1." +" reserved names, e.g. \"nul\"." msgstr "" "``usefncache``\n" @@ -19363,29 +20081,32 @@ msgstr "" "``usefncache``\n" -" \"store\" å½¢å¼ãƒªãƒã‚¸ãƒˆãƒª (本è¨å®šã®æœ‰åŠ¹åŒ–ã«å¿…é ˆ) ã«ãŠã„ã¦ã€\n" -" é•·ã„ファイルåを使用ã™ã‚‹ãŸã‚ã®æ©Ÿèƒ½å‘上や〠\"nul\" ã®ã‚ˆã†ãª Windows\n" -" 予約å利用を回é¿å¯èƒ½ã«ã™ã‚‹ã€ \"fncache\"\n" -" å½¢å¼ãƒªãƒã‚¸ãƒˆãƒªã®ä½¿ç”¨å¯å¦ã€‚\n" -" デフォルトã§ã¯æœ‰åŠ¹åŒ–ã•ã‚Œã¦ã„ã¾ã™ã€‚ ã“ã®è¨å®šã‚’無効化ã—ãŸå ´åˆã€\n" -" æ–°è¦ä½œæˆã—ãŸãƒªãƒã‚¸ãƒˆãƒªã¯ã€ 1.1 以å‰ã® Mercurial ã¨ã€\n" -" ディスク記録形å¼ã§äº’æ›æ€§ãŒä¿ãŸã‚Œã¾ã™ã€‚" - -msgid "" -"``dotencode``\n" -" Enable or disable the \"dotencode\" repository format which enhances\n" -" the \"fncache\" repository format (which has to be enabled to use\n" -" dotencode) to avoid issues with filenames starting with ._ on\n" -" Mac OS X and spaces on Windows. Enabled by default. Disabling this\n" -" option ensures that the on-disk format of newly created\n" -" repositories will be compatible with Mercurial before version 1.7." -msgstr "" -"``dotencode``\n" -" \"fncache\" å½¢å¼ãƒªãƒã‚¸ãƒˆãƒª (本è¨å®šã®æœ‰åŠ¹åŒ–ã«å¿…é ˆ) ã«ãŠã„ã¦ã€\n" -" Mac OS X ã§ã¯ ``._`` ã€Windows ã§ã¯ç©ºç™½æ–‡å—ã§å§‹ã¾ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«åãŒã€\n" -" åŽŸå› ã¨ãªã£ã¦ç™ºç”Ÿã™ã‚‹å•é¡Œã‚’〠回é¿ã™ã‚‹ãŸã‚ã® \"dotencode\"\n" -" å½¢å¼ãƒªãƒã‚¸ãƒˆãƒªã®ä½¿ç”¨å¯å¦ã€‚ デフォルトã§ã¯æœ‰åŠ¹åŒ–ã•ã‚Œã¦ã„ã¾ã™ã€‚\n" -" ã“ã®è¨å®šã‚’無効化ã—ãŸå ´åˆã€ æ–°è¦ä½œæˆã—ãŸãƒªãƒã‚¸ãƒˆãƒªã¯ã€ 1.7 以å‰ã®\n" -" Mercurial ã¨ã€ ディスク記録形å¼ã§äº’æ›æ€§ãŒä¿ãŸã‚Œã¾ã™ã€‚" +" \"fncache\" å½¢å¼ãƒªãƒã‚¸ãƒˆãƒªã®ä½¿ç”¨å¯å¦ã€‚ ã“ã®å½¢å¼ã§ã¯ã€\n" +" é•·ã„ファイルåや〠特定㮠OS ã®äºˆç´„å (Windows ã§ã® \"nul\")\n" +" ã¨åŒåã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å±¥æ´ãŒã€ ã©ã®ç’°å¢ƒã§ã‚‚æ£ã—ãæ ¼ç´ã§ãるよã†ã«ã€\n" +" \"store\" å½¢å¼ (本è¨å®šã®æœ‰åŠ¹åŒ–ã«å¿…é ˆ) ã‚’æ‹¡å¼µã—ã¾ã™ã€‚" + +msgid "" +" Repositories with this on-disk format require Mercurial version 1.1." +msgstr " ã“ã®å½¢å¼ã®åˆ©ç”¨ã«ã¯ Mercurial 1.1 以é™ãŒå¿…è¦ã§ã™ã€‚" + +msgid "" +"``usestore``\n" +" Enable or disable the \"store\" repository format which improves\n" +" compatibility with systems that fold case or otherwise mangle\n" +" filenames. Disabling this option will allow you to store longer " +"filenames\n" +" in some situations at the expense of compatibility." +msgstr "" +"``usestore``\n" +" \"store\" å½¢å¼ãƒªãƒã‚¸ãƒˆãƒªã®ä½¿ç”¨å¯å¦ã€‚ ã“ã®å½¢å¼ã§ã¯ã€\n" +" 管ç†å¯¾è±¡ã®ãƒ•ã‚¡ã‚¤ãƒ«åãŒã€ æ–‡å—大å°é•ã„ã§ãŠäº’ã„ã«è¡çªã™ã‚‹å ´åˆã«ã€\n" +" ã©ã®ç’°å¢ƒã§ã‚‚å±¥æ´ãŒæ£ã—ãæ ¼ç´ã§ãるよã†ã«ã€ æ ¼ç´å½¢å¼ã‚’æ‹¡å¼µã—ã¾ã™ã€‚\n" +" 本形å¼ã‚’無効化ã—ãŸå ´åˆã€ 異環境ã¨ã®ç›¸äº’é‹ç”¨æ€§ã‚’çŠ ç‰²ã«ã™ã‚‹ä»£ã‚ã‚Šã«ã€\n" +" 有効化時よりも長ã„ファイルåを〠管ç†å¯¾è±¡ã«ã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚" + +msgid "" +" Repositories with this on-disk format require Mercurial version 0.9.4." +msgstr " ã“ã®å½¢å¼ã®åˆ©ç”¨ã«ã¯ Mercurial 0.9.4 以é™ãŒå¿…è¦ã§ã™ã€‚" msgid "" "``graph``\n" @@ -19450,7 +20171,7 @@ "hooks can be run for the same action by appending a suffix to the\n" "action. Overriding a site-wide hook can be done by changing its\n" "value or setting it to an empty string. Hooks can be prioritized\n" -"by adding a prefix of ``priority`` to the hook name on a new line\n" +"by adding a prefix of ``priority.`` to the hook name on a new line\n" "and setting the priority. The default priority is 0." msgstr "" "commit ã®é–‹å§‹ï¼çµ‚了ã¨ã„ã£ãŸæ§˜ã€…ãªå‡¦ç†å¥‘æ©Ÿã«ãŠã„ã¦ã€\n" @@ -19459,7 +20180,7 @@ "åŒä¸€å‡¦ç†å¥‘æ©Ÿã«è¤‡æ•°ã®ãƒ•ãƒƒã‚¯ã‚’実行å¯èƒ½ã§ã™ã€‚\n" "å…ˆã«èªã¿è¾¼ã¾ã‚ŒãŸè¨å®š (例: ホスト毎è¨å®š) ã«ãŠã‘るフックè¨å®šã¯ã€\n" "別ãªå€¤ã‚’è¨å®šã™ã‚‹ã‹ã€ 空値ã®è¨å®šã«ã‚ˆã‚Šã€ 上書ãå¯èƒ½ã§ã™ã€‚\n" -"フックåã®å‰ã« ``priority`` ã‚’è¿½åŠ ã—ãŸè¨å®šå€¤ã‚’æ–°ãŸã«å®šç¾©ã—ã€\n" +"フックåã®å‰ã« ``priority.`` 接é è¾žã‚’è¿½åŠ ã—ãŸè¨å®šå€¤ã‚’æ–°ãŸã«å®šç¾©ã—ã€\n" "値をè¨å®šã™ã‚‹ã“ã¨ã§ã€ フック実行ã®å„ªå…ˆåº¦ã‚’è¨å®šã§ãã¾ã™ã€‚\n" "デフォルトã®å„ªå…ˆåº¦è¨å®šå€¤ã¯ 0 ã§ã™ã€‚\n" "(※ 訳注: 優先度値ãŒå¤§ãã„フックã®æ–¹ãŒå…ˆã«å®Ÿè¡Œã•ã‚Œã¾ã™)" @@ -19499,9 +20220,10 @@ msgid "" "``changegroup``\n" -" Run after a changegroup has been added via push, pull or unbundle.\n" -" ID of the first new changeset is in ``$HG_NODE``. URL from which\n" -" changes came is in ``$HG_URL``." +" Run after a changegroup has been added via push, pull or unbundle. ID of " +"the\n" +" first new changeset is in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. URL\n" +" from which changes came is in ``$HG_URL``." msgstr "" "``changegroup``\n" " push〠pull〠unbundle ã«ã‚ˆã‚‹ãƒªãƒ“ジョン群ã®è¿½åŠ 完了時ã«å®Ÿè¡Œã•ã‚Œã¾ã™ã€‚\n" @@ -19505,9 +20227,9 @@ msgstr "" "``changegroup``\n" " push〠pull〠unbundle ã«ã‚ˆã‚‹ãƒªãƒ“ジョン群ã®è¿½åŠ 完了時ã«å®Ÿè¡Œã•ã‚Œã¾ã™ã€‚\n" -" æ–°è¦è¿½åŠ リビジョン群ã®æœ€åˆã® ID ㌠``$HG_NODE`` ã«ã€\n" -" è¿½åŠ ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç¾¤ã®å–ã‚Šè¾¼ã¿å…ƒ URL ㌠``$HG_URL`` ã«è¨å®šã•ã‚Œã¾ã™ã€‚\n" -" (※ 訳注: è¤‡æ•°ãƒªãƒ“ã‚¸ãƒ§ãƒ³ä¸€æ‹¬è¿½åŠ æ™‚ã® ``changegroup``\n" +" æ–°è¦è¿½åŠ リビジョン群ã®æœ€åˆã® ID ㌠``$HG_NODE`` ã«ã€ 最後㮠ID ãŒ\n" +" ``$HG_NODE_LAST`` ã«è¨å®šã•ã‚Œã¾ã™ã€‚ å–ã‚Šè¾¼ã¿å…ƒ URL ㌠``$HG_URL``\n" +" ã«è¨å®šã•ã‚Œã¾ã™ã€‚ (※ 訳注: è¤‡æ•°ãƒªãƒ“ã‚¸ãƒ§ãƒ³ä¸€æ‹¬è¿½åŠ æ™‚ã® ``changegroup``\n" " フック実行ã¯1回ã§ã™ãŒã€ ``incoming`` フックã¯ãƒªãƒ“ジョン毎ã«å®Ÿè¡Œã•ã‚Œã¾ã™)" msgid "" @@ -19573,7 +20295,7 @@ " command line are passed as ``$HG_ARGS``. Parsed command line arguments\n" " are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string\n" " representations of the data internally passed to <command>. ``$HG_OPTS``\n" -" is a dictionary of options (with unspecified options set to their\n" +" is a dictionary of options (with unspecified options set to their\n" " defaults). ``$HG_PATS`` is a list of arguments. If the hook returns\n" " failure, the command doesn't execute and Mercurial returns the failure\n" " code." @@ -19697,16 +20419,23 @@ msgid "" "``pretxnclose``\n" -" Run right before the transaction is actually finalized. Any\n" -" repository change will be visible to the hook program. This lets you\n" -" validate the transaction content or change it. Exit status 0 allows\n" -" the commit to proceed. Non-zero status will cause the transaction to\n" -" be rolled back. The reason for the transaction opening will be in\n" -" ``$HG_TXNNAME`` and a unique identifier for the transaction will be in\n" -" ``HG_TXNID``. The rest of the available data will vary according the\n" -" transaction type. New changesets will add ``$HG_NODE`` (id of the\n" -" first added changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables,\n" -" bookmarks and phases changes will set ``HG_BOOKMARK_MOVED`` and\n" -" ``HG_PHASES_MOVED`` to ``1``, etc." +" Run right before the transaction is actually finalized. Any repository " +"change\n" +" will be visible to the hook program. This lets you validate the " +"transaction\n" +" content or change it. Exit status 0 allows the commit to proceed. Non-" +"zero\n" +" status will cause the transaction to be rolled back. The reason for the\n" +" transaction opening will be in ``$HG_TXNNAME`` and a unique identifier " +"for\n" +" the transaction will be in ``HG_TXNID``. The rest of the available data " +"will\n" +" vary according the transaction type. New changesets will add ``$HG_NODE`` " +"(id\n" +" of the first added changeset), ``$HG_NODE_LAST`` (id of the last added\n" +" changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables, bookmarks and " +"phases\n" +" changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to ``1``, " +"etc." msgstr "" "``pretxnclose``\n" @@ -19711,9 +20440,9 @@ msgstr "" "``pretxnclose``\n" -" トランザクション完了直å‰ã«å®Ÿè¡Œã•ã‚Œã¾ã™ã€‚ é©ç”¨äºˆå®šã®å…¨ã¦ã®å±¥æ´å¤‰æ›´ãŒã€\n" +" トランザクション完了直å‰ã«å®Ÿè¡Œã•ã‚Œã¾ã™ã€‚ 完了時ã®è¨˜éŒ²å†…容ã®å…¨ã¦ã‚’ã€\n" " フックã‹ã‚‰å‚ç…§ã§ãã¾ã™ã€‚ トランザクション内容ã®æ¤œè¨¼ã‚„変更ãŒå¯èƒ½ã§ã™ã€‚\n" " 終了コード㌠0 ã®å ´åˆã€ トランザクション完了処ç†ãŒç¶™ç¶šã•ã‚Œã¾ã™ã€‚\n" " ãれ以外ã®å ´åˆã€ トランザクションã¯ãƒãƒ¼ãƒ«ãƒãƒƒã‚¯ã•ã‚Œã¾ã™ã€‚\n" " トランザクション種別㌠``$HG_TXNNAME`` ã«ã€ 一æ„ãªè˜åˆ¥å㌠``HG_TXNID``\n" " ã«è¨å®šã•ã‚Œã¾ã™ã€‚ ãれ以外ã®æƒ…å ±ã¯ã€ トランザクション種別ã«ä¾å˜ã—ã¾ã™ã€‚\n" " 例ãˆã°ã€ æ–°è¦ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç¾¤ã‚’è¿½åŠ ã™ã‚‹ãƒˆãƒ©ãƒ³ã‚¶ã‚¯ã‚·ãƒ§ãƒ³ã®å ´åˆã€ ``$HG_NODE``\n" @@ -19714,12 +20443,13 @@ " フックã‹ã‚‰å‚ç…§ã§ãã¾ã™ã€‚ トランザクション内容ã®æ¤œè¨¼ã‚„変更ãŒå¯èƒ½ã§ã™ã€‚\n" " 終了コード㌠0 ã®å ´åˆã€ トランザクション完了処ç†ãŒç¶™ç¶šã•ã‚Œã¾ã™ã€‚\n" " ãれ以外ã®å ´åˆã€ トランザクションã¯ãƒãƒ¼ãƒ«ãƒãƒƒã‚¯ã•ã‚Œã¾ã™ã€‚\n" " トランザクション種別㌠``$HG_TXNNAME`` ã«ã€ 一æ„ãªè˜åˆ¥å㌠``HG_TXNID``\n" " ã«è¨å®šã•ã‚Œã¾ã™ã€‚ ãれ以外ã®æƒ…å ±ã¯ã€ トランザクション種別ã«ä¾å˜ã—ã¾ã™ã€‚\n" " 例ãˆã°ã€ æ–°è¦ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç¾¤ã‚’è¿½åŠ ã™ã‚‹ãƒˆãƒ©ãƒ³ã‚¶ã‚¯ã‚·ãƒ§ãƒ³ã®å ´åˆã€ ``$HG_NODE``\n" -" (è¿½åŠ ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç¾¤ã®æœ€åˆã®ã‚‚ã®ã® ID)〠``$HG_URL`` ãŠã‚ˆã³ ``$HG_SOURCE``\n" -" ãŒè¨å®šã•ã‚Œã¾ã™ã€‚ ブックマークやフェーズã®å¤‰æ›´ã®å ´åˆã€\n" -" ``HG_BOOKMARK_MOVED`` ã‚„ ``HG_PHASES_MOVED`` ã« ``1`` ãŒè¨å®šã•ã‚Œã¾ã™ã€‚" +" (è¿½åŠ ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç¾¤ã®æœ€åˆã®ã‚‚ã®ã® ID)〠``$HG_NODE_LAST`` (最後ã®ã‚‚ã®ã®\n" +" ID)〠``$HG_URL`` ãŠã‚ˆã³ ``$HG_SOURCE`` ãŒè¨å®šã•ã‚Œã¾ã™ã€‚\n" +" ブックマークやフェーズã®å¤‰æ›´ã®å ´åˆã€ ``HG_BOOKMARK_MOVED`` ã‚„\n" +" ``HG_PHASES_MOVED`` ã« ``1`` ãŒè¨å®šã•ã‚Œã¾ã™ã€‚" msgid "" "``txnclose``\n" @@ -19745,14 +20475,18 @@ msgid "" "``pretxnchangegroup``\n" -" Run after a changegroup has been added via push, pull or unbundle,\n" -" but before the transaction has been committed. Changegroup is\n" -" visible to hook program. This lets you validate incoming changes\n" -" before accepting them. Passed the ID of the first new changeset in\n" -" ``$HG_NODE``. Exit status 0 allows the transaction to commit. Non-zero\n" -" status will cause the transaction to be rolled back and the push,\n" -" pull or unbundle will fail. URL that was source of changes is in\n" -" ``$HG_URL``." +" Run after a changegroup has been added via push, pull or unbundle, but " +"before\n" +" the transaction has been committed. Changegroup is visible to hook " +"program.\n" +" This lets you validate incoming changes before accepting them. Passed the " +"ID\n" +" of the first new changeset in ``$HG_NODE`` and last in ``$HG_NODE_LAST``.\n" +" Exit status 0 allows the transaction to commit. Non-zero status will " +"cause\n" +" the transaction to be rolled back and the push, pull or unbundle will " +"fail.\n" +" URL that was source of changes is in ``$HG_URL``." msgstr "" "``pretxnchangegroup``\n" " push〠pull〠unbundle ã«ã‚ˆã‚‹ãƒªãƒ“ジョン群ã®è¿½åŠ 完了ã®éš›ã«ã€\n" @@ -19756,10 +20490,10 @@ msgstr "" "``pretxnchangegroup``\n" " push〠pull〠unbundle ã«ã‚ˆã‚‹ãƒªãƒ“ジョン群ã®è¿½åŠ 完了ã®éš›ã«ã€\n" -" トランザクションãŒå®Œäº†ã™ã‚‹å‰ã«å®Ÿè¡Œã•ã‚Œã¾ã™ã€‚\n" -" è¿½åŠ ã•ã‚Œã‚‹ãƒªãƒ“ジョン群ã¯ã€ フックã‹ã‚‰å‚ç…§å¯èƒ½ã§ã™ã€‚\n" -" ãã®ãŸã‚ã€ è¿½åŠ ãŒç¢ºå®šã™ã‚‹å‰ã«ã€ 対象リビジョン群ã®å†…容を検証å¯èƒ½ã§ã™ã€‚\n" -" æ–°è¦è¿½åŠ リビジョン群ã®æœ€åˆã® ID ㌠``$HG_NODE`` ã«è¨å®šã•ã‚Œã¾ã™ã€‚\n" +" トランザクション完了å‰ã«å®Ÿè¡Œã•ã‚Œã¾ã™ã€‚ 完了時ã®è¨˜éŒ²å†…容ã®å…¨ã¦ã‚’ã€\n" +" フックã‹ã‚‰å‚ç…§ã§ãã¾ã™ã€‚ トランザクション内容ã®æ¤œè¨¼ã‚„変更ãŒå¯èƒ½ã§ã™ã€‚\n" +" è¿½åŠ ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç¾¤ã®æœ€åˆã®ã‚‚ã®ã® ID ㌠``$HG_NODE`` ã«ã€\n" +" 最後ã®ã‚‚ã®ã® ID ㌠``$HG_NODE_LAST`` ã«è¨å®šã•ã‚Œã¾ã™ã€‚\n" " 終了コード㌠0 ã®å ´åˆã€ トランザクションãŒç¢ºå®šã—ã¾ã™ã€‚\n" " éž 0 ã®çµ‚了コードã®å ´åˆã€ トランザクションãŒå·»ã戻ã•ã‚Œã€\n" " push〠pull〠unbundle ã¯ä¸æ–ã•ã‚Œã¾ã™ã€‚\n" @@ -20108,8 +20842,6 @@ msgid "" "``executable``\n" -" Either just the name of the executable or its pathname. On Windows,\n" -" the path can use environment variables with ${ProgramFiles} syntax.\n" -" (default: the tool name)" +" Either just the name of the executable or its pathname." msgstr "" "``executable``\n" @@ -20114,8 +20846,14 @@ msgstr "" "``executable``\n" -" 実行å¯èƒ½ãƒ•ã‚¡ã‚¤ãƒ«åã¾ãŸã¯ãƒ‘スå。 Windows 環境ã§ã¯ã€\n" -" ${ProgramFiles} 環境変数を併用ã—ãŸè¨˜è¿°ãŒä½¿ç”¨å¯èƒ½ã§ã™ã€‚\n" -" (デフォルト値: ツールåãŒè‡ªå‹•çš„ã«è¨å®š)" +" 実行å¯èƒ½ãƒ•ã‚¡ã‚¤ãƒ«åã¾ãŸã¯ãƒ‘スå。" + +msgid "" +" On Windows, the path can use environment variables with ${ProgramFiles}\n" +" syntax." +msgstr " Windows 環境ã§ã¯ã€ 環境変数 ${ProgramFiles} を併用å¯èƒ½ã§ã™ã€‚" + +msgid " (default: the tool name)" +msgstr " (デフォルト値: ツールåãŒè‡ªå‹•çš„ã«è¨å®š)" msgid "" "``args``\n" @@ -20220,50 +20958,50 @@ " (デフォルト値: False)" msgid "" -"``regkey``\n" -" Windows registry key which describes install location of this\n" -" tool. Mercurial will search for this key first under\n" -" ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.\n" -" (default: None)" -msgstr "" -"``regkey``\n" -" 当該ツールã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ä½ç½®ã‚’ä¿æŒã™ã‚‹ Windows レジストリã‚ー。\n" -" Mercurial 㯠``HKEY_CURRENT_USER`` ã¾ãŸã¯ ``HKEY_LOCAL_MACHINE``\n" -" é…下ã®å½“該ã‚ーã®æœ‰ç„¡ã‚’〠ã“ã®é †åºã§ç¢ºèªã—ã¾ã™ã€‚\n" -" (デフォルト値: None)" - -msgid "" -"``regkeyalt``\n" -" An alternate Windows registry key to try if the first key is not\n" -" found. The alternate key uses the same ``regname`` and ``regappend``\n" -" semantics of the primary key. The most common use for this key\n" -" is to search for 32bit applications on 64bit operating systems.\n" -" (default: None)" -msgstr "" -"``regkeyalt``\n" -" 指定ã•ã‚ŒãŸãƒ¬ã‚¸ã‚¹ãƒˆãƒªã‚ーä¸åœ¨æ™‚ã®ã€ 代替 Windows レジストリã‚ー。\n" -" ``regname`` ãŠã‚ˆã³ ``regappend`` ã«ã‚ˆã‚‹æ”¹å¤‰ã¯ã€\n" -" 代替ã‚ーã§ã‚‚実施ã•ã‚Œã¾ã™ã€‚ 典型的ãªç”¨é€”ã¯ã€\n" -" 64 ビット環境ã«ãŠã‘ã‚‹ 32 ビットアプリã®æ¤œç´¢ã§ã™ã€‚\n" -" (デフォルト値: None)" - -msgid "" -"``regname``\n" -" Name of value to read from specified registry key.\n" -" (default: the unnamed (default) value)" -msgstr "" -"``regname``\n" -" 当該レジストリã‚ーã‹ã‚‰èªã¿å‡ºã™å€¤ã®åå‰ã€‚ (デフォルト値: ``(既定)`` ã®å€¤)" - -msgid "" -"``regappend``\n" -" String to append to the value read from the registry, typically\n" -" the executable name of the tool.\n" -" (default: None)" -msgstr "" -"``regappend``\n" -" 当該レジストリã‚ーã‹ã‚‰ã®èªã¿å‡ºã—値ã«ä»˜åŠ ã™ã‚‹å€¤ã€‚ 典型的ãªè¨å®šå€¤ã¯ã€\n" -" ツールã®å®Ÿè¡Œå¯èƒ½ãƒ•ã‚¡ã‚¤ãƒ«åã§ã™ã€‚ (デフォルト値: None)" +" ``regkey``\n" +" Windows registry key which describes install location of this\n" +" tool. Mercurial will search for this key first under\n" +" ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.\n" +" (default: None)" +msgstr "" +" ``regkey``\n" +" 当該ツールã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ä½ç½®ã‚’ä¿æŒã™ã‚‹ Windows レジストリã‚ー。\n" +" Mercurial 㯠``HKEY_CURRENT_USER`` ã¾ãŸã¯ ``HKEY_LOCAL_MACHINE``\n" +" é…下ã®å½“該ã‚ーã®æœ‰ç„¡ã‚’〠ã“ã®é †åºã§ç¢ºèªã—ã¾ã™ã€‚\n" +" (デフォルト値: None)" + +msgid "" +" ``regkeyalt``\n" +" An alternate Windows registry key to try if the first key is not\n" +" found. The alternate key uses the same ``regname`` and ``regappend``\n" +" semantics of the primary key. The most common use for this key\n" +" is to search for 32bit applications on 64bit operating systems.\n" +" (default: None)" +msgstr "" +" ``regkeyalt``\n" +" 指定ã•ã‚ŒãŸãƒ¬ã‚¸ã‚¹ãƒˆãƒªã‚ーä¸åœ¨æ™‚ã®ã€ 代替 Windows レジストリã‚ー。\n" +" ``regname`` ãŠã‚ˆã³ ``regappend`` ã«ã‚ˆã‚‹æ”¹å¤‰ã¯ã€\n" +" 代替ã‚ーã§ã‚‚実施ã•ã‚Œã¾ã™ã€‚ 典型的ãªç”¨é€”ã¯ã€\n" +" 64 ビット環境ã«ãŠã‘ã‚‹ 32 ビットアプリã®æ¤œç´¢ã§ã™ã€‚\n" +" (デフォルト値: None)" + +msgid "" +" ``regname``\n" +" Name of value to read from specified registry key.\n" +" (default: the unnamed (default) value)" +msgstr "" +" ``regname``\n" +" 当該レジストリã‚ーã‹ã‚‰èªã¿å‡ºã™å€¤å。 (デフォルト値: ``(既定)`` ã®å€¤)" + +msgid "" +" ``regappend``\n" +" String to append to the value read from the registry, typically\n" +" the executable name of the tool.\n" +" (default: None)" +msgstr "" +" ``regappend``\n" +" 当該レジストリã‚ーã‹ã‚‰ã®èªã¿å‡ºã—値ã«ä»˜åŠ ã™ã‚‹å€¤ã€‚ 典型的ãªè¨å®šå€¤ã¯ã€\n" +" ツールã®å®Ÿè¡Œå¯èƒ½ãƒ•ã‚¡ã‚¤ãƒ«åã§ã™ã€‚ (デフォルト値: None)" msgid "" "\n" @@ -20324,16 +21062,64 @@ "``paths``\n" "---------" -msgid "" -"Assigns symbolic names to repositories. The left side is the\n" -"symbolic name, and the right gives the directory or URL that is the\n" -"location of the repository. Default paths can be declared by setting\n" -"the following entries." -msgstr "" -"リãƒã‚¸ãƒˆãƒªä½ç½®ã¸ã®ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãªåå‰ã®å‰²ã‚Šå½“ã¦è¨å®šã€‚ 記述左辺ã«ã‚·ãƒ³ãƒœãƒ«ã€\n" -"å³è¾ºã«ãƒªãƒã‚¸ãƒˆãƒªä½ç½®ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã€ ã¾ãŸã¯ URL を記述ã—ã¾ã™ã€‚\n" -"以下ã®ã‚·ãƒ³ãƒœãƒ«ã‚’è¨å®šã™ã‚‹ã“ã¨ã§ã€ 連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªæŒ‡å®šãŒç„¡ã„å ´åˆã§ã‚‚ã€\n" -"æš—é»™ã®ãƒ‘ス指定ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚ (※ 訳注: :hg:`help urls` ã‚‚å‚ç…§)" +msgid "Assigns symbolic names and behavior to repositories." +msgstr "連æºå¯¾è±¡ãƒªãƒã‚¸ãƒˆãƒªã«ã€ シンボリックãªåå‰ã‚„挙動を割り当ã¦ã¾ã™ã€‚" + +msgid "" +"Options are symbolic names defining the URL or directory that is the\n" +"location of the repository. Example::" +msgstr "" +"連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã® URL やディレクトリを定義ã™ã‚‹ã€ シンボリックãªåå‰ãŒã€\n" +"è¨å®šé …åã«ãªã‚Šã¾ã™ã€‚ 例ãˆã°::" + +msgid "" +" [paths]\n" +" my_server = https://example.com/my_repo\n" +" local_path = /home/me/repo" +msgstr "" +" [paths]\n" +" my_server = https://example.com/my_repo\n" +" local_path = /home/me/repo" + +msgid "" +"These symbolic names can be used from the command line. To pull\n" +"from ``my_server``: :hg:`pull my_server`. To push to ``local_path``:\n" +":hg:`push local_path`." +msgstr "" +"定義ã•ã‚ŒãŸé …ç›®åã¯ã€ コマンド実行時ã«ä½¿ç”¨ã§ãã¾ã™ã€‚ 例ãˆã°\n" +"``my_server`` ã‹ã‚‰ã®å±¥æ´å–ã‚Šè¾¼ã¿ã¯ :hg:`pull my_server`ã€\n" +"``local_path`` ã¸ã®å±¥æ´åæ˜ ã¯ :hg:`push local_path` ã§å¯èƒ½ã§ã™ã€‚" + +msgid "" +"Options containing colons (``:``) denote sub-options that can influence\n" +"behavior for that specific path. Example::" +msgstr "" +"コãƒãƒ³ (``:``) ã‚’å«ã‚€è¨å®šé …ç›®åã¯ã€ 指定先ã¨ã®é€£æºã®éš›ã®æŒ™å‹•ã«å½±éŸ¿ã™ã‚‹ã€\n" +"ã‚µãƒ–é …ç›®åã¨ã¿ãªã•ã‚Œã¾ã™ã€‚ 例ãˆã°::" + +msgid "" +" [paths]\n" +" my_server = https://example.com/my_path\n" +" my_server:pushurl = ssh://example.com/my_path" +msgstr "" +" [paths]\n" +" my_server = https://example.com/my_path\n" +" my_server:pushurl = ssh://example.com/my_path" + +msgid "The following sub-options can be defined:" +msgstr "以下ã®ã‚µãƒ–オプションを指定ã§ãã¾ã™:" + +msgid "" +"``pushurl``\n" +" The URL to use for push operations. If not defined, the location\n" +" defined by the path's main entry is used." +msgstr "" +"``pushurl``\n" +" å±¥æ´åæ˜ ç³»æ“作 (:hg:`push` ç‰) ã§ä½¿ç”¨ã•ã‚Œã‚‹ URL。 指定ãŒãªã„å ´åˆã¯ã€\n" +" è¨å®šé …ç›®å自体ã«è¨å®šã•ã‚ŒãŸ URL ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚" + +msgid "The following special named paths exist:" +msgstr "以下ã®åå‰ã§å®šç¾©ã•ã‚ŒãŸé€£æºå…ˆã¯ã€ 特殊ãªæ„味をæŒã¡ã¾ã™:" msgid "" "``default``\n" @@ -20337,7 +21123,6 @@ msgid "" "``default``\n" -" Directory or URL to use when pulling if no source is specified.\n" -" (default: repository from which the current repository was cloned)" +" The URL or directory to use when no source or remote is specified." msgstr "" "``default``\n" @@ -20342,9 +21127,12 @@ msgstr "" "``default``\n" -" 連æºå…ˆæŒ‡å®šãŒç„¡ã„å ´åˆã«ã€ :hg:`pull` ã«é¡žã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã®ã€\n" -" 連æºå¯¾è±¡ã¨ãªã‚‹ãƒªãƒã‚¸ãƒˆãƒªã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã€ ã¾ãŸã¯ URL。\n" -" (デフォルト値: :hg:`clone` ã«ã‚ˆã‚‹å½“該リãƒã‚¸ãƒˆãƒªã®è¤‡è£½å…ƒ)\n" -" (※ 訳注: :hg:`clone` ã«ã‚ˆã‚‹è¤‡è£½ã§ãªã„リãƒã‚¸ãƒˆãƒªã§ã¯ã€ 手動è¨å®šãŒå¿…è¦)" +" 連æºå…ˆæŒ‡å®šãŒç„¡ã„å ´åˆã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚" + +msgid "" +" :hg:`clone` will automatically define this path to the location the\n" +" repository was cloned from." +msgstr "" +" :hg:`clone` ã«ã‚ˆã‚‹è¤‡è£½ã®éš›ã¯ã€ 複製元㮠URL ãŒè‡ªå‹•çš„ã«è¨å®šã•ã‚Œã¾ã™ã€‚" msgid "" "``default-push``\n" @@ -20348,7 +21136,7 @@ msgid "" "``default-push``\n" -" Optional. Directory or URL to use when pushing if no destination\n" -" is specified." +" (deprecated) The URL or directory for the default :hg:`push` location.\n" +" ``default:pushurl`` should be used instead." msgstr "" "``default-push``\n" @@ -20353,31 +21141,9 @@ msgstr "" "``default-push``\n" -" 連æºå…ˆæŒ‡å®šãŒç„¡ã„å ´åˆã«ã€ :hg:`push` ã«é¡žã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã®ã€\n" -" 連æºå¯¾è±¡ã¨ãªã‚‹ãƒªãƒã‚¸ãƒˆãƒªã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã€ ã¾ãŸã¯ URL。" - -msgid "" -"Custom paths can be defined by assigning the path to a name that later can " -"be\n" -"used from the command line. Example::" -msgstr "" -"ä»»æ„ã®åå‰ã¸ã®ãƒ‘ス割り当ã¦ã«ã‚ˆã‚Šã€ コマンドラインç‰ã§ã®ãƒªãƒã‚¸ãƒˆãƒªæŒ‡å®šã§ã€\n" -"URL 指定ã®ä»£ã‚ã‚Šã«ãã®åå‰ã‚’使用ã§ãã¾ã™ã€‚è¨å®šä¾‹::" - -msgid "" -" [paths]\n" -" my_path = http://example.com/path" -msgstr "" -" [paths]\n" -" my_path = http://example.com/path" - -msgid "To push to the path defined in ``my_path`` run the command::" -msgstr "以下ã®ã‚³ãƒžãƒ³ãƒ‰å®Ÿè¡Œã§ ``my_path`` リãƒã‚¸ãƒˆãƒªã«å±¥æ´ãŒåæ˜ ã•ã‚Œã¾ã™::" - -msgid " hg push my_path" -msgstr " hg push my_path" - -msgid "" -"\n" +" (éžæŽ¨å¥¨) 連æºå…ˆæŒ‡å®šãŒãªã„å ´åˆã®ã€ å±¥æ´åæ˜ ç³»æ“作 (:hg:`push` ç‰)\n" +" ã§ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚``default:pushurl`` è¨å®šã‚’使ã†ã‚ˆã†ã«ã—ã¦ãã ã•ã„。" + +msgid "" "``phases``\n" "----------" msgstr "" @@ -20381,7 +21147,6 @@ "``phases``\n" "----------" msgstr "" -"\n" "``phases``\n" "----------" @@ -20476,7 +21241,7 @@ " (default: ls)" msgstr "" "``type``\n" -" 使用ã™ã‚‹ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ©ç¨®åˆ¥ã€‚ (デフォルト値: ls)" +" 使用ã™ã‚‹ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ©ç¨®åˆ¥ã€‚ (デフォルト値: ls)" msgid "" " ``ls``\n" @@ -20626,12 +21391,13 @@ msgid "" " Valid entries for the format field are ``topic``, ``bar``, ``number``,\n" -" ``unit``, ``estimate``, speed, and item. item defaults to the last 20\n" -" characters of the item, but this can be changed by adding either ``-" -"<num>``\n" -" which would take the last num characters, or ``+<num>`` for the first " -"num\n" -" characters." +" ``unit``, ``estimate``, ``speed``, and ``item``. ``item`` defaults to " +"the\n" +" last 20 characters of the item, but this can be changed by adding " +"either\n" +" ``-<num>`` which would take the last num characters, or ``+<num>`` for " +"the\n" +" first num characters." msgstr "" " format 指定ã§æœ‰åŠ¹ãªè¦ç´ 㯠``topic`` (ç¾å‡¦ç†å†…容), ``bar`` (ãƒãƒ¼è¡¨ç¤º),\n" " ``number`` (終了数), ``unit`` (対象å˜ä½), ``estimate`` (残予想時間),\n" @@ -20639,7 +21405,7 @@ " ã¯å¯¾è±¡ã®æœ«å°¾ 20 æ–‡å—ã§ã™ãŒã€ ``-<num>`` (末尾 num æ–‡å—) ã‚„ ``+<num>``\n" " (冒é num æ–‡å—) 指定ã®è¿½åŠ ã§å¤‰æ›´å¯èƒ½ã§ã™ã€‚" -msgid " (default: Topic bar number estimate)" +msgid " (default: topic bar number estimate)" msgstr " (デフォルト値: topic bar number estimate)" msgid "" @@ -20673,6 +21439,22 @@ " true è¨å®šæ™‚ã¯ã€disable ã«ã‚ˆã‚‹ç¦æ¢ãŒç„¡ã„é™ã‚Šã€ 常ã«é€²æ—表示を実施。" msgid "" +"``rebase``\n" +"----------" +msgstr "" +"``rebase``\n" +"----------" + +msgid "" +"``allowdivergence``\n" +" Default to False, when True allow creating divergence when performing\n" +" rebase of obsolete changesets." +msgstr "" +"``allowdivergence``\n" +" å»ƒæ¢ (obsolete) リビジョンを移動ã™ã‚‹éš›ã®ã€ 分å²è¨±å®¹ã®æœ‰ç„¡ã€‚\n" +" (デフォルト値: False)" + +msgid "" "``revsetalias``\n" "---------------" msgstr "" @@ -20749,6 +21531,49 @@ " 指示ã—ã¾ã™ (デフォルト値: 1024)" msgid "" +"``bundle1``\n" +" Whether to allow clients to push and pull using the legacy bundle1\n" +" exchange format. (default: True)" +msgstr "" + +msgid "" +"``bundle1gd``\n" +" Like ``bundle1`` but only used if the repository is using the\n" +" *generaldelta* storage format. (default: True)" +msgstr "" + +msgid "" +"``bundle1.push``\n" +" Whether to allow clients to push using the legacy bundle1 exchange\n" +" format. (default: True)" +msgstr "" + +msgid "" +"``bundle1gd.push``\n" +" Like ``bundle1.push`` but only used if the repository is using the\n" +" *generaldelta* storage format. (default: True)" +msgstr "" + +msgid "" +"``bundle1.pull``\n" +" Whether to allow clients to pull using the legacy bundle1 exchange\n" +" format. (default: True)" +msgstr "" + +msgid "" +"``bundle1gd.pull``\n" +" Like ``bundle1.pull`` but only used if the repository is using the\n" +" *generaldelta* storage format. (default: True)" +msgstr "" + +msgid "" +" Large repositories using the *generaldelta* storage format should\n" +" consider setting this option because converting *generaldelta*\n" +" repositories to the exchange format required by the bundle1 data\n" +" format can consume a lot of CPU." +msgstr "" + +msgid "" "``smtp``\n" "--------" msgstr "" @@ -20982,6 +21807,22 @@ " (デフォルト値: False)" msgid "" +"``clonebundles``\n" +" Whether the \"clone bundles\" feature is enabled." +msgstr "" + +msgid "" +" When enabled, :hg:`clone` may download and apply a server-advertised\n" +" bundle file from a URL instead of using the normal exchange mechanism." +msgstr "" + +msgid " This can likely result in faster and more reliable clones." +msgstr "" + +msgid " (default: True)" +msgstr " (デフォルト値: True)" + +msgid "" "``clonebundlefallback``\n" " Whether failure to apply an advertised \"clone bundle\" from a server\n" " should result in fallback to a regular clone." @@ -21011,6 +21852,44 @@ msgstr " (デフォルト値: False)" msgid "" +"``clonebundleprefers``\n" +" Defines preferences for which \"clone bundles\" to use." +msgstr "" + +msgid "" +" Servers advertising \"clone bundles\" may advertise multiple available\n" +" bundles. Each bundle may have different attributes, such as the bundle\n" +" type and compression format. This option is used to prefer a particular\n" +" bundle over another." +msgstr "" + +msgid " The following keys are defined by Mercurial:" +msgstr " Mercurial ã§ã¯ä»¥ä¸‹ã®ã‚ーを定義ã—ã¦ã„ã¾ã™:" + +msgid "" +" BUNDLESPEC\n" +" A bundle type specifier. These are strings passed to :hg:`bundle -" +"t`.\n" +" e.g. ``gzip-v2`` or ``bzip2-v1``." +msgstr "" + +msgid "" +" COMPRESSION\n" +" The compression format of the bundle. e.g. ``gzip`` and ``bzip2``." +msgstr "" + +msgid " Server operators may define custom keys." +msgstr "" + +msgid "" +" Example values: ``COMPRESSION=bzip2``,\n" +" ``BUNDLESPEC=gzip-v2, COMPRESSION=gzip``." +msgstr "" + +msgid " By default, the first bundle advertised by the server is used." +msgstr "" + +msgid "" "``commitsubrepos``\n" " Whether to commit modified subrepositories when committing the\n" " parent repository. If False and one subrepository has uncommitted\n" @@ -21046,6 +21925,15 @@ " (デフォルト値: ISO-8859-1)" msgid "" +"``graphnodetemplate``\n" +" The template used to print changeset nodes in an ASCII revision graph.\n" +" (default: ``{graphnode}``)" +msgstr "" +"``graphnodetemplate``\n" +" ASCII æ–‡å—ã§ã®å±¥æ´ã‚°ãƒ©ãƒ•è¡¨ç¤ºã®éš›ã«ã€ãƒªãƒ“ジョン表示ã§ä½¿ç”¨ã™ã‚‹æ–‡å—\n" +" (デフォルト値: ``{graphnode}``)" + +msgid "" "``ignore``\n" " A file to read per-user ignore patterns from. This file should be\n" " in the same format as a repository-wide .hgignore file. Filenames\n" @@ -21143,6 +22031,13 @@ " æ–‡å—コード混在ã«ã‚ˆã‚‹æ·±åˆ»ãªå•é¡Œã‚’生ã˜ã¾ã™ã€‚" msgid "" +"``origbackuppath``\n" +" The path to a directory used to store generated .orig files. If the path " +"is\n" +" not a directory, one will be created." +msgstr "" + +msgid "" "``patch``\n" " An optional external tool that ``hg import`` and some extensions\n" " will use for applying patches. By default Mercurial uses an\n" @@ -21171,18 +22066,8 @@ msgid "" "``portablefilenames``\n" " Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.\n" -" (default: ``warn``)\n" -" If set to ``warn`` (or ``true``), a warning message is printed on POSIX\n" -" platforms, if a file with a non-portable filename is added (e.g. a file\n" -" with a name that can't be created on Windows because it contains " -"reserved\n" -" parts like ``AUX``, reserved characters like ``:``, or would cause a " -"case\n" -" collision with an existing file).\n" -" If set to ``ignore`` (or ``false``), no warning is printed.\n" -" If set to ``abort``, the command is aborted.\n" -" On Windows, this configuration option is ignored and the command aborted." +" (default: ``warn``)" msgstr "" "``portablefilenames``\n" " ファイルåå¯æ¬æ€§ç¢ºèªã®è¦å¦ã€‚\n" " ``warn``, ``ignore`` ã¾ãŸã¯ ``abort`` ã®ã„ãšã‚Œã‹ã€‚\n" @@ -21185,17 +22070,58 @@ msgstr "" "``portablefilenames``\n" " ファイルåå¯æ¬æ€§ç¢ºèªã®è¦å¦ã€‚\n" " ``warn``, ``ignore`` ã¾ãŸã¯ ``abort`` ã®ã„ãšã‚Œã‹ã€‚\n" -" (デフォルト値: ``warn``)\n" -" POSIX 環境ã«ãŠã‘ã‚‹ ``warn`` (ã¾ãŸã¯ ``true``) è¨å®šã§ã¯ã€\n" -" å¯æ¬æ€§ã®ç„¡ã„åå‰ (例: ``AUX`` ã®ã‚ˆã†ãªäºˆç´„語や〠``:``\n" -" ã®ã‚ˆã†ãªç‰¹æ®Šæ–‡å—ã‚’å«ã‚“ã り〠文å—大å°ã®å•é¡Œã§ã€\n" -" æ—¢å˜ãƒ•ã‚¡ã‚¤ãƒ«ã¨è¡çªã™ã‚‹ã‚ˆã†ãªã€ Windows 環境ã§åˆ©ç”¨ã§ããªã„ファイルå)\n" -" ã‚’æŒã¤ãƒ•ã‚¡ã‚¤ãƒ«ãŒã€ 構æˆç®¡ç†å¯¾è±¡ã¨ã—ã¦è¿½åŠ ã•ã‚ŒãŸéš›ã«ã€\n" -" è¦å‘Šã‚’発ã—ã¾ã™ã€‚\n" -" ``ignore`` (ã¾ãŸã¯ ``false``) è¨å®šã§ã¯ã€ è¦å‘ŠãŒç™ºã›ã‚‰ã‚Œã¾ã›ã‚“。\n" -" ``abort`` è¨å®šã§ã¯ã€ コマンドã®å®Ÿè¡ŒãŒä¸æ–ã•ã‚Œã¾ã™ã€‚\n" -" Windows 環境ã§ã¯ã€ 本è¨å®šã¯ç„¡è¦–ã•ã‚Œã€ コマンド実行ã¯å¸¸ã«ä¸æ–ã•ã‚Œã¾ã™ã€‚" +" (デフォルト値: ``warn``)" + +msgid "" +" ``warn``\n" +" Print a warning message on POSIX platforms, if a file with a non-" +"portable\n" +" filename is added (e.g. a file with a name that can't be created on\n" +" Windows because it contains reserved parts like ``AUX``, reserved\n" +" characters like ``:``, or would cause a case collision with an " +"existing\n" +" file)." +msgstr "" +" ``warn``\n" +" å¯æ¬æ€§ã®ç„¡ã„åå‰ (例: Windows 上ã§ã¯ ``AUX`` ç‰ã®äºˆç´„語や〠``:``\n" +" ç‰ã®ç‰¹æ®Šæ–‡å—〠文å—大å°é•ã„ã§æ—¢å˜ãƒ•ã‚¡ã‚¤ãƒ«ã¨è¡çªã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€\n" +" å•é¡Œã‚’生ã˜ã¾ã™) ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒã€ 構æˆç®¡ç†å¯¾è±¡ã¨ã—ã¦è¿½åŠ ã•ã‚ŒãŸå ´åˆã€\n" +" POSIX 環境ã§ã¯è¦å‘ŠãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚" + +msgid "" +" ``ignore``\n" +" Don't print a warning." +msgstr "" +" ``ignore``\n" +" è¦å‘Šè¡¨ç¤ºã‚’抑æ¢ã—ã¾ã™ã€‚" + +msgid "" +" ``abort``\n" +" The command is aborted." +msgstr "" +" ``abort``\n" +" コマンドã®å®Ÿè¡ŒãŒä¸æ–ã•ã‚Œã¾ã™ã€‚" + +msgid "" +" ``true``\n" +" Alias for ``warn``." +msgstr "" +" ``true``\n" +" ``warn`` è¨å®šã¨ç‰ä¾¡ã§ã™ã€‚" + +msgid "" +" ``false``\n" +" Alias for ``ignore``." +msgstr "" +" ``false``\n" +" ``ignore`` è¨å®šã¨ç‰ä¾¡ã§ã™ã€‚" + +msgid "" +" On Windows, this configuration option is ignored and the command " +"aborted." +msgstr "" +" Windows 環境ã§ã¯ã€ 本è¨å®šã«é–¢ã‚らãšã€ コマンド実行ã¯å¸¸ã«ä¸æ–ã•ã‚Œã¾ã™ã€‚" msgid "" "``quiet``\n" @@ -21199,6 +22125,7 @@ msgid "" "``quiet``\n" -" Reduce the amount of output printed. (default: False)" +" Reduce the amount of output printed.\n" +" (default: False)" msgstr "" "``quiet``\n" @@ -21203,6 +22130,7 @@ msgstr "" "``quiet``\n" -" コマンド実行時ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸è¡¨ç¤ºæŠ‘æ¢è¦å¦ã®çœŸå½å€¤ã€‚ (デフォルト値: False)" +" コマンド実行時ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸è¡¨ç¤ºæŠ‘æ¢è¦å¦ã®çœŸå½å€¤ã€‚\n" +" (デフォルト値: False)" msgid "" "``remotecmd``\n" @@ -21206,6 +22134,7 @@ msgid "" "``remotecmd``\n" -" Remote command to use for clone/push/pull operations. (default: ``hg``)" +" Remote command to use for clone/push/pull operations.\n" +" (default: ``hg``)" msgstr "" "``remotecmd``\n" @@ -21210,7 +22139,8 @@ msgstr "" "``remotecmd``\n" -" clone/push/pull 処ç†ã«ãŠã‘ã‚‹é 隔実行コマンド。 (デフォルト値: ``hg``)" +" clone/push/pull 処ç†ã«ãŠã‘ã‚‹é 隔実行コマンド。\n" +" (デフォルト値: ``hg``)" msgid "" "``report_untrusted``\n" " Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a\n" @@ -21213,8 +22143,9 @@ msgid "" "``report_untrusted``\n" " Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a\n" -" trusted user or group. (default: True)" +" trusted user or group.\n" +" (default: True)" msgstr "" "``report_untrusted``\n" " ä¿¡é ¼ã§ãるユーザï¼ã‚°ãƒ«ãƒ¼ãƒ—下ã«ç„¡ã„ ``.hg/hgrc``\n" @@ -21218,7 +22149,8 @@ msgstr "" "``report_untrusted``\n" " ä¿¡é ¼ã§ãるユーザï¼ã‚°ãƒ«ãƒ¼ãƒ—下ã«ç„¡ã„ ``.hg/hgrc``\n" -" ã®ç„¡è¦–ã«å¯¾ã™ã‚‹ã€ è¦å‘Šè¦å¦ã®çœŸå½å€¤ã€‚ (デフォルト値: True)" +" ã®ç„¡è¦–ã«å¯¾ã™ã‚‹ã€ è¦å‘Šè¦å¦ã®çœŸå½å€¤ã€‚\n" +" (デフォルト値: True)" msgid "" "``slash``\n" @@ -21313,7 +22245,7 @@ msgid "" " (default: ``$EMAIL`` or ``username@hostname``. If the username in\n" -" hgrc is empty, e.g. if the system admin set ``username =`` in the\n" +" hgrc is empty, e.g. if the system admin set ``username =`` in the\n" " system hgrc, it has to be specified manually or in a different\n" " hgrc file)" msgstr "" @@ -21966,7 +22898,7 @@ "``numcpus``\n" " Number of CPUs to use for parallel operations. A zero or\n" " negative value is treated as ``use the default``.\n" -" (default: 4 or the number of CPUs on the system, whichever is larger)\n" +" (default: 4 or the number of CPUs on the system, whichever is larger)" msgstr "" "``numcpus``\n" " 並列実施ã«ä½¿ç”¨å¯èƒ½ãª CPU 数。 0 åˆã¯è² 値ã¯ã€ 『デフォルト値ã®ä½¿ç”¨ã€\n" @@ -21970,7 +22902,41 @@ msgstr "" "``numcpus``\n" " 並列実施ã«ä½¿ç”¨å¯èƒ½ãª CPU 数。 0 åˆã¯è² 値ã¯ã€ 『デフォルト値ã®ä½¿ç”¨ã€\n" -" ã‚’æ„味ã—ã¾ã™ã€‚ (デフォルト値: 4 åˆã¯ä½¿ç”¨å¯èƒ½ CPU æ•°ã®å¤§ãã„æ–¹ã®å€¤)\n" +" ã‚’æ„味ã—ã¾ã™ã€‚ (デフォルト値: 4 åˆã¯ä½¿ç”¨å¯èƒ½ CPU æ•°ã®å¤§ãã„æ–¹ã®å€¤)" + +msgid "" +"``backgroundclose``\n" +" Whether to enable closing file handles on background threads during " +"certain\n" +" operations. Some platforms aren't very efficient at closing file\n" +" handles that have been written or appened to. By performing file " +"closing\n" +" on background threads, file write rate can increase substantially.\n" +" (default: true on Windows, false elsewhere)" +msgstr "" + +msgid "" +"``backgroundcloseminfilecount``\n" +" Minimum number of files required to trigger background file closing.\n" +" Operations not writing this many files won't start background close\n" +" threads.\n" +" (default: 2048)" +msgstr "" + +msgid "" +"``backgroundclosemaxqueue``\n" +" The maximum number of opened file handles waiting to be closed in the\n" +" background. This option only has an effect if ``backgroundclose`` is\n" +" enabled.\n" +" (default: 384)" +msgstr "" + +msgid "" +"``backgroundclosethreadcount``\n" +" Number of threads to process background file closes. Only relevant if\n" +" ``backgroundclose`` is enabled.\n" +" (default: 4)\n" +msgstr "" msgid "Some commands allow the user to specify a date, e.g.:" msgstr "以下ã®ã‚³ãƒžãƒ³ãƒ‰ã§æ—¥æ™‚指定ãŒå¯èƒ½ã§ã™:" @@ -23705,9 +24671,9 @@ msgid "" "Copying\n" "\"\"\"\"\"\"\"\n" -"Copyright (C) 2005-2015 Matt Mackall.\n" +"Copyright (C) 2005-2016 Matt Mackall.\n" "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" "Copying\n" "\"\"\"\"\"\"\"\n" @@ -23709,9 +24675,9 @@ "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" "Copying\n" "\"\"\"\"\"\"\"\n" -"Copyright (C) 2005-2015 Matt Mackall.\n" +"Copyright (C) 2005-2016 Matt Mackall.\n" "本ソフトウェアã¯ã€ ãƒãƒ¼ã‚¸ãƒ§ãƒ³2ã¾ãŸã¯ãれ以é™ã® GNU General\n" "Public License ã®å…ƒã§ã®è‡ªç”±ãªåˆ©ç”¨ãŒä¿è¨¼ã•ã‚Œã¦ã„ã¾ã™ã€‚" @@ -23769,10 +24735,10 @@ "Copying\n" "=======\n" "This manual page is copyright 2006 Vadim Gelfer.\n" -"Mercurial is copyright 2005-2015 Matt Mackall.\n" +"Mercurial is copyright 2005-2016 Matt Mackall.\n" "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" "Copying\n" "=======\n" "本マニュアルページã®è‘—作権㯠copyright 2006 Vadim Gelfer ã§ã™ã€‚\n" @@ -23773,10 +24739,10 @@ "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" "Copying\n" "=======\n" "本マニュアルページã®è‘—作権㯠copyright 2006 Vadim Gelfer ã§ã™ã€‚\n" -"Mercurial ã®è‘—作権㯠copyright 2005-2015 Matt Mackall ã§ã™ã€‚\n" +"Mercurial ã®è‘—作権㯠copyright 2005-2016 Matt Mackall ã§ã™ã€‚\n" "本ソフトウェアã¯ã€ ãƒãƒ¼ã‚¸ãƒ§ãƒ³2ã¾ãŸã¯ãれ以é™ã® GNU General\n" "Public License ã®å…ƒã§ã®è‡ªç”±ãªåˆ©ç”¨ãŒä¿è¨¼ã•ã‚Œã¦ã„ã¾ã™ã€‚" @@ -23883,7 +24849,7 @@ "is treated as an escape character." msgstr "" "無視è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ 1è¡Œ1パターンã§ãƒ‘ターンãŒåˆ—挙ã•ã‚ŒãŸã€\n" -"å˜ç´”ãªãƒ†ã‚ストファイルã§ã™ã€‚ 空ã®è¡Œã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚\n" +"å˜ç´”ãªãƒ†ã‚ストファイルã§ã™ã€‚ 空ã®è¡Œã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚\n" "``#`` æ–‡å—ã¯ã‚³ãƒ¡ãƒ³ãƒˆæ–‡å—〠``\\`` æ–‡å—ã¯ã‚¨ã‚¹ã‚±ãƒ¼ãƒ—æ–‡å—ã¨ã—ã¦æ‰±ã‚ã‚Œã¾ã™ã€‚" msgid "" @@ -24057,10 +25023,10 @@ "Copying\n" "=======\n" "This manual page is copyright 2005 Bryan O'Sullivan.\n" -"Mercurial is copyright 2005-2015 Matt Mackall.\n" +"Mercurial is copyright 2005-2016 Matt Mackall.\n" "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" "Copying\n" "=======\n" "本マニュアルã®è‘—作権㯠copyright 2005 Bryan O'Sullivan ã§ã™ã€‚\n" @@ -24061,10 +25027,10 @@ "Free use of this software is granted under the terms of the GNU General\n" "Public License version 2 or any later version." msgstr "" "Copying\n" "=======\n" "本マニュアルã®è‘—作権㯠copyright 2005 Bryan O'Sullivan ã§ã™ã€‚\n" -"Mercurial ã®è‘—作権㯠copyright 2005-2015 Matt Mackall ã§ã™ã€‚\n" +"Mercurial ã®è‘—作権㯠copyright 2005-2016 Matt Mackall ã§ã™ã€‚\n" "本ソフトウェアã¯ã€ ãƒãƒ¼ã‚¸ãƒ§ãƒ³2ã¾ãŸã¯ãれ以é™ã® GNU General\n" "Public License ã®å…ƒã§ã®è‡ªç”±ãªåˆ©ç”¨ãŒä¿è¨¼ã•ã‚Œã¦ã„ã¾ã™ã€‚" @@ -24714,6 +25680,20 @@ "実行例ã«é–¢ã—ã¦ã¯ :hg:`help -v phase` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" msgid "" +"To make yours commits secret by default, put this in your\n" +"configuration file::" +msgstr "" +"以下ã®è¨˜è¿°ã‚’è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«è¿½åŠ ã™ã‚‹ã“ã¨ã§ã€\n" +"æ–°è¦ã‚³ãƒŸãƒƒãƒˆæ™‚ã®ãƒ•ã‚§ãƒ¼ã‚ºã‚’ secret ã«å¤‰æ›´ã§ãã¾ã™::" + +msgid "" +" [phases]\n" +" new-commit = secret" +msgstr "" +" [phases]\n" +" new-commit = secret" + +msgid "" "Phases and servers\n" "==================" msgstr "" @@ -25881,7 +26861,7 @@ "変更å‰ã«è¦ªãƒªãƒã‚¸ãƒˆãƒªã§è¨˜éŒ²ã•ã‚ŒãŸãƒªãƒ“ジョンãŒæŒã¤é€£æºå…ˆæƒ…å ±ã¯ã€\n" "無効ã¨ãªã£ã¦ã—ã¾ã„ã¾ã™ã€‚ 親リãƒã‚¸ãƒˆãƒªã® ``hgrc`` ファイルã¾ãŸã¯ Mercurial\n" "ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ãŠã„ã¦ã€ 連æºå…ˆæƒ…å ±ã®æ›¸ãæ›ãˆãƒ«ãƒ¼ãƒ«ã‚’定義ã™ã‚‹ã“ã¨ã§ã€\n" -"ã“ã®å•é¡Œã‚’解消å¯èƒ½ã§ã™ã€‚ 詳細ã«é–¢ã—ã¦ã¯ hgrc(5) 㮠``[subpaths]``\n" +"ã“ã®å•é¡Œã‚’解消å¯èƒ½ã§ã™ã€‚ 詳細ã«é–¢ã—ã¦ã¯ hgrc(5) ã® ``[subpaths]``\n" "セクションをå‚ç…§ã—ã¦ãã ã•ã„。 (※ 訳注: :hg:`help config` ã§ã‚‚å‚ç…§å¯èƒ½)" msgid "" @@ -26360,6 +27340,10 @@ msgstr "リビジョン %s ã«ãŠã‘ã‚‹ .hgsubstate ãŒä¸æ£ã§ã™\n" #, python-format +msgid "listening at http://%s%s/%s (bound to %s:%d)\n" +msgstr "http://%s%s/%s ã§å¾…ã¡å—ã‘開始(ãƒã‚¤ãƒ³ãƒ‰å…ˆã¯ %s:%d)\n" + +#, python-format msgid "config file %s not found!" msgstr "è¨å®šãƒ•ã‚¡ã‚¤ãƒ« %s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“!" @@ -27214,10 +28198,6 @@ msgid "diff context lines count must be an integer, not %r" msgstr "差分コンテã‚ストã§ã®è¡Œæ•°æŒ‡å®šãŒä¸æ£ã§ã™: %r" -#, python-format -msgid "unsupported merge state record: %s" -msgstr "未サãƒãƒ¼ãƒˆãªãƒžãƒ¼ã‚¸çŠ¶æ…‹ãŒè¨˜éŒ²ã•ã‚Œã¦ã„ã¾ã™: %s" - msgid "merge driver changed since merge started" msgstr "マージ開始後ã«ãƒžãƒ¼ã‚¸ãƒ‰ãƒ©ã‚¤ãƒè¨å®šãŒå¤‰æ›´ã•ã‚Œã¾ã—ãŸ" @@ -27229,6 +28209,10 @@ msgstr "è¦å‘Š: ファイル %s ã®å±žæ€§è¨å®šã¯ãƒžãƒ¼ã‚¸ã§ãã¾ã›ã‚“\n" #, python-format +msgid "%s.%s not valid ('%s' is none of %s)" +msgstr "%s.%s ã¯ç„¡åŠ¹ã§ã™ (指定値: '%s' 指定å¯èƒ½å€¤: %s)" + +#, python-format msgid "%s: untracked file differs\n" msgstr "%s: 未登録ファイルã«å·®åˆ†ã‚ã‚Š\n" @@ -27237,6 +28221,10 @@ msgstr "指定リビジョンã§ã®è¨˜éŒ²å†…容ã¨ç•°ãªã‚‹æœªç™»éŒ²ãƒ•ã‚¡ã‚¤ãƒ«ãŒå˜åœ¨ã—ã¾ã™" #, python-format +msgid "%s: replacing untracked file\n" +msgstr "%s: 未登録ファイルã®å†…容を書ãæ›ãˆ\n" + +#, python-format msgid "case-folding collision between %s and %s" msgstr "ファイルåã®æ–‡å—大å°ã®å•é¡Œã§ %s 㨠%s ãŒè¡çªã—ã¾ã™" @@ -27292,6 +28280,9 @@ msgid "getting %s to %s\n" msgstr "%s ã‹ã‚‰ %s ã«è¤‡è£½ä¸\n" +msgid "outstanding merge conflicts" +msgstr "マージã§ã®è¡çªè§£æ¶ˆãŒæœªå®Œäº†ã§ã™" + msgid "merging with a working directory ancestor has no effect" msgstr "作æ¥é ˜åŸŸã®ç¥–å…ˆã¨ã®ãƒžãƒ¼ã‚¸ã¯æ„味ãŒã‚ã‚Šã¾ã›ã‚“" @@ -27793,6 +28784,9 @@ msgid "at %s: %s" msgstr "æ–‡å—ä½ç½®: %s: %s" +msgid "see hg help \"revsets.x or y\"" +msgstr "hg help \"revsets.x or y\" ã‚’å‚ç…§ã—ã¦ãã ã•ã„" + msgid "can't use a key-value pair in this context" msgstr "ã“ã“ã§ã¯ key-value ペアを使用ã§ãã¾ã›ã‚“" @@ -28576,7 +29570,7 @@ " ãれ以外ã¯ç©ºé›†åˆã€‚ '.' 記述ã¯ç¾ãƒ–ランãƒåを指ã—ã¾ã™ã€‚" #. i18n: "remote" is a keyword -msgid "remote takes one, two or no arguments" +msgid "remote takes zero, one, or two arguments" msgstr "remote ã®å¼•æ•°ã¯0ã‹ã‚‰2ã¤ã§ã™" #. i18n: "remote" is a keyword @@ -28877,6 +29871,10 @@ msgstr "リビジョン対指定ã®ä¸€æ–¹ãŒç„¡åŠ¹ã§ã™" #, python-format +msgid "creating directory: %s\n" +msgstr "ディレクトリã®ä½œæˆä¸: %s\n" + +#, python-format msgid "recording removal of %s as rename to %s (%d%% similar)\n" msgstr "%s ã®å‰Šé™¤ã‚’ %s ã¸ã®ãƒ•ã‚¡ã‚¤ãƒ«å変更ã¨ã—ã¦è¨˜éŒ²ä¸ (類似度 %d%%)\n" @@ -29059,9 +30057,6 @@ msgid "transferred %s in %.1f seconds (%s/sec)\n" msgstr "%s ã‚’ %.1f 秒ã§é€ä¿¡ã—ã¾ã—㟠(%s/秒)\n" -msgid "cannot apply stream clone bundle on non-empty repo" -msgstr "stream clone bundle ã§ã®è¤‡è£½ã¯ã€ç©ºãƒªãƒã‚¸ãƒˆãƒªã«ã—ã‹é©ç”¨ã§ãã¾ã›ã‚“" - #, python-format msgid "only uncompressed stream clone bundles are supported; got %s" msgstr "éžåœ§ç¸®ã® stream clone bundle ã®ã¿ãŒã‚µãƒãƒ¼ãƒˆå¯¾è±¡ã§ã™: %s を検出" @@ -29069,6 +30064,9 @@ msgid "malformed stream clone bundle: requirements not properly encoded" msgstr "ä¸æ£ãªå½¢å¼ã® stream clone bundle ã§ã™: requirements ã®ç¬¦å·åŒ–ä¸æ£" +msgid "cannot apply stream clone bundle on non-empty repo" +msgstr "stream clone bundle ã§ã®è¤‡è£½ã¯ã€ç©ºãƒªãƒã‚¸ãƒˆãƒªã«ã—ã‹é©ç”¨ã§ãã¾ã›ã‚“" + #, python-format msgid "unable to apply stream clone: unsupported format: %s" msgstr "stream clone ãŒé©ç”¨ã§ãã¾ã›ã‚“: 未サãƒãƒ¼ãƒˆãªå½¢å¼ %s" @@ -29235,6 +30233,21 @@ msgid "not removing repo %s because it has changes.\n" msgstr "変更ãŒå«ã¾ã‚Œã¦ã„ã‚‹ãŸã‚〠リãƒã‚¸ãƒˆãƒª %s ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“\n" +#, python-format +msgid "error executing git for subrepo '%s': %s" +msgstr "サブリãƒã‚¸ãƒˆãƒª '%s' ã§ã® git コマンド実行ã«å¤±æ•—ã—ã¾ã—ãŸ: %s" + +msgid "check git is installed and in your PATH" +msgstr "PATH ã‹ã‚‰å‚ç…§å¯èƒ½ãªä½ç½®ã¸ã® git ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’確èªã—ã¦ãã ã•ã„" + +#, python-format +msgid "couldn't find 'git' or 'git.cmd' for subrepo '%s'" +msgstr "サブリãƒã‚¸ãƒˆãƒª '%s' ã§ä½¿ç”¨ã™ã‚‹ 'git' ã¾ãŸã¯ 'git.cmd' ãŒã‚ã‚Šã¾ã›ã‚“" + +#, python-format +msgid "couldn't find git for subrepo '%s'" +msgstr "サブリãƒã‚¸ãƒˆãƒª '%s' ã§ä½¿ç”¨ã™ã‚‹ 'git' ãŒã‚ã‚Šã¾ã›ã‚“" + msgid "cannot retrieve git version\n" msgstr "git ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ãŒå–å¾—ã§ãã¾ã›ã‚“\n" @@ -29613,6 +30626,13 @@ " 登録除外ファイルã®ä¸€è¦§ã€‚" msgid "" +":graphnode: String. The character representing the changeset node in\n" +" an ASCII revision graph" +msgstr "" +":graphnode: æ–‡å—列。 ASCII æ–‡å—ã§ã®å±¥æ´ã‚°ãƒ©ãƒ•è¡¨ç¤ºã®éš›ã«ã€\n" +" リビジョン表示ã§ä½¿ç”¨ã™ã‚‹æ–‡å—。" + +msgid "" ":latesttag: List of strings. The global tags on the most recent globally\n" " tagged ancestor of this changeset." msgstr "" @@ -29628,6 +30648,13 @@ " (※ 訳注: å±¥æ´ä¸ã«åˆ†å²ãŒãªã„å ´åˆã¯ latesttagdistance ã¨ç‰ä¾¡ã§ã™)" msgid "" +":namespaces: Dict of lists. Names attached to this changeset per\n" +" namespace." +msgstr "" +":namespaces: 列挙ã®è¾žæ›¸ã€‚ リビジョンã«é–¢é€£ä»˜ã‘られã¦ã„ã‚‹åå‰ã‚’ã€\n" +" åå‰ç©ºé–“毎ã«åˆ—挙ã—ãŸã‚‚ã®ã€‚" + +msgid "" ":node: String. The changeset identification hash, as a 40 hexadecimal\n" " digit string." msgstr ":node: æ–‡å—列。 リビジョンè˜åˆ¥ç”¨ã® 40 æ¡ 16 進数ãƒãƒƒã‚·ãƒ¥å€¤ã€‚" @@ -29705,6 +30732,10 @@ msgstr "テンプレート指定ãŒå¿…è¦ã§ã™" #, python-format +msgid "recursive reference '%s' in template" +msgstr "テンプレートã§ã® '%s' ã«ãŠã‘ã‚‹å†å¸°å‚ç…§" + +#, python-format msgid "unknown function '%s'" msgstr "未知ã®é–¢æ•° '%s' ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" @@ -29742,7 +30773,7 @@ " 表示対象ï¼é™¤å¤–対象ファイルã®ãƒ‘ターンを指定ãŒå¯èƒ½ã§ã™ã€‚" #. i18n: "diff" is a keyword -msgid "diff expects one, two or no arguments" +msgid "diff expects zero, one, or two arguments" msgstr "diff ã®å¼•æ•°ã¯æœ€å¤§ï¼’ã¤ã§ã™" msgid "" @@ -30059,9 +31090,6 @@ msgid "username %s contains a newline\n" msgstr "ユーザå %s ãŒæ”¹è¡Œã‚’å«ã‚“ã§ã„ã¾ã™\n" -msgid "response expected" -msgstr "何らã‹ã®å…¥åŠ›ãŒå¿…è¦ã§ã™" - msgid "unrecognized response\n" msgstr "入力ãŒä¸æ£ã§ã™\n" @@ -30072,6 +31100,15 @@ msgid "repository %s does not exist" msgstr "リãƒã‚¸ãƒˆãƒª %s ã¯å˜åœ¨ã—ã¾ã›ã‚“" +#, python-format +msgid "(paths.%s:pushurl not a URL; ignoring)\n" +msgstr "(URL å½¢å¼ã§ãªã„ paths.%s:pushurl を無視ã—ã¾ã™)\n" + +#, python-format +msgid "(\"#fragment\" in paths.%s:pushurl not supported; ignoring)\n" +msgstr "" +"(paths.%s:pushurl ã§ã® \"#fragment\" 指定ã¯æœªã‚µãƒãƒ¼ãƒˆã®ãŸã‚無視ã—ã¾ã™)\n" + msgid "cannot create new union repository" msgstr "union å½¢å¼ã®ãƒªãƒã‚¸ãƒˆãƒªã¯æ–°è¦ä½œæˆã§ãã¾ã›ã‚“" @@ -30291,12 +31328,6 @@ msgid "%.3f ns" msgstr "%.3f ナノ秒" -msgid "cannot verify bundle or remote repos" -msgstr "ãƒãƒ¼ã‚«ãƒ«ãƒªãƒã‚¸ãƒˆãƒªä»¥å¤–ã¯æ¤œè¨¼ã§ãã¾ã›ã‚“" - -msgid "interrupted" -msgstr "ä¸æ–ã•ã‚Œã¾ã—ãŸ" - #, python-format msgid "empty or missing %s" msgstr "%s ã¯ã€ 空ã‹è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" @@ -30345,6 +31376,9 @@ msgid "duplicate revision %d (%d)" msgstr "%d ã¨é‡è¤‡ã™ã‚‹ãƒªãƒ“ジョン %d ãŒã‚ã‚Šã¾ã™" +msgid "cannot verify bundle or remote repos" +msgstr "ãƒãƒ¼ã‚«ãƒ«ãƒªãƒã‚¸ãƒˆãƒªä»¥å¤–ã¯æ¤œè¨¼ã§ãã¾ã›ã‚“" + msgid "abandoned transaction found - run hg recover\n" msgstr "ä¸æ–トランザクションを検出 - 'hg recover' を実施ã—ã¦ãã ã•ã„\n" @@ -30352,6 +31386,26 @@ msgid "repository uses revlog format %d\n" msgstr "リãƒã‚¸ãƒˆãƒªã¯ revlog å½¢å¼ %d ã§ã™\n" +#, python-format +msgid "%d files, %d changesets, %d total revisions\n" +msgstr "%d 個ã®ãƒ•ã‚¡ã‚¤ãƒ«ã€ %d 件ã®å·®åˆ†æƒ…å ±ã€ åˆè¨ˆ %d 件ã®ãƒªãƒ“ジョン\n" + +#, python-format +msgid "%d warnings encountered!\n" +msgstr "è¦å‘ŠãŒ %d 件ã‚ã‚Šã¾ã™!\n" + +msgid "hint: run \"hg debugrebuildfncache\" to recover from corrupt fncache\n" +msgstr "" +"ヒント: fncache ã®ä¿®å¾©ã«ã¯ \"hg debugrebuildfncache\" を実施ã—ã¦ãã ã•ã„\n" + +#, python-format +msgid "%d integrity errors encountered!\n" +msgstr "ä¸æ•´åˆãŒ %d 件ã‚ã‚Šã¾ã™!\n" + +#, python-format +msgid "(first damaged changeset appears to be %d)\n" +msgstr "(最åˆã®ä¸æ•´åˆã¯ %d ã®æ¨¡æ§˜)\n" + msgid "checking changesets\n" msgstr "リビジョンã®ç¢ºèªä¸\n" @@ -30446,25 +31500,12 @@ msgid "warning: orphan revlog '%s'" msgstr "è¦å‘Š: revlog '%s' ã¯ã©ã“ã‹ã‚‰ã‚‚å‚ç…§ã•ã‚Œã¦ã„ã¾ã›ã‚“" -#, python-format -msgid "%d files, %d changesets, %d total revisions\n" -msgstr "%d 個ã®ãƒ•ã‚¡ã‚¤ãƒ«ã€ %d 件ã®å·®åˆ†æƒ…å ±ã€ åˆè¨ˆ %d 件ã®ãƒªãƒ“ジョン\n" - -#, python-format -msgid "%d warnings encountered!\n" -msgstr "è¦å‘ŠãŒ %d 件ã‚ã‚Šã¾ã™!\n" - -msgid "hint: run \"hg debugrebuildfncache\" to recover from corrupt fncache\n" -msgstr "" -"ヒント: fncache ã®ä¿®å¾©ã«ã¯ \"hg debugrebuildfncache\" を実施ã—ã¦ãã ã•ã„\n" - -#, python-format -msgid "%d integrity errors encountered!\n" -msgstr "ä¸æ•´åˆãŒ %d 件ã‚ã‚Šã¾ã™!\n" - -#, python-format -msgid "(first damaged changeset appears to be %d)\n" -msgstr "(最åˆã®ä¸æ•´åˆã¯ %d ã®æ¨¡æ§˜)\n" +msgid "" +"incompatible Mercurial client; bundle2 required\n" +"(see https://www.mercurial-scm.org/wiki/IncompatibleClient)\n" +msgstr "" +"bundle2 未サãƒãƒ¼ãƒˆã® Mercurial クライアントã¨ã¯äº’æ›æ€§ãŒã‚ã‚Šã¾ã›ã‚“\n" +"(https://www.mercurial-scm.org/wiki/IncompatibleClient ã‚’å‚ç…§ã—ã¦ãã ã•ã„)\n" msgid "look up remote revision" msgstr "連æºå…ˆã§ã®ãƒªãƒ“ジョンã®æ¤œç´¢"