diff --git a/i18n/ja.po b/i18n/ja.po index 7fcad0c4ef8c935428ee91b5c80996441f555fad_aTE4bi9qYS5wbw==..88546cc32d8fe3b8da568fe56187e6e82a31e178_aTE4bi9qYS5wbw== 100644 --- a/i18n/ja.po +++ b/i18n/ja.po @@ -114,6 +114,7 @@ # platform 稼åƒç’°å¢ƒ # pop(patch) (パッãƒã®)é©ç”¨è§£é™¤ # progress (, in) 未完了(interrupted rebase/graft/histedit/transplant) +# programming error 内部エラー # pruned xxxxx (obsoleted with no successors) xxxxxx # pull (è¿½åŠ ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã®)å–り込㿠# push (è¿½åŠ ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã®)åæ˜ @@ -159,8 +160,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2015-06-01 09:53+0900\n" -"PO-Revision-Date: 2015-06-01 10:28+0900\n" +"POT-Creation-Date: 2015-07-30 18:57+0900\n" +"PO-Revision-Date: 2015-07-31 18:37+0900\n" "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -1428,6 +1429,9 @@ msgid "must specify revision to censor" msgstr "検閲対象リビジョンを指定ã—ã¦ãã ã•ã„" +msgid "can only specify an explicit filename" +msgstr "明示的ãªãƒ•ã‚¡ã‚¤ãƒ«å以外ã¯æŒ‡å®šã§ãã¾ã›ã‚“" + msgid "cannot censor file with no history" msgstr "å±¥æ´ã®ãªã„ファイルã¯æ¤œé–²ã§ãã¾ã›ã‚“" @@ -1792,8 +1796,8 @@ " resolve.unresolved = red bold\n" " resolve.resolved = green bold" -msgid " bookmarks.current = green" -msgstr " bookmarks.current = green" +msgid " bookmarks.active = green" +msgstr " bookmarks.active = green" msgid "" " branches.active = none\n" @@ -2543,6 +2547,13 @@ " 効果をæŒã¡ã¾ã›ã‚“。 デフォルト値㯠False。" msgid "" +" :convert.git.remoteprefix: remote refs are converted as bookmarks with\n" +" ``convert.git.remoteprefix`` as a prefix followed by a /. The " +"default\n" +" is 'remote'." +msgstr "" + +msgid "" " Perforce Source\n" " ###############" msgstr "" @@ -2585,6 +2596,43 @@ " Mercurial å½¢å¼ã¸ã®å¤‰æ›\n" " ######################" +msgid "" +" The Mercurial destination will recognize Mercurial subrepositories in " +"the\n" +" destination directory, and update the .hgsubstate file automatically if " +"the\n" +" destination subrepositories contain the <dest>/<sub>/.hg/shamap file.\n" +" Converting a repository with subrepositories requires converting a " +"single\n" +" repository at a time, from the bottom up." +msgstr "" +" Mercurial å½¢å¼ã¸ã®å¤‰æ›ã§ã€ 変æ›å…ˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªé…下ã®ã‚µãƒ–リãƒã‚¸ãƒˆãƒªã«ã€\n" +" <dest>/<sub>/.hg/shamap ãŒã‚ã‚‹å ´åˆã€ 親リãƒã‚¸ãƒˆãƒªã® .hgsubstate ã¯ã€\n" +" 自動的ã«æ›´æ–°ã•ã‚Œã¾ã™ã€‚ サブリãƒã‚¸ãƒˆãƒªã‚’å«ã‚€ãƒªãƒã‚¸ãƒˆãƒªã®å¤‰æ›ã¯ã€\n" +" 個々ã®ãƒªãƒã‚¸ãƒˆãƒªã®å¤‰æ›ã‚’〠ボトムアップã§å®Ÿæ–½ã—ã¦ãã ã•ã„。" + +msgid "" +" An example showing how to convert a repository with subrepositories::" +msgstr " サブリãƒã‚¸ãƒˆãƒªã‚’å«ã‚€ãƒªãƒã‚¸ãƒˆãƒªã®å¤‰æ›ä¾‹ã‚’示ã—ã¾ã™::" + +msgid "" +" # so convert knows the type when it sees a non empty destination\n" +" $ hg init converted" +msgstr "" +" # 変æ›å…ˆ converted ㌠hg init 済ã¿ã§ã‚ã‚‹ã“ã¨ã‹ã‚‰\n" +" # converted ã¸ã® hg convert 実行ã®éš›ã«ã¯\n" +" # 変æ›å…ˆå½¢å¼ (= Mercurialå½¢å¼) ãŒè‡ªå‹•çš„ã«ç‰¹å®šã•ã‚Œã¾ã™\n" +" $ hg init converted" + +msgid "" +" $ hg convert orig/sub1 converted/sub1\n" +" $ hg convert orig/sub2 converted/sub2\n" +" $ hg convert orig converted" +msgstr "" +" $ hg convert orig/sub1 converted/sub1\n" +" $ hg convert orig/sub2 converted/sub2\n" +" $ hg convert orig converted" + msgid " The following options are supported:" msgstr " 以下ã®ã‚ªãƒ—ションを指定ã§ãã¾ã™:" @@ -2604,7 +2652,6 @@ msgid "" " :convert.hg.usebranchnames: preserve branch names. The default is\n" -" True.\n" -" " +" True." msgstr "" " :convert.hg.usebranchnames: 変æ›å…ƒã«ãŠã‘るブランãƒåã®ç¶æŒã®è¦å¦ã€‚\n" @@ -2609,6 +2656,34 @@ msgstr "" " :convert.hg.usebranchnames: 変æ›å…ƒã«ãŠã‘るブランãƒåã®ç¶æŒã®è¦å¦ã€‚\n" -" デフォルト値㯠True。\n" +" デフォルト値㯠True。" + +msgid "" +" :convert.hg.sourcename: records the given string as a 'convert_source' " +"extra\n" +" value on each commit made in the target repository. The default is " +"None." +msgstr "" +" :convert.hg.sourcename: 指定文å—列を extra メタデータ 'convert_source'\n" +" ã¨ã—ã¦å¤‰æ›å…ˆã®å„リビジョンã«è¨˜éŒ²ã—ã¾ã™ã€‚ デフォルト値: 無指定" + +msgid "" +" All Destinations\n" +" ################" +msgstr "" +" 全変æ›å…ˆå½¢å¼å…±é€š\n" +" ################" + +msgid " All destination types accept the following options:" +msgstr " 以下ã®ã‚ªãƒ—ションã¯ã€ å…¨ã¦ã®å¤‰æ›å…ˆå½¢å¼ã«å¯¾ã—ã¦æ°æ„›çŸ¥å¯èƒ½ã§ã™:" + +msgid "" +" :convert.skiptags: does not convert tags from the source repo to the " +"target\n" +" repo. The default is False.\n" +" " +msgstr "" +" :convert.skiptags: 変æ›å…ƒã‹ã‚‰å¤‰æ›å…ˆã¸ã®ã‚¿ã‚°æƒ…å ±ã®åæ˜ ã‚’æŠ‘æ¢ã—ã¾ã™ã€‚\n" +" デフォルト値: False\n" " " msgid "only return changes on specified branches" @@ -2828,6 +2903,9 @@ msgid "%s does not look like a CVS checkout" msgstr "%s 㯠CVS 作æ¥é ˜åŸŸã§ã¯ãªã„ã¨æ€ã‚ã‚Œã¾ã™" +msgid "cvs source does not support specifying multiple revs" +msgstr "cvs å½¢å¼ã‹ã‚‰ã®å¤‰æ›ã§ã¯ã€è¤‡æ•°ãƒªãƒ“ジョン指定ã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™" + #, python-format msgid "revision %s is not a patchset number" msgstr "リビジョン %s ã¯ãƒ‘ッãƒã‚»ãƒƒãƒˆç•ªå·ã§ã¯ã‚ã‚Šã¾ã›ã‚“" @@ -2992,6 +3070,10 @@ msgstr "git ã®ãƒ˜ãƒƒãƒ‰ãŒå–å¾—ã§ãã¾ã›ã‚“" #, python-format +msgid "cannot retrieve git head \"%s\"" +msgstr "git ã®ãƒ˜ãƒƒãƒ‰ \"%s\" å–å¾—ã§ãã¾ã›ã‚“" + +#, python-format msgid "cannot read %r object at %s" msgstr "%r オブジェクト㌠%s ã‹ã‚‰èªã¿è¾¼ã‚ã¾ã›ã‚“" @@ -3000,8 +3082,12 @@ msgstr "%r オブジェクト㌠%s ã‹ã‚‰èªã¿è¾¼ã‚ã¾ã›ã‚“: 想定外ã®ã‚µã‚¤ã‚º" #, python-format -msgid "cannot read submodules config file in %s" -msgstr "%s ã«ãŠã‘るサブモジュールã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ãŒèªã¿è¾¼ã‚ã¾ã›ã‚“" +msgid "warning: cannot read submodules config file in %s\n" +msgstr "è¦å‘Š: %s ã«ãŠã‘るサブモジュールã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ãŒèªã¿è¾¼ã‚ã¾ã›ã‚“\n" + +#, python-format +msgid "warning: unable to parse .gitmodules in %s\n" +msgstr "è¦å‘Š: %s ã«ãŠã‘ã‚‹ .gitmodules ã®è§£æžã«å¤±æ•—\n" msgid "convert from git do not support --full" msgstr "git ã‹ã‚‰ã®å¤‰æ›ã§ã¯ --full ã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™" @@ -3053,6 +3139,14 @@ msgid "pulling from %s into %s\n" msgstr "%s ã‹ã‚‰ %s ã«å–ã‚Šè¾¼ã¿ä¸\n" +#, python-format +msgid "no \".hgsubstate\" updates will be made for \"%s\"\n" +msgstr "\"%s\" ã® \".hgsubstate\" ã¯æ›´æ–°ã•ã‚Œã¾ã›ã‚“\n" + +#, python-format +msgid "%s is missing from %s/.hg/shamap\n" +msgstr "%s 㯠%s/.hg/shamap ä¸ã«ã¯ã‚ã‚Šã¾ã›ã‚“\n" + msgid "filtering out empty revision\n" msgstr "空リビジョンã®é™¤å¤–ä¸\n" @@ -3070,6 +3164,9 @@ "変æ›å…ˆãƒªãƒã‚¸ãƒˆãƒªã«ãƒªãƒ“ジョン %s ãŒã‚ã‚Šã¾ã›ã‚“(clonebranches=true ã§ã®æ¤œç´¢ã¯æœª" "実装ã§ã™)" +msgid "mercurial source does not support specifying multiple revisions" +msgstr "mercurial å½¢å¼ã‹ã‚‰ã®å¤‰æ›ã§ã¯ã€è¤‡æ•°ãƒªãƒ“ジョン指定ã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™" + #, python-format msgid "%s is not a valid start revision" msgstr "%s ã¯æ£ã—ã„開始リビジョンã§ã¯ã‚ã‚Šã¾ã›ã‚“" @@ -3081,6 +3178,9 @@ msgid "ignoring: %s\n" msgstr "例外を無視: %s\n" +msgid "monotone source does not support specifying multiple revs" +msgstr "monotone å½¢å¼ã‹ã‚‰ã®å¤‰æ›ã§ã¯ã€è¤‡æ•°ãƒªãƒ“ジョン指定ã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™" + #, python-format msgid "%s does not look like a monotone repository" msgstr "%s 㯠monotone å½¢å¼ã§ã¯ãªã„ã¨æ€ã‚ã‚Œã¾ã™" @@ -3131,9 +3231,12 @@ msgid "%s does not look like a P4 repository" msgstr "%s 㯠P4 å½¢å¼ã§ã¯ãªã„ã¨æ€ã‚ã‚Œã¾ã™" +msgid "p4 source does not support specifying multiple revisions" +msgstr "p4 å½¢å¼ã‹ã‚‰ã®å¤‰æ›ã§ã¯ã€è¤‡æ•°ãƒªãƒ“ジョン指定ã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™" + msgid "reading p4 views\n" msgstr "p4 ビューã®èªã¿è¾¼ã¿ä¸\n" msgid "collecting p4 changelists\n" msgstr "p4 ãƒã‚§ãƒ³ã‚¸ãƒªã‚¹ãƒˆã®åŽé›†ä¸\n" @@ -3134,9 +3237,13 @@ msgid "reading p4 views\n" msgstr "p4 ビューã®èªã¿è¾¼ã¿ä¸\n" msgid "collecting p4 changelists\n" msgstr "p4 ãƒã‚§ãƒ³ã‚¸ãƒªã‚¹ãƒˆã®åŽé›†ä¸\n" +#, python-format +msgid "cannot find source for copied file: %s@%s\n" +msgstr "複製元ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“: %s@%s\n" + msgid "convert from p4 do not support --full" msgstr "p4 ã‹ã‚‰ã®å¤‰æ›ã§ã¯ --full ã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™" @@ -3175,6 +3282,9 @@ msgid "%s does not look like a Subversion repository to libsvn version %s" msgstr "%s 㯠subversion å½¢å¼ã§ã¯ãªã„ã¨æ€ã‚ã‚Œã¾ã™ (libsvn ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s)" +msgid "subversion source does not support specifying multiple revisions" +msgstr "subversion å½¢å¼ã‹ã‚‰ã®å¤‰æ›ã§ã¯ã€è¤‡æ•°ãƒªãƒ“ジョン指定ã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™" + #, python-format msgid "svn: revision %s is not an integer" msgstr "svn: リビジョン %s ãŒæ•°å—ã§ã¯ã‚ã‚Šã¾ã›ã‚“" @@ -3910,6 +4020,13 @@ " 親リビジョン㌠null ã®å ´åˆã¯ tip ãŒå¯¾è±¡ã«ãªã‚Šã¾ã™ã€‚" msgid "" +" The ``gpg.cmd`` config setting can be used to specify the command\n" +" to run. A default key can be specified with ``gpg.key``." +msgstr "" +" ``gpg.cmd`` è¨å®šã«ã‚ˆã‚Šã€ 使用ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã‚’指定å¯èƒ½ã§ã™ã€‚\n" +" デフォルトã®éµã¯ ``gpg.key`` ã§æŒ‡å®šå¯èƒ½ã§ã™ã€‚" + +msgid "" " See :hg:`help dates` for a list of formats valid for -d/--date.\n" " " msgstr "" @@ -4139,6 +4256,6 @@ msgid "" " [hgk]\n" -" path=/location/of/hgk" +" path = /location/of/hgk" msgstr "" " [hgk]\n" @@ -4143,6 +4260,6 @@ msgstr "" " [hgk]\n" -" path=/location/of/hgk" +" path = /location/of/hgk" msgid "" "hgk can make use of the extdiff extension to visualize revisions.\n" @@ -4591,6 +4708,10 @@ msgid "%s: empty changeset\n" msgstr "%s: 空ã®ãƒªãƒ“ジョン\n" +#, python-format +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." @@ -4738,8 +4859,11 @@ msgstr "マージをå«ã‚€å±¥æ´ã¯ histedit ã®å¯¾è±¡ã«æŒ‡å®šã§ãã¾ã›ã‚“" #, python-format -msgid "cannot edit immutable changeset: %s" -msgstr "改変ä¸èƒ½ãªãƒªãƒ“ジョンãŒã‚ã‚Šã¾ã™: %s" +msgid "cannot edit public changeset: %s" +msgstr "public フェーズã®ãƒªãƒ“ジョンã¯æ”¹å¤‰ã§ãã¾ã›ã‚“: %s" + +msgid "see \"hg help phases\" for details" +msgstr "詳細㯠\"hg help phases\" å‚ç…§" #, python-format msgid "malformed line \"%s\"" @@ -5457,6 +5581,6 @@ msgstr "リビジョンã®å¤‰æ›ä¸" #, python-format -msgid "missing largefile '%s' from revision %s" +msgid "missing largefile for '%s' in %s" msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ« '%s' (リビジョン %s ç”±æ¥) ãŒã‚ã‚Šã¾ã›ã‚“" @@ -5461,5 +5585,8 @@ msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ« '%s' (リビジョン %s ç”±æ¥) ãŒã‚ã‚Šã¾ã›ã‚“" +msgid "all largefiles must be present locally" +msgstr "å…¨ã¦ã®å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ãŒãƒãƒ¼ã‚«ãƒ«ãƒªãƒã‚¸ãƒˆãƒªã«å˜åœ¨ã—ã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™" + #, python-format msgid "renamed/copied largefile %s becomes symlink" msgstr "改åï¼è¤‡è£½å¯¾è±¡ã®å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ« %s ãŒã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯åŒ–ã•ã‚Œã¦ã„ã¾ã™" @@ -6058,8 +6185,8 @@ msgstr "パッãƒåã®æœ€åˆã®æ–‡å—ã« \"%s\" ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“" #, python-format -msgid "\"%s\" cannot be used in the name of a patch" -msgstr "\"%s\" ã‚’å«ã‚€åå‰ã¯ãƒ‘ッãƒåã«ä½¿ç”¨ã§ãã¾ã›ã‚“" +msgid "%r cannot be used in the name of a patch" +msgstr "%r ã‚’å«ã‚€åå‰ã¯ãƒ‘ッãƒåã«ä½¿ç”¨ã§ãã¾ã›ã‚“" #, python-format msgid "\"%s\" already exists as a directory" @@ -6174,11 +6301,8 @@ msgid "popping would remove a revision not managed by this patch queue" msgstr "管ç†å¯¾è±¡å¤–ã®ãƒªãƒ“ジョンãŒè§£é™¤å¯¾è±¡ã«æŒ‡å®šã•ã‚Œã¾ã—ãŸ" -msgid "popping would remove an immutable revision" -msgstr "é©ç”¨è§£é™¤å¯¾è±¡ã¯æ”¹å¤‰ä¸èƒ½ãƒªãƒ“ジョンã§ã™" - -msgid "see \"hg help phases\" for details" -msgstr "詳細㯠\"hg help phases\" å‚ç…§" +msgid "popping would remove a public revision" +msgstr "é©ç”¨è§£é™¤å¯¾è±¡ã¯ public フェーズã®ãƒªãƒ“ジョンã§ã™" msgid "deletions found between repo revs" msgstr "リビジョン間ã§å‰Šé™¤ãŒæ¤œå‡ºã•ã‚Œã¾ã—ãŸ" @@ -6193,8 +6317,8 @@ msgid "cannot refresh a revision with children" msgstr "ヘッド以外㯠qrefresh ã®å¯¾è±¡ã«æŒ‡å®šã§ãã¾ã›ã‚“" -msgid "cannot refresh immutable revision" -msgstr "改変ä¸èƒ½ãƒªãƒ“ジョン㯠qrefresh ã§ãã¾ã›ã‚“" +msgid "cannot refresh public revision" +msgstr "public フェーズã®ãƒªãƒ“ジョン㯠qrefresh ã§ãã¾ã›ã‚“" msgid "" "refresh interrupted while patch was popped! (revert --all, qpush to " @@ -8161,96 +8285,17 @@ msgid "writing" msgstr "書ã出ã—ä¸" -msgid "show progress bars for some actions" -msgstr "処ç†ã«ãŠã‘る進æ—率ã®è¡¨ç¤º" - -msgid "" -"This extension uses the progress information logged by hg commands\n" -"to draw progress bars that are as informative as possible. Some progress\n" -"bars only offer indeterminate information, while others have a definite\n" -"end point." -msgstr "" -"本エクステンションã¯ã€ hg コマンドã‹ã‚‰ã®é€²æ—æƒ…å ±ã‚’å…ƒã«ã€\n" -"å¯èƒ½ãªé™ã‚Šæœ‰ç›Šãªé€²æ—率を表示ã—ã¾ã™ã€‚ 多ãã®å‡¦ç†ã§ã®é€²æ—率表示ãŒã€\n" -"明確ãªå‡¦ç†ç·é‡ã«åŸºã¥ã„ã¦ã„る一方ã§ã€ ã„ãã¤ã‹ã®å‡¦ç†ã«ãŠã„ã¦ã¯ã€\n" -"ä¸ç¢ºå®šãªæƒ…å ±ã«åŸºã¥ã„ãŸé€²æ—率を表示ã™ã‚‹å ´åˆã‚‚ã‚ã‚Šã¾ã™ã€‚" - -msgid "The following settings are available::" -msgstr "指定å¯èƒ½ãªè¨å®šã¯ä»¥ä¸‹ã®é€šã‚Šã§ã™::" - -msgid "" -" [progress]\n" -" delay = 3 # number of seconds (float) before showing the progress bar\n" -" changedelay = 1 # changedelay: minimum delay before showing a new topic.\n" -" # If set to less than 3 * refresh, that value will\n" -" # be used instead.\n" -" refresh = 0.1 # time in seconds between refreshes of the progress bar\n" -" format = topic bar number estimate # format of the progress bar\n" -" width = <none> # if set, the maximum width of the progress information\n" -" # (that is, min(width, term width) will be used)\n" -" clear-complete = True # clear the progress bar after it's done\n" -" disable = False # if true, don't show a progress bar\n" -" assume-tty = False # if true, ALWAYS show a progress bar, unless\n" -" # disable is given" -msgstr "" -" [progress]\n" -" delay = 3 # 進æ—率表示ã¾ã§ã®çŒ¶äºˆç§’æ•° (浮動å°æ•°æŒ‡å®š)\n" -" changedelay = 1 # æ–°è¦ãƒˆãƒ”ック表示ã¾ã§ã®æœ€å°çŒ¶äºˆæ™‚間。\n" -" # 3 * refresh よりもå°ã•ã„値ã®å ´åˆã¯ã€\n" -" # ã“ã®è¨å®šã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚\n" -" refresh = 0.1 # 進æ—率表示更新間隔ã®ç§’æ•°\n" -" format = topic bar number estimate # 進æ—率表示ã®å½¢å¼æŒ‡å®š\n" -" width = <none> # 進æ—率表示ã®æœ€å¤§ã‚«ãƒ©ãƒ æ•°\n" -" # (width è¨å®šã¨ç”»é¢å¹…ã®å°ã•ã„æ–¹ãŒæœ‰åŠ¹ã«ãªã‚Šã¾ã™)\n" -" clear-complete = True # 実行完了時ã®é€²æ—率表示クリアã®æœ‰ç„¡\n" -" disable = False # 真値ãŒè¨å®šã•ã‚ŒãŸå ´åˆã€é€²æ—率ã¯è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“\n" -" assume-tty = False # 真値ãŒè¨å®šã•ã‚ŒãŸå ´åˆã€ disable ãŒæŒ‡å®šã•ã‚Œãªã„é™ã‚Š\n" -" # 常ã«é€²æ—率ãŒè¡¨ç¤ºã•ã‚Œã¾ã™" - -msgid "" -"Valid entries for the format field are topic, bar, number, unit,\n" -"estimate, speed, and item. item defaults to the last 20 characters of\n" -"the item, but this can be changed by adding either ``-<num>`` which\n" -"would take the last num characters, or ``+<num>`` for the first num\n" -"characters.\n" -msgstr "" -"format 指定ã§æœ‰åŠ¹ãªè¦ç´ 㯠topic bar number unit estimate speed item\n" -"ã§ã™ã€‚ デフォルト㮠item ã¯æœ«å°¾ 20 æ–‡å—ã§ã™ãŒã€ ``-<num>`` (末尾 num\n" -"æ–‡å—) ã‚„ ``+<num>`` (冒é num æ–‡å—) 指定ã®è¿½åŠ ã§å¤‰æ›´å¯èƒ½ã§ã™ã€‚\n" - -#. i18n: format XX seconds as "XXs" -#, python-format -msgid "%02ds" -msgstr "%02d秒" - -#. i18n: format X minutes and YY seconds as "XmYYs" -#, python-format -msgid "%dm%02ds" -msgstr "%d分%02d秒" - -#. i18n: format X hours and YY minutes as "XhYYm" -#, python-format -msgid "%dh%02dm" -msgstr "%d時間%02d分" - -#. i18n: format X days and YY hours as "XdYYh" -#, python-format -msgid "%dd%02dh" -msgstr "%dæ—¥%02d時間" - -#. i18n: format X weeks and YY days as "XwYYd" -#, python-format -msgid "%dw%02dd" -msgstr "%d週%02dæ—¥" - -#. i18n: format X years and YY weeks as "XyYYw" -#, python-format -msgid "%dy%02dw" -msgstr "%då¹´%02d週" - -#, python-format -msgid "%d %s/sec" -msgstr "%d %s/秒" +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 "作æ¥é ˜åŸŸä¸ã®æœªç™»éŒ²ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰" @@ -8670,8 +8715,8 @@ msgstr "移動ã®å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“\n" #, python-format -msgid "can't rebase immutable changeset %s" -msgstr "改変ä¸èƒ½ãªãƒªãƒ“ジョン %s ã¯ç§»å‹•ã§ãã¾ã›ã‚“" +msgid "can't rebase public changeset %s" +msgstr "public フェーズã®ãƒªãƒ“ジョン %s ã¯ç§»å‹•ã§ãã¾ã›ã‚“" #, python-format msgid "reopening closed branch head %s\n" @@ -8741,8 +8786,8 @@ msgstr "実施ä¸ã® rebase ã«ã‚ˆã‚‹ç§»å‹•ã¯ã‚ã‚Šã¾ã›ã‚“" #, python-format -msgid "warning: can't clean up immutable changesets %s\n" -msgstr "è¦å‘Š: 改変ä¸èƒ½ãªãƒªãƒ“ジョン %s ã¯ç ´æ£„ã§ãã¾ã›ã‚“\n" +msgid "warning: can't clean up public changesets %s\n" +msgstr "è¦å‘Š: public フェーズã®ãƒªãƒ“ジョン %s ã¯ç ´æ£„ã§ãã¾ã›ã‚“\n" msgid "warning: new changesets detected on target branch, can't strip\n" msgstr "è¦å‘Š: 想定外ã®æ–°è¦ãƒªãƒ“ã‚¸ãƒ§ãƒ³è¿½åŠ ã«ã‚ˆã‚Šã€å¯¾è±¡ãƒ–ランãƒã‚’ç ´æ£„ã§ãã¾ã›ã‚“\n" @@ -8850,6 +8895,10 @@ msgid " This command is not available when committing a merge." msgstr " 本コマンドをマージã®ã‚³ãƒŸãƒƒãƒˆã«ä½¿ç”¨ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。" +#, python-format +msgid "running non-interactively, use %s instead" +msgstr "éžå¯¾è©±çš„ã«å®Ÿè¡Œã™ã‚‹å ´åˆã¯ã€%s を使用ã—ã¦ãã ã•ã„" + msgid "hg qrecord [OPTION]... PATCH [FILE]..." msgstr "hg qrecord [OPTION]... PATCH [FILE]..." @@ -9056,6 +9105,77 @@ msgid "share a common history between several working directories" msgstr "複数作æ¥é ˜åŸŸã«ã‚ˆã‚‹å±¥æ´æƒ…å ±é ˜åŸŸã®å…±æœ‰" +msgid "" +"Automatic Pooled Storage for Clones\n" +"-----------------------------------" +msgstr "" +"複製時ã®å±¥æ´ç®¡ç†æƒ…å ±ã®å…±æœ‰é ˜åŸŸè‡ªå‹•ä½œæˆ\n" +"--------------------------------------" + +msgid "" +"When this extension is active, :hg:`clone` can be configured to\n" +"automatically share/pool storage across multiple clones. This\n" +"mode effectively converts :hg:`clone` to :hg:`clone` + :hg:`share`.\n" +"The benefit of using this mode is the automatic management of\n" +"store paths and intelligent pooling of related repositories." +msgstr "" +"本エクステンションãŒæœ‰åŠ¹ãªå ´åˆã€ :hg:`clone` ã§ã®ãƒªãƒã‚¸ãƒˆãƒªè¤‡è£½ã®éš›ã«ã€\n" +"複数ã®ãƒãƒ¼ã‚«ãƒ«ãƒªãƒã‚¸ãƒˆãƒªé–“ã§ã€ å±¥æ´æƒ…å ±ã‚’å…±æœ‰ã™ã‚‹ãŸã‚ã®å±¥æ´å…±æœ‰é ˜åŸŸãŒã€\n" +"自動的ã«ä½œæˆã§ãるよã†ã«ãªã‚Šã¾ã™ (※ 訳注: 実際ã®å…±æœ‰é ˜åŸŸã®ä½œæˆã®æœ‰ç„¡ã¯ã€\n" +"後述ã™ã‚‹ ``share.pool`` è¨å®šã®æœ‰ç„¡ã«å¿œã˜ã¾ã™)。 ã“ã®å ´åˆã€ :hg:`clone` ã¯\n" +":hg:`clone` + :hg:`share` 相当を (効率的ã«) 実施ã—ã¾ã™ã€‚ ã“ã®æ©Ÿèƒ½ã«ã‚ˆã‚Šã€\n" +"ç”±æ¥ã®åŒã˜ãƒªãƒã‚¸ãƒˆãƒªã®å±¥æ´ç®¡ç†æƒ…å ±ãŒã€ 効率的ã«å…±æœ‰ç®¡ç†ã•ã‚Œã¾ã™ã€‚" + +msgid "The following ``share.`` config options influence this feature:" +msgstr "以下㮠``share.`` セクションè¨å®šãŒã€ã“ã®æ©Ÿèƒ½ã‚’制御ã—ã¾ã™:" + +msgid "" +"``share.pool``\n" +" Filesystem path where shared repository data will be stored. When\n" +" defined, :hg:`clone` will automatically use shared repository\n" +" storage instead of creating a store inside each clone." +msgstr "" +"``share.pool``\n" +" 共有用履æ´æƒ…å ±ç®¡ç†é ˜åŸŸã®ä½œæˆå…ˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãƒ‘ス。 ã“ã®å€¤ã®è¨å®šæ™‚ã¯ã€\n" +" :hg:`clone` 時ã«ã€ å„複製リãƒã‚¸ãƒˆãƒªæ¯Žã«å±¥æ´æƒ…å ±ç®¡ç†é ˜åŸŸã‚’作æˆã›ãšã«ã€\n" +" ã“ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªé…下ã®å±¥æ´ç®¡ç†é ˜åŸŸã‚’〠共有ã™ã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™\n" +" (※ 訳注: 対応ã™ã‚‹ç®¡ç†é ˜åŸŸãŒç„¡ã„å ´åˆã¯ã€ ã“ã®é…下ã«ä½œæˆã—ãŸä¸Šã§ã€\n" +" clone 先リãƒã‚¸ãƒˆãƒªã‹ã‚‰ã€ ãã®é ˜åŸŸã‚’共有ã™ã‚‹ã‚ˆã†ã«ã—ã¾ã™)" + +msgid "" +"``share.poolnaming``\n" +" How directory names in ``share.pool`` are constructed." +msgstr "" +"``share.poolnaming``\n" +" ``share.pool`` é…下ã§ã®å±¥æ´ç®¡ç†é ˜åŸŸã®å‘½åæ–¹å¼ã€‚" + +msgid "" +" \"identity\" means the name is derived from the first changeset in the\n" +" repository. In this mode, different remotes share storage if their\n" +" root/initial changeset is identical. In this mode, the local shared\n" +" repository is an aggregate of all encountered remote repositories." +msgstr "" +" \"identity\" ãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã€ ``share.pool`` é…下ã«ãŠã„ã¦ã€\n" +" å„å±¥æ´ç®¡ç†é ˜åŸŸã‚’作æˆï¼å‚ç…§ã™ã‚‹éš›ã®ã€ è˜åˆ¥ç”¨ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªåã¨ã—ã¦ã€\n" +" å±¥æ´ã®æœ€åˆã®ãƒªãƒ“ジョンã®ãƒãƒƒã‚·ãƒ¥å€¤ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚ ã“ã®è¨å®šã®å ´åˆã€\n" +" 最åˆã®ãƒªãƒ“ジョンãŒä¸€è‡´ã™ã‚‹ãªã‚‰ã€ ç•°ãªã‚‹ãƒªãƒ¢ãƒ¼ãƒˆãƒªãƒã‚¸ãƒˆãƒªã®è¤‡è£½ã§ã‚‚ã€\n" +" åŒä¸€ç®¡ç†é ˜åŸŸã‚’共有ã—ã¾ã™ã€‚ 共有管ç†é ˜åŸŸã«ã¯ã€ åŒä¸€ç”±æ¥ã®ãƒªãƒã‚¸ãƒˆãƒªã®ã€\n" +" å±¥æ´æƒ…å ±ãŒé›†ç´„ã•ã‚Œã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚" + +msgid "" +" \"remote\" means the name is derived from the source repository's\n" +" path or URL. In this mode, storage is only shared if the path or URL\n" +" requested in the :hg:`clone` command matches exactly to a repository\n" +" that was cloned before." +msgstr "" +" \"remote\" ãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã€ 共有用履æ´ç®¡ç†é ˜åŸŸã®ä½œæˆï¼å‚ç…§ã«ã¯ã€\n" +" 複製元ã®ãƒ‘スや URL ãŒä½¿ç”¨ã•ã‚Œã¾ã™ (※ 訳注: 実際ã«ã¯ã€ã€Œè¤‡è£½å…ƒã®ãƒ‘スや\n" +" URLã€ã‹ã‚‰ç®—出ã—ãŸãƒãƒƒã‚·ãƒ¥å€¤)。 :hg:`clone` ã«æŒ‡å®šã—ãŸè¤‡è£½å…ƒã®ãƒ‘スや\n" +" URL ãŒä¸€è‡´ã—ãŸå ´åˆã®ã¿ã€ å±¥æ´ç®¡ç†é ˜åŸŸãŒå…±æœ‰ã•ã‚Œã¾ã™ã€‚" + +msgid " The default naming mode is \"identity.\"\n" +msgstr " デフォルトã®è¨å®šã¯ \"identity.\" ã§ã™ã€‚\n" + msgid "do not create a working directory" msgstr "作æ¥é ˜åŸŸã¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å–り出ã—を抑æ¢ã—ã¾ã™" @@ -9178,6 +9298,14 @@ msgid "no shelved changes specified!" msgstr "退é¿æƒ…å ±åãŒç„¡æŒ‡å®šã§ã™!" +#, python-format +msgid "--%s expects a single shelf" +msgstr "--%s ã«ã¯å˜ä¸€é€€é¿æƒ…å ±ã®ã¿ãŒæŒ‡å®šã§ãã¾ã™" + +#, python-format +msgid "cannot find shelf %s" +msgstr "退é¿æƒ…å ± %s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" + msgid "working directory parents do not match unshelve state" msgstr "作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンãŒã€å¾©æ—§é–‹å§‹æ™‚点ã¨ç•°ãªã‚Šã¾ã™" @@ -9222,8 +9350,11 @@ msgid "" " If a shelved change is applied successfully, the bundle that\n" -" contains the shelved changes is deleted afterwards." -msgstr " 退é¿å†…容ã®å¾©æ—§ãŒå®Œäº†ã—ãŸãªã‚‰ã€ 対応ã™ã‚‹é€€é¿æƒ…å ±ã¯ç ´æ£„ã•ã‚Œã¾ã™ã€‚" +" contains the shelved changes is moved to a backup location\n" +" (.hg/shelve-backup)." +msgstr "" +" 退é¿å†…容を復旧ã—終ãˆãŸå¾Œã€ 退é¿æƒ…å ±ã¯ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—é ˜åŸŸã«ç§»å‹•ã•ã‚Œã¾ã™\n" +" (.hg/shelve-backup)。" msgid "" " Since you can restore a shelved change on top of an arbitrary\n" @@ -9231,9 +9362,9 @@ " between your changes and the commits you are unshelving onto. If\n" " this occurs, you must resolve the conflict, then use\n" " ``--continue`` to complete the unshelve operation. (The bundle\n" -" will not be deleted until you successfully complete the unshelve.)" +" will not be moved until you successfully complete the unshelve.)" msgstr "" " ä»»æ„ã®æ™‚点ã§é€€é¿å†…容を復旧ã§ãã‚‹ãŸã‚〠作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã¨ã€\n" " 退é¿å†…容ã®çµ„ã¿åˆã‚ã›æ¬¡ç¬¬ã§ã¯ã€ 変更内容ãŒè¡çªã™ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。\n" " ãã®å ´åˆã¯ã€ è¡çªè§£æ¶ˆå¾Œã« :hg:`unshelve --continue` を実行ã—ã¦ã€\n" " 復旧処ç†ã‚’完了ã•ã›ã¦ãã ã•ã„。 (復旧処ç†ãŒå®Œäº†ã™ã‚‹ã¾ã§ã¯ã€\n" @@ -9235,10 +9366,10 @@ msgstr "" " ä»»æ„ã®æ™‚点ã§é€€é¿å†…容を復旧ã§ãã‚‹ãŸã‚〠作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã¨ã€\n" " 退é¿å†…容ã®çµ„ã¿åˆã‚ã›æ¬¡ç¬¬ã§ã¯ã€ 変更内容ãŒè¡çªã™ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。\n" " ãã®å ´åˆã¯ã€ è¡çªè§£æ¶ˆå¾Œã« :hg:`unshelve --continue` を実行ã—ã¦ã€\n" " 復旧処ç†ã‚’完了ã•ã›ã¦ãã ã•ã„。 (復旧処ç†ãŒå®Œäº†ã™ã‚‹ã¾ã§ã¯ã€\n" -" 退é¿æƒ…å ±ã¯ç ´æ£„ã•ã‚Œã¾ã›ã‚“)" +" 退é¿æƒ…å ±ã¯ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—é ˜åŸŸã«ç§»å‹•ã•ã‚Œã¾ã›ã‚“)" msgid "" " (Alternatively, you can use ``--abort`` to abandon an unshelve\n" " that causes a conflict. This reverts the unshelved changes, and\n" @@ -9241,9 +9372,8 @@ msgid "" " (Alternatively, you can use ``--abort`` to abandon an unshelve\n" " that causes a conflict. This reverts the unshelved changes, and\n" -" does not delete the bundle.)\n" -" " +" leaves the bundle in place.)" msgstr "" " (:hg:`unshelve --abort` 実行ã«ã‚ˆã‚Šã€ è¡çªãŒç™ºç”Ÿã—ãŸå¾©æ—§å‡¦ç†ã‚’ã€\n" " ä¸æ¢ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ ãã®å ´åˆã€ 作æ¥é ˜åŸŸä¸ã®å¤‰æ›´ã¯ç ´æ£„ã•ã‚Œã¾ã™ãŒã€\n" @@ -9247,7 +9377,28 @@ msgstr "" " (:hg:`unshelve --abort` 実行ã«ã‚ˆã‚Šã€ è¡çªãŒç™ºç”Ÿã—ãŸå¾©æ—§å‡¦ç†ã‚’ã€\n" " ä¸æ¢ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ ãã®å ´åˆã€ 作æ¥é ˜åŸŸä¸ã®å¤‰æ›´ã¯ç ´æ£„ã•ã‚Œã¾ã™ãŒã€\n" -" 退é¿æƒ…å ±ã¯ä¿æŒã•ã‚Œã¾ã™)\n" +" 退é¿æƒ…å ±ã¯ä¿æŒã•ã‚Œã¾ã™)" + +msgid "" +" After a successful unshelve, the shelved changes are stored in a\n" +" backup directory. Only the N most recent backups are kept. N\n" +" defaults to 10 but can be overridden using the ``shelve.maxbackups``\n" +" configuration option." +msgstr "" +" 退é¿å†…容を復旧ã—終ãˆãŸå¾Œã€ 退é¿æƒ…å ±ã¯ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—é ˜åŸŸã§ä¿æŒã•ã‚Œã¾ã™ã€‚\n" +" ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—é ˜åŸŸã«ä¿æŒã•ã‚Œã‚‹é€€é¿æƒ…å ±ã®æœ€å¤§æ•°ã¯ ``shelve.maxbackups``\n" +" è¨å®šã§æŒ‡å®šã§ãã¾ã™ï¼ˆãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå€¤: 10)" + +msgid "" +" Timestamp in seconds is used to decide order of backups. More\n" +" than ``maxbackups`` backups are kept, if same timestamp\n" +" prevents from deciding exact order of them, for safety.\n" +" " +msgstr "" +" ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã®é †åºã¯ã€ タイムスタンプ (å˜ä½:秒) ã§åˆ¤å®šã—ã¾ã™ã€‚\n" +" 複数ã®é€€é¿æƒ…å ±ãŒã€ åŒä¸€ã®ã‚¿ã‚¤ãƒ スタンプをæŒã¤å ´åˆã¯ã€\n" +" é †åºã‚’確定ã§ããªã„ãŸã‚〠``maxbackups`` よりも多ãã®é€€é¿æƒ…å ±ãŒã€\n" +" ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—é ˜åŸŸã«ä¿æŒã•ã‚Œã‚‹å¯èƒ½æ€§ã‚‚ã‚ã‚Šã¾ã™ã€‚\n" " " msgid "cannot combine abort/continue with naming a shelved change" @@ -9302,8 +9453,8 @@ msgid "show patch" msgstr "パッãƒå½¢å¼ã§ã®è¡¨ç¤º" -msgid "interactive mode, only works while creating a shelve(EXPERIMENTAL)" -msgstr "対話的ãªé€€é¿å¯¾è±¡ã®é¸æŠž (退é¿å®Ÿæ–½æ™‚ã®ã¿æŒ‡å®šå¯èƒ½) (実験的実装)" +msgid "interactive mode, only works while creating a shelve" +msgstr "対話的ãªé€€é¿å¯¾è±¡ã®é¸æŠž (退é¿å®Ÿæ–½æ™‚ã®ã¿æŒ‡å®šå¯èƒ½)" msgid "output diffstat-style summary of changes" msgstr "diffstat å½¢å¼ã®å¤‰æ›´æ¦‚è¦ã‚’出力" @@ -9375,10 +9526,6 @@ msgid "cannot specify names when using '--cleanup'" msgstr "退é¿æƒ…å ±ã®åå‰æŒ‡å®šã¯ '--cleanup' ã¨ä½µç”¨ã§ãã¾ã›ã‚“" -#, python-format -msgid "option '--%s' may not be used when shelving a change" -msgstr "オプション '--%s' ã¯å¤‰æ›´é€€é¿æ™‚ã«ã¯æŒ‡å®šã§ãã¾ã›ã‚“" - msgid "unshelve already in progress" msgstr "unshelve ã«ã‚ˆã‚‹é€€é¿æƒ…å ±å¾©æ—§ãŒæœªå®Œäº†ã§ã™" @@ -10028,10 +10175,6 @@ msgstr "ä¸æ£ãª .hg/bookmarks 記述行: %r\n" #, python-format -msgid "branch %s not found" -msgstr "ブランム%s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" - -#, python-format msgid "updating to active bookmark %s\n" msgstr "アクティブãªãƒ–ックマーク %s ã¸ã®æ›´æ–°ä¸\n" @@ -10040,6 +10183,10 @@ msgstr "連æºå…ˆã§ã®æ–°è¦ãƒ–ックマーク %s ã‚’è¿½åŠ ä¸\n" #, python-format +msgid "remote bookmark %s points to locally missing %s\n" +msgstr "連æºå…ˆã®ãƒ–ックマーク %s ã¯ãƒªãƒã‚¸ãƒˆãƒªã«å˜åœ¨ã—ãªã„ %s ã‚’å‚ç…§\n" + +#, python-format msgid "importing bookmark %s\n" msgstr "ブックマーク %s ã®å–ã‚Šè¾¼ã¿ä¸\n" @@ -10222,9 +10369,8 @@ msgid "the name '%s' is reserved" msgstr "ã‚¿ã‚°å '%s' ã¯ã‚·ã‚¹ãƒ†ãƒ ã§äºˆç´„ã•ã‚Œã¦ã„ã¾ã™" -#, python-format -msgid "running non-interactively, use %s instead" -msgstr "éžå¯¾è©±çš„ã«å®Ÿè¡Œã™ã‚‹å ´åˆã¯ã€%s を使用ã—ã¦ãã ã•ã„" +msgid "running non-interactively" +msgstr "éžå¯¾è©±çš„ãªå®Ÿè¡Œä¸" msgid "cannot partially commit a merge (use \"hg commit\" instead)" msgstr "マージã®éƒ¨åˆ†ã‚³ãƒŸãƒƒãƒˆã¯ã§ãã¾ã›ã‚“ (\"hg commit\" を使用ã—ã¦ãã ã•ã„)" @@ -10256,6 +10402,9 @@ msgid "cannot specify --changelog and --manifest at the same time" msgstr "--changelog 㨠--manifest ã¯åŒæ™‚ã«ã¯æŒ‡å®šã§ãã¾ã›ã‚“" +msgid "cannot specify --changelog and --dir at the same time" +msgstr "--changelog 㨠--dir ã¯åŒæ™‚ã«ã¯æŒ‡å®šã§ãã¾ã›ã‚“" + msgid "cannot specify filename with --changelog or --manifest" msgstr "--changelog ã¾ãŸã¯ --manifest ã¨ãƒ•ã‚¡ã‚¤ãƒ«åã¯åŒæ™‚ã«æŒ‡å®šã§ãã¾ã›ã‚“" @@ -10259,8 +10408,11 @@ msgid "cannot specify filename with --changelog or --manifest" msgstr "--changelog ã¾ãŸã¯ --manifest ã¨ãƒ•ã‚¡ã‚¤ãƒ«åã¯åŒæ™‚ã«æŒ‡å®šã§ãã¾ã›ã‚“" -msgid "cannot specify --changelog or --manifest without a repository" -msgstr "--changelog ã¾ãŸã¯ --manifest ã®æŒ‡å®šã¯ãƒªãƒã‚¸ãƒˆãƒªæŒ‡å®šãŒå¿…è¦ã§ã™" +msgid "cannot specify --changelog or --manifest or --dir without a repository" +msgstr "--changelog/--manifest/--dir 指定時ã¯ãƒªãƒã‚¸ãƒˆãƒªæŒ‡å®šãŒå¿…è¦ã§ã™" + +msgid "--dir can only be used on repos with treemanifest enabled" +msgstr "--dir 㯠treemanifest ãŒæœ‰åŠ¹ãªãƒªãƒã‚¸ãƒˆãƒªã§ã®ã¿ä½¿ç”¨å¯èƒ½ã§ã™" msgid "invalid arguments" msgstr "引数ãŒä¸æ£ã§ã™" @@ -10435,13 +10587,6 @@ 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" @@ -10584,6 +10729,14 @@ msgid "use 'hg update' to get a consistent checkout" msgstr "作æ¥é ˜åŸŸå†…容ã®æ•´åˆæ€§ã‚’å–ã‚‹ã«ã¯ 'hg update' を実行ã—ã¦ãã ã•ã„" +#, python-format +msgid "can't close already inactivated backup: %s" +msgstr "éžæ´»æ€§åŒ–済ã¿ã®ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—㯠close ã§ãã¾ã›ã‚“: %s" + +#, python-format +msgid "can't release already inactivated backup: %s" +msgstr "éžæ´»æ€§åŒ–済ã¿ã®ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—㯠release ã§ãã¾ã›ã‚“: %s" + msgid "repository root directory or name of overlay bundle file" msgstr "リãƒã‚¸ãƒˆãƒªã®ãƒ«ãƒ¼ãƒˆä½ç½®ã€ ã¾ãŸã¯ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ‘ス" @@ -11512,11 +11665,14 @@ msgid "" " Use the command :hg:`update` to switch to an existing branch. Use\n" -" :hg:`commit --close-branch` to mark this branch as closed." -msgstr "" -" 作æ¥é ˜åŸŸã®å†…容を既å˜ãƒ–ランãƒã®ã‚‚ã®ã§æ›´æ–°ã™ã‚‹å ´åˆã¯ :hg:`update` ã‚’\n" -" 使用ã—ã¦ãã ã•ã„。 ç¾ãƒ–ランãƒã‚’閉鎖ã™ã‚‹å ´åˆã¯\n" -" :hg:`commit --close-branch` を使用ã—ã¦ãã ã•ã„。" +" :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" +" considered closed." +msgstr "" +" 作æ¥é ˜åŸŸã®å†…容を既å˜ãƒ–ランãƒã®å†…容ã§æ›´æ–°ã™ã‚‹å ´åˆã¯ :hg:`update`\n" +" を使用ã—ã¾ã™ã€‚ ç¾ãƒ–ランãƒãƒ˜ãƒƒãƒ‰ã‚’閉鎖ã™ã‚‹å ´åˆã¯\n" +" :hg:`commit --close-branch` を使用ã—ã¾ã™ã€‚ 当該ブランãƒã«ãŠã‘ã‚‹ã€\n" +" 全ブランãƒãƒ˜ãƒƒãƒ‰ã®é–‰éŽ–ã‚’ã‚‚ã£ã¦ã€ ãã®ãƒ–ランãƒã®é–‰éŽ–ã¨ã¿ãªã—ã¾ã™ã€‚" #, python-format msgid "reset working directory to branch %s\n" @@ -11903,8 +12059,8 @@ msgid "mark new/missing files as added/removed before committing" msgstr "æ–°è¦ï¼ä¸åœ¨ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã€ã‚³ãƒŸãƒƒãƒˆå‰ã«ç™»éŒ²ï¼é™¤å¤–対象化" -msgid "mark a branch as closed, hiding it from the branch list" -msgstr "ブランãƒã‚’閉鎖ã—〠ブランãƒä¸€è¦§ã§ã®è¡¨ç¤ºã‹ã‚‰é™¤å¤–" +msgid "mark a branch head as closed" +msgstr "ブランãƒãƒ˜ãƒƒãƒ‰ã‚’閉鎖ã—ã¾ã™" msgid "amend the parent of the working directory" msgstr "作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã®æ”¹å¤‰" @@ -11953,6 +12109,15 @@ " 入力ã—ãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯ ``.hg/last-message.txt`` ã«ä¿å˜ã•ã‚Œã¾ã™ã€‚" msgid "" +" The --close-branch flag can be used to mark the current branch\n" +" head closed. When all heads of a branch are closed, the branch\n" +" will be considered closed and no longer listed." +msgstr "" +" --close-branch 指定ã«ã‚ˆã‚Šã€ ç¾ãƒ–ランãƒãƒ˜ãƒƒãƒ‰ãŒé–‰éŽ–ã•ã‚Œã¾ã™ã€‚\n" +" 当該ブランãƒã«ãŠã‘る〠全ブランãƒãƒ˜ãƒƒãƒ‰ã®é–‰éŽ–ã‚’ã‚‚ã£ã¦ã€\n" +" ãã®ãƒ–ランãƒã®é–‰éŽ–ã¨ã¿ãªã—〠以後ã¯ä¸€è¦§ã«åˆ—挙ã•ã‚Œã¾ã›ã‚“。" + +msgid "" " The --amend flag can be used to amend the parent of the\n" " working directory with a new commit that contains the changes\n" " in the parent in addition to those currently reported by :hg:`status`,\n" @@ -12314,6 +12479,9 @@ msgid "open manifest" msgstr "マニフェストã®èªã¿è¾¼ã¿" +msgid "open directory manifest" +msgstr "ディレクトリマニフェストã®èªã¿è¾¼ã¿" + msgid "-c|-m|FILE REV" msgstr "-c|-m|FILE REV" @@ -12664,6 +12832,9 @@ " ファイル内容ã®ç¢ºèªã‚’強制ã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\n" " " +msgid "rebuild the fncache file" +msgstr "fncache ファイルã®å†æ§‹ç¯‰" + msgid "revision to debug" msgstr "デãƒãƒƒã‚°å¯¾è±¡ãƒªãƒ“ジョン" @@ -13113,6 +13284,9 @@ " 本コマンドã§ã®ç™»éŒ²é™¤å¤–ã¯ã€ ç¾ãƒ–ランãƒã«ãŠã‘る登録除外ã®ã¿ã‚’æ„味ã—ã€\n" " å±¥æ´ãã®ã‚‚ã®ã¯ä¿æŒã•ã‚Œç¶šã‘ã¾ã™ã—〠作æ¥é ˜åŸŸã‹ã‚‰ã‚‚削除ã•ã‚Œã¾ã›ã‚“。" +msgid " To delete the file from the working directory, see :hg:`remove`." +msgstr " 作æ¥é ˜åŸŸä¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã™ã‚‹å ´åˆã¯ :hg:`remove` を使ã„ã¾ã™ã€‚" + msgid " To undo a forget before the next commit, see :hg:`add`." msgstr "" " 登録除外æ“作ã®ã‚³ãƒŸãƒƒãƒˆå‰å–り消ã—ã¯ã€ :hg:`help add` ã‚’å‚ç…§ã—ã¦\n" @@ -13671,6 +13845,18 @@ " メタデータã®ã¿ãŒè¨˜éŒ²ã•ã‚ŒãŸã€ æ–°è¦ãƒªãƒ“ジョンを作æˆã—ã¾ã™ã€‚" 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" +" See :hg:`help config` for more information about configuration\n" +" files and how to use these options." +msgstr "" +" ``ui.patch`` è¨å®šã«ã‚ˆã‚Šã€ 外部プãƒã‚°ãƒ©ãƒ ã§ã®ãƒ‘ッãƒé©ç”¨ã‚‚å¯èƒ½ã§ã™ã€‚\n" +" デフォルトã®ãƒ‘ッãƒé©ç”¨ã§ä½¿ç”¨ã•ã‚Œã‚‹ Mercurial ã®å†…部処ç†ã§ã‚‚ã€\n" +" ``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." @@ -13707,6 +13893,22 @@ msgstr " hg import --exact proposed-fix.patch" msgid "" +" - use an external tool to apply a patch which is too fuzzy for\n" +" the default internal tool." +msgstr "" +" - 内部パッãƒé©ç”¨ãƒ„ールã§ã¯ fuzz è¦å› ã§é©ç”¨ãŒé›£ã—ã„パッãƒã‚’〠\n" +" 外部パッãƒãƒ„ールを使ã£ã¦é©ç”¨" + +msgid " hg import --config ui.patch=\"patch --merge\" fuzzy.patch" +msgstr " hg import --config ui.patch=\"patch --merge\" fuzzy.patch" + +msgid " - change the default fuzzing from 2 to a less strict 7" +msgstr " - デフォルト㮠fuzz è¨±å®¹é‡ 2 ã‹ã‚‰ç·©å’Œã—㦠7 ã«è¨å®š" + +msgid " hg import --config ui.fuzz=7 fuzz.patch" +msgstr " hg import --config ui.fuzz=7 fuzz.patch" + +msgid "" " Returns 0 on success, 1 on partial success (see --partial).\n" " " msgstr "" @@ -14322,9 +14524,6 @@ msgstr "" " é–¢é€£æƒ…å ±ã¯ :hg:`summary` ã‚„ :hg:`help revsets` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" -msgid "can only specify an explicit filename" -msgstr "明示的ãªãƒ•ã‚¡ã‚¤ãƒ«å以外ã¯æŒ‡å®šã§ãã¾ã›ã‚“" - #, python-format msgid "'%s' not found in manifest!" msgstr "'%s' ã¯ç®¡ç†å¯¾è±¡ã§ã¯ã‚ã‚Šã¾ã›ã‚“" @@ -14403,9 +14602,9 @@ msgid "target revision" msgstr "対象リビジョン" -msgid "[-p|-d|-s] [-f] [-r] REV..." -msgstr "[-p|-d|-s] [-f] [-r] REV..." +msgid "[-p|-d|-s] [-f] [-r] [REV...]" +msgstr "[-p|-d|-s] [-f] [-r] [REV...]" msgid "set or show the current phase name" msgstr "ç¾è¡Œãƒ•ã‚§ãƒ¼ã‚ºçŠ¶æ…‹ã®å¤‰æ›´ã¾ãŸã¯è¡¨ç¤º" @@ -14408,9 +14607,9 @@ msgid "set or show the current phase name" msgstr "ç¾è¡Œãƒ•ã‚§ãƒ¼ã‚ºçŠ¶æ…‹ã®å¤‰æ›´ã¾ãŸã¯è¡¨ç¤º" -msgid " With no argument, show the phase name of specified revisions." -msgstr " 引数無ã—ã®å ´åˆã€ 指定リビジョンã®ãƒ•ã‚§ãƒ¼ã‚ºåを表示ã—ã¾ã™ã€‚" +msgid " With no argument, show the phase name of the current revision(s)." +msgstr " 引数無ã—ã®å ´åˆã€ 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã®ãƒ•ã‚§ãƒ¼ã‚ºåを表示ã—ã¾ã™ã€‚" msgid "" " With one of -p/--public, -d/--draft or -s/--secret, change the\n" @@ -14431,7 +14630,6 @@ msgid "" " Returns 0 on success, 1 if no phases were changed or some could not\n" -" be changed.\n" -" " +" be changed." msgstr "" " æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0〠フェーズ状態変更ãŒç„¡ã„ã€ã‚ã‚‹ã„ã¯ã€\n" @@ -14436,6 +14634,12 @@ msgstr "" " æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0〠フェーズ状態変更ãŒç„¡ã„ã€ã‚ã‚‹ã„ã¯ã€\n" -" 変更ã«å¤±æ•—ã—ãŸå ´åˆã¯ 1 ã§ã™ã€‚\n" +" 変更ã«å¤±æ•—ã—ãŸå ´åˆã¯ 1 ã§ã™ã€‚" + +msgid "" +" (For more information about the phases concept, see :hg:`help phases`.)\n" +" " +msgstr "" +" (フェーズã«é–¢ã™ã‚‹è©³ç´°ã¯ã€ :hg:`help phases` ã‚’å‚ç…§ã—ã¦ãã ã•ã„)\n" " " msgid "only one phase can be specified" @@ -15298,10 +15502,10 @@ msgid "" " This generates a brief summary of the working directory state,\n" -" including parents, branch, commit status, and available updates." -msgstr "" -" 親リビジョン〠ブランãƒã€ 想定コミットçµæžœã‚„〠作æ¥é ˜åŸŸæ›´æ–°å€™è£œç‰ã‚’å«ã‚€\n" -" 作æ¥é ˜åŸŸçŠ¶æ…‹ã®æ¦‚è¦ã‚’表示ã—ã¾ã™ã€‚" +" including parents, branch, commit status, phase and available updates." +msgstr "" +" 親リビジョン〠ブランãƒã€ 想定コミットçµæžœã€ フェーズ〠\n" +" 作æ¥é ˜åŸŸæ›´æ–°å€™è£œç‰ã‚’å«ã‚€ã€ 作æ¥é ˜åŸŸçŠ¶æ…‹ã®æ¦‚è¦ã‚’表示ã—ã¾ã™ã€‚" msgid "" " With the --remote option, this will check the default paths for\n" @@ -15403,6 +15607,18 @@ msgid "update: %d new changesets, %d branch heads (merge)\n" msgstr "update 候補: %d 個ã®æ–°è¦ãƒªãƒ“ジョンã€%d 個ã®ãƒ–ランãƒãƒ˜ãƒƒãƒ‰(merge)\n" +#, python-format +msgid "%d draft" +msgstr "%d draft リビジョン" + +#, python-format +msgid "%d secret" +msgstr "%d secret リビジョン" + +#, python-format +msgid "phases: %s\n" +msgstr "フェーズ: %s\n" + msgid "1 or more incoming" msgstr "å–ã‚Šè¾¼ã¿å€™è£œãƒªãƒ“ジョンã‚ã‚Š" @@ -15610,8 +15826,8 @@ msgid "" " Update the repository's working directory to the specified\n" " changeset. If no changeset is specified, update to the tip of the\n" -" current named branch and move the current bookmark (see :hg:`help\n" +" current named branch and move the active bookmark (see :hg:`help\n" " bookmarks`)." msgstr "" " 指定ã•ã‚ŒãŸãƒªãƒ“ジョン時点ã®å†…容ã§ã€ 作æ¥é ˜åŸŸã‚’æ›´æ–°ã—ã¾ã™ã€‚\n" " 対象リビジョンãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ 作æ¥é ˜åŸŸã¨åŒã˜åå‰ä»˜ãブランãƒã®ã€\n" @@ -15614,8 +15830,8 @@ " bookmarks`)." msgstr "" " 指定ã•ã‚ŒãŸãƒªãƒ“ジョン時点ã®å†…容ã§ã€ 作æ¥é ˜åŸŸã‚’æ›´æ–°ã—ã¾ã™ã€‚\n" " 対象リビジョンãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ 作æ¥é ˜åŸŸã¨åŒã˜åå‰ä»˜ãブランãƒã®ã€\n" -" 最新リビジョンã§æ›´æ–°ã—ãŸä¸Šã§ã€ ブックマークã®æ›´æ–°ã‚’è¡Œã„ã¾ã™ã€‚\n" +" 最新リビジョンã§æ›´æ–°ã—ãŸä¸Šã§ã€ アクティブブックマークを更新ã—ã¾ã™ã€‚\n" " (詳細㯠:hg:`help bookmarks` å‚ç…§)" msgid "" @@ -15700,6 +15916,10 @@ msgstr "-c/--check 㨠-C/--clean ã¯ä½µç”¨ã§ãã¾ã›ã‚“" #, python-format +msgid "(leaving bookmark %s)\n" +msgstr "(ブックマーク %s ã‚’éžã‚¢ã‚¯ãƒ†ã‚£ãƒ–化ä¸)\n" + +#, python-format msgid "(activating bookmark %s)\n" msgstr "(ブックマーク %s をアクティブ化ä¸)\n" @@ -15703,10 +15923,6 @@ 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 "リãƒã‚¸ãƒˆãƒªã®æ•´åˆæ€§æ¤œè¨¼" @@ -15864,6 +16080,9 @@ msgid "the python curses/wcurses module is not available/installed" msgstr "Python ã® curses/wcurses モジュールãŒåˆ©ç”¨ã§ãã¾ã›ã‚“" +msgid "confirm" +msgstr "" + msgid "starting interactive selection\n" msgstr "対話的ãªé¸æŠžã®é–‹å§‹\n" @@ -15901,6 +16120,9 @@ msgid "user quit" msgstr "ユーザã®æŒ‡ç¤ºã«ã‚ˆã‚Šçµ‚了ã—ã¾ã™" +msgid "this diff is too large to be displayed" +msgstr "差分é‡ãŒå¤šã™ãŽã¦è¡¨ç¤ºã§ãã¾ã›ã‚“" + #, python-format msgid "invalid character in dag description: %s..." msgstr "dag 記述ã«ä¸æ£ãªæ–‡å—ãŒä½¿ã‚ã‚Œã¦ã„ã¾ã™: %s..." @@ -16070,6 +16292,9 @@ msgid "abort: remote error:\n" msgstr "ä¸æ¢: 連æºã‚¨ãƒ©ãƒ¼:\n" +msgid "abort: remote error\n" +msgstr "ä¸æ¢: 連æºã‚¨ãƒ©ãƒ¼\n" + #, python-format msgid "abort: %s!\n" msgstr "ä¸æ¢: %s!\n" @@ -16233,6 +16458,13 @@ "lsprof ãŒåˆ©ç”¨ã§ãã¾ã›ã‚“ - http://codespeak.net/svn/user/arigo/hack/misc/" "lsprof/ã‹ã‚‰ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„" +msgid "" +"flamegraph not available - install from https://github.com/evanhempel/python-" +"flamegraph" +msgstr "" +"flamegraph ãŒä½¿ç”¨ã§ãã¾ã›ã‚“ - https://github.com/evanhempel/python-" +"flamegraph ã‹ã‚‰ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„" + msgid "statprof not available - install using \"easy_install statprof\"" msgstr "" "statprof ãŒåˆ©ç”¨ã§ãã¾ã›ã‚“ - \"easy_install statprof\"ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•" @@ -16305,8 +16537,12 @@ msgstr "利用å¯èƒ½ãªå…±é€šã®ãƒãƒ³ãƒ‰ãƒ«å½¢å¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒã‚ã‚Šã¾ã›ã‚“" #, python-format +msgid "updating %s to public failed" +msgstr "%s フェーズ㮠public 化ã«å¤±æ•—" + +#, python-format msgid "server ignored update of %s to public!\n" msgstr "連æºå…ˆã§ã€%s ã® public 化ãŒç„¡è¦–ã•ã‚Œã¾ã—ãŸï¼\n" #, python-format msgid "updating %s to public failed!\n" @@ -16308,9 +16544,9 @@ 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" +msgstr "%s フェーズ㮠public 化ã«å¤±æ•—!\n" #, python-format msgid "server ignored bookmark %s update\n" @@ -16338,6 +16574,23 @@ msgid "unsupported getbundle arguments: %s" msgstr "getbundle プãƒãƒˆã‚³ãƒ«ã«æœªçŸ¥ã®å¼•æ•°ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ: %s" +msgid "streaming all changes\n" +msgstr "全変更を転é€ä¸\n" + +msgid "unexpected response from remote server:" +msgstr "連æºå…ˆã®ã‚µãƒ¼ãƒã‹ã‚‰äºˆæœŸã—ãªã„返信:" + +#, python-format +msgid "%d files to transfer, %s of data\n" +msgstr "%d 個ã®ãƒ•ã‚¡ã‚¤ãƒ«è»¢é€(ãƒ‡ãƒ¼ã‚¿é‡ %s)\n" + +msgid "clone" +msgstr "複製" + +#, python-format +msgid "transferred %s in %.1f seconds (%s/sec)\n" +msgstr "%s ã‚’ %.1f 秒ã§é€ä¿¡ã—ã¾ã—㟠(%s/秒)\n" + #, python-format msgid "*** failed to import extension %s from %s: %s\n" msgstr "*** %s ã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã«å¤±æ•— (%s): %s\n" @@ -16520,6 +16773,9 @@ msgid "syntax error" msgstr "文法エラー" +msgid "invalid token" +msgstr "ä¸æ£ãªè¨˜è¿°" + msgid "missing argument" msgstr "引数ãŒã‚ã‚Šã¾ã›ã‚“" @@ -16786,11 +17042,12 @@ msgid "subrepo requires a pattern or no arguments" msgstr "subrepo ã®å¼•æ•°ã¯ã€ãƒ‘ターン指定ã‹ã€å¼•æ•°ç„¡ã—ã§ã™" -msgid "invalid token" -msgstr "ä¸æ£ãªè¨˜è¿°" - -msgid "custom templates not yet supported" -msgstr "ç¾åœ¨ã‚«ã‚¹ã‚¿ãƒ テンプレートã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™" +#, python-format +msgid "available styles: %s\n" +msgstr "利用å¯èƒ½ãªã‚¹ã‚¿ã‚¤ãƒ«: %s\n" + +msgid "specify a template" +msgstr "テンプレートを指定ã—ã¦ãã ã•ã„" msgid "starting revisions are not directly related" msgstr "開始リビジョンã¨ç›´æŽ¥ã®é–¢é€£ãŒã‚ã‚Šã¾ã›ã‚“" @@ -17861,8 +18118,8 @@ " 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: branch '{branch}'\\n{if(activebookmark,\n" +" \"HG: bookmark '{activebookmark}'\\n\") }{subrepos %\n" " \"HG: subrepo {subrepo}\\n\" }{file_adds %\n" " \"HG: added {file}\\n\" }{file_mods %\n" " \"HG: changed {file}\\n\" }{file_dels %\n" @@ -17876,8 +18133,8 @@ " HG: --\n" " HG: ユーザ: {author}\\n{ifeq(p2rev, \"-1\", \"\",\n" " \"HG: ブランãƒã®ãƒžãƒ¼ã‚¸\\n\")\n" -" }HG: ブランム'{branch}'\\n{if(currentbookmark,\n" -" \"HG: ブックマーク '{currentbookmark}'\\n\") }{subrepos %\n" +" }HG: ブランム'{branch}'\\n{if(activebookmark,\n" +" \"HG: ブックマーク '{activebookmark}'\\n\") }{subrepos %\n" " \"HG: サブリãƒã‚¸ãƒˆãƒª {subrepo}\\n\" }{file_adds %\n" " \"HG: {file} ã‚’è¿½åŠ \\n\" }{file_mods %\n" " \"HG: {file} を変更\\n\" }{file_dels %\n" @@ -18411,9 +18668,9 @@ msgid "" " [extensions]\n" -" # (the progress extension will get loaded from Mercurial's path)\n" -" progress =\n" +" # (the color extension will get loaded from Mercurial's path)\n" +" color =\n" " # (this extension will get loaded from the file specified)\n" " myfeature = ~/.hgext/myfeature.py" msgstr "" " [extensions]\n" @@ -18416,9 +18673,9 @@ " # (this extension will get loaded from the file specified)\n" " myfeature = ~/.hgext/myfeature.py" msgstr "" " [extensions]\n" -" # (progress エクステンション㯠Mercurial åŒæ¢±ã®ã‚‚ã®ãŒèªã¿è¾¼ã¾ã‚Œã¾ã™)\n" -" progress =\n" +" # (color エクステンション㯠Mercurial åŒæ¢±ã®ã‚‚ã®ãŒèªã¿è¾¼ã¾ã‚Œã¾ã™)\n" +" color =\n" " # (以下ã®ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ã¯æŒ‡å®šã®ãƒ‘スã‹ã‚‰èªã¿è¾¼ã¾ã‚Œã¾ã™)\n" " myfeature = ~/.hgext/myfeature.py" @@ -19403,7 +19660,17 @@ " デフォルト値: strict" msgid "" -"\n" +"``fuzz``\n" +" The number of lines of 'fuzz' to allow when applying patches. This\n" +" controls how much context the patcher is allowed to ignore when\n" +" trying to apply a patch.\n" +" Default: 2" +msgstr "" +"``fuzz``\n" +" パッãƒé©ç”¨ã§ã® 'fuzz' ã«ãŠã‘る許容行数。 パッãƒé©ç”¨ã«ãŠã„ã¦ã€\n" +" 無視å¯èƒ½ãªã‚³ãƒ³ãƒ†ã‚スト行数を制御ã§ãã¾ã™ã€‚ デフォルト値: 2" + +msgid "" "``paths``\n" "---------" msgstr "" @@ -19407,7 +19674,6 @@ "``paths``\n" "---------" msgstr "" -"\n" "``paths``\n" "---------" @@ -19665,6 +19931,102 @@ " 詳細プãƒãƒ•ã‚¡ã‚¤ãƒ© ``ls`` 固有ã®è¨å®šã€‚ デフォルト値: 5" msgid "" +"``progress``\n" +"------------" +msgstr "" +"``progress``\n" +"------------" + +msgid "" +"Mercurial commands can draw progress bars that are as informative as\n" +"possible. Some progress bars only offer indeterminate information, while " +"others\n" +"have a definite end point." +msgstr "" +"Mercurial コマンドã¯ã€ 処ç†ã®é€²æ—率を表示å¯èƒ½ã§ã™ã€‚ 多ãã®å‡¦ç†ã«ãŠã„ã¦ã€\n" +"明確ãªå‡¦ç†ç·é‡ã«åŸºã¥ã„ã¦ã€ 進æ—表示ãŒè¡Œã‚ã‚Œã¾ã™ãŒã€ 一部ã®å‡¦ç†ã§ã¯ã€\n" +"ä¸ç¢ºå®šãªæƒ…å ±ã«åŸºã¥ã„ãŸé€²æ—率ãŒè¡¨ç¤ºã•ã‚Œã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚" + +msgid "" +"``delay``\n" +" Number of seconds (float) before showing the progress bar. (default: 3)" +msgstr "" +"``delay``\n" +" 進æ—表示開始ã¾ã§ã®ç§’æ•°(浮動å°æ•°ç‚¹) (デフォルト値: 3.0)" + +msgid "" +"``changedelay``\n" +" Minimum delay before showing a new topic. When set to less than 3 * " +"refresh,\n" +" that value will be used instead. (default: 1)" +msgstr "" +"``changedelay``\n" +" 次ã®ãƒˆãƒ”ック表示ã¾ã§ã®æœ€å°é…延。 refresh ã®3å€ä»¥ä¸Šã®å€¤ã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚\n" +" (デフォルト値: 1.0)" + +msgid "" +"``refresh``\n" +" Time in seconds between refreshes of the progress bar. (default: 0.1)" +msgstr "" +"``refresh``\n" +" 進æ—表示更新間隔ã®ç§’æ•° (デフォルト値: 0.1)" + +msgid "" +"``format``\n" +" Format of the progress bar." +msgstr "" +"``format``\n" +" 進æ—表示ã®å½¢å¼æŒ‡å®šã€‚" + +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." +msgstr "" +" format 指定ã§æœ‰åŠ¹ãªè¦ç´ 㯠``topic`` (ç¾å‡¦ç†å†…容), ``bar`` (ãƒãƒ¼è¡¨ç¤º),\n" +" ``number`` (終了数), ``unit`` (対象å˜ä½), ``estimate`` (残予想時間),\n" +" ``speed`` (処ç†é€Ÿåº¦), ``item`` (ç¾å‡¦ç†å¯¾è±¡) ã§ã™ã€‚ デフォルト㮠item\n" +" ã¯å¯¾è±¡ã®æœ«å°¾ 20 æ–‡å—ã§ã™ãŒã€ ``-<num>`` (末尾 num æ–‡å—) ã‚„ ``+<num>``\n" +" (冒é num æ–‡å—) 指定ã®è¿½åŠ ã§å¤‰æ›´å¯èƒ½ã§ã™ã€‚" + +msgid " (default: Topic bar number estimate)" +msgstr " (デフォルト値: topic bar number estimate)" + +msgid "" +"``width``\n" +" If set, the maximum width of the progress information (that is, min" +"(width,\n" +" term width) will be used)" +msgstr "" +"``width``\n" +" 進æ—æƒ…å ±è¡¨ç¤ºã®æœ€å¤§å¹… (ç”»é¢å¹…ã¨æ¯”較ã—ã¦ã€ å°ã•ã„æ–¹ã®å€¤ã‚’採用)" + +msgid "" +"``clear-complete``\n" +" clear the progress bar after it's done (default to True)" +msgstr "" +"``clear-complete``\n" +" 処ç†çµ‚了後ã®é€²æ—表示クリアã®è¦å¦ (デフォルト値: True)" + +msgid "" +"``disable``\n" +" If true, don't show a progress bar" +msgstr "" +"``disable``\n" +" true è¨å®šæ™‚ã¯ã€ 進æ—表示を抑æ¢" + +msgid "" +"``assume-tty``\n" +" If true, ALWAYS show a progress bar, unless disable is given" +msgstr "" +"``assume-tty``\n" +" true è¨å®šæ™‚ã¯ã€disable ã«ã‚ˆã‚‹ç¦æ¢ãŒç„¡ã„é™ã‚Šã€ 常ã«é€²æ—表示を実施" + +msgid "" "``revsetalias``\n" "---------------" msgstr "" @@ -19732,6 +20094,15 @@ " データã®å®Œå…¨æ€§ã‚’確èªã—ã¾ã™ã€‚ デフォルト値: False" msgid "" +"``maxhttpheaderlen``\n" +" Instruct HTTP clients not to send request headers longer than this\n" +" many bytes. Default is 1024." +msgstr "" +"``maxhttpheaderlen``\n" +" HTTP クライアントã«å¯¾ã—ã¦ã€ ã“ã®ã‚µã‚¤ã‚ºä»¥ä¸Šã®ãƒ˜ãƒƒãƒ€ã‚’é€ä¿¡ã—ãªã„よã†ã«ã€\n" +" 指示ã—ã¾ã™ (デフォルト値: 1024)" + +msgid "" "``smtp``\n" "--------" msgstr "" @@ -20091,6 +20462,32 @@ " æ–‡å—コード混在ã«ã‚ˆã‚‹æ·±åˆ»ãªå•é¡Œã‚’生ã˜ã¾ã™ã€‚" 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" +" internal patch utility. The external tool must work as the common\n" +" Unix ``patch`` program. In particular, it must accept a ``-p``\n" +" argument to strip patch headers, a ``-d`` argument to specify the\n" +" current directory, a file name to patch, and a patch file to take\n" +" from stdin." +msgstr "" +"``patch``\n" +" :hg:`import` やエクステンションã«ã‚ˆã‚‹ãƒ‘ッãƒé©ç”¨ã§ä½¿ç”¨ã™ã‚‹å¤–部ツール。\n" +" 通常ã®ãƒ‘ッãƒé©ç”¨ã¯ Mercurial 内部ã§å‡¦ç†ã•ã‚Œã¾ã™ã€‚ 外部ツールã¯ã€\n" +" Unix ã® ``patch`` コマンドã¨åŒç‰ã®æŒ™å‹•ãŒè¦æ±‚ã•ã‚Œã¾ã™ã€‚ 最低é™ã€\n" +" パス指定ã®å†’é è¦ç´ 除去㮠``-p`` ã€èµ·ç‚¹ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªæŒ‡å®šã® ``-d``\n" +" ã¨ã„ã£ãŸã‚ªãƒ—ションã®å—ç†ã‚„〠標準入力ã‹ã‚‰ã®ãƒ‘ッãƒãƒ•ã‚¡ã‚¤ãƒ«å…¥åŠ›ãŒã€\n" +" å¿…è¦ã¨ã•ã‚Œã¾ã™ã€‚" + +msgid "" +" It is possible to specify a patch tool together with extra\n" +" arguments. For example, setting this option to ``patch --merge``\n" +" will use the ``patch`` program with its 2-way merge option." +msgstr "" +" 外部ツールã¯å›ºæœ‰å¼•æ•°ã¨ä¸€ç·’ã«æŒ‡å®šå¯èƒ½ã§ã™ã€‚ 例ãˆã° ``patch --merge``\n" +" 指定ã«ã‚ˆã‚Šã€ 2-way マージオプション付ã㧠``patch`` ãŒå®Ÿè¡Œã•ã‚Œã¾ã™ã€‚" + +msgid "" "``portablefilenames``\n" " Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.\n" " Default is ``warn``.\n" @@ -20134,15 +20531,6 @@ " clone/push/pull 処ç†ã«ãŠã‘ã‚‹é 隔実行コマンド。 デフォルト値: ``hg``" msgid "" -"``reportoldssl``\n" -" Warn if an SSL certificate is unable to be used due to using Python\n" -" 2.5 or earlier. True or False. Default is True." -msgstr "" -"``reportoldssl``\n" -" Python 2.5 以å‰ã®ä½¿ç”¨ã«ã‚ˆã‚Šã€ SSL 証明書ã®å‡¦ç†ãŒã§ããªã„å ´åˆã®ã€\n" -" è¦å‘Šè¡¨ç¤ºã®æœ‰ç„¡ã‚’指定ã™ã‚‹çœŸå½å€¤ã€‚ デフォルト値: True" - -msgid "" "``report_untrusted``\n" " Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a\n" " trusted user or group. True or False. Default is True." @@ -20485,6 +20873,13 @@ " hgweb ã«ãŠã‘ã‚‹ã‚ャッシュ利用ã®å¯å¦ã€‚ デフォルト値: True" msgid "" +"``certificate``\n" +" Certificate to use when running :hg:`serve`." +msgstr "" +"``certificate``\n" +" :hg:`serve` 実行時ã«ä½¿ç”¨ã™ã‚‹è¨¼æ˜Žæ›¸ã€‚" + +msgid "" "``collapse``\n" " With ``descend`` enabled, repositories in subdirectories are shown at\n" " a single level alongside repositories in the current path. With\n" @@ -22809,6 +23204,16 @@ "パターン記述を ``^`` ã§é–‹å§‹ã—ã¦ãã ã•ã„。" msgid "" +"Subdirectories can have their own .hgignore settings by adding\n" +"``subinclude:path/to/subdir/.hgignore`` to the root ``.hgignore``. See\n" +":hg:`help patterns` for details on ``subinclude:`` and ``include:``." +msgstr "" +"リãƒã‚¸ãƒˆãƒªãƒ«ãƒ¼ãƒˆã® ``.hgignore`` ã« ``subinclude:path/to/subdir/.hgignore``\n" +"è¨˜è¿°ã‚’è¿½åŠ ã™ã‚‹ã“ã¨ã§ã€ å„サブディレクトリ固有㮠.hgignore è¨å®šãŒå¯èƒ½ã§ã™ã€‚\n" +"``subinclude:`` 㨠``include:`` ã®è©³ç´°ã¯ :hg:`help patterns`\n" +"ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" + +msgid "" " Patterns specified in other than ``.hgignore`` are always rooted.\n" " Please see :hg:`help patterns` for details." msgstr "" @@ -23424,6 +23829,21 @@ "file パターンã¨ã—ã¦æ‰±ã‚ã‚Œã¾ã™ã€‚" msgid "" +"To read a set of patterns from a file, use ``include:`` or ``subinclude:``.\n" +"``include:`` will use all the patterns from the given file and treat them as " +"if\n" +"they had been passed in manually. ``subinclude:`` will only apply the " +"patterns\n" +"against files that are under the subinclude file's directory. See :hg:`help\n" +"hgignore` for details on the format of these files." +msgstr "" +"パターン指定をファイルã‹ã‚‰èªã¿è¾¼ã‚€å ´åˆã¯ã€ ``include:`` ã‚„ ``subinclude:``\n" +"を使用ã—ã¾ã™ã€‚ ``include:`` ã§èªã¿è¾¼ã¾ã‚ŒãŸå†…容ã¯ã€ 手動ã§ã®ç›´æŽ¥æŒ‡å®šã¨ã€\n" +"åŒã˜åŠ¹æžœã‚’æŒã¡ã¾ã™ã€‚ ``subinclude:`` ã§èªã¿è¾¼ã¾ã‚ŒãŸå†…容ã¯ã€\n" +"èªã¿è¾¼ã¿å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¨ã€ ãã®é…下ã«ã®ã¿é©ç”¨ã•ã‚Œã¾ã™ã€‚\n" +"パターンファイルã®å½¢å¼è©³ç´°ã¯ :hg:`help hgignore` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" + +msgid "" "All patterns, except for ``glob:`` specified in command line (not for\n" "``-I`` or ``-X`` options), can match also against directories: files\n" "under matched directories are treated as matched." @@ -23471,7 +23891,7 @@ msgstr " re:.*\\.c$ ä»»æ„ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®ã€ åå‰ãŒ \".c\" ã§çµ‚ã‚ã‚‹ã‚‚ã®" msgid "File examples::" -msgstr "ファイルèªã¿è¾¼ã¿ä¾‹::" +msgstr "一覧指定例::" msgid "" " listfile:list.txt read list from list.txt with one file pattern per line\n" @@ -23480,8 +23900,22 @@ " listfile:list.txt 1è¡Œ 1 file パターン㧠list.txt ã‹ã‚‰èªã¿è¾¼ã¿\n" " listfile0:list.txt null æ–‡å—区切り㧠file パターンをèªã¿è¾¼ã¿" -msgid "See also :hg:`help filesets`.\n" -msgstr ":hg:`help filesets` ã‚‚å‚ç…§ã—ã¦ãã ã•ã„。\n" +msgid "See also :hg:`help filesets`." +msgstr ":hg:`help filesets` ã‚‚å‚ç…§ã—ã¦ãã ã•ã„。" + +msgid "Include examples::" +msgstr "ファイルèªã¿è¾¼ã¿ä¾‹::" + +msgid "" +" include:path/to/mypatternfile reads patterns to be applied to all " +"paths\n" +" subinclude:path/to/subignorefile reads patterns specifically for paths in " +"the\n" +" subdirectory\n" +msgstr "" +" include:path/to/mypatternfile èªã¿è¾¼ã¿ãƒ‘ターンã¯ãƒªãƒã‚¸ãƒˆãƒªå…¨ä½“ã«é©ç”¨\n" +" subinclude:path/to/subignorefile èªã¿è¾¼ã¿ãƒ‘ターンã¯ã‚µãƒ–ディレクトリ\n" +" é…下ã«ã®ã¿é©ç”¨\n" msgid "" "What are phases?\n" @@ -24222,13 +24656,17 @@ msgid "" ":files: files does not recurse into subrepos unless -S/--subrepos is\n" -" specified. Git and Subversion subrepositories are currently\n" -" silently ignored." -msgstr "" -":files: -S/--subrepos 指定ãŒç„¡ã„é™ã‚Šã€ ファイル一覧表示ã¯ã€\n" -" å†å¸°çš„ã«ã¯å®Ÿæ–½ã•ã‚Œã¾ã›ã‚“。 ãªãŠã€ サブリãƒã‚¸ãƒˆãƒªãŒ Git ã¾ãŸã¯\n" -" Subversion å½¢å¼ã®å ´åˆã€ ç¾çŠ¶ã§ã¯ã€ 何ã®è¡¨ç¤ºã‚‚ç„¡ã—ã«ã€\n" -" 一覧表示è¦æ±‚を無視ã—ã¾ã™ã€‚" +" specified. However, if you specify the full path of a file or\n" +" directory in a subrepo, it will be displayed even without\n" +" -S/--subrepos being specified. Git and Subversion subrepositories\n" +" are currently silently ignored." +msgstr "" +":file: -S/--subrepos 指定ãŒç„¡ã„é™ã‚Šã€ 管ç†å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸€è¦§è¡¨ç¤ºã¯ã€\n" +" å†å¸°çš„ã«ã¯å®Ÿæ–½ã•ã‚Œã¾ã›ã‚“。 但ã—〠-S/--subrepos 指定ãŒç„¡ãã¦ã‚‚ã€\n" +" サブリãƒã‚¸ãƒˆãƒªä¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¸ã®ãƒ‘スãŒã€ 直接指定ã•ã‚ŒãŸå ´åˆã¯ã€\n" +" 管ç†å¯¾è±¡ä¸€è¦§è¡¨ç¤ºãŒå®Ÿæ–½ã•ã‚Œã¾ã™ã€‚ ãªãŠã€ サブリãƒã‚¸ãƒˆãƒªãŒ\n" +" Git/Subversion å½¢å¼ã®å ´åˆã€ ç¾çŠ¶ã§ã¯ã€ 何ã®è¡¨ç¤ºã‚‚ç„¡ã—ã«ã€\n" +" 表示è¦æ±‚を無視ã—ã¾ã™ã€‚" msgid "" ":forget: forget currently only handles exact file matches in subrepos.\n" @@ -24443,6 +24881,16 @@ msgid "- expr % \"{template}\"" msgstr "- expr % \"{template}\"" +msgid "" +"As seen in the above example, \"{template}\" is interpreted as a template.\n" +"To prevent it from being interpreted, you can use an escape character " +"\"\\{\"\n" +"or a raw string prefix, \"r'...'\"." +msgstr "" +"上記例ã§è¦‹ã‚‰ã‚Œã‚‹ã‚ˆã†ã«ã€ \"{template}\" ã¯ãƒ†ãƒ³ãƒ—レートã¨ã—ã¦è§£é‡ˆã•ã‚Œã¾ã™ã€‚\n" +"テンプレートã¨ã—ã¦ã®è§£é‡ˆã‚’抑æ¢ã™ã‚‹å ´åˆã¯ã€ \"\\{\" ã§é–‹å§‹ã™ã‚‹ã‹ã€\n" +"æ–‡å—列指定ã®å†’é ã« ``r`` を付ã‘ã¦ä¸‹ã•ã„ (例: \"r'...'\")" + msgid "Some sample command line templates:" msgstr "コマンドラインã§ã®ãƒ†ãƒ³ãƒ—レート指定例:" @@ -24473,8 +24921,8 @@ msgid "- Output the description set to a fill-width of 30::" msgstr "- コミットãƒã‚°ã®å„行を30æ¡ã§æƒãˆã¦å‡ºåŠ›::" -msgid " $ hg log -r 0 --template \"{fill(desc, '30')}\"" -msgstr " $ hg log -r 0 --template \"{fill(desc, '30')}\"" +msgid " $ hg log -r 0 --template \"{fill(desc, 30)}\"" +msgstr " $ hg log -r 0 --template \"{fill(desc, 30)}\"" msgid "- Use a conditional to test for the default branch::" msgstr "- default ブランãƒã‹å¦ã‹ã§è¡¨ç¤ºå†…容を切り替ãˆ::" @@ -24514,15 +24962,15 @@ msgid " $ hg log -r 0 --template \"{join(extras, '\\n')}\\n\"" msgstr " $ hg log -r 0 --template \"{join(extras, '\\n')}\\n\"" -msgid "- Mark the current bookmark with '*'::" -msgstr "- ç¾åœ¨ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªãƒ–ックマーク㫠'*' を表示::" - -msgid "" -" $ hg log --template \"{bookmarks % '{bookmark}{ifeq(bookmark, current, \\" -"\"*\\\")} '}\\n\"" -msgstr "" -" $ hg log --template \"{bookmarks % '{bookmark}{ifeq(bookmark, current, \\" -"\"*\\\")} '}\\n\"" +msgid "- Mark the active bookmark with '*'::" +msgstr "- アクティブãªãƒ–ックマーク㫠'*' を表示::" + +msgid "" +" $ hg log --template \"{bookmarks % '{bookmark}{ifeq(bookmark, active, " +"'*')} '}\\n\"" +msgstr "" +" $ hg log --template \"{bookmarks % '{bookmark}{ifeq(bookmark, active, " +"'*')} '}\\n\"" msgid "- Mark the working copy parent with '@'::" msgstr "- 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョン㫠'@' を表示::" @@ -24533,11 +24981,10 @@ 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 " $ 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 "- コミットãƒã‚°ã®æœ€åˆã®èªžã®ã¿ã‚’表示::" @@ -24540,9 +24987,9 @@ 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 " $ 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 指定ã¯ä»¥ä¸‹ã®å½¢å¼ã§ã™::" @@ -24713,6 +25160,19 @@ msgid "updating working directory\n" msgstr "作æ¥é ˜åŸŸã®æ›´æ–°ä¸\n" +msgid "" +"src repository does not support revision lookup and so doesn't support clone " +"by revision" +msgstr "指定ã®è¤‡è£½å…ƒã¯ã€ リビジョン指定付ã複製ãŒæœªã‚µãƒãƒ¼ãƒˆã§ã™" + +#, python-format +msgid "(sharing from existing pooled repository %s)\n" +msgstr "(æ—¢å˜ã®å…±æœ‰ç”¨å±¥æ´ç®¡ç†é ˜åŸŸ %s を使用)\n" + +#, python-format +msgid "(sharing from new pooled repository %s)\n" +msgstr "(共有用履æ´ç®¡ç†é ˜åŸŸ %s ã‚’æ–°è¦ä½œæˆ)\n" + #, python-format msgid "destination directory: %s\n" msgstr "複製先ディレクトリ: %s\n" @@ -24728,10 +25188,11 @@ msgid "destination '%s' is not empty" msgstr "複製先 '%s' ã¯ç©ºã§ã¯ã‚ã‚Šã¾ã›ã‚“" -msgid "" -"src repository does not support revision lookup and so doesn't support clone " -"by revision" -msgstr "指定ã®è¤‡è£½å…ƒã¯ã€ リビジョン指定付ã複製ãŒæœªã‚µãƒãƒ¼ãƒˆã§ã™" +msgid "(not using pooled storage: remote appears to be empty)\n" +msgstr "(共有用履æ´ç®¡ç†é ˜åŸŸã¯ä½¿ç”¨ã—ã¾ã›ã‚“: 複製元ã®å±¥æ´ãŒç©ºã§ã™)\n" + +msgid "(not using pooled storage: unable to resolve identity of remote)\n" +msgstr "(共有用履æ´ç®¡ç†é ˜åŸŸã¯ä½¿ç”¨ã—ã¾ã›ã‚“: 複製元ã®å±¥æ´ã‚’å‚ç…§ã§ãã¾ã›ã‚“)\n" msgid "clone from remote to remote not supported" msgstr "リモートã‹ã‚‰ãƒªãƒ¢ãƒ¼ãƒˆã¸ã®è¤‡è£½ã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™" @@ -24761,6 +25222,13 @@ msgid "(branch merge, don't forget to commit)\n" msgstr "(マージçµæžœã® commit を忘れãšã«)\n" +msgid "checking subrepo links\n" +msgstr "サブリãƒã‚¸ãƒˆãƒªã®ç¢ºèªä¸\n" + +#, python-format +msgid ".hgsubstate is corrupt in revision %s\n" +msgstr "リビジョン %s ã«ãŠã‘ã‚‹ .hgsubstate ãŒä¸æ£ã§ã™\n" + #, python-format msgid "websub: invalid pattern for %s: %s\n" msgstr "websub: %s ã®ãƒ‘ターンãŒä¸æ£ã§ã™: %s\n" @@ -25379,14 +25847,6 @@ msgstr "http リãƒã‚¸ãƒˆãƒªã®æ–°è¦ä½œæˆã¯ã§ãã¾ã›ã‚“" #, python-format -msgid "ignoring invalid syntax '%s'" -msgstr "文法ä¸æ£ã® '%s' を無視ã—ã¾ã™" - -#, python-format -msgid "skipping unreadable ignore file '%s': %s\n" -msgstr "èªè¾¼ä¸å¯ã® ignore ファイル '%s' をスã‚ップã—ã¾ã™: %s\n" - -#, python-format msgid "repository %s not found" msgstr "リãƒã‚¸ãƒˆãƒª '%s' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" @@ -25529,9 +25989,6 @@ msgid "committing changelog\n" msgstr "変更履æ´ã®è¨˜éŒ²ä¸\n" -msgid "unexpected response from remote server:" -msgstr "連æºå…ˆã®ã‚µãƒ¼ãƒã‹ã‚‰äºˆæœŸã—ãªã„返信:" - msgid "operation forbidden by server" msgstr "ãã®å‡¦ç†ã¯ã‚µãƒ¼ãƒã§ç¦æ¢ã•ã‚Œã¦ã„ã¾ã™" @@ -25541,20 +25998,6 @@ msgid "the server sent an unknown error code" msgstr "サーãƒãŒæœªçŸ¥ã®ã‚¨ãƒ©ãƒ¼ã‚³ãƒ¼ãƒ‰ã‚’è¿”å´ã—ã¾ã—ãŸ" -msgid "streaming all changes\n" -msgstr "全変更を転é€ä¸\n" - -#, python-format -msgid "%d files to transfer, %s of data\n" -msgstr "%d 個ã®ãƒ•ã‚¡ã‚¤ãƒ«è»¢é€(ãƒ‡ãƒ¼ã‚¿é‡ %s)\n" - -msgid "clone" -msgstr "複製" - -#, python-format -msgid "transferred %s in %.1f seconds (%s/sec)\n" -msgstr "%s ã‚’ %.1f 秒ã§é€ä¿¡ã—ã¾ã—㟠(%s/秒)\n" - #, python-format msgid "pushkey-abort: %s\n" msgstr "pushkey 処ç†ã®ä¸æ¢: %s\n" @@ -25625,6 +26068,14 @@ msgstr "一覧ファイル(%s)ãŒèªã¿è¾¼ã‚ã¾ã›ã‚“" #, python-format +msgid "skipping unreadable pattern file '%s': %s\n" +msgstr "èªè¾¼ä¸å¯ã®ãƒ‘ターンファイル '%s' をスã‚ップã—ã¾ã™: %s\n" + +#, python-format +msgid "%s: invalid pattern (%s): %s" +msgstr "%s: ä¸æ£ãƒ‘ターン (%s): %s" + +#, python-format msgid "invalid pattern (%s): %s" msgstr "ä¸æ£ãƒ‘ターン (%s): %s" @@ -25632,6 +26083,10 @@ msgstr "ä¸æ£ãƒ‘ターン" #, python-format +msgid "%s: ignoring invalid syntax '%s'\n" +msgstr "%s: 文法ä¸æ£ã® '%s' を無視ã—ã¾ã™\n" + +#, python-format msgid "diff context lines count must be an integer, not %r" msgstr "差分コンテã‚ストã§ã®è¡Œæ•°æŒ‡å®šãŒä¸æ£ã§ã™: %r" @@ -25706,6 +26161,10 @@ msgid "getting %s to %s\n" msgstr "%s ã‹ã‚‰ %s ã«è¤‡è£½ä¸\n" +#, python-format +msgid "branch %s not found" +msgstr "ブランム%s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" + msgid "merging with a working directory ancestor has no effect" msgstr "作æ¥é ˜åŸŸã®ç¥–å…ˆã¨ã®ãƒžãƒ¼ã‚¸ã¯æ„味ãŒã‚ã‚Šã¾ã›ã‚“" @@ -25840,6 +26299,22 @@ msgstr "ä¸æ£ãªæŒ¿å…¥è¾ž: %s" #, python-format +msgid "%(func)s takes at most %(nargs)d arguments" +msgstr "%(func)s ã®å¼•æ•°ã¯æœ€å¤§ %(nargs)d 個ã§ã™" + +#, python-format +msgid "%(func)s got an invalid argument" +msgstr "%(func)s ã®å¼•æ•°ãŒä¸æ£ã§ã™" + +#, python-format +msgid "%(func)s got an unexpected keyword argument '%(key)s'" +msgstr "%(func)s ã«äºˆæœŸã›ã¬ã‚ーワード引数 '%(key)s' ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" + +#, python-format +msgid "%(func)s got multiple values for keyword argument '%(key)s'" +msgstr "%(func)s ã®ã‚ーワード引数 '%(key)s' ãŒè¤‡æ•°ã®å€¤ã‚’æŒã¡ã¾ã™" + +#, python-format msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" msgstr "%d 個ã®å·®åˆ†(ç·æ•° %d)ãŒé©ç”¨å¤±æ•— -- å´ä¸‹å·®åˆ†ã¯ %s ã«ä¿å˜\n" @@ -25889,6 +26364,9 @@ msgid "%d hunks, %d lines changed\n" msgstr "%d 個ã®å·®åˆ†ã€ %d è¡Œã®å¤‰æ›´\n" +msgid "record" +msgstr "" + msgid "" "[Ynesfdaq?]$$ &Yes, record this change$$ &No, skip this change$$ &Edit this " "change manually$$ &Skip remaining changes to this file$$ Record remaining " @@ -25925,6 +26403,10 @@ "編集作æ¥ã¯ä¸æ¢ã•ã‚Œã€å·®åˆ†ã¯ãã®ã¾ã¾ç¶æŒã•ã‚Œã¾ã™ã€‚\n" #, python-format +msgid "editor exited with exit code %d\n" +msgstr "エディタãŒçµ‚了コード %d ã§çµ‚了ã—ã¾ã—ãŸ\n" + +#, python-format msgid "examine changes to %s?" msgstr "%s ã®å¤‰æ›´ç‚¹ã‚’調ã¹ã¾ã™ã‹ï¼Ÿ" @@ -26006,6 +26488,10 @@ msgstr "パス %r ã¯ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ '%r' ãŒå«ã¾ã‚Œã¦ã„ã¾ã™" #, python-format +msgid "consider using '--cwd %s'" +msgstr "'--cwd %s' を使ã£ã¦ã¿ã¦ã¯ï¼Ÿ" + +#, python-format msgid "%s not under root '%s'" msgstr "%s ã¯ãƒ«ãƒ¼ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª '%s' ã®é…下ã«ã¯ã‚ã‚Šã¾ã›ã‚“" @@ -26039,6 +26525,40 @@ msgid "killed by signal %d" msgstr "シグナル %d ã§å¼·åˆ¶çµ‚了ã•ã‚Œã¾ã—ãŸ" +#. i18n: format XX seconds as "XXs" +#, python-format +msgid "%02ds" +msgstr "%02d秒" + +#. i18n: format X minutes and YY seconds as "XmYYs" +#, python-format +msgid "%dm%02ds" +msgstr "%d分%02d秒" + +#. i18n: format X hours and YY minutes as "XhYYm" +#, python-format +msgid "%dh%02dm" +msgstr "%d時間%02d分" + +#. i18n: format X days and YY hours as "XdYYh" +#, python-format +msgid "%dd%02dh" +msgstr "%dæ—¥%02d時間" + +#. i18n: format X weeks and YY days as "XwYYd" +#, python-format +msgid "%dw%02dd" +msgstr "%d週%02dæ—¥" + +#. i18n: format X years and YY weeks as "XyYYw" +#, python-format +msgid "%dy%02dw" +msgstr "%då¹´%02d週" + +#, python-format +msgid "%d %s/sec" +msgstr "%d %s/秒" + #, python-format msgid "unknown strip-bundle2-version value %r; should be one of %r\n" msgstr "strip-bundle2-version 値 %r ã¯æœªçŸ¥ã®å€¤ã§ã™; 使用å¯èƒ½å€™è£œã¯ %r\n" @@ -26047,6 +26567,12 @@ msgid "saved backup bundle to %s\n" msgstr "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã®ãƒãƒ³ãƒ‰ãƒ«ã‚’ %s ã«ä¿å˜\n" +msgid "programming error: cannot strip from inside a transaction" +msgstr "内部エラー: トランザクション内ã§ã¯ strip 処ç†ã‚’実施ã§ãã¾ã›ã‚“" + +msgid "contact your extension maintainer" +msgstr "åŽŸå› ã¨æ€ã‚れるエクステンションã®ç®¡ç†è€…ã«ç›¸è«‡ã—ã¦ãã ã•ã„" + msgid "adding branch\n" msgstr "ブランãƒã‚’è¿½åŠ ä¸\n" @@ -26062,6 +26588,19 @@ msgid "strip failed, partial bundle stored in '%s'\n" msgstr "リビジョンã®é™¤å¤–ã«å¤±æ•—: 部分的ãªãƒãƒ³ãƒ‰ãƒ«ã‚’ '%s' ã«ä¿å˜\n" +msgid "(not rebuilding fncache because repository does not support fncache)\n" +msgstr "(fncache 未サãƒãƒ¼ãƒˆã®ãƒªãƒã‚¸ãƒˆãƒªã®ãŸã‚ã€fncache ã®å†æ§‹ç¯‰ã¯çœç•¥)\n" + +msgid "changeset" +msgstr "リビジョン" + +#, python-format +msgid "%d items added, %d removed from fncache\n" +msgstr "fncache ã« %d è¦ç´ ã‚’è¿½åŠ ã€ %d è¦ç´ を削除\n" + +msgid "fncache already up to date\n" +msgstr "fncache ã¯æœ€æ–°ã®çŠ¶æ…‹ã§ã™\n" + #, python-format msgid "revlog decompress error: %s" msgstr "revlog 圧縮ã®å±•é–‹ã‚¨ãƒ©ãƒ¼: %s" @@ -26123,6 +26662,10 @@ msgstr "linkrev -1 ãªãƒªãƒ“ジョンを %s ã«è¿½åŠ ã—よã†ã¨ã—ã¦ã„ã¾ã™" #, python-format +msgid "%s: size of %d bytes exceeds maximum revlog storage of 2GiB" +msgstr "%s: 更新後ã®ã‚µã‚¤ã‚º %d ãƒã‚¤ãƒˆã¯å±¥æ´ãƒ•ã‚¡ã‚¤ãƒ«ã®æœ€å¤§å®¹é‡ 2GiB を超éŽã—ã¾ã™" + +#, python-format msgid "node %s is not censored" msgstr "ノード %s ã¯æ¤œé–²å¯¾è±¡ã§ã¯ã‚ã‚Šã¾ã›ã‚“" @@ -26134,9 +26677,8 @@ msgid "at %s: %s" msgstr "æ–‡å—ä½ç½®: %s: %s" -#, python-format -msgid "can't use %s here" -msgstr "ã“ã“ã§ã¯ %s を使用ã§ãã¾ã›ã‚“" +msgid "can't use a key-value pair in this context" +msgstr "ã“ã“ã§ã¯ key-value ペアを使用ã§ãã¾ã›ã‚“" msgid "" "``adds(pattern)``\n" @@ -26412,17 +26954,6 @@ msgstr "divergent ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" msgid "" -"``draft()``\n" -" Changeset in draft phase." -msgstr "" -"``draft()``\n" -" フェーズ㌠draft ãªãƒªãƒ“ジョン群。" - -#. i18n: "draft" is a keyword -msgid "draft takes no arguments" -msgstr "draft ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" - -msgid "" "``extinct()``\n" " Obsolete changesets with obsolete descendants only." msgstr "" @@ -26452,8 +26983,8 @@ " 付ãã§æŒ‡å®šã—ã¦ãã ã•ã„。" #. i18n: "extra" is a keyword -msgid "extra takes at least 1 and at most 2 arguments" -msgstr "extra ã®å¼•æ•°ã¯ã€ 最低1ã¤ã€æœ€å¤§2ã¤ã§ã™" +msgid "extra takes at least 1 argument" +msgstr "extra ã«ã¯æœ€ä½Ž1ã¤ã®å¼•æ•°ãŒå¿…è¦ã§ã™" #. i18n: "extra" is a keyword msgid "first argument to extra must be a string" @@ -26855,6 +27386,28 @@ "``parents([set])``\n" " 指定リビジョン群ã¾ãŸã¯ä½œæ¥é ˜åŸŸã®ã€ 全親リビジョン群。" +msgid "" +"``draft()``\n" +" Changeset in draft phase." +msgstr "" +"``draft()``\n" +" フェーズ㌠draft ãªãƒªãƒ“ジョン群。" + +#. i18n: "draft" is a keyword +msgid "draft takes no arguments" +msgstr "draft ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" +"``secret()``\n" +" Changeset in secret phase." +msgstr "" +"``secret()``\n" +" フェーズ㌠secret ãªãƒªãƒ“ジョン群。" + +#. i18n: "secret" is a keyword +msgid "secret takes no arguments" +msgstr "secret ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + msgid "^ expects a number 0, 1, or 2" msgstr "^ ã«ã¯ 0〠1 ã¾ãŸã¯ 2 を指定ã—ã¦ãã ã•ã„" @@ -27021,17 +27574,6 @@ " 全リビジョン。" msgid "" -"``secret()``\n" -" Changeset in secret phase." -msgstr "" -"``secret()``\n" -" フェーズ㌠secret ãªãƒªãƒ“ジョン群。" - -#. i18n: "secret" is a keyword -msgid "secret takes no arguments" -msgstr "secret ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" - -msgid "" "``sort(set[, [-]key...])``\n" " Sort set by keys. The default sort order is ascending, specify a key\n" " as ``-key`` to sort in descending order." @@ -27278,7 +27820,10 @@ msgid "no suitable response from remote hg" msgstr "指定リãƒã‚¸ãƒˆãƒªã‹ã‚‰ã®å¿œç”ãŒä¸é©åˆ‡" +msgid "check previous remote output" +msgstr "連æºå…ˆã‹ã‚‰ã®ç›´å‰ã®å‡ºåŠ›ã‚’確èªã—ã¦ãã ã•ã„" + #, python-format msgid "push refused: %s" msgstr "å±¥æ´åæ˜ ãŒæ‹’å¦ã•ã‚Œã¾ã—ãŸ: %s" @@ -27281,7 +27826,11 @@ #, python-format msgid "push refused: %s" msgstr "å±¥æ´åæ˜ ãŒæ‹’å¦ã•ã‚Œã¾ã—ãŸ: %s" +#, python-format +msgid "passphrase for %s: " +msgstr "%s ã®ãƒ‘スフレーズ: " + msgid "ssl connection failed" msgstr "ssl 接続ã«å¤±æ•—" @@ -27285,12 +27834,6 @@ msgid "ssl connection failed" msgstr "ssl 接続ã«å¤±æ•—" -msgid "Python SSL support not found" -msgstr "Python ã® SSL サãƒãƒ¼ãƒˆæ©Ÿèƒ½ãŒä½¿ç”¨ã§ãã¾ã›ã‚“" - -msgid "certificate checking requires Python 2.6" -msgstr "証明書検証ã«ã¯ Python 2.6 ãŒå¿…è¦ã§ã™" - msgid "no certificate received" msgstr "証明書ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“" @@ -27309,18 +27852,6 @@ msgstr "web.cacerts ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“: %s" #, python-format -msgid "host fingerprint for %s can't be verified (Python too old)" -msgstr "ホスト %s ã®ãƒ•ã‚£ãƒ³ã‚¬ãƒ¼ãƒ—リントãŒæ¤œè¨¼ã§ãã¾ã›ã‚“ (Python ãŒå¤ã„ãŸã‚)" - -#, python-format -msgid "certificate for %s can't be verified (Python too old)" -msgstr "%s ã®è¨¼æ˜Žæ›¸ã¯æ¤œè¨¼ã§ãã¾ã›ã‚“ (Python ãŒå¤ã„ãŸã‚)" - -#, python-format -msgid "warning: certificate for %s can't be verified (Python too old)\n" -msgstr "è¦å‘Š: %s ã®è¨¼æ˜Žæ›¸ã¯æ¤œè¨¼ã§ãã¾ã›ã‚“ (Python ãŒå¤ã„ãŸã‚)\n" - -#, python-format msgid "%s ssl connection error" msgstr "%s ã¸ã® ssl 接続ã«å¤±æ•—" @@ -27509,6 +28040,14 @@ msgstr "サブリãƒã‚¸ãƒˆãƒª %s ã®å¤‰æ›´å–り消ã—ä¸\n" #, python-format +msgid "subrepo '%s' is hidden in revision %s\n" +msgstr "サブリãƒã‚¸ãƒˆãƒª '%s' ã®å‚照先ã¯ãƒªãƒ“ジョン %s 時点ã§ä¸å¯è¦–ã§ã™\n" + +#, python-format +msgid "subrepo '%s' not found in revision %s\n" +msgstr "サブリãƒã‚¸ãƒˆãƒª '%s' ã¯ãƒªãƒ“ジョン %s 時点ã§ä¸åœ¨ã§ã™\n" + +#, python-format msgid "'svn' executable not found for subrepo '%s'" msgstr "サブリãƒã‚¸ãƒˆãƒª '%s' ã«ä½¿ç”¨ã™ã‚‹ 'svn' コマンドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" @@ -27739,6 +28278,18 @@ " 'Foo Bar'" msgid "" +":revescape: Any text. Escapes all \"special\" characters, except @.\n" +" Forward slashes are escaped twice to prevent web servers from " +"prematurely\n" +" unescaping them. For example, \"@foo bar/baz\" becomes \"@foo%20bar" +"%252Fbaz\"." +msgstr "" +":revescape: æ–‡å—列。 @ 以外ã®å…¨ã¦ã®ã€Œç‰¹æ®Šã€æ–‡å—を変æ›ã—ã¾ã™ã€‚\n" +" ウェブサービスã«ã‚ˆã‚‹æ—©æœŸã®å¾©å·ã‚’防ããŸã‚〠スラッシュ (\"/\") ã¯äºŒé‡ã«" +"変æ›ã•ã‚Œã¾ã™ã€‚ 例ãˆã° \"@foo bar/baz\" ã¯\n" +" \"@foo%20bar%252Fbaz\" ã¨ãªã‚Šã¾ã™ã€‚" + +msgid "" ":rfc3339date: Date. Returns a date using the Internet date format\n" " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"." msgstr "" @@ -27828,12 +28379,13 @@ msgid "" ":bookmarks: List of strings. Any bookmarks associated with the\n" -" changeset." -msgstr "" -":bookmarks: æ–‡å—列列挙。 当該リビジョンã«ä»˜ä¸Žã•ã‚ŒãŸãƒ–ックマークã®ä¸€è¦§ã€‚" +" changeset. Also sets 'active', the name of the active bookmark." +msgstr "" +":bookmarks: æ–‡å—列列挙。 当該リビジョンã«ä»˜ä¸Žã•ã‚ŒãŸãƒ–ックマークã®ä¸€è¦§ã€‚\n" +" アクティブブックマークãŒå˜åœ¨ã™ã‚‹å ´åˆã¯ 'active' ãŒè¨å®šã•ã‚Œã¾ã™ã€‚" msgid ":children: List of strings. The children of the changeset." msgstr ":children: æ–‡å—列列挙。 リビジョンã®å供。" msgid "" ":currentbookmark: String. The active bookmark, if it is\n" @@ -27834,9 +28386,9 @@ 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" +" associated with the changeset (DEPRECATED)" msgstr "" ":currentbookmark: æ–‡å—列. アクティブブックマーク (対象リビジョンã«å¯¾ã—ã¦ã€\n" @@ -27841,5 +28393,12 @@ msgstr "" ":currentbookmark: æ–‡å—列. アクティブブックマーク (対象リビジョンã«å¯¾ã—ã¦ã€\n" +" 関連付ã‘られã¦ã„ã‚‹å ´åˆã®ã¿) (éžæŽ¨å¥¨)" + +msgid "" +":activebookmark: String. The active bookmark, if it is\n" +" associated with the changeset" +msgstr "" +":activebookmark: æ–‡å—列. アクティブブックマーク (対象リビジョンã«å¯¾ã—ã¦ã€\n" " 関連付ã‘られã¦ã„ã‚‹å ´åˆã®ã¿)" msgid ":date: Date information. The date when the changeset was committed." @@ -27891,11 +28450,12 @@ " 登録除外ファイルã®ä¸€è¦§ã€‚" msgid "" -":latesttag: String. Most recent global tag in the ancestors of this\n" -" changeset." -msgstr "" -":latesttag: æ–‡å—列。 当該リビジョンã®ç¥–å…ˆã«å¯¾ã—ã¦æœ€ã‚‚最近ã«ä»˜ä¸Žã•ã‚ŒãŸã‚¿ã‚°" +":latesttag: List of strings. The global tags on the most recent globally\n" +" tagged ancestor of this changeset." +msgstr "" +":latesttag: æ–‡å—列列挙。 当該リビジョンã®ç¥–å…ˆã«å¯¾ã—ã¦ã€\n" +" 最も最近ã«ä»˜ä¸Žã•ã‚ŒãŸã‚°ãƒãƒ¼ãƒãƒ«ã‚¿ã‚°ã®ä¸€è¦§" msgid ":latesttagdistance: Integer. Longest path to the latest tag." msgstr ":latesttagdistance: 整数。 最新タグã¸ã®æœ€é•·ãƒ‘ス" @@ -27898,7 +28458,12 @@ msgid ":latesttagdistance: Integer. Longest path to the latest tag." msgstr ":latesttagdistance: 整数。 最新タグã¸ã®æœ€é•·ãƒ‘ス" +msgid ":changessincelatesttag: Integer. All ancestors not in the latest tag." +msgstr "" +":changessincelatesttag: 数値。 最新タグ以é™ã®å…¨ç¥–先リビジョン数。\n" +" (※ 訳注: å±¥æ´ä¸ã«åˆ†å²ãŒãªã„å ´åˆã¯ latesttagdistance ã¨ç‰ä¾¡ã§ã™)" + msgid "" ":node: String. The changeset identification hash, as a 40 hexadecimal\n" " digit string." @@ -27959,6 +28524,12 @@ ":parents: æ–‡å—列列挙。 当該リビジョンã®è¦ªãƒªãƒ“ジョン㮠\"rev:node\" å½¢å¼ã€‚\n" " 親ãŒå˜ä¸€ã§ã€ 且ã¤ãƒªãƒ“ジョン番å·ãŒï¼‘ã¤å‰ã®å ´åˆã¯ã€ 何も表示ã•ã‚Œã¾ã›ã‚“。" +msgid "integer literal without digits" +msgstr "数値ã®æŒ‡å®šãŒã‚ã‚Šã¾ã›ã‚“" + +msgid "unterminated template expansion" +msgstr "テンプレート定義ãŒçµ‚端ã—ã¦ã„ã¾ã›ã‚“" + #, python-format msgid "unknown method '%s'" msgstr "未知ã®å‡¦ç† '%s' ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" @@ -28035,6 +28606,20 @@ msgstr "pad() ã®å¼•æ•°ã¯2ã¤ã‹ã‚‰4ã¤ã®é–“ã§ã™" msgid "" +":indent(text, indentchars[, firstline]): Indents all non-empty lines\n" +" with the characters given in the indentchars string. An optional\n" +" third parameter will override the indent for the first line only\n" +" if present." +msgstr "" +":indent(text, indentchars[, firstline]): 空白行以外を indentchars\n" +" を使ã£ã¦å—下ã’ã—ã¾ã™ã€‚ firstline ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 最åˆã®è¡Œã¯ã€\n" +" firstline を使ã£ã¦å—下ã’ã•ã‚Œã¾ã™ã€‚" + +#. i18n: "indent" is a keyword +msgid "indent() expects two or three arguments" +msgstr "indent() ã¯2ã¾ãŸã¯3ã®å¼•æ•°ãŒå¿…è¦ã§ã™" + +msgid "" ":get(dict, key): Get an attribute/key from an object. Some keywords\n" " are complex types. This function allows you to obtain the value of an\n" " attribute on these type." @@ -28165,8 +28750,9 @@ msgid "word expects two or three arguments, got %d" msgstr "word ã¯2ã¾ãŸã¯3ã®å¼•æ•°ãŒå¿…è¦ã§ã™ (実際ã®å¼•æ•°ã¯ %d 個)" -msgid "Use strings like '3' for numbers passed to word function" -msgstr "word 関数ã«ã¯ '3' ã®ã‚ˆã†ãªæ–‡å—列形å¼ã§æ•°å€¤ã‚’指定ã—ã¦ãã ã•ã„" +#. i18n: "word" is a keyword +msgid "word expects an integer index" +msgstr "word ã«ã¯ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹å€¤ã‚’数値ã§æŒ‡å®šã—ã¦ãã ã•ã„" msgid "unmatched quotes" msgstr "引用符ã®å¯¾å¿œé–¢ä¿‚ãŒä¸æ£ã§ã™" @@ -28601,8 +29187,9 @@ msgid "broken revlog! (%s)" msgstr "ä¸æ£ãª revlog! (%s)" -msgid "missing revlog!" -msgstr "revlog ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“!" +#, python-format +msgid " warning: revlog '%s' not in fncache!" +msgstr " è¦å‘Š: å±¥æ´ãƒ•ã‚¡ã‚¤ãƒ« '%s' 㯠fncache ã«å«ã¾ã‚Œã¦ã„ã¾ã›ã‚“!" #, python-format msgid "%s not in manifests" @@ -28651,6 +29238,10 @@ 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"