diff --git a/i18n/ja.po b/i18n/ja.po index 838025b15925695bfcf15ad1c3e2b975c85d9aec_aTE4bi9qYS5wbw==..8ea921bf1c473cb29e18316a5c32a8ff7f4a4c74_aTE4bi9qYS5wbw== 100644 --- a/i18n/ja.po +++ b/i18n/ja.po @@ -149,8 +149,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2014-06-30 18:45+0900\n" -"PO-Revision-Date: 2014-06-30 19:03+0900\n" +"POT-Creation-Date: 2014-07-31 19:59+0900\n" +"PO-Revision-Date: 2014-07-31 23:57+0900\n" "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -1173,7 +1173,7 @@ " bzurl=http://my-project.org/bugzilla\n" " user=bugmail@my-project.org\n" " password=plugh\n" -" version=xmlrpc\n" +" version=xmlrpc+email\n" " bzemail=bugzilla@my-project.org\n" " template=Changeset {node|short} in {root|basename}.\n" " {hgweb}/{webroot}/rev/{node|short}\\n\n" @@ -1184,7 +1184,7 @@ " bzurl=http://my-project.org/bugzilla\n" " user=bugmail@my-project.org\n" " password=plugh\n" -" version=xmlrpc\n" +" version=xmlrpc+email\n" " bzemail=bugzilla@my-project.org\n" " template=Changeset {node|short} in {root|basename}.\n" " {hgweb}/{webroot}/rev/{node|short}\\n\n" @@ -1357,6 +1357,15 @@ "本エクステンションã¯éžæŽ¨å¥¨ã§ã™ã€‚:hg:`log -r \"children(REV)\"`\n" "を使用ã—ã¦ãã ã•ã„。\n" +msgid "REV" +msgstr "リビジョン" + +msgid "show children of the specified revision" +msgstr "指定リビジョンã®åリビジョンã®è¡¨ç¤º" + +msgid "hg children [-r REV] [FILE]" +msgstr "hg children [-r REV] [FILE]" + msgid "show the children of the given or working directory revision" msgstr "指定リビジョンã®åリビジョンã®è¡¨ç¤º" @@ -1375,15 +1384,6 @@ " ã—ã¾ã™ã€‚\n" " " -msgid "REV" -msgstr "リビジョン" - -msgid "show children of the specified revision" -msgstr "指定リビジョンã®åリビジョンã®è¡¨ç¤º" - -msgid "hg children [-r REV] [FILE]" -msgstr "hg children [-r REV] [FILE]" - msgid "command to display statistics about repository history" msgstr "変更履æ´ã®çµ±è¨ˆæƒ…å ±è¡¨ç¤ºã®ã‚³ãƒžãƒ³ãƒ‰" @@ -1394,6 +1394,45 @@ msgid "analyzing" msgstr "解æžä¸" +msgid "count rate for the specified revision or range" +msgstr "処ç†å¯¾è±¡ã¨ã™ã‚‹ç‰¹å®šãƒªãƒ“ジョンï¼ç¯„囲ã®æŒ‡å®š" + +msgid "DATE" +msgstr "日時" + +msgid "count rate for revisions matching date spec" +msgstr "指定日時ã¨ä¸€è‡´ã—ãŸãƒªãƒ“ジョンを処ç†å¯¾è±¡ã¨ã™ã‚‹" + +msgid "TEMPLATE" +msgstr "テンプレート" + +msgid "template to group changesets" +msgstr "リビジョン表示をグループ化ã™ã‚‹ãŸã‚ã®ãƒ†ãƒ³ãƒ—レート" + +msgid "FORMAT" +msgstr "書å¼" + +msgid "strftime-compatible format for grouping by date" +msgstr "日時グループ化ã®ãŸã‚ã® strftime 互æ›å½¢å¼ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆ" + +msgid "count rate by number of changesets" +msgstr "リビジョン数ã§çµ±è¨ˆ" + +msgid "sort by key (default: sort by count)" +msgstr "ã‚ーã«ã‚ˆã‚‹æ•´åˆ—(無指定時: 統計é‡ã§æ•´åˆ—)" + +msgid "display added/removed lines separately" +msgstr "è¿½åŠ ï¼å‰Šé™¤è¡Œè¡¨ç¤ºã®åˆ†é›¢" + +msgid "FILE" +msgstr "ファイル" + +msgid "file with email aliases" +msgstr "ユーザå変æ›ç”¨ãƒ•ã‚¡ã‚¤ãƒ«" + +msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]" +msgstr "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]" + msgid "histogram of changes to the repository" msgstr "リãƒã‚¸ãƒˆãƒªã«ãŠã‘る変更ã®çµ±è¨ˆåˆ†å¸ƒè¡¨ç¤º" @@ -1475,45 +1514,6 @@ msgid "skipping malformed alias: %s\n" msgstr "ä¸æ£ãªå½¢å¼ã®åˆ¥åを無視: %s\n" -msgid "count rate for the specified revision or range" -msgstr "処ç†å¯¾è±¡ã¨ã™ã‚‹ç‰¹å®šãƒªãƒ“ジョンï¼ç¯„囲ã®æŒ‡å®š" - -msgid "DATE" -msgstr "日時" - -msgid "count rate for revisions matching date spec" -msgstr "指定日時ã¨ä¸€è‡´ã—ãŸãƒªãƒ“ジョンを処ç†å¯¾è±¡ã¨ã™ã‚‹" - -msgid "TEMPLATE" -msgstr "テンプレート" - -msgid "template to group changesets" -msgstr "リビジョン表示をグループ化ã™ã‚‹ãŸã‚ã®ãƒ†ãƒ³ãƒ—レート" - -msgid "FORMAT" -msgstr "書å¼" - -msgid "strftime-compatible format for grouping by date" -msgstr "日時グループ化ã®ãŸã‚ã® strftime 互æ›å½¢å¼ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆ" - -msgid "count rate by number of changesets" -msgstr "リビジョン数ã§çµ±è¨ˆ" - -msgid "sort by key (default: sort by count)" -msgstr "ã‚ーã«ã‚ˆã‚‹æ•´åˆ—(無指定時: 統計é‡ã§æ•´åˆ—)" - -msgid "display added/removed lines separately" -msgstr "è¿½åŠ ï¼å‰Šé™¤è¡Œè¡¨ç¤ºã®åˆ†é›¢" - -msgid "FILE" -msgstr "ファイル" - -msgid "file with email aliases" -msgstr "ユーザå変æ›ç”¨ãƒ•ã‚¡ã‚¤ãƒ«" - -msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]" -msgstr "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]" - msgid "colorize output from some commands" msgstr "コマンド出力ã®ã‚«ãƒ©ãƒ¼åŒ–" @@ -1766,6 +1766,45 @@ msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "ä»–ã®æ§‹æˆç®¡ç†ãƒ„ールã‹ã‚‰ Mercurial ã¸ã®å±¥æ´å–ã‚Šè¾¼ã¿" +msgid "username mapping filename (DEPRECATED, use --authormap instead)" +msgstr "ユーザå変æ›ãƒ•ã‚¡ã‚¤ãƒ«ã®æŒ‡å®š (éžæŽ¨å¥¨: --authormap を使用ã—ã¦ãã ã•ã„)" + +msgid "source repository type" +msgstr "変æ›å…ƒãƒªãƒã‚¸ãƒˆãƒªç¨®åˆ¥" + +msgid "destination repository type" +msgstr "変æ›å…ˆã®ãƒªãƒã‚¸ãƒˆãƒªç¨®åˆ¥" + +msgid "import up to source revision REV" +msgstr "変æ›å…ƒã®æŒ‡å®šãƒªãƒ“ジョンã¾ã§ã®å–ã‚Šè¾¼ã¿" + +msgid "remap usernames using this file" +msgstr "変æ›æ™‚ã®ãƒ¦ãƒ¼ã‚¶å変æ›ç”¨ãƒ•ã‚¡ã‚¤ãƒ«" + +msgid "remap file names using contents of file" +msgstr "変æ›æ™‚ã®ãƒ•ã‚¡ã‚¤ãƒ«å変æ›ç”¨ãƒ•ã‚¡ã‚¤ãƒ«" + +msgid "splice synthesized history into place" +msgstr "継ãŽåˆã‚ã›ã«ã‚ˆã‚‹å±¥æ´ã®åˆæˆ" + +msgid "change branch names while converting" +msgstr "変æ›æ™‚ã®ãƒ–ランãƒå変æ›ç”¨ãƒ•ã‚¡ã‚¤ãƒ«" + +msgid "try to sort changesets by branches" +msgstr "ブランãƒã«ã‚ˆã‚‹ãƒªãƒ“ジョンã®ä¸¦ã³æ›¿ãˆ" + +msgid "try to sort changesets by date" +msgstr "日付ã«ã‚ˆã‚‹ãƒªãƒ“ジョンã®ä¸¦ã³æ›¿ãˆ" + +msgid "preserve source changesets order" +msgstr "元リãƒã‚¸ãƒˆãƒªã§ã®ãƒªãƒ“ã‚¸ãƒ§ãƒ³é †ã‚’å°Šé‡" + +msgid "try to reorder closed revisions" +msgstr "閉鎖実施リビジョン群ã®ä¸¦ã³æ›¿ãˆ" + +msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" +msgstr "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" + msgid "convert a foreign SCM repository to a Mercurial one." msgstr "別 SCM ã®ãƒªãƒã‚¸ãƒˆãƒªã‹ã‚‰ Mercurial リãƒã‚¸ãƒˆãƒªã¸ã®å¤‰æ›" @@ -2307,65 +2346,6 @@ " デフォルト値㯠True。\n" " " -msgid "create changeset information from CVS" -msgstr "CVS ã‹ã‚‰ã®ãƒªãƒ“ã‚¸ãƒ§ãƒ³æƒ…å ±ã®ä½œæˆ" - -msgid "" -" This command is intended as a debugging tool for the CVS to\n" -" Mercurial converter, and can be used as a direct replacement for\n" -" cvsps." -msgstr "" -" 本コマンドã®ä½ç½®ä»˜ã‘ã¯ã€ CVS ã‹ã‚‰ Mercurial ã¸ã®å¤‰æ›ã«ãŠã‘るデãƒãƒƒã‚°\n" -" ツールã§ã‚り〠cvsps ã®ä»£æ›¿ãƒ„ールã¨ã—ã¦ä½¿ç”¨å¯èƒ½ã§ã™ã€‚" - -msgid "" -" Hg debugcvsps reads the CVS rlog for current directory (or any\n" -" named directory) in the CVS repository, and converts the log to a\n" -" series of changesets based on matching commit log entries and\n" -" dates." -msgstr "" -" 本コマンドã¯ã€ ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª (ã¾ãŸã¯æŒ‡å®šãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª) ä¸ã® CVS rlog\n" -" ã‚’èªã¿è¾¼ã¿ã€ コミットãƒã‚°ã®å†…容ã¨æ—¥ä»˜ã‚’å…ƒã«ãƒªãƒ“ジョンを推測ã—ã¾ã™ã€‚" - -msgid "username mapping filename (DEPRECATED, use --authormap instead)" -msgstr "ユーザå変æ›ãƒ•ã‚¡ã‚¤ãƒ«ã®æŒ‡å®š (éžæŽ¨å¥¨: --authormap を使用ã—ã¦ãã ã•ã„)" - -msgid "source repository type" -msgstr "変æ›å…ƒãƒªãƒã‚¸ãƒˆãƒªç¨®åˆ¥" - -msgid "destination repository type" -msgstr "変æ›å…ˆã®ãƒªãƒã‚¸ãƒˆãƒªç¨®åˆ¥" - -msgid "import up to source revision REV" -msgstr "変æ›å…ƒã®æŒ‡å®šãƒªãƒ“ジョンã¾ã§ã®å–ã‚Šè¾¼ã¿" - -msgid "remap usernames using this file" -msgstr "変æ›æ™‚ã®ãƒ¦ãƒ¼ã‚¶å変æ›ç”¨ãƒ•ã‚¡ã‚¤ãƒ«" - -msgid "remap file names using contents of file" -msgstr "変æ›æ™‚ã®ãƒ•ã‚¡ã‚¤ãƒ«å変æ›ç”¨ãƒ•ã‚¡ã‚¤ãƒ«" - -msgid "splice synthesized history into place" -msgstr "継ãŽåˆã‚ã›ã«ã‚ˆã‚‹å±¥æ´ã®åˆæˆ" - -msgid "change branch names while converting" -msgstr "変æ›æ™‚ã®ãƒ–ランãƒå変æ›ç”¨ãƒ•ã‚¡ã‚¤ãƒ«" - -msgid "try to sort changesets by branches" -msgstr "ブランãƒã«ã‚ˆã‚‹ãƒªãƒ“ジョンã®ä¸¦ã³æ›¿ãˆ" - -msgid "try to sort changesets by date" -msgstr "日付ã«ã‚ˆã‚‹ãƒªãƒ“ジョンã®ä¸¦ã³æ›¿ãˆ" - -msgid "preserve source changesets order" -msgstr "元リãƒã‚¸ãƒˆãƒªã§ã®ãƒªãƒ“ã‚¸ãƒ§ãƒ³é †ã‚’å°Šé‡" - -msgid "try to reorder closed revisions" -msgstr "閉鎖実施リビジョン群ã®ä¸¦ã³æ›¿ãˆ" - -msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" -msgstr "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" - msgid "only return changes on specified branches" msgstr "指定ブランãƒã®ã¿ã®å¤‰æ›" @@ -2399,6 +2379,26 @@ msgid "hg debugcvsps [OPTION]... [PATH]..." msgstr "hg debugcvsps [OPTION]... [PATH]..." +msgid "create changeset information from CVS" +msgstr "CVS ã‹ã‚‰ã®ãƒªãƒ“ã‚¸ãƒ§ãƒ³æƒ…å ±ã®ä½œæˆ" + +msgid "" +" This command is intended as a debugging tool for the CVS to\n" +" Mercurial converter, and can be used as a direct replacement for\n" +" cvsps." +msgstr "" +" 本コマンドã®ä½ç½®ä»˜ã‘ã¯ã€ CVS ã‹ã‚‰ Mercurial ã¸ã®å¤‰æ›ã«ãŠã‘るデãƒãƒƒã‚°\n" +" ツールã§ã‚り〠cvsps ã®ä»£æ›¿ãƒ„ールã¨ã—ã¦ä½¿ç”¨å¯èƒ½ã§ã™ã€‚" + +msgid "" +" Hg debugcvsps reads the CVS rlog for current directory (or any\n" +" named directory) in the CVS repository, and converts the log to a\n" +" series of changesets based on matching commit log entries and\n" +" dates." +msgstr "" +" 本コマンドã¯ã€ ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª (ã¾ãŸã¯æŒ‡å®šãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª) ä¸ã® CVS rlog\n" +" ã‚’èªã¿è¾¼ã¿ã€ コミットãƒã‚°ã®å†…容ã¨æ—¥ä»˜ã‚’å…ƒã«ãƒªãƒ“ジョンを推測ã—ã¾ã™ã€‚" + msgid ":svnrev: String. Converted subversion revision number." msgstr ":svnrev: æ–‡å—列。 変æ›å…ƒã® subversion リビジョン番å·ã€‚" @@ -2726,6 +2726,10 @@ msgstr "%r オブジェクト㌠%s ã‹ã‚‰èªã¿è¾¼ã‚ã¾ã›ã‚“" #, python-format +msgid "cannot read %r object at %s: %s" +msgstr "%r オブジェクト㌠%s ã‹ã‚‰èªã¿è¾¼ã‚ã¾ã›ã‚“: %s" + +#, python-format msgid "cannot read submodules config file in %s" msgstr "%s ã«ãŠã‘るサブモジュールã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ãŒèªã¿è¾¼ã‚ã¾ã›ã‚“" @@ -3313,6 +3317,27 @@ msgid "cleaning up temp directory\n" msgstr "一時ディレクトリã®ç ´æ£„ä¸\n" +msgid "CMD" +msgstr "コマンド" + +msgid "comparison program to run" +msgstr "差分表示プãƒã‚°ãƒ©ãƒ " + +msgid "OPT" +msgstr "オプション" + +msgid "pass option to comparison program" +msgstr "差分表示プãƒã‚°ãƒ©ãƒ ã¸ã®ã‚ªãƒ—ション指定" + +msgid "revision" +msgstr "リビジョン" + +msgid "change made by revision" +msgstr "当該リビジョンã«ãŠã‘る変更内容ã®è¡¨ç¤º" + +msgid "hg extdiff [OPT]... [FILE]..." +msgstr "hg extdiff [OPT]... [FILE]..." + msgid "use external program to diff repository (or selected files)" msgstr "外部コマンドを使用ã—ãŸãƒªãƒã‚¸ãƒˆãƒª(ã¾ãŸã¯æŒ‡å®šãƒ•ã‚¡ã‚¤ãƒ«)ã®å·®åˆ†è¡¨ç¤º" @@ -3348,27 +3373,6 @@ " リビジョンãŒ1ã¤æŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 作æ¥é ˜åŸŸã¨ã®é–“ã®å·®åˆ†ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n" " リビジョンãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ 作æ¥é ˜åŸŸã¨è¦ªã¨ã®å·®åˆ†ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚" -msgid "CMD" -msgstr "コマンド" - -msgid "comparison program to run" -msgstr "差分表示プãƒã‚°ãƒ©ãƒ " - -msgid "OPT" -msgstr "オプション" - -msgid "pass option to comparison program" -msgstr "差分表示プãƒã‚°ãƒ©ãƒ ã¸ã®ã‚ªãƒ—ション指定" - -msgid "revision" -msgstr "リビジョン" - -msgid "change made by revision" -msgstr "当該リビジョンã«ãŠã‘る変更内容ã®è¡¨ç¤º" - -msgid "hg extdiff [OPT]... [FILE]..." -msgstr "hg extdiff [OPT]... [FILE]..." - #, python-format msgid "use %(path)s to diff repository (or selected files)" msgstr "%(path)s ã«ã‚ˆã‚‹ãƒªãƒã‚¸ãƒˆãƒª(ã¾ãŸã¯æŒ‡å®šãƒ•ã‚¡ã‚¤ãƒ«)ã®å·®åˆ†è¡¨ç¤º" @@ -3454,6 +3458,21 @@ msgid "pull, update and merge in one command (DEPRECATED)" msgstr "pull, update, merge ã®ä¸€æ‹¬å®Ÿè¡Œ (éžæŽ¨å¥¨)" +msgid "a specific revision you would like to pull" +msgstr "å–ã‚Šè¾¼ã¿å¯¾è±¡ãƒªãƒ“ジョンã®æŒ‡å®š" + +msgid "invoke editor on commit messages" +msgstr "コミットãƒã‚°å…¥åŠ›ã«ã‚¨ãƒ‡ã‚£ã‚¿ã‚’èµ·å‹•" + +msgid "edit commit message (DEPRECATED)" +msgstr "コミットãƒã‚°ã®ç·¨é›†(éžæŽ¨å¥¨)" + +msgid "switch parents when merging" +msgstr "マージã®éš›ã®ç¬¬1親リビジョンを切り替ãˆ" + +msgid "hg fetch [SOURCE]" +msgstr "hg fetch [SOURCE]" + msgid "pull changes from a remote repository, merge new changes if needed." msgstr "連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã‹ã‚‰ã®å–ã‚Šè¾¼ã¿ã¨ã€ å¿…è¦ã«å¿œã˜ãŸãƒžãƒ¼ã‚¸å®Ÿæ–½" @@ -3541,21 +3560,6 @@ msgid "new changeset %d:%s merges remote changes with local\n" msgstr "æ–°è¦ãƒªãƒ“ジョン %d:%s ã«ã‚ˆã‚Šã€é€£æºå…ˆã¨ãƒãƒ¼ã‚«ãƒ«ã®ãƒªãƒ“ジョンをマージ\n" -msgid "a specific revision you would like to pull" -msgstr "å–ã‚Šè¾¼ã¿å¯¾è±¡ãƒªãƒ“ジョンã®æŒ‡å®š" - -msgid "edit commit message" -msgstr "コミットãƒã‚°ã®ç·¨é›†" - -msgid "edit commit message (DEPRECATED)" -msgstr "コミットãƒã‚°ã®ç·¨é›†(éžæŽ¨å¥¨)" - -msgid "switch parents when merging" -msgstr "マージã®éš›ã®ç¬¬1親リビジョンを切り替ãˆ" - -msgid "hg fetch [SOURCE]" -msgstr "hg fetch [SOURCE]" - msgid "commands to sign and verify changesets" msgstr "リビジョンã¸ã®ç½²åãŠã‚ˆã³æ¤œè¨¼ã‚³ãƒžãƒ³ãƒ‰" @@ -3613,8 +3617,8 @@ msgid "TEXT" msgstr "テã‚スト" -msgid "commit message" -msgstr "コミットãƒã‚°" +msgid "use text as commit message" +msgstr "指定テã‚ストをコミットãƒã‚°ã¨ã—ã¦ä½¿ç”¨" msgid "hg sign [OPTION]... [REV]..." msgstr "hg sign [OPTION]... [REV]..." @@ -3885,42 +3889,6 @@ "上記è¨å®šã«ã‚ˆã‚Šã€ リビジョンã®ã‚³ãƒ³ãƒ†ã‚ストメニューã«ã¯ã€ 対象リビジョンã¨ã€\n" "指定ã—ãŸãƒªãƒ“ジョンã«å¯¾ã—ã¦ã€ vdiff ã‚’èµ·å‹•ã™ã‚‹é …ç›®ãŒè¿½åŠ ã•ã‚Œã¾ã™ã€‚\n" -msgid "diff trees from two commits" -msgstr "2リビジョン間ã®å·®åˆ†ãƒ„リー表示" - -msgid "output common ancestor information" -msgstr "共通ã®ç¥–先リビジョンã®æƒ…å ±è¡¨ç¤º" - -msgid "cat a specific revision" -msgstr "指定リビジョン時点ã®å†…容表示" - -msgid "cat-file: type or revision not supplied\n" -msgstr "cat-file: 種別もリビジョンも指定ã•ã‚Œã¦ã„ã¾ã›ã‚“\n" - -msgid "aborting hg cat-file only understands commits\n" -msgstr "ä¸æ¢: catfile 㯠commit 種別ã§ã®ã¿å®Ÿè¡Œå¯èƒ½ã§ã™\n" - -msgid "parse given revisions" -msgstr "指定リビジョンã®è§£æž" - -msgid "print revisions" -msgstr "リビジョンã®è¡¨ç¤º" - -msgid "print extension options" -msgstr "エクステンションè¨å®šã®è¡¨ç¤º" - -msgid "start interactive history viewer" -msgstr "対話的ãªå±¥æ´å‚ç…§ã®é–‹å§‹" - -msgid "NUM" -msgstr "数値" - -msgid "limit number of changes displayed" -msgstr "最大表示リビジョン数" - -msgid "hg view [-l LIMIT] [REVRANGE]" -msgstr "hg view [-l LIMIT] [REVRANGE]" - msgid "generate patch" msgstr "パッãƒã®ç”Ÿæˆ" @@ -3939,9 +3907,15 @@ msgid "search" msgstr "検索" -msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..." -msgstr "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..." +msgid "diff trees from two commits" +msgstr "2リビジョン間ã®å·®åˆ†ãƒ„リー表示" + +msgid "hg debug-merge-base REV REV" +msgstr "hg debug-merge-base REV REV" + +msgid "output common ancestor information" +msgstr "共通ã®ç¥–先リビジョンã®æƒ…å ±è¡¨ç¤º" msgid "hg debug-cat-file [OPTION]... TYPE FILE" msgstr "hg debug-cat-file [OPTION]... TYPE FILE" @@ -3944,12 +3918,15 @@ msgid "hg debug-cat-file [OPTION]... TYPE FILE" msgstr "hg debug-cat-file [OPTION]... TYPE FILE" -msgid "hg debug-config" -msgstr "hg debug-config" - -msgid "hg debug-merge-base REV REV" -msgstr "hg debug-merge-base REV REV" +msgid "cat a specific revision" +msgstr "指定リビジョン時点ã®å†…容表示" + +msgid "cat-file: type or revision not supplied\n" +msgstr "cat-file: 種別もリビジョンも指定ã•ã‚Œã¦ã„ã¾ã›ã‚“\n" + +msgid "aborting hg cat-file only understands commits\n" +msgstr "ä¸æ¢: catfile 㯠commit 種別ã§ã®ã¿å®Ÿè¡Œå¯èƒ½ã§ã™\n" #. i18n: bisect changeset status msgid "ignored" @@ -3958,6 +3935,9 @@ msgid "hg debug-rev-parse REV" msgstr "hg debug-rev-parse REV" +msgid "parse given revisions" +msgstr "指定リビジョンã®è§£æž" + msgid "header" msgstr "ヘッダ" @@ -3970,8 +3950,26 @@ msgid "max-count" msgstr "最大数" -msgid "hg debug-rev-list [OPTION]... REV..." -msgstr "hg debug-rev-list [OPTION]... REV..." +msgid "print revisions" +msgstr "リビジョンã®è¡¨ç¤º" + +msgid "hg debug-config" +msgstr "hg debug-config" + +msgid "print extension options" +msgstr "エクステンションè¨å®šã®è¡¨ç¤º" + +msgid "NUM" +msgstr "数値" + +msgid "limit number of changes displayed" +msgstr "最大表示リビジョン数" + +msgid "hg view [-l LIMIT] [REVRANGE]" +msgstr "hg view [-l LIMIT] [REVRANGE]" + +msgid "start interactive history viewer" +msgstr "対話的ãªå±¥æ´å‚ç…§ã®é–‹å§‹" msgid "syntax highlighting for hgweb (requires Pygments)" msgstr "hgweb ã«ãŠã‘るシンタックスãƒã‚¤ãƒ©ã‚¤ãƒˆ (è¦ Pygments)" @@ -5138,6 +5136,15 @@ msgid "%s does not appear to be a largefile store" msgstr "%s 㯠largefiles 対応ã¨ã¯æ€ã‚ã‚Œã¾ã›ã‚“" +msgid "minimum size (MB) for files to be converted as largefiles" +msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ«åŒ–ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®æœ€å°ã‚µã‚¤ã‚º (MB)" + +msgid "convert from a largefiles repo to a normal repo" +msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ä½¿ç”¨ãƒªãƒã‚¸ãƒˆãƒªã‹ã‚‰é€šå¸¸ãƒªãƒã‚¸ãƒˆãƒªã¸ã®å¤‰æ›" + +msgid "hg lfconvert SOURCE DEST [FILE ...]" +msgstr "hg lfconvert SOURCE DEST [FILE ...]" + #, python-format msgid "%s is not a local Mercurial repo" msgstr "%s ã¯ãƒãƒ¼ã‚«ãƒ«ã® Mercurial リãƒã‚¸ãƒˆãƒªã§ã¯ã‚ã‚Šã¾ã›ã‚“" @@ -5195,6 +5202,12 @@ msgid "%d largefiles updated, %d removed\n" msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã®æ›´æ–°æ•° %d〠削除数 %d\n" +msgid "pull largefiles for these revisions" +msgstr "指定リビジョンã«é–¢é€£ã™ã‚‹å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ã‚’入手" + +msgid "-r REV... [-e CMD] [--remotecmd CMD] [SOURCE]" +msgstr "-r REV... [-e CMD] [--remotecmd CMD] [SOURCE]" + msgid "no revisions specified" msgstr "リビジョン指定ãŒã‚ã‚Šã¾ã›ã‚“" @@ -5206,21 +5219,6 @@ msgid "%d largefiles cached\n" msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ« %d 個をã‚ャッシュ\n" -msgid "minimum size (MB) for files to be converted as largefiles" -msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ«åŒ–ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®æœ€å°ã‚µã‚¤ã‚º (MB)" - -msgid "convert from a largefiles repo to a normal repo" -msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ä½¿ç”¨ãƒªãƒã‚¸ãƒˆãƒªã‹ã‚‰é€šå¸¸ãƒªãƒã‚¸ãƒˆãƒªã¸ã®å¤‰æ›" - -msgid "hg lfconvert SOURCE DEST [FILE ...]" -msgstr "hg lfconvert SOURCE DEST [FILE ...]" - -msgid "pull largefiles for these revisions" -msgstr "指定リビジョンã«é–¢é€£ã™ã‚‹å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ã‚’入手" - -msgid "-r REV... [-e CMD] [--remotecmd CMD] [SOURCE]" -msgstr "-r REV... [-e CMD] [--remotecmd CMD] [SOURCE]" - #, python-format msgid "largefiles: size must be number (not %s)\n" msgstr "largefiles: サイズã¯æ•°å€¤ã§æŒ‡å®šã—ã¦ãã ã•ã„ (%s ã¯ä¸æ£ã§ã™)\n" @@ -5347,8 +5345,9 @@ msgid "largefiles: no files to upload\n" msgstr "largefiles: 転é€äºˆå®šãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚ã‚Šã¾ã›ã‚“\n" -msgid "largefiles to upload:\n" -msgstr "転é€äºˆå®šå¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«:\n" +#, python-format +msgid "largefiles to upload (%d entities):\n" +msgstr "転é€äºˆå®šå¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ« (実体数 %d):\n" #. i18n: column positioning for "hg summary" msgid "largefiles: (no remote repo)\n" @@ -5360,8 +5359,8 @@ #. i18n: column positioning for "hg summary" #, python-format -msgid "largefiles: %d to upload\n" -msgstr "largefiles: %d 個ã®è»¢é€äºˆå®šãƒ•ã‚¡ã‚¤ãƒ«\n" +msgid "largefiles: %d entities for %d files to upload\n" +msgstr "largefiles: %d 個ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—㦠%d 個ã®å®Ÿä½“を転é€äºˆå®š\n" #, python-format msgid "largefile %s is not in cache and could not be downloaded" @@ -5774,6 +5773,10 @@ msgid "cannot write patch \"%s\": %s" msgstr "パッム\"%s\" ã®æ›¸ã出ã—ã«å¤±æ•—: %s" +#. i18n: this message is shown in editor with "HG: " prefix +msgid "Leave message empty to use default message." +msgstr "メッセージãŒç©ºã®ã¾ã¾ãªã‚‰ã‚³ãƒŸãƒƒãƒˆã‚’ä¸æ¢ã—ã¾ã™ã€‚" + #, python-format msgid "error unlinking %s\n" msgstr "%s ã® unlink ã«å¤±æ•—\n" @@ -6413,9 +6416,6 @@ " 通常ã¨å¤‰ã‚ã‚Šãªã機能ã—ã¾ã™ã€‚ git 差分形å¼ã®è©³ç´°ã«é–¢ã—ã¦ã¯ã€\n" " 'help diffs' ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" -msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" -msgstr "\"-e\" ã¨ã€ \"-m\" ã¾ãŸã¯ \"-l\" ã¯ä½µç”¨ã§ãã¾ã›ã‚“" - msgid "hg qdiff [OPTION]... [FILE]..." msgstr "hg qdiff [OPTION]... [FILE]..." @@ -6442,9 +6442,6 @@ " å ´åˆã¯ :hg:`diff` を〠作æ¥é ˜åŸŸã®å¤‰æ›´å†…容をå«ã¾ãªã„ç¾è¡Œãƒ‘ッãƒã®å†…容\n" " ã®ã¿ã‚’見ãŸã„å ´åˆã¯ :hg:`export qtip` を使用ã—ã¦ãã ã•ã„。" -msgid "edit patch header" -msgstr "パッãƒãƒ˜ãƒƒãƒ€å†…容ã®ç·¨é›†" - msgid "keep folded patch files" msgstr "ä½µåˆå¯¾è±¡ãƒ‘ッãƒã®ãƒ‘ッãƒãƒ•ã‚¡ã‚¤ãƒ«å‰Šé™¤ã‚’抑æ¢" @@ -7391,6 +7388,22 @@ msgstr "pager.attend è¨å®šæ™‚㯠pager.ignore è¨å®šã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚" msgid "" +"Lastly, you can enable and disable paging for individual commands with\n" +"the attend-<command> option. This setting takes precedence over\n" +"existing attend and ignore options and defaults::" +msgstr "" +"``attend-<command>`` è¨å®šã«ã‚ˆã‚Šã€ ページングã®æœ‰ç„¡ã‚’〠個別ã®ã‚³ãƒžãƒ³ãƒ‰æ¯Žã«ã€\n" +"è¨å®šå¯èƒ½ã§ã™ã€‚ æ—¢å˜ã® ``attend`` ã‚„ ``ignore`` è¨å®šã‚„デフォルト挙動よりもã€\n" +"ã“ã®è¨å®šãŒå„ªå…ˆã•ã‚Œã¾ã™::" + +msgid "" +" [pager]\n" +" attend-cat = false" +msgstr "" +" [pager]\n" +" attend-cat = false" + +msgid "" "To ignore global commands like :hg:`version` or :hg:`help`, you have\n" "to specify them in your user configuration file." msgstr "" @@ -7401,7 +7414,7 @@ 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.\n" +"normal behavior." msgstr "" "ページャーã®ä½¿ç”¨ã¯ã€ --pager=... ã§ã‚‚制御ã§ãã¾ã™ã€‚\n" "真å½å€¤ã® yes no on off 以外ã«ã€ 無指定時挙動ã«ç›¸å½“ã™ã‚‹ auto\n" @@ -7405,7 +7418,7 @@ msgstr "" "ページャーã®ä½¿ç”¨ã¯ã€ --pager=... ã§ã‚‚制御ã§ãã¾ã™ã€‚\n" "真å½å€¤ã® yes no on off 以外ã«ã€ 無指定時挙動ã«ç›¸å½“ã™ã‚‹ auto\n" -"を指定ã§ãã¾ã™ã€‚\n" +"を指定ã§ãã¾ã™ã€‚" msgid "when to paginate (boolean, always, auto, or never)" msgstr "ページャーã®è¦å¦ (真å½å€¤ã€ always auto ã¾ãŸã¯ never)" @@ -7900,6 +7913,12 @@ msgid "purge ignored files too" msgstr "無視対象ファイルも削除" +msgid "purge empty directories" +msgstr "空ディレクトリを削除" + +msgid "purge files" +msgstr "ファイルを削除" + msgid "print filenames instead of deleting them" msgstr "ファイル削除ã®å¤‰ã‚ã‚Šã«ãƒ•ã‚¡ã‚¤ãƒ«å表示を実施" @@ -7920,8 +7939,8 @@ " 記録済ã¿ã®ãƒªãƒ“ジョンや〠未コミット変更をテストã™ã‚‹å ´åˆãªã©ã€\n" " 作æ¥é ˜åŸŸã‚’綺麗ã«ã—ãŸã„å ´åˆã«æœ‰ç”¨ã§ã™ã€‚" -msgid " This means that purge will delete:" -msgstr " 本コマンドã¯ã€ 以下ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã—ã¾ã™:" +msgid " This means that purge will delete the following by default:" +msgstr " 本コマンドã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆæŒ™å‹•ã§ã¯ã€ 以下ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒå‰Šé™¤ã•ã‚Œã¾ã™:" msgid "" " - Unknown files: files marked with \"?\" by :hg:`status`\n" @@ -7945,6 +7964,15 @@ " - æ–°è¦ç™»éŒ²ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ« (:hg:`add` 実施対象)" msgid "" +" The --files and --dirs options can be used to direct purge to delete\n" +" only files, only directories, or both. If neither option is given,\n" +" both will be deleted." +msgstr "" +" ``--files``/``--dirs`` ã«ã‚ˆã‚Šã€ ファイルã®ã¿ã€ ディレクトリã®ã¿ã€\n" +" ã‚ã‚‹ã„ã¯ä¸¡æ–¹ã‚’〠削除対象ã«æŒ‡å®šã§ãã¾ã™ã€‚ オプション無指定ã®å ´åˆã¯ã€\n" +" ファイル・ディレクトリã®ä¸¡æ–¹ãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚" + +msgid "" " If directories are given on the command line, only files in these\n" " directories are considered." msgstr "" @@ -8017,9 +8045,6 @@ msgid "use text as collapse commit message" msgstr "指定テã‚ストをè¦ç´„コミットãƒã‚°ã¨ã—ã¦ä½¿ç”¨" -msgid "invoke editor on commit messages" -msgstr "コミットãƒã‚°å…¥åŠ›ã«ã‚¨ãƒ‡ã‚£ã‚¿ã‚’èµ·å‹•" - msgid "read collapse commit message from file" msgstr "è¦ç´„コミットãƒã‚°ã‚’ファイルã‹ã‚‰èªã¿è¾¼ã¿" @@ -8481,6 +8506,9 @@ msgid " This command is not available when committing a merge." msgstr " 本コマンドをマージã®ã‚³ãƒŸãƒƒãƒˆã«ä½¿ç”¨ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。" +msgid "hg qrecord [OPTION]... PATCH [FILE]..." +msgstr "hg qrecord [OPTION]... PATCH [FILE]..." + msgid "interactively record a new patch" msgstr "æ–°è¦ãƒ‘ッãƒã®ã‚³ãƒŸãƒƒãƒˆå†…容を対話的ã«é¸æŠž" @@ -8509,12 +8537,9 @@ msgid "no changes to record\n" msgstr "記録å¯èƒ½ãªå¤‰æ›´ãŒã‚ã‚Šã¾ã›ã‚“\n" -msgid "hg qrecord [OPTION]... PATCH [FILE]..." -msgstr "hg qrecord [OPTION]... PATCH [FILE]..." - msgid "interactively select changes to refresh" msgstr "パッãƒæ›´æ–°å†…容を対話的ã«é¸æŠž" msgid "recreates hardlinks between repository clones" msgstr "複製リãƒã‚¸ãƒˆãƒªé–“ã§ã®ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯ã®å†ç”Ÿæˆ" @@ -8515,9 +8540,12 @@ msgid "interactively select changes to refresh" msgstr "パッãƒæ›´æ–°å†…容を対話的ã«é¸æŠž" msgid "recreates hardlinks between repository clones" msgstr "複製リãƒã‚¸ãƒˆãƒªé–“ã§ã®ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯ã®å†ç”Ÿæˆ" +msgid "[ORIGIN]" +msgstr "[ORIGIN]" + msgid "recreate hardlinks between two repositories" msgstr "ï¼’ã¤ã®ãƒªãƒã‚¸ãƒˆãƒªé–“ã§ã®ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯ã®å†ç”Ÿæˆ" @@ -8614,9 +8642,6 @@ msgid "relinked %d files (%s reclaimed)\n" msgstr "%d ファイルをå†ãƒªãƒ³ã‚¯ (%s ãƒã‚¤ãƒˆã®ç¯€ç´„)\n" -msgid "[ORIGIN]" -msgstr "[ORIGIN]" - msgid "extend schemes with shortcuts to repository swarms" msgstr "連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªç¾¤ã«å¯¾ã™ã‚‹ç•¥è¨˜æŒ‡å®šã®æ‹¡å¼µ" @@ -8701,6 +8726,12 @@ msgid "share a common history between several working directories" msgstr "複数作æ¥é ˜åŸŸã«ã‚ˆã‚‹å±¥æ´æƒ…å ±é ˜åŸŸã®å…±æœ‰" +msgid "do not create a working copy" +msgstr "作æ¥é ˜åŸŸã®æ›´æ–°ã‚’抑æ¢ã—ã¾ã™" + +msgid "[-U] SOURCE [DEST]" +msgstr "[-U] SOURCE [DEST]" + msgid "create a new shared repository" msgstr "共有リãƒã‚¸ãƒˆãƒªã®æ–°è¦ä½œæˆ" @@ -8746,12 +8777,6 @@ msgid "this is not a shared repo" msgstr "共有状態ã®ãƒªãƒã‚¸ãƒˆãƒªã§ã¯ã‚ã‚Šã¾ã›ã‚“" -msgid "do not create a working copy" -msgstr "作æ¥é ˜åŸŸã®æ›´æ–°ã‚’抑æ¢ã—ã¾ã™" - -msgid "[-U] SOURCE [DEST]" -msgstr "[-U] SOURCE [DEST]" - msgid "save and restore changes to the working directory" msgstr "作æ¥é ˜åŸŸä¸ã®å¤‰æ›´å†…容ã®é€€é¿ãŠã‚ˆã³å¾©æ—§" @@ -9045,6 +9070,10 @@ msgid "local changed subrepos found" msgstr "サブリãƒã‚¸ãƒˆãƒªã«å¤‰æ›´ãŒã‚ã‚Šã¾ã™" +#, python-format +msgid "bookmark '%s' deleted\n" +msgstr "ブックマーク '%s' ãŒç ´æ£„ã•ã‚Œã¾ã—ãŸ\n" + msgid "" "strip specified revision (optional, can specify revisions without this " "option)" @@ -9053,12 +9082,6 @@ msgid "force removal of changesets, discard uncommitted changes (no backup)" msgstr "リビジョンを強制的ã«å‰Šé™¤ã—ã€ æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´å†…å®¹ã‚’ç ´æ£„(ä¿å˜ç„¡ã—)" -msgid "" -"bundle only changesets with local revision number greater than REV which are " -"not descendants of REV (DEPRECATED)" -msgstr "" -"指定リビジョンよりリビジョン番å·ãŒå¤§ããåå«ä»¥å¤–ã®ã‚‚ã®ã‚’ bundle 化(éžæŽ¨å¥¨)" - msgid "no backups" msgstr "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—作æˆã®æŠ‘æ¢" @@ -9137,10 +9160,6 @@ msgid "bookmark '%s' not found" msgstr "ブックマーク '%s' ãŒã‚ã‚Šã¾ã›ã‚“" -#, python-format -msgid "bookmark '%s' deleted\n" -msgstr "ブックマーク '%s' ãŒç ´æ£„ã•ã‚Œã¾ã—ãŸ\n" - msgid "empty revision set" msgstr "指定ã«è©²å½“ã™ã‚‹ãƒªãƒ“ジョンã¯ã‚ã‚Šã¾ã›ã‚“" @@ -9997,6 +10016,13 @@ msgstr "%s: '%s' ã¨ã„ã†ã‚ーã¯ã‚ã‚Šã¾ã›ã‚“" #, python-format +msgid "available styles: %s\n" +msgstr "利用å¯èƒ½ãªã‚¹ã‚¿ã‚¤ãƒ«: %s\n" + +msgid "specify a template" +msgstr "テンプレートを指定ã—ã¦ãã ã•ã„" + +#, python-format msgid "found revision %s from %s\n" msgstr "リビジョン %s (%s) ãŒæŒ‡å®šæ—¥æ™‚ã«åˆè‡´ã—ã¾ã™\n" @@ -10042,6 +10068,12 @@ msgid "stripping amended changeset %s\n" msgstr "改変対象リビジョン %s を除外ä¸\n" +msgid "Leave message empty to abort commit." +msgstr "メッセージãŒç©ºã®ã¾ã¾ãªã‚‰ã‚³ãƒŸãƒƒãƒˆã‚’ä¸æ¢ã—ã¾ã™ã€‚" + +msgid "empty commit message" +msgstr "コミットãƒã‚°ãŒã‚ã‚Šã¾ã›ã‚“" + msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." msgstr "HG: コミットãƒã‚°ã‚’入力ã—ã¦ãã ã•ã„。'HG:' ã§å§‹ã¾ã‚‹è¡Œã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚" @@ -10045,9 +10077,6 @@ msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." msgstr "HG: コミットãƒã‚°ã‚’入力ã—ã¦ãã ã•ã„。'HG:' ã§å§‹ã¾ã‚‹è¡Œã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚" -msgid "HG: Leave message empty to abort commit." -msgstr "HG: メッセージãŒç©ºã®ã¾ã¾ãªã‚‰ã‚³ãƒŸãƒƒãƒˆã‚’ä¸æ¢ã—ã¾ã™ã€‚" - #, python-format msgid "HG: user: %s" msgstr "HG: ユーザ: %s" @@ -10082,9 +10111,6 @@ msgid "HG: no files changed" msgstr "HG: ファイル変更ãªã—" -msgid "empty commit message" -msgstr "コミットãƒã‚°ãŒã‚ã‚Šã¾ã›ã‚“" - msgid "created new head\n" msgstr "æ–°è¦ãƒ˜ãƒƒãƒ‰ãŒå¢—ãˆã¾ã—ãŸ\n" @@ -10209,9 +10235,6 @@ msgid "exclude names matching the given patterns" msgstr "パターンã«åˆè‡´ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’処ç†å¯¾è±¡ã‹ã‚‰é™¤å¤–" -msgid "use text as commit message" -msgstr "指定テã‚ストをコミットãƒã‚°ã¨ã—ã¦ä½¿ç”¨" - msgid "read commit message from file" msgstr "コミットãƒã‚°ã‚’ファイルã‹ã‚‰èªã¿è¾¼ã¿" @@ -10886,39 +10909,36 @@ msgid "hg bookmarks [OPTIONS]... [NAME]..." msgstr "hg bookmarks [OPTIONS]... [NAME]..." -msgid "track a line of development with movable markers" -msgstr "移動å¯èƒ½ãªãƒžãƒ¼ã‚ングã«ã‚ˆã‚‹å±¥æ´é€²å±•ã®è¿½è·¡" - -msgid "" -" Bookmarks are pointers to certain commits that move when committing.\n" -" Bookmarks are local. They can be renamed, copied and deleted. It is\n" -" possible to use :hg:`merge NAME` to merge from a given bookmark, and\n" -" :hg:`update NAME` to update to a given bookmark." -msgstr "" -" ブックマーク (bookmark) ã¯ã€ コミットæ“作ã«è¿½å¾“ã—ã¦ç§»å‹•ã™ã‚‹ã€\n" -" リビジョン特定用ã®æƒ…å ±ã§ã™ã€‚\n" -" ブックマークã®ãƒªãƒã‚¸ãƒˆãƒªé–“ä¼æ’ã¯ã€ 自動的ã«ã¯è¡Œã‚ã‚Œã¾ã›ã‚“。\n" -" ブックマークã«å¯¾ã—ã¦ã¯ã€ 改åï¼è¤‡è£½ï¼å‰Šé™¤ãŒå¯èƒ½ã§ã™ã€‚\n" -" :hg:`merge` ã‚„ :hg:`update` ã¸ã®ãƒªãƒ“ジョン指定ã«ãŠã„ã¦ã€\n" -" ブックマークを使用ã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚" - -msgid "" -" You can use :hg:`bookmark NAME` to set a bookmark on the working\n" -" directory's parent revision with the given name. If you specify\n" -" a revision using -r REV (where REV may be an existing bookmark),\n" -" the bookmark is assigned to that revision." -msgstr "" -" :hg:`bookmark NAME` を実行ã™ã‚‹ã“ã¨ã§ã€ 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã«ã€\n" -" 指定ã•ã‚ŒãŸåå‰ã§ã€ ブックマークãŒè¨å®šã•ã‚Œã¾ã™ã€‚\n" -" -r を使用ã—ã¦ã€ 対象リビジョンを指定ã—ãŸå ´åˆ\n" -" (対象指定自体ã«ã‚‚〠ブックマークを使用å¯èƒ½)\n" -" ãã®ãƒªãƒ“ジョンã«ãƒ–ックマークãŒè¨å®šã•ã‚Œã¾ã™ã€‚" - -msgid "" -" Bookmarks can be pushed and pulled between repositories (see :hg:`help\n" -" push` and :hg:`help pull`). This requires both the local and remote\n" -" repositories to support bookmarks. For versions prior to 1.8, this " -"means\n" -" the bookmarks extension must be enabled." +msgid "create a new bookmark or list existing bookmarks" +msgstr "ブックマークã®ã€æ–°è¦ä½œæˆã€åˆã¯æ—¢å˜ã®ä¸€è¦§è¡¨ç¤º" + +msgid "" +" Bookmarks are labels on changesets to help track lines of development.\n" +" Bookmarks are unversioned and can be moved, renamed and deleted.\n" +" Deleting or moving a bookmark has no effect on the associated changesets." +msgstr "" +" リビジョンã¸ã®ãƒ©ãƒ™ãƒ«ã§ã‚るブックマークã¯ã€ 作æ¥å±¥æ´ã®è¿½è·¡ã‚’助ã‘ã¾ã™ã€‚\n" +" ブックマークã¸ã®æ“作ã¯å±¥æ´è¨˜éŒ²ã•ã‚Œãšã€ 移動・削除・改åã‚‚å¯èƒ½ã§ã™ã€‚\n" +" ブックマークã®å‰Šé™¤ãƒ»ç§»å‹•ã«ã‚ˆã‚‹ã€ 対象リビジョンã¸ã®å½±éŸ¿ã¯ã‚ã‚Šã¾ã›ã‚“。" + +msgid "" +" Creating or updating to a bookmark causes it to be marked as 'active'.\n" +" Active bookmarks are indicated with a '*'.\n" +" When a commit is made, an active bookmark will advance to the new " +"commit.\n" +" A plain :hg:`update` will also advance an active bookmark, if possible.\n" +" Updating away from a bookmark will cause it to be deactivated." +msgstr "" +" ブックマークã®ä½œæˆã‚„æ›´æ–°ã¯ã€ ブックマークを 'アクティブ' 化ã—ã¾ã™ã€‚\n" +" アクティブãªãƒ–ックマーク㯠'*' 付ãã§è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ コミットã®éš›ã«ã€\n" +" アクティブãªãƒ–ックマークã®å‚照先ã¯ã€ æ–°è¦ãƒªãƒ“ジョンã¸ã¨ç§»å‹•ã—ã¾ã™ã€‚\n" +" アクティブブックマークã¯ã€ リビジョン指定無㗠:hg:`update` ã§ç§»å‹•ãŒã€\n" +" リビジョン指定付ã :hg:`update` ã§éžã‚¢ã‚¯ãƒ†ã‚£ãƒ–化ãŒç™ºç”Ÿã—ã¾ã™ã€‚" + +msgid "" +" Bookmarks can be pushed and pulled between repositories (see\n" +" :hg:`help push` and :hg:`help pull`). If a shared bookmark has\n" +" diverged, a new 'divergent bookmark' of the form 'name@path' will\n" +" be created. Using :hg:'merge' will resolve the divergence." msgstr "" " ブックマークã¯ã€ リãƒã‚¸ãƒˆãƒªé–“ã§ã®å–ã‚Šè¾¼ã¿ã‚„åæ˜ ãŒå¯èƒ½ã§ã™\n" @@ -10923,32 +10943,43 @@ msgstr "" " ブックマークã¯ã€ リãƒã‚¸ãƒˆãƒªé–“ã§ã®å–ã‚Šè¾¼ã¿ã‚„åæ˜ ãŒå¯èƒ½ã§ã™\n" -" (:hg:`help push` ãŠã‚ˆã³ :hg:`help pull` å‚ç…§)。\n" -" 但ã—〠連æºã™ã‚‹ãƒªãƒã‚¸ãƒˆãƒªã®ä¸¡æ–¹ãŒã€\n" -" ブックマーク機能ã«å¯¾å¿œã—ã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™\n" -" 1.8 版よりå‰ã® Mercurial ã®å ´åˆã€ \n" -" bookmarks エクステンションを有効ã«ã—ã¦ãã ã•ã„。" - -msgid "" -" If you set a bookmark called '@', new clones of the repository will\n" -" have that revision checked out (and the bookmark made active) by\n" -" default." -msgstr "" -" ブックマーク '@' ãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã€ 特ã«æŒ‡å®šãŒãªã‘ã‚Œã°ã€\n" -" 複製先ã®ä½œæ¥é ˜åŸŸã¯ã€ ãã®ãƒªãƒ“ジョンã§æ›´æ–°ã•ã‚Œã¾ã™ (ブックマーク '@'\n" -" ã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ã«ãªã‚Šã¾ã™)" - -msgid "" -" With -i/--inactive, the new bookmark will not be made the active\n" -" bookmark. If -r/--rev is given, the new bookmark will not be made\n" -" active even if -i/--inactive is not given. If no NAME is given, the\n" -" current active bookmark will be marked inactive.\n" -" " -msgstr "" -" -i/--inactive 指定ã®ã‚ã‚‹å ´åˆã€ 作æˆã•ã‚ŒãŸæ–°è¦ãƒ–ックマークã¯ã€\n" -" アクティブã«ã¯ãªã‚Šã¾ã›ã‚“。 -r/--rev 指定ã®ã‚ã‚‹å ´åˆã€ -i/--inactive\n" -" 指定ãŒç„¡ãã¦ã‚‚〠新è¦ãƒ–ックマークã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ã«ãªã‚Šã¾ã›ã‚“。\n" -" -i/--inactive 指定時ã«ã€ ブックマークå指定ãŒç„¡ã„å ´åˆã¯ã€\n" -" ç¾åœ¨ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªãƒ–ックマークãŒã€ éžã‚¢ã‚¯ãƒ†ã‚£ãƒ–化ã•ã‚Œã¾ã™ã€‚\n" +" (:hg:`help push` ãŠã‚ˆã³ :hg:`help pull` å‚ç…§)。 連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã§ã€\n" +" åŒåブックマークã®å‚照先ãŒåˆ†å² (divergent) ã™ã‚‹å ´åˆã€\n" +" 'ブックマークå@連æºå…ˆ' å½¢å¼ã® '分å²ãƒ–ックマーク' ãŒæ–°è¦ä½œæˆã•ã‚Œã¾ã™ã€‚\n" +" :hg:'merge' ã«ã‚ˆã‚Šåˆ†å²ãŒè§£æ¶ˆã•ã‚Œã¾ã™ã€‚" + +msgid "" +" A bookmark named '@' has the special property that :hg:`clone` will\n" +" check it out by default if it exists." +msgstr "" +" ブックマーク '@' ãŒå˜åœ¨ã™ã‚‹å ´åˆã€ :hg:`clone` ã§ã®ä½œæ¥é ˜åŸŸæ›´æ–°ã®ã€\n" +" デフォルト対象リビジョンã¨ã—ã¦ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚" + +msgid " - create an active bookmark for a new line of development::" +msgstr " - æ–°è¦é–‹ç™ºãƒ©ã‚¤ãƒ³å‘ã‘ã«ã€ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ブックマークを作æˆ::" + +msgid " hg book new-feature" +msgstr " hg book new-feature" + +msgid " - create an inactive bookmark as a place marker::" +msgstr " - éžã‚¢ã‚¯ãƒ†ã‚£ãƒ–ブックマークをマーã‚ング代ã‚ã‚Šã«ä½œæˆ::" + +msgid " hg book -i reviewed" +msgstr " hg book -i reviewed" + +msgid " - create an inactive bookmark on another changeset::" +msgstr " - 作æ¥é ˜åŸŸè¦ªãƒªãƒ“ジョン以外を指ã™éžã‚¢ã‚¯ãƒ†ã‚£ãƒ–ブックマークを作æˆ::" + +msgid " hg book -r .^ tested" +msgstr " hg book -r .^ tested" + +msgid " - move the '@' bookmark from another branch::" +msgstr " - ブックマーク '@' を作æ¥é ˜åŸŸè¦ªãƒªãƒ“ジョンã«å¼·åˆ¶çš„ã«ç§»å‹•::" + +msgid "" +" hg book -f @\n" +" " +msgstr "" +" hg book -f @\n" " " msgid "bookmark names cannot consist entirely of whitespace" @@ -11453,9 +11484,6 @@ msgid "use the secret phase for committing" msgstr "secret フェーズã§ã‚³ãƒŸãƒƒãƒˆä¸" -msgid "further edit commit message already specified" -msgstr "指定ã•ã‚ŒãŸã‚³ãƒŸãƒƒãƒˆãƒã‚°ã‚’エディタã§æ›´ã«ç·¨é›†" - msgid "commit the specified files or all outstanding changes" msgstr "指定ファイルã¾ãŸã¯å…¨ã¦ã®å¤‰æ›´å†…容ã®ãƒªãƒã‚¸ãƒˆãƒªã¸ã®è¨˜éŒ²" @@ -12620,6 +12648,13 @@ msgstr " hg log --debug -r ." msgid "" +" See :hg:`help revisions` and :hg:`help revsets` for more about\n" +" specifying revisions." +msgstr "" +" リビジョン指定ã®è©³ç´°ã¯ :hg:`help revisions` ãŠã‚ˆã³ :hg:`help revsets`\n" +" ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" + +msgid "" " Returns 0 on successful completion.\n" " " msgstr "" @@ -12931,6 +12966,9 @@ msgid "apply patch without touching the working directory" msgstr "作æ¥é ˜åŸŸã®å†…容を変更ã›ãšã«ãƒ‘ッãƒã‚’é©ç”¨" +msgid "commit even if some hunks fail" +msgstr "é©ç”¨å¤±æ•—ãŒã‚ã£ã¦ã‚‚コミットを実施" + msgid "apply patch to the nodes from which it was generated" msgstr "パッãƒä½œæˆæ™‚ã¨åŒã˜è¦ªãƒªãƒ“ジョンã«å¯¾ã—ã¦é©ç”¨" @@ -13012,6 +13050,26 @@ " パッãƒã«ã‚ˆã‚‹å¤‰æ›´çµæžœã‹ã‚‰ã€ 改åや複製を検出ã—ã¾ã™ã€‚" 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 "" " 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." @@ -13047,6 +13105,13 @@ msgid " hg import --exact proposed-fix.patch" msgstr " hg import --exact proposed-fix.patch" +msgid "" +" Returns 0 on success, 1 on partial success (see --partial).\n" +" " +msgstr "" +" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0ã€éƒ¨åˆ†æˆåŠŸæ™‚㯠1 ã§ã™ (--partial å‚ç…§).\n" +" " + msgid "need at least one patch to import" msgstr "å–ã‚Šè¾¼ã¿ã«ã¯æœ€ä½Ž1ã¤ã®ãƒ‘ッãƒå指定ãŒå¿…è¦ã§ã™" @@ -13059,6 +13124,9 @@ msgid "applying patch from stdin\n" msgstr "標準入力ã‹ã‚‰ã®ãƒ‘ッãƒã‚’é©ç”¨ä¸\n" +msgid "patch applied partially\n" +msgstr "パッãƒã®ä¸€éƒ¨ã®ã¿ãŒé©ç”¨ã•ã‚Œã¾ã—ãŸ\n" + #, python-format msgid "%s: no diffs found" msgstr "%s: 差分ãŒã‚ã‚Šã¾ã›ã‚“" @@ -13330,6 +13398,12 @@ msgid " hg log -k bug --template \"{rev}\\n\"" msgstr " hg log -k bug --template \"{rev}\\n\"" +msgid " - list available log templates::" +msgstr " - 利用å¯èƒ½ãªãƒ†ãƒ³ãƒ—レートスタイル一覧ã®è¡¨ç¤º::" + +msgid " hg log -T list" +msgstr " hg log -T list" + msgid " - check if a given changeset is included is a tagged release::" msgstr " - 指定リビジョンãŒæŒ‡å®šã‚¿ã‚°æ™‚点ã«ãŠã„ã¦å«ã¾ã‚Œã¦ã„ã‚‹ã‹ã‚’確èª::" @@ -13351,13 +13425,6 @@ " hg log -r \"last(tagged())::\" --template \"{desc|firstline}\\n\"" msgid "" -" See :hg:`help revisions` and :hg:`help revsets` for more about\n" -" specifying 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 "" @@ -14106,8 +14173,17 @@ msgid "can't specify --all and patterns" msgstr "--all ã¨ãƒ‘ターンã¯åŒæ™‚ã«æŒ‡å®šã§ãã¾ã›ã‚“" -msgid "no files or directories specified; use --all to remerge all files" -msgstr "å†ãƒžãƒ¼ã‚¸ã«ã¯ã€ ファイルï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‹ã€ --all を指定ã—ã¦ãã ã•ã„" +msgid "no files or directories specified" +msgstr "ファイルï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªæŒ‡å®šãŒã‚ã‚Šã¾ã›ã‚“" + +msgid "resolve command not applicable when not merging" +msgstr "マージãŒå®Ÿæ–½ã•ã‚Œã¦ã„ãªã„å ´åˆã¯ resolve コマンドを使用ã§ãã¾ã›ã‚“" + +msgid "arguments do not match paths that need resolving\n" +msgstr "指定パターンã¯è¡çªè§£æ¶ˆå¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã«åˆè‡´ã—ã¾ã›ã‚“\n" + +msgid "(no more unresolved files)\n" +msgstr "(è¡çªæœªè§£æ¶ˆãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚ã‚Šã¾ã›ã‚“)\n" msgid "revert all changes when no arguments given" msgstr "引数指定ãŒç„¡ã„å ´åˆã«ã€ 全ファイルã®å†…容を復旧" @@ -14178,9 +14254,6 @@ msgid "use \"hg update\" or see \"hg help revert\"" msgstr "\"hg update\" 実施を検討ã™ã‚‹ã‹ã€\"hg help revert\" ã‚’å‚ç…§" -msgid "no files or directories specified" -msgstr "ファイルï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªæŒ‡å®šãŒã‚ã‚Šã¾ã›ã‚“" - msgid "" "uncommitted merge, use --all to discard all changes, or 'hg update -C .' to " "abort the merge" @@ -14674,9 +14747,6 @@ msgid "remove a tag" msgstr "ã‚¿ã‚°ã®å‰Šé™¤" -msgid "use <text> as commit message" -msgstr "指定文å—列をコミットãƒã‚°ã¨ã—ã¦ä½¿ç”¨" - msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." msgstr "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." @@ -14937,6 +15007,14 @@ msgid "cannot specify both -c/--check and -C/--clean" msgstr "-c/--check 㨠-C/--clean ã¯ä½µç”¨ã§ãã¾ã›ã‚“" +#, python-format +msgid "(activating bookmark %s)\n" +msgstr "(ブックマーク %s をアクティブ化ä¸)\n" + +#, python-format +msgid "(leaving bookmark %s)\n" +msgstr "(ブックマーク %s ã‚’éžã‚¢ã‚¯ãƒ†ã‚£ãƒ–化ä¸)\n" + msgid "verify the integrity of the repository" msgstr "リãƒã‚¸ãƒˆãƒªã®æ•´åˆæ€§æ¤œè¨¼" @@ -14982,6 +15060,13 @@ "é ’å¸ƒæ¡ä»¶ã«é–¢ã—ã¦ã¯åŒæ¢±ã•ã‚Œã‚‹ãƒ©ã‚¤ã‚»ãƒ³ã‚¹æ¡é …ã‚’ãŠèªã¿ãã ã•ã„。\n" "å¸‚å ´é©åˆæ€§ã‚„特定用途ã¸ã®å¯å¦ã‚’å«ã‚〠本製å“ã¯ç„¡ä¿è¨¼ã§ã™ã€‚\n" +msgid "" +"\n" +"Enabled extensions:" +msgstr "" +"\n" +"有効化ã•ã‚Œã¦ã„るエクステンション:" + #, python-format msgid "unknown mode %s" msgstr "未知ã®ãƒ¢ãƒ¼ãƒ‰ %s" @@ -15139,6 +15224,10 @@ msgstr "æ–°ã—ã„ヘッド %s ãŒé€£æºå…ˆã®ãƒ–ランム'%s' ã«ä½œæˆã•ã‚Œã¾ã™!" #, python-format +msgid "push creates new remote head %s with bookmark '%s'!" +msgstr "æ–°ã—ã„ヘッド %s ãŒãƒ–ックマーク '%s' 付ãã§é€£æºå…ˆã«ä½œæˆã•ã‚Œã¾ã™!" + +#, python-format msgid "push creates new remote head %s!" msgstr "æ–°ã—ã„ヘッド %s ãŒé€£æºå…ˆã«ä½œæˆã•ã‚Œã¾ã™!" @@ -15404,6 +15493,10 @@ msgstr "å±¥æ´åæ˜ å¯¾è±¡ã«åˆ†å² (divergent) ã—ãŸå¾Œç¶™ãƒªãƒ“ジョンãŒå«ã¾ã‚Œã¾ã™ï¼: %s" #, python-format +msgid "server ignored update of %s to public!\n" +msgstr "連æºå…ˆã§ã€%s ã® public 化ãŒç„¡è¦–ã•ã‚Œã¾ã—ãŸï¼\n" + +#, python-format msgid "updating %s to public failed!\n" msgstr "%s ã®ãƒ•ã‚§ãƒ¼ã‚ºã® public 化ã«å¤±æ•—!\n" @@ -15423,6 +15516,10 @@ msgstr "連æºå…ˆã® changegroupsubset 機能未対応ã«ã‚ˆã‚Šã€ 部分å–ã‚Šè¾¼ã¿ã§ãã¾ã›ã‚“。" #, python-format +msgid "unsupported getbundle arguments: %s" +msgstr "getbundle プãƒãƒˆã‚³ãƒ«ã«æœªçŸ¥ã®å¼•æ•°ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ: %s" + +#, python-format msgid "*** failed to import extension %s from %s: %s\n" msgstr "*** %s ã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã«å¤±æ•— (%s): %s\n" @@ -15524,6 +15621,21 @@ msgstr "è¦å‘Š: internal:merge ã¯ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ %s をマージã§ãã¾ã›ã‚“\n" msgid "" +"``internal:tagmerge``\n" +"Uses the internal tag merge algorithm (experimental)." +msgstr "" +"``internal:tagmerge``\n" +"タグファイル専用ã®ãƒžãƒ¼ã‚¸å‡¦ç†ã‚’è¡Œã„ã¾ã™ (実験的実装)" + +#, python-format +msgid "" +"automatic tag merging of %s failed! (use 'hg resolve --tool internal:merge' " +"or another merge tool of your choice)\n" +msgstr "" +"タグファイル %s ã®è‡ªå‹•ãƒžãƒ¼ã‚¸ã«å¤±æ•—ã—ã¾ã—㟠('hg resolve --tool internal:" +"merge'ã‚ã‚‹ã„ã¯åˆ¥ã®ãƒ„ールを使ã£ã¦ãƒžãƒ¼ã‚¸ã—ã¦ãã ã•ã„)\n" + +msgid "" "``internal:dump``\n" "Creates three versions of the files to merge, containing the\n" " contents of local, other and base. These files can then be used to\n" @@ -16045,6 +16157,20 @@ msgid "Extension Commands" msgstr "エクステンション由æ¥ã®ã‚³ãƒžãƒ³ãƒ‰" +msgid "no matches" +msgstr "該当ã™ã‚‹ãƒ˜ãƒ«ãƒ—トピックã¯ã‚ã‚Šã¾ã›ã‚“" + +msgid "try \"hg help\" for a list of topics" +msgstr "ヘルプトピックã®ä¸€è¦§ã¯ \"hg help\" ã§è¡¨ç¤ºã•ã‚Œã¾ã™" + +#, python-format +msgid "no such help topic: %s" +msgstr "該当ã™ã‚‹ãƒ˜ãƒ«ãƒ—トピックã¯ã‚ã‚Šã¾ã›ã‚“: %s" + +#, python-format +msgid "try \"hg help --keyword %s\"" +msgstr "\"hg help --keyword %s\" を使用ã—ã¦ã¿ã¦ãã ã•ã„" + msgid "Mercurial Distributed SCM\n" msgstr "Mercurial - 分散構æˆç®¡ç†ãƒ„ール\n" @@ -16776,6 +16902,129 @@ msgid "" "\n" +"``committemplate``\n" +"------------------" +msgstr "" +"\n" +"``committemplate``\n" +"------------------" + +msgid "" +"``changeset`` configuration in this section is used as the template to\n" +"customize the text shown in the editor when committing." +msgstr "" +"本セクションã§ã® ``changeset`` è¨å®šã¯ã€ コミット時ã®ã‚¨ãƒ‡ã‚£ã‚¿èµ·å‹•ã®éš›ã«ã€\n" +"表示ã•ã‚Œã‚‹ãƒ†ã‚ストã®ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚ºã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚" + +msgid "" +"In addition to pre-defined template keywords, commit log specific one\n" +"below can be used for customization:" +msgstr "" +"æ—¢å˜ã®ãƒ†ãƒ³ãƒ—レートã‚ーワードã®ä»–ã«ã€ 本セクションã§ã®å®šç¾©ã§ã®ã¿æœ‰åŠ¹ãªã€\n" +"以下ã®ãƒ†ãƒ³ãƒ—レートã‚ーワードãŒä½¿ç”¨ã§ãã¾ã™:" + +msgid "" +"``extramsg``\n" +" String: Extra message (typically 'Leave message empty to abort\n" +" commit.'). This may be changed by some commands or extensions." +msgstr "" +"``extramsg``\n" +" æ–‡å—列。 è¿½åŠ ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ (通常㯠'メッセージãŒç©ºã®ã¾ã¾ãªã‚‰ã‚³ãƒŸãƒƒãƒˆã‚’\n" +" ä¸æ¢ã—ã¾ã™ã€‚') 実行ã•ã‚Œã‚‹ã‚³ãƒžãƒ³ãƒ‰ã«ã‚ˆã£ã¦ã€æŒ‡å®šã•ã‚Œã‚‹å†…容ãŒã€\n" +" ç•°ãªã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ (※ 訳注: MQ 系コマンドã§ç•°ãªã‚‹å†…容ã«ãªã‚Šã¾ã™)" + +msgid "" +"For example, the template configuration below shows as same text as\n" +"one shown by default::" +msgstr "" +"例ãˆã°ã€ 以下ã®ã‚ˆã†ãªè¨å®šè¨˜è¿°ã«ã‚ˆã‚Šã€ カスタマイズ未実施ã®éš›ã®è¡¨ç¤ºã¨ã€\n" +"å…¨ãåŒã˜å†…容ã®æƒ…å ±ãŒè¡¨ç¤ºã•ã‚Œã¾ã™::" + +msgid "" +" [committemplate]\n" +" changeset = {desc}\\n\\n\n" +" HG: Enter commit message. Lines beginning with 'HG:' are removed.\n" +" HG: {extramsg}\n" +" HG: --\n" +" HG: user: {author}\\n{ifeq(p2rev, \"-1\", \"\",\n" +" \"HG: branch merge\\n\")\n" +" }HG: branch '{branch}'\\n{if(currentbookmark,\n" +" \"HG: bookmark '{currentbookmark}'\\n\") }{subrepos %\n" +" \"HG: subrepo {subrepo}\\n\" }{file_adds %\n" +" \"HG: added {file}\\n\" }{file_mods %\n" +" \"HG: changed {file}\\n\" }{file_dels %\n" +" \"HG: removed {file}\\n\" }{if(files, \"\",\n" +" \"HG: no files changed\\n\")}" +msgstr "" +" [committemplate]\n" +" changeset = {desc}\\n\\n\n" +" HG: コミットãƒã‚°ã‚’入力ã—ã¦ãã ã•ã„。'HG:' ã§å§‹ã¾ã‚‹è¡Œã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚\n" +" HG: {extramsg}\n" +" HG: --\n" +" HG: ユーザ: {author}\\n{ifeq(p2rev, \"-1\", \"\",\n" +" \"HG: ブランãƒã®ãƒžãƒ¼ã‚¸\\n\")\n" +" }HG: ブランム'{branch}'\\n{if(currentbookmark,\n" +" \"HG: ブックマーク '{currentbookmark}'\\n\") }{subrepos %\n" +" \"HG: サブリãƒã‚¸ãƒˆãƒª {subrepo}\\n\" }{file_adds %\n" +" \"HG: {file} ã‚’è¿½åŠ \\n\" }{file_mods %\n" +" \"HG: {file} を変更\\n\" }{file_dels %\n" +" \"HG: {file} を削除\\n\" }{if(files, \"\",\n" +" \"HG: ファイル変更ãªã—\\n\")}" + +msgid "" +" For some problematic encodings (see :hg:`help win32mbcs` for\n" +" detail), this customization should be configured carefully, to\n" +" avoid showing broken characters." +msgstr "" +" å•é¡Œã®ã‚ã‚‹æ–‡å—コード (詳細㯠:hg:`help win32mbcs` å‚ç…§) を使ã†å ´åˆã€\n" +" 本機能ã«ã‚ˆã‚‹ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚ºã¯ã€ 表示内容ãŒå´©ã‚Œãªã„よã†ã«æ³¨æ„ãŒå¿…è¦ã§ã™ã€‚" + +msgid "" +" For example, if multibyte character ending with backslash (0x5c) is\n" +" followed by ASCII character 'n' in the customized template,\n" +" sequence of backslash and 'n' is treated as line-feed unexpectedly\n" +" (and multibyte character is broken, too)." +msgstr "" +" 例ãˆã°ã€ ãƒãƒƒã‚¯ã‚¹ãƒ©ãƒƒã‚·ãƒ¥ (0x5c) ã§çµ‚了ã™ã‚‹è¤‡æ•°ãƒã‚¤ãƒˆæ–‡å—ãŒã€ ASCII\n" +" æ–‡å—ã® ``n`` を後ã‚ã«ä¼´ã†ã‚ˆã†ãªãƒ†ãƒ³ãƒ—レート定義ã§ã¯ã€ ã“ã®2ãƒã‚¤ãƒˆãŒã€\n" +" 改行文å—扱ã„ã•ã‚Œã¦ã—ã¾ã„ã¾ã™ (先行ã™ã‚‹è¤‡æ•°ãƒã‚¤ãƒˆæ–‡å—ã‚‚å´©ã‚Œã¾ã™)。\n" +" (※ 訳注: cp932/Shift-JIS ã§ã¯ã€Œã‚½ã€ã‚„「能ã€ãªã©ãŒè©²å½“ã—ã¾ã™)" + +msgid "" +"Customized template is used for commands below (``--edit`` may be\n" +"required):" +msgstr "" +"カスタマイズ用テンプレートã¯ã€ 以下ã®ã‚³ãƒžãƒ³ãƒ‰ã§åˆ©ç”¨ã•ã‚Œã¾ã™\n" +"(エディタ起動ã®ãŸã‚ã« ``--edit`` オプションãŒå¿…è¦ãªå ´åˆã‚‚ã‚ã‚Šã¾ã™):" + +msgid "" +"- :hg:`backout`\n" +"- :hg:`commit`\n" +"- :hg:`fetch` (for merge commit only)\n" +"- :hg:`graft`\n" +"- :hg:`histedit`\n" +"- :hg:`import`\n" +"- :hg:`qfold`, :hg:`qnew` and :hg:`qrefresh`\n" +"- :hg:`rebase`\n" +"- :hg:`shelve`\n" +"- :hg:`sign`\n" +"- :hg:`tag`\n" +"- :hg:`transplant`" +msgstr "" +"- :hg:`backout`\n" +"- :hg:`commit`\n" +"- :hg:`fetch` (マージコミット時é™å®š)\n" +"- :hg:`graft`\n" +"- :hg:`histedit`\n" +"- :hg:`import`\n" +"- :hg:`qfold`, :hg:`qnew` ãŠã‚ˆã³ :hg:`qrefresh`\n" +"- :hg:`rebase`\n" +"- :hg:`shelve`\n" +"- :hg:`sign`\n" +"- :hg:`tag`\n" +"- :hg:`transplant`" + +msgid "" "``decode/encode``\n" "-----------------" msgstr "" @@ -16779,7 +17028,6 @@ "``decode/encode``\n" "-----------------" msgstr "" -"\n" "``decode/encode``\n" "-----------------" @@ -17799,8 +18047,14 @@ msgid "" "This section configures external merge tools to use for file-level\n" -"merges." -msgstr "ファイルå˜ä½ã®ãƒžãƒ¼ã‚¸ã‚’è¡Œã†å¤–部マージツールã®è¨å®šã€‚" +"merges. This section has likely been preconfigured at install time.\n" +"Use :hg:`config merge-tools` to check the existing configuration.\n" +"Also see :hg:`help merge-tools` for more details." +msgstr "" +"本セクションã¯ã€ ファイル毎ã®ãƒžãƒ¼ã‚¸å‡¦ç†ã®ãŸã‚ã®ã€ 外部ツールをè¨å®šã—ã¾ã™ã€‚\n" +"インストール時ã«äº‹å‰è¨å®šã•ã‚Œã¦ã„ã‚‹å¯èƒ½æ€§ã‚‚ã‚ã‚Šã¾ã™ã€‚ æ—¢å˜ã®è¨å®šå†…容ã¯ã€\n" +":hg:`config merge-tools` ã§ç¢ºèªã§ãã¾ã™ã€‚ è¨å®šã®è©³ç´°ã¯\n" +":hg:`help merge-tools` ã‚‚å‚ç…§ã—ã¦ãã ã•ã„。" msgid "Example ``~/.hgrc``::" msgstr "``~/.hgrc`` ã§ã®è¨å®šä¾‹ã‚’以下ã«ç¤ºã—ã¾ã™::" @@ -17823,6 +18077,13 @@ " kdiff3.priority = 1" msgid "" +" # Changing the priority of preconfigured tool\n" +" vimdiff.priority = 0" +msgstr "" +" # è¨å®šæ¸ˆã¿ãƒ„ール間ã§ã®å„ªå…ˆåº¦ã®å¤‰æ›´\n" +" vimdiff.priority = 0" + +msgid "" " # Define new tool\n" " myHtmlTool.args = -m $local $other $base $output\n" " myHtmlTool.regkey = Software\\FooSoftware\\HtmlMerge\n" @@ -17856,7 +18117,14 @@ "``args``\n" " The arguments to pass to the tool executable. You can refer to the\n" " files being merged as well as the output file through these\n" -" variables: ``$base``, ``$local``, ``$other``, ``$output``.\n" +" variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning\n" +" of ``$local`` and ``$other`` can vary depending on which action is being\n" +" performed. During and update or merge, ``$local`` represents the original\n" +" state of the file, while ``$other`` represents the commit you are " +"updating\n" +" to or the commit you are merging with. During a rebase ``$local``\n" +" represents the destination of the rebase, and ``$other`` represents the\n" +" commit being rebased.\n" " Default: ``$local $base $other``" msgstr "" "``args``\n" @@ -17860,9 +18128,15 @@ " Default: ``$local $base $other``" msgstr "" "``args``\n" -" 実行å¯èƒ½ãƒ•ã‚¡ã‚¤ãƒ«ã«æ¸¡ã•ã‚Œã‚‹å¼•æ•°ã€‚ ``$base``〠``$local``〠``$other``\n" -" ãŠã‚ˆã³ ``$output`` ã¨ã„ã†è¨˜è¿°ã§ã€ マージ対象ファイル群やã€\n" -" çµæžœãƒ•ã‚¡ã‚¤ãƒ«ã‚’指定å¯èƒ½ã§ã™ã€‚ デフォルト値: ``$local $base $other``" +" 実行時ã«ãƒ„ールã«æŒ‡å®šã•ã‚Œã‚‹å¼•æ•°ã€‚ ``$base``, ``$local``, ``$other``, \n" +" ``$output`` ã¨ã„ã£ãŸè¡¨è¨˜ã«ã‚ˆã‚Šã€ãƒžãƒ¼ã‚¸å¯¾è±¡ã‚„〠çµæžœæ ¼ç´å…ˆãƒ•ã‚¡ã‚¤ãƒ«ã‚‚ã€\n" +" 指定å¯èƒ½ã§ã™ã€‚ ``$local`` ã‚„ ``$other`` ã¯ã€ 実施ã™ã‚‹å‡¦ç†ã«å¿œã˜ã¦ã€\n" +" æ„味åˆã„ãŒå¤‰åŒ–ã—ã¾ã™ã€‚ update ã‚„ merge コマンドã®å ´åˆã€ ``$local``\n" +" ã¯ã‚³ãƒžãƒ³ãƒ‰å®Ÿæ–½å‰æ™‚点ã®ä½œæ¥é ˜åŸŸã®ã€ ``$other`` ã¯å¯¾è±¡ãƒªãƒ“ジョン時点ã®ã€\n" +" ãã‚Œãžã‚Œã®å†…容をä¿æŒã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’指ã—ã¾ã™ã€‚ 一方㧠rebase ã®å ´åˆã¯ã€\n" +" ``$local`` ㌠rebase 先〠``$other`` ㌠rebase 元リビジョン時点ã®ã€\n" +" ãã‚Œãžã‚Œã®å†…容をä¿æŒã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’指ã—ã¾ã™ã€‚デフォルト値:\n" +" ``$local $base $other``" msgid "" "``premerge``\n" @@ -18669,6 +18943,50 @@ " セクションã®èª¬æ˜Žã‚’å‚ç…§ã—ã¦ãã ã•ã„。" msgid "" +"``mergemarkers``\n" +" Sets the merge conflict marker label styling. The ``detailed``\n" +" style uses the ``mergemarkertemplate`` setting to style the labels.\n" +" The ``basic`` style just uses 'local' and 'other' as the marker label.\n" +" One of ``basic`` or ``detailed``.\n" +" Default is ``basic``." +msgstr "" +"``mergemarkers``\n" +" マージã§è¡çªãŒæ¤œå‡ºã•ã‚ŒãŸéš›ã«ã€ ファイルã«æŒ¿å…¥ã•ã‚Œã‚‹è¡çªãƒžãƒ¼ã‚¯ã®ã€\n" +" æƒ…å ±ãƒ©ãƒ™ãƒ«éƒ¨åˆ†ã®å½¢å¼ã€‚ ``detailed`` å½¢å¼ã§ã¯ ``mergemarkertemplate``\n" +" ã«ã‚ˆã‚‹ãƒ†ãƒ³ãƒ—レート定義ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚ ``basic`` å½¢å¼ã§ã¯ ``local``\n" +" ãŠã‚ˆã³ ``other`` ã ã‘ã®å˜ç´”ãªãƒ©ãƒ™ãƒ«ã«ãªã‚Šã¾ã™ã€‚上記ã®ã„ãšã‚Œã‹ã®ã¿ã€\n" +" 指定å¯èƒ½ã§ã™ã€‚デフォルト値: ``basic``" + +msgid "" +"``mergemarkertemplate``\n" +" The template used to print the commit description next to each conflict\n" +" marker during merge conflicts. See :hg:`help templates` for the " +"template\n" +" format.\n" +" Defaults to showing the hash, tags, branches, bookmarks, author, and\n" +" the first line of the commit description.\n" +" You have to pay attention to encodings of managed files, if you\n" +" use non-ASCII characters in tags, branches, bookmarks, author\n" +" and/or commit descriptions. At template expansion, non-ASCII\n" +" characters use the encoding specified by ``--encoding`` global\n" +" option, ``HGENCODING`` or other locale setting environment\n" +" variables. The difference of encoding between merged file and\n" +" conflict markers causes serious problem." +msgstr "" +"``mergemarkertemplate``\n" +" マージã§è¡çªãŒæ¤œå‡ºã•ã‚ŒãŸéš›ã«ã€ ファイルã«æŒ¿å…¥ã•ã‚Œã‚‹è¡çªãƒžãƒ¼ã‚¯ã®ã€\n" +" テンプレート機能ã«ã‚ˆã‚‹å®šç¾©ã€‚ テンプレート機能ãã®ã‚‚ã®ã«é–¢ã™ã‚‹è©³ç´°ã¯\n" +" :hg:`help templates` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。 デフォルトè¨å®šã§ã¯ã€\n" +" ãƒãƒƒã‚·ãƒ¥å€¤ã€ã‚¿ã‚°åã€ãƒ–ランãƒåã€ãƒ–ックマークã€ãƒ¦ãƒ¼ã‚¶åãŠã‚ˆã³ã€\n" +" コミットãƒã‚°ã®ä¸€è¡Œç›®ã‚’表示ã—ã¾ã™ã€‚ ã‚¿ã‚°åã€ãƒ–ランãƒåã€ãƒ–ックマークã€\n" +" ユーザå〠コミットãƒã‚°ã®ã„ãšã‚Œã‹ã§éž ASCII æ–‡å—を使用ã—ã¦ã„ã‚‹å ´åˆã¯ã€\n" +" マージ対象ファイルã®æ–‡å—コードã«ã€ 注æ„を払ã†å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚\n" +" テンプレート展開ã®éš›ã«ã€ éž ASCII æ–‡å—㯠``--encoding`` オプションã€\n" +" ``HGENCODING`` ã‚ã‚‹ã„ã¯å„種ãƒã‚±ãƒ¼ãƒ«ç’°å¢ƒå¤‰æ•°ã§æŒ‡å®šã•ã‚ŒãŸæ–‡å—コードã§ã€\n" +" 符å·åŒ–ã•ã‚Œã¾ã™ã€‚ マージ対象ファイルã®æ–‡å—コードã¨ç•°ãªã‚‹å ´åˆã€\n" +" æ–‡å—コード混在ã«ã‚ˆã‚‹æ·±åˆ»ãªå•é¡Œã‚’生ã˜ã¾ã™ã€‚" + +msgid "" "``portablefilenames``\n" " Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.\n" " Default is ``warn``.\n" @@ -22750,13 +23068,12 @@ msgid "" "Mercurial allows you to customize output of commands through\n" -"templates. You can either pass in a template from the command\n" -"line, via the --template option, or select an existing\n" -"template-style (--style)." -msgstr "" -"Mercurial ã§ã¯ã€ テンプレート機能ã«ã‚ˆã£ã¦ã‚³ãƒžãƒ³ãƒ‰ã®å‡ºåŠ›ã‚’カスタマイズ\n" -"ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ コマンドラインã‹ã‚‰ã®æŒ‡å®šã§ã¯ã€ --template ã«ã‚ˆã‚‹\n" -"テンプレート指定ã¨ã€ --style ã«ã‚ˆã‚‹ã‚¹ã‚¿ã‚¤ãƒ«æŒ‡å®šã®ä¸¡æ–¹ãŒä½¿ç”¨ã§ãã¾ã™ã€‚" +"templates. You can either pass in a template or select an existing\n" +"template-style from the command line, via the --template option." +msgstr "" +"Mercurial ã¯ã€ コマンド出力をテンプレート機能ã§ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚ºå¯èƒ½ã§ã™ã€‚\n" +"コマンドライン㮠--template オプション経由ã§ã€ テンプレート指定やã€\n" +"スタイル定義 (※ 訳注: åŒæ¢±ã®ã‚‚ã®ä»¥å¤–ã«ç‹¬è‡ªå®šç¾©å¯èƒ½) を指定ã§ãã¾ã™ã€‚" msgid "" "You can customize output for any \"log-like\" command: log,\n" @@ -22760,6 +23077,6 @@ msgid "" "You can customize output for any \"log-like\" command: log,\n" -"outgoing, incoming, tip, parents, heads and glog." +"outgoing, incoming, tip, parents, and heads." msgstr "" "「log çš„ã€ãªå‡ºåŠ›ã‚’è¡Œã†ä¸€é€£ã®ã‚³ãƒžãƒ³ãƒ‰å‡ºåŠ›ã‚’カスタマイズå¯èƒ½ã§ã™:\n" @@ -22764,19 +23081,16 @@ msgstr "" "「log çš„ã€ãªå‡ºåŠ›ã‚’è¡Œã†ä¸€é€£ã®ã‚³ãƒžãƒ³ãƒ‰å‡ºåŠ›ã‚’カスタマイズå¯èƒ½ã§ã™:\n" -"log, outgoing, incoming, tip, parents, heads, glog" - -msgid "" -"Five styles are packaged with Mercurial: default (the style used\n" -"when no explicit preference is passed), compact, changelog, phases\n" -"and xml.\n" -"Usage::" -msgstr "" -"Mercurial ã«ã¯ã€ default(明示的ãªæŒ‡å®šãŒç„¡ã„å ´åˆã®ã‚¹ã‚¿ã‚¤ãƒ«)〠compactã€\n" -"changelog〠phases〠ãŠã‚ˆã³ xml ã®5ã¤ã®ã‚¹ã‚¿ã‚¤ãƒ«è¨å®šãŒåŒæ¢±ã•ã‚Œã¦ã„ã¾ã™ã€‚\n" -"スタイルã®æŒ‡å®šæ–¹æ³•ã¯ä»¥ä¸‹ã®é€šã‚Š::" - -msgid " $ hg log -r1 --style changelog" -msgstr " $ hg log -r1 --style changelog" +"log, outgoing, incoming, tip, parents, heads" + +msgid "" +"Some built-in styles are packaged with Mercurial. These can be listed\n" +"with :hg:`log --template list`. Example usage::" +msgstr "" +"ã„ãã¤ã‹ã®ã‚¹ã‚¿ã‚¤ãƒ«å®šç¾©ãŒ Mercurial ã«åŒæ¢±ã•ã‚Œã¦ã„ã¾ã™ã€‚ スタイルã®ä¸€è¦§ã¯\n" +":hg:`log --template list` ã§è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ スタイル定義ã®åˆ©ç”¨ä¾‹::" + +msgid " $ hg log -r1.0::1.1 --template changelog" +msgstr " $ hg log -r1.0::1.1 --template changelog" msgid "" "A template is a piece of text, with markup to invoke variable\n" @@ -22873,9 +23187,12 @@ msgid "- shortest(node)" msgstr "- shortest(node)" +msgid "- startswith(string, text)" +msgstr "- startswith(string, text)" + msgid "- strip(text[, chars])" msgstr "- strip(text[, chars])" msgid "- sub(pat, repl, expr)" msgstr "- sub(pat, repl, expr)" @@ -22876,9 +23193,12 @@ msgid "- strip(text[, chars])" msgstr "- strip(text[, chars])" msgid "- sub(pat, repl, expr)" msgstr "- sub(pat, repl, expr)" +msgid "- word(number, text[, separator])" +msgstr "- word(number, text[, separator])" + msgid "Also, for any expression that returns a list, there is a list operator:" msgstr "ã¾ãŸã€ 列挙形å¼ã‚’返㙠expr ã«å¯¾ã—ã¦ã¯ã€ 以下ã®æ§˜ãªè¨˜è¿°ãŒå¯èƒ½ã§ã™:" @@ -22900,6 +23220,12 @@ msgid " $ hg log -r 0 --template \"files: {join(files, ', ')}\\n\"" msgstr " $ hg log -r 0 --template \"files: {join(files, ', ')}\\n\"" +msgid "- Modify each line of a commit description::" +msgstr "- コミットãƒã‚°ã®å„è¡Œã®è¡Œé ã«æ–‡å—ã‚’è¿½åŠ ::" + +msgid " $ hg log --template \"{splitlines(desc) % '**** {line}\\n'}\"" +msgstr " $ hg log --template \"{splitlines(desc) % '**** {line}\\n'}\"" + msgid "- Format date::" msgstr "- æ—¥æ™‚æƒ…å ±ã®æ•´å½¢::" @@ -22963,8 +23289,22 @@ msgid "- Mark the working copy parent with '@'::" msgstr "- 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョン㫠'@' を表示::" -msgid " $ hg log --template \"{ifcontains(rev, revset('.'), '@')}\\n\"\n" -msgstr " $ hg log --template \"{ifcontains(rev, revset('.'), '@')}\\n\"\n" +msgid " $ hg log --template \"{ifcontains(rev, revset('.'), '@')}\\n\"" +msgstr " $ hg log --template \"{ifcontains(rev, revset('.'), '@')}\\n\"" + +msgid "- Show only commit descriptions that start with \"template\"::" +msgstr "- \"template\" ã§å§‹ã¾ã‚‹ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã®ã¿ã‚’表示::" + +msgid "" +" $ hg log --template \"{startswith(\\\"template\\\", firstline(desc))}\\n\"" +msgstr "" +" $ hg log --template \"{startswith(\\\"template\\\", firstline(desc))}\\n\"" + +msgid "- Print the first word of each line of a commit message::" +msgstr "- コミットãƒã‚°ã®æœ€åˆã®èªžã®ã¿ã‚’表示::" + +msgid " $ hg log --template \"{word(\\\"0\\\", desc)}\\n\"\n" +msgstr " $ hg log --template \"{word(\\\"0\\\", desc)}\\n\"\n" msgid "Valid URLs are of the form::" msgstr "有効㪠URL 指定ã¯ä»¥ä¸‹ã®å½¢å¼ã§ã™::" @@ -23367,8 +23707,11 @@ msgid "working copy of .hgtags is changed (please commit .hgtags manually)" msgstr "作æ¥é ˜åŸŸã® .hgtags ãŒå¤‰æ›´ã•ã‚Œã¦ã„ã¾ã™ (手動ã§ã‚³ãƒŸãƒƒãƒˆã—ã¦ãã ã•ã„)" -msgid "abandoned transaction found - run hg recover" -msgstr "ä¸æ–トランザクションを検出 - 'hg recover' を実施ã—ã¦ãã ã•ã„" +msgid "abandoned transaction found" +msgstr "ä¸æ–トランザクションを検出ã—ã¾ã—ãŸ" + +msgid "run 'hg recover' to clean up transaction" +msgstr "æƒ…å ±ã‚’ç ´æ£„ã™ã‚‹å ´åˆã¯ 'hg recover' を実施ã—ã¦ãã ã•ã„" msgid "rolling back interrupted transaction\n" msgstr "ä¸æ–ã•ã‚ŒãŸãƒˆãƒ©ãƒ³ã‚¶ã‚¯ã‚·ãƒ§ãƒ³ã‚’ãƒãƒ¼ãƒ«ãƒãƒƒã‚¯ä¸\n" @@ -24549,9 +24892,6 @@ "``min(set)``\n" " 指定リビジョン群ä¸ã§ã€ リビジョン番å·ãŒæœ€å°ã®ã‚‚ã®ã€‚" -msgid "_missingancestors requires two arguments" -msgstr "_missingancestors ã®å¼•æ•°ã¯2ã¤ã§ã™" - msgid "" "``modifies(pattern)``\n" " Changesets modifying files matched by pattern." @@ -25324,6 +25664,17 @@ "リビジョン %s ã‚’åæ˜ ã§ãã¾ã›ã‚“。\n" #, python-format +msgid "" +"automatic .hgtags merge failed\n" +"the following %d tags are in conflict: %s\n" +msgstr "" +"タグファイルã®è‡ªå‹•ãƒžãƒ¼ã‚¸ã«å¤±æ•—ã—ã¾ã—ãŸã€‚\n" +"%d 個ã®ã‚¿ã‚°å®šç¾©ãŒè¡çªã—ã¦ã„ã¾ã™: %s\n" + +msgid ".hgtags merged successfully\n" +msgstr "タグファイルã®ãƒžãƒ¼ã‚¸ã«æˆåŠŸã—ã¾ã—ãŸ\n" + +#, python-format msgid "%s, line %s: %s\n" msgstr "%s %s行目: %s\n" @@ -25512,6 +25863,9 @@ msgid ":shortdate: Date. Returns a date like \"2006-09-18\"." msgstr ":shortdate: æ—¥æ™‚æƒ…å ±ã€‚ \"2006-09-18\" å½¢å¼ã§å¯èªåŒ–ã—ã¾ã™ã€‚" +msgid ":splitlines: Any text. Split text into a list of lines." +msgstr ":splitlines: æ–‡å—列。 æ–‡å—列を行ã®ãƒªã‚¹ãƒˆã«åˆ†å‰²ã—ã¾ã™ã€‚" + msgid "" ":stringify: Any type. Turns the value into text by converting values into\n" " text and concatenating them." @@ -25570,6 +25924,13 @@ msgid ":children: List of strings. The children of the changeset." msgstr ":children: æ–‡å—列列挙。 リビジョンã®å供。" +msgid "" +":currentbookmark: String. The active bookmark, if it is\n" +" associated with the changeset" +msgstr "" +":currentbookmark: æ–‡å—列. アクティブブックマーク (対象リビジョンã«å¯¾ã—ã¦ã€\n" +" 関連付ã‘られã¦ã„ã‚‹å ´åˆã®ã¿)" + msgid ":date: Date information. The date when the changeset was committed." msgstr ":date: æ—¥æ™‚æƒ…å ±ã€‚ リビジョンãŒè¨˜éŒ²ã•ã‚ŒãŸæ—¥æ™‚。" @@ -25672,6 +26033,9 @@ msgid ":rev: Integer. The repository-local changeset revision number." msgstr ":rev: 整数。 å„リãƒã‚¸ãƒˆãƒªå›ºæœ‰ã®ãƒªãƒ“ジョン番å·ã€‚" +msgid ":subrepos: List of strings. Updated subrepositories in the changeset." +msgstr ":subrepos: æ–‡å—列挙。 当該リビジョンã§æ›´æ–°ã•ã‚ŒãŸã‚µãƒ–リãƒã‚¸ãƒˆãƒªå。" + msgid ":tags: List of strings. Any tags associated with the changeset." msgstr ":tags: æ–‡å—列列挙。 当該リビジョンã«ä»˜ä¸Žã•ã‚ŒãŸã‚¿ã‚°ã®ä¸€è¦§ã€‚" @@ -25688,8 +26052,9 @@ msgid "unknown method '%s'" msgstr "未知ã®å‡¦ç† '%s' ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" -msgid "expected a symbol" -msgstr "シンボル指定ãŒå¿…è¦ã§ã™" +#, python-format +msgid "expected a symbol, got '%s'" +msgstr "シンボル (symbol) 指定ãŒå¿…è¦ã§ã™ (実際ã®æŒ‡å®šã¯ '%s')" #, python-format msgid "unknown function '%s'" @@ -25760,6 +26125,13 @@ msgid "sub expects three arguments" msgstr "sub ã¯å¼•æ•°ãŒ3ã¤å¿…è¦ã§ã™" +msgid "startswith expects two arguments" +msgstr "startswith ã®å¼•æ•°ã¯2ã¤ã§ã™" + +#, python-format +msgid "word expects two or three arguments, got %d" +msgstr "word ã¯2ã¾ãŸã¯3ã®å¼•æ•°ãŒå¿…è¦ã§ã™ (実際ã®å¼•æ•°ã¯ %d 個)" + msgid "unmatched quotes" msgstr "引用符ã®å¯¾å¿œé–¢ä¿‚ãŒä¸æ£ã§ã™"