# HG changeset patch # User Augie Fackler # Date 1488504656 18000 # Node ID dc8996f855d99c718e06957de0ccae006767ef81 # Parent c22253c4c1b8bdd414f227232499ae323bd2173f# Parent 6b00c3ecd15b26587de8cca6fab811069cba3b2f merge with stable diff -r c22253c4c1b8 -r dc8996f855d9 .hgsigs --- a/.hgsigs Wed Mar 01 19:51:05 2017 -0800 +++ b/.hgsigs Thu Mar 02 20:30:56 2017 -0500 @@ -139,3 +139,4 @@ e69874dc1f4e142746ff3df91e678a09c6fc208c 0 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 diff -r c22253c4c1b8 -r dc8996f855d9 .hgtags --- a/.hgtags Wed Mar 01 19:51:05 2017 -0800 +++ b/.hgtags Thu Mar 02 20:30:56 2017 -0500 @@ -152,3 +152,4 @@ e69874dc1f4e142746ff3df91e678a09c6fc208c 4.0.2 a1dd2c0c479e0550040542e392e87bc91262517e 4.1-rc e1526da1e6d84e03146151c9b6e6950fe9a83d7d 4.1 +25703b624d27e3917d978af56d6ad59331e0464a 4.1.1 diff -r c22253c4c1b8 -r dc8996f855d9 i18n/ja.po --- a/i18n/ja.po Wed Mar 01 19:51:05 2017 -0800 +++ b/i18n/ja.po Thu Mar 02 20:30:56 2017 -0500 @@ -1,7 +1,7 @@ # Japanese translation for Mercurial # Mercurial 日本語翻訳 # -# Copyright (C) 2009-2016 the Mercurial team +# Copyright (C) 2009-2017 the Mercurial team # # ======================================== # 【翻訳用語集】 @@ -81,6 +81,7 @@ # experimental 実験的実装 # extend(ed) 拡張 # extension (Mercurialの)エクステンション +# unexpected 想定外の〜 (※ 場合によては「不正な〜」) # fold (revision/patch) (リビジョン／パッチの)併合 # glob(, rooted at ...) ワイルドカード形式 # (... からの相対パスに対して、 @@ -135,6 +136,9 @@ # resolve/unresolve (衝突)解消/(衝突)未解消 # revert/undo 取り消し # revision リビジョン +# revset (expression) revsets 表記 (for "a expression in 'revisions set'") +# revsets revsets (for "query language") +# revsets 表記 (for "expressions in 'revisions sets'") # schedule (add/remove の)予約 # search 探索 # server サーバ @@ -165,8 +169,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-31 13:29+0900\n" -"PO-Revision-Date: 2016-12-31 17:09+0900\n" +"POT-Creation-Date: 2017-02-28 19:28+0900\n" +"PO-Revision-Date: 2017-03-01 16:33+0900\n" "Last-Translator: Japanese translation team \n" "Language-Team: Japanese\n" "Language: ja\n" @@ -1514,60 +1518,6 @@ msgid "censor tombstone must be no longer than censored data" msgstr "差し替え用の墓碑データは、検閲対象データよりも短くしてください" -msgid "command server extension for cHg (EXPERIMENTAL)" -msgstr "" - -msgid "" -"'S' channel (read/write)\n" -" propagate ui.system() request to client" -msgstr "" - -msgid "" -"'attachio' command\n" -" attach client's stdio passed by sendmsg()" -msgstr "" - -msgid "" -"'chdir' command\n" -" change current directory" -msgstr "" - -msgid "" -"'getpager' command\n" -" checks if pager is enabled and which pager should be executed" -msgstr "" - -msgid "" -"'setenv' command\n" -" replace os.environ completely" -msgstr "" - -msgid "" -"'setumask' command\n" -" set umask" -msgstr "" - -msgid "" -"'validate' command\n" -" reload the config and check if the server is up to date" -msgstr "" - -msgid "" -"Config\n" -"------" -msgstr "" -"設定\n" -"----" - -msgid "" -" [chgserver]\n" -" idletimeout = 3600 # seconds, after which an idle server will exit\n" -" skiphash = False # whether to skip config or env change checks\n" -msgstr "" - -msgid "invalid response" -msgstr "" - msgid "command to display child changesets (DEPRECATED)" msgstr "子リビジョン表示のコマンド (非推奨)" @@ -2343,9 +2293,18 @@ msgid "TYPE" msgstr "種別" +msgid "show all configured styles" +msgstr "全ての設定済みスタイルを表示" + +msgid "show available color, effects or style" +msgstr "利用可能な色／効果／スタイルの表示" + msgid "available colors:\n" msgstr "利用可能な色指定:\n" +msgid "available style:\n" +msgstr "利用可能なスタイル:\n" + msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "他の構成管理ツールから Mercurial への履歴取り込み" @@ -2700,7 +2659,8 @@ msgid "" " :convert.hg.revs: revset specifying the source revisions to convert." -msgstr " :convert.hg.revs: 変換元における変換対象リビジョンの revset 表記。" +msgstr "" +" :convert.hg.revs: 変換元における変換対象リビジョンの revsets 表記。" msgid "" " CVS Source\n" @@ -2929,6 +2889,76 @@ " 効果を持ちません。 デフォルト値は False。" msgid "" +" :convert.git.renamelimit: perform rename and copy detection up to this\n" +" many changed files in a commit. Increasing this will make rename\n" +" and copy detection more accurate but will significantly slow down\n" +" computation on large projects. The option is only relevant if\n" +" ``convert.git.similarity`` is greater than 0. The default is\n" +" ``400``." +msgstr "" + +msgid "" +" :convert.git.committeractions: list of actions to take when processing\n" +" author and committer values." +msgstr "" + +msgid "" +" Git commits have separate author (who wrote the commit) and " +"committer\n" +" (who applied the commit) fields. Not all destinations support " +"separate\n" +" author and committer fields (including Mercurial). This config " +"option\n" +" controls what to do with these author and committer fields during\n" +" conversion." +msgstr "" + +msgid "" +" A value of ``messagedifferent`` will append a ``committer: ...``\n" +" line to the commit message if the Git committer is different from " +"the\n" +" author. The prefix of that line can be specified using the syntax\n" +" ``messagedifferent=``. e.g. ``messagedifferent=git-committer:" +"``.\n" +" When a prefix is specified, a space will always be inserted between " +"the\n" +" prefix and the value." +msgstr "" + +msgid "" +" ``messagealways`` behaves like ``messagedifferent`` except it will\n" +" always result in a ``committer: ...`` line being appended to the " +"commit\n" +" message. This value is mutually exclusive with ``messagedifferent``." +msgstr "" + +msgid "" +" ``dropcommitter`` will remove references to the committer. Only\n" +" references to the author will remain. Actions that add references\n" +" to the committer will have no effect when this is set." +msgstr "" + +msgid "" +" ``replaceauthor`` will replace the value of the author field with\n" +" the committer. Other actions that add references to the committer\n" +" will still take effect when this is set." +msgstr "" + +msgid " The default is ``messagedifferent``." +msgstr "" + +msgid "" +" :convert.git.extrakeys: list of extra keys from commit metadata to copy " +"to\n" +" the destination. Some Git repositories store extra metadata in " +"commits.\n" +" By default, this non-default metadata will be lost during " +"conversion.\n" +" Setting this config option can retain that metadata. Some built-in\n" +" keys such as ``parent`` and ``branch`` are not allowed to be copied." +msgstr "" + +msgid "" " :convert.git.remoteprefix: remote refs are converted as bookmarks with\n" " ``convert.git.remoteprefix`` as a prefix followed by a /. The " "default\n" @@ -2936,6 +2966,12 @@ msgstr "" msgid "" +" :convert.git.saverev: whether to store the original Git commit ID in " +"the\n" +" metadata of the destination commit. The default is True." +msgstr "" + +msgid "" " :convert.git.skipsubmodules: does not convert root level .gitmodules " "files\n" " or files with 160000 mode indicating a submodule. Default is False." @@ -3317,7 +3353,7 @@ #, python-format msgid "" "unexpected response from CVS server (expected \"Valid-requests\", but got %r)" -msgstr "CVS サーバの予期せぬ応答(期待値 \"Valid-requests\" に対して %r)" +msgstr "想定外の CVS サーバ応答(期待値 \"Valid-requests\" に対して %r)" #, python-format msgid "%d bytes missing from remote file" @@ -3463,6 +3499,22 @@ msgid "similarity must be between 0 and 100" msgstr "類似度には0から100の間を指定してください" +#, python-format +msgid "copying of extra key is forbidden: %s" +msgstr "以下のキーのコピーは禁止されています: %s" + +msgid ", " +msgstr ", " + +msgid "committeractions cannot define both messagedifferent and messagealways" +msgstr "" + +msgid "committeractions cannot define both dropcommitter and replaceauthor" +msgstr "" + +msgid "committeractions cannot define both dropcommitter and messagealways" +msgstr "" + msgid "cannot retrieve git heads" msgstr "git のヘッドが取得できません" @@ -3628,7 +3680,7 @@ #, python-format msgid "mtn automate stdio header unexpected: %s" -msgstr "mtn automate stdio ヘッダが想定外です: %s" +msgstr "想定外の mtn automate stdio ヘッダ: %s" msgid "failed to reach end of mtn automate stdio headers" msgstr "mtn automate stdio ヘッダを最後まで読み込めませんでした" @@ -3653,6 +3705,10 @@ msgid "convert from p4 does not support --full" msgstr "p4 からの変換では --full は未サポートです" +#, python-format +msgid "cannot find %s in the revmap or parsed changesets" +msgstr "リビジョン %s は revmap にも解析済みリビジョンにも見当たりません" + msgid "debugsvnlog could not load Subversion python bindings" msgstr "debugsvnlog が Subversion python バインディングを読み込めません" @@ -3761,10 +3817,10 @@ msgstr "svn ワーキングコピー %r の初期化中\n" msgid "unexpected svn output:\n" -msgstr "予期せぬ svn の出力:\n" +msgstr "想定外の svn 出力:\n" msgid "unable to cope with svn output" -msgstr "予期せぬ svn 出力のため継続できません" +msgstr "svn 出力に対処できません" msgid "writing Subversion tags is not yet implemented\n" msgstr "Subversion のタグ書き出し機能は未実装です\n" @@ -5122,6 +5178,13 @@ "を指定することで、 元リポジトリとの関連ありとみなすことができます。" msgid "" +"Config\n" +"------" +msgstr "" +"設定\n" +"----" + +msgid "" "Histedit rule lines are truncated to 80 characters by default. You\n" "can customize this behavior by setting a different length in your\n" "configuration file::" @@ -5370,7 +5433,7 @@ " ancestry of the working directory." msgstr "" " - 改変対象の指定がない場合、 \"histedit.defaultrev\" 設定を使って、\n" -" 改変対象が選択されます。 revset 記述で得た最初のリビジョンと、\n" +" 改変対象が選択されます。 revsets 表記で得た最初のリビジョンと、\n" " その直系の子孫が、 改変対象となります。 明示的な指定がない場合、\n" " 作業領域の親が属する (構造的) ブランチ固有のリビジョンが、\n" " 改変対象となります。" @@ -6621,10 +6684,10 @@ msgstr "大容量ファイルの転送に失敗:" msgid "putlfile failed (unexpected response):" -msgstr "大容量ファイルの転送に失敗 (未知の応答):" +msgstr "大容量ファイルの転送に失敗 (想定外の応答):" msgid "unexpected response:" -msgstr "未知の応答:" +msgstr "想定外の応答:" #, python-format msgid "remotestore: could not put %s to remote store %s" @@ -9725,6 +9788,10 @@ msgid "warning: new changesets detected on source branch, not stripping\n" msgstr "警告: 移動元に新規リビジョンを検出したので、 破棄しません\n" +msgid "cannot pull with rebase: please commit or shelve your changes first" +msgstr "" +"rebase するためには、未コミット変更を commit または shelve してください" + msgid "nothing to rebase - updating instead\n" msgstr "移動操作は不要です - 作業領域の更新のみを実施します\n" @@ -9785,12 +9852,14 @@ " 全てのファイルが記録の対象となります。" msgid "" -" You will be prompted for whether to record changes to each\n" +" If using the text interface (see :hg:`help config`),\n" +" you will be prompted for whether to record changes to each\n" " modified file, and for files with multiple changes, for each\n" " change to use. For each query, the following responses are\n" " possible::" msgstr "" -" 変更されたファイルの変更箇所ごとに記録するかどうか質問されます。\n" +" `text` インタフェース (:hg:`help config` 参照) が選択されている場合、\n" +" 変更されたファイルの、 変更箇所毎に、 記録の要否を質問されます。\n" " それに対して以下の操作が可能です::" msgid "" @@ -10200,23 +10269,20 @@ "this version of shelve is incompatible with the version used in this repo" msgstr "非互換なバージョンの shelve エクステンションによる復旧処理中です" -msgid "cannot shelve while merging" -msgstr "マージ実施中は変更を退避できません" - #, python-format msgid "a shelved change named '%s' already exists" msgstr "'%s' という名前の退避情報はすでに存在します" +msgid "shelved change names can not contain slashes" +msgstr "退避情報の名称にスラッシュやバックスラッシュは使用できません" + +msgid "shelved change names can not start with '.'" +msgstr "退避情報の名称の先頭に '.' は使用できません" + #, python-format msgid "too many shelved changes named '%s'" msgstr "名前のベースに '%s' を使用する退避情報が多過ぎます" -msgid "shelved change names may not contain slashes" -msgstr "退避情報の名称にスラッシュやバックスラッシュは使用できません" - -msgid "shelved change names may not start with '.'" -msgstr "退避情報の名称の先頭に '.' は使用できません" - #, python-format msgid "nothing changed (%d missing files, see 'hg status')\n" msgstr "変更はありません (%d 個のファイルが不在。 'hg status' で確認を)\n" @@ -10224,6 +10290,9 @@ msgid "nothing changed\n" msgstr "変更なし\n" +msgid "cannot shelve while merging" +msgstr "マージ実施中は変更を退避できません" + #, python-format msgid "shelved as %s\n" msgstr "変更内容を %s という名前で退避\n" @@ -10232,8 +10301,8 @@ msgstr "退避情報名が無指定です!" #, python-format -msgid "--%s expects a single shelf" -msgstr "--%s には単一退避情報のみが指定できます" +msgid "--%s expects at least one shelf" +msgstr "--%s には最低1つの退避情報名の指定が必要です" #, python-format msgid "cannot find shelf %s" @@ -10260,6 +10329,24 @@ msgid "unshelve of '%s' complete\n" msgstr "退避情報 '%s' の復旧を完了\n" +msgid "" +"temporarily committing pending changes (restore with 'hg unshelve --abort')\n" +msgstr "変更内容を一時的にコミット中 (中断時の復旧は 'hg unshelve --abort')\n" + +msgid "rebasing shelved changes\n" +msgstr "退避した変更の移動 (rebase) 中\n" + +msgid "unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')" +msgstr "" +"衝突が未解消です ('hg resolve' で衝突解消後に 'hg unshelve --continue' を実行" +"してください)" + +msgid "shelved change touches missing files" +msgstr "退避情報には不在ファイルへの変更が含まれています" + +msgid "run hg status to see which files are missing" +msgstr "hg status を実行して不在ファイルを確認してください" + msgid "abort an incomplete unshelve operation" msgstr "未完了の復旧処理を中止" @@ -10380,18 +10467,6 @@ msgid "unshelving change '%s'\n" msgstr "退避情報 '%s' を復旧中\n" -msgid "" -"temporarily committing pending changes (restore with 'hg unshelve --abort')\n" -msgstr "変更内容を一時的にコミット中 (中断時の復旧は 'hg unshelve --abort')\n" - -msgid "rebasing shelved changes\n" -msgstr "退避した変更の移動 (rebase) 中\n" - -msgid "unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')" -msgstr "" -"衝突が未解消です ('hg resolve' で衝突解消後に 'hg unshelve --continue' を実行" -"してください)" - msgid "mark new/missing files as added/removed before shelving" msgstr "新規／不在ファイルを、退避前に登録／除外対象化" @@ -11302,7 +11377,7 @@ #, python-format msgid "stream ended unexpectedly (got %d bytes, expected %d)" -msgstr "予期せぬデータ終端 (実データ:%d バイト 期待データ:%d バイト)" +msgstr "想定外のデータ終端 (実データ:%d バイト 期待データ:%d バイト)" #, python-format msgid "invalid chunk length %d" @@ -11391,6 +11466,13 @@ msgid "the name '%s' is reserved" msgstr "タグ名 '%s' はシステムで予約されています" +msgid "invalid response" +msgstr "不正な応答" + +#, python-format +msgid "unexpected command: %s" +msgstr "想定外のコマンド: %s" + msgid "running non-interactively" msgstr "非対話的な実行中" @@ -11521,13 +11603,6 @@ msgid "(consider using --after)\n" msgstr "(--after を使ってみては？)\n" -msgid "child process failed to start" -msgstr "子プロセスの生成に失敗" - -#, python-format -msgid "invalid value for --daemon-postexec: %s" -msgstr "--daemon-postexec への指定値が不正です: %s" - msgid "not a Mercurial patch" msgstr "Mercurial 向けのパッチではありません" @@ -11592,6 +11667,11 @@ msgstr "日付: %s\n" #. i18n: column positioning for "hg log" +#, python-format +msgid "trouble: %s\n" +msgstr "trouble: %s\n" + +#. i18n: column positioning for "hg log" msgid "files:" msgstr "ファイル: " @@ -11779,8 +11859,12 @@ msgstr "ファイル %s は管理対象ではありません\n" #, python-format -msgid "forget added file %s (yn)?$$ &Yes $$ &No" -msgstr "ファイル %s の追加登録を取り消しますか？(Yes/no)$$ &Yes $$ &No" +msgid "forget added file %s (Yn)?$$ &Yes $$ &No" +msgstr "ファイル %s の追加登録を取り消しますか？(Yn)$$ &Yes $$ &No" + +#, python-format +msgid "remove added file %s (Yn)?$$ &Yes $$ &No" +msgstr "ファイル %s の追加登録を取り消しますか？(Yn)$$ &Yes $$ &No" msgid "graft in progress" msgstr "graft による移植が未完了です" @@ -11808,14 +11892,6 @@ msgid "no %s in progress" msgstr "中断中の %s 処理はありません" -#, python-format -msgid "can't close already inactivated backup: dirstate%s" -msgstr "非活性化済みのバックアップは close できません: dirstate%s" - -#, python-format -msgid "can't release already inactivated backup: dirstate%s" -msgstr "非活性化済みのバックアップは release できません: dirstate%s" - msgid "repository root directory or name of overlay bundle file" msgstr "リポジトリのルート位置、 またはバンドルファイルのパス" @@ -12656,8 +12732,11 @@ msgid " hg log --graph -r \"bisect(range)\"" msgstr " hg log --graph -r \"bisect(range)\"" -msgid " See :hg:`help revsets` for more about the `bisect()` keyword." -msgstr " `bisect()` の詳細は :hg:`help revsets` を参照してください。" +msgid "" +" See :hg:`help revisions.bisect` for more about the `bisect()` " +"predicate." +msgstr "" +" `bisect()` の詳細は :hg:`help revisions.bisect` を参照してください。" msgid "(use of 'hg bisect ' is deprecated)\n" msgstr "('hg bisect ' 形式の実行は非推奨です)\n" @@ -13579,387 +13658,6 @@ " 成功時のコマンドの終了値は 0、 エラー発生時は 1 です。\n" " " -msgid "[INDEX] REV1 REV2" -msgstr "[INDEX] REV1 REV2" - -msgid "find the ancestor revision of two revisions in a given index" -msgstr "指定範囲における2つのリビジョンの祖先リビジョンの検索" - -msgid "either two or three arguments required" -msgstr "2または3の引数が必要です" - -msgid "add single file mergeable changes" -msgstr "ファイルを1つ登録して、 マージ可能な変更をリビジョン毎に実施" - -msgid "add single file all revs overwrite" -msgstr "ファイルを1つ登録して、 リビジョン毎に上書きを実施" - -msgid "add new file at each rev" -msgstr "各リビジョン毎に新規ファイルを登録" - -msgid "[OPTION]... [TEXT]" -msgstr "[OPTION]... [TEXT]" - -msgid "builds a repo with a given DAG from scratch in the current empty repo" -msgstr "指定 DAG による空リポジトリ上への履歴構築" - -msgid "" -" The description of the DAG is read from stdin if not given on the\n" -" command line." -msgstr " コマンド行で指定が無い場合、 標準入力から DAG を読み込みます。" - -msgid " Elements:" -msgstr " 表記:" - -msgid "" -" - \"+n\" is a linear run of n nodes based on the current default " -"parent\n" -" - \".\" is a single node based on the current default parent\n" -" - \"$\" resets the default parent to null (implied at the start);\n" -" otherwise the default parent is always the last node created\n" -" - \"8 ------------------------" +msgstr " HG: ------------------------ >8 ------------------------" + +msgid "" +"For example, the template configuration below will show the diff below the\n" +"extra message::" +msgstr "" +"例えば、 以下の設定記述により、 追加メッセージ以降に差分を表示できます::" + +msgid "" +" [committemplate]\n" +" changeset = {desc}\\n\\n\n" +" HG: Enter commit message. Lines beginning with 'HG:' are removed.\n" +" HG: {extramsg}\n" +" HG: ------------------------ >8 ------------------------\n" +" HG: Do not touch the line above.\n" +" HG: Everything below will be removed.\n" +" {diff()}" +msgstr "" +" [committemplate]\n" +" changeset = {desc}\\n\\n\n" +" HG: コミットログを入力してください。'HG:' で始まる行は無視されま" +"す。\n" +" HG: {extramsg}\n" +" HG: ------------------------ >8 ------------------------\n" +" HG: 上の行は削除しないでください。\n" +" HG: 以下の行は全て無視されます。\n" +" {diff()}" + +msgid "" " For some problematic encodings (see :hg:`help win32mbcs` for\n" " detail), this customization should be configured carefully, to\n" " avoid showing broken characters." @@ -22096,7 +22085,7 @@ " defined by this sub-option is evaluated to determine what to push." msgstr "" " ``-r`` 指定無しで :hg:`push` が実行された際に、 この項目で設定された\n" -" revset 記述を元に、 反映対象リビジョンが算出されます。" +" revsets 表記を元に、 反映対象リビジョンが算出されます。" msgid "" " For example, a value of ``.`` will push the working directory's\n" @@ -22109,7 +22098,7 @@ " Revsets specifying bookmarks will not result in the bookmark being\n" " pushed." msgstr "" -" ブックマークを含む revset を記述しても、 ブックマーク情報そのものは、\n" +" ブックマークを含む revsets 表記指定でも、 ブックマーク情報そのものは、\n" " 反映対象には含まれません。" msgid "The following special named paths exist:" @@ -22226,7 +22215,7 @@ msgstr "" "以下の説明では、 プロファイル期間に採取される生データの事を\n" "'プロファイルデータ'、 プロファイルデータを元にした、\n" -"テキスト形式の統計報告を 'プロファイル報告' と呼称します。\n" +"テキスト形式の統計報告を 'プロファイル報告' と呼びます。\n" "プロファイル採取には、 lsprof が用いられます。" msgid "" @@ -22244,10 +22233,11 @@ msgid "" "``type``\n" " The type of profiler to use.\n" -" (default: ls)" +" (default: stat)" msgstr "" "``type``\n" -" 使用するプロファイラ種別。 (デフォルト値: ls)" +" 使用するプロファイラ種別。\n" +" (デフォルト値: stat)" msgid "" " ``ls``\n" @@ -22256,17 +22246,17 @@ " first line of a function. This restriction makes it difficult to\n" " identify the expensive parts of a non-trivial function.\n" " ``stat``\n" -" Use a third-party statistical profiler, statprof. This profiler\n" -" currently runs only on Unix systems, and is most useful for\n" -" profiling commands that run for longer than about 0.1 seconds." +" Use a statistical profiler, statprof. This profiler is most\n" +" useful for profiling commands that run for longer than about 0.1\n" +" seconds." msgstr "" " ``ls``\n" " Python 組み込みの詳細プロファイラ。 どの環境でも利用できますが、\n" " 報告される行番号は、 常に関数の冒頭行に固定されます。 そのため、\n" " 入り組んだ関数内部の、 高コストな部位は、 特定が困難です。\n" " ``stat``\n" -" サードパーティ製の statprof。 現時点では Unix 環境でのみ使用でき、\n" -" 0.1 秒以上を要するコマンド実行の解析で有用です。" +" 統計的なプロファイラ statprof。 0.1 秒以上のコマンド実行の場合、\n" +" ls よりもこちらの方が有用です。" msgid "" "``format``\n" @@ -22295,6 +22285,36 @@ " 当該ファイルは直接 kcachegrind で読み込めます。" msgid "" +"``statformat``\n" +" Profiling format for the ``stat`` profiler.\n" +" (default: hotpath)" +msgstr "" +"``statformat``\n" +" プロファイラ ``stat`` のプロファイル形式。\n" +" (デフォルト値: hotpath)" + +msgid "" +" ``hotpath``\n" +" Show a tree-based display containing the hot path of execution (where\n" +" most time was spent).\n" +" ``bymethod``\n" +" Show a table of methods ordered by how frequently they are active.\n" +" ``byline``\n" +" Show a table of lines in files ordered by how frequently they are " +"active.\n" +" ``json``\n" +" Render profiling data as JSON." +msgstr "" +" ``hotpath``\n" +" 実行時のホットパス (時間消費の激しい場所) を含むツリー表示\n" +" ``bymethod``\n" +" 実行頻度順で整列した関数をテーブル表示\n" +" ``byline``\n" +" 実行頻度順で整列したソース行をテーブル表示\n" +" ``json``\n" +" プロファイルデータを JSON で出力" + +msgid "" "``frequency``\n" " Sampling frequency. Specific to the ``stat`` sampling profiler.\n" " (default: 1000)" @@ -22483,6 +22503,29 @@ msgstr "一般的なサーバ機能の設定。" msgid "" +"``compressionengines``\n" +" List of compression engines and their relative priority to advertise\n" +" to clients." +msgstr "" + +msgid "" +" The order of compression engines determines their priority, the first\n" +" having the highest priority. If a compression engine is not listed\n" +" here, it won't be advertised to clients." +msgstr "" + +msgid "" +" If not set (the default), built-in defaults are used. Run\n" +" :hg:`debuginstall` to list available compression engines and their\n" +" default wire protocol priority." +msgstr "" + +msgid "" +" Older Mercurial clients only support zlib compression and this setting\n" +" has no effect for legacy clients." +msgstr "" + +msgid "" "``uncompressed``\n" " Whether to allow clients to clone a repository using the\n" " uncompressed streaming protocol. This transfers about 40% more\n" @@ -22604,6 +22647,24 @@ msgstr "" msgid "" +"``zstdlevel``\n" +" Integer between ``1`` and ``22`` that controls the zstd compression " +"level\n" +" for wire protocol commands. ``1`` is the minimal amount of compression " +"and\n" +" ``22`` is the highest amount of compression." +msgstr "" + +msgid "" +" The default (``3``) should be significantly faster than zlib while " +"likely\n" +" delivering better compression ratios." +msgstr "" + +msgid " See also ``server.zliblevel``." +msgstr "" + +msgid "" "``smtp``\n" "--------" msgstr "" @@ -22744,7 +22805,7 @@ "Use the ``[templates]`` section to define template strings.\n" "See :hg:`help templates` for details." msgstr "" -"``[templates]`` セクションはテンプレート文字列の定義を行います。\n" +"``[templates]`` セクションでは、 テンプレート文字列の定義を行います。\n" "詳細は :hg:`help templates` を参照してください。" msgid "" @@ -23602,6 +23663,28 @@ " あるいは \"unknown\")" msgid "" +"``csp``\n" +" Send a ``Content-Security-Policy`` HTTP header with this value." +msgstr "" + +msgid "" +" The value may contain a special string ``%nonce%``, which will be " +"replaced\n" +" by a randomly-generated one-time use value. If the value contains\n" +" ``%nonce%``, ``web.cache`` will be disabled, as caching undermines the\n" +" one-time property of the nonce. This nonce will also be inserted into\n" +" ``