diff --git a/i18n/ja.po b/i18n/ja.po index fc081623f4bd918e384b47231707a4ee71dc1ccf_aTE4bi9qYS5wbw==..da4175159dac80ebc954530a5abfbacf064ba465_aTE4bi9qYS5wbw== 100644 --- a/i18n/ja.po +++ b/i18n/ja.po @@ -50,6 +50,7 @@ # backout 打ã¡æ¶ˆã— # basename パスå末尾è¦ç´ # binary ãƒã‚¤ãƒŠãƒª +# bisect 二分探索 # branch ブランム# bundle( file) ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ« # change ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆ/差分 @@ -143,7 +144,7 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2013-02-28 16:20+0900\n" +"POT-Creation-Date: 2013-04-30 18:34+0900\n" "PO-Revision-Date: 2009-11-16 21:24+0100\n" "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" "Language-Team: Japanese\n" @@ -610,6 +611,53 @@ msgstr "" "acl: ユーザ \"%s\" ã¯ãƒ•ã‚¡ã‚¤ãƒ« \"%s\" ãŒè¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“(リビジョン \"%s\")" +msgid "log repository events to a blackbox for debugging" +msgstr "" + +msgid "" +"Logs event information to .hg/blackbox.log to help debug and diagnose " +"problems.\n" +"The events that get logged can be configured via the blackbox.track config " +"key.\n" +"Examples:" +msgstr "" + +msgid "" +" [blackbox]\n" +" track = *" +msgstr "" + +msgid "" +" [blackbox]\n" +" track = command, commandfinish, commandexception, exthook, pythonhook" +msgstr "" + +msgid "" +" [blackbox]\n" +" track = incoming" +msgstr "" + +msgid "" +" [blackbox]\n" +" # limit the size of a log file\n" +" maxsize = 1.5 MB\n" +" # rotate up to N log files when the current one gets too big\n" +" maxfiles = 3" +msgstr "" + +msgid "the number of events to show" +msgstr "イベント表示数" + +msgid "hg blackbox [OPTION]..." +msgstr "hg blackbox [OPTION]..." + +msgid "" +"view the recent repository events\n" +" " +msgstr "" +"最新ã®ãƒªãƒã‚¸ãƒˆãƒªã‚¤ãƒ™ãƒ³ãƒˆã®è¡¨ç¤º\n" +" " + msgid "hooks for integrating with the Bugzilla bug tracker" msgstr "Bugzilla ãƒã‚°ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ ã¨ã®é€£æºç”¨ãƒ•ãƒƒã‚¯é›†" @@ -1753,7 +1801,15 @@ " supported by Mercurial sources." msgstr "" " --sourcesort 変æ›å…ƒã®ãƒªãƒ“ã‚¸ãƒ§ãƒ³é †åºã‚’ç¶æŒã—ã¾ã™ã€‚ 変æ›å…ƒå½¢å¼ãŒ\n" -" Mercurial ã§ã®ã¿ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã™ã€‚" +" Mercurial ã®å ´åˆã®ã¿ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¾ã™ã€‚" + +msgid "" +" --closesort try to move closed revisions as close as possible\n" +" to parent branches, only supported by Mercurial\n" +" sources." +msgstr "" +" --closesort 閉鎖実施リビジョンを〠極力親ブランãƒå‚ã«ç§»å‹•ã—ã¾ã™ã€‚\n" +" 変æ›å…ƒå½¢å¼ãŒ Mercurial ã®å ´åˆã®ã¿ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¾ã™ã€‚" msgid "" " If ``REVMAP`` isn't given, it will be put in a default location\n" @@ -2245,6 +2301,6 @@ msgstr "変æ›æ™‚ã®ãƒ–ランãƒå変æ›ç”¨ãƒ•ã‚¡ã‚¤ãƒ«" msgid "try to sort changesets by branches" -msgstr "ブランãƒã«ã‚ˆã‚‹ãƒªãƒ“ジョンã®ä¸¦ã³æ›¿ãˆã‚’試ã™" +msgstr "ブランãƒã«ã‚ˆã‚‹ãƒªãƒ“ジョンã®ä¸¦ã³æ›¿ãˆ" msgid "try to sort changesets by date" @@ -2249,5 +2305,5 @@ msgid "try to sort changesets by date" -msgstr "日付ã«ã‚ˆã‚‹ãƒªãƒ“ジョンã®ä¸¦ã³æ›¿ãˆã‚’試ã™" +msgstr "日付ã«ã‚ˆã‚‹ãƒªãƒ“ジョンã®ä¸¦ã³æ›¿ãˆ" msgid "preserve source changesets order" @@ -2252,6 +2308,9 @@ msgid "preserve source changesets order" -msgstr "元リãƒã‚¸ãƒˆãƒªã§ã®ãƒªãƒ“ジョンã®ä¸¦ã³é †ã‚’å°Šé‡" +msgstr "元リãƒã‚¸ãƒˆãƒªã§ã®ãƒªãƒ“ã‚¸ãƒ§ãƒ³é †ã‚’å°Šé‡" + +msgid "try to reorder closed revisions" +msgstr "閉鎖実施リビジョン群ã®ä¸¦ã³æ›¿ãˆ" msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" msgstr "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" @@ -2319,7 +2378,7 @@ #, python-format msgid "%s is not available in %s anymore" -msgstr "%s 㯠%s ã«ãŠã„ã¦å˜åœ¨ã—ã¾ã›ã‚“" +msgstr "%s 㯠%s ã«å˜åœ¨ã—ã¾ã›ã‚“" #, python-format msgid "%s.%s symlink has no target" @@ -2439,6 +2498,9 @@ msgid "--sourcesort is not supported by this data source" msgstr "指定ã®å¤‰æ›å…ƒã¯ --sourcesort ãŒæœªã‚µãƒãƒ¼ãƒˆã§ã™" +msgid "--closesort is not supported by this data source" +msgstr "指定ã®å¤‰æ›å…ƒã¯ --closesort ãŒæœªã‚µãƒãƒ¼ãƒˆã§ã™" + #, python-format msgid "%s does not look like a CVS checkout" msgstr "%s 㯠CVS 作æ¥é ˜åŸŸã§ã¯ãªã„ã¨æ€ã‚ã‚Œã¾ã™" @@ -4177,6 +4239,13 @@ msgid "%s: empty changeset" msgstr "%s: 空ã®ãƒªãƒ“ジョン" +#, python-format +msgid "comparing with %s\n" +msgstr "%s ã¨æ¯”較ä¸\n" + +msgid "no outgoing ancestors" +msgstr "åæ˜ å€™è£œãƒªãƒ“ã‚¸ãƒ§ãƒ³ãŒã‚ã‚Šã¾ã›ã‚“" + msgid "Read history edits from the specified file." msgstr "å±¥æ´æ”¹å¤‰æ‰‹é †ã‚’指定ファイルã‹ã‚‰èªã¿è¾¼ã¿" @@ -4211,13 +4280,6 @@ msgid "source has mq patches applied" msgstr "元リãƒã‚¸ãƒˆãƒªã§ã¯ MQ パッãƒãŒé©ç”¨ä¸ã§ã™" -msgid "only one repo argument allowed with --outgoing" -msgstr "--outgoing 指定時ã«ã¯ã€å¼•æ•°ã¯ï¼‘ã¤ã—ã‹æŒ‡å®šã§ãã¾ã›ã‚“" - -#, python-format -msgid "comparing with %s\n" -msgstr "%s ã¨æ¯”較ä¸\n" - msgid "--force only allowed with --outgoing" msgstr "--outgoing 指定時ã®ã¿ --force を指定å¯èƒ½ã§ã™" @@ -4230,6 +4292,12 @@ msgid "history edit already in progress, try --continue or --abort" msgstr "å±¥æ´æ”¹å¤‰ã¯ç¶™ç¶šä¸ã§ã™ã€‚ --continue ã¾ãŸã¯ --abort を指定ã—ã¦ãã ã•ã„" +msgid "no revisions allowed with --outgoing" +msgstr "--outgoing ã¨ãƒªãƒ“ジョン指定ã¯ä½µç”¨ã§ãã¾ã›ã‚“" + +msgid "only one repo argument allowed with --outgoing" +msgstr "--outgoing 指定時ã«ã¯ã€å¼•æ•°ã¯ï¼‘ã¤ã—ã‹æŒ‡å®šã§ãã¾ã›ã‚“" + msgid "histedit requires exactly one parent revision" msgstr "å±¥æ´æ”¹å¤‰ã«ã¯å˜ä¸€ã®è¦ªãƒªãƒ“ジョンを指定ã—ã¦ãã ã•ã„" @@ -4233,12 +4301,9 @@ msgid "histedit requires exactly one parent revision" msgstr "å±¥æ´æ”¹å¤‰ã«ã¯å˜ä¸€ã®è¦ªãƒªãƒ“ジョンを指定ã—ã¦ãã ã•ã„" -msgid "nothing to edit\n" -msgstr "改変ã®å¿…è¦ãªãƒªãƒ“ジョンãŒã‚ã‚Šã¾ã›ã‚“\n" - -#, python-format -msgid "working directory parent is not a descendant of %s" -msgstr "作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョン㯠%s ã®åå«ã§ã¯ã‚ã‚Šã¾ã›ã‚“" +#, python-format +msgid "%s is not an ancestor of working directory" +msgstr "%s ã¯ä½œæ¥é ˜åŸŸã®ç¥–å…ˆã§ã¯ã‚ã‚Šã¾ã›ã‚“" #, python-format msgid "update to %s or descendant and run \"hg histedit --continue\" again" @@ -4252,10 +4317,7 @@ msgid "cannot edit immutable changeset: %s" msgstr "改変ä¸èƒ½ãªãƒªãƒ“ジョンãŒã‚ã‚Šã¾ã™: %s" -msgid "must specify a rule for each changeset once" -msgstr "1リビジョン毎ã«ï¼‘ã¤ã®ãƒ«ãƒ¼ãƒ«æŒ‡å®šãŒå¿…è¦ã§ã™" - #, python-format msgid "malformed line \"%s\"" msgstr "ä¸æ£ãªè¡Œ \"%s\"" @@ -4258,11 +4320,8 @@ #, python-format msgid "malformed line \"%s\"" msgstr "ä¸æ£ãªè¡Œ \"%s\"" -msgid "may not use changesets other than the ones listed" -msgstr "対象範囲以外ã®ãƒªãƒ“ジョンã¯æŒ‡å®šã§ãã¾ã›ã‚“" - #, python-format msgid "unknown changeset %s listed" msgstr "未知ã®ãƒªãƒ“ジョン %s ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" @@ -4265,9 +4324,16 @@ #, python-format msgid "unknown changeset %s listed" msgstr "未知ã®ãƒªãƒ“ジョン %s ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" +msgid "may not use changesets other than the ones listed" +msgstr "対象範囲以外ã®ãƒªãƒ“ジョンã¯æŒ‡å®šã§ãã¾ã›ã‚“" + +#, python-format +msgid "duplicated command for changeset %s" +msgstr "リビジョン %s ã¸ã®ãƒ«ãƒ¼ãƒ«æŒ‡å®šãŒè¤‡æ•°ã‚ã‚Šã¾ã™" + #, python-format msgid "unknown action \"%s\"" msgstr "未知ã®æ“作 \"%s\" ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" #, python-format @@ -4269,8 +4335,15 @@ #, python-format msgid "unknown action \"%s\"" msgstr "未知ã®æ“作 \"%s\" ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" #, python-format +msgid "missing rules for changeset %s" +msgstr "リビジョン %s ã¸ã®ãƒ«ãƒ¼ãƒ«æŒ‡å®šãŒã‚ã‚Šã¾ã›ã‚“" + +msgid "do you want to use the drop action?" +msgstr "リビジョンã®ç ´æ£„ã«ã¯ drop コマンド指定ãŒå¿…è¦ã§ã™" + +#, python-format msgid "histedit: moving bookmarks %s from %s to %s\n" msgstr "histedit: ブックマーク %s ã‚’ %s ã‹ã‚‰ %s ã«ç§»å‹•ä¸\n" @@ -4874,18 +4947,58 @@ msgid "" "When you pull a changeset that affects largefiles from a remote\n" -"repository, Mercurial behaves as normal. However, when you update to\n" -"such a revision, any largefiles needed by that revision are downloaded\n" -"and cached (if they have never been downloaded before). This means\n" -"that network access may be required to update to changesets you have\n" -"not previously updated to." -msgstr "" -"連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã‹ã‚‰å–ã‚Šè¾¼ã¾ã‚Œã‚‹ãƒªãƒ“ジョンãŒã€ 大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€\n" -"影響ã®ã‚ã‚‹ã‚‚ã®ã§ã‚ã‚‹å ´åˆã€ Mercurial ã®æŒ™å‹•ã¯é€šå¸¸ã¨å¤‰ã‚ã‚Šã¾ã›ã‚“。\n" -"但ã—〠当該リビジョンã§ã®ä½œæ¥é ˜åŸŸæ›´æ–°ã®éš›ã«ã€ å¿…è¦ãªå¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ãŒã€\n" -"転é€ï¼ã‚ャッシュã•ã‚Œã¾ã™ (事å‰å…¥æ‰‹ã•ã‚Œã¦ã„ãªã„å ´åˆã®ã¿)。 ãã®ãŸã‚ã€\n" -"ã“ã‚Œã¾ã§ :hg:`update` 対象ã«ãªã£ã¦ã„ãªã„リビジョンを使用ã™ã‚‹éš›ã«ã¯ã€\n" -"ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŽ¥ç¶šã‚’å¿…è¦ã¨ã™ã‚‹å¯èƒ½æ€§ãŒç”Ÿã˜ã¾ã™ã€‚" +"repository, the largefiles for the changeset will by default not be\n" +"pulled down. However, when you update to such a revision, any\n" +"largefiles needed by that revision are downloaded and cached (if\n" +"they have never been downloaded before). One way to pull largefiles\n" +"when pulling is thus to use --update, which will update your working\n" +"copy to the latest pulled revision (and thereby downloading any new\n" +"largefiles)." +msgstr "" +"連æºå…ˆã‹ã‚‰å–り込むリビジョンãŒã€ 大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã«é–¢ã™ã‚‹ã‚‚ã®ã§ã‚ã£ã¦ã‚‚ã€\n" +"特ã«æŒ‡å®šãŒç„¡ã‘ã‚Œã°ã€ 大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã›ã‚“。 ãã®ä¸€æ–¹ã§ã€\n" +"大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã«é–¢ä¿‚ã™ã‚‹ãƒªãƒ“ジョンã§ã€ 作æ¥é ˜åŸŸã‚’æ›´æ–°ã—よã†ã¨ã—ãŸå ´åˆã€\n" +"å¿…è¦ã¨ã•ã‚Œã‚‹ (且ã¤æœªå–å¾—ãª) 大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã¨ã€\n" +"ã‚ãƒ£ãƒƒã‚·ãƒ¥é ˜åŸŸã¸ã®æ ¼ç´ãŒå®Ÿæ–½ã•ã‚Œã¾ã™ã€‚ å±¥æ´å–ã‚Šè¾¼ã¿ã¨åŒæ™‚ã«ã€\n" +"大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å–å¾—ã™ã‚‹æ–¹æ³•ã¨ã—ã¦ã¯ã€ 作æ¥é ˜åŸŸã‚’最新リビジョンã§æ›´æ–°ã™ã‚‹\n" +"--update を〠履æ´å–ã‚Šè¾¼ã¿ã®éš›ã«æŒ‡å®šã™ã‚‹æ–¹æ³•ãŒã‚ã‚Šã¾ã™ã€‚" + +msgid "" +"If you want to pull largefiles you don't need for update yet, then\n" +"you can use pull with the `--lfrev` option or the :hg:`lfpull` command." +msgstr "" +"作æ¥é ˜åŸŸæ›´æ–°ã§ã¯å¿…è¦ã¨ã•ã‚Œãªã„大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã‚‚å–å¾—ã—ãŸã„å ´åˆã¯ã€\n" +"å±¥æ´å–ã‚Šè¾¼ã¿ã®éš›ã« `--lfrev` を指定ã™ã‚‹ã‹ã€ :hg:`lfpull` を使用ã—ã¾ã™ã€‚" + +msgid "" +"If you know you are pulling from a non-default location and want to\n" +"download all the largefiles that correspond to the new changesets at\n" +"the same time, then you can pull with `--lfrev \"pulled()\"`." +msgstr "" +"リビジョンå–ã‚Šè¾¼ã¿ã®éš›ã«ã€ 関連ã™ã‚‹å…¨å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å–å¾—ã—ãŸã„å ´åˆã¯ã€\n" +"`--lfrev \"pulled()\"` を指定ã—ã¦ãã ã•ã„。" + +msgid "" +"If you just want to ensure that you will have the largefiles needed to\n" +"merge or rebase with new heads that you are pulling, then you can pull\n" +"with `--lfrev \"head(pulled())\"` flag to pre-emptively download any " +"largefiles\n" +"that are new in the heads you are pulling." +msgstr "" +"å–得対象大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã‚’〠å–ã‚Šè¾¼ã¾ã‚ŒãŸæ–°è¦ãƒ˜ãƒƒãƒ‰ãƒªãƒ“ジョンã®ãƒžãƒ¼ã‚¸ã‚„移動\n" +"(rebase) ã«å¿…è¦ãªã‚‚ã®ã ã‘ã«é™å®šã—ãŸã„å ´åˆã¯ã€ `--lfrev \"head(pulled())\"`\n" +"を指定ã—ã¦ãã ã•ã„。" + +msgid "" +"Keep in mind that network access may now be required to update to\n" +"changesets that you have not previously updated to. The nature of the\n" +"largefiles extension means that updating is no longer guaranteed to\n" +"be a local-only operation." +msgstr "" +"関連ã™ã‚‹å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ãŒæœªå–å¾—ãªå ´åˆã¯ã€ 作æ¥é ˜åŸŸæ›´æ–°ã§ã‚ã£ã¦ã‚‚ã€\n" +"ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¢ã‚¯ã‚»ã‚¹ãŒå¿…è¦ã«ãªã‚‹ã‹ã‚‚ã—ã‚Œãªã„点ã«ç•™æ„ã—ã¦ãã ã•ã„。\n" +"largefiles エクステンション使用時ã«ã¯ã€ 作æ¥é ˜åŸŸæ›´æ–°æ“作ã§ã‚ã£ã¦ã‚‚ã€\n" +"作æ¥ä¸ã®ãƒªãƒã‚¸ãƒˆãƒªã«é–‰ã˜ãŸæ“作ã§ã¯ãªã„å¯èƒ½æ€§ãŒã‚ã‚‹ã®ã§ã™ã€‚" msgid "" "If you already have large files tracked by Mercurial without the\n" @@ -5002,6 +5115,45 @@ " --to-normal を指定ã—ã¾ã™ã€‚ 変æ›å¾Œãƒªãƒã‚¸ãƒˆãƒªã¯ã€ largefiles\n" " エクステンション無ã—ã§ã‚‚使用ã§ãã¾ã™ã€‚" +msgid "pull largefiles for the specified revisions from the specified source" +msgstr "指定リビジョンã«é–¢é€£ã™ã‚‹å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ã®å–ã‚Šè¾¼ã¿" + +msgid "" +" Pull largefiles that are referenced from local changesets but missing\n" +" locally, pulling from a remote repository to the local cache." +msgstr "" +" 作æ¥ä¸ãƒªãƒã‚¸ãƒˆãƒªä¸ã«ã‚る指定リビジョンã«é–¢é€£ã™ã‚‹å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ã®ã†ã¡ã€\n" +" 未å–å¾—ã®ã‚‚ã®ã‚’å–ã‚Šè¾¼ã¿ã€ ã‚ãƒ£ãƒƒã‚·ãƒ¥é ˜åŸŸã«ä¿å˜ã—ã¾ã™ã€‚" + +msgid "" +" If SOURCE is omitted, the 'default' path will be used.\n" +" See :hg:`help urls` for more information." +msgstr "" +" 連æºå…ˆãŒçœç•¥ã•ã‚ŒãŸå ´åˆã€ 'default' パスãŒé€£æºå…ˆã¨ã—ã¦ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚\n" +" 詳細㯠:hg:`help urls` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" + +msgid " .. container:: verbose" +msgstr " .. container:: verbose" + +msgid " Some examples:" +msgstr " 例:" + +msgid " - pull largefiles for all branch heads::" +msgstr " - å…¨åå‰ä»˜ãブランãƒã®ãƒ˜ãƒƒãƒ‰ã«é–¢é€£ã™ã‚‹å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å–å¾—::" + +msgid " hg lfpull -r \"head() and not closed()\"" +msgstr " hg lfpull -r \"head() and not closed()\"" + +msgid " - pull largefiles on the default branch::" +msgstr " - default ブランãƒã®ãƒªãƒ“ジョンã«é–¢é€£ã™ã‚‹å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å–å¾—::" + +msgid "" +" hg lfpull -r \"branch(default)\"\n" +" " +msgstr "" +" hg lfpull -r \"branch(default)\"\n" +" " + #, python-format msgid "error getting id %s from url %s for file %s: %s\n" msgstr "è˜åˆ¥å %s (連æºå…ˆ %s ã®ãƒ•ã‚¡ã‚¤ãƒ« %s) ã«å¯¾ã™ã‚‹ã‚¨ãƒ©ãƒ¼: %s\n" @@ -5014,6 +5166,10 @@ msgstr "ファイル %s ã®å–å¾—ä¸:%s\n" #, python-format +msgid "%s: largefile %s not available from %s\n" +msgstr "%s: 大容é‡ãƒ•ã‚¡ã‚¤ãƒ« %s 㯠%s ã«å˜åœ¨ã—ã¾ã›ã‚“\n" + +#, python-format msgid "%s: data corruption (expected %s, got %s)\n" msgstr "%s: ãƒ‡ãƒ¼ã‚¿ç ´æを検出 (想定ãƒãƒƒã‚·ãƒ¥å€¤ %s ã«å¯¾ã—㦠%s)\n" @@ -5094,9 +5250,16 @@ msgid "%d largefiles updated, %d removed\n" msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã®æ›´æ–°æ•° %d〠削除数 %d\n" -#, python-format -msgid "largefile %s is not in cache and could not be downloaded" -msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ« %s ã¯ã‚ャッシュã•ã‚Œã¦ãŠã‚‰ãšã€ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã‚‚ã§ãã¾ã›ã‚“" +msgid "no revisions specified" +msgstr "リビジョン指定ãŒã‚ã‚Šã¾ã›ã‚“" + +#, python-format +msgid "pulling largefiles for revision %s\n" +msgstr "リビジョン %s ã«é–¢é€£ã™ã‚‹å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ã®å–å¾—ä¸\n" + +#, python-format +msgid "%d largefiles cached\n" +msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ« %d 個をã‚ャッシュ\n" msgid "minimum size (MB) for files to be converted as largefiles" msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ«åŒ–ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®æœ€å°ã‚µã‚¤ã‚º (MB)" @@ -5107,6 +5270,12 @@ 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" @@ -5130,24 +5299,12 @@ msgstr "ファイルãŒæ‰‹å…ƒã«ã‚ã‚Šã¾ã›ã‚“" #, python-format -msgid "" -"changeset %s: %s missing\n" -" (looked for hash %s)\n" -msgstr "" -"リビジョン %s: %s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“\n" -" (ãƒãƒƒã‚·ãƒ¥å€¤ %s を想定)\n" - -#, python-format -msgid "" -"changeset %s: %s: contents differ\n" -" (%s:\n" -" expected hash %s,\n" -" but got %s)\n" -msgstr "" -"リビジョン %s: %s ã®å†…容ãŒç•°ãªã‚Šã¾ã™\n" -" (%s:\n" -" 想定ãƒãƒƒã‚·ãƒ¥å€¤ %s ã«å¯¾ã—ã¦\n" -" 実際ã®ãƒãƒƒã‚·ãƒ¥å€¤ã¯ %s)\n" +msgid "changeset %s: %s references missing %s\n" +msgstr "リビジョン %s: %s ãŒå‚ç…§ã—ã¦ã„ã‚‹ %s ãŒä¸åœ¨ã§ã™\n" + +#, python-format +msgid "changeset %s: %s references corrupted %s\n" +msgstr "リビジョン %s: %s ãŒå‚ç…§ã—ã¦ã„ã‚‹ %s ãŒç ´æã—ã¦ã„ã¾ã™\n" #, python-format msgid "%s already a largefile\n" @@ -5233,12 +5390,8 @@ msgid "destination largefile already exists" msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã®è¤‡è£½å…ˆã¯æ—¢ã«å˜åœ¨ã—ã¾ã™" -msgid "caching new largefiles\n" -msgstr "æ–°è¦å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚ャッシュä¸\n" - -#, python-format -msgid "%d largefiles cached\n" -msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ« %d 個をã‚ャッシュ\n" +msgid "pulled() only available in --lfrev" +msgstr "pulled() 述語㯠--lfrev 指定ã§ã®ã¿æœ‰åŠ¹ã§ã™" #, python-format msgid "--all-largefiles is incompatible with non-local destination %s" @@ -5281,6 +5434,10 @@ msgid "largefiles: %d to upload\n" msgstr "largefiles: %d 個ã®è»¢é€äºˆå®šãƒ•ã‚¡ã‚¤ãƒ«\n" +#, python-format +msgid "largefile %s is not in cache and could not be downloaded" +msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ« %s ã¯ã‚ャッシュã•ã‚Œã¦ãŠã‚‰ãšã€ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã‚‚ã§ãã¾ã›ã‚“" + msgid "largefile contents do not match hash" msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã®å†…容ãŒæƒ³å®šãƒãƒƒã‚·ãƒ¥å€¤ã¨ä¸€è‡´ã—ã¾ã›ã‚“" @@ -5321,14 +5478,6 @@ msgstr "remotestore: ファイル %s ã‚’é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“: %s" #, python-format -msgid "remotestore: largefile %s is invalid" -msgstr "remotestore: 大容é‡ãƒ•ã‚¡ã‚¤ãƒ« %s ã¯ç„¡åŠ¹ã§ã™" - -#, python-format -msgid "remotestore: largefile %s is missing" -msgstr "remotestore: 大容é‡ãƒ•ã‚¡ã‚¤ãƒ« %s ã¯å˜åœ¨ã—ã¾ã›ã‚“" - -#, python-format msgid "changeset %s: %s: contents differ\n" msgstr "リビジョン %s: %s: 内容ãŒç•°ãªã‚Šã¾ã™\n" @@ -5337,14 +5486,6 @@ msgstr "リビジョン %s: ファイル %s ãŒä¸åœ¨ã§ã™\n" #, python-format -msgid "" -"largefiles: repo method %r appears to have already been wrapped by another " -"extension: largefiles may behave incorrectly\n" -msgstr "" -"largefiles: ä»–ã®ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ãŒ %r 機能を書ãæ›ãˆã¦ã„る模様ã§ã™:" -"largefiles ãŒæƒ³å®šå¤–ã®æŒ™å‹•ã‚’ã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™\n" - -#, python-format msgid "file \"%s\" is a largefile standin" msgstr "\"%s\" ã¯å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ã®ä»£ç†ãƒ•ã‚¡ã‚¤ãƒ«ã§ã™" @@ -5359,14 +5500,14 @@ msgstr "" "指定サイズ (å˜ä½:MB) 以上ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’〠大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã¨ã—ã¦è¿½åŠ (既定値:10)" -msgid "verify largefiles" -msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã‚’検証" - -msgid "verify all revisions of largefiles not just current" -msgstr "ç¾ãƒªãƒ“ジョン以外ã§ã‚‚〠大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã«é–¢ã™ã‚‹æ¤œè¨¼ã‚’実施" - -msgid "verify largefile contents not just existence" -msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã®å˜åœ¨ç¢ºèªä»¥å¤–ã«ã€ 内容ã®æ¤œè¨¼ã‚‚実施" +msgid "verify that all largefiles in current revision exists" +msgstr "ç¾ãƒªãƒ“ジョンã®å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ã®å˜åœ¨ã‚’検証" + +msgid "verify largefiles in all revisions, not just current" +msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã®æ¤œè¨¼ã‚’全リビジョンã§å®Ÿæ–½" + +msgid "verify local largefile contents, not just existence" +msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã®å˜åœ¨ã¨å†…容ã®ä¸¡æ–¹ã‚’検証" msgid "display largefiles dirstate" msgstr "大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã®ä½œæ¥é ˜åŸŸçŠ¶æ…‹ã‚’表示" @@ -5374,7 +5515,10 @@ msgid "display outgoing largefiles" msgstr "転é€å¯¾è±¡å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" -msgid "download all pulled versions of largefiles" -msgstr "å–ã‚Šè¾¼ã¿ãƒªãƒ“ジョンã«ãŠã„ã¦ã€ 大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å…¨ã¦å–å¾—" +msgid "download all pulled versions of largefiles (DEPRECATED)" +msgstr "å–ã‚Šè¾¼ã¿ãƒªãƒ“ジョンã«é–¢é€£ã™ã‚‹å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å…¨ã¦å–å¾— (éžæŽ¨å¥¨)" + +msgid "download largefiles for these revisions" +msgstr "指定リビジョンã«é–¢é€£ã™ã‚‹å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å–å¾—" msgid "download all versions of all largefiles" @@ -5379,6 +5523,6 @@ msgid "download all versions of all largefiles" -msgstr "全リビジョンã«ãŠã„ã¦ã€ 大容é‡ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å…¨ã¦å–å¾—" +msgstr "全リビジョンã«é–¢é€£ã™ã‚‹å¤§å®¹é‡ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å–å¾—" msgid "manage a stack of patches" msgstr "パッãƒä½µç”¨ã®ç®¡ç†" @@ -6883,9 +7027,6 @@ " ã“ã®æ©Ÿèƒ½ã¯ã€ 上æµã®ãƒªãƒã‚¸ãƒˆãƒªã§ãƒ‘ッãƒãŒå—ç†ã•ã‚ŒãŸå ´åˆã‚„ã€\n" " パッãƒå†…容を上æµãƒªãƒã‚¸ãƒˆãƒªã«åæ˜ ã™ã‚‹å ´åˆãªã©ã«æœ‰ç”¨ã§ã™ã€‚" -msgid "no revisions specified" -msgstr "リビジョン指定ãŒã‚ã‚Šã¾ã›ã‚“" - msgid "warning: uncommitted changes in the working directory\n" msgstr "è¦å‘Š: 作æ¥é ˜åŸŸã®å¤‰æ›´ãŒæœªã‚³ãƒŸãƒƒãƒˆã§ã™\n" @@ -8226,6 +8367,9 @@ msgid "use --keep to keep original changesets" msgstr "元リビジョンをç¶æŒã™ã‚‹å ´åˆã¯ --keep を使用ã—ã¦ãã ã•ã„" +msgid "nothing to rebase\n" +msgstr "移動ã®å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“\n" + #, python-format msgid "can't rebase immutable changeset %s" msgstr "改変ä¸èƒ½ãªãƒªãƒ“ジョン %s ã¯ç§»å‹•ã§ãã¾ã›ã‚“" @@ -8233,9 +8377,6 @@ msgid "see hg help phases for details" msgstr "詳細ã¯ã€€\"hg help phases\" ã‚’å‚ç…§ã—ã¦ãã ã•ã„" -msgid "nothing to rebase\n" -msgstr "移動ã®å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“\n" - msgid "cannot collapse multiple named branches" msgstr "複数ã®åå‰ä»˜ãブランãƒã®å˜ä¸€åŒ–ã¯ã§ãã¾ã›ã‚“" @@ -8483,6 +8624,10 @@ msgid "cannot partially commit a merge (use \"hg commit\" instead)" msgstr "マージã®éƒ¨åˆ†ã‚³ãƒŸãƒƒãƒˆã¯ã§ãã¾ã›ã‚“ (\"hg commit\" を使用ã—ã¦ãã ã•ã„)" +#, python-format +msgid "error parsing patch: %s" +msgstr "パッãƒè§£æžã«å¤±æ•—: %s" + msgid "no changes to record\n" msgstr "記録å¯èƒ½ãªå¤‰æ›´ãŒã‚ã‚Šã¾ã›ã‚“\n" @@ -8668,6 +8813,10 @@ msgstr "定義済ã¿ã‚¹ã‚ーマã¯ã€ åŒåスã‚ーマ定義ã«ã‚ˆã‚Šã€ 上書ãå¯èƒ½ã§ã™ã€‚\n" #, python-format +msgid "no '://' in scheme url '%s'" +msgstr "'://' 記述ãŒã‚¹ã‚ーマ URL '%s' ã«å«ã¾ã‚Œã¦ã„ã¾ã›ã‚“" + +#, python-format msgid "custom scheme %s:// conflicts with drive letter %s:\\\n" msgstr "独自スã‚ーマ %s:// ã¯ã€ ãƒ‰ãƒ©ã‚¤ãƒ–æ–‡å— %s:\\ ã¨è¡çªã—ã¾ã™\n" @@ -8732,8 +8881,13 @@ msgid "command to transplant changesets from another branch" msgstr "別ブランãƒã‹ã‚‰ã®ãƒªãƒ“ジョンã®ç§»æ¤" -msgid "This extension allows you to transplant patches from another branch." -msgstr "本エクステンションã¯ã€ 別ブランãƒã‹ã‚‰ã®ãƒªãƒ“ジョン移æ¤ã‚’å¯èƒ½ã«ã—ã¾ã™ã€‚" +msgid "" +"This extension allows you to transplant changes to another parent revision,\n" +"possibly in another repository. The transplant is done using 'diff' patches." +msgstr "" +"本エクステンションã«ã‚ˆã‚Šã€ 一連ã®ãƒªãƒ“ジョン群を別ãªè¦ªãƒªãƒ“ジョン\n" +"(リãƒã‚¸ãƒˆãƒªæ¨ªæ–ã‚‚å¯èƒ½) ã®å…ˆã«ç§»æ¤ã§ãã¾ã™ã€‚ 移æ¤ã¯ãƒ‘ッãƒå½¢å¼ ('diff')\n" +"ã‚’å…ƒã«å®Ÿæ–½ã•ã‚Œã¾ã™ (※ 訳注: rebase ã‚„ graft 㯠3-way マージã§å®Ÿæ–½)。" msgid "" "Transplanted patches are recorded in .hg/transplant/transplants, as a\n" @@ -8820,14 +8974,14 @@ msgid "no such option\n" msgstr "ãã®ã‚ˆã†ãªã‚ªãƒ—ションã¯ã‚ã‚Šã¾ã›ã‚“\n" -msgid "pull patches from REPO" -msgstr "指定リãƒã‚¸ãƒˆãƒªã‹ã‚‰ã®å–ã‚Šè¾¼ã¿" - -msgid "pull patches from branch BRANCH" -msgstr "指定ブランãƒã‹ã‚‰ã®å–ã‚Šè¾¼ã¿" - -msgid "pull all changesets up to BRANCH" -msgstr "指定ブランãƒã®å…¨ã¦ã‚’å–り込む" +msgid "transplant changesets from REPO" +msgstr "指定リãƒã‚¸ãƒˆãƒªã‹ã‚‰ã®ãƒªãƒ“ジョンã®ç§»æ¤" + +msgid "use this source changeset as head" +msgstr "指定リビジョンを移æ¤å…ƒã®ãƒ˜ãƒƒãƒ‰ã¨ã¿ãªã™" + +msgid "pull all changesets up to the --branch revisions" +msgstr "--branch ã§ã®æŒ‡å®šãƒ–ランãƒã®å…¨ã¦ã‚’å–り込む" msgid "skip over REV" msgstr "指定リビジョンã®ã‚¹ã‚ップ" @@ -8841,8 +8995,8 @@ msgid "append transplant info to log message" msgstr "コミットãƒã‚°ã¸ã®ç§»æ¤æƒ…å ±ã®ä»˜ä¸Ž" -msgid "continue last transplant session after repair" -msgstr "ä¸æ–ã•ã‚ŒãŸç›´å‰ã®ç§»æ¤ä½œæ¥ã®å†é–‹" +msgid "continue last transplant session after fixing conflicts" +msgstr "è¡çªè§£æ¶ˆå¾Œã«ãŠã‘ã‚‹ã€ä¸æ–ã•ã‚ŒãŸç›´å‰ã®ç§»æ¤ä½œæ¥ã®å†é–‹" msgid "filter changesets through command" msgstr "コマンドã«ã‚ˆã‚‹ãƒªãƒ“ジョンã®ãƒ•ã‚£ãƒ«ã‚¿ãƒªãƒ³ã‚°" @@ -8856,9 +9010,8 @@ msgid "" " Selected changesets will be applied on top of the current working\n" " directory with the log of the original changeset. The changesets\n" -" are copied and will thus appear twice in the history. Use the\n" -" rebase extension instead if you want to move a whole branch of\n" -" unpublished changesets." +" are copied and will thus appear twice in the history with different\n" +" identities." msgstr "" " 移æ¤å¯¾è±¡ãƒªãƒ“ジョンã¯ã€ 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã®åå«ã¨ã—ã¦ã€\n" " コミットãƒã‚°ã‚’ç¶æŒã—ã¤ã¤è¤‡è£½ã•ã‚Œã¾ã™ã€‚ 移æ¤ã§ã®è¤‡è£½ã«ã‚ˆã‚Šã€\n" @@ -8862,8 +9015,18 @@ msgstr "" " 移æ¤å¯¾è±¡ãƒªãƒ“ジョンã¯ã€ 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã®åå«ã¨ã—ã¦ã€\n" " コミットãƒã‚°ã‚’ç¶æŒã—ã¤ã¤è¤‡è£½ã•ã‚Œã¾ã™ã€‚ 移æ¤ã§ã®è¤‡è£½ã«ã‚ˆã‚Šã€\n" -" 移æ¤å¯¾è±¡ã¨åŒå†…容ã®ãƒªãƒ“ジョンã¯ã€ å±¥æ´ä¸Šã«2å›žç™»å ´ã™ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚\n" -" 未公開リビジョンã®ãƒ–ランãƒã‚’〠ã¾ã¨ã‚ã¦ç§»å‹•ã—ãŸã„å ´åˆã¯ã€ rebase\n" +" 移æ¤å¯¾è±¡ã¨åŒå†…容ã®ãƒªãƒ“ジョンãŒã€ å±¥æ´ä¸Šã«2回 (è˜åˆ¥åã¯ãã‚Œãžã‚Œç•°ãªã‚‹)\n" +" ç™»å ´ã™ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ã€‚" + +msgid "" +" Consider using the graft command if everything is inside the same\n" +" repository - it will use merges and will usually give a better result.\n" +" Use the rebase extension if the changesets are unpublished and you want\n" +" to move them instead of copying them." +msgstr "" +" 移æ¤å…ƒï¼å…ˆãŒåŒä¸€ãƒªãƒã‚¸ãƒˆãƒªã®å ´åˆã¯ã€ graft ã®ä½¿ç”¨ã‚’検討ã—ã¾ã—ょã†ã€‚\n" +" graft ã®å†…部処ç†ã¯ 3-way マージを使用ã™ã‚‹ãŸã‚〠多ãã®å ´åˆã§ transplant\n" +" よりも良ã„çµæžœãŒå¾—られã¾ã™ã€‚未公開リビジョンã®ç§»å‹•ã®å ´åˆã¯ã€rebase\n" " エクステンションを使用ã—ã¦ãã ã•ã„。" msgid "" @@ -8885,27 +9048,30 @@ " 第2引数ã«ã¯ãƒ‘ッãƒãŒæ ¼ç´ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ãŒæŒ‡å®šã•ã‚Œã¾ã™ã€‚" msgid "" -" If --source/-s is specified, selects changesets from the named\n" -" repository. If --branch/-b is specified, selects changesets from\n" -" the branch holding the named revision, up to that revision. If\n" -" --all/-a is specified, all changesets on the branch will be\n" -" transplanted, otherwise you will be prompted to select the\n" -" changesets you want." -msgstr "" -" --source/-s ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ã€ 指定リãƒã‚¸ãƒˆãƒªãŒç§»æ¤å…ƒã«ãªã‚Šã¾ã™ã€‚\n" -" --branch/-b ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ã€ 指定リビジョンをå«ã‚€ãƒ–ランãƒã®ã€\n" -" 指定リビジョンã¾ã§ãŒç§»æ¤å…ƒã«ãªã‚Šã¾ã™ã€‚ --all/-a ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ã€\n" -" 指定ブランãƒä¸ã®å…¨ã¦ã®ãƒªãƒ“ジョンãŒç§»æ¤å¯¾è±¡ã¨ãªã‚Šã€ ãれ以外ã®å ´åˆã¯ã€\n" -" 移æ¤å€™è£œãƒªãƒ“ジョンã«é–¢ã—ã¦ã€ 移æ¤è¦å¦ã®å•ã„åˆã‚ã›ãŒç™ºç”Ÿã—ã¾ã™ã€‚" - -msgid "" -" :hg:`transplant --branch REV --all` will transplant the\n" -" selected branch (up to the named revision) onto your current\n" -" working directory." -msgstr "" -" :hg:`transplant --branch REV --all` 実行ã«ã‚ˆã‚Šã€\n" -" 指定ã•ã‚ŒãŸåå‰ä»˜ãブランム(ã®ä¸ã® REV ã¾ã§ã®ãƒªãƒ“ジョン) ãŒã€\n" -" 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã®åã¨ã—ã¦ã€ 移æ¤ã•ã‚Œã¾ã™ã€‚" +" --source/-s specifies another repository to use for selecting " +"changesets,\n" +" just as if it temporarily had been pulled.\n" +" If --branch/-b is specified, these revisions will be used as\n" +" heads when deciding which changsets to transplant, just as if only\n" +" these revisions had been pulled.\n" +" If --all/-a is specified, all the revisions up to the heads specified\n" +" with --branch will be transplanted." +msgstr "" +" 移æ¤å¯¾è±¡ãƒªãƒ“ジョン㯠--source/-s ã§æŒ‡å®šã—ãŸãƒªãƒã‚¸ãƒˆãƒªã‹ã‚‰ã€\n" +" 移æ¤æ™‚ã«å–り込むã“ã¨ãŒå¯èƒ½ã§ã™ã€‚ --branch/-b ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€\n" +" 指定ブランãƒã®ã¿ã®å–ã‚Šè¾¼ã¿ã‚’仮定ã—ã¦ã€ 移æ¤å¯¾è±¡ãŒæ±ºå®šã•ã‚Œã¾ã™ã€‚\n" +" --all/-a ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ã€ 指定リビジョンã«è‡³ã‚‹å…¨ãƒªãƒ“ジョンãŒã€\n" +" 移æ¤å¯¾è±¡ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚" + +msgid " Example:" +msgstr " 実行例:" + +msgid "" +" - transplant all changes up to REV on top of your current revision::" +msgstr " - REV ã¾ã§ã®å…¨ãƒªãƒ“ジョンをã€ç¾ãƒªãƒ“ジョン上ã«ç§»æ¤::" + +msgid " hg transplant --branch REV --all" +msgstr " hg transplant --branch REV --all" msgid "" " You can optionally mark selected transplanted changesets as merge\n" @@ -8947,6 +9113,6 @@ " --continue/-c` を実行ã™ã‚‹ã“ã¨ã§ã€ ä¸æ–ã•ã‚ŒãŸç§»æ¤ã‚’å†é–‹å¯èƒ½ã§ã™ã€‚\n" " " -msgid "--continue is incompatible with branch, all or merge" +msgid "--continue is incompatible with --branch, --all and --merge" msgstr "--continue 㯠--branch〠--all〠--merge ã¨ä½µç”¨ã§ãã¾ã›ã‚“" @@ -8951,7 +9117,7 @@ msgstr "--continue 㯠--branch〠--all〠--merge ã¨ä½µç”¨ã§ãã¾ã›ã‚“" -msgid "no source URL, branch tag or revision list provided" -msgstr "å…ƒ URL〠ブランãƒã‚¿ã‚°ã€ リビジョン一覧ã®ã„ãšã‚Œã‚‚指定ã•ã‚Œã¦ã„ã¾ã›ã‚“" +msgid "no source URL, branch revision or revision list provided" +msgstr "å…ƒ URL〠ブランãƒå〠リビジョン一覧ã®ã„ãšã‚Œã‚‚指定ã•ã‚Œã¦ã„ã¾ã›ã‚“" msgid "--all requires a branch revision" msgstr "--all ã«ã¯ãƒ–ランãƒãƒªãƒ“ジョン指定ãŒå¿…è¦ã§ã™" @@ -9240,6 +9406,9 @@ msgid "archiving" msgstr "アーカイブä¸" +msgid "no files match the archive pattern" +msgstr "指定パターンã«åˆè‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“" + #, python-format msgid "malformed line in .hg/bookmarks: %r\n" msgstr "ä¸æ£ãª .hg/bookmarks 記述行: %r\n" @@ -9549,6 +9718,10 @@ msgstr "HG: ブランム'%s'" #, python-format +msgid "HG: bookmark '%s'" +msgstr "HG: ブックマーク '%s'" + +#, python-format msgid "HG: subrepo %s" msgstr "HG: サブリãƒã‚¸ãƒˆãƒª %s" @@ -9570,6 +9743,17 @@ msgid "empty commit message" msgstr "コミットãƒã‚°ãŒã‚ã‚Šã¾ã›ã‚“" +msgid "created new head\n" +msgstr "æ–°è¦ãƒ˜ãƒƒãƒ‰ãŒå¢—ãˆã¾ã—ãŸ\n" + +#, python-format +msgid "reopening closed branch head %d\n" +msgstr "閉鎖済ã¿ãƒ–ランãƒãƒ˜ãƒƒãƒ‰ %d ã®å†é–‹ä¸\n" + +#, python-format +msgid "committed changeset %d:%s\n" +msgstr "コミット対象リビジョン %d:%s\n" + #, python-format msgid "forgetting %s\n" msgstr "%s ã®è¿½åŠ 登録をå–り消ã—ä¸\n" @@ -9750,9 +9934,6 @@ msgstr "" " ファイルå指定ãŒç„¡ã„å ´åˆã€ 作æ¥é ˜åŸŸä¸ã®å…¨ãƒ•ã‚¡ã‚¤ãƒ«ãŒå¯¾è±¡ã¨ãªã‚Šã¾ã™ã€‚" -msgid " .. container:: verbose" -msgstr " .. container:: verbose" - msgid "" " An example showing how new (unknown) files are added\n" " automatically by :hg:`add`::" @@ -10110,7 +10291,7 @@ msgstr "[-gbsr] [-U] [-c CMD] [REV]" msgid "subdivision search of changesets" -msgstr "リビジョンã®åˆ†å‰²æŽ¢ç´¢" +msgstr "リビジョンã®äºŒåˆ†æŽ¢ç´¢" msgid "" " This command helps to find changesets which introduce problems. To\n" @@ -10122,7 +10303,7 @@ " bad, and bisect will either update to another candidate changeset\n" " or announce that it has found the bad revision." msgstr "" -" å•é¡Œç™ºç”Ÿå¥‘æ©Ÿã¨ãªã‚‹ãƒªãƒ“ジョンã®ç‰¹å®šã‚’補助ã—ã¾ã™ã€‚ 使用開始ã®éš›ã«ã¯ã€\n" +" å•é¡Œç™ºç”Ÿå¥‘æ©Ÿã¨ãªã‚‹ãƒªãƒ“ジョンを探索ã—ã¾ã™ã€‚ 使用開始ã®éš›ã«ã¯ã€\n" " å•é¡ŒãŒç™ºç”Ÿã™ã‚‹æ—¢çŸ¥ã®ãƒªãƒ“ジョンã®ã†ã¡ã€ 最å¤ã®ã‚‚ã®ã‚’ bad ã¨ãƒžãƒ¼ã‚¯ã—ã€\n" " å•é¡ŒãŒç™ºç”Ÿã—ãªã„既知ã®ãƒªãƒ“ジョンã®ã†ã¡ã€ 最新ã®ã‚‚ã®ã‚’ good ã¨ãƒžãƒ¼ã‚¯\n" " ã—ã¾ã™ã€‚ 本コマンドã¯ã€ 検証対象リビジョンã§ä½œæ¥é ˜åŸŸã‚’æ›´æ–°ã—ã¾ã™(-U/\n" @@ -10153,9 +10334,6 @@ " ã¯ãƒªãƒ“ジョンã®ã‚¹ã‚ップ〠127 (コマンドä¸åœ¨) ã¯æŽ¢ç´¢ä¸æ–ã€\n" " ãã®ä»–ã®éž 0 終了コード㯠bad ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚" -msgid " Some examples:" -msgstr " 例:" - msgid "" " - start a bisection with known bad revision 12, and good revision 34::" msgstr "" @@ -10159,7 +10337,7 @@ msgid "" " - start a bisection with known bad revision 12, and good revision 34::" msgstr "" -" - 既知㮠bad ãªãƒªãƒ“ジョン 12 㨠good ãªãƒªãƒ“ジョン 34 ã‹ã‚‰æ¤œç´¢é–‹å§‹::" +" - 既知㮠bad ãªãƒªãƒ“ジョン 12 㨠good ãªãƒªãƒ“ジョン 34 ã‹ã‚‰æŽ¢ç´¢é–‹å§‹::" msgid "" " hg bisect --bad 34\n" @@ -10172,7 +10350,7 @@ " - advance the current bisection by marking current revision as good " "or\n" " bad::" -msgstr " - ç¾ãƒªãƒ“ジョンを good ãªã„ã— bad 化ã—ã¦æ¤œç´¢çŠ¶æ…‹ã‚’進ã‚ã‚‹::" +msgstr " - ç¾ãƒªãƒ“ジョンを good ãªã„ã— bad 化ã—ã¦æŽ¢ç´¢ã‚’継続::" msgid "" " hg bisect --good\n" @@ -10206,7 +10384,7 @@ " hg bisect --skip '!( file(\"path:foo\") & file(\"path:bar\") )'" msgid " - forget the current bisection::" -msgstr " - ç¾è¡Œã®æ¤œç´¢çŠ¶æ…‹ã‚’クリア::" +msgstr " - ç¾è¡Œã®æŽ¢ç´¢çŠ¶æ…‹ã‚’クリア::" msgid " hg bisect --reset" msgstr " hg bisect --reset" @@ -10231,7 +10409,7 @@ msgid "" " - see all changesets whose states are already known in the current\n" " bisection::" -msgstr " - ç¾åœ¨ã®æ¤œç´¢ã«ãŠã„ã¦ã€ 状態ã®åˆ¤æ˜Žã—ã¦ã„るリビジョン全ã¦ã‚’表示::" +msgstr " - ç¾åœ¨ã®æŽ¢ç´¢ã«ãŠã„ã¦ã€ 状態ã®åˆ¤æ˜Žã—ã¦ã„るリビジョン全ã¦ã‚’表示::" msgid " hg log -r \"bisect(pruned)\"" msgstr " hg log -r \"bisect(pruned)\"" @@ -10246,7 +10424,7 @@ msgstr " hg log -r \"bisect(current)\"" msgid " - see all changesets that took part in the current bisection::" -msgstr " - ç¾åœ¨ã®æ¤œç´¢å¯¾è±¡ã«ãªã£ã¦ã„るリビジョン全ã¦ã‚’表示::" +msgstr " - ç¾åœ¨ã®æŽ¢ç´¢å¯¾è±¡ç¯„囲ã®ãƒªãƒ“ジョン全ã¦ã‚’表示::" msgid " hg log -r \"bisect(range)\"" msgstr " hg log -r \"bisect(range)\"" @@ -10274,7 +10452,7 @@ "the common ancestor, %s.\n" msgstr "" "ã“ã®ãƒªãƒ“ジョンã®ç¥–å…ˆã«å¯¾ã™ã‚‹ç¢ºèªã¯å®Œå…¨ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n" -"共通ã®ç¥–å…ˆ %s ã‹ã‚‰æ¤œç´¢ã‚’継続ã™ã‚‹å ´åˆã€\n" +"共通ã®ç¥–å…ˆ %s ã‹ã‚‰æŽ¢ç´¢ã‚’継続ã™ã‚‹å ´åˆã€\n" "--extend 付ã㧠\"hg bisect\" を実行ã—ã¦ãã ã•ã„。\n" msgid "Due to skipped revisions, the first good revision could be any of:\n" @@ -10284,6 +10462,6 @@ msgstr "検証çœç•¥ã«ã‚ˆã‚Šã€ 最åˆã® bad ãªãƒªãƒ“ジョンã¯ä»¥ä¸‹ã‹ã‚‰é¸æŠžå¯èƒ½ã§ã™:\n" msgid "cannot bisect (no known good revisions)" -msgstr "分割探索ã§ãã¾ã›ã‚“(good リビジョンãŒæœªæŒ‡å®šã§ã™)" +msgstr "二分探索ã§ãã¾ã›ã‚“(good リビジョンãŒæœªæŒ‡å®šã§ã™)" msgid "cannot bisect (no known bad revisions)" @@ -10288,6 +10466,6 @@ msgid "cannot bisect (no known bad revisions)" -msgstr "分割探索ã§ãã¾ã›ã‚“(bad リビジョンãŒæœªæŒ‡å®šã§ã™)" +msgstr "二分探索ã§ãã¾ã›ã‚“(bad リビジョンãŒæœªæŒ‡å®šã§ã™)" msgid "(use of 'hg bisect <cmd>' is deprecated)\n" msgstr "('hg bisect <cmd>' å½¢å¼ã®å®Ÿè¡Œã¯æŽ¨å¥¨ã•ã‚Œã¾ã›ã‚“)\n" @@ -10408,6 +10586,10 @@ msgstr "空白文å—ã ã‘ã§æ§‹æˆã•ã‚ŒãŸã‚¿ã‚°åã¯ä¸æ£ã§ã™" #, python-format +msgid "moving bookmark '%s' forward from %s\n" +msgstr "ブックマーク '%s' ã‚’ %s ã‹ã‚‰å‰æ–¹ã«ç§»å‹•ä¸\n" + +#, python-format msgid "bookmark '%s' already exists (use -f to force)" msgstr "ブックマーク '%s' ã¯å˜åœ¨ã—ã¾ã™(強制実行ã™ã‚‹å ´åˆã¯ -f を指定)" @@ -10970,12 +11152,9 @@ " æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0〠変更ãŒæ¤œå‡ºã§ããªã„å ´åˆã¯ 1 ã§ã™ã€‚\n" " " -msgid "can only close branch heads" -msgstr "ブランãƒãƒ˜ãƒƒãƒ‰ã®ã¿é–‰éŽ–ã§ãã¾ã™" - msgid "cannot amend recursively" msgstr "サブリãƒã‚¸ãƒˆãƒªã‚’å«ã‚€å†å¸°çš„ãªæ”¹å¤‰ã¯ã§ãã¾ã›ã‚“" msgid "cannot amend public changesets" msgstr "public フェーズã®ãƒªãƒ“ジョンã¯æ”¹å¤‰ã§ãã¾ã›ã‚“" @@ -10976,12 +11155,9 @@ msgid "cannot amend recursively" msgstr "サブリãƒã‚¸ãƒˆãƒªã‚’å«ã‚€å†å¸°çš„ãªæ”¹å¤‰ã¯ã§ãã¾ã›ã‚“" msgid "cannot amend public changesets" msgstr "public フェーズã®ãƒªãƒ“ジョンã¯æ”¹å¤‰ã§ãã¾ã›ã‚“" -msgid "cannot amend merge changesets" -msgstr "マージ実施リビジョンã¯æ”¹å¤‰ã§ãã¾ã›ã‚“" - msgid "cannot amend while merging" msgstr "マージ実施ä¸ã®ä½œæ¥é ˜åŸŸã§ã¯æ”¹å¤‰ã§ãã¾ã›ã‚“" @@ -10995,17 +11171,6 @@ msgid "nothing changed (%d missing files, see 'hg status')\n" msgstr "変更ã¯ã‚ã‚Šã¾ã›ã‚“ (%d 個ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒä¸åœ¨ã€‚ 'hg status' ã§ç¢ºèªã‚’)\n" -msgid "created new head\n" -msgstr "æ–°è¦ãƒ˜ãƒƒãƒ‰ãŒå¢—ãˆã¾ã—ãŸ\n" - -#, python-format -msgid "reopening closed branch head %d\n" -msgstr "閉鎖済ã¿ãƒ–ランãƒãƒ˜ãƒƒãƒ‰ %d ã®å†é–‹ä¸\n" - -#, python-format -msgid "committed changeset %d:%s\n" -msgstr "コミット対象リビジョン %d:%s\n" - msgid "record a copy that has already occurred" msgstr "手動ã§è¤‡è£½æ¸ˆã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€ 複製ã®æ—¨ã‚’記録" @@ -11393,6 +11558,12 @@ " å„ ID 毎ã®æ—¢çŸ¥æ€§ã‚’〠0 㨠1 ã§è¡¨ç¾ã—ãŸãƒªã‚¹ãƒˆãŒå‡ºåŠ›ã•ã‚Œã¾ã™ã€‚\n" " " +msgid "LABEL..." +msgstr "LABEL..." + +msgid "complete \"labels\" - tags, open branch names, bookmark names" +msgstr "" + msgid "markers flag" msgstr "廃æ¢ãƒžãƒ¼ã‚«ç”¨ãƒ•ãƒ©ã‚°" @@ -11402,6 +11573,6 @@ msgid "create arbitrary obsolete marker" msgstr "ä»»æ„ã®å»ƒæ¢çŠ¶æ…‹ã®è¨å®š" -msgid " With no arguments it it display the list obsolescence marker." +msgid " With no arguments, displays the list of obsolescence markers." msgstr " 引数指定ãŒç„¡ã„å ´åˆã€ 廃æ¢ãƒžãƒ¼ã‚«ã‚’一覧表示ã—ã¾ã™ã€‚" @@ -11406,5 +11577,33 @@ msgstr " 引数指定ãŒç„¡ã„å ´åˆã€ 廃æ¢ãƒžãƒ¼ã‚«ã‚’一覧表示ã—ã¾ã™ã€‚" +msgid "complete an entire path" +msgstr "パス全体を補完" + +msgid "show only normal files" +msgstr "通常ファイルã®ã¿ã‚’表示" + +msgid "show only added files" +msgstr "è¿½åŠ ç™»éŒ²ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" + +msgid "show only removed files" +msgstr "登録除外ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" + +msgid "FILESPEC..." +msgstr "FILESPEC..." + +msgid "complete part or all of a tracked path" +msgstr "管ç†å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ‘スã®ä¸€éƒ¨ï¼å…¨éƒ¨ã®è£œå®Œ" + +msgid "" +" This command supports shells that offer path name completion. It\n" +" currently completes only files already known to the dirstate." +msgstr "" + +msgid "" +" Completion extends only to the next path segment unless\n" +" --full is specified, in which case entire paths are used." +msgstr "" + msgid "REPO NAMESPACE [KEY OLD NEW]" msgstr "REPO NAMESPACE [KEY OLD NEW]" @@ -11445,9 +11644,9 @@ msgid "revision to rebuild to" msgstr "å†æ§‹ç¯‰å¯¾è±¡ãƒªãƒ“ジョン" -msgid "[-r REV] [REV]" -msgstr "[-r REV] [REV]" +msgid "[-r REV]" +msgstr "[-r REV]" msgid "rebuild the dirstate as it would look like for the given revision" msgstr "指定リビジョン時点相当㮠dirstate ã®å†æ§‹ç¯‰" @@ -11450,7 +11649,22 @@ msgid "rebuild the dirstate as it would look like for the given revision" msgstr "指定リビジョン時点相当㮠dirstate ã®å†æ§‹ç¯‰" +msgid " If no revision is specified the first current parent will be used." +msgstr " リビジョン指定ãŒç„¡ã„å ´åˆã€ 作æ¥é ˜åŸŸã®ç¬¬ï¼‘親指定ã¨ã¿ãªã—ã¾ã™ã€‚" + +msgid "" +" The dirstate will be set to the files of the given revision.\n" +" The actual working directory content or existing dirstate\n" +" information such as adds or removes is not considered." +msgstr "" + +msgid "" +" One use of this command is to make the next :hg:`status` invocation\n" +" check the actual file content.\n" +" " +msgstr "" + msgid "revision to debug" msgstr "デãƒãƒƒã‚°å¯¾è±¡ãƒªãƒ“ジョン" @@ -11520,6 +11734,9 @@ msgid "revision to check" msgstr "確èªå¯¾è±¡ãƒªãƒ“ジョン" +msgid "[-r REV] [REV]" +msgstr "[-r REV] [REV]" + msgid "[REV]" msgstr "[REV]" @@ -11692,9 +11909,9 @@ msgid "revisions to export" msgstr "対象リビジョン" -msgid "[OPTION]... [-o OUTFILESPEC] [-r] REV..." -msgstr "[OPTION]... [-o OUTFILESPEC] [-r] REV..." +msgid "[OPTION]... [-o OUTFILESPEC] [-r] [REV]..." +msgstr "[OPTION]... [-o OUTFILESPEC] [-r] [REV]..." msgid "dump the header and diffs for one or more changesets" msgstr "1ã¤ä»¥ä¸Šã®ãƒªãƒ“ジョンã«å¯¾ã™ã‚‹ãƒ˜ãƒƒãƒ€ãŠã‚ˆã³å¤‰æ›´å†…容ã®å‡ºåŠ›" @@ -11697,10 +11914,13 @@ msgid "dump the header and diffs for one or more changesets" msgstr "1ã¤ä»¥ä¸Šã®ãƒªãƒ“ジョンã«å¯¾ã™ã‚‹ãƒ˜ãƒƒãƒ€ãŠã‚ˆã³å¤‰æ›´å†…容ã®å‡ºåŠ›" -msgid " Print the changeset header and diffs for one or more revisions." -msgstr "" -" 1ã¤ä»¥ä¸Šã®ãƒªãƒ“ジョンã«å¯¾ã—ã¦ã€ ãƒ˜ãƒƒãƒ€æƒ…å ±ãŠã‚ˆã³å¤‰æ›´å†…容を表示ã—ã¾ã™ã€‚" +msgid "" +" Print the changeset header and diffs for one or more revisions.\n" +" If no revision is given, the parent of the working directory is used." +msgstr "" +" 指定リビジョンã«å¯¾ã—ã¦ã€ ãƒ˜ãƒƒãƒ€æƒ…å ±ãŠã‚ˆã³å¤‰æ›´å†…容を表示ã—ã¾ã™ã€‚\n" +" リビジョン指定ãŒç„¡ã„å ´åˆã¯ã€ 作æ¥é ˜åŸŸã®ç¬¬1親指定ã¨ã¿ãªã—ã¾ã™ã€‚" msgid "" " The information shown in the changeset header is: author, date,\n" @@ -12157,128 +12377,6 @@ " æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0 ã§ã™ã€‚\n" " " -#, python-format -msgid "" -"\n" -"aliases: %s\n" -msgstr "" -"\n" -"別å: %s\n" - -msgid "(no help text available)" -msgstr "(ヘルプã¯ã‚ã‚Šã¾ã›ã‚“)" - -#, python-format -msgid "shell alias for::" -msgstr "シェルコマンドã®åˆ¥å::" - -#, python-format -msgid " %s" -msgstr " %s" - -#, python-format -msgid "alias for: hg %s" -msgstr "コマンドã®åˆ¥å: hg %s" - -#, python-format -msgid "%s" -msgstr "%s" - -#, python-format -msgid "use \"hg help -e %s\" to show help for the %s extension" -msgstr "\"hg help -e %s\" ã«ã‚ˆã£ã¦ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ %s ã®ãƒ˜ãƒ«ãƒ—ãŒè¡¨ç¤ºã•ã‚Œã¾ã™" - -msgid "options:" -msgstr "オプション:" - -msgid "global options:" -msgstr "ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ション:" - -#, python-format -msgid "" -"\n" -"use \"hg help %s\" to show the full help text\n" -msgstr "" -"\n" -"\"hg help %s\" ã§è©³ç´°ãªãƒ˜ãƒ«ãƒ—ãŒè¡¨ç¤ºã•ã‚Œã¾ã™\n" - -#, python-format -msgid "use \"hg -v help %s\" to show more complete help and the global options" -msgstr "çœç•¥ã•ã‚ŒãŸãƒ˜ãƒ«ãƒ—ã®è©³ç´°ã‚„ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ションã®è¡¨ç¤ºã¯ \"hg -v help %s\"" - -#, python-format -msgid "use \"hg -v help %s\" to show the global options" -msgstr "ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ションã®è¡¨ç¤ºã¯ \"hg -v help %s\"" - -msgid "basic commands:" -msgstr "基本コマンド:" - -msgid "list of commands:" -msgstr "コマンド一覧:" - -msgid "no commands defined\n" -msgstr "コマンドãŒå®šç¾©ã•ã‚Œã¦ã„ã¾ã›ã‚“\n" - -msgid "enabled extensions:" -msgstr "有効化ã•ã‚Œã¦ã„るエクステンション:" - -msgid "" -"\n" -"additional help topics:" -msgstr "" -"\n" -"è¿½åŠ ã®ãƒ˜ãƒ«ãƒ—トピック:" - -msgid "use \"hg help\" for the full list of commands" -msgstr "全コマンドã®ä¸€è¦§ã¯ \"hg help\" ã§è¡¨ç¤ºã•ã‚Œã¾ã™" - -msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" -msgstr "" -"全コマンドã®ä¸€è¦§ã¯ \"hg help\" ã§ã€ コマンド詳細㯠\"hg -v\" ã§è¡¨ç¤ºã•ã‚Œã¾ã™" - -#, python-format -msgid "use \"hg help %s\" to show the full help text" -msgstr "詳細ãªãƒ˜ãƒ«ãƒ—ã®è¡¨ç¤ºã¯ \"hg help %s\"" - -#, python-format -msgid "use \"hg -v help%s\" to show builtin aliases and global options" -msgstr "組ã¿è¾¼ã¿åˆ¥åãŠã‚ˆã³ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ションã®è¡¨ç¤ºã¯ \"hg -v help%s\"" - -#, python-format -msgid "use \"hg help -v %s\" to show more complete help" -msgstr "çœç•¥ã•ã‚ŒãŸãƒ˜ãƒ«ãƒ—ã®è©³ç´°ã®è¡¨ç¤ºã¯ \"hg help %s\"" - -#, python-format -msgid "" -"\n" -"use \"hg help -c %s\" to see help for the %s command\n" -msgstr "" -"\n" -"\"hg help -c %s\" ã«ã‚ˆã£ã¦ã‚³ãƒžãƒ³ãƒ‰ %s ã®ãƒ˜ãƒ«ãƒ—ãŒè¡¨ç¤ºã•ã‚Œã¾ã™\n" - -msgid "no help text available" -msgstr "ヘルプã¯ã‚ã‚Šã¾ã›ã‚“" - -#, python-format -msgid "%s extension - %s" -msgstr "%s エクステンション - %s" - -msgid "use \"hg help extensions\" for information on enabling extensions\n" -msgstr "\"hg help extensions\" ã§æœ‰åŠ¹ãªã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ã®æƒ…å ±ãŒè¡¨ç¤ºã•ã‚Œã¾ã™\n" - -#, python-format -msgid "'%s' is provided by the following extension:" -msgstr "以下ã®ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ã«ã‚ˆã‚Š '%s' ãŒæä¾›ã•ã‚Œã¦ã„ã¾ã™:" - -msgid "Topics" -msgstr "トピック" - -msgid "Extension Commands" -msgstr "エクステンション由æ¥ã®ã‚³ãƒžãƒ³ãƒ‰" - -msgid "Mercurial Distributed SCM\n" -msgstr "Mercurial - 分散構æˆç®¡ç†ãƒ„ール\n" - msgid "identify the specified revision" msgstr "当該リビジョンã®è˜åˆ¥æƒ…å ±ã‚’è¡¨ç¤º" @@ -12496,12 +12594,9 @@ msgid "cannot use --similarity with --bypass" msgstr "--similarity 㨠--bypass ã¯ä½µç”¨ã§ãã¾ã›ã‚“" -msgid "patch is damaged or loses information" -msgstr "パッãƒã«ã¯ç ´æãªã„ã—æƒ…å ±ã®æ¬ è½ãŒã‚ã‚Šã¾ã™" - msgid "applied to working directory" msgstr "作æ¥é ˜åŸŸã¸ã®é©ç”¨" msgid "not a Mercurial patch" msgstr "Mercurial å‘ã‘ã®ãƒ‘ッãƒã§ã¯ã‚ã‚Šã¾ã›ã‚“" @@ -12502,9 +12597,12 @@ msgid "applied to working directory" msgstr "作æ¥é ˜åŸŸã¸ã®é©ç”¨" msgid "not a Mercurial patch" msgstr "Mercurial å‘ã‘ã®ãƒ‘ッãƒã§ã¯ã‚ã‚Šã¾ã›ã‚“" +msgid "patch is damaged or loses information" +msgstr "パッãƒã«ã¯ç ´æãªã„ã—æƒ…å ±ã®æ¬ è½ãŒã‚ã‚Šã¾ã™" + #. i18n: refers to a short changeset id #, python-format msgid "created %s" @@ -12791,9 +12889,6 @@ msgid "list files from all revisions" msgstr "関連ã™ã‚‹å…¨ãƒ•ã‚¡ã‚¤ãƒ«ã®è¡¨ç¤º" -msgid "[-r REV]" -msgstr "[-r REV]" - msgid "output the current or given revision of the project manifest" msgstr "ç¾æ™‚点ãªã„ã—指定時点ã§ã®ãƒªãƒã‚¸ãƒˆãƒªãƒžãƒ‹ãƒ•ã‚§ã‚¹ãƒˆã®å‡ºåŠ›" @@ -13181,13 +13276,6 @@ " 最後ã®ãƒªãƒ“ジョンを ``-r`` ã®å¼•æ•°ã«ã—㦠:hg:`pull -r X` を実行ã—ã¾ã™ã€‚" msgid "" -" If SOURCE is omitted, the 'default' path will be used.\n" -" See :hg:`help urls` for more information." -msgstr "" -" 連æºå…ˆãŒçœç•¥ã•ã‚ŒãŸå ´åˆã€ 'default' パスãŒé€£æºå…ˆã¨ã—ã¦ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚\n" -" 詳細㯠:hg:`help urls` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" - -msgid "" " Returns 0 on success, 1 if an update had unresolved files.\n" " " msgstr "" @@ -13871,12 +13959,6 @@ msgid "show only modified files" msgstr "変更ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" -msgid "show only added files" -msgstr "è¿½åŠ ç™»éŒ²ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" - -msgid "show only removed files" -msgstr "登録除外ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" - msgid "show only deleted (but tracked) files" msgstr "削除ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«(登録除外ã¯æœªå®Ÿæ–½)を表示" @@ -14237,8 +14319,8 @@ msgid "not at a branch head (use -f to force)" msgstr "親リビジョンãŒãƒ–ランãƒã®ãƒ˜ãƒƒãƒ‰ã§ã¯ã‚ã‚Šã¾ã›ã‚“(強制実行㯠-f 指定)" -msgid "null revision specified" -msgstr "null リビジョンãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" +msgid "cannot tag null revision" +msgstr "null リビジョンã«ã¯ã‚¿ã‚°ä»˜ã‘ã§ãã¾ã›ã‚“" msgid "list repository tags" msgstr "リãƒã‚¸ãƒˆãƒªä¸ã®ã‚¿ã‚°ä¸€è¦§ã®è¡¨ç¤º" @@ -14828,6 +14910,9 @@ msgid "*** failed to import extension %s: %s\n" msgstr "*** %s ã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã«å¤±æ•—: %s\n" +msgid "(no help text available)" +msgstr "(ヘルプã¯ã‚ã‚Šã¾ã›ã‚“)" + #, python-format msgid "warning: error finding commands in %s\n" msgstr "è¦å‘Š: ファイル %s ã§ã®ã‚³ãƒžãƒ³ãƒ‰è§£æžä¸ã«ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ\n" @@ -15176,6 +15261,17 @@ msgstr "ä¸æ˜Žãªã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚° '%s' ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" msgid "" +"``eol(style)``\n" +" File contains newlines of the given style (dos, unix, mac). Binary\n" +" files are excluded, files with mixed line endings match multiple\n" +" styles." +msgstr "" +"``eol(style)``\n" +" æŒ‡å®šå½¢å¼ (dos, unix, mac) ã®æ”¹è¡Œã‚’å«ã‚€ãƒ•ã‚¡ã‚¤ãƒ«ã€‚\n" +" ãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ã¯é™¤å¤–ã•ã‚Œã¾ã™ã€‚ 複数形å¼ãŒæ··åœ¨ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€\n" +" 複数ã®å½¢å¼æŒ‡å®šã«åˆè‡´ã—ã¾ã™ã€‚" + +msgid "" "``copied()``\n" " File that is recorded as being copied." msgstr "" @@ -15212,6 +15308,6 @@ #, python-format msgid "unknown bisect kind %s" -msgstr "未知ã®åˆ†å²ç¨®é¡ž %s" +msgstr "未知ã®æŽ¢ç´¢ç¨®åˆ¥ %s" msgid "invalid bisect state" @@ -15216,6 +15312,6 @@ msgid "invalid bisect state" -msgstr "bisect 状態ãŒä¸æ£ã§ã™" +msgstr "探索状態ãŒä¸æ£ã§ã™" #. i18n: bisect changeset status msgid "good" @@ -15241,6 +15337,9 @@ msgid "bad (implicit)" msgstr "bad (推定)" +msgid "enabled extensions:" +msgstr "有効化ã•ã‚Œã¦ã„るエクステンション:" + msgid "disabled extensions:" msgstr "無効化ã•ã‚Œã¦ã„るエクステンション:" @@ -15311,6 +15410,122 @@ msgid "Working with Phases" msgstr "フェーズã®åˆ©ç”¨" +#, python-format +msgid "" +"\n" +"aliases: %s\n" +msgstr "" +"\n" +"別å: %s\n" + +#, python-format +msgid "shell alias for::" +msgstr "シェルコマンドã®åˆ¥å::" + +#, python-format +msgid " %s" +msgstr " %s" + +#, python-format +msgid "alias for: hg %s" +msgstr "コマンドã®åˆ¥å: hg %s" + +#, python-format +msgid "%s" +msgstr "%s" + +#, python-format +msgid "use \"hg help -e %s\" to show help for the %s extension" +msgstr "\"hg help -e %s\" ã«ã‚ˆã£ã¦ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ %s ã®ãƒ˜ãƒ«ãƒ—ãŒè¡¨ç¤ºã•ã‚Œã¾ã™" + +msgid "options:" +msgstr "オプション:" + +msgid "global options:" +msgstr "ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ション:" + +#, python-format +msgid "" +"\n" +"use \"hg help %s\" to show the full help text\n" +msgstr "" +"\n" +"\"hg help %s\" ã§è©³ç´°ãªãƒ˜ãƒ«ãƒ—ãŒè¡¨ç¤ºã•ã‚Œã¾ã™\n" + +#, python-format +msgid "use \"hg -v help %s\" to show more complete help and the global options" +msgstr "çœç•¥ã•ã‚ŒãŸãƒ˜ãƒ«ãƒ—ã®è©³ç´°ã‚„ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ションã®è¡¨ç¤ºã¯ \"hg -v help %s\"" + +#, python-format +msgid "use \"hg -v help %s\" to show the global options" +msgstr "ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ションã®è¡¨ç¤ºã¯ \"hg -v help %s\"" + +msgid "basic commands:" +msgstr "基本コマンド:" + +msgid "list of commands:" +msgstr "コマンド一覧:" + +msgid "no commands defined\n" +msgstr "コマンドãŒå®šç¾©ã•ã‚Œã¦ã„ã¾ã›ã‚“\n" + +msgid "" +"\n" +"additional help topics:" +msgstr "" +"\n" +"è¿½åŠ ã®ãƒ˜ãƒ«ãƒ—トピック:" + +msgid "use \"hg help\" for the full list of commands" +msgstr "全コマンドã®ä¸€è¦§ã¯ \"hg help\" ã§è¡¨ç¤ºã•ã‚Œã¾ã™" + +msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" +msgstr "" +"全コマンドã®ä¸€è¦§ã¯ \"hg help\" ã§ã€ コマンド詳細㯠\"hg -v\" ã§è¡¨ç¤ºã•ã‚Œã¾ã™" + +#, python-format +msgid "use \"hg help %s\" to show the full help text" +msgstr "詳細ãªãƒ˜ãƒ«ãƒ—ã®è¡¨ç¤ºã¯ \"hg help %s\"" + +#, python-format +msgid "use \"hg -v help%s\" to show builtin aliases and global options" +msgstr "組ã¿è¾¼ã¿åˆ¥åãŠã‚ˆã³ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ションã®è¡¨ç¤ºã¯ \"hg -v help%s\"" + +#, python-format +msgid "use \"hg help -v %s\" to show more complete help" +msgstr "çœç•¥ã•ã‚ŒãŸãƒ˜ãƒ«ãƒ—ã®è©³ç´°ã®è¡¨ç¤ºã¯ \"hg help %s\"" + +#, python-format +msgid "" +"\n" +"use \"hg help -c %s\" to see help for the %s command\n" +msgstr "" +"\n" +"\"hg help -c %s\" ã«ã‚ˆã£ã¦ã‚³ãƒžãƒ³ãƒ‰ %s ã®ãƒ˜ãƒ«ãƒ—ãŒè¡¨ç¤ºã•ã‚Œã¾ã™\n" + +msgid "no help text available" +msgstr "ヘルプã¯ã‚ã‚Šã¾ã›ã‚“" + +#, python-format +msgid "%s extension - %s" +msgstr "%s エクステンション - %s" + +msgid "use \"hg help extensions\" for information on enabling extensions\n" +msgstr "\"hg help extensions\" ã§æœ‰åŠ¹ãªã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ã®æƒ…å ±ãŒè¡¨ç¤ºã•ã‚Œã¾ã™\n" + +#, python-format +msgid "'%s' is provided by the following extension:" +msgstr "以下ã®ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ã«ã‚ˆã‚Š '%s' ãŒæä¾›ã•ã‚Œã¦ã„ã¾ã™:" + +msgid "Topics" +msgstr "トピック" + +msgid "Extension Commands" +msgstr "エクステンション由æ¥ã®ã‚³ãƒžãƒ³ãƒ‰" + +msgid "Mercurial Distributed SCM\n" +msgstr "Mercurial - 分散構æˆç®¡ç†ãƒ„ール\n" + msgid "" "The Mercurial system uses a set of configuration files to control\n" "aspects of its behavior." @@ -16933,7 +17148,7 @@ msgid "" " [hostfingerprints]\n" -" hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:" -"d6:4b:ee:cc" +" hg.intevation.org = 44:ed:af:1f:97:11:b6:01:7a:48:45:fc:10:3c:b7:f9:" +"d4:89:2a:9d" msgstr "" " [hostfingerprints]\n" @@ -16938,7 +17153,7 @@ msgstr "" " [hostfingerprints]\n" -" hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:" -"d6:4b:ee:cc" +" hg.intevation.org = 44:ed:af:1f:97:11:b6:01:7a:48:45:fc:10:3c:b7:f9:" +"d4:89:2a:9d" msgid "This feature is only supported when using Python 2.6 or later." msgstr "本機能ã¯ã€ Python 2.6 以é™ã§ã®ã¿ä½¿ç”¨å¯èƒ½ã§ã™ã€‚" @@ -17476,4 +17691,12 @@ " ã‹ã‚‰1ã¤ã‚’指定ã—ã¦ãã ã•ã„。 デフォルト値: inlinetime" msgid "" +"``limit``\n" +" Number of lines to show. Specific to the ``ls`` instrumenting profiler.\n" +" Default: 30." +msgstr "" +"``limit``\n" +" 表示対象行数。 詳細プãƒãƒ•ã‚¡ã‚¤ãƒ© ``ls`` 固有ã®è¨å®šã€‚ デフォルト値: 30" + +msgid "" "``nested``\n" @@ -17479,10 +17702,8 @@ "``nested``\n" -" Show at most this number of lines of drill-down info in a tree " -"structure\n" -" after each main entry. This can help explain the difference between " -"Total\n" -" and Inline.\n" +" Show at most this number of lines of drill-down info after each main " +"entry.\n" +" This can help explain the difference between Total and Inline.\n" " Specific to the ``ls`` instrumenting profiler.\n" " Default: 5." msgstr "" "``nested``\n" @@ -17485,9 +17706,9 @@ " Specific to the ``ls`` instrumenting profiler.\n" " Default: 5." msgstr "" "``nested``\n" -" 個々ã®ãƒ¡ã‚¤ãƒ³ã‚¨ãƒ³ãƒˆãƒªä»¥å¾Œã®ã€ æœ¨æ§‹é€ ã«ãŠã‘る掘り下㒠(drill-down)\n" -" æƒ…å ±è¡¨ç¤ºã®ã€ 最大行数。 Total 㨠Inline ã®å·®ã®èª¬æ˜Žã‚’助ã‘ã¾ã™ã€‚\n" +" 個々ã®ãƒ¡ã‚¤ãƒ³ã‚¨ãƒ³ãƒˆãƒªä»¥å¾Œã®ã€ 掘り下㒠(drill-down) æƒ…å ±è¡¨ç¤ºã®ã€\n" +" 最大行数。 Total 㨠Inline ã®å·®ã®èª¬æ˜Žã‚’助ã‘ã¾ã™ã€‚\n" " 詳細プãƒãƒ•ã‚¡ã‚¤ãƒ© ``ls`` 固有ã®è¨å®šã€‚ デフォルト値: 5" msgid "" @@ -17572,7 +17793,7 @@ " Host name of mail server, e.g. \"mail.example.com\"." msgstr "" "``host``\n" -" SMTP サーãƒã®ãƒ›ã‚¹ãƒˆå。 è¨å®šä¾‹: \"mail.example.com\"" +" メールサーãƒã®ãƒ›ã‚¹ãƒˆå。 è¨å®šä¾‹: \"mail.example.com\"" msgid "" "``port``\n" @@ -17576,6 +17797,7 @@ msgid "" "``port``\n" -" Optional. Port to connect to on mail server. Default: 25." +" Optional. Port to connect to on mail server. Default: 465 (if\n" +" ``tls`` is smtps) or 25 (otherwise)." msgstr "" "``port``\n" @@ -17580,6 +17802,7 @@ msgstr "" "``port``\n" -" çœç•¥å¯èƒ½ã€‚ SMTP サーãƒã®ãƒãƒ¼ãƒˆç•ªå·ã€‚ デフォルト値: 25" +" çœç•¥å¯èƒ½ã€‚ メールサーãƒã®ãƒãƒ¼ãƒˆç•ªå·ã€‚ デフォルト値: 465 (``tls``\n" +" è¨å®šãŒ smtps ã®å ´åˆ) ã‚ã‚‹ã„㯠25 (ãれ以外)" msgid "" "``tls``\n" @@ -17588,7 +17811,7 @@ " smtps or none. Default: none." msgstr "" "``tls``\n" -" çœç•¥å¯èƒ½ã€‚ SMTP サーãƒæŽ¥ç¶šã«ãŠã‘ã‚‹ TLS 接続ã®æœ‰ç„¡ï¼æ–¹å¼ã®æŒ‡å®šã€‚\n" +" çœç•¥å¯èƒ½ã€‚ メールサーãƒæŽ¥ç¶šã«ãŠã‘ã‚‹ TLS 接続ã®æœ‰ç„¡ï¼æ–¹å¼ã®æŒ‡å®šã€‚\n" " starttls〠smtps ãªã„ã— none。 デフォルト値: none" msgid "" @@ -17592,8 +17815,29 @@ " starttls〠smtps ãªã„ã— none。 デフォルト値: none" msgid "" +"``verifycert``\n" +" Optional. Verification for the certificate of mail server, when\n" +" ``tls`` is starttls or smtps. \"strict\", \"loose\" or False. For\n" +" \"strict\" or \"loose\", the certificate is verified as same as the\n" +" verification for HTTPS connections (see ``[hostfingerprints]`` and\n" +" ``[web] cacerts`` also). For \"strict\", sending email is also\n" +" aborted, if there is no configuration for mail server in\n" +" ``[hostfingerprints]`` and ``[web] cacerts``. --insecure for\n" +" :hg:`email` overwrites this as \"loose\". Default: \"strict\"." +msgstr "" +"``verifycert``\n" +" çœç•¥å¯èƒ½ã€‚ ``tls`` è¨å®šãŒ starttls ã‚ã‚‹ã„㯠smtps ã®å ´åˆã«ãŠã‘ã‚‹ã€\n" +" メールサーãƒã®è¨¼æ˜Žæ›¸ã®æ¤œè¨¼æ–¹å¼ã€‚ \"strict\" \"loose\" ã‚ã‚‹ã„㯠False。\n" +" \"strict\" ã‚ã‚‹ã„㯠\"loose\" ã®å ´åˆã€HTTPS接続ã®éš›ã¨åŒã˜è¦é ˜ã§ã€\n" +" 証明書ãŒæ¤œè¨¼ã•ã‚Œã¾ã™ã€‚(``[hostfingerprints]`` ãŠã‚ˆã³ ``[web] cacerts``\n" +" ã‚‚å‚ç…§) \"strict\" ã®å ´åˆã€ 接続先メールサーãƒã«é–¢ã™ã‚‹è¨å®šãŒ\n" +" ``[hostfingerprints]`` 㨠``[web] cacerts`` ã®ã„ãšã‚Œã«ã‚‚ç„¡ã„å ´åˆã‚‚ã€\n" +" メールé€ä¿¡ãŒä¸æ–ã•ã‚Œã¾ã™ã€‚ :hg:`email` ã« --insecure ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€\n" +" ã“ã®è¨å®šå€¤ã¯ \"loose\" ã§ä¸Šæ›¸ãã•ã‚Œã¾ã™ã€‚デフォルト値: \"strict\"" + +msgid "" "``username``\n" " Optional. User name for authenticating with the SMTP server.\n" " Default: none." msgstr "" "``username``\n" @@ -17595,9 +17839,9 @@ "``username``\n" " Optional. User name for authenticating with the SMTP server.\n" " Default: none." msgstr "" "``username``\n" -" çœç•¥å¯èƒ½ã€‚ SMTP サーãƒæŽ¥ç¶šã®èªè¨¼ã«ãŠã‘るユーザå。\n" +" çœç•¥å¯èƒ½ã€‚ メールサーãƒæŽ¥ç¶šã®èªè¨¼ã«ãŠã‘るユーザå。\n" " デフォルト値: none" msgid "" @@ -17607,7 +17851,7 @@ " password; non-interactive sessions will fail. Default: none." msgstr "" "``password``\n" -" çœç•¥å¯èƒ½ã€‚ SMTP サーãƒæŽ¥ç¶šã®èªè¨¼ã«ãŠã‘るパスワード。\n" +" çœç•¥å¯èƒ½ã€‚ メールサーãƒæŽ¥ç¶šã®èªè¨¼ã«ãŠã‘るパスワード。\n" " 無指定ã®å ´åˆã€ 対話的ãªå®Ÿè¡Œã§ã‚ã‚Œã°ã€\n" " パスワード入力プãƒãƒ³ãƒ—トãŒè¡¨ç¤ºã•ã‚Œã¾ã™ãŒã€\n" " éžå¯¾è©±çš„ãªå®Ÿè¡Œã§ã‚ã‚Œã°ã€ 処ç†ãŒä¸æ–ã•ã‚Œã¾ã™ã€‚\n" @@ -18499,6 +18743,6 @@ msgid "" "``templates``\n" -" Where to find the HTML templates. Default is install path.\n" +" Where to find the HTML templates. Default is install path." msgstr "" "``templates``\n" @@ -18503,6 +18747,89 @@ msgstr "" "``templates``\n" -" HTML テンプレートã®æ¤œç´¢å…ˆã€‚ 無指定時ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆã€‚\n" +" HTML テンプレートã®æ¤œç´¢å…ˆã€‚ 無指定時ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«å…ˆã€‚" + +msgid "" +"``websub``\n" +"----------" +msgstr "" +"``websub``\n" +"----------" + +msgid "" +"Web substitution filter definition. You can use this section to\n" +"define a set of regular expression substitution patterns which\n" +"let you automatically modify the hgweb server output." +msgstr "" + +msgid "" +"The default hgweb templates only apply these substitution patterns\n" +"on the revision description fields. You can apply them anywhere\n" +"you want when you create your own templates by adding calls to the\n" +"\"websub\" filter (usually after calling the \"escape\" filter)." +msgstr "" + +msgid "" +"This can be used, for example, to convert issue references to links\n" +"to your issue tracker, or to convert \"markdown-like\" syntax into\n" +"HTML (see the examples below)." +msgstr "" + +msgid "" +"Each entry in this section names a substitution filter.\n" +"The value of each entry defines the substitution expression itself.\n" +"The websub expressions follow the old interhg extension syntax,\n" +"which in turn imitates the Unix sed replacement syntax::" +msgstr "" + +msgid " patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i]" +msgstr " patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i]" + +msgid "" +"You can use any separator other than \"/\". The final \"i\" is optional\n" +"and indicates that the search must be case insensitive." +msgstr "" + +msgid "Examples::" +msgstr "記述例::" + +msgid "" +" [websub]\n" +" issues = s|issue(\\d+)|<a href=\"http://bts.example.org/issue\\1\">issue" +"\\1</a>|i\n" +" italic = s/\\b_(\\S+)_\\b/<i>\\1<\\/i>/\n" +" bold = s/\\*\\b(\\S+)\\b\\*/<b>\\1<\\/b>/" +msgstr "" +" [websub]\n" +" issues = s|issue(\\d+)|<a href=\"http://bts.example.org/issue\\1\">issue" +"\\1</a>|i\n" +" italic = s/\\b_(\\S+)_\\b/<i>\\1<\\/i>/\n" +" bold = s/\\*\\b(\\S+)\\b\\*/<b>\\1<\\/b>/" + +msgid "" +"``worker``\n" +"----------" +msgstr "" +"``worker``\n" +"----------" + +msgid "" +"Parallel master/worker configuration. We currently perform working\n" +"directory updates in parallel on Unix-like systems, which greatly\n" +"helps performance." +msgstr "" +"並列実施ã«é–¢ã™ã‚‹è¨å®šã€‚ ç¾çŠ¶ã§ã¯ã€ Unix 系システムã«ãŠã‘る作æ¥é ˜åŸŸæ›´æ–°ã§ã€\n" +"処ç†ãŒä¸¦åˆ—ã«å®Ÿæ–½ã•ã‚Œã€å¤§è¦æ¨¡ãƒªãƒã‚¸ãƒˆãƒªã«ãŠã‘る大幅ãªæ€§èƒ½æ”¹å–„ãŒè¦‹è¾¼ã¾ã‚Œã¾ã™ã€‚" + +msgid "" +"``numcpus``\n" +" Number of CPUs to use for parallel operations. Default is 4 or the\n" +" number of CPUs on the system, whichever is larger. A zero or\n" +" negative value is treated as ``use the default``.\n" +msgstr "" +"``numcpus``\n" +" 並列実施ã«ä½¿ç”¨å¯èƒ½ãª CPU 数。 デフォルト値㯠4 ã‚ã‚‹ã„ã¯\n" +" システム上㮠CPU æ•°ã®å¤§ãã„æ–¹ã®å€¤ã€‚ 0 ã‚ã‚‹ã„ã¯è² 値ã¯ã€\n" +" 『デフォルト値ã®ä½¿ç”¨ã€ã‚’æ„味ã—ã¾ã™ã€‚\n" msgid "Some commands allow the user to specify a date, e.g.:" msgstr "以下ã®ã‚³ãƒžãƒ³ãƒ‰ã§æ—¥æ™‚指定ãŒå¯èƒ½ã§ã™:" @@ -18530,7 +18857,10 @@ "- ``2006-12-6``\n" "- ``12-6``\n" "- ``12/6``\n" -"- ``12/6/6`` (Dec 6 2006)" +"- ``12/6/6`` (Dec 6 2006)\n" +"- ``today`` (midnight)\n" +"- ``yesterday`` (midnight)\n" +"- ``now`` - right now" msgstr "" "- ``Wed Dec 6 13:18:29 2006`` (「ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚¤ãƒ ゾーンã€ã‚’想定)\n" "- ``Dec 6 13:18 -0600`` (「今年ã€ã‚’想定〠タイムゾーンã¯ã‚ªãƒ•ã‚»ãƒƒãƒˆæŒ‡å®š)\n" @@ -18544,7 +18874,10 @@ "- ``2006-12-6``\n" "- ``12-6``\n" "- ``12/6``\n" -"- ``12/6/6`` (2006å¹´12月6æ—¥)" +"- ``12/6/6`` (2006å¹´12月6æ—¥)\n" +"- ``today`` (当日åˆå‰0時)\n" +"- ``yesterday`` (昨日åˆå‰0時)\n" +"- ``now`` - ç¾åœ¨æ™‚刻" msgid "Lastly, there is Mercurial's internal format:" msgstr "最後ã«ã€ Mercurial 固有ã®å†…部形å¼ã‚’示ã—ã¾ã™:" @@ -18941,7 +19274,7 @@ msgid "" "Mercurial supports a functional language for selecting a set of\n" -"files. " +"files." msgstr "Mercurial ã¯ãƒ•ã‚¡ã‚¤ãƒ«æŒ‡å®šã®ãŸã‚ã®å•ã„åˆã‚ã›è¨€èªžã‚’æä¾›ã—ã¦ã„ã¾ã™ã€‚" msgid "" @@ -20513,7 +20846,7 @@ msgid "" ".. note::\n" -" Patterns specified in ``.hgignore`` are not rooted. \n" +" Patterns specified in ``.hgignore`` are not rooted.\n" " Please see :hg:`help hgignore` for details." msgstr "" ".. note::\n" @@ -20785,7 +21118,7 @@ msgid " - resynchronize draft changesets relative to a remote repository::" msgstr " - 連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã«å¿œã˜ã¦ã€ãƒªãƒ“ジョンを draft フェーズ化::" -msgid " hg phase -fd 'outgoing(URL)' " +msgid " hg phase -fd 'outgoing(URL)'" msgstr " hg phase -fd 'outgoing(URL)'" msgid "" @@ -21041,7 +21374,7 @@ msgstr " hg log -r \"branch(default) and 1.5:: and not merge()\"" msgid "- Open branch heads::" -msgstr "- 閉鎖 (close) ã•ã‚Œã¦ã„ãªã„ブランãƒãƒ³ã®ãƒ˜ãƒƒãƒ‰::" +msgstr "- 閉鎖 (close) ã•ã‚Œã¦ã„ãªã„ブランãƒã®ãƒ˜ãƒƒãƒ‰::" msgid " hg log -r \"head() and not closed()\"" msgstr " hg log -r \"head() and not closed()\"" @@ -21488,9 +21821,18 @@ msgid "In addition to filters, there are some basic built-in functions:" msgstr "フィルタã®ä»–ã«ã€ 以下ã®æ§˜ãªåŸºæœ¬çš„ãªçµ„ã¿è¾¼ã¿é–¢æ•°ãŒã‚ã‚Šã¾ã™:" +msgid "- date(date[, fmt])" +msgstr "- date(date[, fmt])" + +msgid "- fill(text[, width])" +msgstr "- fill(text[, width])" + +msgid "- get(dict, key)" +msgstr "- get(dict, key)" + msgid "- if(expr, then[, else])" msgstr "- if(expr, then[, else])" msgid "- ifeq(expr, expr, then[, else])" msgstr "- ifeq(expr, expr, then[, else])" @@ -21491,15 +21833,12 @@ msgid "- if(expr, then[, else])" msgstr "- if(expr, then[, else])" msgid "- ifeq(expr, expr, then[, else])" msgstr "- ifeq(expr, expr, then[, else])" -msgid "- sub(pat, repl, expr)" -msgstr "- sub(pat, repl, expr)" - msgid "- join(list, sep)" msgstr "- join(list, sep)" msgid "- label(label, expr)" msgstr "- label(label, expr)" @@ -21500,14 +21839,14 @@ msgid "- join(list, sep)" msgstr "- join(list, sep)" msgid "- label(label, expr)" msgstr "- label(label, expr)" -msgid "- date(date[, fmt])" -msgstr "- date(date[, fmt])" - -msgid "- fill(text[, width])" -msgstr "- fill(text[, width])" +msgid "- sub(pat, repl, expr)" +msgstr "- sub(pat, repl, expr)" + +msgid "- rstdoc(text, style)" +msgstr "- rstdoc(text, style)" msgid "Also, for any expression that returns a list, there is a list operator:" msgstr "ã¾ãŸã€ 列挙形å¼ã‚’返㙠expr ã«å¯¾ã—ã¦ã¯ã€ 以下ã®æ§˜ãªè¨˜è¿°ãŒå¯èƒ½ã§ã™:" @@ -21795,6 +22134,14 @@ msgstr "(マージçµæžœã® commit を忘れãšã«)\n" #, python-format +msgid "websub: invalid pattern for %s: %s\n" +msgstr "websub: %s ã®ãƒ‘ターンãŒä¸æ£ã§ã™: %s\n" + +#, python-format +msgid "websub: invalid regexp for %s: %s\n" +msgstr "websub: %s ã®æ£è¦è¡¨ç¾ãŒä¸æ£ã§ã™: %s\n" + +#, python-format msgid "config file %s not found!" msgstr "è¨å®šãƒ•ã‚¡ã‚¤ãƒ« %s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“!" @@ -22098,9 +22445,6 @@ msgid "updating %s to public failed!\n" msgstr "%s ã®ãƒ•ã‚§ãƒ¼ã‚ºã® public 化ã«å¤±æ•—!\n" -msgid "failed to push some obsolete markers!\n" -msgstr "リビジョンã®å»ƒæ¢æƒ…å ±ã®åæ˜ ã«å¤±æ•—ã—ã¾ã—ãŸï¼\n" - #, python-format msgid "%d changesets found\n" msgstr "%d 個ã®ãƒªãƒ“ジョンãŒã‚ã‚Šã¾ã™\n" @@ -22174,6 +22518,9 @@ msgid "transferred %s in %.1f seconds (%s/sec)\n" msgstr "%s ã‚’ %.1f 秒ã§é€ä¿¡ã—ã¾ã—ãŸï¼ˆ%s/秒)\n" +msgid "SMTPS requires Python 2.6 or later" +msgstr "SMTPS ã®åˆ©ç”¨ã«ã¯ Python 2.6 以é™ãŒå¿…è¦ã§ã™" + msgid "can't use TLS: Python SSL support not installed" msgstr "TLS を利用ã§ãã¾ã›ã‚“: Python SSL サãƒãƒ¼ãƒˆãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“" @@ -22177,10 +22524,7 @@ msgid "can't use TLS: Python SSL support not installed" msgstr "TLS を利用ã§ãã¾ã›ã‚“: Python SSL サãƒãƒ¼ãƒˆãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“" -msgid "(using smtps)\n" -msgstr "(SMTP を使用)\n" - msgid "smtp.host not configured - cannot send mail" msgstr "è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã« smtp.host 指定ãŒã‚ã‚Šã¾ã›ã‚“ - メールé€ä¿¡ã«å¤±æ•—" #, python-format @@ -22183,8 +22527,15 @@ msgid "smtp.host not configured - cannot send mail" msgstr "è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã« smtp.host 指定ãŒã‚ã‚Šã¾ã›ã‚“ - メールé€ä¿¡ã«å¤±æ•—" #, python-format +msgid "invalid smtp.verifycert configuration: %s" +msgstr "smtp.verifycert è¨å®šãŒä¸æ£ã§ã™: %s" + +msgid "(using smtps)\n" +msgstr "(smtps を使用ä¸)\n" + +#, python-format msgid "sending mail: smtp host %s, port %s\n" msgstr "メールé€ä¿¡ä¸: SMTP ホスト %s〠ãƒãƒ¼ãƒˆç•ªå· %s\n" msgid "(using starttls)\n" @@ -22187,8 +22538,11 @@ msgid "sending mail: smtp host %s, port %s\n" msgstr "メールé€ä¿¡ä¸: SMTP ホスト %s〠ãƒãƒ¼ãƒˆç•ªå· %s\n" msgid "(using starttls)\n" -msgstr "(starttls を使用)\n" +msgstr "(starttls を使用ä¸)\n" + +msgid "(verifying remote certificate)\n" +msgstr "(接続先ã®è¨¼æ˜Žæ›¸ã‚’検証ä¸)\n" #, python-format msgid "(authenticating to mail server as %s)\n" @@ -22192,7 +22546,7 @@ #, python-format msgid "(authenticating to mail server as %s)\n" -msgstr "(%s ã¨ã—ã¦ãƒ¡ãƒ¼ãƒ«ã‚µãƒ¼ãƒã®èªè¨¼ä¸)\n" +msgstr "(メールサーãƒã« %s ã¨ã—ã¦èªè¨¼è¦æ±‚ä¸)\n" #, python-format msgid "sending mail: %s\n" @@ -22261,7 +22615,7 @@ #, python-format msgid "" -" local changed %s which remote deleted\n" +"local changed %s which remote deleted\n" "use (c)hanged version or (d)elete?" msgstr "" "変更ã—ãŸãƒ•ã‚¡ã‚¤ãƒ« %s ã¯åˆ¥ãƒªãƒ“ジョンã§ç™»éŒ²é™¤å¤–ã•ã‚Œã¦ã„ã¾ã™\n" @@ -22284,9 +22638,6 @@ msgid "&Deleted" msgstr "&Deleted" -msgid "updating" -msgstr "æ›´æ–°ä¸" - #, python-format msgid "update failed to remove %s: %s!\n" msgstr "%s ã®å‰Šé™¤ã«å¤±æ•—: %s!\n" @@ -22295,6 +22646,9 @@ msgid "getting %s\n" msgstr "%s ã‚’å–å¾—ã—ã¦ã„ã¾ã™\n" +msgid "updating" +msgstr "æ›´æ–°ä¸" + #, python-format msgid "getting %s to %s\n" msgstr "%s ã‹ã‚‰ %s ã«è¤‡è£½ä¸\n" @@ -22373,6 +22727,9 @@ msgid "unexpected old value" msgstr "旧値ã®æŒ‡å®šã¯æƒ³å®šå¤–ã§ã™" +msgid "failed to push some obsolete markers!\n" +msgstr "リビジョンã®å»ƒæ¢æƒ…å ±ã®åæ˜ ã«å¤±æ•—ã—ã¾ã—ãŸï¼\n" + #, python-format msgid "unexpected token: %s" msgstr "未知ã®è¨˜è¿°: %s" @@ -22585,19 +22942,21 @@ msgstr "adds ã«ã¯ãƒ‘ターンを指定ã—ã¦ãã ã•ã„" msgid "" -"``ancestor(single, single)``\n" -" Greatest common ancestor of the two changesets." -msgstr "" -"``ancestor(single, single)``\n" -" 2ã¤ã®ãƒªãƒ“ジョンã«å…±é€šãªæœ€æ–°ã®ç¥–先。" - -#. i18n: "ancestor" is a keyword -msgid "ancestor requires two arguments" -msgstr "ancestor ã®å¼•æ•°ã¯2ã¤ã§ã™" - -#. i18n: "ancestor" is a keyword -msgid "ancestor arguments must be single revisions" -msgstr "ancestor ã®å¼•æ•°ã«ã¯ãã‚Œãžã‚Œå˜ä¸€ãƒªãƒ“ジョンを指定ã—ã¦ãã ã•ã„" +"``ancestor(*changeset)``\n" +" Greatest common ancestor of the changesets." +msgstr "" +"``ancestor(*changeset)``\n" +" 指定リビジョン郡ã«å…±é€šãªæœ€æ–°ã®ç¥–先。" + +msgid "" +" Accepts 0 or more changesets.\n" +" Will return empty list when passed no args.\n" +" Greatest common ancestor of a single changeset is that changeset." +msgstr "" +" ä»»æ„ã®æ•°ã®ãƒªãƒ“ジョンを指定å¯èƒ½ã§ã™ã€‚\n" +" リビジョン指定ãŒç„¡ã„å ´åˆã€çµæžœã¯ç©ºã¨ãªã‚Šã¾ã™ã€‚\n" +" 1ã¤ã®ãƒªãƒ“ジョンã ã‘ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€\n" +" ãã®ãƒªãƒ“ジョン自身ãŒã€Žå…±é€šã®ç¥–å…ˆã€ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚" msgid "" "``ancestors(set)``\n" @@ -23437,10 +23796,6 @@ msgid "the argument to tag must be a string" msgstr "tag ã«ã¯æ–‡å—列を指定ã—ã¦ãã ã•ã„" -#, python-format -msgid "no tags exist that match '%s'" -msgstr "'%s' ã«åˆè‡´ã™ã‚‹ã‚¿ã‚°ã¯ã‚ã‚Šã¾ã›ã‚“" - msgid "" "``unstable()``\n" " Non-obsolete changesets with obsolete ancestors." @@ -23495,6 +23850,9 @@ msgid "%r cannot be used in a name" msgstr "%r ã¯åå‰å®šç¾©ã«ä½¿ç”¨ã§ãã¾ã›ã‚“" +msgid "cannot use an integer as a name" +msgstr "数値ã ã‘ã®åå‰ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“" + #, python-format msgid "ui.portablefilenames value is invalid ('%s')" msgstr "ui.portablefilenames 値ãŒä¸æ£ã§ã™ ('%s')" @@ -23630,6 +23988,10 @@ 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" @@ -23659,7 +24021,14 @@ "指定ã—ã¦ãã ã•ã„" #, python-format +msgid "%s certificate with fingerprint %s not verified" +msgstr "%s ã®è¨¼æ˜Žæ›¸ã®ãƒ•ã‚£ãƒ³ã‚¬ãƒ¼ãƒ—リント %s ã¯æ¤œè¨¼ã§ãã¾ã›ã‚“" + +msgid "check hostfingerprints or web.cacerts config setting" +msgstr "hostfingerprint ã¾ãŸã¯ web.cacerts è¨å®šã‚’確èªã—ã¦ãã ã•ã„" + +#, python-format msgid "" "warning: %s certificate with fingerprint %s not verified (check " "hostfingerprints or web.cacerts config setting)\n" msgstr "" @@ -23662,8 +24031,8 @@ msgid "" "warning: %s certificate with fingerprint %s not verified (check " "hostfingerprints or web.cacerts config setting)\n" msgstr "" -"è¦å‘Š: %s ã®è¨¼æ˜Žæ›¸ (fingerprint 㯠%s) 検証をçœç•¥(è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã® " +"è¦å‘Š: %s ã®è¨¼æ˜Žæ›¸ (フィンガープリント㯠%s) 検証をçœç•¥(è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã® " "hostfingerprints ãªã„ã— web.cacerts è¨å®šã‚’確èªã—ã¦ãã ã•ã„)\n" #, python-format @@ -23774,6 +24143,10 @@ msgstr "サブリãƒã‚¸ãƒˆãƒª %s ã« %s ã‹ã‚‰å–ã‚Šè¾¼ã¿ä¸\n" #, python-format +msgid "no changes made to subrepo %s since last push to %s\n" +msgstr "サブリãƒã‚¸ãƒˆãƒª %s ã¯ã€ç›´å‰ã® %s ã¸ã®åæ˜ ä»¥é™ã®å¤‰æ›´ãŒã‚ã‚Šã¾ã›ã‚“\n" + +#, python-format msgid "pushing subrepo %s to %s\n" msgstr "サブリãƒã‚¸ãƒˆãƒª %s ã‹ã‚‰ %s ã¸åæ˜ ä¸\n" @@ -24019,5 +24392,5 @@ " S: skipped, U: untested, I: ignored). Returns single space if `text`\n" " is not a valid bisection status." msgstr "" -":shortbisect: æ–‡å—列。 `æ–‡å—列` を2分探索 (bisect) 状態ã¨ã¿ãªã—ã€\n" +":shortbisect: æ–‡å—列。 `æ–‡å—列` を二分探索 (bisect) 状態ã¨ã¿ãªã—ã€\n" " 状態ã«è¦‹åˆã£ãŸ1æ–‡å— (G: good, B: bad, S: skipped, U: untested, I:\n" @@ -24023,5 +24396,5 @@ " 状態ã«è¦‹åˆã£ãŸ1æ–‡å— (G: good, B: bad, S: skipped, U: untested, I:\n" -" ignored) ã‚’è¿”ã—ã¾ã™ã€‚ `æ–‡å—列` ãŒï¼’分探索状態ã¨ã—ã¦ä¸é©åˆ‡ãªå ´åˆã€\n" +" ignored) ã‚’è¿”ã—ã¾ã™ã€‚ `æ–‡å—列` ãŒäºŒåˆ†æŽ¢ç´¢çŠ¶æ…‹ã¨ã—ã¦ä¸é©åˆ‡ãªå ´åˆã€\n" " 空白文å—ã‚’è¿”ã—ã¾ã™ã€‚" msgid ":shortdate: Date. Returns a date like \"2006-09-18\"." @@ -24078,7 +24451,7 @@ msgstr ":author: æ–‡å—列。 リビジョンã®ä½œè€…å(è¨˜éŒ²æƒ…å ±ãã®ã¾ã¾)。" msgid ":bisect: String. The changeset bisection status." -msgstr ":bisect: æ–‡å—列。 当該リビジョンã®ï¼’分探索状態。" +msgstr ":bisect: æ–‡å—列。 当該リビジョンã®äºŒåˆ†æŽ¢ç´¢çŠ¶æ…‹ã€‚" msgid "" ":branch: String. The name of the branch on which the changeset was\n" @@ -24231,6 +24604,14 @@ msgid "filter %s expects one argument" msgstr "フィルタ %s ã¯å¼•æ•°ãŒ1ã¤å¿…è¦ã§ã™" +#. i18n: "get" is a keyword +msgid "get() expects two arguments" +msgstr "get() ã®å¼•æ•°ã¯2ã¤ã§ã™" + +#. i18n: "get" is a keyword +msgid "get() expects a dict as first argument" +msgstr "get() ã®ç¬¬1引数ã¯è¾žæ›¸ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" + #. i18n: "join" is a keyword msgid "join expects one or two arguments" msgstr "join ã®å¼•æ•°ã¯1ã¤ãªã„ã—2ã¤ã§ã™" @@ -24247,6 +24628,10 @@ msgid "ifeq expects three or four arguments" msgstr "ifeq ã¯3ãªã„ã—4ã®å¼•æ•°ãŒå¿…è¦ã§ã™" +#. i18n: "rstdoc" is a keyword +msgid "rstdoc expects two arguments" +msgstr "rstdoc ã®å¼•æ•°ã¯2ã¤ã§ã™" + msgid "unmatched quotes" msgstr "引用符ã®å¯¾å¿œé–¢ä¿‚ãŒä¸æ£ã§ã™" @@ -24305,6 +24690,10 @@ msgid "%s.%s is not an integer ('%s')" msgstr "%s.%s ã®å€¤ ('%s') ã¯æ•´æ•°å€¤ã§ã¯ã‚ã‚Šã¾ã›ã‚“" +#, python-format +msgid "%s.%s is not a byte quantity ('%s')" +msgstr "%s.%s ã®å€¤ ('%s') ã¯ãƒã‚¤ãƒˆæ•°ã‚’表ã™å€¤ã§ã¯ã‚ã‚Šã¾ã›ã‚“" + msgid "enter a commit username:" msgstr "コミットã™ã‚‹ãƒ¦ãƒ¼ã‚¶åを入力ã—ã¦ãã ã•ã„:" @@ -24328,6 +24717,9 @@ msgid "password: " msgstr "パスワード: " +msgid "cannot create new union repository" +msgstr "" + msgid "http authorization required" msgstr "HTTP èªè¨¼ã«å¤±æ•—" @@ -24372,6 +24764,15 @@ msgid "negative timestamp: %d" msgstr "è² ã®ã‚¿ã‚¤ãƒ スタンプ: %d" +msgid "now" +msgstr "now" + +msgid "today" +msgstr "today" + +msgid "yesterday" +msgstr "yesterday" + #, python-format msgid "invalid date: %r" msgstr "ä¸æ£ãªæ—¥ä»˜: %r" @@ -24452,6 +24853,58 @@ msgid "file:// URLs can only refer to localhost" msgstr "file:// URL ãŒå‚ç…§ã§ãã‚‹ã®ã¯ãƒãƒ¼ã‚«ãƒ«ãƒ›ã‚¹ãƒˆã®ã¿ã§ã™" +#, python-format +msgid "%.0f s" +msgstr "%.0f 秒" + +#, python-format +msgid "%.1f s" +msgstr "%.1f 秒" + +#, python-format +msgid "%.2f s" +msgstr "%.2f 秒" + +#, python-format +msgid "%.3f s" +msgstr "%.3f 秒" + +#, python-format +msgid "%.1f ms" +msgstr "%.1f ミリ秒" + +#, python-format +msgid "%.2f ms" +msgstr "%.2f ミリ秒" + +#, python-format +msgid "%.3f ms" +msgstr "%.3f ミリ秒" + +#, python-format +msgid "%.1f us" +msgstr "%.1f マイクãƒç§’" + +#, python-format +msgid "%.2f us" +msgstr "%.2f マイクãƒç§’" + +#, python-format +msgid "%.3f us" +msgstr "%.3f マイクãƒç§’" + +#, python-format +msgid "%.1f ns" +msgstr "%.1f ナノ秒" + +#, python-format +msgid "%.2f ns" +msgstr "%.2f ナノ秒" + +#, python-format +msgid "%.3f ns" +msgstr "%.3f ナノ秒" + msgid "cannot verify bundle or remote repos" msgstr "ãƒãƒ¼ã‚«ãƒ«ãƒªãƒã‚¸ãƒˆãƒªä»¥å¤–ã¯æ¤œè¨¼ã§ãã¾ã›ã‚“" @@ -24630,3 +25083,6 @@ msgid "push failed:" msgstr "å±¥æ´åæ˜ ã«å¤±æ•—:" + +msgid "number of cpus must be an integer" +msgstr "CPU æ•°ã¯æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"