merge with i18n

i18n/ja.po

@@ -1,7 +1,7 b''
 # Japanese translation for Mercurial
 # Mercurial 日本語翻訳
 #
-# Copyright (C) 2009-2017 the Mercurial team
+# Copyright (C) 2009-2018 the Mercurial team
 #
 # ========================================
 # 【翻訳用語集】
@@ -171,8 +171,8 b' msgid ""'
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <[e-mail]>\n"
-"POT-Creation-Date: 2017-04-29 22:12+0900\n"
-"PO-Revision-Date: 2017-05-01 07:00+0900\n"
+"POT-Creation-Date: 2017-08-01 21:59+0900\n"
+"PO-Revision-Date: 2018-05-01 18:00+0900\n"
 "Last-Translator: Japanese translation team <[e-mail]>\n"
 "Language-Team: Japanese\n"
 "Language: ja\n"
@@ -645,6 +645,48 b' msgid "acl: user \\"%s\\" not allowed on \\'
 msgstr ""
 "acl: ユーザ \"%s\" はファイル \"%s\" が許可されていません(リビジョン \"%s\")"
 
+#, fuzzy
+msgid "provide the amend command (EXPERIMENTAL)"
+msgstr "    (実験的実装)"
+
+msgid ""
+"This extension provides an ``amend`` command that is similar to\n"
+"``commit --amend`` but does not prompt an editor.\n"
+msgstr ""
+
+msgid "mark new/missing files as added/removed before committing"
+msgstr "新規／不在ファイルを、コミット前に登録／除外対象化"
+
+msgid "invoke editor on commit messages"
+msgstr "コミットログ入力にエディタを起動"
+
+msgid "use interactive mode"
+msgstr "操作対象変更の対話的な選択"
+
+msgid "store a note on the amend"
+msgstr ""
+
+msgid "[OPTION]... [FILE]..."
+msgstr "[OPTION]... [FILE]..."
+
+#, fuzzy
+msgid "amend the working copy parent with all or specified outstanding changes"
+msgstr "作業領域の変更が未コミットです"
+
+msgid ""
+"    Similar to :hg:`commit --amend`, but reuse the commit message without\n"
+"    invoking editor, unless ``--edit`` was set."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    See :hg:`help commit` for more details.\n"
+"    "
+msgstr "詳細は :hg:`help color` を参照してください。\n"
+
+msgid "cannot store a note of more than 255 bytes"
+msgstr ""
+
 msgid "check for unrecorded moves at commit time (EXPERIMENTAL)"
 msgstr "ファイル移動のコミット時自動検出 (実験的実装)"
 
@@ -852,10 +894,11 b' msgstr ""'
 "Bugzilla へのアクセスで使用されるユーザ名で、 メールが送信されます。\n"
 "サポート対象の全ての版の Bugzilla で、 バグの状態を「解決」にできます。"
 
+#, fuzzy
 msgid ""
 "Access via the REST-API needs either a Bugzilla username and password\n"
 "or an apikey specified in the configuration. Comments are made under\n"
-"the given username or the user assoicated with the apikey in Bugzilla."
+"the given username or the user associated with the apikey in Bugzilla."
 msgstr ""
 "REST-API での利用には、 Bugzilla のユーザ名とパスワード、 または、\n"
 "設定への APIKEY 記述のいずれかが必要です。 コメントの作成は、\n"
@@ -1583,8 +1626,9 b' msgstr ""'
 msgid "    Please use :hg:`log` instead::"
 msgstr "    本コマンドの代わりに :hg:`log` を使うようにしてください::"
 
-msgid ""
-"        hg children => hg log -r \"children()\"\n"
+#, fuzzy
+msgid ""
+"        hg children => hg log -r \"children(.)\"\n"
 "        hg children -r REV => hg log -r \"children(REV)\""
 msgstr ""
 "        hg children => hg log -r \"children()\"\n"
@@ -1679,9 +1723,10 b' msgstr ""'
 msgid "    Examples::"
 msgstr "    例::"
 
+#, fuzzy
 msgid ""
 "      # display count of changed lines for every committer\n"
-"      hg churn -t \"{author|email}\""
+"      hg churn -T \"{author|email}\""
 msgstr ""
 "      # ユーザ毎の変更行数の表示\n"
 "      hg churn -t \"{author|email}\""
@@ -1740,7 +1785,8 b' msgid ""'
 "\"clonebundles\" is a server-side extension used to advertise the existence\n"
 "of pre-generated, externally hosted bundle files to clients that are\n"
 "cloning so that cloning can be faster, more reliable, and require less\n"
-"resources on the server."
+"resources on the server. \"pullbundles\" is a related feature for sending\n"
+"pre-generated bundle files to clients as part of pull operations."
 msgstr ""
 
 msgid ""
@@ -1756,8 +1802,13 b' msgid ""'
 msgstr ""
 
 msgid ""
-"This extension provides server operators the ability to offload potentially\n"
-"expensive clone load to an external service. Here's how it works."
+"This extension provides server operators the ability to offload\n"
+"potentially expensive clone load to an external service. Pre-generated\n"
+"bundles also allow using more CPU intensive compression, reducing the\n"
+"effective bandwidth requirements."
+msgstr ""
+
+msgid "Here's how clone bundles work:"
 msgstr ""
 
 msgid ""
@@ -1776,7 +1827,7 b' msgid ""'
 "7. The client reconnects to the original server and performs the equivalent\n"
 "   of :hg:`pull` to retrieve all repository data not in the bundle. (The\n"
 "   repository could have been updated between when the bundle was created\n"
-"   and when the client started the clone.)"
+"   and when the client started the clone.) This may use \"pullbundles\"."
 msgstr ""
 
 msgid ""
@@ -1789,15 +1840,33 b' msgid ""'
 "clones to less than 1% of original."
 msgstr ""
 
+msgid "Here's how pullbundles work:"
+msgstr ""
+
+msgid ""
+"1. A manifest file listing available bundles and describing the revisions\n"
+"   is added to the Mercurial repository on the server.\n"
+"2. A new-enough client informs the server that it supports partial pulls\n"
+"   and initiates a pull.\n"
+"3. If the server has pull bundles enabled and sees the client advertising\n"
+"   partial pulls, it checks for a matching pull bundle in the manifest.\n"
+"   A bundle matches if the format is supported by the client, the client\n"
+"   has the required revisions already and needs something from the bundle.\n"
+"4. If there is at least one matching bundle, the server sends it to the "
+"client.\n"
+"5. The client applies the bundle and notices that the server reply was\n"
+"   incomplete. It initiates another pull."
+msgstr ""
+
 msgid "To work, this extension requires the following of server operators:"
 msgstr ""
 
 msgid ""
 "* Generating bundle files of repository content (typically periodically,\n"
 "  such as once per day).\n"
-"* A file server that clients have network access to and that Python knows\n"
-"  how to talk to through its normal URL handling facility (typically an\n"
-"  HTTP server).\n"
+"* Clone bundles: A file server that clients have network access to and that\n"
+"  Python knows how to talk to through its normal URL handling facility\n"
+"  (typically an HTTP/HTTPS server).\n"
 "* A process for keeping the bundles manifest in sync with available bundle\n"
 "  files."
 msgstr ""
@@ -1836,12 +1905,11 b' msgid ""'
 "manifest``\n"
 "file containing the list of available bundle files suitable for seeding\n"
 "clones. If this file does not exist, the repository will not advertise the\n"
-"existence of clone bundles when clients connect."
-msgstr ""
-
-msgid ""
-"The manifest file contains a newline (\n"
-") delimited list of entries."
+"existence of clone bundles when clients connect. For pull bundles,\n"
+"``.hg/pullbundles.manifest`` is used."
+msgstr ""
+
+msgid "The manifest file contains a newline (\\n) delimited list of entries."
 msgstr ""
 
 msgid ""
@@ -1858,6 +1926,11 b' msgid ""'
 msgstr ""
 
 msgid ""
+"For pull bundles, the URL is a path under the ``.hg`` directory of the\n"
+"repository."
+msgstr ""
+
+msgid ""
 "Keys in UPPERCASE are reserved for use by Mercurial and are defined below.\n"
 "All non-uppercase keys can be used by site installations. An example use\n"
 "for custom properties is to use the *datacenter* attribute to define which\n"
@@ -1930,13 +2003,25 b' msgid " Value should be \\"true\\"."'
 msgstr ""
 
 msgid ""
+"heads\n"
+"   Used for pull bundles. This contains the ``;`` separated changeset\n"
+"   hashes of the heads of the bundle content."
+msgstr ""
+
+msgid ""
+"bases\n"
+"   Used for pull bundles. This contains the ``;`` separated changeset\n"
+"   hashes of the roots of the bundle content. This can be skipped if\n"
+"   the bundle was created without ``--base``."
+msgstr ""
+
+msgid ""
 "Manifests can contain multiple entries. Assuming metadata is defined, "
 "clients\n"
 "will filter entries from the manifest that they don't support. The "
 "remaining\n"
 "entries are optionally sorted by client preferences\n"
-"(``experimental.clonebundleprefers`` config option). The client then "
-"attempts\n"
+"(``ui.clonebundleprefers`` config option). The client then attempts\n"
 "to fetch the bundle at the first URL in the remaining list."
 msgstr ""
 
@@ -1972,25 +2057,30 b' msgid ""'
 "Mercurial server when the bundle hosting service fails.\n"
 msgstr ""
 
-msgid "enable Mercurial color mode (DEPRECATED)"
-msgstr "Mercurial の出力のカラー化 (非推奨)"
-
-msgid ""
-"This extension enables Mercurial color mode. The feature is now directly\n"
-"available in Mercurial core. You can access it using::"
-msgstr ""
-"本エクステンションは Mercurial 出力をカラー化します。 カラー化機能は、\n"
-"Mercurial のコア機能に取り込まれたため、 以下の設定のみで利用可能です::"
-
-msgid ""
-"  [ui]\n"
-"  color = auto"
-msgstr ""
-"  [ui]\n"
-"  color = auto"
-
-msgid "See :hg:`help color` for details.\n"
-msgstr "詳細は :hg:`help color` を参照してください。\n"
+msgid "adds a new flag extras to commit (ADVANCED)"
+msgstr ""
+
+msgid "KEY=VALUE"
+msgstr "キーワード=値"
+
+#, fuzzy
+msgid "set a changeset's extra values"
+msgstr "電子メールによる変更内容のパッチ送付"
+
+#, python-format
+msgid "unable to parse '%s', should follow KEY=VALUE format"
+msgstr ""
+
+#, python-format
+msgid "unable to parse '%s', keys can't be empty"
+msgstr ""
+
+msgid "keys can only contain ascii letters, digits, '_' and '-'"
+msgstr ""
+
+#, python-format
+msgid "key '%s' is used internally, can't be set manually"
+msgstr ""
 
 msgid "import revisions from foreign VCS repositories into Mercurial"
 msgstr "他の構成管理ツールから Mercurial への履歴取り込み"
@@ -2294,11 +2384,12 b' msgstr ""'
 msgid "      original_branch_name new_branch_name"
 msgstr "      変換元ブランチ名 変換先ブランチ名"
 
+#, fuzzy
 msgid ""
 "    where \"original_branch_name\" is the name of the branch in the\n"
 "    source repository, and \"new_branch_name\" is the name of the branch\n"
-"    is the destination repository. No whitespace is allowed in the\n"
-"    branch names. This can be used to (for instance) move code in one\n"
+"    is the destination repository. No whitespace is allowed in the new\n"
+"    branch name. This can be used to (for instance) move code in one\n"
 "    repository from \"default\" to a named branch."
 msgstr ""
 "    \"変換元ブランチ名\" が変換元リポジトリにおけるブランチ名で、\n"
@@ -2403,6 +2494,14 b' msgstr ""'
 "        不十分な恐れがあります。"
 
 msgid ""
+"    :convert.cvsps.logencoding: Specify encoding name to be used for\n"
+"        transcoding CVS log messages. Multiple encoding names can be\n"
+"        specified as a list (see :hg:`help config.Syntax`), but only\n"
+"        the first acceptable encoding in the list is used per CVS log\n"
+"        entries. This transcoding is executed before cvslog hook below."
+msgstr ""
+
+msgid ""
 "    :convert.cvsps.mergeto: Specify a regular expression to which\n"
 "        commit log messages are matched. If a match occurs, then the\n"
 "        conversion process will insert a dummy revision merging the\n"
@@ -3110,6 +3209,14 b' msgstr "cvs \xe3\x83\xad\xe3\x82\xb0\xe3\x82\xad\xe3\x83\xa3\xe3\x83\x83\xe3\x82\xb7\xe3\x83\xa5 %s \xe3\x81\xae\xe6\x9b\xb8\xe3\x81\x8d\xe8\xbe\xbc\xe3\x81\xbf\xe4\xb8\xad\\n"'
 msgid "%d log entries\n"
 msgstr "%d 件のログエントリ\n"
 
+#, fuzzy
+msgid "check convert.cvsps.logencoding configuration"
+msgstr "%s 設定を確認してください"
+
+#, python-format
+msgid "no encoding can transcode CVS log message for %s of %s"
+msgstr ""
+
 msgid "creating changesets\n"
 msgstr "リビジョン作成中\n"
 
@@ -3755,6 +3862,13 b' msgstr ""'
 "スナップショットディレクトリへのパス) を使って起動されます。"
 
 msgid ""
+"If there is more than one file being compared and the \"child\" revision\n"
+"is the working directory, any modifications made in the external diff\n"
+"program will be copied back to the working directory from the temporary\n"
+"directory."
+msgstr ""
+
+msgid ""
 "The extdiff extension also allows you to configure new diff commands, so\n"
 "you do not need to type :hg:`extdiff -p kdiff3` always. ::"
 msgstr ""
@@ -4018,9 +4132,6 b' msgstr "pull, update, merge \xe3\x81\xae\xe4\xb8\x80\xe6\x8b\xac\xe5\xae\x9f\xe8\xa1\x8c (\xe9\x9d\x9e\xe6\x8e\xa8\xe5\xa5\xa8)"'
 msgid "a specific revision you would like to pull"
 msgstr "取り込み対象リビジョンの指定"
 
-msgid "invoke editor on commit messages"
-msgstr "コミットログ入力にエディタを起動"
-
 msgid "edit commit message (DEPRECATED)"
 msgstr "コミットログの編集 (非推奨)"
 
@@ -4110,6 +4221,160 b' msgstr "\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3 %d:%s \xe3\x81\xa8\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xb8\xe4\xb8\xad\\n"'
 msgid "new changeset %d:%s merges remote changes with local\n"
 msgstr "新規リビジョン %d:%s により、連携先とローカルのリビジョンをマージ\n"
 
+#, fuzzy
+msgid "rewrite file content in changesets or working copy (EXPERIMENTAL)"
+msgstr ""
+"``wdir``\n"
+"    作業領域ディレクトリを表す値 (実験的実装)"
+
+msgid ""
+"Provides a command that runs configured tools on the contents of modified "
+"files,\n"
+"writing back any fixes to the working copy or replacing changesets."
+msgstr ""
+
+msgid ""
+"Here is an example configuration that causes :hg:`fix` to apply automatic\n"
+"formatting fixes to modified lines in C++ code::"
+msgstr ""
+
+msgid ""
+"  [fix]\n"
+"  clang-format:command=clang-format --assume-filename={rootpath}\n"
+"  clang-format:linerange=--lines={first}:{last}\n"
+"  clang-format:fileset=set:**.cpp or **.hpp"
+msgstr ""
+
+msgid ""
+"The :command suboption forms the first part of the shell command that will "
+"be\n"
+"used to fix a file. The content of the file is passed on standard input, and "
+"the\n"
+"fixed file content is expected on standard output. If there is any output "
+"on\n"
+"standard error, the file will not be affected. Some values may be "
+"substituted\n"
+"into the command::"
+msgstr ""
+
+msgid ""
+"  {rootpath}  The path of the file being fixed, relative to the repo root\n"
+"  {basename}  The name of the file being fixed, without the directory path"
+msgstr ""
+
+msgid ""
+"If the :linerange suboption is set, the tool will only be run if there are\n"
+"changed lines in a file. The value of this suboption is appended to the "
+"shell\n"
+"command once for every range of changed lines in the file. Some values may "
+"be\n"
+"substituted into the command::"
+msgstr ""
+
+msgid ""
+"  {first}   The 1-based line number of the first line in the modified range\n"
+"  {last}    The 1-based line number of the last line in the modified range"
+msgstr ""
+
+msgid ""
+"The :fileset suboption determines which files will be passed through each\n"
+"configured tool. See :hg:`help fileset` for possible values. If there are "
+"file\n"
+"arguments to :hg:`fix`, the intersection of these filesets is used."
+msgstr ""
+
+msgid ""
+"There is also a configurable limit for the maximum size of file that will "
+"be\n"
+"processed by :hg:`fix`::"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"  [fix]\n"
+"  maxfilesize=2MB"
+msgstr ""
+"  [largefiles]\n"
+"  minsize = 2"
+
+msgid "fix all non-public non-obsolete revisions"
+msgstr ""
+
+msgid ""
+"revisions to diff against (overrides automatic selection, and applies to "
+"every revision being fixed)"
+msgstr ""
+
+#, fuzzy
+msgid "revisions to fix"
+msgstr "移植対象リビジョン"
+
+#, fuzzy
+msgid "fix the working directory"
+msgstr "作業領域の変更"
+
+msgid "always fix every line of a file"
+msgstr ""
+
+#, fuzzy
+msgid "rewrite file content in changesets or working directory"
+msgstr "%s は作業領域の祖先ではありません"
+
+msgid ""
+"    Runs any configured tools to fix the content of files. Only affects "
+"files\n"
+"    with changes, unless file arguments are provided. Only affects changed "
+"lines\n"
+"    of files, unless the --whole flag is used. Some tools may always affect "
+"the\n"
+"    whole file regardless of --whole."
+msgstr ""
+
+msgid ""
+"    If revisions are specified with --rev, those revisions will be checked, "
+"and\n"
+"    they may be replaced with new revisions that have fixed file content.  "
+"It is\n"
+"    desirable to specify all descendants of each specified revision, so that "
+"the\n"
+"    fixes propagate to the descendants. If all descendants are fixed at the "
+"same\n"
+"    time, no merging, rebasing, or evolution will be required."
+msgstr ""
+
+msgid ""
+"    If --working-dir is used, files with uncommitted changes in the working "
+"copy\n"
+"    will be fixed. If the checked-out revision is also fixed, the working\n"
+"    directory will update to the replacement revision."
+msgstr ""
+
+msgid ""
+"    When determining what lines of each file to fix at each revision, the "
+"whole\n"
+"    set of revisions being fixed is considered, so that fixes to earlier\n"
+"    revisions are not forgotten in later ones. The --base flag can be used "
+"to\n"
+"    override this default behavior, though it is not usually desirable to do "
+"so.\n"
+"    "
+msgstr ""
+
+#, fuzzy
+msgid "cannot specify both \"--rev\" and \"--all\""
+msgstr "--noupdate と --updaterev は併用できません"
+
+#, fuzzy, python-format
+msgid "ignoring file larger than %s: %s\n"
+msgstr "不正な文字セットを無視します: %s\n"
+
+#, fuzzy
+msgid "can only fix a changeset together with all its descendants"
+msgstr "対象の全子孫が編集対象に含まれる場合のみリビジョンの編集が可能です。"
+
+msgid "wdir"
+msgstr ""
+
 msgid "Faster status operations with the Watchman file monitor (EXPERIMENTAL)"
 msgstr ""
 
@@ -4131,6 +4396,11 b' msgid ""'
 "https://facebook.github.io/watchman/ and make sure it is in your PATH."
 msgstr ""
 
+msgid ""
+"fsmonitor is incompatible with the largefiles and eol extensions, and\n"
+"will disable itself if any of those are active."
+msgstr ""
+
 msgid "The following configuration options exist:"
 msgstr ""
 
@@ -4188,8 +4458,25 b' msgid ""'
 msgstr ""
 
 msgid ""
-"fsmonitor is incompatible with the largefiles and eol extensions, and\n"
-"will disable itself if any of those are active."
+"    [fsmonitor]\n"
+"    warn_when_unused = (boolean)"
+msgstr ""
+
+msgid ""
+"Whether to print a warning during certain operations when fsmonitor would "
+"be\n"
+"beneficial to performance but isn't enabled."
+msgstr ""
+
+msgid ""
+"    [fsmonitor]\n"
+"    warn_update_file_count = (integer)"
+msgstr ""
+
+msgid ""
+"If ``warn_when_unused`` is set and fsmonitor isn't enabled, a warning will\n"
+"be printed during working directory updates if this many files will be\n"
+"created.\n"
 msgstr ""
 
 msgid "unknown"
@@ -4224,13 +4511,181 b' msgid ""'
 "disabled.\n"
 msgstr ""
 
-#, python-format
-msgid "type '%s' has no property '%s'"
-msgstr ""
-
 msgid "warning: unable to write out fsmonitor state\n"
 msgstr ""
 
+msgid "try mapping git commands to Mercurial commands"
+msgstr ""
+
+msgid "Tries to map a given git command to a Mercurial command:"
+msgstr ""
+
+msgid ""
+"  $ hg githelp -- git checkout master\n"
+"  hg update master"
+msgstr ""
+
+msgid ""
+"If an unknown command or parameter combination is detected, an error is\n"
+"produced.\n"
+msgstr ""
+
+msgid "hg githelp"
+msgstr ""
+
+msgid "suggests the Mercurial equivalent of the given git command"
+msgstr ""
+
+msgid ""
+"    Usage: hg githelp -- <git command>\n"
+"    "
+msgstr ""
+
+msgid "missing git command - usage: hg githelp -- <git command>"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "ignoring unknown option %s\n"
+msgstr "未知の改行形式 '%s' (%s 由来) を無視\n"
+
+msgid ""
+"note: Mercurial will commit when complete, as there is no staging area in "
+"Mercurial"
+msgstr ""
+
+msgid "note: use hg addremove to remove files that have been deleted."
+msgstr ""
+
+#, fuzzy
+msgid "See 'hg help bisect' for how to use bisect."
+msgstr "詳細は 'hg help histedit' を参照"
+
+msgid "Mercurial has no concept of upstream branches\n"
+msgstr ""
+
+msgid "note: use --no-backup to avoid creating .orig files"
+msgstr ""
+
+msgid "note: hg graft does not have --abort."
+msgstr ""
+
+msgid ""
+"note: Mercurial does not have bare clones. -U will clone the repo without "
+"checking out a commit"
+msgstr ""
+
+msgid ""
+"note: Mercurial doesn't have a staging area, so there is no --all. -A will "
+"add and remove files for you though."
+msgstr ""
+
+msgid ""
+"This command has been deprecated in the git project, thus isn't supported by "
+"this tool."
+msgstr ""
+
+msgid ""
+"note: Mercurial has no concept of a staging area, so --cached does nothing."
+msgstr ""
+
+msgid ""
+"Mercurial does not enable external difftool by default. You need to enable "
+"the extdiff extension in your .hgrc file by adding\n"
+"extdiff =\n"
+"to the [extensions] section and then running"
+msgstr ""
+
+msgid "hg extdiff -p <program>"
+msgstr ""
+
+#, fuzzy
+msgid "See 'hg help extdiff' and 'hg help -e extdiff' for more information.\n"
+msgstr ""
+"    用法等の詳細は :hg:`help qnew` および :hg:`help record`\n"
+"    を参照してください。"
+
+msgid ""
+"note: Mercurial doesn't have refspecs. -r can be used to specify which "
+"commits you want to pull. -B can be used to specify which bookmark you want "
+"to pull."
+msgstr ""
+
+msgid ""
+"note: -v prints the entire commit message like Git does. To print just the "
+"first line, drop the -v."
+msgstr ""
+
+#, fuzzy
+msgid "note: see hg help revset for information on how to filter log output."
+msgstr "    衝突の扱いに関する詳細は :hg:`help resolve` を参照してください。"
+
+msgid ""
+"note: --format format:??? equates to Mercurial's --template. See hg help "
+"templates for more info."
+msgstr ""
+
+msgid ""
+"note: --pretty/format/oneline equate to Mercurial's --style or --template. "
+"See hg help templates for more info."
+msgstr ""
+
+msgid "note: Mercurial doesn't have a staging area, ignoring --stage\n"
+msgstr ""
+
+msgid "NOTE: ancestors() is part of the revset language.\n"
+msgstr ""
+
+msgid "Learn more about revsets with 'hg help revsets'"
+msgstr ""
+
+msgid ""
+"note: Mercurial doesn't have refspecs. -r can be used to specify which "
+"commits you want to push. -B can be used to specify which bookmark you want "
+"to push."
+msgstr ""
+
+msgid "note: hg histedit does not perform a rebase. It just edits history."
+msgstr ""
+
+msgid ""
+"also note: 'hg histedit' will automatically detect your stack, so no second "
+"argument is necessary."
+msgstr ""
+
+msgid ""
+"note: if you're trying to lift a commit off one branch, try hg rebase -d "
+"<destination commit> -s <commit to be lifted>"
+msgstr ""
+
+msgid ""
+"note: in hg commits can be deleted from repo but we always have backups.\n"
+msgstr ""
+
+msgid "NOTE: --mixed has no meaning since Mercurial has no staging area"
+msgstr ""
+
+msgid "NOTE: --soft has no meaning since Mercurial has no staging area"
+msgstr ""
+
+msgid "note: hg backout doesn't support multiple commits at once"
+msgstr ""
+
+#, fuzzy
+msgid "note: hg root prints the root of the repository"
+msgstr "    現リポジトリのルートディレクトリ位置を表示します。"
+
+msgid "note: see hg help revset for how to refer to commits\n"
+msgstr ""
+
+msgid ""
+"note: Mercurial doesn't have equivalents to the git stash branch, show, "
+"clear, or create actions."
+msgstr ""
+
+#, fuzzy, python-format
+msgid "error: unknown git svn command %s\n"
+msgstr "hg: 未知のコマンド '%s'\n"
+
 msgid "commands to sign and verify changesets"
 msgstr "リビジョンへの署名および検証コマンド"
 
@@ -4641,6 +5096,7 b' msgstr ""'
 " pick 030b686bedc4 Add gamma\n"
 " pick 7c2fd3b9020c Add delta"
 
+#, fuzzy
 msgid ""
 " # Edit history between c561b4e977df and 7c2fd3b9020c\n"
 " #\n"
@@ -4653,6 +5109,7 b' msgid ""'
 " #  r, roll = like fold, but discard this commit's description and date\n"
 " #  d, drop = remove commit from history\n"
 " #  m, mess = edit commit message without changing commit content\n"
+" #  b, base = checkout changeset and apply further changesets from there\n"
 " #"
 msgstr ""
 " # リビジョン c561b4e977df から 7c2fd3b9020c にかけての履歴の改変\n"
@@ -4966,6 +5423,10 b' msgstr "\xe5\x88\xa9\xe7\x94\xa8\xe5\x8f\xaf\xe8\x83\xbd\xe3\x82\xb3\xe3\x83\x9e\xe3\x83\xb3\xe3\x83\x89:\\n"'
 msgid "histedit"
 msgstr "histedit"
 
+#, fuzzy, python-format
+msgid "invalid changeset %s"
+msgstr "リビジョン %s の展開中"
+
 #, python-format
 msgid "unknown changeset %s listed"
 msgstr "未知のリビジョン %s が指定されました"
@@ -5029,6 +5490,9 b' msgid ""'
 msgstr ""
 "%s: 併合できません - 作業領域は直前のコミット %s の子孫ではありません\n"
 
+msgid "checkout changeset and apply further changesets from there"
+msgstr ""
+
 #, python-format
 msgid "%s \"%s\" changeset was an edited list candidate"
 msgstr "%s の適用対象が編集対象リビジョン \"%s\" です"
@@ -5130,6 +5594,11 b' msgstr " - `roll` \xe3\x81\xa7 fold \xe5\x90\x8c\xe6\xa7\x98\xe4\xbd\xb5\xe5\x90\x88\xe3\x81\x99\xe3\x82\x8b\xe3\x81\x8c\xe3\x80\x81\xe3\x82\xb3\xe3\x83\x9f\xe3\x83\x83\xe3\x83\x88\xe3\x83\xad\xe3\x82\xb0\xef\xbc\x8f\xe6\x97\xa5\xe4\xbb\x98\xe3\x81\xaf\xe7\xa0\xb4\xe6\xa3\x84"'
 msgid "    - `edit` to edit this changeset (preserving date)"
 msgstr "    - `edit` で変更内容を再編集 (日付は保持)"
 
+#, fuzzy
+msgid ""
+"    - `base` to checkout changeset and apply further changesets from there"
+msgstr "リポジトリからの、 特定リビジョンおよびその子孫の除外"
+
 msgid "    There are a number of ways to select the root changeset:"
 msgstr "    改変対象リビジョンの指定には、 以下の様な方法があります:"
 
@@ -5359,6 +5828,10 b' msgstr "\xe6\x9c\xaa\xe7\x9f\xa5\xe3\x81\xae\xe6\x93\x8d\xe4\xbd\x9c \\"%s\\" \xe3\x81\x8c\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xbe\xe3\x81\x97\xe3\x81\x9f"'
 msgid "warning: histedit rules saved to: .hg/histedit-last-edit.txt\n"
 msgstr "警告: histedit の操作指示は .hg/histedit-last-edit.txt に保存\n"
 
+#, fuzzy, python-format
+msgid "first changeset cannot use verb \"%s\""
+msgstr "リビジョン %s をそれ自身で廃止することはできません"
+
 msgid "no rules provided"
 msgstr "処理内容指定が空です"
 
@@ -5376,10 +5849,6 b' msgstr ""'
 "てください。"
 
 #, python-format
-msgid "histedit: moving bookmarks %s from %s to %s\n"
-msgstr "histedit: ブックマーク %s を %s から %s に移動中\n"
-
-#, python-format
 msgid "histedit in progress, can't strip %s"
 msgstr "histedit による履歴改変が未完了のため、%s を除外できません"
 
@@ -5401,8 +5870,184 b' msgstr "\'hg histedit --continue\' \xe3\x81\x8b \'hg histedit --abort\' \xe3\x82\x92\xe5\xae\x9f\xe6\x96\xbd\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84"'
 msgid "hg histedit --continue"
 msgstr "hg histedit --continue"
 
-msgid "checkout changeset and apply further changesets from there"
-msgstr ""
+#, fuzzy
+msgid " store some pushes in a remote blob store on the server (EXPERIMENTAL)"
+msgstr "共有元情報を相対パスで保持 (実験的実装)"
+
+msgid ""
+"    [infinitepush]\n"
+"    # Server-side and client-side option. Pattern of the infinitepush "
+"bookmark\n"
+"    branchpattern = PATTERN"
+msgstr ""
+
+msgid ""
+"    # Server or client\n"
+"    server = False"
+msgstr ""
+
+msgid ""
+"    # Server-side option. Possible values: 'disk' or 'sql'. Fails if not "
+"set\n"
+"    indextype = disk"
+msgstr ""
+
+msgid ""
+"    # Server-side option. Used only if indextype=sql.\n"
+"    # Format: 'IP:PORT:DB_NAME:USER:PASSWORD'\n"
+"    sqlhost = IP:PORT:DB_NAME:USER:PASSWORD"
+msgstr ""
+
+msgid ""
+"    # Server-side option. Used only if indextype=disk.\n"
+"    # Filesystem path to the index store\n"
+"    indexpath = PATH"
+msgstr ""
+
+msgid ""
+"    # Server-side option. Possible values: 'disk' or 'external'\n"
+"    # Fails if not set\n"
+"    storetype = disk"
+msgstr ""
+
+msgid ""
+"    # Server-side option.\n"
+"    # Path to the binary that will save bundle to the bundlestore\n"
+"    # Formatted cmd line will be passed to it (see `put_args`)\n"
+"    put_binary = put"
+msgstr ""
+
+msgid ""
+"    # Serser-side option. Used only if storetype=external.\n"
+"    # Format cmd-line string for put binary. Placeholder: {filename}\n"
+"    put_args = {filename}"
+msgstr ""
+
+msgid ""
+"    # Server-side option.\n"
+"    # Path to the binary that get bundle from the bundlestore.\n"
+"    # Formatted cmd line will be passed to it (see `get_args`)\n"
+"    get_binary = get"
+msgstr ""
+
+msgid ""
+"    # Serser-side option. Used only if storetype=external.\n"
+"    # Format cmd-line string for get binary. Placeholders: {filename} "
+"{handle}\n"
+"    get_args = {filename} {handle}"
+msgstr ""
+
+msgid ""
+"    # Server-side option\n"
+"    logfile = FIlE"
+msgstr ""
+
+msgid ""
+"    # Server-side option\n"
+"    loglevel = DEBUG"
+msgstr ""
+
+msgid ""
+"    # Server-side option. Used only if indextype=sql.\n"
+"    # Sets mysql wait_timeout option.\n"
+"    waittimeout = 300"
+msgstr ""
+
+msgid ""
+"    # Server-side option. Used only if indextype=sql.\n"
+"    # Sets mysql innodb_lock_wait_timeout option.\n"
+"    locktimeout = 120"
+msgstr ""
+
+msgid ""
+"    # Server-side option. Used only if indextype=sql.\n"
+"    # Name of the repository\n"
+"    reponame = ''"
+msgstr ""
+
+msgid ""
+"    # Client-side option. Used by --list-remote option. List of remote "
+"scratch\n"
+"    # patterns to list if no patterns are specified.\n"
+"    defaultremotepatterns = ['*']"
+msgstr ""
+
+msgid ""
+"    # Instructs infinitepush to forward all received bundle2 parts to the\n"
+"    # bundle for storage. Defaults to False.\n"
+"    storeallparts = True"
+msgstr ""
+
+msgid ""
+"    # routes each incoming push to the bundlestore. defaults to False\n"
+"    pushtobundlestore = True"
+msgstr ""
+
+msgid ""
+"    [remotenames]\n"
+"    # Client-side option\n"
+"    # This option should be set only if remotenames extension is enabled.\n"
+"    # Whether remote bookmarks are tracked by remotenames extension.\n"
+"    bookmarks = True\n"
+msgstr ""
+
+msgid "please set infinitepush.sqlhost"
+msgstr ""
+
+msgid "please set infinitepush.reponame"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "invalid log level %s"
+msgstr "不正なローカルアドレス: %s"
+
+#, fuzzy, python-format
+msgid "unknown infinitepush store type specified %s"
+msgstr "--type に未知のバンドル種別が指定されました"
+
+#, fuzzy, python-format
+msgid "unknown infinitepush index type specified %s"
+msgstr "--type に未知のバンドル種別が指定されました"
+
+#, fuzzy
+msgid "force push to go to bundle store (EXPERIMENTAL)"
+msgstr "表示対象リビジョン"
+
+msgid "default repository not configured!"
+msgstr "デフォルトの連携先が設定されていません"
+
+msgid "see 'hg help config.paths'"
+msgstr "詳細は 'hg help config.paths' 参照"
+
+#, fuzzy
+msgid "infinitepush bookmark '{}' does not exist in path '{}'"
+msgstr "ブックマーク '%s' は存在しません"
+
+msgid "no changes found\n"
+msgstr "差分はありません\n"
+
+#, fuzzy
+msgid "storing changesets on the bundlestore\n"
+msgstr "連携先リポジトリに含まれないリビジョンの表示"
+
+msgid "cannot push more than one head to a scratch branch"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "pushing %d commit%s:\n"
+msgstr "%s への反映中\n"
+
+#, fuzzy
+msgid "no commits to push"
+msgstr "リビジョン指定は空です"
+
+#, fuzzy, python-format
+msgid "no server support for %r"
+msgstr "%s 機能が未サポートです"
+
+#, fuzzy
+msgid "nothing to push"
+msgstr "rebase の必要はありません"
 
 msgid "track previous positions of bookmarks (EXPERIMENTAL)"
 msgstr ""
@@ -6028,79 +6673,6 b' msgstr ""'
 "最初の大容量ファイルを追加登録する際には、 :hg:`add` に明示的に --large \n"
 "を指定する必要があります。\n"
 
-msgid "convert a normal repository to a largefiles repository"
-msgstr "既存リポジトリから largefiles を利用するリポジトリへの変換"
-
-msgid ""
-"    Convert repository SOURCE to a new repository DEST, identical to\n"
-"    SOURCE except that certain files will be converted as largefiles:\n"
-"    specifically, any file that matches any PATTERN *or* whose size is\n"
-"    above the minimum size threshold is converted as a largefile. The\n"
-"    size used to determine whether or not to track a file as a\n"
-"    largefile is the size of the first version of the file. The\n"
-"    minimum size can be specified either with --size or in\n"
-"    configuration as ``largefiles.size``."
-msgstr ""
-"    リポジトリ SOURCE を変換し、 新規リポジトリ DEST を生成します。\n"
-"    SOURCE に対する DEST の違いは、 指定パターンへの名前の合致、 または、\n"
-"    指定閾値以上のサイズのファイルが、 大容量ファイル扱いになっている、\n"
-"    という点です。 大容量ファイル扱いの要否判定に使用するサイズ値には、\n"
-"    各ファイルが最初に登録された時点のサイズが使用されます。\n"
-"    サイズ閾値の指定は、 --size か、 ``largefiles.size``\n"
-"    設定によって行います。"
-
-msgid ""
-"    After running this command you will need to make sure that\n"
-"    largefiles is enabled anywhere you intend to push the new\n"
-"    repository."
-msgstr ""
-"    このコマンドの実施後は、 変換後リポジトリの連携先リポジトリでも、\n"
-"    largefiles エクステンションが有効になっている事を確認してください。"
-
-msgid ""
-"    Use --to-normal to convert largefiles back to normal files; after\n"
-"    this, the DEST repository can be used without largefiles at all."
-msgstr ""
-"    largefiles エクステンションを使用しないリポジトリへの変換には、\n"
-"    --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 "      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"
@@ -6141,6 +6713,43 b' msgstr "\xe5\xa4\xa7\xe5\xae\xb9\xe9\x87\x8f\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe4\xbd\xbf\xe7\x94\xa8\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x81\x8b\xe3\x82\x89\xe9\x80\x9a\xe5\xb8\xb8\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x81\xb8\xe3\x81\xae\xe5\xa4\x89\xe6\x8f\x9b"'
 msgid "hg lfconvert SOURCE DEST [FILE ...]"
 msgstr "hg lfconvert SOURCE DEST [FILE ...]"
 
+msgid "convert a normal repository to a largefiles repository"
+msgstr "既存リポジトリから largefiles を利用するリポジトリへの変換"
+
+msgid ""
+"    Convert repository SOURCE to a new repository DEST, identical to\n"
+"    SOURCE except that certain files will be converted as largefiles:\n"
+"    specifically, any file that matches any PATTERN *or* whose size is\n"
+"    above the minimum size threshold is converted as a largefile. The\n"
+"    size used to determine whether or not to track a file as a\n"
+"    largefile is the size of the first version of the file. The\n"
+"    minimum size can be specified either with --size or in\n"
+"    configuration as ``largefiles.size``."
+msgstr ""
+"    リポジトリ SOURCE を変換し、 新規リポジトリ DEST を生成します。\n"
+"    SOURCE に対する DEST の違いは、 指定パターンへの名前の合致、 または、\n"
+"    指定閾値以上のサイズのファイルが、 大容量ファイル扱いになっている、\n"
+"    という点です。 大容量ファイル扱いの要否判定に使用するサイズ値には、\n"
+"    各ファイルが最初に登録された時点のサイズが使用されます。\n"
+"    サイズ閾値の指定は、 --size か、 ``largefiles.size``\n"
+"    設定によって行います。"
+
+msgid ""
+"    After running this command you will need to make sure that\n"
+"    largefiles is enabled anywhere you intend to push the new\n"
+"    repository."
+msgstr ""
+"    このコマンドの実施後は、 変換後リポジトリの連携先リポジトリでも、\n"
+"    largefiles エクステンションが有効になっている事を確認してください。"
+
+msgid ""
+"    Use --to-normal to convert largefiles back to normal files; after\n"
+"    this, the DEST repository can be used without largefiles at all."
+msgstr ""
+"    largefiles エクステンションを使用しないリポジトリへの変換には、\n"
+"    --to-normal を指定します。 変換後リポジトリは、 largefiles\n"
+"    エクステンション無しでも使用できます。"
+
 #, python-format
 msgid "%s is not a local Mercurial repo"
 msgstr "%s はローカルの Mercurial リポジトリではありません"
@@ -6207,11 +6816,47 b' msgstr "\xe6\x8c\x87\xe5\xae\x9a\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xab\xe9\x96\xa2\xe9\x80\xa3\xe3\x81\x99\xe3\x82\x8b\xe5\xa4\xa7\xe5\xae\xb9\xe9\x87\x8f\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x82\x92\xe5\x85\xa5\xe6\x89\x8b"'
 msgid "-r REV... [-e CMD] [--remotecmd CMD] [SOURCE]"
 msgstr "-r REV... [-e CMD] [--remotecmd CMD] [SOURCE]"
 
+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 "      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"
+"    "
+
 msgid "no revisions specified"
 msgstr "リビジョン指定がありません"
 
-#, python-format
-msgid "pulling largefiles for revision %s\n"
+#, fuzzy, python-format
+msgid "pulling largefiles for revision %d\n"
 msgstr "リビジョン %s に関連する大容量ファイルの取得中\n"
 
 #, python-format
@@ -6483,6 +7128,298 b' msgstr "\xe6\x8c\x87\xe5\xae\x9a\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xab\xe9\x96\xa2\xe9\x80\xa3\xe3\x81\x99\xe3\x82\x8b\xe5\xa4\xa7\xe5\xae\xb9\xe9\x87\x8f\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x82\x92\xe3\x80\x81 \xe9\x80\xa3\xe6\x90\xba\xe5\x85\x88\xe3\x81\xab\xe8\xbb\xa2\xe9\x80\x81"'
 msgid "download all versions of all largefiles"
 msgstr "全リビジョンに関連する大容量ファイルを取得"
 
+#, fuzzy
+msgid "lfs - large file support (EXPERIMENTAL)"
+msgstr "当該テンプレートで表示をカスタマイズ (実験的実装)"
+
+msgid ""
+"This extension allows large files to be tracked outside of the normal\n"
+"repository storage and stored on a centralized server, similar to the\n"
+"``largefiles`` extension.  The ``git-lfs`` protocol is used when\n"
+"communicating with the server, so existing git infrastructure can be\n"
+"harnessed.  Even though the files are stored outside of the repository,\n"
+"they are still integrity checked in the same manner as normal files."
+msgstr ""
+
+msgid ""
+"The files stored outside of the repository are downloaded on demand,\n"
+"which reduces the time to clone, and possibly the local disk usage.\n"
+"This changes fundamental workflows in a DVCS, so careful thought\n"
+"should be given before deploying it.  :hg:`convert` can be used to\n"
+"convert LFS repositories to normal repositories that no longer\n"
+"require this extension, and do so without changing the commit hashes.\n"
+"This allows the extension to be disabled if the centralized workflow\n"
+"becomes burdensome.  However, the pre and post convert clones will\n"
+"not be able to communicate with each other unless the extension is\n"
+"enabled on both."
+msgstr ""
+
+msgid ""
+"To start a new repository, or to add LFS files to an existing one, just\n"
+"create an ``.hglfs`` file as described below in the root directory of\n"
+"the repository.  Typically, this file should be put under version\n"
+"control, so that the settings will propagate to other repositories with\n"
+"push and pull.  During any commit, Mercurial will consult this file to\n"
+"determine if an added or modified file should be stored externally.  The\n"
+"type of storage depends on the characteristics of the file at each\n"
+"commit.  A file that is near a size threshold may switch back and forth\n"
+"between LFS and normal storage, as needed."
+msgstr ""
+
+msgid ""
+"Alternately, both normal repositories and largefile controlled\n"
+"repositories can be converted to LFS by using :hg:`convert` and the\n"
+"``lfs.track`` config option described below.  The ``.hglfs`` file\n"
+"should then be created and added, to control subsequent LFS selection.\n"
+"The hashes are also unchanged in this case.  The LFS and non-LFS\n"
+"repositories can be distinguished because the LFS repository will\n"
+"abort any command if this extension is disabled."
+msgstr ""
+
+msgid ""
+"Committed LFS files are held locally, until the repository is pushed.\n"
+"Prior to pushing the normal repository data, the LFS files that are\n"
+"tracked by the outgoing commits are automatically uploaded to the\n"
+"configured central server.  No LFS files are transferred on\n"
+":hg:`pull` or :hg:`clone`.  Instead, the files are downloaded on\n"
+"demand as they need to be read, if a cached copy cannot be found\n"
+"locally.  Both committing and downloading an LFS file will link the\n"
+"file to a usercache, to speed up future access.  See the `usercache`\n"
+"config setting described below."
+msgstr ""
+
+msgid ".hglfs::"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    The extension reads its configuration from a versioned ``.hglfs``\n"
+"    configuration file found in the root of the working directory. The\n"
+"    ``.hglfs`` file uses the same syntax as all other Mercurial\n"
+"    configuration files. It uses a single section, ``[track]``."
+msgstr ""
+"本エクステンションは、 作業領域のルート直下のファイル ``.hgeol``\n"
+"(履歴管理可能) から設定を読み込みます。 ``.hgeol`` ファイルの文法は、\n"
+"他の Mercurial 設定ファイルと同じです。 本設定ファイルでは、\n"
+"``[patterns]`` と ``[repository]`` の2つのセクションを記述可能です。"
+
+msgid ""
+"    The ``[track]`` section specifies which files are stored as LFS (or\n"
+"    not). Each line is keyed by a file pattern, with a predicate value.\n"
+"    The first file pattern match is used, so put more specific patterns\n"
+"    first.  The available predicates are ``all()``, ``none()``, and\n"
+"    ``size()``. See \"hg help filesets.size\" for the latter."
+msgstr ""
+
+#, fuzzy
+msgid "    Example versioned ``.hglfs`` file::"
+msgstr "``.hgeol`` ファイルの記述例::"
+
+msgid ""
+"      [track]\n"
+"      # No Makefile or python file, anywhere, will be LFS\n"
+"      **Makefile = none()\n"
+"      **.py = none()"
+msgstr ""
+
+msgid ""
+"      **.zip = all()\n"
+"      **.exe = size(\">1MB\")"
+msgstr ""
+
+msgid ""
+"      # Catchall for everything not matched above\n"
+"      ** = size(\">10MB\")"
+msgstr ""
+
+msgid "Configs::"
+msgstr ""
+
+msgid ""
+"    [lfs]\n"
+"    # Remote endpoint. Multiple protocols are supported:\n"
+"    # - http(s)://user:[e-mail]/path\n"
+"    #   git-lfs endpoint\n"
+"    # - file:///tmp/path\n"
+"    #   local filesystem, usually for testing\n"
+"    # if unset, lfs will assume the remote repository also handles blob "
+"storage\n"
+"    # for http(s) URLs.  Otherwise, lfs will prompt to set this when it "
+"must\n"
+"    # use this value.\n"
+"    # (default: unset)\n"
+"    url = https://example.com/repo.git/info/lfs"
+msgstr ""
+
+msgid ""
+"    # Which files to track in LFS.  Path tests are \"**.extname\" for file\n"
+"    # extensions, and \"path:under/some/directory\" for path prefix.  Both\n"
+"    # are relative to the repository root.\n"
+"    # File size can be tested with the \"size()\" fileset, and tests can be\n"
+"    # joined with fileset operators.  (See \"hg help filesets.operators\".)\n"
+"    #\n"
+"    # Some examples:\n"
+"    # - all()                       # everything\n"
+"    # - none()                      # nothing\n"
+"    # - size(\">20MB\")               # larger than 20MB\n"
+"    # - !**.txt                     # anything not a *.txt file\n"
+"    # - **.zip | **.tar.gz | **.7z  # some types of compressed files\n"
+"    # - path:bin                    # files under \"bin\" in the project "
+"root\n"
+"    # - (**.php & size(\">2MB\")) | (**.js & size(\">5MB\")) | **.tar.gz\n"
+"    #     | (path:bin & !path:/bin/README) | size(\">1GB\")\n"
+"    # (default: none())\n"
+"    #\n"
+"    # This is ignored if there is a tracked '.hglfs' file, and this setting\n"
+"    # will eventually be deprecated and removed.\n"
+"    track = size(\">10M\")"
+msgstr ""
+
+msgid ""
+"    # how many times to retry before giving up on transferring an object\n"
+"    retry = 5"
+msgstr ""
+
+msgid ""
+"    # the local directory to store lfs files for sharing across local "
+"clones.\n"
+"    # If not set, the cache is located in an OS specific cache location.\n"
+"    usercache = /path/to/global/cache\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "parse error in .hglfs: %s"
+msgstr "hg: %s での解析エラー: %s\n"
+
+#. i18n: "lfs" is a keyword
+#, fuzzy
+msgid "lfs takes no arguments"
+msgstr "all には引数が指定できません"
+
+#, fuzzy
+msgid "upload large files introduced by REV"
+msgstr "大容量ファイルの転送中"
+
+#, fuzzy
+msgid "upload lfs blobs added by the working copy parent or given revisions"
+msgstr "指定リビジョンへの署名の付与"
+
+#, fuzzy, python-format
+msgid "corrupt remote lfs object: %s"
+msgstr "%r オブジェクトが %s から読み込めません"
+
+#, fuzzy, python-format
+msgid "lfs: adding %s to the usercache\n"
+msgstr "パッチ %s を追加中\n"
+
+#, fuzzy, python-format
+msgid "lfs: found %s in the usercache\n"
+msgstr "%s はシステムキャッシュに取得済み\n"
+
+#, fuzzy, python-format
+msgid "lfs: found %s in the local lfs store\n"
+msgstr "%s はリポジトリに取得済み\n"
+
+#, python-format
+msgid "LFS HTTP error: %s (action=%s)"
+msgstr ""
+
+#, python-format
+msgid "LFS server returns invalid JSON: %s"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "LFS server error for \"%s\": %s"
+msgstr "hg: %s での解析エラー: %s\n"
+
+#, python-format
+msgid "LFS server error. Unsolicited response for oid %s"
+msgstr ""
+
+#, python-format
+msgid "detected corrupt lfs object: %s"
+msgstr ""
+
+msgid "run hg verify"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "HTTP error: %s (oid=%s, action=%s)"
+msgstr "エラー: フック %s による例外発生: %s\n"
+
+msgid "lfs uploading"
+msgstr ""
+
+msgid "lfs downloading"
+msgstr ""
+
+#, python-format
+msgid "lfs: need to transfer %d objects (%s)\n"
+msgstr ""
+
+#, python-format
+msgid "lfs: downloading %s (%s)\n"
+msgstr ""
+
+#, python-format
+msgid "lfs: uploading %s (%s)\n"
+msgstr ""
+
+#, python-format
+msgid "lfs: failed: %r (remaining retry %d)\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "lfs: processed: %s\n"
+msgstr "履歴反映が拒否されました: %s"
+
+#, python-format
+msgid "lfs: uploaded %d files (%s)\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "lfs: downloaded %d files (%s)\n"
+msgstr "%d ファイルを再リンク (%s バイトの節約)\n"
+
+#, fuzzy
+msgid "lfs.url needs to be configured"
+msgstr "デフォルトの連携先が設定されていません"
+
+#, fuzzy, python-format
+msgid "lfs: assuming remote store: %s\n"
+msgstr "連携先での新規ブックマーク %s を追加中\n"
+
+#, fuzzy, python-format
+msgid "lfs: unknown url scheme: %s"
+msgstr "%s: 未知のバンドル機能 %s"
+
+#, python-format
+msgid "cannot parse git-lfs text: %r"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "unexpected value: %s=%r"
+msgstr "%r に対する旧値の指定は想定外です"
+
+#, fuzzy, python-format
+msgid "unexpected key: %s"
+msgstr "想定外の記述: %s"
+
+#, fuzzy, python-format
+msgid "missed keys: %s"
+msgstr "定義位置: %s\n"
+
+msgid "enable the lfs extension on the server"
+msgstr ""
+
+#, python-format
+msgid "lfs: corrupted pointer (%s@%s): %s\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "copying lfs blob %s\n"
+msgstr "%s を %s にコピー中\n"
+
 msgid "send ui.log() data to a subprocess (EXPERIMENTAL)"
 msgstr ""
 
@@ -8083,6 +9020,183 b' msgstr "mq \xe3\x81\xab\xe3\x81\xaf\xe5\xbc\x95\xe6\x95\xb0\xe3\x81\x8c\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"'
 msgid "operate on patch repository"
 msgstr "パッチ管理リポジトリへの操作"
 
+msgid ""
+"create clones which fetch history data for subset of files (EXPERIMENTAL)"
+msgstr ""
+
+msgid "no common changegroup version"
+msgstr "利用可能な共通のバンドル形式バージョンがありません"
+
+msgid ""
+"server does not advertise changegroup version, can't negotiate support for "
+"ellipsis nodes"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "depth must be positive, got %d"
+msgstr "制限には正数を指定してください"
+
+msgid "{} configuration for user {} is empty"
+msgstr ""
+
+msgid "The following includes are not accessible for {}: {}"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "unexpected changespec node chunk type: %s"
+msgstr "想定外の revspec フォーマット文字 %s"
+
+msgid "adding branch\n"
+msgstr "ブランチを追加中\n"
+
+#, python-format
+msgid "error removing %s: %s\n"
+msgstr "ファイル %s の破棄に失敗: %s\n"
+
+msgid "uncompressed size of bundle content:\n"
+msgstr "バンドルファイル内容の非圧縮サイズ:\n"
+
+msgid "changesets"
+msgstr "リビジョン"
+
+#, python-format
+msgid "%8.i (changelog)\n"
+msgstr "%8.i (履歴情報)\n"
+
+#, fuzzy
+msgid "create a narrow clone of select files"
+msgstr "バンドルファイルの生成"
+
+msgid "limit the history fetched by distance from heads"
+msgstr ""
+
+msgid "specifically fetch this file/directory"
+msgstr ""
+
+msgid "do not fetch this file/directory, even if included"
+msgstr ""
+
+#, fuzzy
+msgid "server doesn't support narrow clones"
+msgstr "連携先リポジトリはブックマークが未サポートです\n"
+
+#, fuzzy
+msgid "looking for local changes to affected paths\n"
+msgstr "パッチ対象ファイルに対する作業領域中の変更を破棄"
+
+msgid ""
+"The following changeset(s) or their ancestors have local changes not on the "
+"remote:\n"
+msgstr ""
+
+#, python-format
+msgid "...and %d more, use --verbose to list all\n"
+msgstr ""
+
+msgid "local changes found"
+msgstr "作業領域に変更があります"
+
+msgid "use --force-delete-local-changes to ignore"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "deleting %s\n"
+msgstr "%s の復旧中\n"
+
+#, fuzzy
+msgid "new paths to include"
+msgstr "当該テンプレートで表示をカスタマイズ"
+
+#, fuzzy
+msgid "old paths to no longer include"
+msgstr "word にはインデックス値を数値で指定してください"
+
+#, fuzzy
+msgid "new paths to exclude"
+msgstr "当該テンプレートで表示をカスタマイズ"
+
+msgid "old paths to no longer exclude"
+msgstr ""
+
+msgid "whether to replace the existing narrowspec"
+msgstr ""
+
+msgid "forces deletion of local changes when narrowing"
+msgstr ""
+
+#, fuzzy
+msgid "[OPTIONS]... [REMOTE]"
+msgstr "[OPTION]... [TEXT]"
+
+#, fuzzy
+msgid "show or change the current narrowspec"
+msgstr "現行パッチの名前表示"
+
+msgid ""
+"    With no argument, shows the current narrowspec entries, one per line. "
+"Each\n"
+"    line will be prefixed with 'I' or 'X' for included or excluded "
+"patterns,\n"
+"    respectively."
+msgstr ""
+
+msgid ""
+"    The narrowspec is comprised of expressions to match remote files and/or\n"
+"    directories that should be pulled into your client.\n"
+"    The narrowspec has *include* and *exclude* expressions, with excludes "
+"always\n"
+"    trumping includes: that is, if a file matches an exclude expression, it "
+"will\n"
+"    be excluded even if it also matches an include expression.\n"
+"    Excluding files that were never included has no effect."
+msgstr ""
+
+msgid ""
+"    Each included or excluded entry is in the format described by\n"
+"    'hg help patterns'."
+msgstr ""
+
+msgid ""
+"    The options allow you to add or remove included and excluded expressions."
+msgstr ""
+
+msgid ""
+"    If --clear is specified, then all previous includes and excludes are "
+"DROPPED\n"
+"    and replaced by the new ones specified to --addinclude and --"
+"addexclude.\n"
+"    If --clear is specified without any further options, the narrowspec will "
+"be\n"
+"    empty and will not match any files.\n"
+"    "
+msgstr ""
+
+msgid ""
+"The narrow command is only supported on respositories cloned with --narrow.\n"
+msgstr ""
+
+#, fuzzy
+msgid "The --clear option is not yet supported.\n"
+msgstr "圧縮形式 %s は未サポートです"
+
+#, python-format
+msgid "cannot track '%s' - it is outside the narrow clone"
+msgstr ""
+
+#, python-format
+msgid "merge affects file '%s' outside narrow, which is not yet supported"
+msgstr ""
+
+msgid "merging in the other direction may work"
+msgstr ""
+
+#, python-format
+msgid "conflict in file '%s' is outside narrow clone"
+msgstr ""
+
+msgid "expanding narrowspec\n"
+msgstr ""
+
 msgid "hooks for sending email push notifications"
 msgstr "電子メールによる push 通知送信用フック集"
 
@@ -8316,6 +9430,17 b' msgstr ""'
 "  メール本文に含める、 差分情報の最大行数。 0 の場合は、 差分が含まれず、\n"
 "  -1 の場合は、 全差分行が含まれます。 デフォルト値は 300。"
 
+#, fuzzy
+msgid ""
+"notify.maxdiffstat\n"
+"  Maximum number of diffstat lines to include in notification email. Set to "
+"-1\n"
+"  to include all of it. Default: -1."
+msgstr ""
+"notify.maxdiff\n"
+"  メール本文に含める、 差分情報の最大行数。 0 の場合は、 差分が含まれず、\n"
+"  -1 の場合は、 全差分行が含まれます。 デフォルト値は 300。"
+
 msgid ""
 "notify.maxsubject\n"
 "  Maximum number of characters in email's subject line. Default: 67."
@@ -8387,6 +9512,14 b' msgstr "%s: %d \xe4\xbb\xb6\xe3\x81\xae\xe6\x96\xb0\xe3\x81\x97\xe3\x81\x84\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3"'
 msgid "notify: sending %d subscribers %d changes\n"
 msgstr "notify: %d 購読者に %d 変更を送信中\n"
 
+#, fuzzy, python-format
+msgid ""
+"\n"
+"diffstat (truncated from %d to %d lines):"
+msgstr ""
+"\n"
+"差分 (%d 行から %d 行に切り詰め):"
+
 #, python-format
 msgid ""
 "\n"
@@ -8609,9 +9742,6 b' msgstr ""'
 msgid "this patch series consists of %d patches."
 msgstr "一連のパッチは %d 個のパッチから構成されています。"
 
-msgid "no changes found\n"
-msgstr "差分はありません\n"
-
 msgid "send patches as inline message text (default)"
 msgstr "インラインメッセージとしてパッチを送信 (デフォルト)"
 
@@ -8672,6 +9802,10 b' msgstr "\xe5\xaf\xbe\xe8\xb1\xa1\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x81\xab\xe7\x84\xa1\xe3\x81\x84\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x82\x92\xe3\x83\x91\xe3\x83\x83\xe3\x83\x81\xe5\xbd\xa2\xe5\xbc\x8f\xe3\x81\xa7\xe9\x80\x81\xe4\xbf\xa1"'
 msgid "send changes not in target as a binary bundle"
 msgstr "対象リポジトリに無いリビジョンをバンドル形式で送信"
 
+#, fuzzy
+msgid "send changes only reachable by given bookmark"
+msgstr "指定ブックマークから、 到達可能なリビジョンのみを除外"
+
 msgid "name of the bundle attachment file"
 msgstr "バンドル形式添付ファイルのファイル名"
 
@@ -8748,6 +9882,11 b' msgstr ""'
 "    インラインまたは通常の添付ファイルから、 選択することができます。"
 
 msgid ""
+"    With -B/--bookmark changesets reachable by the given bookmark are\n"
+"    selected."
+msgstr ""
+
+msgid ""
 "    With -o/--outgoing, emails will be generated for patches not found\n"
 "    in the destination repository (or only those which are ancestors\n"
 "    of the specified revisions if any are provided)"
@@ -8827,6 +9966,10 b' msgstr ""'
 "      hg email -o -r 3000 DEST  # 3000 以前で DEST 側に無いリビジョン"
 
 msgid ""
+"      hg email -B feature       # send all ancestors of feature bookmark"
+msgstr ""
+
+msgid ""
 "      hg email -b               # send bundle of all patches not in default\n"
 "      hg email -b DEST          # send bundle of all patches not in DEST\n"
 "      hg email -b -r 3000       # bundle of all ancestors of 3000 not in "
@@ -8863,12 +10006,17 b' msgstr ""'
 "    を参照してください。 (※ 訳注: :hg:`help config` でも参照可能)\n"
 "    "
 
-msgid "specify at least one changeset with -r or -o"
+#, fuzzy
+msgid "specify at least one changeset with -B, -r or -o"
 msgstr "-r 又は -o を使用してリビジョンを指定してください"
 
 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
 msgstr "--bundle 指定で暗黙に有効となりますので --outgoing 指定は不要です"
 
+#, fuzzy
+msgid "-r and -B are mutually exclusive"
+msgstr "--message と --logfile は同時に指定できません"
+
 msgid "too many destinations"
 msgstr "対象指定が多過ぎです"
 
@@ -8876,6 +10024,10 b' msgid "use only one form to specify the '
 msgstr "リビジョン指定は単一の形式で行ってください"
 
 #, python-format
+msgid "bookmark '%s' not found"
+msgstr "ブックマーク '%s' がありません"
+
+#, python-format
 msgid "unable to access public repo: %s\n"
 msgstr "publicurl で指定された公開リポジトリにアクセスできません: %s\n"
 
@@ -9043,6 +10195,10 b' msgstr ""'
 "詳細は以下を参照してください:\n"
 "https://mercurial-scm.org/wiki/RebaseExtension\n"
 
+#, python-format
+msgid "ambiguous automatic rebase: %r could end up on any of %r"
+msgstr ""
+
 msgid "rebase"
 msgstr "rebase"
 
@@ -9071,6 +10227,10 b' msgstr "\xe7\xa7\xbb\xe5\x8b\x95\xe3\x81\xae\xe5\xbf\x85\xe8\xa6\x81\xe3\x81\xaf\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93\\n"'
 msgid "can't rebase public changeset %s"
 msgstr "public フェーズのリビジョン %s は移動できません"
 
+#, fuzzy
+msgid "--collapse does not work with multiple destinations"
+msgstr "p4 形式からの変換では、複数リビジョン指定は未サポートです"
+
 #, python-format
 msgid "reopening closed branch head %s\n"
 msgstr "閉鎖済みブランチヘッド %s の閉鎖状態を解除中\n"
@@ -9078,16 +10238,33 b' msgstr "\xe9\x96\x89\xe9\x8e\x96\xe6\xb8\x88\xe3\x81\xbf\xe3\x83\x96\xe3\x83\xa9\xe3\x83\xb3\xe3\x83\x81\xe3\x83\x98\xe3\x83\x83\xe3\x83\x89 %s \xe3\x81\xae\xe9\x96\x89\xe9\x8e\x96\xe7\x8a\xb6\xe6\x85\x8b\xe3\x82\x92\xe8\xa7\xa3\xe9\x99\xa4\xe4\xb8\xad\\n"'
 msgid "cannot collapse multiple named branches"
 msgstr "複数の名前付きブランチの単一化はできません"
 
+msgid "rebasing"
+msgstr "移動中"
+
+msgid "rebase merging completed\n"
+msgstr "移動のマージ処理が完了\n"
+
+#, fuzzy, python-format
+msgid "already rebased %s\n"
+msgstr "%s は %s として移動済みです\n"
+
+#, fuzzy, python-format
+msgid ""
+"note: not rebasing %s and its descendants as this would cause divergence\n"
+msgstr "備考: %s は既に %s として移動済みなので移動しません\n"
+
+#, python-format
+msgid "note: not rebasing %s, it has no successor\n"
+msgstr "備考: 廃止済みで後継リビジョンを持たない %s は移動しません\n"
+
+#, python-format
+msgid "note: not rebasing %s, already in destination as %s\n"
+msgstr "備考: %s は既に %s として移動済みなので移動しません\n"
+
 #, python-format
 msgid "rebasing %s\n"
 msgstr "リビジョン '%s' を移動中\n"
 
-msgid "rebasing"
-msgstr "移動中"
-
-msgid "changesets"
-msgstr "リビジョン"
-
 msgid "unresolved conflicts (see hg resolve, then hg rebase --continue)"
 msgstr ""
 "衝突が未解消です ('hg resolve' での衝突解消後に、'hg rebase --continue' を実"
@@ -9098,24 +10275,9 b' msgid "note: rebase of %d:%s created no '
 msgstr "備考: リビジョン %d:%s は移動先で空になるため無視されます\n"
 
 #, python-format
-msgid "not rebasing ignored %s\n"
-msgstr "無視対象のリビジョン '%s' は移動されません\n"
-
-#, python-format
-msgid "note: not rebasing %s, already in destination as %s\n"
-msgstr "備考: %s は既に %s として移動済みなので移動しません\n"
-
-#, python-format
-msgid "note: not rebasing %s, it has no successor\n"
-msgstr "備考: 廃止済みで後継リビジョンを持たない %s は移動しません\n"
-
-#, python-format
 msgid "already rebased %s as %s\n"
 msgstr "%s は %s として移動済みです\n"
 
-msgid "rebase merging completed\n"
-msgstr "移動のマージ処理が完了\n"
-
 msgid "update back to initial working directory parent\n"
 msgstr "移動先の親リビジョンで作業領域を更新\n"
 
@@ -9126,49 +10288,6 b' msgstr "\xe7\xa7\xbb\xe5\x8b\x95\xe5\xae\x8c\xe4\xba\x86\\n"'
 msgid "%d revisions have been skipped\n"
 msgstr "%d 個のリビジョンをスキップ\n"
 
-msgid "rebase the specified changeset and descendants"
-msgstr "指定リビジョンとその子孫の移動"
-
-msgid "rebase everything from branching point of specified changeset"
-msgstr "指定リビジョンの枝分かれ元以降のリビジョンの移動"
-
-msgid "rebase these revisions"
-msgstr "指定リビジョン群の移動"
-
-msgid "rebase onto the specified changeset"
-msgstr "移動先リビジョン"
-
-msgid "collapse the rebased changesets"
-msgstr "移動後に移動リビジョンを単一化"
-
-msgid "use text as collapse commit message"
-msgstr "指定テキストを要約コミットログとして使用"
-
-msgid "read collapse commit message from file"
-msgstr "要約コミットログをファイルから読み込み"
-
-msgid "keep original changesets"
-msgstr "元リビジョンを維持"
-
-msgid "keep original branch names"
-msgstr "元ブランチ名を維持"
-
-#. i18n: "(DEPRECATED)" is a keyword, must be translated consistently
-msgid "(DEPRECATED)"
-msgstr "(非推奨)"
-
-msgid "specify merge tool"
-msgstr "マージツールの指定"
-
-msgid "continue an interrupted rebase"
-msgstr "中断された未完了の移動を再開"
-
-msgid "abort an interrupted rebase"
-msgstr "中断による未完了な移動の情報を破棄(＝中止)"
-
-msgid "[-s REV | -b REV] [-d REV] [OPTION]"
-msgstr "[-s REV | -b REV] [-d REV] [OPTION]"
-
 msgid "move changeset (and descendants) to a different branch"
 msgstr "別な履歴位置へのリビジョン(およびその子孫)の移動"
 
@@ -9234,6 +10353,14 b' msgstr ""'
 "         ``--base .`` 相当の指定で移動を実施"
 
 msgid ""
+"    If ``--source`` or ``--rev`` is used, special names ``SRC`` and "
+"``ALLSRC``\n"
+"    can be used in ``--dest``. Destination would be calculated per source\n"
+"    revision with ``SRC`` substituted by that single source revision and\n"
+"    ``ALLSRC`` substituted by all source revisions."
+msgstr ""
+
+msgid ""
 "    Rebase will destroy original changesets unless you use ``--keep``.\n"
 "    It will also move your bookmarks (even if you do)."
 msgstr ""
@@ -9327,20 +10454,68 b' msgstr " - \xe3\x83\x96\xe3\x83\xa9\xe3\x83\xb3\xe3\x83\x81\xe5\x90\x8d\xe5\x89\x8d\xe3\x82\x92\xe7\xb6\xad\xe6\x8c\x81\xe3\x81\x97\xe3\x81\xa4\xe3\x81\xa4\xe3\x80\x81 \xe5\x90\x8d\xe5\x89\x8d\xe4\xbb\x98\xe3\x81\x8d\xe3\x83\x96\xe3\x83\xa9\xe3\x83\xb3\xe3\x83\x81\xe5\x85\xa8\xe4\xbd\x93\xe3\x82\x92\xe7\xa7\xbb\xe5\x8b\x95::"'
 msgid "          hg rebase -r \"branch(featureX)\" -d 1.3 --keepbranches"
 msgstr "          hg rebase -r \"branch(featureX)\" -d 1.3 --keepbranches"
 
+msgid "      - stabilize orphaned changesets so history looks linear::"
+msgstr ""
+
+msgid ""
+"          hg rebase -r 'orphan()-obsolete()' -d "
+"'first(max((successors(max(roots(ALLSRC) & ::SRC)^)-obsolete())::) + max(::"
+"((roots(ALLSRC) & ::SRC)^)-obsolete()))'"
+msgstr ""
+
 msgid "    Configuration Options:"
 msgstr "    設定項目:"
 
+#, fuzzy
 msgid ""
 "    You can make rebase require a destination if you set the following "
 "config\n"
-"    option:"
+"    option::"
 msgstr ""
 "    以下の項目を設定することで、 rebase 時の移動先指定を必須化できます:"
 
 msgid ""
 "      [commands]\n"
-"      rebase.requiredest = False"
-msgstr ""
+"      rebase.requiredest = True"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    By default, rebase will close the transaction after each commit. For\n"
+"    performance purposes, you can configure rebase to use a single "
+"transaction\n"
+"    across the entire rebase. WARNING: This setting introduces a "
+"significant\n"
+"    risk of losing the work you've done in a rebase if the rebase aborts\n"
+"    unexpectedly::"
+msgstr ""
+"特に指定が無い場合、 個々の処理毎に、 トランザクションが作成されます。\n"
+"実行性能の観点から、 単一トランザクションでの histedit 実行も可能です。\n"
+"警告: histedit が予期せず中断した場合、 作業内容を失うかもしれない、\n"
+"深刻な危険性を持つ設定ですので、 設定の際は注意してください::"
+
+#, fuzzy
+msgid ""
+"      [rebase]\n"
+"      singletransaction = True"
+msgstr ""
+"  [histedit]\n"
+"  singletransaction = True"
+
+msgid ""
+"    By default, rebase writes to the working copy, but you can configure it "
+"to\n"
+"    run in-memory for for better performance, and to allow it to run if the\n"
+"    working copy is dirty::"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"      [rebase]\n"
+"      experimental.inmemory = True"
+msgstr ""
+"  [histedit]\n"
+"  singletransaction = True"
 
 msgid "    Return Values:"
 msgstr "    コマンド終了値:"
@@ -9352,6 +10527,60 b' msgstr ""'
 "    成功時のコマンド終了値は 0、 移動が必要なリビジョンが無い場合や、\n"
 "    未解消の衝突が発生した場合は 1 です。"
 
+msgid "rebase the specified changeset and descendants"
+msgstr "指定リビジョンとその子孫の移動"
+
+msgid "rebase everything from branching point of specified changeset"
+msgstr "指定リビジョンの枝分かれ元以降のリビジョンの移動"
+
+msgid "rebase these revisions"
+msgstr "指定リビジョン群の移動"
+
+msgid "rebase onto the specified changeset"
+msgstr "移動先リビジョン"
+
+msgid "collapse the rebased changesets"
+msgstr "移動後に移動リビジョンを単一化"
+
+msgid "use text as collapse commit message"
+msgstr "指定テキストを要約コミットログとして使用"
+
+msgid "read collapse commit message from file"
+msgstr "要約コミットログをファイルから読み込み"
+
+msgid "keep original changesets"
+msgstr "元リビジョンを維持"
+
+msgid "keep original branch names"
+msgstr "元ブランチ名を維持"
+
+#. i18n: "(DEPRECATED)" is a keyword, must be translated consistently
+msgid "(DEPRECATED)"
+msgstr "(非推奨)"
+
+msgid "specify merge tool"
+msgstr "マージツールの指定"
+
+msgid "continue an interrupted rebase"
+msgstr "中断された未完了の移動を再開"
+
+msgid "abort an interrupted rebase"
+msgstr "中断による未完了な移動の情報を破棄(＝中止)"
+
+msgid ""
+"automatically rebase orphan revisions in the specified revset (EXPERIMENTAL)"
+msgstr ""
+
+msgid "[-s REV | -b REV] [-d REV] [OPTION]"
+msgstr "[-s REV | -b REV] [-d REV] [OPTION]"
+
+#, fuzzy, python-format
+msgid "--auto-orphans is incompatible with %s"
+msgstr "-G/--graph と --%s は併用できません"
+
+msgid "hit merge conflicts; re-running rebase without in-memory merge\n"
+msgstr ""
+
 #, python-format
 msgid ""
 "interactive history editing is supported by the 'histedit' extension (see "
@@ -9420,9 +10649,21 b' msgstr "\xe7\xa7\xbb\xe5\x8b\x95\xe5\xaf\xbe\xe8\xb1\xa1\xe3\x81\x8c\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93 - \xe4\xbd\x9c\xe6\xa5\xad\xe9\xa0\x98\xe5\x9f\x9f\xe3\x81\xae\xe8\xa6\xaa\xe3\x81\xaf --dest \xe6\x8c\x87\xe5\xae\x9a\xe3\x81\xae %s \xe3\x81\xae\xe7\xa5\x96\xe5\x85\x88\xe3\x81\xa7\xe3\x81\x99\\n"'
 msgid "nothing to rebase from %s to %s\n"
 msgstr "%s から %s への移動は不要です\n"
 
-#, python-format
-msgid ""
-"unable to collapse on top of %s, there is more than one external parent: %s"
+#, fuzzy, python-format
+msgid "skipping %s - empty destination\n"
+msgstr "%s を抑止 - ガード %s が適用されました\n"
+
+#, fuzzy, python-format
+msgid "rebase destination for %s is not unique"
+msgstr "複製先 '%s' は空ではありません"
+
+#, fuzzy
+msgid "nothing to rebase - empty destination\n"
+msgstr "移動操作は不要です - 作業領域の更新のみを実施します\n"
+
+#, fuzzy, python-format
+msgid ""
+"unable to collapse on top of %d, there is more than one external parent: %s"
 msgstr ""
 "%s への移動で単一化できません。移動対象外の複数の祖先が内容に影響します: %s"
 
@@ -9430,15 +10671,27 b' msgstr ""'
 msgid "this rebase will cause divergences from: %s"
 msgstr "この移動操作は %s からの分岐 (divergence) を生じます"
 
-msgid "to force the rebase please set experimental.allowdivergence=True"
+#, fuzzy
+msgid ""
+"to force the rebase please set experimental.evolution.allowdivergence=True"
 msgstr "移動を強制する場合は experimental.allowdivergence=True 設定が必要です"
 
 #, python-format
-msgid "cannot use revision %d as base, result would have 3 parents"
-msgstr "親リビジョンが 3 つになるので、 リビジョン %d をベースにできません"
-
-#, python-format
-msgid "updating mq patch %s to %s:%s\n"
+msgid "cannot rebase %d:%s without moving at least one of its parents"
+msgstr ""
+
+msgid "source is ancestor of destination"
+msgstr "移動元は移動先の祖先です"
+
+msgid " or "
+msgstr ""
+
+#, python-format
+msgid "rebasing %d:%s will include unwanted changes from %s"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "updating mq patch %s to %d:%s\n"
 msgstr "mq パッチ %s をリビジョン %s:%s に移動中\n"
 
 msgid "missing .hg/last-message.txt for rebase"
@@ -9448,24 +10701,23 b' msgstr "rebase \xe3\x81\x8c\xe5\x88\xa9\xe7\x94\xa8\xe3\x81\x99\xe3\x82\x8b .hg/last-message.txt \xe3\x81\x8c\xe4\xb8\x8d\xe5\x9c\xa8\xe3\x81\xa7\xe3\x81\x99"'
 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"
+#, fuzzy
+msgid "warning: new changesets detected on destination branch, can't strip\n"
 msgstr "警告: 想定外の新規リビジョン追加により、対象ブランチを破棄できません\n"
 
 msgid "rebase aborted\n"
 msgstr "移動が中止されました\n"
 
+#, fuzzy
+msgid "source and destination form a cycle"
+msgstr "パッチ対象のファイル名が指定されていません"
+
 msgid "cannot rebase onto an applied mq patch"
 msgstr "MQ パッチ上への移動はできません"
 
 msgid "no matching revisions"
 msgstr "合致するリビジョンはありません"
 
-msgid "source is ancestor of destination"
-msgstr "移動元は移動先の祖先です"
-
-msgid "warning: new changesets detected on source branch, not stripping\n"
-msgstr "警告: 移動元に新規リビジョンを検出したので、 破棄しません\n"
-
 msgid "rebase destination required by configuration"
 msgstr "設定により移動先リビジョン指定が必須となっています"
 
@@ -9601,6 +10853,287 b' msgstr "\'mq\' \xe3\x82\xa8\xe3\x82\xaf\xe3\x82\xb9\xe3\x83\x86\xe3\x83\xb3\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\x8c\xe8\xaa\xad\xe3\x81\xbf\xe8\xbe\xbc\xe3\x81\xbe\xe3\x82\x8c\xe3\x81\xa6\xe3\x81\x84\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"'
 msgid "interactively select changes to refresh"
 msgstr "パッチ更新内容を対話的に選択"
 
+#, fuzzy
+msgid "generate release notes from commit messages (EXPERIMENTAL)"
+msgstr "操作対象変更の対話的な選択 (実験的実装)"
+
+msgid ""
+"It is common to maintain files detailing changes in a project between\n"
+"releases. Maintaining these files can be difficult and time consuming.\n"
+"The :hg:`releasenotes` command provided by this extension makes the\n"
+"process simpler by automating it.\n"
+msgstr ""
+
+msgid "New Features"
+msgstr ""
+
+msgid "Backwards Compatibility Changes"
+msgstr ""
+
+msgid "Bug Fixes"
+msgstr ""
+
+msgid "Performance Improvements"
+msgstr ""
+
+#, fuzzy
+msgid "API Changes"
+msgstr "changegroups フォーマット"
+
+#, fuzzy
+msgid "Other Changes"
+msgstr "ハッシュ値を表示"
+
+msgid ""
+"module 'fuzzywuzzy' not found, merging of similar releasenotes is disabled\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "%s already exists in %s section; ignoring\n"
+msgstr "\"%s\" はディレクトリとして既に存在します"
+
+#, fuzzy, python-format
+msgid "\"%s\" already exists in notes; ignoring\n"
+msgstr "\"%s\" はディレクトリとして既に存在します"
+
+#, fuzzy, python-format
+msgid "\"%s\" already exists in notes file; ignoring\n"
+msgstr "\"%s\" はディレクトリとして既に存在します"
+
+#, fuzzy, python-format
+msgid ".hgreleasenotes file '%s' not found"
+msgstr "サブリポジトリの spec ファイル '%s' が見つかりません"
+
+#, python-format
+msgid "Invalid admonition '%s' present in changeset %s\n"
+msgstr ""
+
+#, python-format
+msgid "(did you mean %s?)\n"
+msgstr "(推測される候補: %s)\n"
+
+#, python-format
+msgid "(did you mean one of %s?)\n"
+msgstr "(推測される候補: %s)\n"
+
+#, fuzzy, python-format
+msgid "changeset %s: release notes directive %s lacks content"
+msgstr "想定外の revspec フォーマット文字 %s"
+
+#, fuzzy, python-format
+msgid "changeset %s: unexpected block in release notes directive %s\n"
+msgstr "想定外の revspec フォーマット文字 %s"
+
+#, fuzzy, python-format
+msgid "error parsing releasenotes for revision: '%s'\n"
+msgstr "リビジョン %s に関連する大容量ファイルの取得中\n"
+
+#, fuzzy
+msgid "indented bullet lists not supported"
+msgstr "addremove は未サポートです"
+
+#, fuzzy, python-format
+msgid "unexpected block type in release notes: %s"
+msgstr "想定外の連携先リポジトリ応答: %s"
+
+#, fuzzy, python-format
+msgid "unknown release notes section: %s"
+msgstr "未知のストリーム圧縮形式です: %s"
+
+#, fuzzy, python-format
+msgid "unsupported section type for %s"
+msgstr "未サポートの行末種別: %s"
+
+msgid "revisions to process for release notes"
+msgstr ""
+
+msgid "checks for validity of admonitions (if any)"
+msgstr ""
+
+msgid "list the available admonitions with their title"
+msgstr ""
+
+#, fuzzy
+msgid "hg releasenotes [-r REV] [-c] FILE"
+msgstr "hg children [-r REV] [FILE]"
+
+msgid "parse release notes from commit messages into an output file"
+msgstr ""
+
+msgid ""
+"    Given an output file and set of revisions, this command will parse "
+"commit\n"
+"    messages for release notes then add them to the output file."
+msgstr ""
+
+msgid ""
+"    Release notes are defined in commit messages as ReStructuredText\n"
+"    directives. These have the form::"
+msgstr ""
+
+#. do not translate: .. directive::
+msgid "       .. directive:: title"
+msgstr ""
+
+#, fuzzy
+msgid "          content"
+msgstr "          hg bisect --reset"
+
+msgid ""
+"    Each ``directive`` maps to an output section in a generated release "
+"notes\n"
+"    file, which itself is ReStructuredText. For example, the ``.. feature::"
+"``\n"
+"    directive would map to a ``New Features`` section."
+msgstr ""
+
+msgid ""
+"    Release note directives can be either short-form or long-form. In "
+"short-\n"
+"    form, ``title`` is omitted and the release note is rendered as a bullet\n"
+"    list. In long form, a sub-section with the title ``title`` is added to "
+"the\n"
+"    section."
+msgstr ""
+
+msgid ""
+"    The ``FILE`` argument controls the output file to write gathered "
+"release\n"
+"    notes to. The format of the file is::"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"       Section 1\n"
+"       ========="
+msgstr ""
+"セクション\n"
+"=========="
+
+msgid "       ..."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"       Section 2\n"
+"       ========="
+msgstr ""
+"セクション\n"
+"=========="
+
+msgid "    Only sections with defined release notes are emitted."
+msgstr ""
+
+msgid ""
+"    If a section only has short-form notes, it will consist of bullet list::"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"       Section\n"
+"       ======="
+msgstr ""
+"セクション\n"
+"=========="
+
+msgid ""
+"       * Release note 1\n"
+"       * Release note 2"
+msgstr ""
+
+msgid "    If a section has long-form notes, sub-sections will be emitted::"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"       Note 1 Title\n"
+"       ------------"
+msgstr ""
+"\n"
+"    /shortlog\n"
+"    ---------"
+
+msgid "       Description of the first long-form note."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"       Note 2 Title\n"
+"       ------------"
+msgstr ""
+"\n"
+"    /shortlog\n"
+"    ---------"
+
+msgid "       Description of the second long-form note."
+msgstr ""
+
+msgid ""
+"    If the ``FILE`` argument points to an existing file, that file will be\n"
+"    parsed for release notes having the format that would be generated by "
+"this\n"
+"    command. The notes from the processed commit messages will be *merged*\n"
+"    into this parsed set."
+msgstr ""
+
+msgid "    During release notes merging:"
+msgstr ""
+
+msgid ""
+"    * Duplicate items are automatically ignored\n"
+"    * Items that are different are automatically ignored if the similarity "
+"is\n"
+"      greater than a threshold."
+msgstr ""
+
+msgid ""
+"    This means that the release notes file can be updated independently "
+"from\n"
+"    this command and changes should not be lost when running this command "
+"on\n"
+"    that file. A particular use case for this is to tweak the wording of a\n"
+"    release note after it has been added to the release notes file."
+msgstr ""
+
+msgid ""
+"    The -c/--check option checks the commit message for invalid admonitions."
+msgstr ""
+
+msgid ""
+"    The -l/--list option, presents the user with a list of existing "
+"available\n"
+"    admonitions along with their title. This also includes the custom\n"
+"    admonitions (if any).\n"
+"    "
+msgstr ""
+
+#, fuzzy
+msgid "cannot use both '--list' and '--rev'"
+msgstr "--noupdate と --updaterev は併用できません"
+
+#, fuzzy
+msgid "cannot use both '--list' and '--check'"
+msgstr "--force と --keep-changes は併用できません"
+
+msgid "parse release notes and print resulting data structure"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "section: %s\n"
+msgstr "  読み込み元: %s\n"
+
+#, fuzzy, python-format
+msgid "  subsection: %s\n"
+msgstr "  読み込み元: %s\n"
+
+#, fuzzy, python-format
+msgid "    paragraph: %s\n"
+msgstr "    別名: %s"
+
+#, fuzzy
+msgid "  bullet point:\n"
+msgstr "  障害報告先: %s\n"
+
 msgid "recreates hardlinks between repository clones"
 msgstr "複製リポジトリ間でのハードリンクの再生成"
 
@@ -9700,6 +11233,50 b' msgstr "\xe5\x86\x8d\xe3\x83\xaa\xe3\x83\xb3\xe3\x82\xaf\xe4\xb8\xad"'
 msgid "relinked %d files (%s reclaimed)\n"
 msgstr "%d ファイルを再リンク (%s バイトの節約)\n"
 
+#, fuzzy
+msgid " showing remotebookmarks and remotebranches in UI"
+msgstr "連携先に新しいブランチが作成されます: %s!"
+
+msgid ""
+"By default both remotebookmarks and remotebranches are turned on. Config "
+"knob to\n"
+"control the individually are as follows."
+msgstr ""
+
+msgid "Config options to tweak the default behaviour:"
+msgstr ""
+
+msgid ""
+"remotenames.bookmarks\n"
+"  Boolean value to enable or disable showing of remotebookmarks (default: "
+"True)"
+msgstr ""
+
+msgid ""
+"remotenames.branches\n"
+"  Boolean value to enable or disable showing of remotebranches (default: "
+"True)"
+msgstr ""
+
+msgid ""
+"remotenames.hoistedpeer\n"
+"  Name of the peer whose remotebookmarks should be hoisted into the top-"
+"level\n"
+"  namespace (default: 'default')\n"
+msgstr ""
+
+#, fuzzy
+msgid "remotenames takes no arguments"
+msgstr "removed には引数が指定できません"
+
+#, fuzzy
+msgid "remotebranches takes no arguments"
+msgstr "removed には引数が指定できません"
+
+#, fuzzy
+msgid "remotebookmarks takes no arguments"
+msgstr "removed には引数が指定できません"
+
 msgid "extend schemes with shortcuts to repository swarms"
 msgstr "連携先リポジトリ群に対する略記指定の拡張"
 
@@ -9859,7 +11436,8 b' msgstr ""'
 "    URL」から算出したハッシュ値)。 :hg:`clone` に指定した複製元のパスや\n"
 "    URL が一致した場合のみ、 履歴管理領域が共有されます。"
 
-msgid "    The default naming mode is \"identity.\"\n"
+#, fuzzy
+msgid "    The default naming mode is \"identity\".\n"
 msgstr "    デフォルトの設定は \"identity.\" です。\n"
 
 msgid "do not create a working directory"
@@ -9967,10 +11545,6 b' msgid "shelved change names can not star'
 msgstr "退避情報の名称の先頭に '.' は使用できません"
 
 #, python-format
-msgid "too many shelved changes named '%s'"
-msgstr "名前のベースに '%s' を使用する退避情報が多過ぎます"
-
-#, python-format
 msgid "nothing changed (%d missing files, see 'hg status')\n"
 msgstr "変更はありません (%d 個のファイルが不在。 'hg status' で確認を)\n"
 
@@ -10286,7 +11860,30 b' msgstr ""'
 msgid ""
 "This extension provides the :hg:`show` command, which provides a central\n"
 "command for displaying commonly-accessed repository data and views of that\n"
-"data.\n"
+"data."
+msgstr ""
+
+#, fuzzy
+msgid "The following config options can influence operation."
+msgstr "以下の ``share.`` セクション設定が、この機能を制御します:"
+
+msgid ""
+"``commands``\n"
+"------------"
+msgstr ""
+"``commands``\n"
+"------------"
+
+msgid ""
+"``show.aliasprefix``\n"
+"   List of strings that will register aliases for views. e.g. ``s`` will\n"
+"   effectively set config options ``alias.s<view> = show <view>`` for all\n"
+"   views. i.e. `hg swork` would execute `hg show work`."
+msgstr ""
+
+msgid ""
+"   Aliases that would conflict with existing registrations will not be\n"
+"   performed.\n"
 msgstr ""
 
 #, fuzzy
@@ -10323,6 +11920,9 b' msgstr ""'
 ":activebookmark: 文字列. アクティブなブックマーク (対象リビジョンに対し、\n"
 "    関連付けられている場合のみ)"
 
+msgid "    stack       current line of work"
+msgstr ""
+
 msgid ""
 "    work        changesets that aren't finished\n"
 "    "
@@ -10361,6 +11961,27 b' msgid "(no bookmarks set)\\n"'
 msgstr "ブックマークは存在しません\n"
 
 #, fuzzy
+msgid "stack view only available when there is a working directory"
+msgstr "作業領域のファイル操作状況の表示"
+
+#, fuzzy
+msgid "(empty stack; working directory parent is a published changeset)\n"
+msgstr "移動対象がありません - 作業領域の親は移動先と同一です\n"
+
+#, fuzzy, python-format
+msgid "%d commits ahead"
+msgstr "コミットに失敗"
+
+msgid "(stack head)\n"
+msgstr ""
+
+msgid "(multiple children)\n"
+msgstr ""
+
+msgid "(stack base)"
+msgstr ""
+
+#, fuzzy
 msgid "commitage requires a string"
 msgstr "date には文字列を指定してください"
 
@@ -10368,6 +11989,332 b' msgstr "date \xe3\x81\xab\xe3\x81\xaf\xe6\x96\x87\xe5\xad\x97\xe5\x88\x97\xe3\x82\x92\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84"'
 msgid "headage requires a string"
 msgstr "date には文字列を指定してください"
 
+#, fuzzy
+msgid "allow sparse checkouts of the working directory (EXPERIMENTAL)"
+msgstr ""
+"``wdir``\n"
+"    作業領域ディレクトリを表す値 (実験的実装)"
+
+msgid ""
+"(This extension is not yet protected by backwards compatibility\n"
+"guarantees. Any aspect may break in future releases until this\n"
+"notice is removed.)"
+msgstr ""
+
+msgid ""
+"This extension allows the working directory to only consist of a\n"
+"subset of files for the revision. This allows specific files or\n"
+"directories to be explicitly included or excluded. Many repository\n"
+"operations have performance proportional to the number of files in\n"
+"the working directory. So only realizing a subset of files in the\n"
+"working directory can improve performance."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Sparse Config Files\n"
+"-------------------"
+msgstr ""
+"設定例\n"
+"------"
+
+msgid ""
+"The set of files that are part of a sparse checkout are defined by\n"
+"a sparse config file. The file defines 3 things: includes (files to\n"
+"include in the sparse checkout), excludes (files to exclude from the\n"
+"sparse checkout), and profiles (links to other config files)."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"The file format is newline delimited. Empty lines and lines beginning\n"
+"with ``#`` are ignored."
+msgstr "    空行と ``#`` で始まる行は無視されます。"
+
+msgid ""
+"Lines beginning with ``%include `` denote another sparse config file\n"
+"to include. e.g. ``%include tests.sparse``. The filename is relative\n"
+"to the repository root."
+msgstr ""
+
+msgid ""
+"The special lines ``[include]`` and ``[exclude]`` denote the section\n"
+"for includes and excludes that follow, respectively. It is illegal to\n"
+"have ``[include]`` after ``[exclude]``."
+msgstr ""
+
+msgid ""
+"Non-special lines resemble file patterns to be added to either includes\n"
+"or excludes. The syntax of these lines is documented by :hg:`help "
+"patterns`.\n"
+"Patterns are interpreted as ``glob:`` by default and match against the\n"
+"root of the repository."
+msgstr ""
+
+msgid ""
+"Exclusion patterns take precedence over inclusion patterns. So even\n"
+"if a file is explicitly included, an ``[exclude]`` entry can remove it."
+msgstr ""
+
+msgid ""
+"For example, say you have a repository with 3 directories, ``frontend/``,\n"
+"``backend/``, and ``tools/``. ``frontend/`` and ``backend/`` correspond\n"
+"to different projects and it is uncommon for someone working on one\n"
+"to need the files for the other. But ``tools/`` contains files shared\n"
+"between both projects. Your sparse config files may resemble::"
+msgstr ""
+
+msgid ""
+"  # frontend.sparse\n"
+"  frontend/**\n"
+"  tools/**"
+msgstr ""
+
+msgid ""
+"  # backend.sparse\n"
+"  backend/**\n"
+"  tools/**"
+msgstr ""
+
+msgid ""
+"Say the backend grows in size. Or there's a directory with thousands\n"
+"of files you wish to exclude. You can modify the profile to exclude\n"
+"certain files::"
+msgstr ""
+
+msgid ""
+"  [include]\n"
+"  backend/**\n"
+"  tools/**"
+msgstr ""
+
+msgid ""
+"  [exclude]\n"
+"  tools/tests/**\n"
+msgstr ""
+
+#, python-format
+msgid "type '%s' has no property '%s'"
+msgstr ""
+
+#, fuzzy
+msgid "too many flags specified."
+msgstr "オプション指定が過剰です"
+
+msgid ""
+"include file with `hg debugsparse --include <pattern>` or use `hg add -s "
+"<file>` to include file directory while adding"
+msgstr ""
+
+#, python-format
+msgid "cannot add '%s' - it is outside the sparse checkout"
+msgstr ""
+
+#, fuzzy
+msgid "include files in the sparse checkout"
+msgstr "親リビジョンの状態でファイルを復旧"
+
+#, fuzzy
+msgid "exclude files in the sparse checkout"
+msgstr "親リビジョンの状態でファイルを復旧"
+
+msgid "delete an include/exclude rule"
+msgstr ""
+
+msgid "allow changing rules even with pending changes"
+msgstr ""
+
+#, fuzzy
+msgid "enables the specified profile"
+msgstr "当該リビジョン時点での由来情報を表示"
+
+#, fuzzy
+msgid "disables the specified profile"
+msgstr "履歴改変指示を指定ファイルから読み込み"
+
+msgid "imports rules from a file"
+msgstr ""
+
+msgid "clears local include/exclude rules"
+msgstr ""
+
+msgid "updates the working after sparseness changes"
+msgstr ""
+
+msgid "makes the repo full again"
+msgstr ""
+
+#, fuzzy
+msgid "[--OPTION] PATTERN..."
+msgstr "[OPTION]... [PATTERN]..."
+
+msgid "make the current checkout sparse, or edit the existing checkout"
+msgstr ""
+
+msgid ""
+"    The sparse command is used to make the current checkout sparse.\n"
+"    This means files that don't meet the sparse condition will not be\n"
+"    written to disk, or show up in any working copy operations. It does\n"
+"    not affect files in history in any way."
+msgstr ""
+
+#, fuzzy
+msgid "    Passing no arguments prints the currently applied sparse rules."
+msgstr ""
+"    引数指定が無い場合、 現在のガード選択状況を表示します。\n"
+"    引数が指定された場合、 ガード選択を設定します。"
+
+msgid ""
+"    --include and --exclude are used to add and remove files from the "
+"sparse\n"
+"    checkout. The effects of adding an include or exclude rule are applied\n"
+"    immediately. If applying the new rule would cause a file with pending\n"
+"    changes to be added or removed, the command will fail. Pass --force to\n"
+"    force a rule change even with pending changes (the changes on disk will\n"
+"    be preserved)."
+msgstr ""
+
+msgid ""
+"    --delete removes an existing include/exclude rule. The effects are\n"
+"    immediate."
+msgstr ""
+
+msgid ""
+"    --refresh refreshes the files on disk based on the sparse rules. This "
+"is\n"
+"    only necessary if .hg/sparse was changed by hand."
+msgstr ""
+
+msgid ""
+"    --enable-profile and --disable-profile accept a path to a .hgsparse "
+"file.\n"
+"    This allows defining sparse checkouts and tracking them inside the\n"
+"    repository. This is useful for defining commonly used sparse checkouts "
+"for\n"
+"    many people to use. As the profile definition changes over time, the "
+"sparse\n"
+"    checkout will automatically be updated appropriately, depending on "
+"which\n"
+"    changeset is checked out. Changes to .hgsparse are not applied until "
+"they\n"
+"    have been committed."
+msgstr ""
+
+msgid ""
+"    --import-rules accepts a path to a file containing rules in the ."
+"hgsparse\n"
+"    format, allowing you to add --include, --exclude and --enable-profile "
+"rules\n"
+"    in bulk. Like the --include, --exclude and --enable-profile switches, "
+"the\n"
+"    changes are applied immediately."
+msgstr ""
+
+msgid ""
+"    --clear-rules removes all local include and exclude rules, while "
+"leaving\n"
+"    any enabled profiles in place."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    Returns 0 if editing the sparse checkout succeeds.\n"
+"    "
+msgstr ""
+"    成功時のコマンド終了値は 0 です。\n"
+"    "
+
+#, fuzzy
+msgid "too many flags specified"
+msgstr "オプション指定が過剰です"
+
+msgid "Temporarily Included Files (for merge/rebase):\n"
+msgstr ""
+
+#, fuzzy
+msgid "repo is not sparse\n"
+msgstr "addremove は未サポートです"
+
+#, fuzzy
+msgid "command to split a changeset into smaller ones (EXPERIMENTAL)"
+msgstr "子リビジョン表示のコマンド (非推奨)"
+
+#, fuzzy
+msgid "revision to split"
+msgstr "表示対象リビジョン"
+
+msgid "rebase descendants after split"
+msgstr ""
+
+msgid "hg split [--no-rebase] [[-r] REV]"
+msgstr ""
+
+#, fuzzy
+msgid "split a changeset into smaller ones"
+msgstr "電子メールによる変更内容のパッチ送付"
+
+msgid ""
+"    Repeatedly prompt changes and commit message for new changesets until "
+"there\n"
+"    is nothing left in the original changeset."
+msgstr ""
+
+#, fuzzy
+msgid "    If --rev was not given, split the working directory parent."
+msgstr "      - 作業領域の親リビジョンの完全ハッシュ値の表示::"
+
+msgid ""
+"    By default, rebase connected non-obsoleted descendants onto the new\n"
+"    changeset. Use --no-rebase to avoid the rebase.\n"
+"    "
+msgstr ""
+
+#, fuzzy
+msgid "cannot split multiple revisions"
+msgstr "null リビジョンにはタグ付けできません"
+
+#, fuzzy
+msgid "nothing to split\n"
+msgstr "移動の必要はありません\n"
+
+#, fuzzy
+msgid "cannot split working directory"
+msgstr "作業領域の親リビジョンの内容は検閲できません"
+
+#, fuzzy
+msgid "cannot split public changeset"
+msgstr "public フェーズのリビジョンは改変できません: %s"
+
+msgid "split would leave orphaned changesets behind"
+msgstr ""
+
+#, fuzzy
+msgid "cannot split changeset with children without rebase"
+msgstr "子リビジョンを持つリビジョンは改変できません"
+
+#, fuzzy
+msgid "cannot split a merge changeset"
+msgstr "マージ実施リビジョンは打ち消し対象にできません"
+
+#, python-format
+msgid "HG: Splitting %s. So far it has been split into:\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "HG: - %s: %s\n"
+msgstr "リビジョン %s: %s\n"
+
+msgid "HG: Write commit message for the next split changeset.\n"
+msgstr ""
+
+#, python-format
+msgid "HG: Splitting %s. Write commit message for the first split changeset.\n"
+msgstr ""
+
+#, fuzzy
+msgid "cannot split an empty revision"
+msgstr "null リビジョンにはタグ付けできません"
+
 msgid "strip changesets and their descendants from history"
 msgstr "指定リビジョンと子孫の履歴からの破棄"
 
@@ -10379,9 +12326,6 b' msgstr ""'
 "本エクステンションは、 指定リビジョンとその子孫を、 履歴から破棄します。\n"
 "詳細は :hg:`help strip` を参照してください。\n"
 
-msgid "local changes found"
-msgstr "作業領域に変更があります"
-
 msgid "local changed subrepos found"
 msgstr "サブリポジトリに変更があります"
 
@@ -10471,10 +12415,6 b' msgstr ""'
 "    他リポジトリに反映済みである場合、 そのリビジョンは pull 操作により、\n"
 "    再び手元のリポジトリに出現することでしょう。"
 
-#, python-format
-msgid "bookmark '%s' not found"
-msgstr "ブックマーク '%s' がありません"
-
 msgid "empty revision set"
 msgstr "指定に該当するリビジョンはありません"
 
@@ -10501,8 +12441,8 b' msgstr ""'
 msgid "skipping already applied revision %s\n"
 msgstr "適用済みリビジョン %s を無視\n"
 
-#, python-format
-msgid "skipping merge changeset %s:%s\n"
+#, fuzzy, python-format
+msgid "skipping merge changeset %d:%s\n"
 msgstr "マージ実施リビジョン %s:%s を無視\n"
 
 #, python-format
@@ -10746,6 +12686,62 b' msgstr "transplant \xe3\x81\xab\xe3\x82\x88\xe3\x82\x8b\xe7\xa7\xbb\xe6\xa4\x8d\xe3\x81\x8c\xe6\x9c\xaa\xe5\xae\x8c\xe4\xba\x86\xe3\x81\xa7\xe3\x81\x99"'
 msgid "use 'hg transplant --continue' or 'hg update' to abort"
 msgstr "'hg transplant --continue' か 'hg update' (移植中止)を実施してください"
 
+#, fuzzy
+msgid "uncommit part or all of a local changeset (EXPERIMENTAL)"
+msgstr "操作対象変更の対話的な選択 (実験的実装)"
+
+msgid ""
+"This command undoes the effect of a local commit, returning the affected\n"
+"files to their uncommitted state. This means that files modified, added or\n"
+"removed in the changeset will be left unchanged, and so will remain "
+"modified,\n"
+"added and removed in the working directory.\n"
+msgstr ""
+
+msgid "allow an empty commit after uncommiting"
+msgstr ""
+
+#, fuzzy
+msgid "uncommit part or all of a local changeset"
+msgstr "パス全体を補完"
+
+msgid ""
+"    This command undoes the effect of a local commit, returning the "
+"affected\n"
+"    files to their uncommitted state. This means that files modified or\n"
+"    deleted in the changeset will be left unchanged, and so will remain\n"
+"    modified in the working directory."
+msgstr ""
+
+msgid ""
+"    If no files are specified, the commit will be pruned, unless --keep is\n"
+"    given.\n"
+"    "
+msgstr ""
+
+#, fuzzy
+msgid "cannot uncommit merge changeset"
+msgstr "マージ実施リビジョンは打ち消し対象にできません"
+
+#, fuzzy
+msgid "nothing to uncommit\n"
+msgstr "merge の必要はありません"
+
+msgid "undo the most recent amend operation on a current changeset"
+msgstr ""
+
+msgid ""
+"    This command will roll back to the previous version of a changeset,\n"
+"    leaving working directory in state in which it was before running\n"
+"    `hg amend` (e.g. files modified as part of an amend will be\n"
+"    marked as modified `hg status`)\n"
+"    "
+msgstr ""
+
+#, python-format
+msgid "changeset must have one predecessor, found %i predecessors"
+msgstr ""
+
 msgid "allow the use of MBCS paths with problematic encodings"
 msgstr "問題ある文字コードをパス名に使用する場合の対処"
 
@@ -11016,9 +13012,31 b' msgid "no active bookmark"'
 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 を指定)"
+
+msgid "a bookmark cannot have the name of an existing branch"
+msgstr "既存ブランチと同名のブックマークは作成できません"
+
+#, python-format
+msgid ""
+"bookmark %s matches a changeset hash\n"
+"(did you leave a -r out of an 'hg bookmark' command?)\n"
+msgstr ""
+"ブックマーク %s は既存のリビジョン識別ハッシュ値と合致します。\n"
+"('hg bookmark' 実行時に -r オプションを忘れていませんか？)\n"
+
+#, python-format
 msgid "updating to active bookmark %s\n"
 msgstr "アクティブなブックマーク %s への更新中\n"
 
+msgid "bad bookmark stream"
+msgstr "不正なブックマーク stream"
+
 #, python-format
 msgid "adding remote bookmark %s\n"
 msgstr "連携先での新規ブックマーク %s を追加中\n"
@@ -11070,6 +13088,20 b' msgstr "\xe5\xa4\x89\xe6\x9b\xb4\xe3\x81\x95\xe3\x82\x8c\xe3\x81\x9f\xe3\x83\x96\xe3\x83\x83\xe3\x82\xaf\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xaf\xe3\x81\xaf\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93\\n"'
 msgid "deleted"
 msgstr "削除"
 
+msgid "bookmark names cannot consist entirely of whitespace"
+msgstr "空白文字だけで構成されたブックマーク名は不正です"
+
+#, python-format
+msgid "bookmark '%s' does not exist"
+msgstr "ブックマーク '%s' は存在しません"
+
+#, python-format
+msgid "bookmarking hidden changeset %s\n"
+msgstr "不可視リビジョン %s へのブックマーク設定\n"
+
+msgid "no bookmarks set\n"
+msgstr "ブックマークは存在しません\n"
+
 msgid "not a Mercurial bundle"
 msgstr "Mercurial のバンドル形式ではありません"
 
@@ -11077,14 +13109,26 b' msgstr "Mercurial \xe3\x81\xae\xe3\x83\x90\xe3\x83\xb3\xe3\x83\x89\xe3\x83\xab\xe5\xbd\xa2\xe5\xbc\x8f\xe3\x81\xa7\xe3\x81\xaf\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"'
 msgid "unknown bundle version %s"
 msgstr "未知のバンドル形式バージョン %s"
 
+#, python-format
+msgid "stream ended unexpectedly  (got %d bytes, expected %d)"
+msgstr "想定外のデータ終端 (実データ:%d バイト 期待データ:%d バイト)"
+
 msgid "Seek failed\n"
 msgstr "seek に失敗しました\n"
 
 msgid "File pointer is not seekable"
 msgstr "対象ファイルは seek できません"
 
+msgid "stream data requested but server does not allow this feature"
+msgstr ""
+
+msgid ""
+"well-behaved clients should not be requesting stream data from servers not "
+"advertising it; the client may be buggy"
+msgstr ""
+
 msgid "old bundle types only supports v1 changegroups"
-msgstr "旧来の bundle 形式で使用できるのは v1 changegroups のみです"
+msgstr "旧来のバンドル形式で使用できるのは v1 changegroups のみです"
 
 #, python-format
 msgid "unknown stream compression type: %s"
@@ -11133,19 +13177,26 b' msgstr "\xe5\xb1\xa5\xe6\xad\xb4\xe5\x8f\x8d\xe6\x98\xa0\xe3\x81\xab\xe5\xa4\xb1\xe6\x95\x97:"'
 msgid "%i new obsolescence markers\n"
 msgstr "%i 個の新規廃止情報マーカ\n"
 
+msgid "cannot apply stream clone to non empty repository"
+msgstr "stream clone bundle での複製は、空リポジトリにしか適用できません"
+
 msgid "unknown parent"
 msgstr "未知の親"
 
 msgid "unknown delta base"
 msgstr "未知の差分ベース"
 
+msgid "No changegroups found"
+msgstr "変更内容が含まれていません"
+
+#, python-format
+msgid "bundle type %s cannot be read"
+msgstr "バンドル形式 %s は読み込めません"
+
 #, python-format
 msgid "Unsupported changegroup version: %s"
 msgstr "未サポートなバンドルファイルバージョンです: %s"
 
-msgid "No changegroups found"
-msgstr "変更内容が含まれていません"
-
 #, python-format
 msgid "setting parent to node %s that only exists in the bundle\n"
 msgstr "バンドル中にのみ存在するリビジョン %s が更新先として指定されました\n"
@@ -11154,10 +13205,6 b' msgid "cannot create new bundle reposito'
 msgstr "バンドルリポジトリの新規作成はできません"
 
 #, python-format
-msgid "stream ended unexpectedly (got %d bytes, expected %d)"
-msgstr "想定外のデータ終端 (実データ:%d バイト 期待データ:%d バイト)"
-
-#, python-format
 msgid "invalid chunk length %d"
 msgstr "不正なデータ長: %d"
 
@@ -11170,9 +13217,6 b' msgstr "\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x82\x92\xe8\xbf\xbd\xe5\x8a\xa0\xe4\xb8\xad\\n"'
 msgid "chunks"
 msgstr "チャンク"
 
-msgid "received changelog group is empty"
-msgstr "受信した変更履歴は空です"
-
 msgid "adding manifests\n"
 msgstr "マニフェストを追加中\n"
 
@@ -11193,20 +13237,13 b' msgstr "\xe3\x83\x87\xe3\x82\xa3\xe3\x83\xac\xe3\x82\xaf\xe3\x83\x88\xe3\x83\xaa\xe3\x81\xae\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x83\xad\xe3\x82\xb0\xe3\x81\x8c\xe7\xa9\xba\xe3\x81\xa7\xe3\x81\x99"'
 msgid "bundling"
 msgstr "バンドル生成中"
 
-msgid "uncompressed size of bundle content:\n"
-msgstr "バンドルファイル内容の非圧縮サイズ:\n"
-
-#, python-format
-msgid "%8.i (changelog)\n"
-msgstr "%8.i (履歴情報)\n"
-
 #, python-format
 msgid "%8.i (manifests)\n"
 msgstr "%8.i (マニフェスト)\n"
 
 #, python-format
-msgid "empty or missing revlog for %s"
-msgstr "%s に対するリビジョンログが空または不在です"
+msgid "empty or missing file data for %s"
+msgstr "ファイル %s に対する履歴情報が空または不在です"
 
 #, python-format
 msgid "%8.i  %s\n"
@@ -11236,8 +13273,8 b' msgstr "\xe6\x8c\x87\xe5\xae\x9a\xe5\xaf\xbe\xe8\xb1\xa1\xe3\x81\xaf\xe3\x83\x95\xe3\x82\xa3\xe3\x83\xab\xe3\x82\xbf\xe3\x83\xaa\xe3\x83\xb3\xe3\x82\xb0\xe5\xaf\xbe\xe8\xb1\xa1\xe3\x81\xa7\xe3\x81\x99"'
 msgid "empty username"
 msgstr "ユーザ名が空です"
 
-#, python-format
-msgid "username %s contains a newline"
+#, fuzzy, python-format
+msgid "username %r contains a newline"
 msgstr "ユーザ名 %s が改行を含んでいます"
 
 #, python-format
@@ -11251,6 +13288,114 b' msgstr "\xe4\xb8\x8d\xe6\xad\xa3\xe3\x81\xaa\xe5\xbf\x9c\xe7\xad\x94"'
 msgid "unexpected command: %s"
 msgstr "想定外のコマンド: %s"
 
+msgid "do not perform actions, just print output"
+msgstr "実施予定の処理内容の表示のみで処理実施は抑止"
+
+msgid "ask before applying actions"
+msgstr "処理実施前に確認を実施"
+
+msgid "specify ssh command to use"
+msgstr "SSH 連携で使用する ssh コマンド"
+
+msgid "specify hg command to run on the remote side"
+msgstr "遠隔ホスト側で実行される hg コマンド"
+
+msgid "do not verify server certificate (ignoring web.cacerts config)"
+msgstr "接続先証明書の検証省略(web.cacerts 設定の無視)"
+
+msgid "PATTERN"
+msgstr "パターン"
+
+msgid "include names matching the given patterns"
+msgstr "パターンに合致したファイルを処理対象に追加"
+
+msgid "exclude names matching the given patterns"
+msgstr "パターンに合致したファイルを処理対象から除外"
+
+msgid "read commit message from file"
+msgstr "コミットログをファイルから読み込み"
+
+msgid "record the specified date as commit date"
+msgstr "指定日時をコミット日時として記録"
+
+msgid "record the specified user as committer"
+msgstr "指定ユーザをコミットユーザとして記録"
+
+msgid "display with template (EXPERIMENTAL)"
+msgstr "当該テンプレートで表示をカスタマイズ (実験的実装)"
+
+msgid "STYLE"
+msgstr "スタイル"
+
+msgid "display using template map file (DEPRECATED)"
+msgstr "当該スタイルで表示をカスタマイズ (非推奨)"
+
+msgid "display with template"
+msgstr "当該テンプレートで表示をカスタマイズ"
+
+msgid "do not show merges"
+msgstr "マージ実施リビジョンの表示抑止"
+
+msgid "show the revision DAG"
+msgstr "履歴ツリーの表示"
+
+msgid "treat all files as text"
+msgstr "全ファイルをテキストファイルと仮定"
+
+msgid "generate binary diffs in git mode (default)"
+msgstr "git モード時にバイナリ差分を生成 (デフォルト挙動)"
+
+msgid "omit dates from diff headers"
+msgstr "差分表示の際に日付情報の表示を抑止"
+
+msgid "ignore white space when comparing lines"
+msgstr "差分判定の際に空白文字を無視"
+
+msgid "ignore changes in the amount of white space"
+msgstr "差分判定の際に空白文字の数を無視"
+
+msgid "ignore changes whose lines are all blank"
+msgstr "差分判定の際に空白行を無視"
+
+msgid "ignore changes in whitespace at EOL"
+msgstr "行末空白文字における変更を無視"
+
+msgid "omit a/ and b/ prefixes from filenames"
+msgstr "ファイル名の接頭辞 a/ と b/ の省略"
+
+msgid "show which function each change is in"
+msgstr "差分表示の際に関数名情報を表示"
+
+msgid "produce a diff that undoes the changes"
+msgstr "変更を取り消すための差分を生成"
+
+msgid "number of lines of context to show"
+msgstr "差分コンテキストの行数"
+
+msgid "DIR"
+msgstr "ディレクトリ"
+
+msgid "produce diffs relative to subdirectory"
+msgstr "差分生成の起点ディレクトリ指定"
+
+msgid "SIMILARITY"
+msgstr "類似度"
+
+msgid "guess renamed files by similarity (0<=s<=100)"
+msgstr "ファイル改名推定の際の類似度(0 以上 100 以下)"
+
+msgid "recurse into subrepositories"
+msgstr "サブリポジトリへの再帰的適用"
+
+msgid "open changelog"
+msgstr "変更履歴の読み込み"
+
+msgid "open manifest"
+msgstr "マニフェストの読み込み"
+
+msgid "open directory manifest"
+msgstr "ディレクトリマニフェストの読み込み"
+
 msgid "running non-interactively"
 msgstr "非対話的な実行中"
 
@@ -11264,6 +13409,64 b' msgstr "\xe3\x83\x91\xe3\x83\x83\xe3\x83\x81\xe8\xa7\xa3\xe6\x9e\x90\xe3\x81\xab\xe5\xa4\xb1\xe6\x95\x97: %s"'
 msgid "no changes to record\n"
 msgstr "記録可能な変更がありません\n"
 
+#, python-format
+msgid "'%s' not recognized"
+msgstr "'%s' は未知です"
+
+#, python-format
+msgid "Unresolved merge conflicts:"
+msgstr "マージにおける未解消の衝突"
+
+#, python-format
+msgid "To mark files as resolved:  hg resolve --mark FILE"
+msgstr "衝突解消済み状態に設定: hg resolve --mark 対象ファイル"
+
+msgid "No unresolved merge conflicts."
+msgstr "マージでの衝突は全て解消済みです。"
+
+#, python-format
+msgid ""
+"To continue:                %s\n"
+"To abort:                   %s"
+msgstr ""
+"処理を継続:                 %s\n"
+"途中成果を破棄:             %s"
+
+msgid "warning: this will discard uncommitted changes"
+msgstr "警告: 作業領域中の未コミット成果が破棄されます"
+
+msgid ""
+"To mark the changeset good:    hg bisect --good\n"
+"To mark the changeset bad:     hg bisect --bad\n"
+"To abort:                      hg bisect --reset\n"
+msgstr ""
+"リビジョンを good でマーキング: hg bisect --good\n"
+"リビジョンを bad でマーキング:  hg bisect --bad\n"
+"bisect を中断:                  hg bisect --reset\n"
+
+#, python-format
+msgid "The repository is in an unfinished *%s* state."
+msgstr "リポジトリは *%s* 処理が未完了です。"
+
+msgid "cannot change branch of non-linear revisions"
+msgstr "非直線な履歴群のブランチ名は変更できません"
+
+msgid "a branch of the same name already exists"
+msgstr "同じ名前のブランチがすでに存在します"
+
+msgid "cannot change branch of a merge commit"
+msgstr "マージ実施リビジョンのブランチ名は変更できません"
+
+msgid "cannot change branch of a obsolete changeset"
+msgstr "廃止 (obsolete) リビジョンのブランチ名は変更できません"
+
+msgid "cannot change branch in middle of a stack"
+msgstr "中間リビジョンだけのブランチ名変更はできません"
+
+#, python-format
+msgid "changed branch on %d changesets\n"
+msgstr "%d 個のリビジョンのブランチ名を変更\n"
+
 msgid "options --message and --logfile are mutually exclusive"
 msgstr "--message と --logfile は同時に指定できません"
 
@@ -11271,11 +13474,8 b' msgstr "--message \xe3\x81\xa8 --logfile \xe3\x81\xaf\xe5\x90\x8c\xe6\x99\x82\xe3\x81\xab\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"'
 msgid "can't read commit message '%s': %s"
 msgstr "コミットログ '%s' が読み込めません: %s"
 
-msgid "limit must be a positive integer"
-msgstr "制限には正数を指定してください"
-
-msgid "limit must be positive"
-msgstr "制限には正数を指定してください"
+msgid "incomplete format spec in output filename"
+msgstr "出力ファイル名に不正なフォーマット指定"
 
 #, python-format
 msgid "invalid format spec '%%%s' in output filename"
@@ -11406,85 +13606,6 b' msgid "created %s"'
 msgstr "%s を作成"
 
 #, python-format
-msgid "warning: %s not inside relative root %s\n"
-msgstr "警告: %s は相対ルート %s の範囲外です\n"
-
-#. i18n: column positioning for "hg log"
-#, python-format
-msgid "changeset:   %d:%s\n"
-msgstr "リビジョン:   %d:%s\n"
-
-#. i18n: column positioning for "hg log"
-#, python-format
-msgid "branch:      %s\n"
-msgstr "ブランチ:     %s\n"
-
-#. i18n: column positioning for "hg log"
-#, python-format
-msgid "phase:       %s\n"
-msgstr "フェーズ:     %s\n"
-
-#. i18n: column positioning for "hg log"
-#, python-format
-msgid "parent:      %d:%s\n"
-msgstr "親リビジョン: %d:%s\n"
-
-#. i18n: column positioning for "hg log"
-#, python-format
-msgid "manifest:    %d:%s\n"
-msgstr "manifest参照: %d:%s\n"
-
-#. i18n: column positioning for "hg log"
-#, python-format
-msgid "user:        %s\n"
-msgstr "ユーザ:       %s\n"
-
-#. i18n: column positioning for "hg log"
-#, python-format
-msgid "date:        %s\n"
-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 "ファイル:    "
-
-#. i18n: column positioning for "hg log"
-msgid "files+:"
-msgstr "ファイル追加:"
-
-#. i18n: column positioning for "hg log"
-msgid "files-:"
-msgstr "ファイル削除:"
-
-#. i18n: column positioning for "hg log"
-#, python-format
-msgid "files:       %s\n"
-msgstr "ファイル:     %s\n"
-
-#. i18n: column positioning for "hg log"
-#, python-format
-msgid "copies:      %s\n"
-msgstr "コピー:       %s\n"
-
-#. i18n: column positioning for "hg log"
-#, python-format
-msgid "extra:       %s=%s\n"
-msgstr "その他:       %s=%s\n"
-
-msgid "description:\n"
-msgstr "説明:\n"
-
-#. i18n: column positioning for "hg log"
-#, python-format
-msgid "summary:     %s\n"
-msgstr "要約:         %s\n"
-
-#, python-format
 msgid "found revision %s from %s\n"
 msgstr "リビジョン %s (%s) が指定日時に合致します\n"
 
@@ -11503,10 +13624,6 b' msgid "can only follow copies/renames fo'
 msgstr "ファイル名が明示された場合のみ複製/改名を追跡可能です"
 
 #, python-format
-msgid "-G/--graph option is incompatible with --%s"
-msgstr "-G/--graph と --%s は併用できません"
-
-#, python-format
 msgid "adding %s\n"
 msgstr "%s を追加登録中\n"
 
@@ -11514,6 +13631,21 b' msgstr "%s \xe3\x82\x92\xe8\xbf\xbd\xe5\x8a\xa0\xe7\x99\xbb\xe9\x8c\xb2\xe4\xb8\xad\\n"'
 msgid "skipping missing subrepository: %s\n"
 msgstr "存在しないサブリポジトリへの処理を省略: %s\n"
 
+msgid "cannot specify both --dry-run and --interactive"
+msgstr "--dry-run と --interactive は併用できません"
+
+msgid ""
+"[Ynsa?]$$ &Yes, forget this file$$ &No, skip this file$$ &Skip remaining "
+"files$$ Include &all remaining files$$ &? (display help)"
+msgstr ""
+"[Ynsa?]$$ このファイルを登録除外 (&yes)$$ このファイルは無視 (&no)$$残りの"
+"ファイルを全て無視 (&skip)$$ 残りのファイルを全て登録除外 (&all)$$ヘルプ表示"
+"(&?)"
+
+#, python-format
+msgid "forget %s %s"
+msgstr "%s の登録除外 %s"
+
 msgid "searching"
 msgstr "検索中"
 
@@ -11551,14 +13683,6 b' msgstr "\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3 %s \xe3\x82\x92\xe6\x94\xb9\xe5\xa4\x89\xe4\xb8\xad\\n"'
 msgid "copying changeset %s to %s\n"
 msgstr "リビジョン %s を %s にコピー中\n"
 
-#, python-format
-msgid "stripping intermediate changeset %s\n"
-msgstr "中途リビジョン %s を除外中\n"
-
-#, python-format
-msgid "stripping amended changeset %s\n"
-msgstr "改変対象リビジョン %s を除外中\n"
-
 msgid "Leave message empty to abort commit."
 msgstr "メッセージが空のままならコミットを中止します。"
 
@@ -11685,9 +13809,6 b' msgstr "\xe6\x9c\xaa\xe7\x9f\xa5\xe3\x81\xae\xe8\x89\xb2/\xe5\x8a\xb9\xe6\x9e\x9c\xe6\x8c\x87\xe5\xae\x9a %r \xe3\x82\x92\xe7\x84\xa1\xe8\xa6\x96(color.%s \xe3\x81\xa7\xe8\xa8\xad\xe5\xae\x9a\xe8\xa8\x98\xe8\xbf\xb0)\\n"'
 msgid "repository root directory or name of overlay bundle file"
 msgstr "リポジトリのルート位置、 またはバンドルファイルのパス"
 
-msgid "DIR"
-msgstr "ディレクトリ"
-
 msgid "change working directory"
 msgstr "作業領域の変更"
 
@@ -11750,108 +13871,6 b' msgstr "\xe4\xb8\x8d\xe5\x8f\xaf\xe8\xa6\x96\xe7\x8a\xb6\xe6\x85\x8b\xe3\x81\xae\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x82\x82\xe5\xaf\xbe\xe8\xb1\xa1\xe3\x81\xab\xe5\x90\xab\xe3\x82\x81\xe3\x82\x8b"'
 msgid "when to paginate (boolean, always, auto, or never)"
 msgstr "ページャの要否 (真偽値、 always auto または never)"
 
-msgid "do not perform actions, just print output"
-msgstr "実施予定の処理内容の表示のみで処理実施は抑止"
-
-msgid "specify ssh command to use"
-msgstr "SSH 連携で使用する ssh コマンド"
-
-msgid "specify hg command to run on the remote side"
-msgstr "遠隔ホスト側で実行される hg コマンド"
-
-msgid "do not verify server certificate (ignoring web.cacerts config)"
-msgstr "接続先証明書の検証省略(web.cacerts 設定の無視)"
-
-msgid "PATTERN"
-msgstr "パターン"
-
-msgid "include names matching the given patterns"
-msgstr "パターンに合致したファイルを処理対象に追加"
-
-msgid "exclude names matching the given patterns"
-msgstr "パターンに合致したファイルを処理対象から除外"
-
-msgid "read commit message from file"
-msgstr "コミットログをファイルから読み込み"
-
-msgid "record the specified date as commit date"
-msgstr "指定日時をコミット日時として記録"
-
-msgid "record the specified user as committer"
-msgstr "指定ユーザをコミットユーザとして記録"
-
-msgid "display with template (EXPERIMENTAL)"
-msgstr "当該テンプレートで表示をカスタマイズ (実験的実装)"
-
-msgid "STYLE"
-msgstr "スタイル"
-
-msgid "display using template map file (DEPRECATED)"
-msgstr "当該スタイルで表示をカスタマイズ (非推奨)"
-
-msgid "display with template"
-msgstr "当該テンプレートで表示をカスタマイズ"
-
-msgid "do not show merges"
-msgstr "マージ実施リビジョンの表示抑止"
-
-msgid "show the revision DAG"
-msgstr "履歴ツリーの表示"
-
-msgid "treat all files as text"
-msgstr "全ファイルをテキストファイルと仮定"
-
-msgid "generate binary diffs in git mode (default)"
-msgstr "git モード時にバイナリ差分を生成 (デフォルト挙動)"
-
-msgid "omit dates from diff headers"
-msgstr "差分表示の際に日付情報の表示を抑止"
-
-msgid "ignore white space when comparing lines"
-msgstr "差分判定の際に空白文字を無視"
-
-msgid "ignore changes in the amount of white space"
-msgstr "差分判定の際に空白文字の数を無視"
-
-msgid "ignore changes whose lines are all blank"
-msgstr "差分判定の際に空白行を無視"
-
-msgid "omit a/ and b/ prefixes from filenames"
-msgstr "ファイル名の接頭辞 a/ と b/ の省略"
-
-msgid "show which function each change is in"
-msgstr "差分表示の際に関数名情報を表示"
-
-msgid "produce a diff that undoes the changes"
-msgstr "変更を取り消すための差分を生成"
-
-msgid "number of lines of context to show"
-msgstr "差分コンテキストの行数"
-
-msgid "produce diffs relative to subdirectory"
-msgstr "差分生成の起点ディレクトリ指定"
-
-msgid "SIMILARITY"
-msgstr "類似度"
-
-msgid "guess renamed files by similarity (0<=s<=100)"
-msgstr "ファイル改名推定の際の類似度(0 以上 100 以下)"
-
-msgid "recurse into subrepositories"
-msgstr "サブリポジトリへの再帰的適用"
-
-msgid "open changelog"
-msgstr "変更履歴の読み込み"
-
-msgid "open manifest"
-msgstr "マニフェストの読み込み"
-
-msgid "open directory manifest"
-msgstr "ディレクトリマニフェストの読み込み"
-
-msgid "[OPTION]... [FILE]..."
-msgstr "[OPTION]... [FILE]..."
-
 msgid "add the specified files on the next commit"
 msgstr "指定ファイルの追加登録予約"
 
@@ -12043,9 +14062,6 b' msgstr ""'
 "               foobar.c\n"
 "             r foobar.c"
 
-msgid "similarity must be a number"
-msgstr "類似度には数値を指定してください"
-
 msgid "annotate the specified revision"
 msgstr "当該リビジョン時点での由来情報を表示"
 
@@ -12073,6 +14089,9 b' msgstr "\xe3\x83\x8f\xe3\x83\x83\xe3\x82\xb7\xe3\x83\xa5\xe5\x80\xa4\xe3\x82\x92\xe8\xa1\xa8\xe7\xa4\xba"'
 msgid "show line number at the first appearance"
 msgstr "由来リビジョンでの初出時の行番号を表示"
 
+msgid "revision to not display (EXPERIMENTAL)"
+msgstr "非表示リビジョン (実験的実装)"
+
 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
 msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
 
@@ -12545,6 +14564,10 b' msgstr "(\'hg bisect <cmd>\' \xe5\xbd\xa2\xe5\xbc\x8f\xe3\x81\xae\xe5\xae\x9f\xe8\xa1\x8c\xe3\x81\xaf\xe9\x9d\x9e\xe6\x8e\xa8\xe5\xa5\xa8\xe3\x81\xa7\xe3\x81\x99)\\n"'
 msgid "incompatible arguments"
 msgstr "不正な引数の組み合わせです"
 
+#, python-format
+msgid "%s and %s are incompatible"
+msgstr "%s と %s は併用できません"
+
 msgid "current bisect revision is unknown - start a new bisect to fix"
 msgstr "未知のリビジョンが検証対象です - 探索を最初からやり直してください"
 
@@ -12637,6 +14660,13 b' msgstr ""'
 "    履歴の分岐は :hg:`merge` で解消してください。"
 
 msgid ""
+"    Specifying bookmark as '.' to -m or -d options is equivalent to "
+"specifying\n"
+"    the active bookmark's name."
+msgstr ""
+"    オプション -m/-d での '.' 指定は、 アクティブブックマーク指定と等価です"
+
+msgid ""
 "    A bookmark named '@' has the special property that :hg:`clone` will\n"
 "    check it out by default if it exists."
 msgstr ""
@@ -12677,20 +14707,6 b' msgstr ""'
 "          hg book -f @\n"
 "    "
 
-msgid "bookmark names cannot consist entirely of whitespace"
-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 を指定)"
-
-msgid "a bookmark cannot have the name of an existing branch"
-msgstr "既存ブランチと同名のブックマークは作成できません"
-
 msgid "--delete and --rename are incompatible"
 msgstr "--delete と --rename は併用できません"
 
@@ -12703,19 +14719,12 b' msgstr "--rev \xe3\x81\xa8 --rename \xe3\x81\xaf\xe4\xbd\xb5\xe7\x94\xa8\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"'
 msgid "bookmark name required"
 msgstr "ブックマーク名指定が必要です"
 
-#, python-format
-msgid "bookmark '%s' does not exist"
-msgstr "ブックマーク '%s' は存在しません"
-
 msgid "new bookmark name required"
 msgstr "新しいブックマーク名が必要です"
 
 msgid "only one new bookmark name allowed"
 msgstr "新規ブックマーク名の指定は1つだけです"
 
-msgid "no bookmarks set\n"
-msgstr "ブックマークは存在しません\n"
-
 msgid "no active bookmark\n"
 msgstr "アクティブなブックマークがありません\n"
 
@@ -12725,6 +14734,9 b' msgstr "\xe5\x90\x8c\xe5\x90\x8d\xe6\x97\xa2\xe5\xad\x98\xe3\x83\x96\xe3\x83\xa9\xe3\x83\xb3\xe3\x83\x81\xe3\x81\x8c\xe5\xad\x98\xe5\x9c\xa8\xe3\x81\x99\xe3\x82\x8b\xe5\xa0\xb4\xe5\x90\x88\xe3\x81\xa7\xe3\x82\x82\xe3\x83\x96\xe3\x83\xa9\xe3\x83\xb3\xe3\x83\x81\xe4\xbd\x9c\xe6\x88\x90\xe3\x82\x92\xe5\xae\x9f\xe6\x96\xbd"'
 msgid "reset branch name to parent branch name"
 msgstr "ブランチ名設定を解消し、 親リビジョンのブランチに戻る"
 
+msgid "change branches of the given revs (EXPERIMENTAL)"
+msgstr "指定リビジョンのブランチを変更 (実験的実装)"
+
 msgid "[-fC] [NAME]"
 msgstr "[-fC] [NAME]"
 
@@ -12779,13 +14791,13 b' msgstr ""'
 "    現ブランチヘッドの閉鎖には :hg:`commit --close-branch` を使用します。\n"
 "    全ブランチヘッドの閉鎖をもって、 当該ブランチの閉鎖とみなします。"
 
+msgid "no branch name specified for the revisions"
+msgstr "指定リビジョンに対するブランチ名指定がありません"
+
 #, python-format
 msgid "reset working directory to branch %s\n"
 msgstr "作業領域のブランチを %s にリセット\n"
 
-msgid "a branch of the same name already exists"
-msgstr "同じ名前のブランチがすでに存在します"
-
 #. i18n: "it" refers to an existing branch
 msgid "use 'hg update' to switch to it"
 msgstr "作業領域を既存ブランチに切り替えるには 'hg update' を使用してください"
@@ -12856,7 +14868,9 b' msgstr "[-f] [-t BUNDLESPEC] [-a] [-r RE'
 msgid "create a bundle file"
 msgstr "バンドルファイルの生成"
 
-msgid "    Generate a bundle file containing data to be added to a repository."
+msgid ""
+"    Generate a bundle file containing data to be transferred to another\n"
+"    repository."
 msgstr ""
 "    連携対象リポジトリに無い履歴情報を、 バンドルファイルに書き出します。"
 
@@ -12865,7 +14879,8 b' msgid ""'
 "    (or --base null). Otherwise, hg assumes the destination will have\n"
 "    all the nodes you specify with --base parameters. Otherwise, hg\n"
 "    will assume the repository has all the nodes in destination, or\n"
-"    default-push/default if no destination is specified."
+"    default-push/default if no destination is specified, where destination\n"
+"    is the repository you provide through DEST option."
 msgstr ""
 "    -a/--all (又は --base null) 指定がある場合、 バンドルファイルには、\n"
 "    リポジトリの全ての履歴が書き出されます。 明示的な --base 指定の場合、\n"
@@ -12957,10 +14972,13 b' msgstr ""'
 
 msgid ""
 "    Output may be to a file, in which case the name of the file is\n"
-"    given using a format string. The formatting rules as follows:"
-msgstr ""
-"    出力先指定(置換指定可能)がある場合、 出力はファイルに保存されます。\n"
-"    置換指定として以下のものが使用可能です:"
+"    given using a template string. See :hg:`help templates`. In addition\n"
+"    to the common template keywords, the following formatting rules are\n"
+"    supported:"
+msgstr ""
+"    出力先指定には、 テンプレート文字列を使用可能です。 詳細は\n"
+"    :hg:`help templates` を参照してください。\n"
+"    標準テンプレートキーワードに加えて、 以下のものも使用可能です:"
 
 msgid ""
 "    :``%%``: literal \"%\" character\n"
@@ -12971,7 +14989,8 b' msgid ""'
 "    :``%R``: changeset revision number\n"
 "    :``%h``: short-form changeset hash (12 hexadecimal digits)\n"
 "    :``%r``: zero-padded changeset revision number\n"
-"    :``%b``: basename of the exporting repository"
+"    :``%b``: basename of the exporting repository\n"
+"    :``\\``: literal \"\\\" character"
 msgstr ""
 "    :``%%``: \"%\" 文字そのもの\n"
 "    :``%s``: 対象ファイルパスの末尾要素\n"
@@ -12981,7 +15000,8 b' msgstr ""'
 "    :``%R``: リビジョン番号\n"
 "    :``%h``: 短縮形式ハッシュ値(12 桁 16 進数)\n"
 "    :``%r``: ゼロ詰めのリビジョン番号\n"
-"    :``%b``: 対象リポジトリパスの末尾要素"
+"    :``%b``: 対象リポジトリパスの末尾要素\n"
+"    :``\\``: \"\\\" 文字そのもの"
 
 msgid "the clone will include an empty working directory (only a repository)"
 msgstr "複製先の作業領域を空にする(管理領域のみの複製)"
@@ -12989,11 +15009,19 b' msgstr "\xe8\xa4\x87\xe8\xa3\xbd\xe5\x85\x88\xe3\x81\xae\xe4\xbd\x9c\xe6\xa5\xad\xe9\xa0\x98\xe5\x9f\x9f\xe3\x82\x92\xe7\xa9\xba\xe3\x81\xab\xe3\x81\x99\xe3\x82\x8b(\xe7\xae\xa1\xe7\x90\x86\xe9\xa0\x98\xe5\x9f\x9f\xe3\x81\xae\xe3\x81\xbf\xe3\x81\xae\xe8\xa4\x87\xe8\xa3\xbd)"'
 msgid "revision, tag, or branch to check out"
 msgstr "作業領域更新用リビジョン(タグ名／ブランチ名指定可)"
 
-msgid "include the specified changeset"
-msgstr "複製対象に含めるリビジョン"
-
-msgid "clone only the specified branch"
-msgstr "指定ブランチのみを複製"
+msgid "do not clone everything, but include this changeset and its ancestors"
+msgstr "指定リビジョンとその祖先のみを複製"
+
+msgid ""
+"do not clone everything, but include this branch's changesets and their "
+"ancestors"
+msgstr "指定ブランチ中のリビジョンとその祖先のみを複製"
+
+msgid "an alias to --stream (DEPRECATED)"
+msgstr "--stream の別名 (非推奨)"
+
+msgid "clone with minimal data processing"
+msgstr "最小限のデータ処理のみでの複製"
 
 msgid "[OPTION]... SOURCE [DEST]"
 msgstr "[OPTION]... SOURCE [DEST]"
@@ -13055,6 +15083,29 b' msgstr ""'
 "    同様に振舞います。"
 
 msgid ""
+"    In normal clone mode, the remote normalizes repository data into a "
+"common\n"
+"    exchange format and the receiving end translates this data into its "
+"local\n"
+"    storage format. --stream activates a different clone mode that "
+"essentially\n"
+"    copies repository files from the remote with minimal data processing. "
+"This\n"
+"    significantly reduces the CPU cost of a clone both remotely and "
+"locally.\n"
+"    However, it often increases the transferred data size by 30-40%. This "
+"can\n"
+"    result in substantially faster clones where I/O throughput is "
+"plentiful,\n"
+"    especially for larger repositories. A side-effect of --stream clones is\n"
+"    that storage settings and requirements on the remote are applied "
+"locally:\n"
+"    a modern client may inherit legacy or inefficient storage used by the\n"
+"    remote or a legacy Mercurial client may not be able to clone from a\n"
+"    modern Mercurial remote."
+msgstr ""
+
+msgid ""
 "       Specifying a tag will include the tagged changeset but not the\n"
 "       changeset containing the tag."
 msgstr ""
@@ -13077,32 +15128,6 b' msgstr ""'
 "      を指定することで、 ハードリンク使用を抑止してください。"
 
 msgid ""
-"      In some cases, you can clone repositories and the working\n"
-"      directory using full hardlinks with ::"
-msgstr ""
-"      リポジトリの内部管理データと作業領域中のファイル全てに対する、\n"
-"      ハードリンクによる複製の作成には、 以下の方法が使えるかも知れません::"
-
-msgid "        $ cp -al REPO REPOCLONE"
-msgstr "        $ cp -al REPO REPOCLONE"
-
-msgid ""
-"      This is the fastest way to clone, but it is not always safe. The\n"
-"      operation is not atomic (making sure REPO is not modified during\n"
-"      the operation is up to you) and you have to make sure your\n"
-"      editor breaks hardlinks (Emacs and most Linux Kernel tools do\n"
-"      so). Also, this is not compatible with certain extensions that\n"
-"      place their metadata under the .hg directory, such as mq."
-msgstr ""
-"      この方法は最速の複製方法かもしれませんが、 常に安全とは限りません。\n"
-"      操作の単一性は保障されません (複製中のリポジトリの変更防止は、 \n"
-"      利用者責務) し、 利用するエディタのファイル変更時の振る舞いが、\n"
-"      ハードリンクを破棄するものである必要があります (Emacs および多くの\n"
-"      Linux 系ツールは、 そのように振舞います)。 この制約は、\n"
-"      MQ エクステンションのように、 .hg ディレクトリ配下に、\n"
-"      管理情報を格納するツールとは相容れません。"
-
-msgid ""
 "      Mercurial will update the working directory to the first applicable\n"
 "      revision from this list:"
 msgstr ""
@@ -13136,19 +15161,19 b' msgstr ""'
 
 msgid ""
 "      When cloning from servers that support it, Mercurial may fetch\n"
-"      pre-generated data from a server-advertised URL. When this is done,\n"
-"      hooks operating on incoming changesets and changegroups may fire "
-"twice,\n"
-"      once for the bundle fetched from the URL and another for any "
-"additional\n"
-"      data not fetched from this URL. In addition, if an error occurs, the\n"
-"      repository may be rolled back to a partial clone. This behavior may\n"
-"      change in future releases. See :hg:`help -e clonebundles` for more."
+"      pre-generated data from a server-advertised URL or inline from the\n"
+"      same stream. When this is done, hooks operating on incoming "
+"changesets\n"
+"      and changegroups may fire more than once, once for each pre-generated\n"
+"      bundle and as well as for any additional remaining data. In addition,\n"
+"      if an error occurs, the repository may be rolled back to a partial\n"
+"      clone. This behavior may change in future releases.\n"
+"      See :hg:`help -e clonebundles` for more."
 msgstr ""
 "      サーバ経由で複製した場合、 サーバ側で事前に作成されたデータを元に、\n"
-"      複製を行う可能性があります (サーバ側設定次第)。 そのような場合は、\n"
-"      incoming, changegroup 系フックが、 事前作成データの取り込みで一度、\n"
-"      追加履歴の取り込みでもう一度、 合計二度実行されることになります。\n"
+"      複製を行う可能性があります (サーバ側設定次第)。 そのような場合、\n"
+"      incoming, changegroups 系フックが、 事前作成データに対して一度、\n"
+"      残りの履歴情報に対してもう一度、 合計二度実行されることになります。\n"
 "      また、 エラーでの複製中断時も、 複製先に履歴が残る可能性があります。\n"
 "      この挙動は将来変更されるかもしれません。\n"
 "      詳細は :hg:`help -e clonebundles` を参照してください。"
@@ -13172,13 +15197,11 b' msgstr " - SSH \xe6\x8e\xa5\xe7\xb6\x9a\xe5\x85\x88\xe3\x81\x8b\xe3\x82\x89\xe7\xb5\xb6\xe5\xaf\xbe\xe3\x83\x91\xe3\x82\xb9\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\xa7\xe8\xa4\x87\xe8\xa3\xbd (\xe3\x83\x80\xe3\x83\x96\xe3\x83\xab\xe3\x82\xb9\xe3\x83\xa9\xe3\x83\x83\xe3\x82\xb7\xe3\x83\xa5\xe3\x81\xab\xe6\xb3\xa8\xe6\x84\x8f)::"'
 msgid "          hg clone ssh://user@server//home/projects/alpha/"
 msgstr "          hg clone ssh://user@server//home/projects/alpha/"
 
-msgid ""
-"      - do a high-speed clone over a LAN while checking out a\n"
-"        specified version::"
-msgstr "      - LAN 経由での高速複製と、 特定リビジョンでの作業領域更新::"
-
-msgid "          hg clone --uncompressed http://server/repo -u 1.5"
-msgstr "          hg clone --uncompressed http://server/repo -u 1.5"
+msgid "      - do a streaming clone while checking out a specified version::"
+msgstr "      - stream 方式での複製と、 指定リビジョンでの作業領域更新::"
+
+msgid "          hg clone --stream http://server/repo -u 1.5"
+msgstr "          hg clone --stream http://server/repo -u 1.5"
 
 msgid ""
 "      - create a repository without changesets after a particular revision::"
@@ -13199,9 +15222,6 b' msgstr " URL \xe8\xa8\x98\xe8\xbf\xb0\xe3\x81\xae\xe8\xa9\xb3\xe7\xb4\xb0\xe3\x81\xaf :hg:`help urls` \xe3\x82\x92\xe5\x8f\x82\xe7\x85\xa7\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84\xe3\x80\x82"'
 msgid "cannot specify both --noupdate and --updaterev"
 msgstr "--noupdate と --updaterev は併用できません"
 
-msgid "mark new/missing files as added/removed before committing"
-msgstr "新規／不在ファイルを、コミット前に登録／除外対象化"
-
 msgid "mark a branch head as closed"
 msgstr "ブランチヘッドを閉鎖します"
 
@@ -13211,9 +15231,6 b' msgstr "\xe4\xbd\x9c\xe6\xa5\xad\xe9\xa0\x98\xe5\x9f\x9f\xe3\x81\xae\xe8\xa6\xaa\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xae\xe6\x94\xb9\xe5\xa4\x89"'
 msgid "use the secret phase for committing"
 msgstr "secret フェーズでコミット中"
 
-msgid "use interactive mode"
-msgstr "操作対象変更の対話的な選択"
-
 msgid "commit the specified files or all outstanding changes"
 msgstr "指定ファイルまたは全ての変更内容のリポジトリへの記録"
 
@@ -13329,15 +15346,6 b' msgstr "\xe9\x96\x89\xe9\x8e\x96\xe3\x81\xa7\xe3\x81\x8d\xe3\x82\x8b\xe3\x81\xae\xe3\x81\xaf\xe3\x83\x96\xe3\x83\xa9\xe3\x83\xb3\xe3\x83\x81\xe3\x83\x98\xe3\x83\x83\xe3\x83\x89\xe3\x81\xa0\xe3\x81\x91\xe3\x81\xa7\xe3\x81\x99"'
 msgid "cannot amend with ui.commitsubrepos enabled"
 msgstr "ui.commitsubrepos が有効になっている場合は --amend を使用できません"
 
-msgid "cannot amend public changesets"
-msgstr "public フェーズのリビジョンは改変できません"
-
-msgid "cannot amend while merging"
-msgstr "マージ実施中の作業領域では改変できません"
-
-msgid "cannot amend changeset with children"
-msgstr "子リビジョンを持つリビジョンは改変できません"
-
 msgid "show untrusted configuration options"
 msgstr "信頼できない設定項目も表示"
 
@@ -13369,10 +15377,10 b' msgstr ""'
 
 msgid ""
 "    With multiple arguments, print names and values of all config\n"
-"    items with matching section names."
-msgstr ""
-"    複数の引数が指定された場合、 それらをセクション名とみなし、 該当する\n"
-"    セクションの設定項目を全て表示します。"
+"    items with matching section names or section.names."
+msgstr ""
+"    複数の引数が指定された場合、 それらを ``セクション名`` または\n"
+"    ``セクション名.項目名`` とみなし、 該当する設定項目を全て表示します。"
 
 msgid ""
 "    With --edit, start an editor on the user-level config file. With\n"
@@ -13406,9 +15414,6 b' msgstr "\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x81\xae\xe5\xa4\x96\xe5\x81\xb4\xe3\x81\xa7\xe3\x81\xaf --local \xe3\x82\x92\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"'
 msgid "edit failed"
 msgstr "編集に失敗"
 
-msgid "only one config item permitted"
-msgstr "複数の設定項目指定は無効です"
-
 msgid "record a copy that has already occurred"
 msgstr "手動で複製済みのファイルに対して、 複製の旨を記録"
 
@@ -13454,6 +15459,21 b' msgstr ""'
 "    成功時のコマンドの終了値は 0、 エラー発生時は 1 です。\n"
 "    "
 
+msgid "[COMMAND]"
+msgstr "[COMMAND]"
+
+msgid "list all available commands and options"
+msgstr "利用可能な全コマンド／オプションの一覧表示"
+
+msgid "show the command options"
+msgstr "当該コマンドのオプション一覧の表示"
+
+msgid "[-o] CMD"
+msgstr "[-o] CMD"
+
+msgid "returns the completion list associated with the given command"
+msgstr "指定コマンドの補完用リストの取得"
+
 msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
 msgstr "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
 
@@ -13583,13 +15603,6 b' msgstr ""'
 "       当該リビジョンの第1親に固定されているためです。"
 
 msgid ""
-"    Output may be to a file, in which case the name of the file is\n"
-"    given using a format string. The formatting rules are as follows:"
-msgstr ""
-"    出力先指定(置換指定可能)がある場合、 出力はファイルに保存されます。\n"
-"    置換指定として以下のものが使用可能です:"
-
-msgid ""
 "    :``%%``: literal \"%\" character\n"
 "    :``%H``: changeset hash (40 hexadecimal digits)\n"
 "    :``%N``: number of patches being generated\n"
@@ -13599,17 +15612,19 b' msgid ""'
 "    :``%m``: first line of the commit message (only alphanumeric "
 "characters)\n"
 "    :``%n``: zero-padded sequence number, starting at 1\n"
-"    :``%r``: zero-padded changeset revision number"
+"    :``%r``: zero-padded changeset revision number\n"
+"    :``\\``: literal \"\\\" character"
 msgstr ""
 "    :``%%``: \"%\" 文字そのもの\n"
 "    :``%H``: ハッシュ値(40 桁 16 進数)\n"
-"    :``%N``: 生成されるファイルの総数\n"
+"    :``%N``: 生成されるパッチファイルの総数\n"
 "    :``%R``: リビジョン番号\n"
 "    :``%b``: 対象リポジトリパスの末尾要素\n"
 "    :``%h``: 短縮形式ハッシュ値(12 桁 16 進数)\n"
 "    :``%m``: コミットログの1行目 (英数字限定)\n"
 "    :``%n``: 1から始まるゼロ詰めの通し番号\n"
-"    :``%r``: ゼロ詰めのリビジョン番号"
+"    :``%r``: ゼロ詰めのリビジョン番号\n"
+"    :``\\``: \"\\\" 文字そのもの"
 
 msgid ""
 "    Without the -a/--text option, export will avoid generating diffs\n"
@@ -13824,7 +15839,7 b' msgstr " (grafted from \xe7\xa7\xbb\xe6\xa4\x8d\xe5\x85\x83\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xae\xe3\x83\x8f\xe3\x83\x83\xe3\x82\xb7\xe3\x83\xa5\xe5\x80\xa4)"'
 
 msgid ""
 "    If --force is specified, revisions will be grafted even if they\n"
-"    are already ancestors of or have been grafted to the destination.\n"
+"    are already ancestors of, or have been grafted to, the destination.\n"
 "    This is useful when the revisions have since been backed out."
 msgstr ""
 "    移植対象リビジョン、 あるいはその移植先リビジョンが、 移植先にとって、\n"
@@ -13910,8 +15925,8 b' msgid "graft"'
 msgstr "graft"
 
 #, python-format
-msgid "skipping ungraftable merge revision %s\n"
-msgstr "移植できないマージリビジョン %s を無視\n"
+msgid "skipping ungraftable merge revision %d\n"
+msgstr "移植できないマージリビジョン %d を無視\n"
 
 #, python-format
 msgid "skipping ancestor revision %d:%s\n"
@@ -14175,9 +16190,13 b' msgstr ""'
 
 msgid ""
 "    When REV is not given, print a summary of the current state of the\n"
-"    repository."
-msgstr ""
-"    リビジョン指定無しで起動された場合は、 作業領域の状態を表示します。"
+"    repository including the working directory. Specify -r. to get "
+"information\n"
+"    of the working directory parent without scanning uncommitted changes."
+msgstr ""
+"    リビジョン指定無しで起動された場合は、 リポジトリの状態を表示します\n"
+"    (作業領域状態含む)。 作業領域の未コミット変更等を無視する場合は、\n"
+"    ``-r .`` を指定してください。"
 
 msgid ""
 "    Specifying a path to a repository root or Mercurial bundle will\n"
@@ -14430,6 +16449,9 b' msgstr "\xe5\x8f\x96\xe3\x82\x8a\xe8\xbe\xbc\xe3\x81\xbf\xe3\x81\xab\xe3\x81\xaf\xe6\x9c\x80\xe4\xbd\x8e1\xe3\x81\xa4\xe3\x81\xae\xe3\x83\x91\xe3\x83\x83\xe3\x83\x81\xe5\x90\x8d\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\x8c\xe5\xbf\x85\xe8\xa6\x81\xe3\x81\xa7\xe3\x81\x99"'
 msgid "cannot use --no-commit with --bypass"
 msgstr "--no-commit と --bypass は併用できません"
 
+msgid "similarity must be a number"
+msgstr "類似度には数値を指定してください"
+
 msgid "cannot use --similarity with --bypass"
 msgstr "--similarity と --bypass は併用できません"
 
@@ -14479,11 +16501,11 b' msgstr "\xe6\x8c\x87\xe5\xae\x9a\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe4\xb8\xad\xe3\x81\xae\xe6\x9c\xaa\xe5\x8f\x96\xe3\x82\x8a\xe8\xbe\xbc\xe3\x81\xbf\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xae\xe6\xa4\x9c\xe7\xb4\xa2"'
 msgid ""
 "    Show new changesets found in the specified path/URL or the default\n"
 "    pull location. These are the changesets that would have been pulled\n"
-"    if a pull at the time you issued this command."
-msgstr ""
-"    ファイルパス、 URL または :hg:`pull` の無指定時連携先リポジトリ中の、\n"
-"    未取り込みリビジョンを検索します。 これらのリビジョンは\n"
-"    :hg:`pull` を実行した際に、 取り込み対象となります。"
+"    by :hg:`pull` at the time you issued this command."
+msgstr ""
+"    連携先リポジトリ中の、 新規リビジョンを表示します (連携先は、\n"
+"    指定のファイルパス、 URL、 あるいは無指定時連携先リポジトリ設定)。\n"
+"    表示されたリビジョンは :hg:`pull` 実行時に、 取り込み対象となります。"
 
 msgid "    See pull for valid source format details."
 msgstr "    対象リポジトリの指定形式は :hg:`help pull` を参照してください。"
@@ -14647,6 +16669,12 b' msgstr ""'
 msgid "    See :hg:`help files` for a more versatile command."
 msgstr "    より高機能な :hg:`files` コマンドのヘルプを参照してください。"
 
+msgid "follow line range of specified file (EXPERIMENTAL)"
+msgstr "指定ファイルの特定行範囲の変更を追跡 (実験的実装)"
+
+msgid "FILE,RANGE"
+msgstr "ファイル,行範囲"
+
 msgid "show revision history of entire repository or files"
 msgstr "リポジトリ全体またはファイルの変更履歴の表示"
 
@@ -14668,13 +16696,12 b' msgid ""'
 "    File history is shown without following rename or copy history of\n"
 "    files. Use -f/--follow with a filename to follow history across\n"
 "    renames and copies. --follow without a filename will only show\n"
-"    ancestors or descendants of the starting revision."
-msgstr ""
-"    ファイルの履歴表示では、 改名／複製時の元ファイルにまでさかのぼった\n"
-"    履歴は表示しません。 元ファイルの履歴をさかのぼる場合は、 ファイル名\n"
-"    と一緒に -f/--follow を使用します。 --follow 指定の際にファイル名が\n"
-"    指定されない場合は、 開始リビジョンに連なるリビジョンのみを表示\n"
-"    します。"
+"    ancestors of the starting revision."
+msgstr ""
+"    ファイルの履歴表示では、 改名／複製の元ファイルの履歴は表示しません。\n"
+"    元ファイルの履歴までさかのぼる場合は、 ファイル名と一緒に -f/--follow\n"
+"    を使用します。 --follow 指定の際にファイル名が指定されない場合は、\n"
+"    表示開始対象リビジョンと、 その祖先のみを表示します。"
 
 msgid ""
 "    By default this command prints revision number and changeset id,\n"
@@ -14691,15 +16718,36 b' msgstr ""'
 msgid ""
 "    With --graph the revisions are shown as an ASCII art DAG with the most\n"
 "    recent changeset at the top.\n"
-"    'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,\n"
-"    and '+' represents a fork where the changeset from the lines below is a\n"
-"    parent of the 'o' merge on the same line."
+"    'o' is a changeset, '@' is a working directory parent, '_' closes a "
+"branch,\n"
+"    'x' is obsolete, '*' is unstable, and '+' represents a fork where the\n"
+"    changeset from the lines below is a parent of the 'o' merge on the same\n"
+"    line.\n"
+"    Paths in the DAG are represented with '|', '/' and so forth. ':' in "
+"place\n"
+"    of a '|' indicates one or more revisions in a path are omitted."
 msgstr ""
 "    --graph 指定がある場合、 最新リビジョンを上にした履歴グラフ (DAG) を、\n"
-"    ASCII アートで描画します。 履歴グラフにおける 'o' はリビジョン、\n"
-"    '@' は作業領域の親、 'x' は廃止 (obsoleted) リビジョンを意味します。\n"
+"    ASCII アートで描画します。 履歴グラフにおける 'o' は通常リビジョン、\n"
+"    '@' は作業領域の親、 '_' はブランチ閉鎖、 'x' は廃止 (obsoleted) 、\n"
+"    '*' は非永続 (unstable) リビジョンを意味します。\n"
 "    また '+' は、 同一行の 'o' が '+' 下方のリビジョンを親としたマージで、\n"
-"    且つこのマージによって、 履歴が枝分かれしていることを表します。"
+"    且つこのマージによって、 履歴が枝分かれしていることを表します。    グラフ"
+"中の履歴の枝葉は、 '|', '/' 等々で表現されます。 '|' の代わりに\n"
+"    ':' が使用されている箇所は、 省略されたリビジョンの存在を表します。"
+
+msgid ""
+"       Use -L/--line-range FILE,M:N options to follow the history of lines\n"
+"       from M to N in FILE. With -p/--patch only diff hunks affecting\n"
+"       specified line range will be shown. This option requires --follow;\n"
+"       it can be specified multiple times. Currently, this option is not\n"
+"       compatible with --graph. This option is experimental."
+msgstr ""
+"       -L/--line-range に関して: -L FILE,M:N は、 ファイル FILE\n"
+"       の M 〜 N 行目の範囲に関連する履歴の指定となります。\n"
+"       -p/--patch 指定時は、 当該範囲に関連する差分のみが表示されます。\n"
+"       --follow との併用が必須です。 オプションは複数指定可能です。\n"
+"       --graph とは併用できません。 まだ実験的実装段階です。"
 
 msgid ""
 "       :hg:`log --patch` may generate unexpected diff output for merge\n"
@@ -14723,6 +16771,17 b' msgstr ""'
 "       といったリビジョンが、 表示対象から除外される可能性があります。\n"
 "       --removed 指定により、 これらを含む全リビジョンが表示されます。"
 
+msgid ""
+"          The history resulting from -L/--line-range options depends on "
+"diff\n"
+"          options; for instance if white-spaces are ignored, respective "
+"changes\n"
+"          with only white-spaces in specified line range will not be listed."
+msgstr ""
+"          -L/--line-range 指定時の履歴は、 diff 表示設定の影響を受けます。\n"
+"          例: 空白文字を無視する場合、 指定範囲の変更を行っている履歴でも、\n"
+"          空白文字の変更のみの履歴は、 無視されます。"
+
 msgid "      - changesets with full descriptions and file lists::"
 msgstr "      - 全リビジョンのコミットログとファイル一覧の表示::"
 
@@ -14793,6 +16852,21 b' msgid ""'
 msgstr ""
 "          hg log -r \"last(tagged())::\" --template \"{desc|firstline}\\n\""
 
+msgid "      - changesets touching lines 13 to 23 for file.c::"
+msgstr "      - file.c の 13 〜 23 行目に関連する履歴::"
+
+msgid "          hg log -L file.c,13:23"
+msgstr "          hg log -L file.c,13:23"
+
+msgid ""
+"      - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of\n"
+"        main.c with patch::"
+msgstr ""
+"      - file.c の 13 〜 23 行目と、 main.c の 2 〜 6 行目に関連する履歴::"
+
+msgid "          hg log -L file.c,13:23 -L main.c,2:6 -p"
+msgstr "          hg log -L file.c,13:23 -L main.c,2:6 -p"
+
 msgid ""
 "    See :hg:`help revisions` for more about specifying and ordering\n"
 "    revisions."
@@ -14801,10 +16875,19 b' msgstr ""'
 
 msgid ""
 "    See :hg:`help templates` for more about pre-packaged styles and\n"
-"    specifying custom templates."
+"    specifying custom templates. The default template used by the log\n"
+"    command can be customized via the ``ui.logtemplate`` configuration\n"
+"    setting."
 msgstr ""
 "    同梱されているスタイルや、テンプレートのカスタマイズ等の詳細は、\n"
-"    :hg:`help templates` を参照してください。"
+"    :hg:`help templates` を参照してください。 :hg:`log` での表示は、\n"
+"    ``ui.logtemplate`` 設定経由でもカスタマイズ可能です。"
+
+msgid "--line-range requires --follow"
+msgstr "--line-range は --follow と組み合わせてください"
+
+msgid "FILE arguments are not compatible with --line-range option"
+msgstr "--line-range 指定時は、引数にファイル名を指定できません"
 
 msgid "revision to display"
 msgstr "表示対象リビジョン"
@@ -14855,6 +16938,9 b' msgstr "\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xb8\xe5\xaf\xbe\xe8\xb1\xa1\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3"'
 msgid "review revisions to merge (no merge is performed)"
 msgstr "マージ対象リビジョンの確認(マージ処理は未実施)"
 
+msgid "abort the ongoing merge"
+msgstr "未コミットの merge 成果を破棄します"
+
 msgid "[-P] [[-r] REV]"
 msgstr "[-P] [[-r] REV]"
 
@@ -14904,12 +16990,12 b' msgid " See :hg:`help resolve` for in'
 msgstr "    衝突の扱いに関する詳細は :hg:`help resolve` を参照してください。"
 
 msgid ""
-"    To undo an uncommitted merge, use :hg:`update --clean .` which\n"
+"    To undo an uncommitted merge, use :hg:`merge --abort` which\n"
 "    will check out a clean copy of the original merge parent, losing\n"
 "    all changes."
 msgstr ""
-"    コミット前にマージ処理を取り消す場合は、 :hg:`update --clean .`\n"
-"    が使用できますが、 マージ前の親リビジョンの内容で上書きするため、\n"
+"    未コミットなマージ成果は、 :hg:`merge --abort` で破棄できます。\n"
+"    この場合、 作業領域は以前の親リビジョンの内容で上書きされ、\n"
 "    作業領域中の全ての変更内容が失われます。"
 
 msgid ""
@@ -14919,6 +17005,21 b' msgstr ""'
 "    成功時のコマンド終了値は 0、 未解消ファイルがある場合は 1 です。\n"
 "    "
 
+# this is left untranslated intentionally, because untranslated word
+# can be treated as ACTION name.
+# (by [e-mail])
+msgid "merge"
+msgstr ""
+
+msgid "cannot specify a node with --abort"
+msgstr "リビジョン指定と --abort は併用できません"
+
+msgid "cannot specify both --rev and --abort"
+msgstr "--rev と --abort は併用できません"
+
+msgid "cannot specify --preview with --abort"
+msgstr "--preview と --abort は併用できません"
+
 msgid "a changeset intended to be included in the destination"
 msgstr "反映対象とするリビジョン"
 
@@ -15136,10 +17237,11 b' msgstr ""'
 "    指定リビジョンのフェーズを指定値に変更します。"
 
 msgid ""
-"    Unless -f/--force is specified, :hg:`phase` won't move changeset from a\n"
-"    lower phase to an higher phase. Phases are ordered as follows::"
-msgstr ""
-"    -f/--force が指定されない限り、 低い方から高い方へのフェーズ変更は、\n"
+"    Unless -f/--force is specified, :hg:`phase` won't move changesets from "
+"a\n"
+"    lower phase to a higher phase. Phases are ordered as follows::"
+msgstr ""
+"    -f/--force 指定がない限り、 フェーズ値の低い方から高い方への変更は、\n"
 "    実施できません。 フェーズの高低は以下のように定義されています::"
 
 msgid "        public < draft < secret"
@@ -15187,8 +17289,8 b' msgstr "(\xe3\x83\x98\xe3\x83\x83\xe3\x83\x89\xe4\xb8\x80\xe8\xa6\xa7\xe8\xa1\xa8\xe7\xa4\xba\xe3\x81\xaf \'hg heads\')\\n"'
 msgid "(run 'hg update' to get a working copy)\n"
 msgstr "(作業領域の更新は 'hg update')\n"
 
-msgid "update to new branch head if changesets were pulled"
-msgstr "新規取り込みの際は、 新規ブランチヘッドで、 作業領域を更新"
+msgid "update to new branch head if new descendants were pulled"
+msgstr "作業領域の子孫が取り込まれた場合、 作業領域を新規ブランチヘッドで更新"
 
 msgid "run even when remote repository is unrelated"
 msgstr "連携先が無関係なリポジトリでも実行"
@@ -15219,6 +17321,19 b' msgstr ""'
 "    特に指定が無い場合、 このコマンドによる作業領域の更新はありません。"
 
 msgid ""
+"    When cloning from servers that support it, Mercurial may fetch\n"
+"    pre-generated data. When this is done, hooks operating on incoming\n"
+"    changesets and changegroups may fire more than once, once for each\n"
+"    pre-generated bundle and as well as for any additional remaining\n"
+"    data. See :hg:`help -e clonebundles` for more."
+msgstr ""
+"    サーバ経由で複製した場合、 サーバ側で事前に作成されたデータを元に、\n"
+"    複製を行う可能性があります (サーバ側設定次第)。 そのような場合、\n"
+"    incoming, changegroups 系フックが、 事前作成データに対して一度、\n"
+"    残りの履歴情報に対してもう一度、 合計二度実行されることになります。\n"
+"    詳細は :hg:`help -e clonebundles` を参照してください。"
+
+msgid ""
 "    Use :hg:`incoming` if you want to see what would have been added\n"
 "    by a pull at the time you issued this command. If you then decide\n"
 "    to add those changes to the repository, you should use :hg:`pull\n"
@@ -15262,6 +17377,9 b' msgstr "\xe5\x8f\x8d\xe6\x98\xa0\xe5\xaf\xbe\xe8\xb1\xa1\xe3\x83\x96\xe3\x83\x83\xe3\x82\xaf\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xaf"'
 msgid "allow pushing a new branch"
 msgstr "新規ブランチの反映を許可"
 
+msgid "variables that can be sent to server (ADVANCED)"
+msgstr ""
+
 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
 msgstr "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
 
@@ -15333,18 +17451,41 b' msgstr ""'
 "    連携先が省略された場合、 'default' パスが連携先として使用されます。"
 
 msgid ""
+"        The --pushvars option sends strings to the server that become\n"
+"        environment variables prepended with ``HG_USERVAR_``. For example,\n"
+"        ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks "
+"with\n"
+"        ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment."
+msgstr ""
+
+msgid ""
+"        pushvars can provide for user-overridable hooks as well as set "
+"debug\n"
+"        levels. One example is having a hook that blocks commits containing\n"
+"        conflict markers, but enables the user to override the hook if the "
+"file\n"
+"        is using conflict markers for testing purposes or the file format "
+"has\n"
+"        strings that look like conflict markers."
+msgstr ""
+
+msgid ""
+"        By default, servers will ignore `--pushvars`. To enable it add the\n"
+"        following to your configuration file::"
+msgstr ""
+
+msgid ""
+"            [push]\n"
+"            pushvars.server = true"
+msgstr ""
+
+msgid ""
 "    Returns 0 if push was successful, 1 if nothing to push.\n"
 "    "
 msgstr ""
 "    反映成功時のコマンド終了値は 0、 何も反映されなかった場合は 1 です。\n"
 "    "
 
-msgid "default repository not configured!"
-msgstr "デフォルトの連携先が設定されていません"
-
-msgid "see 'hg help config.paths'"
-msgstr "詳細は 'hg help config.paths' 参照"
-
 #, python-format
 msgid "pushing to %s\n"
 msgstr "%s への反映中\n"
@@ -15604,6 +17745,10 b' msgid "not unmarking %s as it is driver-'
 msgstr "マージドライバの処理対象 %s は衝突未解消扱いになりません\n"
 
 #, python-format
+msgid "%s: path conflict must be resolved manually\n"
+msgstr "%s: パスの衝突は手動で解消する必要があります\n"
+
+#, python-format
 msgid "(try: hg resolve %s%s)\n"
 msgstr "(推奨コマンド: hg resolve %s%s)\n"
 
@@ -15626,8 +17771,8 b' msgstr "\xe5\xbd\x93\xe8\xa9\xb2\xe6\x97\xa5\xe6\x99\x82\xe3\x81\xae\xe6\x9c\x80\xe6\x96\xb0\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x82\x92\xe4\xbd\xbf\xe7\x94\xa8"'
 msgid "revert to the specified revision"
 msgstr "当該リビジョン時点の内容で復旧"
 
-msgid "interactively select the changes (EXPERIMENTAL)"
-msgstr "操作対象変更の対話的な選択 (実験的実装)"
+msgid "interactively select the changes"
+msgstr "操作対象変更の対話的な選択"
 
 msgid "[OPTION]... [-r REV] [NAME]..."
 msgstr "[OPTION]... [-r REV] [NAME]..."
@@ -15638,10 +17783,10 b' msgstr "\xe8\xa6\xaa\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xae\xe7\x8a\xb6\xe6\x85\x8b\xe3\x81\xa7\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x82\x92\xe5\xbe\xa9\xe6\x97\xa7"'
 msgid ""
 "       To check out earlier revisions, you should use :hg:`update REV`.\n"
 "       To cancel an uncommitted merge (and lose your changes),\n"
-"       use :hg:`update --clean .`."
+"       use :hg:`merge --abort`."
 msgstr ""
 "       指定リビジョンでの作業領域の更新は :hg:`update 対象リビジョン`\n"
-"       で行います。 マージ途中での取り消しは :hg:`update --clean .`\n"
+"       で行います。 未コミットマージ成果の破棄は :hg:`merge --abort`\n"
 "       で行います (マージにおける修正内容は破棄されます)。"
 
 msgid ""
@@ -15905,13 +18050,13 b' msgstr ""'
 msgid ""
 "    Please note that the server does not implement access control.\n"
 "    This means that, by default, anybody can read from the server and\n"
-"    nobody can write to it by default. Set the ``web.allow_push``\n"
+"    nobody can write to it by default. Set the ``web.allow-push``\n"
 "    option to ``*`` to allow everybody to push to the server. You\n"
 "    should use a real web server if you need to authenticate users."
 msgstr ""
 "    本コマンドで起動されるサーバは、 アクセス制御が実装されていません。\n"
 "    特に設定が無い場合、 誰もがリポジトリを参照可能で、 且つリポジトリは\n"
-"    誰にも更新できない状態にあります。 ``web.allow_push`` 設定を ``*``\n"
+"    誰にも更新できない状態にあります。 ``web.allow-push`` 設定を ``*``\n"
 "    に設定することで、 誰もがリポジトリに :hg:`push` できます。\n"
 "    ユーザ認証が必要な場合は、 通常のウェブサーバを使用してください。"
 
@@ -15959,6 +18104,9 b' msgstr "\xe6\xa7\x8b\xe6\x88\x90\xe7\xae\xa1\xe7\x90\x86\xe5\xaf\xbe\xe8\xb1\xa1\xe5\xa4\x96\xe3\x81\xae\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x82\x92\xe8\xa1\xa8\xe7\xa4\xba"'
 msgid "show only ignored files"
 msgstr "無視対象のファイルを表示"
 
+msgid "show the terse output (EXPERIMENTAL)"
+msgstr "省略形式での表示 (実験的実装)"
+
 msgid "show source of copied files"
 msgstr "複製元ファイルを表示"
 
@@ -16040,6 +18188,41 b' msgstr ""'
 "        = 直前に表示される新規登録予定ファイル(A)の複製元"
 
 msgid ""
+"      The -t/--terse option abbreviates the output by showing only the "
+"directory\n"
+"      name if all the files in it share the same status. The option takes "
+"an\n"
+"      argument indicating the statuses to abbreviate: 'm' for 'modified', "
+"'a'\n"
+"      for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', "
+"'i'\n"
+"      for 'ignored' and 'c' for clean."
+msgstr ""
+
+msgid ""
+"      It abbreviates only those statuses which are passed. Note that clean "
+"and\n"
+"      ignored files are not displayed with '--terse ic' unless the -c/--"
+"clean\n"
+"      and -i/--ignored options are also used."
+msgstr ""
+
+msgid ""
+"      The -v/--verbose option shows information when the repository is in "
+"an\n"
+"      unfinished merge, shelve, rebase state etc. You can have this "
+"behavior\n"
+"      turned on by default by enabling the ``commands.status.verbose`` "
+"option."
+msgstr ""
+
+msgid ""
+"      You can skip displaying some of these states by setting\n"
+"      ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',\n"
+"      'histedit', 'merge', 'rebase', or 'unshelve'."
+msgstr ""
+
+msgid ""
 "      - show changes in the working directory relative to a\n"
 "        changeset::"
 msgstr "      - 作業領域と指定リビジョンとの間での状態変更を表示::"
@@ -16069,6 +18252,17 b' msgstr " - \xe8\xbf\xbd\xe5\x8a\xa0\xe7\x99\xbb\xe9\x8c\xb2\xe3\x81\x95\xe3\x82\x8c\xe3\x81\x9f\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xae NUL \xe5\x8c\xba\xe5\x88\x87\xe3\x82\x8a\xe4\xb8\x80\xe8\xa6\xa7\xe3\x81\xae\xe8\xa1\xa8\xe7\xa4\xba (xargs \xe5\x90\x91\xe3\x81\x91)::"'
 msgid "          hg status -an0"
 msgstr "          hg status -an0"
 
+msgid ""
+"      - show more information about the repository status, abbreviating\n"
+"        added, removed, modified, deleted, and untracked paths::"
+msgstr ""
+
+msgid "          hg status -v -t mardu"
+msgstr "          hg status -v -t mardu"
+
+msgid "cannot use --terse with --rev"
+msgstr "--terse と --rev は併用できません"
+
 msgid "check for push and pull"
 msgstr "push/pull 実施結果の確認"
 
@@ -16205,16 +18399,16 b' msgid "phases: %s\\n"'
 msgstr "フェーズ:     %s\n"
 
 #, python-format
-msgid "unstable: %d changesets"
-msgstr "unstable リビジョン: %d 個"
-
-#, python-format
-msgid "divergent: %d changesets"
-msgstr "divergent リビジョン: %d 個"
-
-#, python-format
-msgid "bumped: %d changesets"
-msgstr "bumped リビジョン: %d 個"
+msgid "orphan: %d changesets"
+msgstr "孤立リビジョン: %d 個"
+
+#, python-format
+msgid "content-divergent: %d changesets"
+msgstr "内容分岐リビジョン: %d 個"
+
+#, python-format
+msgid "phase-divergent: %d changesets"
+msgstr "フェーズ分岐リビジョン: %d 個"
 
 msgid "1 or more incoming"
 msgstr "取り込み候補リビジョンあり"
@@ -16402,6 +18596,12 b' msgstr ""'
 "    成功時のコマンド終了値は 0、 衝突未解消ファイルがある場合は 1 です。\n"
 "    "
 
+msgid "packed bundles cannot be applied with \"hg unbundle\""
+msgstr "packed bundle は \"hg unbundle\" では適用できません"
+
+msgid "use \"hg debugapplystreamclonebundle\""
+msgstr "\"hg debugapplystreamclonebundle\" を使用してください"
+
 #, python-format
 msgid "%s: unknown bundle feature, %s"
 msgstr "%s: 未知のバンドル機能 %s"
@@ -16409,12 +18609,6 b' msgstr "%s: \xe6\x9c\xaa\xe7\x9f\xa5\xe3\x81\xae\xe3\x83\x90\xe3\x83\xb3\xe3\x83\x89\xe3\x83\xab\xe6\xa9\x9f\xe8\x83\xbd %s"'
 msgid "see https://mercurial-scm.org/wiki/BundleFeature for more information"
 msgstr "詳細は https://mercurial-scm.org/wiki/BundleFeature 参照"
 
-msgid "packed bundles cannot be applied with \"hg unbundle\""
-msgstr "packed bundle は \"hg unbundle\" では適用できません"
-
-msgid "use \"hg debugapplystreamclonebundle\""
-msgstr "\"hg debugapplystreamclonebundle\" を使用してください"
-
 msgid "discard uncommitted changes (no backup)"
 msgstr "未コミット変更内容の破棄(保存無し)"
 
@@ -16512,11 +18706,10 b' msgstr ""'
 
 msgid ""
 "    To cancel an uncommitted merge (and lose your changes), use\n"
-"    :hg:`update --clean .`."
-msgstr ""
-"    マージ実施を途中で取り消す場合は\n"
-"    :hg:`update --clean .` を実行してください\n"
-"    (マージにおける修正内容は破棄されます)。"
+"    :hg:`merge --abort`."
+msgstr ""
+"    未コミットマージ成果の破棄は :hg:`merge --abort`\n"
+"    で行います (マージにおける修正内容は破棄されます)。"
 
 msgid ""
 "    Use null as the changeset to remove the working directory (like\n"
@@ -16538,6 +18731,10 b' msgstr "\xe6\x8c\x87\xe5\xae\x9a\xe4\xbe\x8b: hg update \\".::\\""'
 msgid "can only specify one of -C/--clean, -c/--check, or -m/--merge"
 msgstr "-C/--clean, -c/--check および -m/--merge は複数指定できません"
 
+#, python-format
+msgid "updating to a hidden changeset %s\n"
+msgstr "作業領域を不可視リビジョン %s で更新中\n"
+
 msgid "verify the integrity of the repository"
 msgstr "リポジトリの整合性検証"
 
@@ -16574,11 +18771,11 b' msgid "(see https://mercurial-scm.org fo'
 msgstr "(詳細は https://mercurial-scm.org を参照)"
 
 msgid ""
-"Copyright (C) 2005-2017 Matt Mackall and others\n"
+"Copyright (C) 2005-2018 Matt Mackall and others\n"
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
-"Copyright (C) 2005-2017 Matt Mackall and others\n"
+"Copyright (C) 2005-2018 Matt Mackall and others\n"
 "本製品はフリーソフトウェアです。\n"
 "頒布条件に関しては同梱されるライセンス条項をお読みください。\n"
 "市場適合性や特定用途への可否を含め、 本製品は無保証です。\n"
@@ -16626,21 +18823,14 b' msgid "not found in manifest"'
 msgstr "マニフェストにありません"
 
 #, python-format
-msgid "hidden revision '%s'"
-msgstr "'%s' は不可視リビジョンです"
-
-msgid "use --hidden to access hidden revisions"
-msgstr "不可視リビジョンへのアクセス時には --hidden 指定が必要です"
-
-#, python-format
-msgid "filtered revision '%s' (not in '%s' subset)"
-msgstr "'%s' はフィルタリング対象リビジョンです ('%s' には属しません)"
-
-#, python-format
 msgid "working directory has unknown parent '%s'!"
 msgstr "作業領域の親 '%s' が未知のリビジョンです!"
 
 #, python-format
+msgid "filtered revision '%s'"
+msgstr "'%s' は不可視リビジョンです"
+
+#, python-format
 msgid "unknown revision '%s'"
 msgstr "'%s' は未知のリビジョンです"
 
@@ -16698,6 +18888,10 b' msgstr "%s \xe3\x81\xaf\xe5\x89\x8a\xe9\x99\xa4\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93\xe3\x81\xa7\xe3\x81\x97\xe3\x81\x9f!\\n"'
 msgid "copy failed: %s is not a file or a symbolic link\n"
 msgstr "コピー失敗: %s はファイルでもシンボリックリンクでもありません\n"
 
+#, python-format
+msgid "skipping copytracing for '%s', more candidates than the limit: %d\n"
+msgstr ""
+
 msgid ""
 "# To remove '-' lines, make them ' ' lines (context).\n"
 "# To remove '+' lines, delete them.\n"
@@ -16733,8 +18927,9 b' msgstr ""'
 msgid "starting interactive selection\n"
 msgstr "対話的な選択の開始\n"
 
-msgid "Select hunks to revert"
-msgstr "取り消しに用いる差分の選択"
+#, fuzzy
+msgid "Select hunks to apply"
+msgstr "破棄する差分の選択"
 
 msgid "Select hunks to discard"
 msgstr "破棄する差分の選択"
@@ -16742,6 +18937,12 b' msgstr "\xe7\xa0\xb4\xe6\xa3\x84\xe3\x81\x99\xe3\x82\x8b\xe5\xb7\xae\xe5\x88\x86\xe3\x81\xae\xe9\x81\xb8\xe6\x8a\x9e"'
 msgid "Select hunks to record"
 msgstr "記録する差分の選択"
 
+msgid "space: select"
+msgstr ""
+
+msgid "space: deselect"
+msgstr ""
+
 msgid "[x]=selected **=collapsed"
 msgstr ""
 
@@ -16754,12 +18955,6 b' msgstr ""'
 msgid "arrow keys: move/expand/collapse"
 msgstr ""
 
-msgid "space: deselect"
-msgstr ""
-
-msgid "space: select"
-msgstr ""
-
 msgid "?: help"
 msgstr ""
 
@@ -16859,8 +19054,8 b' msgstr "\xe6\x83\xb3\xe5\xae\x9a id %i \xe3\x81\xab\xe5\xaf\xbe\xe3\x81\x97\xe3\x81\xa6 %i \xe3\x81\x8c\xe6\xa4\x9c\xe5\x87\xba"'
 msgid "parent id %i is larger than current id %i"
 msgstr "親 id %i が現 id %i よりも大きいです"
 
-#, python-format
-msgid "invalid event type in dag: %s"
+#, fuzzy, python-format
+msgid "invalid event type in dag: ('%s', '%s')"
 msgstr "dag イベント種別が不正です: %s"
 
 msgid "nullid"
@@ -16869,9 +19064,16 b' msgstr "nullid"'
 msgid "[INDEX] REV1 REV2"
 msgstr "[INDEX] REV1 REV2"
 
+msgid "find the ancestor revision of two revisions in a given index"
+msgstr ""
+
 msgid "either two or three arguments required"
 msgstr "2または3の引数が必要です"
 
+#, fuzzy
+msgid "apply a stream clone bundle file"
+msgstr "バンドルファイルの適用"
+
 msgid "add single file mergeable changes"
 msgstr "ファイルを1つ登録して、 マージ可能な変更をリビジョン毎に実施"
 
@@ -16884,6 +19086,54 b' msgstr "\xe5\x90\x84\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe6\xaf\x8e\xe3\x81\xab\xe6\x96\xb0\xe8\xa6\x8f\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x82\x92\xe7\x99\xbb\xe9\x8c\xb2"'
 msgid "[OPTION]... [TEXT]"
 msgstr "[OPTION]... [TEXT]"
 
+msgid "builds a repo with a given DAG from scratch in the current empty repo"
+msgstr ""
+
+msgid ""
+"    The description of the DAG is read from stdin if not given on the\n"
+"    command line."
+msgstr ""
+
+#, fuzzy
+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"
+"     - \"<p\" sets the default parent to the backref p\n"
+"     - \"*p\" is a fork at parent p, which is a backref\n"
+"     - \"*p1/p2\" is a merge of parents p1 and p2, which are backrefs\n"
+"     - \"/p2\" is a merge of the preceding node and p2\n"
+"     - \":tag\" defines a local tag for the preceding node\n"
+"     - \"@branch\" sets the named branch for subsequent nodes\n"
+"     - \"#...\\n\" is a comment up to the end of the line"
+msgstr ""
+
+msgid "    Whitespace between the above elements is ignored."
+msgstr ""
+
+msgid "    A backref is either"
+msgstr ""
+
+msgid ""
+"     - a number n, which references the node curr-n, where curr is the "
+"current\n"
+"       node, or\n"
+"     - the name of a local tag you placed earlier using \":tag\", or\n"
+"     - empty to denote the default parent."
+msgstr ""
+
+msgid ""
+"    All string valued-elements are either strictly alphanumeric, or must\n"
+"    be enclosed in double quotes (\"...\"), with \"\\\" as escape "
+"character.\n"
+"    "
+msgstr ""
+
 msgid "reading DAG from stdin\n"
 msgstr "DAG を標準入力から読み込みます\n"
 
@@ -16902,9 +19152,25 b' msgstr "bundle2 \xe5\xbd\xa2\xe5\xbc\x8f\xe3\x81\xae\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xa7\xe3\x81\xaf\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"'
 msgid "show all details"
 msgstr "全詳細の表示"
 
+#, fuzzy
+msgid "show only the named part type"
+msgstr "直前に適用したパッチのみを表示"
+
 msgid "print the bundlespec of the bundle"
 msgstr "バンドルファイルの仕様表示"
 
+#, fuzzy
+msgid "lists the contents of a bundle"
+msgstr "バンドルファイルの仕様表示"
+
+#, fuzzy
+msgid "lists the capabilities of a remote peer"
+msgstr "指定リビジョンにおける変更対象ファイルの一覧"
+
+#, fuzzy
+msgid "validate the correctness of the current dirstate"
+msgstr "現行パッチの名前表示"
+
 #, python-format
 msgid "%s in state %s, but not in manifest1\n"
 msgstr "%s の状態は %s ですが、 管理対象ではありません\n"
@@ -16927,20 +19193,27 b' msgstr "\xe8\xa6\xaa\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xae\xe7\xae\xa1\xe7\x90\x86\xe6\x83\x85\xe5\xa0\xb1\xe3\x81\xa8 .hg/dirstate \xe3\x81\xae\xe9\x96\x93\xe3\x81\xab\xe4\xb8\x8d\xe6\x95\xb4\xe5\x90\x88\xe3\x81\x8c\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x99"'
 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 "[COMMAND]"
-msgstr "[COMMAND]"
-
-msgid "show the command options"
-msgstr "当該コマンドのオプション一覧の表示"
-
-msgid "[-o] CMD"
-msgstr "[-o] CMD"
+#, fuzzy
+msgid "create a stream clone bundle file"
+msgstr "バンドルファイルの生成"
+
+msgid ""
+"    Stream bundles are special bundles that are essentially archives of\n"
+"    revlog files. They are commonly used for cloning very quickly.\n"
+"    "
+msgstr ""
+
+msgid "(warning: stream clone bundle will contain secret revisions)\n"
+msgstr ""
 
 #, python-format
 msgid "bundle requirements: %s\n"
@@ -16961,27 +19234,105 b' msgstr "\xe5\x90\x84\xe8\xa6\x81\xe7\xb4\xa0\xe3\x81\xae\xe5\x8c\xba\xe5\x88\x87\xe3\x82\x8a\xe3\x81\xab\xe7\xa9\xba\xe7\x99\xbd\xe3\x82\x92\xe6\x8c\xbf\xe5\x85\xa5"'
 msgid "[OPTION]... [FILE [REV]...]"
 msgstr "[OPTION]... [FILE [REV]...]"
 
+msgid "format the changelog or an index DAG as a concise textual description"
+msgstr ""
+
+msgid ""
+"    If you pass a revlog index, the revlog's DAG is emitted. If you list\n"
+"    revision numbers, they get labeled in the output as rN."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    Otherwise, the changelog DAG of the current repo is emitted.\n"
+"    "
+msgstr "    現リポジトリの整合性を検証します。"
+
 msgid "need repo for changelog dag"
 msgstr "変更履歴の DAG 出力にはリポジトリが必要です"
 
 msgid "-c|-m|FILE REV"
 msgstr "-c|-m|FILE REV"
 
+#, fuzzy
+msgid "dump the contents of a data file revision"
+msgstr "指定リビジョンのファイル内容の検閲／消去"
+
 msgid "try extended date formats"
 msgstr "拡張日時形式の使用"
 
 msgid "[-e] DATE [RANGE]"
 msgstr "[-e] DATE [RANGE]"
 
+msgid "parse and display a date"
+msgstr ""
+
 msgid "-c|-m|FILE"
 msgstr "-c|-m|FILE"
 
+msgid "dump information about delta chains in a revlog"
+msgstr ""
+
+msgid "    Output can be templatized. Available template keywords are:"
+msgstr ""
+
+msgid ""
+"    :``rev``:       revision number\n"
+"    :``chainid``:   delta chain identifier (numbered by unique base)\n"
+"    :``chainlen``:  delta chain length to this revision\n"
+"    :``prevrev``:   previous revision in delta chain\n"
+"    :``deltatype``: role of delta / how it was computed\n"
+"    :``compsize``:  compressed size of revision\n"
+"    :``uncompsize``: uncompressed size of revision\n"
+"    :``chainsize``: total size of compressed revisions in chain\n"
+"    :``chainratio``: total chain size divided by uncompressed revision size\n"
+"                    (new delta chains typically start at ratio 2.00)\n"
+"    :``lindist``:   linear distance from base revision in delta chain to "
+"end\n"
+"                    of this revision\n"
+"    :``extradist``: total size of revisions not part of this delta chain "
+"from\n"
+"                    base of delta chain to end of this revision; a "
+"measurement\n"
+"                    of how much extra data we need to read/seek across to "
+"read\n"
+"                    the delta chain for this revision\n"
+"    :``extraratio``: extradist divided by chainsize; another representation "
+"of\n"
+"                    how much unrelated data is needed to load this delta "
+"chain"
+msgstr ""
+
+msgid ""
+"    If the repository is configured to use the sparse read, additional "
+"keywords\n"
+"    are available:"
+msgstr ""
+
+msgid ""
+"    :``readsize``:     total size of data read from the disk for a revision\n"
+"                       (sum of the sizes of all the blocks)\n"
+"    :``largestblock``: size of the largest block of data read from the disk\n"
+"    :``readdensity``:  density of useful bytes in the data read from the "
+"disk\n"
+"    :``srchunks``:  in how many data hunks the whole revision would be read"
+msgstr ""
+
+msgid ""
+"    The sparse read can be enabled with experimental.sparse-read = True\n"
+"    "
+msgstr ""
+
 msgid "do not display the saved mtime"
 msgstr "記録された mtime 情報の表示抑止"
 
 msgid "sort by saved mtime"
 msgstr "記録された mtime 情報で整列"
 
+#, fuzzy
+msgid "show the contents of the current dirstate"
+msgstr "現行パッチの名前表示"
+
 #, python-format
 msgid "copy: %s -> %s\n"
 msgstr "%s から %s に複製\n"
@@ -16992,8 +19343,25 b' msgstr "\xe6\x97\xa7\xe5\xbd\xa2\xe5\xbc\x8f\xe3\x81\xae\xe6\x8e\xa2\xe7\xb4\xa2\xe3\x82\x92\xe5\xae\x9f\xe6\x96\xbd"'
 msgid "use old-style discovery with non-heads included"
 msgstr "non-heads 有りの旧形式探索を実施"
 
-msgid "[-l REV] [-r REV] [-b BRANCH]... [OTHER]"
-msgstr "[-l REV] [-r REV] [-b BRANCH]... [OTHER]"
+#, fuzzy
+msgid "[--rev REV] [OTHER]"
+msgstr "[-r REV] [REV]"
+
+msgid "runs the changeset discovery protocol in isolation"
+msgstr ""
+
+#, fuzzy
+msgid "path"
+msgstr "パス"
+
+msgid ""
+"download a resource using Mercurial logic and config\n"
+"    "
+msgstr ""
+
+#, fuzzy
+msgid "show information about active extensions"
+msgstr "    名前付きブランチ情報の表示。"
 
 msgid " (untested!)\n"
 msgstr " (テスト未実施!)\n"
@@ -17020,9 +19388,25 b' msgstr "\xe6\x8c\x87\xe5\xae\x9a\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xab\xe5\xaf\xbe\xe3\x81\x99\xe3\x82\x8b fileset \xe8\xa8\x98\xe8\xbf\xb0\xe3\x81\xae\xe9\x81\xa9\xe7\x94\xa8"'
 msgid "[-r REV] FILESPEC"
 msgstr "[-r REV] FILESPEC"
 
+msgid "parse and apply a fileset specification"
+msgstr ""
+
+#, fuzzy
+msgid "display format information about the current repository"
+msgstr "    指定ファイルの履歴の表示。"
+
+msgid ""
+"    Use --verbose to get extra information about current config value and\n"
+"    Mercurial default."
+msgstr ""
+
 msgid "[PATH]"
 msgstr "[PATH]"
 
+#, fuzzy
+msgid "show information detected about current filesystem"
+msgstr "削除されたファイル(登録除外は未実施)を表示"
+
 msgid "id of head node"
 msgstr "ヘッドノードの ID"
 
@@ -17032,11 +19416,33 b' msgstr "\xe5\x85\xb1\xe9\x80\x9a\xe3\x83\x8e\xe3\x83\xbc\xe3\x83\x89\xe3\x81\xae ID"'
 msgid "REPO FILE [-H|-C ID]..."
 msgstr "REPO FILE [-H|-C ID]..."
 
+#, fuzzy
+msgid "retrieves a bundle from a repo"
+msgstr "バンドルファイルの生成"
+
+msgid ""
+"    Every ID must be a full-length hex node id string. Saves the bundle to "
+"the\n"
+"    given file.\n"
+"    "
+msgstr ""
+
 msgid "unknown bundle type specified with --type"
-msgstr "--type に未知のバンドル種別が指定されました"
-
-msgid "no ignore patterns found"
-msgstr "無視対象ファイルの指定がありません"
+msgstr "--type に未知のバンドル形式が指定されました"
+
+msgid "display the combined ignore pattern and information about ignored files"
+msgstr ""
+
+#, fuzzy
+msgid "    With no argument display the combined ignore pattern."
+msgstr "    引数指定が無い場合、 コマンドの一覧と概要を表示します。"
+
+msgid ""
+"    Given space separated file names, shows if the given file is ignored "
+"and\n"
+"    if so, show the ignore rule (file and line number) that matched it.\n"
+"    "
+msgstr ""
 
 #, python-format
 msgid "%s is ignored\n"
@@ -17060,10 +19466,19 b' msgstr "revlog \xe3\x81\xae\xe5\xbd\xa2\xe5\xbc\x8f"'
 msgid "[-f FORMAT] -c|-m|FILE"
 msgstr "[-f FORMAT] -c|-m|FILE"
 
+msgid "dump the contents of an index file"
+msgstr ""
+
 #, python-format
 msgid "unknown format %d"
 msgstr "未知のフォーマット: %d"
 
+msgid "dump an index DAG as a graphviz dot file"
+msgstr ""
+
+msgid "test Mercurial installation"
+msgstr ""
+
 #, python-format
 msgid "checking encoding (%s)...\n"
 msgstr "文字コードの検証中 (%s)...\n"
@@ -17134,6 +19549,10 b' msgstr "\xe5\x88\xa9\xe7\x94\xa8\xe5\x8f\xaf\xe8\x83\xbd\xe5\x9c\xa7\xe7\xb8\xae\xe3\x82\xa8\xe3\x83\xb3\xe3\x82\xb8\xe3\x83\xb3\xe3\x81\xae\xe6\xa4\x9c\xe8\xa8\xbc\xe4\xb8\xad (%s)\\n"'
 msgid "checking available compression engines for wire protocol (%s)\n"
 msgstr "通信時に利用可能な圧縮エンジンの検証中 (%s)\n"
 
+#, fuzzy, python-format
+msgid "checking \"re2\" regexp engine (%s)\n"
+msgstr "登録済み圧縮エンジンの検証中 (%s)...\n"
+
 msgid " no template directories found\n"
 msgstr " テンプレート設定ディレクトリが存在しません\n"
 
@@ -17192,18 +19611,98 b' msgstr "\xe9\x9a\x9c\xe5\xae\xb3\xe3\x81\x8c %d \xe4\xbb\xb6\xe6\xa4\x9c\xe5\x87\xba\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xbe\xe3\x81\x97\xe3\x81\x9f\xe3\x80\x82 \xe3\x82\xa4\xe3\x83\xb3\xe3\x82\xb9\xe3\x83\x88\xe3\x83\xbc\xe3\x83\xab\xe5\x86\x85\xe5\xae\xb9\xe3\x82\x92\xe7\xa2\xba\xe8\xaa\x8d\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84\\n"'
 msgid "REPO ID..."
 msgstr "REPO ID..."
 
+msgid "test whether node ids are known to a repo"
+msgstr ""
+
+msgid ""
+"    Every ID must be a full-length hex node id string. Returns a list of 0s\n"
+"    and 1s indicating unknown/known.\n"
+"    "
+msgstr ""
+
 msgid "LABEL..."
 msgstr "LABEL..."
 
+msgid "backwards compatibility with old bash completion scripts (DEPRECATED)"
+msgstr ""
+
 msgid "free the store lock (DANGEROUS)"
 msgstr "管理領域の排他の解放 (危険)"
 
 msgid "free the working state lock (DANGEROUS)"
 msgstr "作業領域の排他の解放 (危険)"
 
+msgid "set the store lock until stopped"
+msgstr ""
+
+#, fuzzy
+msgid "set the working state lock until stopped"
+msgstr "作業領域の排他の解放 (危険)"
+
+#, fuzzy
+msgid "show or modify state of locks"
+msgstr "変更されたファイルを表示"
+
+msgid ""
+"    By default, this command will show which locks are held. This\n"
+"    includes the user and process holding the lock, the amount of time\n"
+"    the lock has been held, and the machine name where the process is\n"
+"    running if it's not local."
+msgstr ""
+
+msgid ""
+"    Locks protect the integrity of Mercurial's data, so should be\n"
+"    treated with care. System crashes or other interruptions may cause\n"
+"    locks to not be properly released, though Mercurial will usually\n"
+"    detect and remove such stale locks automatically."
+msgstr ""
+
+msgid ""
+"    However, detecting stale locks may not always be possible (for\n"
+"    instance, on a shared filesystem). Removing locks may also be\n"
+"    blocked by filesystem permissions."
+msgstr ""
+
+msgid ""
+"    Setting a lock will prevent other commands from changing the data.\n"
+"    The command will wait until an interruption (SIGINT, SIGTERM, ...) "
+"occurs.\n"
+"    The set locks are removed when the command exits."
+msgstr ""
+
+#, fuzzy
+msgid "    Returns 0 if no locks are held."
+msgstr ""
+"    成功時のコマンド終了値は 0 です。\n"
+"    "
+
+#, fuzzy
+msgid "wlock is already held"
+msgstr "パッチ状態は保存済みです\n"
+
+#, fuzzy
+msgid "lock is already held"
+msgstr "パッチ状態は保存済みです\n"
+
+msgid "ready to release the lock (y)? $$ &Yes"
+msgstr ""
+
+#, fuzzy
+msgid "print merge state"
+msgstr "送信予定のメールの内容を表示"
+
+msgid ""
+"    Use --verbose to print out information about whether v1 or v2 merge "
+"state\n"
+"    was chosen."
+msgstr ""
+
 msgid "NAME..."
 msgstr "NAME..."
 
+msgid "complete \"names\" - tags, open branch names, bookmark names"
+msgstr ""
+
 msgid "markers flag"
 msgstr "廃止マーカ用フラグ"
 
@@ -17213,6 +19712,10 b' msgstr "\xe5\xbb\x83\xe6\xad\xa2\xe5\xaf\xbe\xe8\xb1\xa1\xe3\x81\xb8\xe3\x81\xae\xe8\xa6\xaa\xe6\x83\x85\xe5\xa0\xb1\xe3\x81\xae\xe8\xa8\x98\xe9\x8c\xb2"'
 msgid "display markers relevant to REV"
 msgstr "指定リビジョンに関連するマーカの表示"
 
+#, fuzzy
+msgid "restrict display to markers only relevant to REV"
+msgstr "指定リビジョンに関連するマーカの表示"
+
 msgid "display index of the marker"
 msgstr "廃止マーカのインデックス値を表示"
 
@@ -17222,6 +19725,14 b' msgstr "\xe6\x8c\x87\xe5\xae\x9a\xe3\x82\xa4\xe3\x83\xb3\xe3\x83\x87\xe3\x83\x83\xe3\x82\xaf\xe3\x82\xb9\xe3\x81\xae\xe5\xbb\x83\xe6\xad\xa2\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xab\xe3\x82\x92\xe7\xa0\xb4\xe6\xa3\x84"'
 msgid "[OBSOLETED [REPLACEMENT ...]]"
 msgstr "[OBSOLETED [REPLACEMENT ...]]"
 
+#, fuzzy
+msgid "create arbitrary obsolete marker"
+msgstr "%i 個の廃止マーカを破棄\n"
+
+#, fuzzy
+msgid "    With no arguments, displays the list of obsolescence markers."
+msgstr "    引数指定が無い場合、 コマンドの一覧と概要を表示します。"
+
 #, python-format
 msgid "invalid index value: %r"
 msgstr "不正なインデックス値: %r"
@@ -17249,9 +19760,132 b' msgstr "\xe9\x80\x9a\xe5\xb8\xb8\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xae\xe3\x81\xbf\xe3\x82\x92\xe8\xa1\xa8\xe7\xa4\xba"'
 msgid "FILESPEC..."
 msgstr "FILESPEC..."
 
+#, fuzzy
+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 ""
+
+#, fuzzy
+msgid "establish a connection to a peer repository"
+msgstr "%s への ssl 接続に失敗"
+
+#, fuzzy, python-format
+msgid "url: %s\n"
+msgstr "ユーザ: %s\n"
+
+#, fuzzy, python-format
+msgid "local: %s\n"
+msgstr "a: %s\n"
+
+#, fuzzy
+msgid "no"
+msgstr "now"
+
+#, fuzzy
+msgid "yes"
+msgstr "バイト"
+
+#, fuzzy, python-format
+msgid "pushable: %s\n"
+msgstr "履歴反映に失敗: %s"
+
+#, fuzzy
+msgid "check for files in this revision"
+msgstr "指定リビジョンに対する fileset 記述の適用"
+
+msgid "emulate merging change and delete"
+msgstr ""
+
+#, fuzzy
+msgid "[PATTERN]..."
+msgstr "パターン"
+
+msgid "examine which merge tool is chosen for specified file"
+msgstr ""
+
+msgid ""
+"    As described in :hg:`help merge-tools`, Mercurial examines\n"
+"    configurations below in this order to decide which merge tool is\n"
+"    chosen for specified file."
+msgstr ""
+
+msgid ""
+"    1. ``--tool`` option\n"
+"    2. ``HGMERGE`` environment variable\n"
+"    3. configurations in ``merge-patterns`` section\n"
+"    4. configuration of ``ui.merge``\n"
+"    5. configurations in ``merge-tools`` section\n"
+"    6. ``hgmerge`` tool (for historical reason only)\n"
+"    7. default tool for fallback (``:merge`` or ``:prompt``)"
+msgstr ""
+
+#, fuzzy
+msgid "    This command writes out examination result in the style below::"
+msgstr ""
+"    本コマンドは以下と等価です (※ 訳注: 2つ目以降は FILE や `--rev REV`\n"
+"    指定時の挙動に対応します)::"
+
+msgid "        FILE = MERGETOOL"
+msgstr ""
+
+msgid ""
+"    By default, all files known in the first parent context of the\n"
+"    working directory are examined. Use file patterns and/or -I/-X\n"
+"    options to limit target files. -r/--rev is also useful to examine\n"
+"    files in another context without actual updating to it."
+msgstr ""
+
+msgid ""
+"    With --debug, this command shows warning messages while matching\n"
+"    against ``merge-patterns`` and so on, too. It is recommended to\n"
+"    use this option with explicit file patterns and/or -I/-X options,\n"
+"    because this option increases amount of output per file according\n"
+"    to configurations in hgrc."
+msgstr ""
+
+msgid ""
+"    With -v/--verbose, this command shows configurations below at\n"
+"    first (only if specified)."
+msgstr ""
+
+msgid ""
+"    - ``--tool`` option\n"
+"    - ``HGMERGE`` environment variable\n"
+"    - configuration of ``ui.merge``"
+msgstr ""
+
+msgid ""
+"    If merge tool is chosen before matching against\n"
+"    ``merge-patterns``, this command can't show any helpful\n"
+"    information, even with --debug. In such case, information above is\n"
+"    useful to know why a merge tool is chosen.\n"
+"    "
+msgstr ""
+
 msgid "REPO NAMESPACE [KEY OLD NEW]"
 msgstr "REPO NAMESPACE [KEY OLD NEW]"
 
+msgid "access the pushkey key/value protocol"
+msgstr ""
+
+msgid "    With two args, list the keys in the given namespace."
+msgstr ""
+
+msgid ""
+"    With five args, set a key to new if it currently is set to old.\n"
+"    Reports success or failure.\n"
+"    "
+msgstr ""
+
 msgid "A B"
 msgstr "A B"
 
@@ -17277,12 +19911,47 b' msgstr "\xe5\x86\x8d\xe6\xa7\x8b\xe7\xaf\x89\xe5\xaf\xbe\xe8\xb1\xa1\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3"'
 msgid "only rebuild files that are inconsistent with the working copy parent"
 msgstr "作業領域の親リビジョンに対して、 不適切なファイルのみ、 状態を再構築"
 
+msgid "rebuild the dirstate as it would look like for the given revision"
+msgstr ""
+
+#, fuzzy
+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 ""
+"    ``minimal`` will only rebuild the dirstate status for files that claim "
+"to be\n"
+"    tracked but are not in the parent manifest, or that exist in the parent\n"
+"    manifest but are not in the dirstate. It will not change adds, removes, "
+"or\n"
+"    modified files that are in the working copy parent."
+msgstr ""
+
+msgid ""
+"    One use of this command is to make the next :hg:`status` invocation\n"
+"    check the actual file content.\n"
+"    "
+msgstr ""
+
+msgid "rebuild the fncache file"
+msgstr ""
+
 msgid "revision to debug"
 msgstr "デバッグ対象リビジョン"
 
 msgid "[-r REV] FILE"
 msgstr "[-r REV] FILE"
 
+#, fuzzy
+msgid "dump rename information"
+msgstr "共通の祖先リビジョンの情報表示"
+
 #, python-format
 msgid "%s renamed from %s:%s\n"
 msgstr "%s は %s:%s で改名されました\n"
@@ -17294,9 +19963,19 b' msgstr "%s \xe3\x81\xaf\xe6\x94\xb9\xe5\x90\x8d\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xa6\xe3\x81\x84\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93\\n"'
 msgid "dump index data"
 msgstr "インデックスデータのダンプ"
 
+msgid "show data and statistics about a revlog"
+msgstr ""
+
 msgid "print parsed tree after optimizing (DEPRECATED)"
 msgstr "最適化後の解析ツリーの表示 (非推奨)"
 
+#, fuzzy
+msgid "print list of result revisions (default)"
+msgstr "リビジョン番号を表示(既定動作)"
+
+msgid "print internal representation of result set"
+msgstr ""
+
 msgid "print parsed tree at the given stage"
 msgstr "指定解析段階における解析ツリーの表示"
 
@@ -17306,6 +19985,27 b' msgstr "\xe6\x9c\x80\xe9\x81\xa9\xe5\x8c\x96\xe7\x84\xa1\xe3\x81\x97\xe3\x81\xa7\xe8\xa7\xa3\xe6\x9e\x90\xe3\x83\x84\xe3\x83\xaa\xe3\x83\xbc\xe3\x82\x92\xe8\xa9\x95\xe4\xbe\xa1"'
 msgid "verify optimized result"
 msgstr "最適化結果を検証"
 
+msgid "parse and apply a revision specification"
+msgstr ""
+
+msgid ""
+"    Use -p/--show-stage option to print the parsed tree at the given "
+"stages.\n"
+"    Use -p all to print tree at every stage."
+msgstr ""
+
+msgid ""
+"    Use --no-show-revs option with -s or -p to print only the set\n"
+"    representation or the parsed tree respectively."
+msgstr ""
+
+msgid ""
+"    Use --verify-optimized to compare the optimized result with the "
+"unoptimized\n"
+"    one. Returns 1 if the optimized result differs.\n"
+"    "
+msgstr ""
+
 msgid "cannot use --verify-optimized with --no-optimized"
 msgstr "--verify-optimized と --no-optimized は併用できません"
 
@@ -17316,43 +20016,775 b' msgstr "--optimize \xe3\x81\xa8 --show-stage \xe3\x81\xaf\xe4\xbd\xb5\xe7\x94\xa8\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"'
 msgid "invalid stage name: %s"
 msgstr "不正な解析段階名: %s"
 
+msgid "run an SSH server bound to process handles"
+msgstr ""
+
+msgid "file descriptor to log server I/O to"
+msgstr ""
+
+msgid "file to log server I/O to"
+msgstr ""
+
+msgid "run a server with advanced settings"
+msgstr ""
+
+msgid ""
+"    This command is similar to :hg:`serve`. It exists partially as a\n"
+"    workaround to the fact that ``hg serve --stdio`` must have specific\n"
+"    arguments for security reasons.\n"
+"    "
+msgstr ""
+
+#, fuzzy
+msgid "only --sshstdio is currently supported"
+msgstr "    以下のオプションを指定できます:"
+
+#, fuzzy
+msgid "cannot use both --logiofd and --logiofile"
+msgstr "--force と --keep-changes は併用できません"
+
 msgid "REV1 [REV2]"
 msgstr "REV1 [REV2]"
 
+#, fuzzy
+msgid "manually set the parents of the current working directory"
+msgstr "作業領域の親リビジョンの改変"
+
+msgid ""
+"    This is useful for writing repository conversion tools, but should\n"
+"    be used with care. For example, neither the working directory nor the\n"
+"    dirstate is updated, so file status may be incorrect after running this\n"
+"    command."
+msgstr ""
+
+#, fuzzy
+msgid "test a secure connection to a server"
+msgstr "%s への ssl 接続に失敗"
+
+msgid ""
+"    This builds the certificate chain for the server on Windows, installing "
+"the\n"
+"    missing intermediates and trusted root via Windows Update if necessary.  "
+"It\n"
+"    does nothing on other platforms."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    If SOURCE is omitted, the 'default' path will be used.  If a URL is "
+"given,\n"
+"    that server is used. See :hg:`help urls` for more information."
+msgstr ""
+"    連携先が省略された場合、 'default' パスが連携先として使用されます。\n"
+"    詳細は :hg:`help urls` を参照してください。"
+
+msgid ""
+"    If the update succeeds, retry the original operation.  Otherwise, the "
+"cause\n"
+"    of the SSL error is likely another issue.\n"
+"    "
+msgstr ""
+
+msgid "certificate chain building is only possible on Windows"
+msgstr ""
+
+#, fuzzy
+msgid "there is no Mercurial repository here, and no server specified"
+msgstr "Mercurial リポジトリが見つかりません(.hg が不在です)"
+
+#, fuzzy
+msgid "malformed port number in URL"
+msgstr "不正なパスワード文字列"
+
+#, fuzzy
+msgid "only https and ssh connections are supported"
+msgstr "    以下のオプションを指定できます:"
+
+#, fuzzy, python-format
+msgid "checking the certificate chain for %s\n"
+msgstr "%s 用の証明書ファイル"
+
+msgid "certificate chain is incomplete, updating... "
+msgstr ""
+
+#, fuzzy
+msgid "failed.\n"
+msgstr "seek に失敗しました\n"
+
+#, fuzzy
+msgid "done.\n"
+msgstr "完了\n"
+
+msgid "full certificate chain is available\n"
+msgstr ""
+
 msgid "revision to check"
 msgstr "確認対象リビジョン"
 
 msgid "[-r REV] [REV]"
 msgstr "[-r REV] [REV]"
 
+msgid "return closest successors sets only"
+msgstr ""
+
 msgid "[REV]"
 msgstr "[REV]"
 
+#, fuzzy
+msgid "show set of successors for revision"
+msgstr "親リビジョンの表示対象"
+
+msgid ""
+"    A successors set of changeset A is a consistent group of revisions that\n"
+"    succeed A. It contains non-obsolete changesets only unless closests\n"
+"    successors set is set."
+msgstr ""
+
+msgid ""
+"    In most cases a changeset A has a single successors set containing a "
+"single\n"
+"    successor (changeset A replaced by A')."
+msgstr ""
+
+msgid ""
+"    A changeset that is made obsolete with no successors are called \"pruned"
+"\".\n"
+"    Such changesets have no successors sets at all."
+msgstr ""
+
+msgid ""
+"    A changeset that has been \"split\" will have a successors set "
+"containing\n"
+"    more than one successor."
+msgstr ""
+
+msgid ""
+"    A changeset that has been rewritten in multiple different ways is "
+"called\n"
+"    \"divergent\". Such changesets have multiple successor sets (each of "
+"which\n"
+"    may also be split, i.e. have multiple successors)."
+msgstr ""
+
+#, fuzzy
+msgid "    Results are displayed as follows::"
+msgstr "    以下のファイル形式を想定しています::"
+
+msgid ""
+"        <rev1>\n"
+"            <successors-1A>\n"
+"        <rev2>\n"
+"            <successors-2A>\n"
+"            <successors-2B1> <successors-2B2> <successors-2B3>"
+msgstr ""
+
+msgid ""
+"    Here rev2 has two possible (i.e. divergent) successors sets. The first\n"
+"    holds one element, whereas the second holds three (i.e. the changeset "
+"has\n"
+"    been split).\n"
+"    "
+msgstr ""
+
 msgid "apply template on changesets"
 msgstr "指定テンプレートでリビジョン表示"
 
-msgid "KEY=VALUE"
-msgstr "キーワード=値"
-
 msgid "define template keyword"
 msgstr "テンプレートキーワードを定義"
 
 msgid "[-r REV]... [-D KEY=VALUE]... TEMPLATE"
 msgstr "[-r REV]... [-D KEY=VALUE]... TEMPLATE"
 
+#, fuzzy
+msgid "parse and apply a template"
+msgstr "テンプレートを指定してください"
+
+msgid ""
+"    If -r/--rev is given, the template is processed as a log template and\n"
+"    applied to the given changesets. Otherwise, it is processed as a "
+"generic\n"
+"    template."
+msgstr ""
+
+msgid ""
+"    Use --verbose to print the parsed tree.\n"
+"    "
+msgstr ""
+
 #, python-format
 msgid "malformed keyword definition: %s"
 msgstr "不正なキーワード定義: %s"
 
+msgid "prompt text"
+msgstr ""
+
+#, fuzzy
+msgid "[-p TEXT]"
+msgstr "テキスト"
+
+msgid "show prompt to type password"
+msgstr ""
+
+msgid "show plain prompt"
+msgstr ""
+
+#, fuzzy
+msgid "warm all known caches in the repository"
+msgstr "リポジトリ中の全リビジョンをバンドルに含める"
+
 msgid "extra optimization to perform"
 msgstr "追加実施する最適化"
 
 msgid "performs an upgrade"
 msgstr "アップグレードの実施"
 
+#, fuzzy
+msgid "upgrade a repository to use different features"
+msgstr "リンク元とリンク先が同一ファイルシステム上にありません"
+
+msgid ""
+"    If no arguments are specified, the repository is evaluated for upgrade\n"
+"    and a list of problems and potential optimizations is printed."
+msgstr ""
+
+msgid ""
+"    With ``--run``, a repository upgrade is performed. Behavior of the "
+"upgrade\n"
+"    can be influenced via additional arguments. More details will be "
+"provided\n"
+"    by the command output when run without ``--run``."
+msgstr ""
+
+msgid ""
+"    During the upgrade, the repository will be locked and no writes will be\n"
+"    allowed."
+msgstr ""
+
+msgid ""
+"    At the end of the upgrade, the repository may not be readable while new\n"
+"    repository data is swapped in. This window will be as long as it takes "
+"to\n"
+"    rename some directories inside the ``.hg`` directory. On most machines, "
+"this\n"
+"    should complete almost instantaneously and the chances of a consumer "
+"being\n"
+"    unable to access the repository should be low.\n"
+"    "
+msgstr ""
+
+#, fuzzy
+msgid "show how files match on given patterns"
+msgstr "指定パターンに合致するファイルがありません"
+
+#, fuzzy
+msgid "explain instabilities of a changeset"
+msgstr "リビジョンから参照されていないファイル"
+
 msgid "REPO [OPTIONS]... [ONE [TWO]]"
 msgstr "REPO [OPTIONS]... [ONE [TWO]]"
 
+msgid "indented line outside of block"
+msgstr ""
+
+msgid "start an SSH server for this repo"
+msgstr ""
+
+#, fuzzy
+msgid "construct a specific version of the peer"
+msgstr "指定リビジョン時点の内容表示"
+
+msgid "do not read from stderr of the remote"
+msgstr ""
+
+msgid "do not log I/O related to the peer handshake"
+msgstr ""
+
+msgid "send wire protocol commands to a server"
+msgstr ""
+
+msgid ""
+"    This command can be used to issue wire protocol commands to remote\n"
+"    peers and to debug the raw data being exchanged."
+msgstr ""
+
+msgid ""
+"    ``--localssh`` will start an SSH server against the current repository\n"
+"    and connect to that. By default, the connection will perform a "
+"handshake\n"
+"    and establish an appropriate peer instance."
+msgstr ""
+
+msgid ""
+"    ``--peer`` can be used to bypass the handshake protocol and construct a\n"
+"    peer instance using the specified class type. Valid values are ``raw``,\n"
+"    ``http2``, ``ssh1``, and ``ssh2``. ``raw`` instances only allow sending\n"
+"    raw data payloads and don't support higher-level command actions."
+msgstr ""
+
+msgid ""
+"    ``--noreadstderr`` can be used to disable automatic reading from stderr\n"
+"    of the peer (for SSH connections only). Disabling automatic reading of\n"
+"    stderr is useful for making output more deterministic."
+msgstr ""
+
+msgid ""
+"    Commands are issued via a mini language which is specified via stdin.\n"
+"    The language consists of individual actions to perform. An action is\n"
+"    defined by a block. A block is defined as a line with no leading\n"
+"    space followed by 0 or more lines with leading space. Blocks are\n"
+"    effectively a high-level command with additional metadata."
+msgstr ""
+
+#, fuzzy
+msgid "    Lines beginning with ``#`` are ignored."
+msgstr "    空行と ``#`` で始まる行は無視されます。"
+
+#, fuzzy
+msgid "    The following sections denote available actions."
+msgstr "以下の ``share.`` セクション設定が、この機能を制御します:"
+
+#, fuzzy
+msgid ""
+"    raw\n"
+"    ---"
+msgstr ""
+"\n"
+"    /tags\n"
+"    -----"
+
+msgid "    Send raw data to the server."
+msgstr ""
+
+msgid ""
+"    The block payload contains the raw data to send as one atomic send\n"
+"    operation. The data may not actually be delivered in a single system\n"
+"    call: it depends on the abilities of the transport being used."
+msgstr ""
+
+msgid ""
+"    Each line in the block is de-indented and concatenated. Then, that\n"
+"    value is evaluated as a Python b'' literal. This allows the use of\n"
+"    backslash escaping, etc."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    raw+\n"
+"    ----"
+msgstr ""
+"\n"
+"    /tags\n"
+"    -----"
+
+msgid "    Behaves like ``raw`` except flushes output afterwards."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    command <X>\n"
+"    -----------"
+msgstr ""
+"\n"
+"    /bookmarks\n"
+"    ----------"
+
+msgid ""
+"    Send a request to run a named command, whose name follows the "
+"``command``\n"
+"    string."
+msgstr ""
+
+msgid ""
+"    Arguments to the command are defined as lines in this block. The format "
+"of\n"
+"    each line is ``<key> <value>``. e.g.::"
+msgstr ""
+
+msgid ""
+"       command listkeys\n"
+"           namespace bookmarks"
+msgstr ""
+
+msgid ""
+"    If the value begins with ``eval:``, it will be interpreted as a Python\n"
+"    literal expression. Otherwise values are interpreted as Python b'' "
+"literals.\n"
+"    This allows sending complex types and encoding special byte sequences "
+"via\n"
+"    backslash escaping."
+msgstr ""
+
+#, fuzzy
+msgid "    The following arguments have special meaning:"
+msgstr "    以下のオプションを指定できます:"
+
+msgid ""
+"    ``PUSHFILE``\n"
+"        When defined, the *push* mechanism of the peer will be used instead\n"
+"        of the static request-response mechanism and the content of the\n"
+"        file specified in the value of this argument will be sent as the\n"
+"        command payload."
+msgstr ""
+
+msgid "        This can be used to submit a local bundle file to the remote."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    batchbegin\n"
+"    ----------"
+msgstr ""
+"\n"
+"    /branches\n"
+"    ---------"
+
+msgid "    Instruct the peer to begin a batched send."
+msgstr ""
+
+msgid ""
+"    All ``command`` blocks are queued for execution until the next\n"
+"    ``batchsubmit`` block."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    batchsubmit\n"
+"    -----------"
+msgstr ""
+"\n"
+"    /branches\n"
+"    ---------"
+
+msgid "    Submit previously queued ``command`` blocks as a batch request."
+msgstr ""
+
+msgid "    This action MUST be paired with a ``batchbegin`` action."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    httprequest <method> <path>\n"
+"    ---------------------------"
+msgstr ""
+"\n"
+"    /annotate/{revision}/{path}\n"
+"    ---------------------------"
+
+msgid "    (HTTP peer only)"
+msgstr ""
+
+msgid "    Send an HTTP request to the peer."
+msgstr ""
+
+msgid ""
+"    The HTTP request line follows the ``httprequest`` action. e.g. ``GET /"
+"foo``."
+msgstr ""
+
+msgid ""
+"    Arguments of the form ``<key>: <value>`` are interpreted as HTTP "
+"request\n"
+"    headers to add to the request. e.g. ``Accept: foo``."
+msgstr ""
+
+#, fuzzy
+msgid "    The following arguments are special:"
+msgstr "    以下のオプションを指定できます:"
+
+msgid ""
+"    ``BODYFILE``\n"
+"        The content of the file defined as the value to this argument will "
+"be\n"
+"        transferred verbatim as the HTTP request body."
+msgstr ""
+
+msgid ""
+"    ``frame <type> <flags> <payload>``\n"
+"        Send a unified protocol frame as part of the request body."
+msgstr ""
+
+msgid ""
+"        All frames will be collected and sent as the body to the HTTP\n"
+"        request."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    close\n"
+"    -----"
+msgstr ""
+"\n"
+"    /tags\n"
+"    -----"
+
+#, fuzzy
+msgid "    Close the connection to the server."
+msgstr "%s への ssl 接続に失敗"
+
+#, fuzzy
+msgid ""
+"    flush\n"
+"    -----"
+msgstr ""
+"\n"
+"    /tags\n"
+"    -----"
+
+msgid "    Flush data written to the server."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    readavailable\n"
+"    -------------"
+msgstr ""
+"\n"
+"    /shortlog\n"
+"    ---------"
+
+msgid ""
+"    Close the write end of the connection and read all available data from\n"
+"    the server."
+msgstr ""
+
+msgid ""
+"    If the connection to the server encompasses multiple pipes, we poll "
+"both\n"
+"    pipes and read available data."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    readline\n"
+"    --------"
+msgstr ""
+"\n"
+"    /branches\n"
+"    ---------"
+
+msgid ""
+"    Read a line of output from the server. If there are multiple output\n"
+"    pipes, reads only the main pipe."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    ereadline\n"
+"    ---------"
+msgstr ""
+"\n"
+"    /branches\n"
+"    ---------"
+
+msgid "    Like ``readline``, but read from the stderr pipe, if available."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    read <X>\n"
+"    --------"
+msgstr ""
+"\n"
+"    /branches\n"
+"    ---------"
+
+msgid "    ``read()`` N bytes from the server's main output pipe."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    eread <X>\n"
+"    ---------"
+msgstr ""
+"\n"
+"    /branches\n"
+"    ---------"
+
+msgid "    ``read()`` N bytes from the server's stderr pipe, if available."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    Specifying Unified Frame-Based Protocol Frames\n"
+"    ----------------------------------------------"
+msgstr "     HG: ------------------------ >8 ------------------------"
+
+msgid ""
+"    It is possible to emit a *Unified Frame-Based Protocol* by using "
+"special\n"
+"    syntax."
+msgstr ""
+
+msgid ""
+"    A frame is composed as a type, flags, and payload. These can be parsed\n"
+"    from a string of the form:"
+msgstr ""
+
+msgid "       <request-id> <stream-id> <stream-flags> <type> <flags> <payload>"
+msgstr ""
+
+msgid ""
+"    ``request-id`` and ``stream-id`` are integers defining the request and\n"
+"    stream identifiers."
+msgstr ""
+
+msgid ""
+"    ``type`` can be an integer value for the frame type or the string name\n"
+"    of the type. The strings are defined in ``wireprotoframing.py``. e.g.\n"
+"    ``command-name``."
+msgstr ""
+
+msgid ""
+"    ``stream-flags`` and ``flags`` are a ``|`` delimited list of flag\n"
+"    components. Each component (and there can be just one) can be an "
+"integer\n"
+"    or a flag name for stream flags or frame flags, respectively. Values "
+"are\n"
+"    resolved to integers and then bitwise OR'd together."
+msgstr ""
+
+msgid ""
+"    ``payload`` represents the raw frame payload. If it begins with\n"
+"    ``cbor:``, the following string is evaluated as Python code and the\n"
+"    resulting object is fed into a CBOR encoder. Otherwise it is "
+"interpreted\n"
+"    as a Python byte string literal.\n"
+"    "
+msgstr ""
+
+#, fuzzy
+msgid "--localssh requires a repository"
+msgstr "remote にはリポジトリパスを指定してください"
+
+#, fuzzy
+msgid "invalid value for --peer"
+msgstr "--daemon-postexec への指定値が不正です: %s"
+
+msgid "valid values are \"raw\", \"ssh1\", and \"ssh2\""
+msgstr ""
+
+#, fuzzy
+msgid "cannot specify --localssh with an explicit path"
+msgstr "パッチ適用中に、 --exact 付きでのパッチ適用はできません"
+
+#, fuzzy
+msgid "(waiting for commands on stdin)\n"
+msgstr "警告: ファイル %s でのコマンド解析中にエラー発生\n"
+
+msgid "creating ssh peer for wire protocol version 1\n"
+msgstr ""
+
+msgid "creating ssh peer for wire protocol version 2\n"
+msgstr ""
+
+#, fuzzy
+msgid "using raw connection to peer\n"
+msgstr "%s への ssl 接続に失敗"
+
+msgid "creating ssh peer from handshake results\n"
+msgstr ""
+
+#, fuzzy
+msgid "only http:// paths are currently supported"
+msgstr "全てのパッチが適用中です\n"
+
+msgid "creating http peer for wire protocol version 2\n"
+msgstr ""
+
+msgid "could not instantiate HTTP peer for wire protocol version 2"
+msgstr ""
+
+msgid ""
+"the server may not have the feature enabled or is not allowing this client "
+"version"
+msgstr ""
+
+#, python-format
+msgid "--peer %s not supported with HTTP peers"
+msgstr ""
+
+#, fuzzy
+msgid "unsupported connection configuration"
+msgstr "未サポートの行末種別: %s"
+
+msgid "cannot call raw/raw+ on this peer"
+msgstr ""
+
+#, fuzzy
+msgid "cannot call flush on this peer"
+msgstr "null リビジョンのフェーズは変更できません"
+
+msgid "cannot send commands unless peer instance is available"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "sending %s command\n"
+msgstr "通知コマンド %s 実行中\n"
+
+#, fuzzy, python-format
+msgid "result: %s\n"
+msgstr "認証領域(realm): %s\n"
+
+#, fuzzy, python-format
+msgid "remote output: %s\n"
+msgstr "連携先: 中止: %s\n"
+
+#, fuzzy, python-format
+msgid "response: %s\n"
+msgstr "連携先同期:   %s\n"
+
+msgid "nested batchbegin not allowed"
+msgstr ""
+
+#, python-format
+msgid "sending batch with %d sub-commands\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "response #%d: %s\n"
+msgstr "連携先同期:   %s\n"
+
+msgid "cannot use httprequest without an HTTP peer"
+msgstr ""
+
+msgid "invalid httprequest: expected format is \"httprequest <method> <path>"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "unknown argument to httprequest: %s"
+msgstr "未知のダイジェスト種別: %s"
+
+#, fuzzy, python-format
+msgid "cbor> %s\n"
+msgstr "中止: %s\n"
+
+#, fuzzy
+msgid "readavailable not available on this peer"
+msgstr "このシステムでは IPv6 を利用できません"
+
+#, fuzzy
+msgid "readline not available on this peer"
+msgstr "このシステムでは IPv6 を利用できません"
+
+#, fuzzy
+msgid "ereadline not available on this peer"
+msgstr "このシステムでは IPv6 を利用できません"
+
+#, fuzzy
+msgid "read not available on this peer"
+msgstr "このシステムでは IPv6 を利用できません"
+
+#, fuzzy
+msgid "eread not available on this peer"
+msgstr "このシステムでは IPv6 を利用できません"
+
+#, fuzzy, python-format
+msgid "unknown action: %s"
+msgstr "未知の操作 \"%s\" が指定されました"
+
+msgid "unclosed \"batchbegin\" request"
+msgstr ""
+
 msgid ""
 "multiple matching bookmarks to merge - please merge with an explicit rev or "
 "bookmark"
@@ -17453,14 +20885,15 b' msgid "(committing will reopen branch \\"'
 msgstr "(閉鎖済みヘッドでのコミットはブランチ \"%s\" の閉鎖を解除します)\n"
 
 #, python-format
+msgid "updated to \"%s: %s\"\n"
+msgstr "リビジョン \"%s: %s\" で更新\n"
+
+#, python-format
 msgid "%i other heads for branch \"%s\"\n"
 msgstr "他に %i 個のヘッドがブランチ \"%s\" に存在します\n"
 
-msgid "working directory state appears damaged!"
-msgstr "作業領域の状態管理に問題があります!"
-
-msgid "working directory state may be changed parallelly"
-msgstr "作業領域状態が平行して更新された可能性があります"
+msgid "incomplete hunk"
+msgstr ""
 
 #, python-format
 msgid "directory %r already in dirstate"
@@ -17474,13 +20907,19 b' msgstr "\xe7\xae\xa1\xe7\x90\x86\xe6\x83\x85\xe5\xa0\xb1\xe4\xb8\xad\xe3\x81\xae\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab %r \xe3\x81\xaf %r \xe3\x81\xab\xe3\x82\x88\xe3\x81\xa3\xe3\x81\xa6\xe7\xa0\xb4\xe5\xa3\x8a\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xbe\xe3\x81\x99"'
 msgid "setting %r to other parent only allowed in merges"
 msgstr "%r の別親への設定はマージでのみ可能です"
 
-#, 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 "working directory state may be changed parallelly"
+msgstr "作業領域状態が平行して更新された可能性があります"
+
+msgid "working directory state appears damaged!"
+msgstr "作業領域の状態管理に問題があります!"
+
+#, 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"
 
 #, python-format
 msgid "push creates new remote branches: %s!"
@@ -17489,10 +20928,6 b' msgstr "\xe9\x80\xa3\xe6\x90\xba\xe5\x85\x88\xe3\x81\xab\xe6\x96\xb0\xe3\x81\x97\xe3\x81\x84\xe3\x83\x96\xe3\x83\xa9\xe3\x83\xb3\xe3\x83\x81\xe3\x81\x8c\xe4\xbd\x9c\xe6\x88\x90\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xbe\xe3\x81\x99: %s!"'
 msgid "use 'hg push --new-branch' to create new remote branches"
 msgstr "連携先への新規ブランチ作成は 'hg push --new-branch'"
 
-#, python-format
-msgid "and %s others"
-msgstr "その他 %s 個"
-
 msgid "remote has heads that are not known locally\n"
 msgstr "連携先には新規ヘッドが存在します\n"
 
@@ -17535,14 +20970,6 b' msgid "new remote heads on branch \'%s\':\\'
 msgstr "以下の新しいヘッドが連携先のブランチ '%s' に作成されます:\n"
 
 #, python-format
-msgid "(did you mean %s?)\n"
-msgstr "(推測される候補: %s)\n"
-
-#, python-format
-msgid "(did you mean one of %s?)\n"
-msgstr "(推測される候補: %s)\n"
-
-#, python-format
 msgid "hg: parse error at %s: %s\n"
 msgstr "hg: %s での解析エラー: %s\n"
 
@@ -17557,6 +20984,17 b' msgstr "hg: \xe8\xa7\xa3\xe6\x9e\x90\xe3\x82\xa8\xe3\x83\xa9\xe3\x83\xbc: %s\\n"'
 msgid "(%s)\n"
 msgstr "(%s)\n"
 
+#, python-format
+msgid "** ProgrammingError: %s\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "** (%s)\n"
+msgstr "(%s)\n"
+
+msgid "killed!\n"
+msgstr "強制終了されました!\n"
+
 msgid "interrupted!\n"
 msgstr "中断されました!\n"
 
@@ -17615,6 +21053,10 b' msgstr "\'%s\' \xe3\x81\x8c\xe6\x9c\xaa\xe7\x9f\xa5\xe3\x81\xae\xe3\x82\xb3\xe3\x83\x9e\xe3\x83\xb3\xe3\x83\x89 \'%s\' \xe3\x81\xae\xe5\x88\xa5\xe5\x90\x8d\xe3\x81\xa8\xe3\x81\xbf\xe3\x81\xaa\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xbe\xe3\x81\x97\xe3\x81\x9f"'
 msgid "alias '%s' resolves to ambiguous command '%s'"
 msgstr "'%s' が曖昧なコマンド '%s' の別名とみなされました"
 
+#, fuzzy, python-format
+msgid "non-ASCII character in alias definition '%s:%s'"
+msgstr "dag 記述に不正な文字が使われています: %s..."
+
 #, python-format
 msgid "'%s' is provided by '%s' extension"
 msgstr "'%s' コマンドは '%s' エクステンションにより提供されています"
@@ -17638,6 +21080,10 b' msgid ""'
 "repository may only be abbreviated as --repo!"
 msgstr "-R は単独記述(例: '-dR' は不可)、 --repository の略記は --repo のみ"
 
+#, fuzzy
+msgid "option --debugger may not be abbreviated!"
+msgstr "--cwd 指定値が省略されなかった可能性があります!"
+
 #, python-format
 msgid "time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
 msgstr "所要時間: 実時間 %.3f 秒 (ユーザ %.3f+%.3f システム %.3f+%.3f)\n"
@@ -17783,6 +21229,10 b' msgstr "\xe9\x80\xa3\xe6\x90\xba\xe5\x85\x88\xe3\x81\xae\xe3\x83\x96\xe3\x83\x83\xe3\x82\xaf\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xaf %s \xe3\x81\xae\xe5\x89\x8a\xe9\x99\xa4\xe3\x81\xab\xe5\xa4\xb1\xe6\x95\x97!\\n"'
 msgid "destination does not support push"
 msgstr "指定の連携先には履歴を反映できません"
 
+msgid ""
+"cannot push: destination does not support the unbundle wire protocol command"
+msgstr ""
+
 #, python-format
 msgid "bookmark %s does not exist on the local or remote repository!\n"
 msgstr "ブックマーク %s はいずれのリポジトリにも存在しません!\n"
@@ -17792,19 +21242,20 b' msgid "push includes obsolete changeset:'
 msgstr "履歴反映対象に廃止 (obsolete) リビジョンが含まれます！: %s"
 
 #, python-format
-msgid "push includes unstable changeset: %s!"
-msgstr "履歴反映対象に非永続 (unstable) リビジョンが含まれます！: %s"
-
-#, python-format
-msgid "push includes bumped changeset: %s!"
-msgstr ""
-
-#, python-format
-msgid "push includes divergent changeset: %s!"
-msgstr "履歴反映対象に分岐 (divergent) した後継リビジョンが含まれます！: %s"
-
-msgid "no common changegroup version"
-msgstr "利用可能な共通のバンドル形式バージョンがありません"
+msgid "push includes phase-divergent changeset: %s!"
+msgstr ""
+"履歴反映対象にフェーズ分岐 (phase-divergent) した後継リビジョンが含まれま"
+"す！: %s"
+
+#, python-format
+msgid "push includes content-divergent changeset: %s!"
+msgstr ""
+"履歴反映対象に内容分岐 (content-divergent) した後継リビジョンが含まれます！: "
+"%s"
+
+#, python-format
+msgid "push includes orphan changeset: %s!"
+msgstr "履歴反映対象に孤児 (orphan) リビジョンが含まれます！: %s"
 
 #, python-format
 msgid "updating %s to public failed"
@@ -17861,6 +21312,12 b' msgstr "bundle10 \xe3\x81\xa7\xe3\x81\xae\xe8\xa6\x81\xe6\xb1\x82\xe3\x81\xab\xe3\x81\xaf\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe6\x83\x85\xe5\xa0\xb1\xe3\x81\x8c\xe5\xbf\x85\xe8\xa6\x81\xe3\x81\xa7\xe3\x81\x99"'
 msgid "unsupported getbundle arguments: %s"
 msgstr "getbundle プロトコルに未知の引数が指定されました: %s"
 
+msgid "no common bookmarks exchange method"
+msgstr "ブックマーク情報が交換できません"
+
+msgid "no common phases exchange method"
+msgstr "フェーズ情報が交換できません"
+
 msgid "no clone bundles available on remote; falling back to regular clone\n"
 msgstr "連携先にclone用バンドルファイルがありません。通常clone処理を実施中\n"
 
@@ -17910,13 +21367,21 b' msgstr ""'
 "を無効化します)\n"
 
 #, python-format
+msgid "*** failed to set up extension %s: %s\n"
+msgstr "*** エクステンション %s の設定に失敗: %s\n"
+
+#, python-format
 msgid "*** failed to import extension %s from %s: %s\n"
-msgstr "*** %s のインポートに失敗 (%s): %s\n"
+msgstr "*** エクステンション %s のインポートに失敗 (%s): %s\n"
 
 #, python-format
 msgid "*** failed to import extension %s: %s\n"
 msgstr "*** %s のインポートに失敗: %s\n"
 
+#, python-format
+msgid "*** (%s)\n"
+msgstr "*** (%s)\n"
+
 msgid "(no help text available)"
 msgstr "(ヘルプはありません)"
 
@@ -17924,34 +21389,12 b' msgstr "(\xe3\x83\x98\xe3\x83\xab\xe3\x83\x97\xe3\x81\xaf\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93)"'
 msgid "warning: error finding commands in %s\n"
 msgstr "警告: ファイル %s でのコマンド解析中にエラー発生\n"
 
-#, python-format
-msgid "invalid value %r for option %s, expected int"
-msgstr "指定値 %r は整数値を想定しているオプション %s には不適切です"
-
-#, python-format
-msgid "couldn't find merge tool %s\n"
-msgstr "マージツール %s が見つかりません\n"
-
-#, python-format
-msgid "tool %s can't handle symlinks\n"
-msgstr "ツール %s はシンボリックリンクを扱えません\n"
-
-#, python-format
-msgid "tool %s can't handle binary\n"
-msgstr "ツール %s はバイナリを扱えません\n"
-
-#, python-format
-msgid "tool %s requires a GUI\n"
-msgstr "ツール %s は GUI が必要です\n"
-
-msgid ""
-"``:prompt``\n"
-"Asks the user which of the local `p1()` or the other `p2()` version to\n"
-"    keep as the merged version."
-msgstr ""
-"``:prompt``\n"
-"現行側 (`p1()`) と他方側 (`p2()`) のどちらをマージ結果に採用するか、\n"
-"    対話的に確認します。"
+msgid "expected int"
+msgstr "整数値を想定"
+
+#, python-format
+msgid "invalid value %r for option %s, %s"
+msgstr "指定値 %r はオプション %s には不適切です: %s"
 
 #, python-format
 msgid ""
@@ -17974,10 +21417,42 b' msgstr ""'
 "すか？$$ &Changed $$ &Delete $$ &Unresolved"
 
 #, python-format
-msgid ""
-"no tool found to merge %(fd)s\n"
-"keep (l)ocal%(l)s, take (o)ther%(o)s, or leave (u)nresolved?$$ &Local $$ "
-"&Other $$ &Unresolved"
+msgid "%s (for pattern %s)"
+msgstr "%s (パターン %s)"
+
+#, python-format
+msgid "couldn't find merge tool %s\n"
+msgstr "マージツール %s が見つかりません\n"
+
+#, python-format
+msgid "tool %s can't handle symlinks\n"
+msgstr "ツール %s はシンボリックリンクを扱えません\n"
+
+#, python-format
+msgid "tool %s can't handle binary\n"
+msgstr "ツール %s はバイナリを扱えません\n"
+
+#, python-format
+msgid "tool %s requires a GUI\n"
+msgstr "ツール %s は GUI が必要です\n"
+
+#, python-format
+msgid "no tool found to merge %s\n"
+msgstr "ファイル %s 向けマージツールは設定されていません\n"
+
+msgid ""
+"``:prompt``\n"
+"    Asks the user which of the local `p1()` or the other `p2()` version to\n"
+"    keep as the merged version."
+msgstr ""
+"``:prompt``\n"
+"    現行側 (`p1()`) と他方側 (`p2()`) のどちらをマージ結果に採用するか、\n"
+"    対話的に確認します。"
+
+#, fuzzy, python-format
+msgid ""
+"keep (l)ocal%(l)s, take (o)ther%(o)s, or leave (u)nresolved for %(fd)s?$$ "
+"&Local $$ &Other $$ &Unresolved"
 msgstr ""
 "ファイル %(fd)s のマージに適切なツールが見つかりません。\n"
 "現行側%(l)s:(l)ocal, 他方側%(o)s:(o)ther, 衝突未解消:(u)nresolved のいずれを"
@@ -18020,6 +21495,12 b' msgstr "\xe8\xad\xa6\xe5\x91\x8a: \xe5\x86\x85\xe9\x83\xa8\xe3\x83\x84\xe3\x83\xbc\xe3\x83\xab %s \xe3\x81\xaf\xe3\x82\xb7\xe3\x83\xb3\xe3\x83\x9c\xe3\x83\xaa\xe3\x83\x83\xe3\x82\xaf\xe3\x83\xaa\xe3\x83\xb3\xe3\x82\xaf %s \xe3\x82\x92\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xb8\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93\\n"'
 msgid "warning: internal %s cannot merge change/delete conflict for %s\n"
 msgstr "警告: 内部ツール %s は %s への変更と登録除外をマージできません\n"
 
+#, python-format
+msgid ""
+"warning: conflicts while merging %s! (edit, then use 'hg resolve --mark')\n"
+msgstr ""
+"警告: %s のマージで衝突を検出 (編集後 'hg resolve --mark' 実施が必要です)\n"
+
 msgid ""
 "``:union``\n"
 "Uses the internal non-interactive simple merge algorithm for merging\n"
@@ -18030,12 +21511,6 b' msgstr ""'
 "非対話的な、 単純なマージ処理を実施します。 衝突があった場合、\n"
 "    両方の変更内容が取り込まれます。 衝突マークは記録されません。"
 
-#, python-format
-msgid ""
-"warning: conflicts while merging %s! (edit, then use 'hg resolve --mark')\n"
-msgstr ""
-"警告: %s のマージで衝突を検出 (編集後 'hg resolve --mark' 実施が必要です)\n"
-
 msgid ""
 "``:merge``\n"
 "Uses the internal non-interactive simple merge algorithm for merging\n"
@@ -18083,13 +21558,6 b' msgstr ""'
 "内部ツール :merge と同様の挙動ですが、 非対話的な衝突解消の際に、\n"
 "    マージ対象リビジョン側 (`p2()`) の変更内容を採用します。"
 
-msgid ""
-"``:tagmerge``\n"
-"Uses the internal tag merge algorithm (experimental)."
-msgstr ""
-"``:tagmerge``\n"
-"タグファイル専用のマージ処理を行います (実験的実装)"
-
 #, python-format
 msgid ""
 "automatic tag merging of %s failed! (use 'hg resolve --tool :merge' or "
@@ -18099,6 +21567,13 b' msgstr ""'
 "のツールを使ってマージしてください)\n"
 
 msgid ""
+"``:tagmerge``\n"
+"    Uses the internal tag merge algorithm (experimental)."
+msgstr ""
+"``:tagmerge``\n"
+"    タグファイル専用のマージ処理を行います (実験的実装)"
+
+msgid ""
 "``:dump``\n"
 "Creates three versions of the files to merge, containing the\n"
 "    contents of local, other and base. These files can then be used to\n"
@@ -18109,13 +21584,27 b' msgid ""'
 msgstr ""
 "``:dump``\n"
 "作業領域側、 マージ対象リビジョン側、 および共通祖先時点の、\n"
-"    それぞれの内容を持つ3つのファイルを生成します。\n"
+"    それぞれの内容を持つ、 3つのファイルを生成します。\n"
 "    これらのファイルは、事後の手動マージ等で使用してください。\n"
 "    対象ファイル名が ``a.txt`` であった場合、\n"
 "    生成されるファイルはそれぞれ ``a.txt.local``, ``a.txt.other``\n"
 "    および ``a.txt.base`` と命名され、\n"
 "    ``a.txt`` と同じディレクトリに格納されます。"
 
+msgid ""
+"    This implies premerge. Therefore, files aren't dumped, if premerge\n"
+"    runs successfully. Use :forcedump to forcibly write files out."
+msgstr ""
+"    事前マージが成功した場合は、 ファイルが出力されません。\n"
+"    強制的にファイルを書き出したい場合は :forcedump を使用してください。"
+
+msgid ""
+"``:forcedump``\n"
+"    Creates three versions of the files as same as :dump, but omits premerge."
+msgstr ""
+"``:forcedump``\n"
+"    事前マージ無しで :dump と同じ要領でファイルを書き出します。"
+
 #, python-format
 msgid "warning: %s cannot merge change/delete conflict for %s\n"
 msgstr "警告: マージツール %s は %s への変更と登録除外をマージできません\n"
@@ -18136,6 +21625,12 b' msgstr "%s \xe3\x81\xa8 %s \xe3\x82\x92 %s \xe3\x81\xab\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xb8\xe4\xb8\xad\\n"'
 msgid "merging %s\n"
 msgstr "%s をマージ中\n"
 
+msgid "merge halted after failed merge (see hg resolve)"
+msgstr ""
+
+msgid "continue merge operation (yn)?$$ &Yes $$ &No"
+msgstr "マージ処理を継続しますか？ (y/n)$$ &Yes $$ &No"
+
 #, python-format
 msgid "was merge of '%s' successful (yn)?$$ &Yes $$ &No"
 msgstr "'%s' のマージは成功しましたか？(y/n)$$ &Yes $$ &No"
@@ -18157,9 +21652,24 b' msgstr "\xe6\x96\x87\xe6\xb3\x95\xe3\x82\xa8\xe3\x83\xa9\xe3\x83\xbc"'
 msgid "invalid token"
 msgstr "不正な記述"
 
+msgid "not a symbol"
+msgstr "シンボル以外が指定されました"
+
+#, fuzzy, python-format
+msgid "invalid pattern kind: %s"
+msgstr "不正パターン (%s): %s"
+
 msgid "missing argument"
 msgstr "引数がありません"
 
+#, fuzzy
+msgid "pattern must be a string"
+msgstr "sort には文字列を指定してください"
+
+#, fuzzy
+msgid "can't use negate operator in this context"
+msgstr "ここではリストを使用できません"
+
 msgid "can't use a list in this context"
 msgstr "ここではリストを使用できません"
 
@@ -18359,6 +21869,10 b' msgstr "\xe4\xb8\x8d\xe6\xad\xa3\xe3\x81\xaa\xe3\x83\x9e\xe3\x83\x83\xe3\x83\x81\xe3\x83\xb3\xe3\x82\xb0\xe3\x83\x91\xe3\x82\xbf\xe3\x83\xbc\xe3\x83\xb3: %s"'
 msgid "couldn't parse size: %s"
 msgstr "サイズ指定の解析に失敗: %s"
 
+#. i18n: "size" is a keyword
+msgid "size requires an expression"
+msgstr "size には条件指定が必要です"
+
 msgid ""
 "``size(expression)``\n"
 "    File size matches the given expression. Examples:"
@@ -18377,10 +21891,6 b' msgstr ""'
 "    - size('>= .5MB') - 524288 バイト以上のファイル\n"
 "    - size('4k - 1MB') - 4096 〜 1048576 バイトのファイル"
 
-#. i18n: "size" is a keyword
-msgid "size requires an expression"
-msgstr "size には条件指定が必要です"
-
 msgid ""
 "``encoding(name)``\n"
 "    File can be successfully decoded with the given character\n"
@@ -18495,8 +22005,8 b' msgstr "\xe3\x83\x86\xe3\x83\xb3\xe3\x83\x97\xe3\x83\xac\xe3\x83\xbc\xe3\x83\x88\xe3\x82\x92\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84"'
 msgid "starting revisions are not directly related"
 msgstr "開始リビジョンと直接の関連がありません"
 
-#, python-format
-msgid "inconsistent state, %s:%s is good and bad"
+#, fuzzy, python-format
+msgid "inconsistent state, %d:%s is good and bad"
 msgstr "状態矛盾: %s:%s は良否判定不能"
 
 #, python-format
@@ -18579,6 +22089,10 b' msgstr "\xe7\x84\xa1\xe5\x8a\xb9\xe5\x8c\x96\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xa6\xe3\x81\x84\xe3\x82\x8b\xe3\x82\xa8\xe3\x82\xaf\xe3\x82\xb9\xe3\x83\x86\xe3\x83\xb3\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3:"'
 msgid " ([+] can be repeated)"
 msgstr " ([+] 印付きのオプションは複数回指定可能です)"
 
+#, fuzzy
+msgid "Bundle2"
+msgstr "bundle フォーマット"
+
 msgid "Bundles"
 msgstr "bundle フォーマット"
 
@@ -18588,6 +22102,9 b' msgstr "\xe6\xa4\x9c\xe9\x96\xb2"'
 msgid "Changegroups"
 msgstr "changegroups フォーマット"
 
+msgid "Config Registrar"
+msgstr ""
+
 msgid "Repository Requirements"
 msgstr "リポジトリの requires 設定"
 
@@ -18609,6 +22126,10 b' msgstr "\xe8\xa8\xad\xe5\xae\x9a\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab"'
 msgid "Date Formats"
 msgstr "日時表記"
 
+#, fuzzy
+msgid "Command-line flags"
+msgstr "コマンド"
+
 msgid "File Name Patterns"
 msgstr "ファイル名パターン"
 
@@ -18668,15 +22189,11 b' msgstr ""'
 "\n"
 "別名: %s\n"
 
-#, python-format
-msgid "shell alias for::"
+#, fuzzy, python-format
+msgid "shell alias for: %s"
 msgstr "シェルコマンドの別名::"
 
 #, python-format
-msgid "    %s"
-msgstr "    %s"
-
-#, python-format
 msgid "defined by: %s\n"
 msgstr "定義位置: %s\n"
 
@@ -18862,7 +22379,7 b' msgstr ""'
 
 msgid ""
 "<compression>-<type>\n"
-"    The compression engine and format are delimited by a hypthen (``-``)."
+"    The compression engine and format are delimited by a hyphen (``-``)."
 msgstr ""
 
 msgid ""
@@ -18948,7 +22465,7 b' msgstr ""'
 
 msgid ""
 "``none-v1``\n"
-"    Produce a ``v2`` bundle with no compression."
+"    Produce a ``v1`` bundle with no compression."
 msgstr ""
 
 msgid ""
@@ -18962,7 +22479,8 b' msgid ""'
 "    This errors because ``zstd`` is not supported for ``v1`` types.\n"
 msgstr ""
 
-msgid "Mercurial can colorizes output from several commands."
+#, fuzzy
+msgid "Mercurial colorizes output from several commands."
 msgstr "Mercurial は、 各種コマンドの出力を、 カラー化できます。"
 
 msgid ""
@@ -18976,9 +22494,45 b' msgstr ""'
 "他の多くのコマンドの出力も、 同様にカラー化されます。 カラー化設定は、\n"
 "カスタマイズ可能です。"
 
-msgid "To enable color use::"
+#, fuzzy
+msgid "To enable color (default) whenever possible use::"
+msgstr "出力をカラー化するには、 以下の設定が必要です::"
+
+#, fuzzy
+msgid ""
+"  [ui]\n"
+"  color = yes"
+msgstr ""
+"  [ui]\n"
+"  color = auto"
+
+#, fuzzy
+msgid "To disable color use::"
 msgstr "出力をカラー化するには、 以下の設定が必要です::"
 
+#, fuzzy
+msgid ""
+"  [ui]\n"
+"  color = no"
+msgstr ""
+"  [ui]\n"
+"  color = auto"
+
+#, fuzzy
+msgid "See :hg:`help config.ui.color` for details."
+msgstr "詳細は :hg:`help color` を参照してください。\n"
+
+msgid ""
+"  The default pager on Windows does not support color, so enabling the "
+"pager\n"
+"  will effectively disable color.  See :hg:`help config.ui.paginate` to "
+"disable\n"
+"  the pager.  Alternately, MSYS and Cygwin shells provide `less` as a "
+"pager,\n"
+"  which can be configured to support ANSI color mode.  Windows 10 natively\n"
+"  supports ANSI color mode."
+msgstr ""
+
 msgid ""
 "Mode\n"
 "===="
@@ -18986,11 +22540,12 b' msgstr ""'
 "モード\n"
 "======"
 
-msgid ""
-"Mercurial can use various system to display color. The supported modes are\n"
+#, fuzzy
+msgid ""
+"Mercurial can use various systems to display color. The supported modes are\n"
 "``ansi``, ``win32``, and ``terminfo``.  See :hg:`help config.color` for "
 "details\n"
-"about how to control the mode"
+"about how to control the mode."
 msgstr ""
 "Mercurial の出力は、 様々な方法でカラー化可能です。 カラー化方式として\n"
 "``ansi``, ``win32`` および ``terminfo`` の各モードがサポートされています。\n"
@@ -19212,8 +22767,9 b' msgstr ""'
 "色指定のカスタマイズ\n"
 "===================="
 
-msgid ""
-"Because there are only eight standard colors, this module allows you\n"
+#, fuzzy
+msgid ""
+"Because there are only eight standard colors, Mercurial allows you\n"
 "to define color names for other color slots which might be available\n"
 "for your terminal type, assuming terminfo mode.  For instance::"
 msgstr ""
@@ -19893,6 +23449,14 b' msgstr ""'
 "``ignorews``\n"
 "    差分検出における空白文字無視の有無。"
 
+#, fuzzy
+msgid ""
+"``ignorewseol``\n"
+"    Ignore white space at the end of a line when comparing lines."
+msgstr ""
+"``ignorews``\n"
+"    差分検出における空白文字無視の有無。"
+
 msgid ""
 "``ignorewsamount``\n"
 "    Ignore changes in the amount of white space."
@@ -20107,13 +23671,14 b' msgstr ""'
 "Mercurial 出力のカラー化設定。 効果指定やスタイルのカスタマイズの詳細は、\n"
 ":hg:`help color` を参照してください。"
 
+#, fuzzy
 msgid ""
 "``mode``\n"
 "    String: control the method used to output color. One of ``auto``, "
 "``ansi``,\n"
-"    ``win32``, ``terminfo`` or ``debug``. In auto mode the color extension "
-"will\n"
-"    use ANSI mode by default (or win32 mode on Windows) if it detects a\n"
+"    ``win32``, ``terminfo`` or ``debug``. In auto mode, Mercurial will\n"
+"    use ANSI mode by default (or win32 mode prior to Windows 10) if it "
+"detects a\n"
 "    terminal. Any invalid value will disable color."
 msgstr ""
 "``mode``\n"
@@ -20122,19 +23687,19 b' msgstr ""'
 "    対話的実行でのカラー化方式として ansi (Windows 環境なら win32) が、\n"
 "    デフォルトの選択となります。 不正な方式の指定は、 カラー化を抑止します。"
 
+#, fuzzy
 msgid ""
 "``pagermode``\n"
-"    String: optinal override of ``color.mode`` used with pager (from the "
-"pager\n"
-"    extensions)."
+"    String: optional override of ``color.mode`` used with pager."
 msgstr ""
 "``pagermode``\n"
 "    文字列: ページャ使用時に ``color.mode`` を上書きする値 (pager\n"
 "    エクステンション由来)。"
 
+#, fuzzy
 msgid ""
 "    On some systems, terminfo mode may cause problems when using\n"
-"    color with the pager extension and less -R. less with the -R option\n"
+"    color with ``less -R`` as a pager program. less with the -R option\n"
 "    will only display ECMA-48 color codes, and terminfo mode may sometimes\n"
 "    emit codes that less doesn't understand. You can work around this by\n"
 "    either using ansi mode (or auto mode), or by using less -r (which will\n"
@@ -20149,25 +23714,19 b' msgstr ""'
 "    (色指定を含む全ての端末制御が、 透過的に伝播されます) の使用などで、\n"
 "    対処してください。"
 
+#, fuzzy
 msgid ""
 "    On some systems (such as MSYS in Windows), the terminal may support\n"
-"    a different color mode than the pager (activated via the \"pager\"\n"
-"    extension)."
+"    a different color mode than the pager program."
 msgstr ""
 "    環境によっては、 pager エクステンションが起動するページャコマンドと、\n"
 "    ターミナルソフトの間で、 カラー化方式が異なる場合があります\n"
 "    (Windows 上の MSYS 等)。"
 
-msgid ""
-"``commands``\n"
-"------------"
-msgstr ""
-"``commands``\n"
-"------------"
-
+#, fuzzy
 msgid ""
 "``status.relative``\n"
-"    Make paths in ``hg status`` output relative to the current directory.\n"
+"    Make paths in :hg:`status` output relative to the current directory.\n"
 "    (default: False)"
 msgstr ""
 "``status.relative``\n"
@@ -20175,10 +23734,27 b' msgstr ""'
 "    (デフォルト値: False)"
 
 msgid ""
+"``update.check``\n"
+"    Determines what level of checking :hg:`update` will perform before "
+"moving\n"
+"    to a destination revision. Valid values are ``abort``, ``none``,\n"
+"    ``linear``, and ``noconflict``. ``abort`` always fails if the working\n"
+"    directory has uncommitted changes. ``none`` performs no checking, and "
+"may\n"
+"    result in a merge with uncommitted changes. ``linear`` allows any "
+"update\n"
+"    as long as it follows a straight line in the revision history, and may\n"
+"    trigger a merge with uncommitted changes. ``noconflict`` will allow any\n"
+"    update which would not trigger a merge with uncommitted changes, if any\n"
+"    are present.\n"
+"    (default: ``linear``)"
+msgstr ""
+
+#, fuzzy
+msgid ""
 "``update.requiredest``\n"
-"    Require that the user pass a destination when running ``hg update``.\n"
-"    For example, ``hg update .::`` will be allowed, but a plain ``hg "
-"update``\n"
+"    Require that the user pass a destination when running :hg:`update`.\n"
+"    For example, :hg:`update .::` will be allowed, but a plain :hg:`update`\n"
 "    will be disallowed.\n"
 "    (default: False)"
 msgstr ""
@@ -21035,13 +24611,14 b' msgstr ""'
 "  # 他の incoming に先立って autobuild フックを実行\n"
 "  priority.incoming.autobuild = 1"
 
+#, fuzzy
 msgid ""
 "Most hooks are run with environment variables set that give useful\n"
 "additional information. For each hook below, the environment variables\n"
-"it is passed are listed with names of the form ``$HG_foo``. The\n"
+"it is passed are listed with names in the form ``$HG_foo``. The\n"
 "``$HG_HOOKTYPE`` and ``$HG_HOOKNAME`` variables are set for all hooks.\n"
-"their respectively contains the type of hook which triggered the run and\n"
-"the full name of the hooks in the config. In the example about this will\n"
+"They contain the type of hook which triggered the run and the full name\n"
+"of the hook in the config, respectively. In the example above, this will\n"
 "be ``$HG_HOOKTYPE=incoming`` and ``$HG_HOOKNAME=incoming.email``."
 msgstr ""
 "多くのフックは、 環境変数に付加的情報が設定された上で実行されます。\n"
@@ -21051,12 +24628,14 b' msgstr ""'
 "例えば ``$HG_HOOKTYPE=incoming`` と ``$HG_HOOKNAME=incoming.email``\n"
 "といった具合です。"
 
+#, fuzzy
 msgid ""
 "``changegroup``\n"
-"  Run after a changegroup has been added via push, pull or unbundle.  ID of "
-"the\n"
-"  first new changeset is in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. URL\n"
-"  from which changes came is in ``$HG_URL``."
+"  Run after a changegroup has been added via push, pull or unbundle.  The ID "
+"of\n"
+"  the first new changeset is in ``$HG_NODE`` and last is in ``"
+"$HG_NODE_LAST``.\n"
+"  The URL from which changes came is in ``$HG_URL``."
 msgstr ""
 "``changegroup``\n"
 "  push、 pull、 unbundle によるリビジョン群の追加完了時に実行されます。\n"
@@ -21065,9 +24644,10 b' msgstr ""'
 "  に設定されます。 (※ 訳注: 複数リビジョン一括追加時の ``changegroup``\n"
 "  フック実行は1回ですが、 ``incoming`` フックはリビジョン毎に実行されます)"
 
+#, fuzzy
 msgid ""
 "``commit``\n"
-"  Run after a changeset has been created in the local repository. ID\n"
+"  Run after a changeset has been created in the local repository. The ID\n"
 "  of the newly created changeset is in ``$HG_NODE``. Parent changeset\n"
 "  IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
 msgstr ""
@@ -21076,11 +24656,12 b' msgstr ""'
 "  新規作成リビジョンの ID が ``$HG_NODE`` に、親リビジョンの ID が\n"
 "  ``$HG_PARENT1`` および ``$HG_PARENT2`` に設定されます。"
 
+#, fuzzy
 msgid ""
 "``incoming``\n"
 "  Run after a changeset has been pulled, pushed, or unbundled into\n"
 "  the local repository. The ID of the newly arrived changeset is in\n"
-"  ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``."
+"  ``$HG_NODE``. The URL that was source of the changes is in ``$HG_URL``."
 msgstr ""
 "``incoming``\n"
 "  push、 pull、 unbundle によるリビジョンの追加完了時に実行されます。\n"
@@ -21089,11 +24670,12 b' msgstr ""'
 "  (※ 訳注: 複数リビジョン一括追加時の ``changegroup``\n"
 "  フック実行は1回ですが、 ``incoming`` フックはリビジョン毎に実行されます)"
 
+#, fuzzy
 msgid ""
 "``outgoing``\n"
-"  Run after sending changes from local repository to another. ID of\n"
-"  first changeset sent is in ``$HG_NODE``. Source of operation is in\n"
-"  ``$HG_SOURCE``; Also see :hg:`help config.hooks.preoutgoing` hook."
+"  Run after sending changes from the local repository to another. The ID of\n"
+"  first changeset sent is in ``$HG_NODE``. The source of operation is in\n"
+"  ``$HG_SOURCE``. Also see :hg:`help config.hooks.preoutgoing`."
 msgstr ""
 "``outgoing``\n"
 "  他リポジトリへの変更反映完了後に実行されます。\n"
@@ -21164,11 +24746,12 b' msgstr ""'
 "  フック実行が失敗した場合、 当該コマンドは実行されず、\n"
 "  Mercurial は実行失敗の終了コードを返します。"
 
+#, fuzzy
 msgid ""
 "``prechangegroup``\n"
 "  Run before a changegroup is added via push, pull or unbundle. Exit\n"
-"  status 0 allows the changegroup to proceed. Non-zero status will\n"
-"  cause the push, pull or unbundle to fail. URL from which changes\n"
+"  status 0 allows the changegroup to proceed. A non-zero status will\n"
+"  cause the push, pull or unbundle to fail. The URL from which changes\n"
 "  will come is in ``$HG_URL``."
 msgstr ""
 "``prechangegroup``\n"
@@ -21177,10 +24760,11 b' msgstr ""'
 "  非 0 の終了コードは、 push、 pull、 unbundle の中断を意味します。\n"
 "  追加リビジョン群の取り込み元 URL が ``$HG_URL`` に設定されます。"
 
+#, fuzzy
 msgid ""
 "``precommit``\n"
 "  Run before starting a local commit. Exit status 0 allows the\n"
-"  commit to proceed. Non-zero status will cause the commit to fail.\n"
+"  commit to proceed. A non-zero status will cause the commit to fail.\n"
 "  Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
 msgstr ""
 "``precommit``\n"
@@ -21190,10 +24774,11 b' msgstr ""'
 "  親リビジョンの ID が\n"
 "  ``$HG_PARENT1`` および ``$HG_PARENT2`` に設定されます。"
 
+#, fuzzy
 msgid ""
 "``prelistkeys``\n"
 "  Run before listing pushkeys (like bookmarks) in the\n"
-"  repository. Non-zero status will cause failure. The key namespace is\n"
+"  repository. A non-zero status will cause failure. The key namespace is\n"
 "  in ``$HG_NAMESPACE``."
 msgstr ""
 "``prelistkeys``\n"
@@ -21201,16 +24786,19 b' msgstr ""'
 "  非 0 の終了コードは、 処理の中断を意味します。\n"
 "  キーの名前空間が ``$HG_NAMESPACE`` に設定されます。"
 
+#, fuzzy
 msgid ""
 "``preoutgoing``\n"
 "  Run before collecting changes to send from the local repository to\n"
-"  another. Non-zero status will cause failure. This lets you prevent\n"
-"  pull over HTTP or SSH. Also prevents against local pull, push\n"
-"  (outbound) or bundle commands, but not effective, since you can\n"
-"  just copy files instead then. Source of operation is in\n"
-"  ``$HG_SOURCE``. If \"serve\", operation is happening on behalf of remote\n"
-"  SSH or HTTP repository. If \"push\", \"pull\" or \"bundle\", operation\n"
-"  is happening on behalf of repository on same system."
+"  another. A non-zero status will cause failure. This lets you prevent\n"
+"  pull over HTTP or SSH. It can also prevent propagating commits (via\n"
+"  local pull, push (outbound) or bundle commands), but not completely,\n"
+"  since you can just copy files instead. The source of operation is in\n"
+"  ``$HG_SOURCE``. If \"serve\", the operation is happening on behalf of a "
+"remote\n"
+"  SSH or HTTP repository. If \"push\", \"pull\" or \"bundle\", the "
+"operation\n"
+"  is happening on behalf of a repository on same system."
 msgstr ""
 "``preoutgoing``\n"
 "  他リポジトリへの変更反映において、 対象リビジョン確定前に実行されます。\n"
@@ -21225,10 +24813,11 b' msgstr ""'
 "  \"push\"、 \"pull\" または \"bundle\" が設定されている場合、\n"
 "  同一ホスト上のリポジトリが処理契機となっています。"
 
+#, fuzzy
 msgid ""
 "``prepushkey``\n"
 "  Run before a pushkey (like a bookmark) is added to the\n"
-"  repository. Non-zero status will cause the key to be rejected. The\n"
+"  repository. A non-zero status will cause the key to be rejected. The\n"
 "  key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,\n"
 "  the old value (if any) is in ``$HG_OLD``, and the new value is in\n"
 "  ``$HG_NEW``."
@@ -21241,13 +24830,14 b' msgstr ""'
 "  (更新の場合は) 旧値が ``$HG_OLD`` に、\n"
 "  新値が ``$HG_NEW`` に設定されます。"
 
+#, fuzzy
 msgid ""
 "``pretag``\n"
 "  Run before creating a tag. Exit status 0 allows the tag to be\n"
-"  created. Non-zero status will cause the tag to fail. ID of\n"
-"  changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag "
-"is\n"
-"  local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``."
+"  created. A non-zero status will cause the tag to fail. The ID of the\n"
+"  changeset to tag is in ``$HG_NODE``. The name of tag is in ``$HG_TAG``. "
+"The\n"
+"  tag is local if ``$HG_LOCAL=1``, or in the repository if ``$HG_LOCAL=0``."
 msgstr ""
 "``pretag``\n"
 "  タグの新規生成前に実行されます。\n"
@@ -21258,10 +24848,11 b' msgstr ""'
 "  ローカルタグの場合は ``$HG_LOCAL=1`` に、\n"
 "  通常のタグの場合は ``$HG_LOCAL=0`` になります。"
 
+#, fuzzy
 msgid ""
 "``pretxnopen``\n"
 "  Run before any new repository transaction is open. The reason for the\n"
-"  transaction will be in ``$HG_TXNNAME`` and a unique identifier for the\n"
+"  transaction will be in ``$HG_TXNNAME``, and a unique identifier for the\n"
 "  transaction will be in ``HG_TXNID``. A non-zero status will prevent the\n"
 "  transaction from being opened."
 msgstr ""
@@ -21270,26 +24861,56 b' msgstr ""'
 "  ``$HG_TXNNAME`` に、 一意な識別子が ``HG_TXNID`` に設定されます。 \n"
 "  終了コードが非ゼロの場合、 トランザクションは開始されません。"
 
+#, fuzzy
 msgid ""
 "``pretxnclose``\n"
 "  Run right before the transaction is actually finalized. Any repository "
 "change\n"
 "  will be visible to the hook program. This lets you validate the "
 "transaction\n"
-"  content or change it. Exit status 0 allows the commit to proceed. Non-"
+"  content or change it. Exit status 0 allows the commit to proceed. A non-"
 "zero\n"
 "  status will cause the transaction to be rolled back. The reason for the\n"
-"  transaction opening will be in ``$HG_TXNNAME`` and a unique identifier "
+"  transaction opening will be in ``$HG_TXNNAME``, and a unique identifier "
 "for\n"
 "  the transaction will be in ``HG_TXNID``. The rest of the available data "
 "will\n"
-"  vary according the transaction type. New changesets will add ``$HG_NODE`` "
-"(id\n"
-"  of the first added changeset), ``$HG_NODE_LAST`` (id of the last added\n"
-"  changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables, bookmarks and "
-"phases\n"
-"  changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to ``1``, "
-"etc."
+"  vary according the transaction type. New changesets will add ``$HG_NODE``\n"
+"  (the ID of the first added changeset), ``$HG_NODE_LAST`` (the ID of the "
+"last\n"
+"  added changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables.  Bookmark and\n"
+"  phase changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to "
+"``1``\n"
+"  respectively, etc."
+msgstr ""
+"``pretxnclose``\n"
+"  トランザクション完了直前に実行されます。 完了時の記録内容の全てを、\n"
+"  フックから参照できます。 トランザクション内容の検証や変更が可能です。\n"
+"  終了コードが 0 の場合、 トランザクション完了処理が継続されます。\n"
+"  それ以外の場合、 トランザクションはロールバックされます。\n"
+"  トランザクション種別が ``$HG_TXNNAME`` に、 一意な識別子が ``HG_TXNID``\n"
+"  に設定されます。 それ以外の情報は、 トランザクション種別に依存します。\n"
+"  例えば、 新規リビジョン群を追加するトランザクションの場合、 ``$HG_NODE``\n"
+"  (追加リビジョン群の最初のものの ID)、 ``$HG_NODE_LAST`` (最後のものの\n"
+"  ID)、 ``$HG_URL`` および ``$HG_SOURCE`` が設定されます。\n"
+"  ブックマークやフェーズの変更の場合、 ``HG_BOOKMARK_MOVED`` や\n"
+"  ``HG_PHASES_MOVED`` に ``1`` が設定されます。"
+
+#, fuzzy
+msgid ""
+"``pretxnclose-bookmark``\n"
+"  Run right before a bookmark change is actually finalized. Any repository\n"
+"  change will be visible to the hook program. This lets you validate the\n"
+"  transaction content or change it. Exit status 0 allows the commit to\n"
+"  proceed. A non-zero status will cause the transaction to be rolled back.\n"
+"  The name of the bookmark will be available in ``$HG_BOOKMARK``, the new\n"
+"  bookmark location will be available in ``$HG_NODE`` while the previous\n"
+"  location will be available in ``$HG_OLDNODE``. In case of a bookmark\n"
+"  creation ``$HG_OLDNODE`` will be empty. In case of deletion ``$HG_NODE``\n"
+"  will be empty.\n"
+"  In addition, the reason for the transaction opening will be in\n"
+"  ``$HG_TXNNAME``, and a unique identifier for the transaction will be in\n"
+"  ``HG_TXNID``."
 msgstr ""
 "``pretxnclose``\n"
 "  トランザクション完了直前に実行されます。 完了時の記録内容の全てを、\n"
@@ -21304,12 +24925,47 b' msgstr ""'
 "  ブックマークやフェーズの変更の場合、 ``HG_BOOKMARK_MOVED`` や\n"
 "  ``HG_PHASES_MOVED`` に ``1`` が設定されます。"
 
+#, fuzzy
+msgid ""
+"``pretxnclose-phase``\n"
+"  Run right before a phase change is actually finalized. Any repository "
+"change\n"
+"  will be visible to the hook program. This lets you validate the "
+"transaction\n"
+"  content or change it. Exit status 0 allows the commit to proceed.  A non-"
+"zero\n"
+"  status will cause the transaction to be rolled back. The hook is called\n"
+"  multiple times, once for each revision affected by a phase change.\n"
+"  The affected node is available in ``$HG_NODE``, the phase in ``"
+"$HG_PHASE``\n"
+"  while the previous ``$HG_OLDPHASE``. In case of new node, ``"
+"$HG_OLDPHASE``\n"
+"  will be empty.  In addition, the reason for the transaction opening will "
+"be in\n"
+"  ``$HG_TXNNAME``, and a unique identifier for the transaction will be in\n"
+"  ``HG_TXNID``. The hook is also run for newly added revisions. In this "
+"case\n"
+"  the ``$HG_OLDPHASE`` entry will be empty."
+msgstr ""
+"``pretxnclose``\n"
+"  トランザクション完了直前に実行されます。 完了時の記録内容の全てを、\n"
+"  フックから参照できます。 トランザクション内容の検証や変更が可能です。\n"
+"  終了コードが 0 の場合、 トランザクション完了処理が継続されます。\n"
+"  それ以外の場合、 トランザクションはロールバックされます。\n"
+"  トランザクション種別が ``$HG_TXNNAME`` に、 一意な識別子が ``HG_TXNID``\n"
+"  に設定されます。 それ以外の情報は、 トランザクション種別に依存します。\n"
+"  例えば、 新規リビジョン群を追加するトランザクションの場合、 ``$HG_NODE``\n"
+"  (追加リビジョン群の最初のものの ID)、 ``$HG_NODE_LAST`` (最後のものの\n"
+"  ID)、 ``$HG_URL`` および ``$HG_SOURCE`` が設定されます。\n"
+"  ブックマークやフェーズの変更の場合、 ``HG_BOOKMARK_MOVED`` や\n"
+"  ``HG_PHASES_MOVED`` に ``1`` が設定されます。"
+
+#, fuzzy
 msgid ""
 "``txnclose``\n"
 "  Run after any repository transaction has been committed. At this\n"
 "  point, the transaction can no longer be rolled back. The hook will run\n"
-"  after the lock is released. See :hg:`help config.hooks.pretxnclose` docs "
-"for\n"
+"  after the lock is released. See :hg:`help config.hooks.pretxnclose` for\n"
 "  details about available variables."
 msgstr ""
 "``txnclose``\n"
@@ -21318,30 +24974,64 b' msgstr ""'
 "  排他は解放されます。 参照可能な変数の詳細に関しては\n"
 "  :hg:`help config.hooks.pretxnclose` の説明を参照してください。"
 
+#, fuzzy
+msgid ""
+"``txnclose-bookmark``\n"
+"  Run after any bookmark change has been committed. At this point, the\n"
+"  transaction can no longer be rolled back. The hook will run after the "
+"lock\n"
+"  is released. See :hg:`help config.hooks.pretxnclose-bookmark` for details\n"
+"  about available variables."
+msgstr ""
+"``txnclose``\n"
+"  トランザクション完了直後に実行されます。 このフックの実行結果は、\n"
+"  トランザクションのロールバックを生じません。 フック実行に先立って、\n"
+"  排他は解放されます。 参照可能な変数の詳細に関しては\n"
+"  :hg:`help config.hooks.pretxnclose` の説明を参照してください。"
+
+#, fuzzy
+msgid ""
+"``txnclose-phase``\n"
+"  Run after any phase change has been committed. At this point, the\n"
+"  transaction can no longer be rolled back. The hook will run after the "
+"lock\n"
+"  is released. See :hg:`help config.hooks.pretxnclose-phase` for details "
+"about\n"
+"  available variables."
+msgstr ""
+"``txnclose``\n"
+"  トランザクション完了直後に実行されます。 このフックの実行結果は、\n"
+"  トランザクションのロールバックを生じません。 フック実行に先立って、\n"
+"  排他は解放されます。 参照可能な変数の詳細に関しては\n"
+"  :hg:`help config.hooks.pretxnclose` の説明を参照してください。"
+
+#, fuzzy
 msgid ""
 "``txnabort``\n"
 "  Run when a transaction is aborted. See :hg:`help config.hooks."
 "pretxnclose`\n"
-"  docs for details about available variables."
+"  for details about available variables."
 msgstr ""
 "``txnabort``\n"
 "  トランザクション中断時に実行されます。 参照可能な変数の詳細に関しては\n"
 "  :hg:`help config.hooks.pretxnclose` の説明を参照してください。"
 
+#, fuzzy
 msgid ""
 "``pretxnchangegroup``\n"
 "  Run after a changegroup has been added via push, pull or unbundle, but "
 "before\n"
-"  the transaction has been committed. Changegroup is visible to hook "
-"program.\n"
-"  This lets you validate incoming changes before accepting them. Passed the "
-"ID\n"
-"  of the first new changeset in ``$HG_NODE`` and last in ``$HG_NODE_LAST``.\n"
-"  Exit status 0 allows the transaction to commit. Non-zero status will "
-"cause\n"
-"  the transaction to be rolled back and the push, pull or unbundle will "
-"fail.\n"
-"  URL that was source of changes is in ``$HG_URL``."
+"  the transaction has been committed. The changegroup is visible to the "
+"hook\n"
+"  program. This allows validation of incoming changes before accepting "
+"them.\n"
+"  The ID of the first new changeset is in ``$HG_NODE`` and last is in\n"
+"  ``$HG_NODE_LAST``. Exit status 0 allows the transaction to commit. A non-"
+"zero\n"
+"  status will cause the transaction to be rolled back, and the push, pull "
+"or\n"
+"  unbundle will fail. The URL that was the source of changes is in ``"
+"$HG_URL``."
 msgstr ""
 "``pretxnchangegroup``\n"
 "  push、 pull、 unbundle によるリビジョン群の追加完了の際に、\n"
@@ -21354,14 +25044,16 b' msgstr ""'
 "  push、 pull、 unbundle は中断されます。\n"
 "  追加リビジョンの取り込み元 URL は ``$HG_URL`` に設定されます。"
 
+#, fuzzy
 msgid ""
 "``pretxncommit``\n"
-"  Run after a changeset has been created but the transaction not yet\n"
-"  committed. Changeset is visible to hook program. This lets you\n"
-"  validate commit message and changes. Exit status 0 allows the\n"
-"  commit to proceed. Non-zero status will cause the transaction to\n"
-"  be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset\n"
-"  IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
+"  Run after a changeset has been created, but before the transaction is\n"
+"  committed. The changeset is visible to the hook program. This allows\n"
+"  validation of the commit message and changes. Exit status 0 allows the\n"
+"  commit to proceed. A non-zero status will cause the transaction to\n"
+"  be rolled back. The ID of the new changeset is in ``$HG_NODE``. The "
+"parent\n"
+"  changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
 msgstr ""
 "``pretxncommit``\n"
 "  新規リビジョン作成の際に、\n"
@@ -21374,12 +25066,14 b' msgstr ""'
 "  親リビジョンの ID が\n"
 "  ``$HG_PARENT1`` および ``$HG_PARENT2`` に設定されます。"
 
+#, fuzzy
 msgid ""
 "``preupdate``\n"
 "  Run before updating the working directory. Exit status 0 allows\n"
-"  the update to proceed. Non-zero status will prevent the update.\n"
-"  Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID\n"
-"  of second new parent is in ``$HG_PARENT2``."
+"  the update to proceed. A non-zero status will prevent the update.\n"
+"  The changeset ID of first new parent is in ``$HG_PARENT1``. If updating to "
+"a\n"
+"  merge, the ID of second new parent is in ``$HG_PARENT2``."
 msgstr ""
 "``preupdate``\n"
 "  作業領域の更新前に実行されます。\n"
@@ -21414,11 +25108,14 b' msgstr ""'
 "  (更新の場合は) 旧値が ``$HG_OLD`` に、\n"
 "  新値が ``$HG_NEW`` に設定されます。"
 
+#, fuzzy
 msgid ""
 "``tag``\n"
-"  Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.\n"
-"  Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in\n"
-"  repository if ``$HG_LOCAL=0``."
+"  Run after a tag is created. The ID of the tagged changeset is in ``"
+"$HG_NODE``.\n"
+"  The name of tag is in ``$HG_TAG``. The tag is local if ``$HG_LOCAL=1``, or "
+"in\n"
+"  the repository if ``$HG_LOCAL=0``."
 msgstr ""
 "``tag``\n"
 "  タグの新規生成後に実行されます。\n"
@@ -21427,12 +25124,15 b' msgstr ""'
 "  ローカルタグの場合は ``$HG_LOCAL=1`` に、\n"
 "  通常のタグの場合は ``$HG_LOCAL=0`` になります。"
 
+#, fuzzy
 msgid ""
 "``update``\n"
-"  Run after updating the working directory. Changeset ID of first\n"
-"  new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is\n"
-"  in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the\n"
-"  update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``."
+"  Run after updating the working directory. The changeset ID of first\n"
+"  new parent is in ``$HG_PARENT1``. If updating to a merge, the ID of second "
+"new\n"
+"  parent is in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If "
+"the\n"
+"  update failed (e.g. because conflicts were not resolved), ``$HG_ERROR=1``."
 msgstr ""
 "``update``\n"
 "  作業領域の更新後に実行されます。\n"
@@ -21442,9 +25142,10 b' msgstr ""'
 "  更新処理が成功した場合は ``$HG_ERROR=0`` に、\n"
 "  失敗した場合 (例: 衝突解消の失敗等) は ``$HG_ERROR=1`` が設定されます。"
 
+#, fuzzy
 msgid ""
 "   It is generally better to use standard hooks rather than the\n"
-"   generic pre- and post- command hooks as they are guaranteed to be\n"
+"   generic pre- and post- command hooks, as they are guaranteed to be\n"
 "   called in the appropriate contexts for influencing transactions.\n"
 "   Also, hooks like \"commit\" will be called in all contexts that\n"
 "   generate a commit (e.g. tag) and not just the commit command."
@@ -21660,13 +25361,15 b' msgstr ""'
 "    対応するホストとの接続にのみ適用される点以外は、 先述した ``ciphers``\n"
 "    設定と同じです。"
 
+#, fuzzy
 msgid ""
 "``fingerprints``\n"
 "    A list of hashes of the DER encoded peer/remote certificate. Values "
 "have\n"
 "    the form ``algorithm``:``fingerprint``. e.g.\n"
 "    ``sha256:"
-"c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2``."
+"c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2``.\n"
+"    In addition, colons (``:``) can appear in the fingerprint part."
 msgstr ""
 "``fingerprints``\n"
 "    対応するホストの、 DER 符号化された証明書の SHA-1 ハッシュ値です。\n"
@@ -21761,6 +25464,7 b' msgstr ""'
 "        ... (base64 PEM 符号化形式の証明書) ...\n"
 "        -----END CERTIFICATE-----"
 
+#, fuzzy
 msgid ""
 "    [hostsecurity]\n"
 "    hg.example.com:fingerprints = sha256:"
@@ -21768,6 +25472,8 b' msgid ""'
 "    hg2.example.com:fingerprints = "
 "sha1:914f1aff87249c09b6859b88b1906d30756491ca, sha1:fc:e2:8d:d9:51:cd:cb:"
 "c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33\n"
+"    hg3.example.com:fingerprints = sha256:9a:b0:dc:e2:75:ad:8a:b7:84:58:"
+"e5:1f:07:32:f1:87:e6:bd:24:22:af:b7:ce:8e:9c:b4:10:cf:b9:f4:0e:d2\n"
 "    foo.example.com:verifycertsfile = /etc/ssl/trusted-ca-certs.pem"
 msgstr ""
 "    [hostsecurity]\n"
@@ -21895,6 +25601,20 b' msgstr ""'
 "   (デフォルト値: ``abort``)"
 
 msgid ""
+"``on-failure``\n"
+"   When set to ``continue`` (the default), the merge process attempts to\n"
+"   merge all unresolved files using the merge chosen tool, regardless of\n"
+"   whether previous file merge attempts during the process succeeded or "
+"not.\n"
+"   Setting this to ``prompt`` will prompt after any merge failure continue\n"
+"   or halt the merge process. Setting this to ``halt`` will automatically\n"
+"   halt the merge process on any merge tool failure. The merge process\n"
+"   can be restarted by using the ``resolve`` command. When a merge is\n"
+"   halted, the repository is left in a normal ``unresolved`` merge state.\n"
+"   (default: ``continue``)"
+msgstr ""
+
+msgid ""
 "``merge-patterns``\n"
 "------------------"
 msgstr ""
@@ -22011,15 +25731,21 b' msgid ""'
 "``args``\n"
 "  The arguments to pass to the tool executable. You can refer to the\n"
 "  files being merged as well as the output file through these\n"
-"  variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning\n"
-"  of ``$local`` and ``$other`` can vary depending on which action is being\n"
-"  performed. During and update or merge, ``$local`` represents the original\n"
-"  state of the file, while ``$other`` represents the commit you are "
-"updating\n"
-"  to or the commit you are merging with. During a rebase ``$local``\n"
-"  represents the destination of the rebase, and ``$other`` represents the\n"
-"  commit being rebased.\n"
-"  (default: ``$local $base $other``)"
+"  variables: ``$base``, ``$local``, ``$other``, ``$output``."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"  The meaning of ``$local`` and ``$other`` can vary depending on which "
+"action is\n"
+"  being performed. During an update or merge, ``$local`` represents the "
+"original\n"
+"  state of the file, while ``$other`` represents the commit you are updating "
+"to or\n"
+"  the commit you are merging with. During a rebase, ``$local`` represents "
+"the\n"
+"  destination of the rebase, and ``$other`` represents the commit being "
+"rebased."
 msgstr ""
 "``args``\n"
 "  実行時にツールに指定される引数。 ``$base``, ``$local``, ``$other``, \n"
@@ -22033,6 +25759,17 b' msgstr ""'
 "  (デフォルト値: ``$local $base $other``)"
 
 msgid ""
+"  Some operations define custom labels to assist with identifying the "
+"revisions,\n"
+"  accessible via ``$labellocal``, ``$labelother``, and ``$labelbase``. If "
+"custom\n"
+"  labels are not available, these will be ``local``, ``other``, and "
+"``base``,\n"
+"  respectively.\n"
+"  (default: ``$local $base $other``)"
+msgstr ""
+
+msgid ""
 "``premerge``\n"
 "  Attempt to run internal non-interactive 3-way merge tool before\n"
 "  launching external tool.  Options are ``true``, ``false``, ``keep`` or\n"
@@ -22111,6 +25848,30 b' msgstr ""'
 "  (デフォルト値: False)"
 
 msgid ""
+"``mergemarkers``\n"
+"  Controls whether the labels passed via ``$labellocal``, ``$labelother``, "
+"and\n"
+"  ``$labelbase`` are ``detailed`` (respecting ``mergemarkertemplate``) or\n"
+"  ``basic``. If ``premerge`` is ``keep`` or ``keep-merge3``, the conflict\n"
+"  markers generated during premerge will be ``detailed`` if either this "
+"option or\n"
+"  the corresponding option in the ``[ui]`` section is ``detailed``.\n"
+"  (default: ``basic``)"
+msgstr ""
+
+msgid ""
+"``mergemarkertemplate``\n"
+"  This setting can be used to override ``mergemarkertemplate`` from the "
+"``[ui]``\n"
+"  section on a per-tool basis; this applies to the ``$label``-prefixed "
+"variables\n"
+"  and to the conflict markers that are generated if ``premerge`` is ``keep` "
+"or\n"
+"  ``keep-merge3``. See the corresponding variable in ``[ui]`` for more\n"
+"  information."
+msgstr ""
+
+msgid ""
 "  ``regkey``\n"
 "    Windows registry key which describes install location of this\n"
 "    tool. Mercurial will search for this key first under\n"
@@ -22156,8 +25917,57 b' msgstr ""'
 "    当該レジストリキーからの読み出し値に付加する値。 典型的な設定値は、\n"
 "    ツールの実行可能ファイル名です。 (デフォルト値: None)"
 
-msgid ""
-"\n"
+#, fuzzy
+msgid ""
+"``pager``\n"
+"---------"
+msgstr ""
+"``phases``\n"
+"----------"
+
+msgid ""
+"Setting used to control when to paginate and with what external tool. See\n"
+":hg:`help pager` for details."
+msgstr ""
+
+msgid ""
+"``pager``\n"
+"    Define the external tool used as pager."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"    If no pager is set, Mercurial uses the environment variable $PAGER.\n"
+"    If neither pager.pager, nor $PAGER is set, a default pager will be\n"
+"    used, typically `less` on Unix and `more` on Windows. Example::"
+msgstr ""
+"上記設定が無い場合、 Mercurial は PAGER 環境変数を参照します。\n"
+"どちらも未設定の場合、 Mercurial はデフォルトのページャを使用します\n"
+"(通常は `more` コマンド)。"
+
+#, fuzzy
+msgid ""
+"      [pager]\n"
+"      pager = less -FRX"
+msgstr ""
+"  [pager]\n"
+"  pager = less -FRX"
+
+msgid ""
+"``ignore``\n"
+"    List of commands to disable the pager for. Example::"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"      [pager]\n"
+"      ignore = version, help, update"
+msgstr ""
+"  [pager]\n"
+"  ignore = version, help, update"
+
+#, fuzzy
+msgid ""
 "``patch``\n"
 "---------"
 msgstr ""
@@ -22405,11 +26215,11 b' msgstr ""'
 "精密プロファイル (名称: ``ls``) と、 サンプリングプロファイル (名称:\n"
 "``stat``) の2種類です。"
 
+#, fuzzy
 msgid ""
 "In this section description, 'profiling data' stands for the raw data\n"
 "collected during profiling, while 'profiling report' stands for a\n"
-"statistical text report generated from the profiling data. The\n"
-"profiling is done using lsprof."
+"statistical text report generated from the profiling data."
 msgstr ""
 "以下の説明では、 プロファイル期間に採取される生データの事を\n"
 "'プロファイルデータ'、 プロファイルデータを元にした、\n"
@@ -22552,13 +26362,14 b' msgstr ""'
 "``limit``\n"
 "    表示対象行数。 詳細プロファイラ ``ls`` 固有の設定。 (デフォルト値: 30)"
 
+#, fuzzy
 msgid ""
 "``nested``\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)"
+"    (default: 0)"
 msgstr ""
 "``nested``\n"
 "    個々のメインエントリ以後の、 掘り下げ (drill-down) 情報表示の、\n"
@@ -22566,6 +26377,33 b' msgstr ""'
 "    詳細プロファイラ ``ls`` 固有の設定。 (デフォルト値: 5)"
 
 msgid ""
+"``showmin``\n"
+"    Minimum fraction of samples an entry must have for it to be displayed.\n"
+"    Can be specified as a float between ``0.0`` and ``1.0`` or can have a\n"
+"    ``%`` afterwards to allow values up to ``100``. e.g. ``5%``."
+msgstr ""
+
+msgid "    Only used by the ``stat`` profiler."
+msgstr ""
+
+msgid ""
+"    For the ``hotpath`` format, default is ``0.05``.\n"
+"    For the ``chrome`` format, default is ``0.005``."
+msgstr ""
+
+msgid "    The option is unused on other formats."
+msgstr ""
+
+msgid ""
+"``showmax``\n"
+"    Maximum fraction of samples an entry can have before it is ignored in\n"
+"    display. Values format is the same as ``showmin``."
+msgstr ""
+
+msgid "    For the ``chrome`` format, default is ``0.999``."
+msgstr ""
+
+msgid ""
 "``progress``\n"
 "------------"
 msgstr ""
@@ -22600,6 +26438,12 b' msgstr ""'
 "    (デフォルト値: 1.0)"
 
 msgid ""
+"``estimateinterval``\n"
+"    Maximum sampling interval in seconds for speed and estimated time\n"
+"    calculation. (default: 60)"
+msgstr ""
+
+msgid ""
 "``refresh``\n"
 "    Time in seconds between refreshes of the progress bar. (default: 0.1)"
 msgstr ""
@@ -22669,8 +26513,9 b' msgstr ""'
 "``rebase``\n"
 "----------"
 
-msgid ""
-"``allowdivergence``\n"
+#, fuzzy
+msgid ""
+"``evolution.allowdivergence``\n"
 "    Default to False, when True allow creating divergence when performing\n"
 "    rebase of obsolete changesets."
 msgstr ""
@@ -22701,6 +26546,19 b' msgid "Controls generic server settings.'
 msgstr "一般的なサーバ機能の設定。"
 
 msgid ""
+"``bookmarks-pushkey-compat``\n"
+"    Trigger pushkey hook when being pushed bookmark updates. This config "
+"exist\n"
+"    for compatibility purpose (default to True)"
+msgstr ""
+
+msgid ""
+"    If you use ``pushkey`` and ``pre-pushkey`` hooks to control bookmark\n"
+"    movement we recommend you migrate them to ``txnclose-bookmark`` and\n"
+"    ``pretxnclose-bookmark``."
+msgstr ""
+
+msgid ""
 "``compressionengines``\n"
 "    List of compression engines and their relative priority to advertise\n"
 "    to clients."
@@ -22748,6 +26606,16 b' msgstr ""'
 "    一時的な書き込みロックが保持されます。\n"
 "    (デフォルト値: True)"
 
+#, fuzzy
+msgid ""
+"``uncompressedallowsecret``\n"
+"    Whether to allow stream clones when the repository contains secret\n"
+"    changesets. (default: False)"
+msgstr ""
+"``allowgz``\n"
+"    (非推奨) .tar.gz 形式でのアーカイブダウンロードの可否。\n"
+"    (デフォルト値: False)"
+
 msgid ""
 "``preferuncompressed``\n"
 "    When set, clients will try to use the uncompressed streaming\n"
@@ -22758,6 +26626,52 b' msgstr ""'
 "    (デフォルト値: False)"
 
 msgid ""
+"``disablefullbundle``\n"
+"    When set, servers will refuse attempts to do pull-based clones.\n"
+"    If this option is set, ``preferuncompressed`` and/or clone bundles\n"
+"    are highly recommended. Partial clones will still be allowed.\n"
+"    (default: False)"
+msgstr ""
+
+msgid ""
+"``streamunbundle``\n"
+"    When set, servers will apply data sent from the client directly,\n"
+"    otherwise it will be written to a temporary file first. This option\n"
+"    effectively prevents concurrent pushes."
+msgstr ""
+
+msgid ""
+"``pullbundle``\n"
+"    When set, the server will check pullbundle.manifest for bundles\n"
+"    covering the requested heads and common nodes. The first matching\n"
+"    entry will be streamed to the client."
+msgstr ""
+
+msgid ""
+"    For HTTP transport, the stream will still use zlib compression\n"
+"    for older clients."
+msgstr ""
+
+msgid ""
+"``concurrent-push-mode``\n"
+"    Level of allowed race condition between two pushing clients."
+msgstr ""
+
+msgid ""
+"    - 'strict': push is abort if another client touched the repository\n"
+"      while the push was preparing. (default)\n"
+"    - 'check-related': push is only aborted if it affects head that got "
+"also\n"
+"      affected while the push was preparing."
+msgstr ""
+
+msgid ""
+"    This requires compatible client (version 4.3 and later). Old client "
+"will\n"
+"    use 'strict'."
+msgstr ""
+
+msgid ""
 "``validate``\n"
 "    Whether to validate the completeness of pushed changesets by\n"
 "    checking that all new file revisions specified in manifests are\n"
@@ -22980,6 +26894,74 b' msgstr ""'
 "絶対パス化前の参照先に対し、 合致判定／買い替えを再度実施します。\n"
 "書き換えの適用は、 記述順に実施されます。"
 
+#, fuzzy
+msgid ""
+"``subrepos``\n"
+"------------"
+msgstr ""
+"\n"
+"``subpaths``\n"
+"------------"
+
+msgid ""
+"This section contains options that control the behavior of the\n"
+"subrepositories feature. See also :hg:`help subrepos`."
+msgstr ""
+
+msgid ""
+"Security note: auditing in Mercurial is known to be insufficient to\n"
+"prevent clone-time code execution with carefully constructed Git\n"
+"subrepos. It is unknown if a similar detect is present in Subversion\n"
+"subrepos. Both Git and Subversion subrepos are disabled by default\n"
+"out of security concerns. These subrepo types can be enabled using\n"
+"the respective options below."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"``allowed``\n"
+"    Whether subrepositories are allowed in the working directory."
+msgstr ""
+"``parents([set])``\n"
+"    指定リビジョン群または作業領域の、 全親リビジョン群。"
+
+msgid ""
+"    When false, commands involving subrepositories (like :hg:`update`)\n"
+"    will fail for all subrepository types.\n"
+"    (default: true)"
+msgstr ""
+
+msgid ""
+"``hg:allowed``\n"
+"    Whether Mercurial subrepositories are allowed in the working\n"
+"    directory. This option only has an effect if ``subrepos.allowed``\n"
+"    is true.\n"
+"    (default: true)"
+msgstr ""
+
+msgid ""
+"``git:allowed``\n"
+"    Whether Git subrepositories are allowed in the working directory.\n"
+"    This option only has an effect if ``subrepos.allowed`` is true."
+msgstr ""
+
+msgid ""
+"    See the security note above before enabling Git subrepos.\n"
+"    (default: false)"
+msgstr ""
+
+msgid ""
+"``svn:allowed``\n"
+"    Whether Subversion subrepositories are allowed in the working\n"
+"    directory. This option only has an effect if ``subrepos.allowed``\n"
+"    is true."
+msgstr ""
+
+msgid ""
+"    See the security note above before enabling Subversion subrepos.\n"
+"    (default: false)"
+msgstr ""
+
 msgid ""
 "``templatealias``\n"
 "-----------------"
@@ -23186,13 +27168,14 b' msgstr ""'
 msgid "    By default, the first bundle advertised by the server is used."
 msgstr ""
 
+#, fuzzy
 msgid ""
 "``color``\n"
-"    String: when to use to colorize output. possible value are auto, "
-"always,\n"
-"    never, or debug (default: auto). 'auto' will use color whenever it "
-"seems\n"
-"    possible. See :hg:`help color` for details."
+"    When to colorize output. Possible value are Boolean (\"yes\" or \"no\"), "
+"or\n"
+"    \"debug\", or \"always\". (default: \"yes\"). \"yes\" will use color "
+"whenever it\n"
+"    seems possible. See :hg:`help color` for details."
 msgstr ""
 "``color``\n"
 "    文字列: コマンド出力のカラー化設定。 指定可能な値は auto, always,\n"
@@ -23200,9 +27183,6 b' msgstr ""'
 "    可能な範囲でカラー化されます。 詳細は :hg:`help color`\n"
 "    を参照してください。"
 
-msgid "    (in addition a boolean can be used in place always/never)"
-msgstr "    (true/false 等の真偽値は always/never 相当とみなされます)"
-
 msgid ""
 "``commitsubrepos``\n"
 "    Whether to commit modified subrepositories when committing the\n"
@@ -23365,16 +27345,31 b' msgstr ""'
 "    文字コード混在による深刻な問題を生じます。"
 
 msgid ""
+"    Can be overridden per-merge-tool, see the ``[merge-tools]`` section."
+msgstr ""
+
+#, fuzzy
+msgid ""
 "``origbackuppath``\n"
 "    The path to a directory used to store generated .orig files. If the path "
 "is\n"
-"    not a directory, one will be created."
+"    not a directory, one will be created.  If set, files stored in this\n"
+"    directory have the same name as the original file and do not have a ."
+"orig\n"
+"    suffix."
 msgstr ""
 "``origbackuppath``\n"
 "    バックアップ用の .orig ファイル格納先のディレクトリ名。 格納時点で、\n"
 "    対象ディレクトリが不在の場合は、 新規に作成されます。"
 
 msgid ""
+"``paginate``\n"
+"  Control the pagination of command output (default: True). See :hg:`help "
+"pager`\n"
+"  for details."
+msgstr ""
+
+msgid ""
 "``patch``\n"
 "    An optional external tool that ``hg import`` and some extensions\n"
 "    will use for applying patches. By default Mercurial uses an\n"
@@ -23491,6 +27486,11 b' msgstr ""'
 
 msgid ""
 "``slash``\n"
+"    (Deprecated. Use ``slashpath`` template filter instead.)"
+msgstr ""
+
+#, fuzzy
+msgid ""
 "    Display paths using a slash (``/``) as the path separator. This\n"
 "    only makes a difference on systems where the default path\n"
 "    separator is not the slash character (e.g. Windows uses the\n"
@@ -23518,6 +27518,12 b' msgstr ""'
 "    SSH 接続に使用するコマンド。 (デフォルト値: ``ssh``)"
 
 msgid ""
+"``ssherrorhint``\n"
+"    A hint shown to the user in the case of SSH error (e.g.\n"
+"    ``Please see http://company/internalwiki/ssh.html``)"
+msgstr ""
+
+msgid ""
 "``strict``\n"
 "    Require exact command names, instead of allowing unambiguous\n"
 "    abbreviations. (default: False)"
@@ -23568,6 +27574,17 b' msgstr ""'
 "    ロック解放待ちにおけるタイムアウト時間指定 (単位: 秒)。\n"
 "    負値はタイムアウト無しを意味します。 (デフォルト値: 600)"
 
+#, fuzzy
+msgid ""
+"``timeout.warn``\n"
+"    Time (in seconds) before a warning is printed about held lock. A "
+"negative\n"
+"    value means no warning. (default: 0)"
+msgstr ""
+"``timeout``\n"
+"    ロック解放待ちにおけるタイムアウト時間指定 (単位: 秒)。\n"
+"    負値はタイムアウト無しを意味します。 (デフォルト値: 600)"
+
 msgid ""
 "``traceback``\n"
 "    Mercurial always prints a traceback when an unknown exception\n"
@@ -23581,6 +27598,18 b' msgstr ""'
 "    MemoryError) であっても、トレースバックを表示します。\n"
 "    (デフォルト値: False)"
 
+msgid "``tweakdefaults``"
+msgstr ""
+
+msgid ""
+"    By default Mercurial's behavior changes very little from release\n"
+"    to release, but over time the recommended config settings\n"
+"    shift. Enable this config to opt in to get automatic tweaks to\n"
+"    Mercurial's behavior over time. This config setting will have no\n"
+"    effet if ``HGPLAIN` is set or ``HGPLAINEXCEPT`` is set and does\n"
+"    not include ``tweakdefaults``. (default: False)"
+msgstr ""
+
 msgid ""
 "``username``\n"
 "    The committer of a changeset created when running \"commit\".\n"
@@ -23654,7 +27683,8 b' msgstr ""'
 "信頼できる環境 (例: 私的な LAN 配下で、 全ての利用者に :hg:`push` 許可)\n"
 "において、 素早くサーバを立ち上げたい場合、 以下の起動形式が良いでしょう::"
 
-msgid "    $ hg --config web.allow_push=* --config web.push_ssl=False serve"
+#, fuzzy
+msgid "    $ hg --config web.allow-push=* --config web.push_ssl=False serve"
 msgstr "    $ hg --config web.allow_push=* --config web.push_ssl=False serve"
 
 msgid ""
@@ -23710,21 +27740,23 b' msgstr ""'
 "    (非推奨) .tar.gz 形式でのアーカイブダウンロードの可否。\n"
 "    (デフォルト値: False)"
 
-msgid ""
-"``allowpull``\n"
+#, fuzzy
+msgid ""
+"``allow-pull``\n"
 "    Whether to allow pulling from the repository. (default: True)"
 msgstr ""
 "``allowpull``\n"
 "    :hg:`pull` 要求への応答の可否。 (デフォルト値: True)"
 
-msgid ""
-"``allow_push``\n"
+#, fuzzy
+msgid ""
+"``allow-push``\n"
 "    Whether to allow pushing to the repository. If empty or not set,\n"
 "    pushing is not allowed. If the special value ``*``, any remote\n"
 "    user can push, including unauthenticated users. Otherwise, the\n"
 "    remote user must have been authenticated, and the authenticated\n"
 "    user name must be present in this list. The contents of the\n"
-"    allow_push list are examined after the deny_push list."
+"    allow-push list are examined after the deny_push list."
 msgstr ""
 "``allow_push``\n"
 "    :hg:`push` 要求への応答の可否。 空または未設定の場合、 :hg:`push`\n"
@@ -23901,13 +27933,14 b' msgid ""'
 "    threat model."
 msgstr ""
 
+#, fuzzy
 msgid ""
 "``deny_push``\n"
 "    Whether to deny pushing to the repository. If empty or not set,\n"
 "    push is not denied. If the special value ``*``, all remote users are\n"
 "    denied push. Otherwise, unauthenticated users are all denied, and\n"
 "    any authenticated user name present in this list is also denied. The\n"
-"    contents of the deny_push list are examined before the allow_push list."
+"    contents of the deny_push list are examined before the allow-push list."
 msgstr ""
 "``deny_push``\n"
 "    :hg:`push` 要求拒否の要否。 空または未設定の場合、 :hg:`push` は、\n"
@@ -24133,6 +28166,11 b' msgstr ""'
 "    (デフォルト値: 20)"
 
 msgid ""
+"``server-header``\n"
+"    Value for HTTP ``Server`` response header."
+msgstr ""
+
+msgid ""
 "``staticurl``\n"
 "    Base URL to use for static files. If unset, static files (e.g. the\n"
 "    hgicon.png favicon) will be served by the CGI script itself. Use\n"
@@ -24259,6 +28297,16 b' msgstr ""'
 "並列実施に関する設定。 現状では、 Unix 系システムにおける作業領域更新で、\n"
 "処理の並列実施により、 大規模リポジトリでの大幅な性能改善が見込まれます。"
 
+#, fuzzy
+msgid ""
+"``enabled``\n"
+"    Whether to enable workers code to be used.\n"
+"    (default: true)"
+msgstr ""
+"``enabled``\n"
+"    プロファイラの有効化。\n"
+"    (デフォルト値: false)"
+
 msgid ""
 "``numcpus``\n"
 "    Number of CPUs to use for parallel operations. A zero or\n"
@@ -24470,7 +28518,8 b' msgstr ""'
 "    コミットの際のメッセージ入力を行うためのエディタの名前。\n"
 "    EDITOR 環境変数についても参照してください。"
 
-msgid "    (deprecated, use configuration file)"
+#, fuzzy
+msgid "    (deprecated, see :hg:`help config.ui.editor`)"
 msgstr "    (非推奨: 設定ファイル経由で指定してください)"
 
 msgid ""
@@ -24533,6 +28582,10 b' msgstr ""'
 "    作業領域のファイル、 マージ対象別リビジョンのファイル、\n"
 "    両者の親リビジョンのファイルを表す、 3つの引数が指定されます。"
 
+#, fuzzy
+msgid "    (deprecated, see :hg:`help config.ui.merge`)"
+msgstr "    (非推奨: 設定ファイル経由で指定してください)"
+
 msgid ""
 "HGRCPATH\n"
 "    A list of files or directories to search for configuration\n"
@@ -24574,12 +28627,26 b' msgstr ""'
 "    ツール等から Mercurial を使用する場合に有用です。"
 
 msgid ""
+"    In addition to the features disabled by ``HGPLAIN=``, the following\n"
+"    values can be specified to adjust behavior:"
+msgstr ""
+
+msgid ""
+"    ``+strictflags``\n"
+"        Restrict parsing of command line flags."
+msgstr ""
+
+msgid ""
 "    Equivalent options set via command line flags or environment\n"
 "    variables are not overridden."
 msgstr ""
 "    コマンドラインや環境変数によって、 同等のオプションが、\n"
 "    明示的に指定された場合には、 こららは無視されません。"
 
+#, fuzzy
+msgid "    See :hg:`help scripting` for details."
+msgstr "詳細は :hg:`help color` を参照してください。\n"
+
 msgid ""
 "HGPLAINEXCEPT\n"
 "    This is a comma-separated list of features to preserve when\n"
@@ -24589,9 +28656,12 b' msgstr ""'
 "    HGPLAIN による設定無効化の際でも、 継続して利用したい機能名を、\n"
 "    カンマ区切りで列挙します。 現在利用可能な機能名は以下の通り:"
 
+#, fuzzy
 msgid ""
 "    ``alias``\n"
 "        Don't remove aliases.\n"
+"    ``color``\n"
+"        Don't disable colored output.\n"
 "    ``i18n``\n"
 "        Preserve internationalization.\n"
 "    ``revsetalias``\n"
@@ -24641,6 +28711,10 b' msgstr ""'
 "    - 対話的な入力\n"
 "    - LOGNAME 環境変数値(``@hostname`` が付与されます)"
 
+#, fuzzy
+msgid "    (deprecated, see :hg:`help config.ui.username`)"
+msgstr "    (非推奨: 設定ファイル経由で指定してください)"
+
 msgid ""
 "EMAIL\n"
 "    May be used as the author of a commit; see HGUSER."
@@ -24783,12 +28857,14 b' msgstr ""'
 "(※ 訳注: いわゆる「関数」的なもの) を提供しており、\n"
 "二項演算子による結合や、 括弧によるグループ化も可能です。"
 
+#, fuzzy
 msgid ""
 "Identifiers such as filenames or patterns must be quoted with single\n"
 "or double quotes if they contain characters outside of\n"
 "``[.*{}[]?/\\_a-zA-Z0-9\\x80-\\xff]`` or if they match one of the\n"
 "predefined predicates. This generally applies to file patterns other\n"
-"than globs and arguments for predicates."
+"than globs and arguments for predicates. Pattern prefixes such as\n"
+"``path:`` may be specified without quoting."
 msgstr ""
 "ファイル名やパターンが、 ``[.*{}[]?/\\_a-zA-Z0-9\\x80-\\xff]``\n"
 "以外の文字や、 既存の述語と一致する場合、 引用符(') または二重引用符(\")\n"
@@ -24905,9 +28981,224 b' msgstr " hg revert \\"set:revs(\'wdir()'
 msgid "- Remove files listed in foo.lst that contain the letter a or b::"
 msgstr "- foo.lst の一覧中で a 又は b を名前に含むファイルを登録除外::"
 
-msgid "    hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\"\n"
+#, fuzzy
+msgid "    hg remove \"set: listfile:foo.lst and (**a* or **b*)\"\n"
 msgstr "    hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\"\n"
 
+msgid "Most Mercurial commands accept various flags."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Flag names\n"
+"=========="
+msgstr ""
+"記述例\n"
+"======"
+
+msgid ""
+"Flags for each command are listed in :hg:`help` for that command.\n"
+"Additionally, some flags, such as --repository, are global and can be used "
+"with\n"
+"any command - those are seen in :hg:`help -v`, and can be specified before "
+"or\n"
+"after the command."
+msgstr ""
+
+msgid ""
+"Every flag has at least a long name, such as --repository. Some flags may "
+"also\n"
+"have a short one-letter name, such as the equivalent -R. Using the short or "
+"long\n"
+"name is equivalent and has the same effect."
+msgstr ""
+
+msgid ""
+"Flags that have a short name can also be bundled together - for instance, "
+"to\n"
+"specify both --edit (short -e) and --interactive (short -i), one could use::"
+msgstr ""
+
+#, fuzzy
+msgid "    hg commit -ei"
+msgstr "hg commit"
+
+msgid ""
+"If any of the bundled flags takes a value (i.e. is not a boolean), it must "
+"be\n"
+"last, followed by the value::"
+msgstr ""
+
+#, fuzzy
+msgid "    hg commit -im 'Message'"
+msgstr "指定テキストをコミットログとして使用"
+
+#, fuzzy
+msgid ""
+"Flag types\n"
+"=========="
+msgstr ""
+"フィルタ\n"
+"========"
+
+msgid ""
+"Mercurial command-line flags can be strings, numbers, booleans, or lists of\n"
+"strings."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Specifying flag values\n"
+"======================"
+msgstr ""
+"単一リビジョンの指定\n"
+"===================="
+
+msgid ""
+"The following syntaxes are allowed, assuming a flag 'flagname' with short "
+"name\n"
+"'f'::"
+msgstr ""
+
+msgid ""
+"    --flagname=foo\n"
+"    --flagname foo\n"
+"    -f foo\n"
+"    -ffoo"
+msgstr ""
+
+msgid ""
+"This syntax applies to all non-boolean flags (strings, numbers or lists)."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Specifying boolean flags\n"
+"========================"
+msgstr ""
+"単一リビジョンの指定\n"
+"===================="
+
+msgid ""
+"Boolean flags do not take a value parameter. To specify a boolean, use the "
+"flag\n"
+"name to set it to true, or the same name prefixed with 'no-' to set it to\n"
+"false::"
+msgstr ""
+
+msgid ""
+"    hg commit --interactive\n"
+"    hg commit --no-interactive"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Specifying list flags\n"
+"====================="
+msgstr ""
+"単一リビジョンの指定\n"
+"===================="
+
+msgid ""
+"List flags take multiple values. To specify them, pass the flag multiple "
+"times::"
+msgstr ""
+
+msgid "    hg files --include mercurial --include tests"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Setting flag defaults\n"
+"====================="
+msgstr ""
+"インタフェースの選択\n"
+"===================="
+
+msgid ""
+"In order to set a default value for a flag in an hgrc file, it is "
+"recommended to\n"
+"use aliases::"
+msgstr ""
+
+msgid ""
+"    [alias]\n"
+"    commit = commit --interactive"
+msgstr ""
+
+#, fuzzy
+msgid "For more information on hgrc files, see :hg:`help config`."
+msgstr ""
+"    (フェーズに関する詳細は、 :hg:`help phases` を参照してください)\n"
+"    "
+
+#, fuzzy
+msgid ""
+"Overriding flags on the command line\n"
+"===================================="
+msgstr ""
+"Mercurial コマンドとの連携\n"
+"=========================="
+
+msgid ""
+"If the same non-list flag is specified multiple times on the command line, "
+"the\n"
+"latest specification is used::"
+msgstr ""
+
+msgid "    hg commit -m \"Ignored value\" -m \"Used value\""
+msgstr ""
+
+msgid "This includes the use of aliases - e.g., if one has::"
+msgstr ""
+
+msgid ""
+"    [alias]\n"
+"    committemp = commit -m \"Ignored value\""
+msgstr ""
+
+msgid "then the following command will override that -m::"
+msgstr ""
+
+msgid "    hg committemp -m \"Used value\""
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Overriding flag defaults\n"
+"========================"
+msgstr ""
+"サブリポジトリの削除\n"
+"===================="
+
+msgid ""
+"Every flag has a default value, and you may also set your own defaults in "
+"hgrc\n"
+"as described above.\n"
+"Except for list flags, defaults can be overridden on the command line simply "
+"by\n"
+"specifying the flag in that location."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"Hidden flags\n"
+"============"
+msgstr ""
+"等価性\n"
+"======"
+
+msgid ""
+"Some flags are not shown in a command's help by default - specifically, "
+"those\n"
+"that are deemed to be experimental, deprecated or advanced. To show all "
+"flags,\n"
+"add the --verbose flag for the help command::"
+msgstr ""
+
+msgid "    hg help --verbose commit\n"
+msgstr ""
+
 msgid ""
 "Ancestor\n"
 "    Any changeset that can be reached by an unbroken chain of parent\n"
@@ -26176,16 +30467,17 b' msgstr ""'
 "\"\"\"\"\"\"\"\"\"\"\n"
 "|hgignore(5)|_, |hgrc(5)|_"
 
+#, fuzzy
 msgid ""
 "Copying\n"
 "\"\"\"\"\"\"\"\n"
-"Copyright (C) 2005-2017 Matt Mackall.\n"
+"Copyright (C) 2005-2018 Matt Mackall.\n"
 "Free use of this software is granted under the terms of the GNU General\n"
 "Public License version 2 or any later version."
 msgstr ""
 "Copying\n"
 "\"\"\"\"\"\"\"\n"
-"Copyright (C) 2005-2017 Matt Mackall.\n"
+"Copyright (C) 2005-2016 Matt Mackall.\n"
 "本ソフトウェアは、 バージョン2またはそれ以降の GNU General\n"
 "Public License の元での自由な利用が保証されています。"
 
@@ -26239,11 +30531,12 b' msgstr ""'
 "==========\n"
 "|hg(1)|_, |hgrc(5)|_"
 
+#, fuzzy
 msgid ""
 "Copying\n"
 "=======\n"
 "This manual page is copyright 2006 Vadim Gelfer.\n"
-"Mercurial is copyright 2005-2017 Matt Mackall.\n"
+"Mercurial is copyright 2005-2018 Matt Mackall.\n"
 "Free use of this software is granted under the terms of the GNU General\n"
 "Public License version 2 or any later version."
 msgstr ""
@@ -26527,11 +30820,12 b' msgstr ""'
 "==========\n"
 "|hg(1)|_, |hgignore(5)|_"
 
+#, fuzzy
 msgid ""
 "Copying\n"
 "=======\n"
 "This manual page is copyright 2005 Bryan O'Sullivan.\n"
-"Mercurial is copyright 2005-2017 Matt Mackall.\n"
+"Mercurial is copyright 2005-2018 Matt Mackall.\n"
 "Free use of this software is granted under the terms of the GNU General\n"
 "Public License version 2 or any later version."
 msgstr ""
@@ -26897,15 +31191,15 b' msgstr ""'
 "7. マージ対象ファイルがシンボリックリンクやバイナリファイルでない場合、\n"
 "   内部ツールの ``:merge`` が使用されます。"
 
-msgid "8. The merge of the file fails and must be resolved before commit."
-msgstr ""
-"8. ファイルのマージは失敗とみなされ、 手動での :hg:`resolve` が必要です。"
-
+msgid "8. Otherwise, ``:prompt`` is used."
+msgstr ""
+
+#, fuzzy
 msgid ""
 "   After selecting a merge program, Mercurial will by default attempt\n"
 "   to merge the files using a simple merge algorithm first. Only if it "
 "doesn't\n"
-"   succeed because of conflicting changes Mercurial will actually execute "
+"   succeed because of conflicting changes will Mercurial actually execute "
 "the\n"
 "   merge program. Whether to use the simple merge algorithm first can be\n"
 "   controlled by the premerge setting of the merge tool. Premerge is enabled "
@@ -26927,8 +31221,9 b' msgstr ""'
 "マージツールの設定詳細に関しては、 hgrc(5) における merge-tools や\n"
 "ui セクションを参照してください。 (※ 訳注: :hg:`help config` でも参照可能)\n"
 
-msgid ""
-"Some Mercurial commands produce a lot of output, and Mercurial will\n"
+#, fuzzy
+msgid ""
+"Some Mercurial commands can produce a lot of output, and Mercurial will\n"
 "attempt to use a pager to make those commands more pleasant."
 msgstr ""
 "Mercurial のコマンドには、 大量の情報を出力するものがありますが、\n"
@@ -26944,16 +31239,31 b' msgstr ""'
 "  [pager]\n"
 "  pager = less -FRX"
 
-msgid ""
-"If no pager is set, the pager extensions uses the environment variable\n"
-"$PAGER. If neither pager.pager, nor $PAGER is set, a default pager\n"
-"will be used, typically `more`."
+#, fuzzy
+msgid ""
+"If no pager is set in the user or repository configuration, Mercurial uses "
+"the\n"
+"environment variable $PAGER. If $PAGER is not set, pager.pager from the "
+"default\n"
+"or system configuration is used. If none of these are set, a default pager "
+"will\n"
+"be used, typically `less` on Unix and `more` on Windows."
 msgstr ""
 "上記設定が無い場合、 Mercurial は PAGER 環境変数を参照します。\n"
 "どちらも未設定の場合、 Mercurial はデフォルトのページャを使用します\n"
 "(通常は `more` コマンド)。"
 
 msgid ""
+"  On Windows, `more` is not color aware, so using it effectively disables "
+"color.\n"
+"  MSYS and Cygwin shells provide `less` as a pager, which can be configured "
+"to\n"
+"  support ANSI color codes.  See :hg:`help config.color.pagermode` to "
+"configure\n"
+"  the color mode when invoking a pager."
+msgstr ""
+
+msgid ""
 "You can disable the pager for certain commands by adding them to the\n"
 "pager.ignore list::"
 msgstr ""
@@ -26975,13 +31285,15 b' msgstr ""'
 "ページャ使用を抑止したい場合、 個人の設定ファイル中で、\n"
 "その旨を明記してください。"
 
+#, fuzzy
 msgid ""
 "To control whether the pager is used at all for an individual command,\n"
-"you can use --pager=<value>::"
+"you can use --pager=<value>:"
 msgstr ""
 "--pager=<value> を指定することで、 ページャの使用を、コマンド実行の都度、\n"
 "明示することができます::"
 
+#, fuzzy
 msgid ""
 "  - use as needed: `auto`.\n"
 "  - require the pager: `yes` or `on`.\n"
@@ -26996,11 +31308,9 b' msgid "To globally turn off all attempts'
 msgstr "ページャ使用を全面的に抑止する場合は、 以下のように設定します::"
 
 msgid ""
-"  [pager]\n"
-"  enable = false"
-msgstr ""
-"  [pager]\n"
-"  enable = false"
+"  [ui]\n"
+"  paginate = never"
+msgstr ""
 
 msgid "which will prevent the pager from running.\n"
 msgstr "この設定により、 ページャ使用は完全に抑止されます。\n"
@@ -27130,12 +31440,14 b' msgstr ""'
 msgid "Glob examples::"
 msgstr "ワイルドカード指定例::"
 
+#, fuzzy
 msgid ""
 "  glob:*.c       any name ending in \".c\" in the current directory\n"
 "  *.c            any name ending in \".c\" in the current directory\n"
 "  **.c           any name ending in \".c\" in any subdirectory of the\n"
 "                 current directory including itself.\n"
-"  foo/*          any file in directory foo plus all its subdirectories,\n"
+"  foo/*          any file in directory foo\n"
+"  foo/**         any file in directory foo plus all its subdirectories,\n"
 "                 recursively\n"
 "  foo/*.c        any name ending in \".c\" in the directory foo\n"
 "  foo/**.c       any name ending in \".c\" in any subdirectory of foo\n"
@@ -27250,8 +31562,9 b' msgstr ""'
 "必要であれば :hg:`phase` コマンドによる手動でのフェーズ変更も可能です。\n"
 "実行例に関しては :hg:`help -v phase` を参照してください。"
 
-msgid ""
-"To make yours commits secret by default, put this in your\n"
+#, fuzzy
+msgid ""
+"To make your commits secret by default, put this in your\n"
 "configuration file::"
 msgstr ""
 "以下の記述を設定ファイルに追加することで、\n"
@@ -27362,7 +31675,8 b' msgstr " - \xe7\x8f\xbe\xe8\xa1\x8c\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xa8\xe5\xad\x90\xe5\xad\xab\xe3\x81\xae\xe3\x83\x95\xe3\x82\xa7\xe3\x83\xbc\xe3\x82\xba\xe3\x82\x92 public \xe3\x81\x8b\xe3\x82\x89 draft \xe3\x81\xab\xe5\xbc\xb7\xe5\x88\xb6\xe5\xa4\x89\xe6\x9b\xb4::"'
 msgid "     hg phase --force --draft ."
 msgstr "     hg phase --force --draft ."
 
-msgid " - show a list of changeset revision and phase::"
+#, fuzzy
+msgid " - show a list of changeset revisions and each corresponding phase::"
 msgstr " - リビジョン番号とフェーズを表示::"
 
 msgid "     hg log --template \"{rev} {phase}\\n\""
@@ -27566,9 +31880,11 b' msgstr ""'
 "  n には 0 1 または 2 を指定可能。\n"
 "  n == 0 ならリビジョン自身、 n == 1 なら第1親、 n == 2 なら第2親。"
 
+#, fuzzy
 msgid ""
 "``x~n``\n"
-"  The nth first ancestor of x; ``x~0`` is x; ``x~3`` is ``x^^^``."
+"  The nth first ancestor of x; ``x~0`` is x; ``x~3`` is ``x^^^``.\n"
+"  For n < 0, the nth unambiguous descendent of x."
 msgstr ""
 "``x~n``\n"
 "  リビジョン群 x 中の各リビジョンの、 第1親側の n 番目の祖先。\n"
@@ -27600,11 +31916,11 b' msgstr ""'
 "    issue(a1) = grep(r'\\bissue[ :]?' ## a1 ## r'\\b|\\bbug\\(' ## a1 ## "
 "r'\\)')"
 
+#, fuzzy
 msgid ""
 "    ``issue(1234)`` is equivalent to\n"
 "    ``grep(r'\\bissue[ :]?1234\\b|\\bbug\\(1234\\)')``\n"
-"    in this case. This matches against all of \"issue 1234\", "
-"\"issue:1234\",\n"
+"  in this case. This matches against all of \"issue 1234\", \"issue:1234\",\n"
 "    \"issue1234\" and \"bug(1234)\"."
 msgstr ""
 "    上記の別名が定義されている場合、 ``issue(1234)`` という記述は\n"
@@ -27653,9 +31969,10 b' msgstr ""'
 "そのような述語の合致判定で、 文字大小を無視したい場合は、 ``(?i)``\n"
 "で始まる正規表現を使ってください。"
 
-msgid ""
-"    ``tag(r're:(?i)release')`` matches \"release\" or \"RELEASE\" or "
-"\"Release\", etc"
+#, fuzzy
+msgid ""
+"For example, ``tag(r're:(?i)release')`` matches \"release\" or \"RELEASE\"\n"
+"or \"Release\", etc."
 msgstr ""
 "    ``tag(r're:(?i)release')``\n"
 "\n"
@@ -27784,8 +32101,10 b' msgid ""'
 msgstr ""
 "    hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tag())\""
 
-msgid ""
-"- Update to commit that bookmark @ is pointing too, without activating the\n"
+#, fuzzy
+msgid ""
+"- Update to the commit that bookmark @ is pointing to, without activating "
+"the\n"
 "  bookmark (this works because the last revision of the revset is used)::"
 msgstr ""
 "- ブックマーク @ 参照先に更新しつつ、 ブックマークのアクティブ化を回避\n"
@@ -27968,6 +32287,50 b' msgstr ""'
 "    (※ 訳注: 例えば largefiles 無効化は、 リポジトリアクセスを阻害します)\n"
 "    等に対して、 予期せぬ影響を生じ得る点に、 留意してください。"
 
+#, fuzzy
+msgid ""
+"Command-line Flags\n"
+"=================="
+msgstr ""
+"コマンドと URL\n"
+"=============="
+
+msgid ""
+"Mercurial's default command-line parser is designed for humans, and is not\n"
+"robust against malicious input. For instance, you can start a debugger by\n"
+"passing ``--debugger`` as an option value::"
+msgstr ""
+
+msgid "    $ REV=--debugger sh -c 'hg log -r \"$REV\"'"
+msgstr ""
+
+msgid ""
+"This happens because several command-line flags need to be scanned without\n"
+"using a concrete command table, which may be modified while loading "
+"repository\n"
+"settings and extensions."
+msgstr ""
+
+msgid ""
+"Since Mercurial 4.4.2, the parsing of such flags may be restricted by "
+"setting\n"
+"``HGPLAIN=+strictflags``. When this feature is enabled, all early options\n"
+"(e.g. ``-R/--repository``, ``--cwd``, ``--config``) must be specified first\n"
+"amongst the other global options, and cannot be injected to an arbitrary\n"
+"location::"
+msgstr ""
+
+msgid "    $ HGPLAIN=+strictflags hg -R \"$REPO\" log -r \"$REV\""
+msgstr ""
+
+msgid ""
+"In earlier Mercurial versions where ``+strictflags`` isn't available, you\n"
+"can mitigate the issue by concatenating an option value with its flag::"
+msgstr ""
+
+msgid "    $ hg log -r\"$REV\" --keyword=\"$KEYWORD\""
+msgstr ""
+
 msgid ""
 "Consuming Command Output\n"
 "========================"
@@ -28372,8 +32735,9 b' msgstr ""'
 ":archive: -S/--subrepos 指定が無い限り、 アーカイブの作成は、\n"
 "    再帰的には実施されません。"
 
-msgid ""
-":cat: cat currently only handles exact file matches in subrepos.\n"
+#, fuzzy
+msgid ""
+":cat: Git subrepositories only support exact file matches.\n"
 "    Subversion subrepositories are currently ignored."
 msgstr ""
 ":cat: 現状では、 サブリポジトリ中のファイルと厳密一致した場合のみ、\n"
@@ -28678,7 +33042,8 b' msgstr ""'
 "  乗算用の *\n"
 "  除算用の / (除算結果は、 マイナス無限大方向の整数値に丸められます)"
 
-msgid "Division fulfils the law x = x / y + mod(x, y)."
+#, fuzzy
+msgid "Division fulfills the law x = x / y + mod(x, y)."
 msgstr "除算結果は x = x / y + mod(x, y) を満たします。"
 
 msgid ""
@@ -28698,6 +33063,16 b' msgstr ""'
 "テンプレートとしての解釈を抑止する場合は、 ``\\{`` で開始するか、\n"
 "文字列指定の冒頭に ``r`` を付けて下さい (例: ``r'...'``)"
 
+msgid "The dot operator can be used as a shorthand for accessing a sub item:"
+msgstr ""
+
+msgid ""
+"- ``expr.member`` is roughly equivalent to ``expr % '{member}'`` if "
+"``expr``\n"
+"  returns a non-list/dict. The returned value is not stringified.\n"
+"- ``dict.key`` is identical to ``get(dict, 'key')``."
+msgstr ""
+
 msgid ""
 "New keywords and functions can be defined in the ``templatealias`` section "
 "of\n"
@@ -28751,6 +33126,34 b' msgstr "\xe4\xb8\x8a\xe8\xa8\x98\xe3\x81\xae ``nodedate`` \xe5\xae\x9a\xe7\xbe\xa9\xe3\x81\xab\xe3\x82\x88\xe3\x82\x8a\xe3\x80\x81 \xe4\xbb\xa5\xe4\xb8\x8b\xe3\x81\xae\xe3\x82\xb3\xe3\x83\x9e\xe3\x83\xb3\xe3\x83\x89\xe5\xae\x9f\xe8\xa1\x8c\xe3\x81\x8c\xe5\x8f\xaf\xe8\x83\xbd\xe3\x81\xab\xe3\x81\xaa\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x99::"'
 msgid "  $ hg log -r . -Tnodedate"
 msgstr "  $ hg log -r . -Tnodedate"
 
+msgid ""
+"A template defined in ``templates`` section can also be referenced from\n"
+"another template::"
+msgstr ""
+
+#, fuzzy
+msgid "  $ hg log -r . -T \"{rev} {nodedate}\""
+msgstr "  $ hg log -r . -Tnodedate"
+
+msgid ""
+"but be aware that the keywords cannot be overridden by templates. For "
+"example,\n"
+"a template defined as ``templates.rev`` cannot be referenced as ``{rev}``."
+msgstr ""
+
+msgid ""
+"A template defined in ``templates`` section may have sub templates which\n"
+"are inserted before/after/between items::"
+msgstr ""
+
+msgid ""
+"  [templates]\n"
+"  myjson = ' {dict(rev, node|short)|json}'\n"
+"  myjson:docheader = '\\{\\n'\n"
+"  myjson:docfooter = '\\n}\\n'\n"
+"  myjson:separator = ',\\n'"
+msgstr ""
+
 msgid "Some sample command line templates:"
 msgstr "コマンドラインでのテンプレート指定例:"
 
@@ -28951,9 +33354,10 b' msgstr ""'
 msgid "Some notes about using SSH with Mercurial:"
 msgstr "Mercurial と SSH を併用する場合の注意点:"
 
+#, fuzzy
 msgid ""
 "- SSH requires an accessible shell account on the destination machine\n"
-"  and a copy of hg in the remote path or specified with as remotecmd.\n"
+"  and a copy of hg in the remote path or specified with remotecmd.\n"
 "- path is relative to the remote user's home directory by default. Use\n"
 "  an extra slash at the start of a path to specify an absolute path::"
 msgstr ""
@@ -29134,11 +33538,15 b' msgstr "(\xe3\x83\x96\xe3\x83\x83\xe3\x82\xaf\xe3\x83\x9e\xe3\x83\xbc\xe3\x82\xaf %s \xe3\x82\x92\xe9\x9d\x9e\xe3\x82\xa2\xe3\x82\xaf\xe3\x83\x86\xe3\x82\xa3\xe3\x83\x96\xe5\x8c\x96\xe4\xb8\xad)\\n"'
 msgid "(activating bookmark %s)\n"
 msgstr "(ブックマーク %s をアクティブ化中)\n"
 
-msgid ""
-"use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to "
+#, python-format
+msgid "aborting the merge, updating back to %s\n"
+msgstr "マージを中断し、 作業領域を %s へと戻します\n"
+
+msgid ""
+"use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to "
 "abandon\n"
 msgstr ""
-"'hg resolve' で再度衝突解消するか、 'hg up -C .' で変更破棄してください\n"
+"'hg resolve' で衝突解消するか 'hg merge --abort' で変更破棄してください\n"
 
 msgid "(branch merge, don't forget to commit)\n"
 msgstr "(マージ結果の commit を忘れずに)\n"
@@ -29155,10 +33563,6 b' msgid "listening at http://%s%s/%s (boun'
 msgstr "http://%s%s/%s で待ち受け開始(バインド先は %s:%d)\n"
 
 #, python-format
-msgid "config file %s not found!"
-msgstr "設定ファイル %s が見つかりません!"
-
-#, python-format
 msgid "error reading %s/.hg/hgrc: %s\n"
 msgstr "%s/.hg/hgrc の読み込みに失敗: %s\n"
 
@@ -29166,6 +33570,10 b' msgstr "%s/.hg/hgrc \xe3\x81\xae\xe8\xaa\xad\xe3\x81\xbf\xe8\xbe\xbc\xe3\x81\xbf\xe3\x81\xab\xe5\xa4\xb1\xe6\x95\x97: %s\\n"'
 msgid "error accessing repository at %s\n"
 msgstr "リポジトリ %s へのアクセス失敗\n"
 
+#, python-format
+msgid "config file %s not found!"
+msgstr "設定ファイル %s が見つかりません!"
+
 msgid "SSL support is unavailable"
 msgstr "SSL サポートが利用できません"
 
@@ -29519,6 +33927,15 b' msgstr ""'
 msgid "    Show changeset information for each line in a file."
 msgstr "    ファイル各行の由来リビジョンの表示。"
 
+msgid ""
+"    The ``ignorews``, ``ignorewsamount``, ``ignorewseol``, and\n"
+"    ``ignoreblanklines`` query string arguments have the same meaning as\n"
+"    their ``[annotate]`` config equivalents. It uses the hgrc boolean\n"
+"    parsing logic to interpret the value. e.g. ``0`` and ``false`` are\n"
+"    false and ``1`` and ``true`` are true. If not defined, the server\n"
+"    default settings are used."
+msgstr ""
+
 msgid "    The ``fileannotate`` template is rendered."
 msgstr "    結果出力には ``fileannotate`` テンプレートを使用します。"
 
@@ -29602,7 +34019,10 b' msgid ""'
 "    representations of repository topology."
 msgstr "    この機能は、 履歴の木構造をグラフで描画します。"
 
-msgid "    The ``revision`` URL parameter controls the starting changeset."
+#, fuzzy
+msgid ""
+"    The ``revision`` URL parameter controls the starting changeset. If it's\n"
+"    absent, the default is ``tip``."
 msgstr "    URL パス要素 ``{revision}`` で、表示開始リビジョンを指定できます。"
 
 msgid ""
@@ -29612,6 +34032,13 b' msgid ""'
 msgstr ""
 "    クエリ文字列引数 ``revcount`` で、 読み込みの最大数を指定できます。"
 
+msgid ""
+"    The ``graphtop`` query string argument can specify the starting "
+"changeset\n"
+"    for producing ``jsdata`` variable that is used for rendering graph in\n"
+"    JavaScript. By default it has the same value as ``revision``."
+msgstr ""
+
 msgid "    This handler will render the ``graph`` template."
 msgstr "    結果出力には ``graph`` テンプレートを使用します。"
 
@@ -29648,6 +34075,9 b' msgstr ""'
 msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
 msgstr " 更新ファイル数 %d、 追加 %d 行(+)、 削除 %d 行(-)\n"
 
+msgid "not displayable without template"
+msgstr "テンプレート指定なしでは表示できません"
+
 #, python-format
 msgid "websub: invalid pattern for %s: %s\n"
 msgstr "websub: %s のパターンが不正です: %s\n"
@@ -29756,20 +34186,6 b' msgstr ""'
 msgid "HTTP request error (%s)"
 msgstr "HTTP 要求エラー (%s)"
 
-msgid ""
-"this may be an intermittent failure; if the error persists, consider "
-"contacting the network or server operator"
-msgstr ""
-"ネットワーク経路の切断が主要因です。同様のエラーが継続的に発生する場合は、"
-"ネットワークあるいはサーバの管理者に問い合わせてください"
-
-#, python-format
-msgid "unsupported URL component: \"%s\""
-msgstr "URL 要素 \"%s\" は未サポートです"
-
-msgid "operation not supported over http"
-msgstr "http リポジトリでは未サポートの機能です"
-
 #, python-format
 msgid "real URL is %s\n"
 msgstr "実際の URL: %s\n"
@@ -29786,6 +34202,9 b' msgstr ""'
 "%s\n"
 "---%%<---\n"
 
+msgid "unexpected CBOR response from server"
+msgstr "想定外の CBOR サーバ応答"
+
 #, python-format
 msgid "'%s' sent a broken Content-Type header (%s)"
 msgstr "'%s' は壊れた Content-Type ヘッダ(%s)を送信しました"
@@ -29798,16 +34217,50 b' msgstr "\'%s\' \xe3\x81\xaf\xe6\x96\xb0\xe3\x81\x97\xe3\x81\x84\xe3\x83\x97\xe3\x83\xad\xe3\x83\x88\xe3\x82\xb3\xe3\x83\xab %s \xe3\x82\x92\xe4\xbd\xbf\xe3\x81\x84\xe3\x81\xbe\xe3\x81\x99"'
 msgid "push failed: %s"
 msgstr "履歴反映に失敗: %s"
 
-msgid "Python support for SSL and HTTPS is not installed"
-msgstr "SSL と HTTPS をサポートした Python がインストールされていません"
+#, python-format
+msgid "cannot make request requiring multiple permissions: %s"
+msgstr ""
+
+#, fuzzy
+msgid "unfulfilled command response"
+msgstr "入力が不正です\n"
+
+#, python-format
+msgid ""
+"cannot %s; client or remote repository does not support the %r capability"
+msgstr "%s ができません。 クライアントまたは連携先は機能 %r が未サポートです"
+
+msgid "error decoding CBOR from remote server"
+msgstr "連携先サーバからの CBOR 応答が復号できません"
+
+msgid "try again and consider contacting the server operator"
+msgstr "再実行するなり連携先リポジトリの管理者に連絡するなりしてください"
+
+#, python-format
+msgid "unexpected response type from server: %s"
+msgstr "連携先サーバからの想定外の応答種別: %s"
+
+#, python-format
+msgid "unsupported URL component: \"%s\""
+msgstr "URL 要素 \"%s\" は未サポートです"
 
 msgid "cannot create new http repository"
 msgstr "http リポジトリの新規作成はできません"
 
+msgid "Python support for SSL and HTTPS is not installed"
+msgstr "SSL と HTTPS をサポートした Python がインストールされていません"
+
 msgid "(falling back to static-http)\n"
 msgstr "(static-http との連携に切り替え中)\n"
 
 #, python-format
+msgid "bad HTTP status line: %s"
+msgstr "不正な HTTP ステータス行: %s"
+
+msgid "cannot perform stream clone against local peer"
+msgstr ""
+
+#, python-format
 msgid "repository %s not found"
 msgstr "リポジトリ '%s' が見つかりません"
 
@@ -29819,9 +34272,10 b' msgstr "\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa %s \xe3\x81\xaf\xe6\x97\xa2\xe3\x81\xab\xe5\xad\x98\xe5\x9c\xa8\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x84\xe3\x81\xbe\xe3\x81\x99"'
 msgid ".hg/sharedpath points to nonexistent directory %s"
 msgstr ".hg/sharedpath の参照先 %s は存在しません"
 
-#, python-format
-msgid "obsolete feature not enabled but %i markers found!\n"
-msgstr "obsolete 機能は無効ですが、 %i 個の廃止情報マーカが存在します!\n"
+msgid ""
+"repository is using sparse feature but sparse is not enabled; enable the "
+"\"sparse\" extensions to access"
+msgstr ""
 
 #, python-format
 msgid "warning: ignoring unknown working parent %s!\n"
@@ -29843,12 +34297,12 b' msgid "no rollback information available'
 msgstr "利用可能なロールバック情報がありません\n"
 
 #, python-format
-msgid "repository tip rolled back to revision %s (undo %s: %s)\n"
-msgstr "tip をリビジョン %s へと巻き戻し(%s %s の取り消し)\n"
-
-#, python-format
-msgid "repository tip rolled back to revision %s (undo %s)\n"
-msgstr "tip をリビジョン %s へと巻き戻し(%s の取り消し)\n"
+msgid "repository tip rolled back to revision %d (undo %s: %s)\n"
+msgstr "tip をリビジョン %d へと巻き戻し (%s %s の取り消し)\n"
+
+#, python-format
+msgid "repository tip rolled back to revision %d (undo %s)\n"
+msgstr "tip をリビジョン %d へと巻き戻し (%s の取り消し)\n"
 
 msgid "rolling back unknown transaction\n"
 msgstr "未知のトランザクションの巻き戻し\n"
@@ -29872,10 +34326,6 b' msgid "working directory now based on re'
 msgstr "%d が作業領域の親リビジョンになりました\n"
 
 #, python-format
-msgid "waiting for lock on %s held by process %r on host %r\n"
-msgstr "%s のロック (プロセス %r/ホスト %s が保持) の解放を待っています\n"
-
-#, python-format
 msgid "repository %s"
 msgstr "リポジトリ '%s'"
 
@@ -29899,16 +34349,6 b' msgstr "\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xaf\xe7\xae\xa1\xe7\x90\x86\xe5\xaf\xbe\xe8\xb1\xa1\xe5\xa4\x96\xe3\x81\xa7\xe3\x81\x99!"'
 msgid "cannot partially commit a merge (do not specify files or patterns)"
 msgstr "マージの部分コミットはできません(ファイル名／パターンは指定できません)"
 
-#, python-format
-msgid "commit with new subrepo %s excluded"
-msgstr "コミット対象に、新規サブリポジトリ %s が含まれていません"
-
-msgid "use --subrepos for recursive commit"
-msgstr "--subrepos 指定で再帰コミット"
-
-msgid "can't commit subrepos without .hgsub"
-msgstr ".hgsub の無いサブリポジトリはコミットできません"
-
 msgid "cannot commit merge with missing files"
 msgstr "管理対象ファイルが不在の状況では、マージ結果をコミットできません"
 
@@ -29948,6 +34388,43 b' msgid "run \\"hg debuginstall\\" to list a'
 msgstr ""
 "\"hg debuginstall\" で表示される利用可能圧縮エンジン一覧を確認してください"
 
+#, python-format
+msgid "waiting for lock on %s held by process %r on host %r\n"
+msgstr "%s のロック (プロセス %r/ホスト %s が保持) の解放を待っています\n"
+
+#, python-format
+msgid "got lock after %d seconds\n"
+msgstr "%d 秒遅れでロックを獲得\n"
+
+msgid "limit must be a positive integer"
+msgstr "制限には正数を指定してください"
+
+msgid "limit must be positive"
+msgstr "制限には正数を指定してください"
+
+#, python-format
+msgid "warning: %s not inside relative root %s\n"
+msgstr "警告: %s は相対ルート %s の範囲外です\n"
+
+msgid "description:\n"
+msgstr "説明:\n"
+
+#, python-format
+msgid "malformatted line-range pattern %s"
+msgstr "不正な行範囲指定 %s"
+
+#, python-format
+msgid "invalid line range for %s"
+msgstr "不正な行範囲指定 %s"
+
+#, python-format
+msgid "line range pattern '%s' must match exactly one file"
+msgstr "行範囲指定 '%s' は単一ファイルにのみ合致する必要があります"
+
+#, python-format
+msgid "-G/--graph option is incompatible with --%s"
+msgstr "-G/--graph と --%s は併用できません"
+
 msgid "can't use TLS: Python SSL support not installed"
 msgstr "TLS を利用できません: Python SSL サポートがインストールされていません"
 
@@ -30010,9 +34487,6 b' msgid "cannot ask for manifest directory'
 msgstr ""
 "フラットなマニフェストではマニフェストディレクトリ '%s' を指定できません"
 
-msgid "fileset expression with no context"
-msgstr "対象リビジョン指定なしの fileset 記述"
-
 #, python-format
 msgid "unable to read file list (%s)"
 msgstr "一覧ファイル(%s)が読み込めません"
@@ -30062,6 +34536,14 b' msgid "%s.%s not valid (\'%s\' is none of '
 msgstr "%s.%s は無効です (指定値: '%s' 指定可能値: %s)"
 
 #, python-format
+msgid "%s: untracked file conflicts with directory\n"
+msgstr "%s: 管理対象外ファイルが管理対象ファイルのディレクトリ名と衝突\n"
+
+#, python-format
+msgid "%s: untracked directory conflicts with file\n"
+msgstr "%s: 管理対象外ディレクトリが管理対象ファイル名と衝突\n"
+
+#, python-format
 msgid "%s: untracked file differs\n"
 msgstr "%s: 管理対象外ファイルに差分あり\n"
 
@@ -30074,6 +34556,10 b' msgid "%s: replacing untracked file\\n"'
 msgstr "%s: 管理対象外ファイルの内容を書き換え\n"
 
 #, python-format
+msgid "%s: replacing untracked files in directory\n"
+msgstr "%s: ディレクトリ配下の管理対象外ファイルの内容を書き換え\n"
+
+#, python-format
 msgid "case-folding collision between %s and %s"
 msgstr "ファイル名の文字大小の問題で %s と %s が衝突します"
 
@@ -30081,6 +34567,13 b' msgstr "\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe5\x90\x8d\xe3\x81\xae\xe6\x96\x87\xe5\xad\x97\xe5\xa4\xa7\xe5\xb0\x8f\xe3\x81\xae\xe5\x95\x8f\xe9\xa1\x8c\xe3\x81\xa7 %s \xe3\x81\xa8 %s \xe3\x81\x8c\xe8\xa1\x9d\xe7\xaa\x81\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99"'
 msgid "case-folding collision between %s and directory of %s"
 msgstr "ファイル名の文字大小の問題で %s とディレクトリ %s が衝突します"
 
+#, python-format
+msgid "%s: is both a file and a directory\n"
+msgstr "%s: ファイル名／ディレクトリ名の両方で使用\n"
+
+msgid "destination manifest contains path conflicts"
+msgstr "指定リビジョンの管理対象ファイルにパスの衝突が含まれます"
+
 msgid "resolving manifests\n"
 msgstr "管理ファイル一覧の解決中\n"
 
@@ -30146,6 +34639,22 b' msgid "updating"'
 msgstr "更新中"
 
 #, python-format
+msgid "%s: path conflict - a file or link has the same name as a directory\n"
+msgstr "%s: パス衝突 - ファイル名／リンク名がディレクトリ名と一致\n"
+
+#, python-format
+msgid "the local file has been renamed to %s\n"
+msgstr ""
+
+#, python-format
+msgid "the remote file has been renamed to %s\n"
+msgstr ""
+
+#, python-format
+msgid "resolve manually then use 'hg resolve --mark %s'\n"
+msgstr "手動での衝突解消後、'hg resolve --mark %s' を実施してください\n"
+
+#, python-format
 msgid "getting %s to %s\n"
 msgstr "%s から %s に複製中\n"
 
@@ -30193,6 +34702,11 b' msgstr "\xe5\x82\x99\xe8\x80\x83: \xe8\xa1\x9d\xe7\xaa\x81\xe3\x81\xae\xe5\x8f\xaf\xe8\x83\xbd\xe6\x80\xa7 - %s \xe3\x81\x8c\xe8\xa4\x87\xe6\x95\xb0\xe3\x81\xae\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xab\xe6\x94\xb9\xe5\x90\x8d\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xbe\xe3\x81\x97\xe3\x81\x9f:\\n"'
 msgid "note: possible conflict - %s was deleted and renamed to:\n"
 msgstr "備考: 衝突の可能性 - 削除と平行して %s への改名があります:\n"
 
+msgid ""
+"(warning: large working directory being used without fsmonitor enabled; "
+"enable fsmonitor to improve performance; see \"hg help -e fsmonitor\")\n"
+msgstr ""
+
 msgid "unresolved merge conflicts (see 'hg help resolve')"
 msgstr "未解消の衝突が残っています ('hg help resolve' を参照)"
 
@@ -30202,6 +34716,21 b' msgstr ""'
 msgid "run \"hg resolve --all\" to resolve"
 msgstr "衝突解消には \"hg resolve --all\" を実行してください"
 
+#, fuzzy
+msgid "invalid file pattern"
+msgstr "不正パターン"
+
+#, fuzzy, python-format
+msgid "reserved character: %s"
+msgstr "想定外の revspec フォーマット文字 %s"
+
+#, fuzzy, python-format
+msgid "unsupported file pattern: %s"
+msgstr "未サポートなパーサ状態です: %s"
+
+msgid "paths must be prefixed with \"path:\""
+msgstr ""
+
 msgid "Attention:"
 msgstr "注意:"
 
@@ -30229,20 +34758,36 b' msgstr "\xe6\x83\x85\xe5\xa0\xb1:"'
 msgid "Warning!"
 msgstr "警告!"
 
-#. i18n: column positioning for "hg log"
-#, python-format
-msgid "bookmark:    %s\n"
-msgstr "ブックマーク: %s\n"
-
-#. i18n: column positioning for "hg log"
-#, python-format
-msgid "tag:         %s\n"
-msgstr "タグ:         %s\n"
-
 #, python-format
 msgid "no such name: %s"
 msgstr "指定の名前は存在しません: %s"
 
+msgid "narrowspec includes section must appear at most once, before excludes"
+msgstr ""
+
+msgid "narrowspec excludes section must appear at most once"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "Invalid narrowspec pattern line: \"%s\""
+msgstr "不正なマッチングパターン: %s"
+
+#, python-format
+msgid "Invalid key \"%s\" in server response"
+msgstr ""
+
+msgid "newlines are not allowed in narrowspec paths"
+msgstr ""
+
+msgid "\".\" and \"..\" are not allowed in narrowspec paths"
+msgstr ""
+
+msgid ""
+"'createmarkers' obsolete option must be enabled if other obsolete options "
+"are enabled"
+msgstr ""
+"廃止情報機能の各オプションの有効化には 'createmarkers' の有効化が必須です"
+
 #, python-format
 msgid ""
 "parsing obsolete marker: metadata is too short, %d bytes expected, got %d"
@@ -30266,6 +34811,10 b' msgid "creating obsolete markers is not '
 msgstr "廃止マーカの作成機能は無効化されています"
 
 #, python-format
+msgid "obsolete feature not enabled but %i markers found!\n"
+msgstr "obsolete 機能は無効ですが、 %i 個の廃止情報マーカが存在します!\n"
+
+#, python-format
 msgid "unknown key: %r"
 msgstr "未知のキーです: %r"
 
@@ -30281,11 +34830,25 b' msgstr "public \xe3\x83\x95\xe3\x82\xa7\xe3\x83\xbc\xe3\x82\xba\xe3\x81\xae\xe3\x83\xaa\xe3\x83\x93\xe3\x82\xb8\xe3\x83\xa7\xe3\x83\xb3\xe3\x81\xaf\xe5\xbb\x83\xe6\xad\xa2\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93: %s"'
 msgid "changeset %s cannot obsolete itself"
 msgstr "リビジョン %s をそれ自身で廃止することはできません"
 
-msgid ""
-"'createmarkers' obsolete option must be enabled if other obsolete options "
-"are enabled"
-msgstr ""
-"廃止情報機能の各オプションの有効化には 'createmarkers' の有効化が必須です"
+#, fuzzy, python-format
+msgid "hidden revision '%s' is pruned"
+msgstr "'%s' は不可視リビジョンです"
+
+#, fuzzy, python-format
+msgid "hidden revision '%s' has diverged"
+msgstr "'%s' は不可視リビジョンです"
+
+#, fuzzy, python-format
+msgid "hidden revision '%s' was rewritten as: %s"
+msgstr "'%s' は不可視リビジョンです"
+
+#, fuzzy, python-format
+msgid "hidden revision '%s' was split as: %s"
+msgstr "'%s' は不可視リビジョンです"
+
+#, python-format
+msgid "hidden revision '%s' was split as: %s and %d more"
+msgstr ""
 
 #, python-format
 msgid "unexpected token: %s"
@@ -30409,6 +34972,10 b' msgstr "\xe3\x81\x93\xe3\x82\x8c\xe3\x81\xaf\xe3\x83\x90\xe3\x82\xa4\xe3\x83\x8a\xe3\x83\xaa\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xa7\xe3\x81\x99\\n"'
 msgid "%d hunks, %d lines changed\n"
 msgstr "%d 個の差分、 %d 行の変更\n"
 
+#, fuzzy, python-format
+msgid "apply change %d/%d to '%s'?"
+msgstr "この変更 (%d 件目 / %d 件中) を '%s' から破棄しますか？"
+
 #, python-format
 msgid "discard change %d/%d to '%s'?"
 msgstr "この変更 (%d 件目 / %d 件中) を '%s' から破棄しますか？"
@@ -30417,9 +34984,9 b' msgstr "\xe3\x81\x93\xe3\x81\xae\xe5\xa4\x89\xe6\x9b\xb4 (%d \xe4\xbb\xb6\xe7\x9b\xae / %d \xe4\xbb\xb6\xe4\xb8\xad) \xe3\x82\x92 \'%s\' \xe3\x81\x8b\xe3\x82\x89\xe7\xa0\xb4\xe6\xa3\x84\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99\xe3\x81\x8b\xef\xbc\x9f"'
 msgid "record change %d/%d to '%s'?"
 msgstr "この変更 (%d 件目 / %d 件中) を '%s' に記録しますか？"
 
-#, python-format
-msgid "revert change %d/%d to '%s'?"
-msgstr "この変更 (%d 件目 / %d 件中) を '%s' に記録しますか？"
+#, fuzzy, python-format
+msgid "apply this change to '%s'?"
+msgstr "この変更を '%s' から破棄しますか？"
 
 #, python-format
 msgid "discard this change to '%s'?"
@@ -30429,9 +34996,31 b' msgstr "\xe3\x81\x93\xe3\x81\xae\xe5\xa4\x89\xe6\x9b\xb4\xe3\x82\x92 \'%s\' \xe3\x81\x8b\xe3\x82\x89\xe7\xa0\xb4\xe6\xa3\x84\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99\xe3\x81\x8b\xef\xbc\x9f"'
 msgid "record this change to '%s'?"
 msgstr "この変更を '%s' に記録しますか？"
 
-#, python-format
-msgid "revert this change to '%s'?"
-msgstr "この変更を '%s' に記録しますか？"
+#, fuzzy
+msgid ""
+"[Ynesfdaq?]$$ &Yes, apply this change$$ &No, skip this change$$ &Edit this "
+"change manually$$ &Skip remaining changes to this file$$ Apply remaining "
+"changes to this &file$$ &Done, skip remaining changes and files$$ Apply &all "
+"changes to all remaining files$$ &Quit, applying no changes$$ &? (display "
+"help)"
+msgstr ""
+"[Ynesfdaq?]$$ この変更を記録(&yes)$$ この変更を無視(&no)$$ この変更を手動で編"
+"集(&edit)$$ 同一ファイルの以後の全ての変更を無視(&skip)$$ 同一ファイル(&file)"
+"の以後の全ての変更を記録$$ 以後の全ての変更を無視＝記録作業を完了(&done)$$ 以"
+"後の全て(&all)の変更を記録$$ 変更の記録自体を中止(&quit)$$ ヘルプ表示(&?)"
+
+#, fuzzy
+msgid ""
+"[Ynesfdaq?]$$ &Yes, discard this change$$ &No, skip this change$$ &Edit this "
+"change manually$$ &Skip remaining changes to this file$$ Discard remaining "
+"changes to this &file$$ &Done, skip remaining changes and files$$ Discard "
+"&all changes to all remaining files$$ &Quit, discarding no changes$$ &? "
+"(display help)"
+msgstr ""
+"[Ynesfdaq?]$$ この変更を記録(&yes)$$ この変更を無視(&no)$$ この変更を手動で編"
+"集(&edit)$$ 同一ファイルの以後の全ての変更を無視(&skip)$$ 同一ファイル(&file)"
+"の以後の全ての変更を記録$$ 以後の全ての変更を無視＝記録作業を完了(&done)$$ 以"
+"後の全て(&all)の変更を記録$$ 変更の記録自体を中止(&quit)$$ ヘルプ表示(&?)"
 
 msgid ""
 "[Ynesfdaq?]$$ &Yes, record this change$$ &No, skip this change$$ &Edit this "
@@ -30480,6 +35069,10 b' msgstr "%s \xe3\x81\xae\xe5\xa4\x89\xe6\x9b\xb4\xe7\x82\xb9\xe3\x82\x92\xe8\xaa\xbf\xe3\x81\xb9\xe3\x81\xbe\xe3\x81\x99\xe3\x81\x8b\xef\xbc\x9f"'
 msgid "bad hunk #%d"
 msgstr "不正な差分: #%d"
 
+#, fuzzy, python-format
+msgid "bad hunk #%d: %s"
+msgstr "不正な差分: #%d"
+
 #, python-format
 msgid "bad hunk #%d old text line %d"
 msgstr "不正な差分: #%d 元テキスト %d 行目"
@@ -30565,9 +35158,8 b' msgstr "\'--cwd %s\' \xe3\x82\x92\xe4\xbd\xbf\xe3\x81\xa3\xe3\x81\xa6\xe3\x81\xbf\xe3\x81\xa6\xe3\x81\xaf\xef\xbc\x9f"'
 msgid "%s not under root '%s'"
 msgstr "%s はルートディレクトリ '%s' の配下にはありません"
 
-#, python-format
-msgid "cannot %s; remote repository does not support the %r capability"
-msgstr "%s ができません。 連携先は機能 %r が未サポートです"
+msgid "bad phase-heads stream"
+msgstr ""
 
 msgid "cannot lookup negative revision"
 msgstr "負値のリビジョン指定は無効です"
@@ -30588,12 +35180,8 b' msgid "phases.new-commit: not a valid ph'
 msgstr "phases.new-commit: 不正なフェーズ名です ('%s')"
 
 #, python-format
-msgid "exited with status %d"
-msgstr "終了コード %d で終了しました"
-
-#, python-format
-msgid "killed by signal %d"
-msgstr "シグナル %d で強制終了されました"
+msgid "illegal ssh hostname or username starting with -: %s"
+msgstr "SSH 連携のホスト名またはユーザ名が - で始まる不正なものです: %s"
 
 #, python-format
 msgid "unrecognized profiling format '%s' - Ignored\n"
@@ -30663,13 +35251,6 b' msgstr "%d %s/\xe7\xa7\x92"'
 msgid "saved backup bundle to %s\n"
 msgstr "バックアップのバンドルを %s に保存\n"
 
-msgid "adding branch\n"
-msgstr "ブランチを追加中\n"
-
-#, python-format
-msgid "error removing %s: %s\n"
-msgstr "ファイル %s の破棄に失敗: %s\n"
-
 #, python-format
 msgid "strip failed, backup bundle stored in '%s'\n"
 msgstr "リビジョン除外に失敗: バックアップバンドルを '%s' に保存\n"
@@ -30683,6 +35264,10 b' msgid ""'
 "(fix the problem, then recover the changesets with \"hg unbundle '%s'\")\n"
 msgstr "(問題解決後に \"hg unbundle '%s'\" で履歴を復旧してください)\n"
 
+#, python-format
+msgid "warning: orphaned descendants detected, not stripping %s\n"
+msgstr "警告: 孤立するリビジョンがあるため、破棄しません: %s\n"
+
 msgid "(not rebuilding fncache because repository does not support fncache)\n"
 msgstr "(fncache 未サポートのリポジトリのため、fncache の再構築は省略)\n"
 
@@ -30697,6 +35282,10 b' msgid "fncache already up to date\\n"'
 msgstr "fncache は最新の状態です\n"
 
 #, python-format
+msgid "cannot %s; remote repository does not support the %r capability"
+msgstr "%s ができません。 連携先は機能 %r が未サポートです"
+
+#, python-format
 msgid "cannot register processor on unknown flag '%#x'."
 msgstr ""
 
@@ -30708,8 +35297,12 b' msgstr ""'
 msgid "cannot register multiple processors on flag '%#x'."
 msgstr ""
 
-msgid "index entry flags need RevlogNG"
-msgstr "インデックスエントリフラグは RevlogNG 対応が必要です"
+#, python-format
+msgid "node %s is not censored"
+msgstr "ノード %s は検閲対象ではありません"
+
+msgid "index entry flags need revlog version 1"
+msgstr "インデックスエントリフラグは revlog version 1 対応が必要です"
 
 #, python-format
 msgid "revlog chunk cache size %r is not greater than 0"
@@ -30719,17 +35312,13 b' msgstr "revlog chunk \xe3\x81\xae\xe3\x82\xad\xe3\x83\xa3\xe3\x83\x83\xe3\x82\xb7\xe3\x83\xa5\xe3\x82\xb5\xe3\x82\xa4\xe3\x82\xba %r \xe3\x81\xaf 0 \xe3\x82\x88\xe3\x82\x8a\xe5\xa4\xa7\xe3\x81\x8d\xe3\x81\x8f\xe3\x81\x82\xe3\x82\x8a\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"'
 msgid "revlog chunk cache size %r is not a power of 2"
 msgstr "revlog chunk のキャッシュサイズ %r は2の累乗ではありません"
 
-#, python-format
-msgid "index %s unknown flags %#04x for format v0"
-msgstr "インデックス %s: %#04x は未知のフラグです(フォーマット v0)"
-
-#, python-format
-msgid "index %s unknown flags %#04x for revlogng"
+#, fuzzy, python-format
+msgid "unknown flags (%#04x) in version %d revlog %s"
 msgstr "インデックス %s: %#04x は未知のフラグです(revlogng)"
 
-#, python-format
-msgid "index %s unknown format %d"
-msgstr "インデックス %s: %d は未知のフォーマットです"
+#, fuzzy, python-format
+msgid "unknown version (%d) in revlog %s"
+msgstr "未知のエンコーディング '%s' が指定されました"
 
 #, python-format
 msgid "index %s is corrupted"
@@ -30777,9 +35366,13 b' msgstr "revlog \xe5\x9c\xa7\xe7\xb8\xae\xe3\x81\xae\xe5\xb1\x95\xe9\x96\x8b\xe3\x82\xa8\xe3\x83\xa9\xe3\x83\xbc: %s"'
 msgid "unknown compression type %r"
 msgstr "%r は未知の圧縮形式です"
 
-#, python-format
-msgid "node %s is not censored"
-msgstr "ノード %s は検閲対象ではありません"
+#, fuzzy, python-format
+msgid "%s: attempt to add null revision"
+msgstr "null リビジョンにはタグ付けできません"
+
+#, fuzzy, python-format
+msgid "%s: attempt to add wdir revision"
+msgstr "%s は有効なリビジョンではありません"
 
 #, python-format
 msgid "value for deltareuse invalid: %s"
@@ -30794,6 +35387,22 b' msgstr ""'
 msgid "destination revlog has filtered revisions"
 msgstr ""
 
+#, fuzzy
+msgid "empty string is not a valid revision"
+msgstr "%s は有効なリビジョンではありません"
+
+#, fuzzy
+msgid "can't use a relation in this context"
+msgstr "ここではリストを使用できません"
+
+#, fuzzy
+msgid "relation subscript must be an integer"
+msgstr "CPU 数には数値を指定してください"
+
+#, fuzzy
+msgid "can't use a subscript in this context"
+msgstr "ここではリストを使用できません"
+
 msgid "see hg help \"revsets.x or y\""
 msgstr "hg help \"revsets.x or y\" を参照してください"
 
@@ -30836,13 +35445,38 b' msgstr ""'
 "    1つのリビジョンだけが指定された場合、\n"
 "    そのリビジョン自身が『共通の祖先』とみなされます。"
 
-msgid ""
-"``ancestors(set)``\n"
-"    Changesets that are ancestors of a changeset in set."
+#, fuzzy
+msgid ""
+"``ancestors(set[, depth])``\n"
+"    Changesets that are ancestors of changesets in set, including the\n"
+"    given changesets themselves."
 msgstr ""
 "``ancestors(set)``\n"
 "    set 中のリビジョンに対する祖先リビジョン群。"
 
+msgid ""
+"    If depth is specified, the result only includes changesets up to\n"
+"    the specified generation."
+msgstr ""
+
+#. i18n: "ancestors" is a keyword
+#, fuzzy
+msgid "ancestors takes at least 1 argument"
+msgstr "extra には最低1つの引数が必要です"
+
+#. i18n: "ancestors" is a keyword
+#, fuzzy
+msgid "ancestors expects an integer depth"
+msgstr "word にはインデックス値を数値で指定してください"
+
+#, fuzzy
+msgid "negative depth"
+msgstr "負値のオフセットは指定できません"
+
+#, fuzzy
+msgid "revision in set has more than one child"
+msgstr "リビジョン %d は1つ以上のブランチの分岐点です"
+
 msgid "~ expects a number"
 msgstr "~ には数値を指定してください"
 
@@ -30931,21 +35565,26 b' msgstr ""'
 msgid "branch '%s' does not exist"
 msgstr "ブランチ '%s' は存在しません"
 
-msgid ""
-"``bumped()``\n"
+#, fuzzy
+msgid ""
+"``phasedivergent()``\n"
 "    Mutable changesets marked as successors of public changesets."
 msgstr ""
 "``bumped()``\n"
 "    public フェーズなリビジョンの後継で、 且つ改変可能なリビジョン。"
 
-msgid "    Only non-public and non-obsolete changesets can be `bumped`."
+#, fuzzy
+msgid ""
+"    Only non-public and non-obsolete changesets can be `phasedivergent`.\n"
+"    (EXPERIMENTAL)"
 msgstr ""
 "    非 public で、且つ廃止設定されていないリビジョンのみが `bumped`\n"
 "    とみなされます。"
 
-#. i18n: "bumped" is a keyword
-msgid "bumped takes no arguments"
-msgstr "bumped には引数が指定できません"
+#. i18n: "phasedivergent" is a keyword
+#, fuzzy
+msgid "phasedivergent takes no arguments"
+msgstr "divergent には引数が指定できません"
 
 msgid ""
 "``bundle()``\n"
@@ -31039,13 +35678,25 b' msgstr ""'
 msgid "desc requires a string"
 msgstr "desc には文字列を指定してください"
 
-msgid ""
-"``descendants(set)``\n"
-"    Changesets which are descendants of changesets in set."
+#, fuzzy
+msgid ""
+"``descendants(set[, depth])``\n"
+"    Changesets which are descendants of changesets in set, including the\n"
+"    given changesets themselves."
 msgstr ""
 "``descendants(set)``\n"
 "    指定リビジョン群の子孫リビジョン群。"
 
+#. i18n: "descendants" is a keyword
+#, fuzzy
+msgid "descendants takes at least 1 argument"
+msgstr "extra には最低1つの引数が必要です"
+
+#. i18n: "descendants" is a keyword
+#, fuzzy
+msgid "descendants expects an integer depth"
+msgstr "pad() の width 引数には数値を指定してください"
+
 msgid ""
 "``destination([set])``\n"
 "    Changesets that were created by a graft, transplant or rebase "
@@ -31059,18 +35710,33 b' msgstr ""'
 "    生成されたリビジョン群。 set 指定が省略された場合、 ``all()``\n"
 "    指定相当とみなします。"
 
-msgid ""
-"``divergent()``\n"
-"    Final successors of changesets with an alternative set of final "
-"successors."
+#, fuzzy
+msgid ""
+"``contentdivergent()``\n"
+"    Final successors of changesets with an alternative set of final\n"
+"    successors. (EXPERIMENTAL)"
 msgstr ""
 "``divergent()``\n"
 "    他の最終後継リビジョンが存在する、 最終後継リビジョン群。"
 
-#. i18n: "divergent" is a keyword
-msgid "divergent takes no arguments"
+#. i18n: "contentdivergent" is a keyword
+#, fuzzy
+msgid "contentdivergent takes no arguments"
 msgstr "divergent には引数が指定できません"
 
+#, fuzzy
+msgid ""
+"``extdata(source)``\n"
+"    Changesets in the specified extdata source. (EXPERIMENTAL)"
+msgstr ""
+"``bisect(string)``\n"
+"    探索状態に合致するリビジョン群:"
+
+#. i18n: "extdata" is a keyword
+#, fuzzy
+msgid "extdata takes at least 1 string argument"
+msgstr "extra には最低1つの引数が必要です"
+
 msgid ""
 "``extinct()``\n"
 "    Obsolete changesets with obsolete descendants only."
@@ -31151,22 +35817,15 b' msgstr ""'
 "    limit() 記述の別名。"
 
 #, python-format
-msgid "%s takes no arguments or a pattern and an optional revset"
-msgstr "%s にはパターンと revset しか指定できません"
-
-#, python-format
 msgid "%s expected a pattern"
 msgstr "%s にはパターン文字列を指定してください"
 
-#, python-format
-msgid "%s expected one starting revision"
-msgstr "%s には開始リビジョンを指定してください"
-
-msgid ""
-"``follow([pattern[, startrev]])``\n"
+#, fuzzy
+msgid ""
+"``follow([file[, startrev]])``\n"
 "    An alias for ``::.`` (ancestors of the working directory's first "
 "parent).\n"
-"    If pattern is specified, the histories of files matching given\n"
+"    If file pattern is specified, the histories of files matching given\n"
 "    pattern in the revision given by startrev are followed, including copies."
 msgstr ""
 "``follow([pattern[, startrev]])``\n"
@@ -31207,22 +35866,27 b' msgstr ""'
 msgid "followlines requires a line range"
 msgstr "followlines には行範囲を指定してください"
 
+#. i18n: "followlines" is a keyword
 msgid "followlines expects exactly one revision"
 msgstr "followlines に指定可能なリビジョンは1つのみです"
 
 msgid "followlines requires a pattern"
 msgstr "followlines にはパターンを指定してください"
 
+#. i18n: "followlines" is a keyword
 msgid "followlines expects exactly one file"
 msgstr "followlines に指定可能なファイルは1つのみです"
 
+#. i18n: "followlines" is a keyword
 msgid "followlines expects a line range"
 msgstr "followlines には行範囲を指定してください"
 
 msgid "line range bounds must be integers"
 msgstr "行範囲指定には整数値を使用してください"
 
-msgid "'descend' argument must be a boolean"
+#. i18n: "descend" is a keyword
+#, fuzzy
+msgid "descend argument must be a boolean"
 msgstr "descend 引数には真偽値を指定してください"
 
 msgid ""
@@ -31339,6 +36003,10 b' msgstr "limit \xe3\x81\xae\xe5\xbc\x95\xe6\x95\xb0\xe3\x81\xaf 1 \xe3\x80\x9c 3 \xe5\x80\x8b\xe3\x81\xa7\xe3\x81\x99"'
 msgid "limit expects a number"
 msgstr "limit には数値を指定してください"
 
+#, fuzzy
+msgid "negative number to select"
+msgstr "負値のオフセットは指定できません"
+
 msgid "negative offset"
 msgstr "負値のオフセットは指定できません"
 
@@ -31557,6 +36225,12 b' msgstr ""'
 msgid "secret takes no arguments"
 msgstr "secret には引数が指定できません"
 
+msgid ""
+"``stack([revs])``\n"
+"    Experimental revset for the stack of changesets or working directory\n"
+"    parent. (EXPERIMENTAL)"
+msgstr ""
+
 msgid "^ expects a number 0, 1, or 2"
 msgstr "^ には 0、 1 または 2 を指定してください"
 
@@ -31794,6 +36468,11 b' msgid "subrepo requires a pattern"'
 msgstr "subrepo にはパターン指定が必要です"
 
 msgid ""
+"``successors(set)``\n"
+"    All successors for set, including the given set themselves"
+msgstr ""
+
+msgid ""
 "``tag([name])``\n"
 "    The specified tag by name, or all tagged revisions if no name is given."
 msgstr ""
@@ -31815,17 +36494,19 b' msgstr "tagged \xe3\x81\xae\xe5\xbc\x95\xe6\x95\xb0\xe3\x81\xaf 0 \xe3\x80\x9c 1 \xe5\x80\x8b\xe3\x81\xa7\xe3\x81\x99"'
 msgid "the argument to tag must be a string"
 msgstr "tag には文字列を指定してください"
 
-msgid ""
-"``unstable()``\n"
-"    Non-obsolete changesets with obsolete ancestors."
+#, fuzzy
+msgid ""
+"``orphan()``\n"
+"    Non-obsolete changesets with obsolete ancestors. (EXPERIMENTAL)"
 msgstr ""
 "``unstable()``\n"
 "    祖先に廃止リビジョンを持つ、非廃止リビジョン群 (※ 訳注: 日本語訳では\n"
 "    unstable を『非永続』と訳しています)"
 
-#. i18n: "unstable" is a keyword
-msgid "unstable takes no arguments"
-msgstr "unstable には引数が指定できません"
+#. i18n: "orphan" is a keyword
+#, fuzzy
+msgid "orphan takes no arguments"
+msgstr "head には引数が指定できません"
 
 msgid ""
 "``user(string)``\n"
@@ -31834,8 +36515,9 b' msgstr ""'
 "``user(string)``\n"
 "    文字列をユーザ名に持つリビジョン群。 合致判定は文字大小を無視。"
 
-msgid ""
-"``wdir``\n"
+#, fuzzy
+msgid ""
+"``wdir()``\n"
 "    Working directory. (EXPERIMENTAL)"
 msgstr ""
 "``wdir``\n"
@@ -31852,8 +36534,9 b' msgstr "\xe5\x95\x8f\xe3\x81\x84\xe5\x90\x88\xe3\x82\x8f\xe3\x81\x9b\xe3\x81\x8c\xe7\xa9\xba\xe3\x81\xa7\xe3\x81\x99"'
 msgid "syntax error in revset '%s'"
 msgstr "revsets 表記 '%s' での文法エラー"
 
-msgid "not a symbol"
-msgstr "シンボル以外が指定されました"
+#, fuzzy
+msgid "can't use '::' in this context"
+msgstr "ここでは添え字値を使用できません"
 
 msgid "can't negate that"
 msgstr "負値にできません"
@@ -31865,26 +36548,67 b' msgstr "revset \xe5\x88\xa5\xe5\x90\x8d\xe5\xae\x9a\xe7\xbe\xa9"'
 msgid "\"##\" can't concatenate \"%s\" element"
 msgstr "\"##\" 演算子は \"%s\" 要素を結合できません"
 
+msgid "here"
+msgstr ""
+
 #, python-format
 msgid "unexpected revspec format character %s"
 msgstr "想定外の revspec フォーマット文字 %s"
 
+#, fuzzy
+msgid "incomplete revspec format character"
+msgstr "想定外の revspec フォーマット文字 %s"
+
+#, fuzzy
+msgid "missing argument for revspec"
+msgstr "引数がありません"
+
+#, fuzzy
+msgid "invalid argument for revspec"
+msgstr "引数が不正です"
+
+#, fuzzy
+msgid "too many revspec arguments specified"
+msgstr "オプション指定が過剰です"
+
+#, python-format
+msgid "cannot %s null changeset"
+msgstr "null リビジョンに対する %s 操作はできません"
+
+msgid "no changeset checked out"
+msgstr "作業領域が未更新です"
+
+#, python-format
+msgid "cannot %s while merging"
+msgstr "マージ実施中は %s 操作はできません"
+
+#, python-format
+msgid "cannot %s public changesets"
+msgstr "public フェーズのリビジョンに対する %s 操作はできません"
+
+#, python-format
+msgid "cannot %s changeset with children"
+msgstr "子孫を持つリビジョンに対する %s 操作はできません"
+
 #, python-format
 msgid "no changes found (ignored %d secret changesets)\n"
 msgstr "差分はありません (secret フェーズの %d 個のリビジョンは無視)\n"
 
 #, python-format
-msgid "timed out waiting for lock held by %s"
+msgid "timed out waiting for lock held by %r"
 msgstr "%s のロック解放待ちを断念"
 
 #, python-format
-msgid "lock held by %s"
+msgid "lock held by %r"
 msgstr "%s によるロック保持"
 
 #, python-format
 msgid "abort: %s: %s\n"
 msgstr "中止: %s: %s\n"
 
+msgid "(lock might be very busy)\n"
+msgstr "(ロック要求殺到中と思われます)\n"
+
 #, python-format
 msgid "abort: could not lock %s: %s\n"
 msgstr "中止: %s のロックに失敗: %s\n"
@@ -31910,8 +36634,8 b' msgstr " \xe7\xa9\xba\xe6\x96\x87\xe5\xad\x97\xe5\x88\x97\\n"'
 msgid "abort: file censored %s!\n"
 msgstr "中止: 検閲対象ファイルです: %s\n"
 
-msgid "killed!\n"
-msgstr "強制終了されました!\n"
+msgid "abort: working directory revision cannot be specified\n"
+msgstr "中止: 作業領域 (wdir) は指定できません\n"
 
 msgid "(did you forget to compile extensions?)\n"
 msgstr "(エクステンションのコンパイルを忘れていませんか？)\n"
@@ -31938,6 +36662,10 b' msgid "cannot use an integer as a name"'
 msgstr "数値だけの名前は使用できません"
 
 #, python-format
+msgid "leading or trailing whitespace in name %r"
+msgstr "名称 %r の冒頭／末尾に空白文字があります"
+
+#, python-format
 msgid "ui.portablefilenames value is invalid ('%s')"
 msgstr "ui.portablefilenames 値が不正です ('%s')"
 
@@ -31945,6 +36673,17 b' msgstr "ui.portablefilenames \xe5\x80\xa4\xe3\x81\x8c\xe4\xb8\x8d\xe6\xad\xa3\xe3\x81\xa7\xe3\x81\x99 (\'%s\')"'
 msgid "possible case-folding collision for %s"
 msgstr "ファイル名の文字大小の問題で %s が衝突します"
 
+#, python-format
+msgid "hidden revision '%s'"
+msgstr "'%s' は不可視リビジョンです"
+
+msgid "use --hidden to access hidden revisions"
+msgstr "不可視リビジョンへのアクセス時には --hidden 指定が必要です"
+
+#, python-format
+msgid "filtered revision '%s' (not in '%s' subset)"
+msgstr "'%s' はフィルタリング対象リビジョンです ('%s' には属しません)"
+
 msgid "empty revision range"
 msgstr "該当するリビジョンがありません"
 
@@ -31956,6 +36695,14 b' msgid "creating directory: %s\\n"'
 msgstr "ディレクトリの作成中: %s\n"
 
 #, python-format
+msgid "removing conflicting file: %s\n"
+msgstr "同名ファイルの削除中: %s\n"
+
+#, python-format
+msgid "removing conflicting directory: %s\n"
+msgstr "同名ディレクトリの削除中: %s\n"
+
+#, python-format
 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
 msgstr "%s の削除を %s へのファイル名変更として記録中 (類似度 %d%%)\n"
 
@@ -31974,13 +36721,56 b' msgid ""'
 "see https://mercurial-scm.org/wiki/MissingRequirement for more information"
 msgstr "詳細は https://mercurial-scm.org/wiki/MissingRequirement 参照"
 
-msgid "child process failed to start"
-msgstr "子プロセスの生成に失敗"
+#, python-format
+msgid "unknown extdata source '%s'"
+msgstr "外部データソース '%s' は未知のものです"
+
+#, python-format
+msgid "extdata command '%s' failed: %s"
+msgstr "外部データコマンド '%s' が失敗: %s"
+
+msgid "empty simplekeyvalue file"
+msgstr "simplekeyvalue ファイルが空です"
+
+#, python-format
+msgid "%r can't be used as a key"
+msgstr "%r はキーとして使用できません"
+
+#, python-format
+msgid "obsoleted %i changesets\n"
+msgstr "%i 個のリビジョンを廃止\n"
+
+#, python-format
+msgid "%i new %s changesets\n"
+msgstr "%i 個のリビジョンを新規 %s 化\n"
+
+#, python-format
+msgid "new changesets %s\n"
+msgstr "新規リビジョン範囲 %s\n"
+
+#, python-format
+msgid "%s and %d others"
+msgstr "%s 他 %d 個"
+
+#, python-format
+msgid "rejecting multiple heads on branch \"%s\""
+msgstr "ブランチ \"%s\" の複数ヘッド化を拒否"
+
+#, python-format
+msgid "%d heads: %s"
+msgstr "%d 個のヘッド: %s"
+
+#, python-format
+msgid "warning: accessing hidden changesets for write operation: %s\n"
+msgstr "警告: 不可視リビジョンへの改変操作: %s\n"
 
 #, python-format
 msgid "invalid value for --daemon-postexec: %s"
 msgstr "--daemon-postexec への指定値が不正です: %s"
 
+msgid "child process failed to start"
+msgstr "子プロセスの生成に失敗"
+
 #, python-format
 msgid "unknown mode %s"
 msgstr "未知のモード %s"
@@ -32019,15 +36809,75 b' msgstr "%s \xe3\x81\xaf\xe3\x83\x90\xe3\x82\xa4\xe3\x83\x8a\xe3\x83\xaa\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab\xe3\x81\xae\xe3\x82\x88\xe3\x81\x86\xe3\x81\xa7\xe3\x81\x99\xe3\x80\x82"'
 msgid "can only specify three labels."
 msgstr "ラベルは3つのみ指定可。"
 
-#, python-format
-msgid "couldn't parse location %s"
-msgstr "URL %s の解析に失敗"
-
-msgid "password in URL not supported"
-msgstr "パスワード付き URL は未サポートです"
-
-msgid "could not create remote repo"
-msgstr "指定リポジトリの作成に失敗"
+msgid "sparse config cannot have includes after excludes"
+msgstr ""
+
+#, python-format
+msgid "sparse config entry outside of section: %s"
+msgstr ""
+
+msgid "add an [include] or [exclude] line to declare the entry type"
+msgstr ""
+
+#, python-format
+msgid "warning: sparse profile cannot use paths starting with /, ignoring %s\n"
+msgstr ""
+
+#, fuzzy
+msgid "cannot parse sparse patterns from working directory"
+msgstr "作業領域の親リビジョンの内容は検閲できません"
+
+msgid "dropping temporarily included sparse files"
+msgstr ""
+
+#, python-format
+msgid "cleaned up %d temporarily added file(s) from the sparse checkout\n"
+msgstr ""
+
+#, python-format
+msgid "temporarily included %d file(s) in the sparse checkout for merging\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "pending changes to '%s'\n"
+msgstr "リビジョン %s を改変中\n"
+
+#, fuzzy
+msgid "could not update sparseness due to pending changes"
+msgstr "変更をコミットするか、変更を破棄 (update --clean) してください"
+
+msgid ""
+"cannot change sparseness due to pending changes (delete the files or use --"
+"force to bring them back dirty)"
+msgstr ""
+
+#, fuzzy
+msgid "paths cannot be absolute"
+msgstr "%s の削除に失敗"
+
+#, fuzzy, python-format
+msgid "Profiles changed: %d\n"
+msgstr "ファイル変更なし"
+
+#, fuzzy, python-format
+msgid "Include rules changed: %d\n"
+msgstr "履歴反映対象に非永続 (unstable) リビジョンが含まれます！: %s"
+
+#, fuzzy, python-format
+msgid "Exclude rules changed: %d\n"
+msgstr "履歴反映対象に非永続 (unstable) リビジョンが含まれます！: %s"
+
+#, python-format
+msgid "Files added: %d\n"
+msgstr ""
+
+#, python-format
+msgid "Files dropped: %d\n"
+msgstr ""
+
+#, python-format
+msgid "Files conflicting: %d\n"
+msgstr ""
 
 msgid "no suitable response from remote hg"
 msgstr "連携先リポジトリからの応答が不適切"
@@ -32040,12 +36890,21 b' msgid "check previous remote output"'
 msgstr "連携先からの直前の出力を確認してください"
 
 #, python-format
-msgid "push refused: %s"
-msgstr "履歴反映が拒否されました: %s"
-
-#, python-format
-msgid "unexpected parameter %r"
-msgstr "想定外のパラメータ: %s"
+msgid "unknown version of SSH protocol: %s"
+msgstr "未知の SSH プロトコルバージョン: %s"
+
+#, python-format
+msgid "couldn't parse location %s"
+msgstr "URL %s の解析に失敗"
+
+msgid "password in URL not supported"
+msgstr "パスワード付き URL は未サポートです"
+
+msgid "could not create remote repo"
+msgstr "指定リポジトリの作成に失敗"
+
+msgid "capability exchange failed"
+msgstr "連携機能確認に失敗しました"
 
 msgid "capath not supported"
 msgstr "capath は未サポートです"
@@ -32053,17 +36912,6 b' msgstr "capath \xe3\x81\xaf\xe6\x9c\xaa\xe3\x82\xb5\xe3\x83\x9d\xe3\x83\xbc\xe3\x83\x88\xe3\x81\xa7\xe3\x81\x99"'
 msgid "cadata not supported"
 msgstr "cadata は未サポートです"
 
-msgid ""
-"setting ciphers in [hostsecurity] is not supported by this version of Python"
-msgstr ""
-"このバージョンの Python では [hostsecurity] での暗号形式設定は未サポートです"
-
-msgid ""
-"remove the config option or run Mercurial with a modern Python version "
-"(preferred)"
-msgstr ""
-"設定を破棄するか、新しい Python で Mercurial を実行してください(後者を推奨)"
-
 #, python-format
 msgid "unsupported protocol from hostsecurity.%s: %s"
 msgstr "hostsecurity.%s での未サポートプロトコルの指定: %s"
@@ -32119,6 +36967,13 b' msgid "serverhostname argument is requir'
 msgstr "内部エラー: serverhostname 引数が未指定です"
 
 #, python-format
+msgid "certificate file (%s) does not exist; cannot connect to %s"
+msgstr "証明書ファイル (%s) が存在しません。%s に接続できません。"
+
+msgid "restore missing file or fix references in Mercurial config"
+msgstr ""
+
+#, python-format
 msgid "could not set ciphers: %s"
 msgstr "暗号形式の指定に失敗: %s"
 
@@ -32190,9 +37045,18 b' msgstr ""'
 msgid "(see https://mercurial-scm.org/wiki/SecureConnections for more info)\n"
 msgstr "(詳細は https://mercurial-scm.org/wiki/SecureConnections 参照)\n"
 
+msgid ""
+"(the full certificate chain may not be available locally; see \"hg help "
+"debugssl\")\n"
+msgstr ""
+
 msgid "ssl connection failed"
 msgstr "ssl 接続に失敗"
 
+#, python-format
+msgid "referenced certificate file (%s) does not exist"
+msgstr "指定された証明書ファイル (%s) が存在しません"
+
 msgid "TLS 1.1 not supported by this Python"
 msgstr "利用中の Python では TLS 1.1 が未サポートです"
 
@@ -32263,14 +37127,14 b' msgstr ""'
 #, python-format
 msgid ""
 "(SHA-1 fingerprint for %s found in legacy [hostfingerprints] section; if you "
-"trust this fingerprint, set the following config value in [hostsecurity] and "
-"remove the old one from [hostfingerprints] to upgrade to a more secure "
-"SHA-256 fingerprint: %s.fingerprints=%s)\n"
+"trust this fingerprint, remove the old SHA-1 fingerprint from "
+"[hostfingerprints] and add the following entry to the new [hostsecurity] "
+"section: %s:fingerprints=%s)\n"
 msgstr ""
 "(旧来の [hostfingerprints] セクションに %s 向けの SHA-1 フィンガープリントが"
-"記述されています。この値が信用できる場合は、後述する設定を [hostsecurity]セク"
-"ションに記述した上で、[hostfingerprints] のエントリを削除することで、より強固"
-"な SHA-256 フィンガープリントに移行してください: %s.fingerprints=%s)\n"
+"記述されています。この値が信用できる場合は、SHA-1 フィンガープリントを旧来の"
+"[hostfingerprints] エントリから削除し、後述する設定を [hostsecurity]セクショ"
+"ンに記述してください: %s.fingerprints=%s)\n"
 
 #, python-format
 msgid "certificate for %s has unexpected fingerprint %s"
@@ -32313,6 +37177,9 b' msgstr ""'
 msgid "'%s' does not appear to be an hg repository"
 msgstr "'%s' は Mercurial リポジトリ形式とは思われません"
 
+msgid "lock not available"
+msgstr "ロックできません"
+
 msgid "cannot lock static-http repository"
 msgstr "static-http リポジトリはロックできません"
 
@@ -32323,6 +37190,19 b' msgstr "static-http \xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x81\xae\xe6\x96\xb0\xe8\xa6\x8f\xe4\xbd\x9c\xe6\x88\x90\xe3\x81\xaf\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"'
 msgid "invalid entry in fncache, line %d"
 msgstr "ファイル名キャッシュに不正なエントリ: %d 行目"
 
+msgid "warning: stream clone requested but server has them disabled\n"
+msgstr ""
+
+#, python-format
+msgid ""
+"warning: stream clone requested but client is missing requirements: %s\n"
+msgstr ""
+
+msgid ""
+"(see https://www.mercurial-scm.org/wiki/MissingRequirement for more "
+"information)\n"
+msgstr "(詳細は https://www.mercurial-scm.org/wiki/MissingRequirement 参照)\n"
+
 msgid "unexpected response from remote server:"
 msgstr "想定外の連携先サーバ応答:"
 
@@ -32372,72 +37252,11 b' msgstr "stream clone bundle \xe3\x81\xa7\xe3\x81\xae\xe8\xa4\x87\xe8\xa3\xbd\xe3\x81\xaf\xe3\x80\x81\xe7\xa9\xba\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x81\xab\xe3\x81\x97\xe3\x81\x8b\xe9\x81\xa9\xe7\x94\xa8\xe3\x81\xa7\xe3\x81\x8d\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"'
 msgid "unable to apply stream clone: unsupported format: %s"
 msgstr "stream clone が適用できません: 未サポートな形式 %s"
 
-#, python-format
-msgid "(in subrepo %s)"
+#, fuzzy, python-format
+msgid "(in subrepository \"%s\")"
 msgstr "(サブリポジトリ %s で発生)"
 
 #, python-format
-msgid "warning: subrepo spec file '%s' not found\n"
-msgstr "警告: サブリポジトリの spec ファイル '%s' が見つかりません\n"
-
-#, python-format
-msgid "subrepo spec file '%s' not found"
-msgstr "サブリポジトリの spec ファイル '%s' が見つかりません"
-
-#, python-format
-msgid "invalid subrepository revision specifier in '%s' line %d"
-msgstr "'%s' の %d 行目におけるサブリポジトリのリビジョン指定が不正です"
-
-#, python-format
-msgid "bad subrepository pattern in %s: %s"
-msgstr "%s におけるサブリポジトリ指定の不正: %s"
-
-msgid "missing ] in subrepo source"
-msgstr "サブリポジトリ元指定に ] がありません"
-
-#, python-format
-msgid ""
-" subrepository sources for %(s)s differ\n"
-"use (l)ocal%(l)s source (%(lo)s) or (r)emote%(o)s source (%(ro)s)?$$ &Local $"
-"$ &Remote"
-msgstr ""
-" サブリポジトリ %(s)s の連携先が異なっています。\n"
-"現行側%(l)s 連携先 (%(lo)s):(l)ocal と、他方側%(o)s 連携先 (%(ro)s):(r)emote "
-"のどちらを採用しますか？$$ &Local $$ &Remote"
-
-#, python-format
-msgid ""
-" subrepository %(s)s diverged (local revision: %(sl)s, remote revision: "
-"%(sr)s)\n"
-"(M)erge, keep (l)ocal%(l)s or keep (r)emote%(o)s?$$ &Merge $$ &Local $$ "
-"&Remote"
-msgstr ""
-" サブリポジトリ %(s)s の参照先が異なっています (現行側: %(sl)s, 他方側: "
-"%(sr)s)\n"
-"両者のマージ:(m)erge, 現行側%(l)s 参照先:(l)ocal, 他方側%(o)s 参照先:"
-"(r)emote のいずれを採用しますか？$$ &Merge $$ &Local $$ &Remote"
-
-#, python-format
-msgid ""
-" local%(l)s changed subrepository %(s)s which remote%(o)s removed\n"
-"use (c)hanged version or (d)elete?$$ &Changed $$ &Delete"
-msgstr ""
-" 現行側%(l)s でのサブリポジトリ %(s)s の変更が、他方側%(o)s での削除と衝突し"
-"ます\n"
-"変更:(c)hanged と、削除:(d)elete のどちらを採用しますか？$$ &Changed $$ "
-"&Delete"
-
-#, python-format
-msgid ""
-" remote%(o)s changed subrepository %(s)s which local%(l)s removed\n"
-"use (c)hanged version or (d)elete?$$ &Changed $$ &Delete"
-msgstr ""
-" 他方側%(o)s でのサブリポジトリ %(s)s の変更が、現行側%(l)s での削除と衝突し"
-"ます\n"
-"変更:(c)hanged と、削除:(d)elete のどちらを採用しますか？$$ &Changed $$ "
-"&Delete"
-
-#, python-format
 msgid ""
 " subrepository sources for %s differ\n"
 "use (l)ocal source (%s) or (r)emote source (%s)?$$ &Local $$ &Remote"
@@ -32455,31 +37274,32 b' msgstr ""'
 "現行内容 (%s):(l)ocal と、他方側参照先 (%s):(r)emote のどちらを採用しますか？"
 "$$ &Local $$ &Remote"
 
-msgid "default path for subrepository not found"
-msgstr "サブリポジトリの連携先が見つかりません"
-
 #, python-format
 msgid "warning: removing potentially hostile 'hgrc' in '%s'\n"
 msgstr "警告: 潜在的な問題となりえる '%s' 中の hgrc ファイルを破棄します\n"
 
+#, fuzzy, python-format
+msgid "subrepo '%s' traverses symbolic link"
+msgstr "パス %r はシンボリックリンク '%r' が含まれています"
+
+#, fuzzy
+msgid "subrepos not enabled"
+msgstr "%r にはリスト処理を適用できません"
+
+#, fuzzy
+msgid "see 'hg help config.subrepos' for details"
+msgstr "詳細は 'hg help phases' 参照"
+
+#, python-format
+msgid "%s subrepos not allowed"
+msgstr ""
+
 #, python-format
 msgid "unknown subrepo type %s"
 msgstr "未知のサブリポジトリ種別 '%s'"
 
-#, python-format
-msgid "invalid phases.checksubrepos configuration: %s"
-msgstr "phases.checksubrepos 設定が不正です: %s"
-
-#, python-format
-msgid "can't commit in %s phase conflicting %s from subrepository %s"
-msgstr "%s フェーズでのコミットは、%s なサブリポジトリ %s と矛盾します"
-
-#, python-format
-msgid "warning: changes are committed in %s phase from subrepository %s\n"
-msgstr "警告: %s フェーズでコミットします(サブリポジトリ %s に追従)\n"
-
-#, python-format
-msgid "uncommitted changes in subrepository '%s'"
+#, fuzzy, python-format
+msgid "uncommitted changes in subrepository \"%s\""
 msgstr "サブリポジトリ '%s' の変更が未コミットです"
 
 msgid "addremove is not supported"
@@ -32505,6 +37325,10 b' msgstr "\xe8\xad\xa6\xe5\x91\x8a: \xe3\x82\xa8\xe3\x83\xa9\xe3\x83\xbc \\"%s\\" \xe3\x81\x8c\xe3\x82\xb5\xe3\x83\x96\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa \\"%s\\" \xe3\x81\xa7\xe7\x99\xba\xe7\x94\x9f\\n"'
 msgid "removing subrepo %s\n"
 msgstr "サブリポジトリの %s を登録除外中\n"
 
+#, fuzzy, python-format
+msgid "sharing subrepo %s from %s\n"
+msgstr "サブリポジトリ %s に %s から複製中\n"
+
 #, python-format
 msgid "cloning subrepo %s from %s\n"
 msgstr "サブリポジトリ %s に %s から複製中\n"
@@ -32513,8 +37337,8 b' msgstr "\xe3\x82\xb5\xe3\x83\x96\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa %s \xe3\x81\xab %s \xe3\x81\x8b\xe3\x82\x89\xe8\xa4\x87\xe8\xa3\xbd\xe4\xb8\xad\\n"'
 msgid "pulling subrepo %s from %s\n"
 msgstr "サブリポジトリ %s に %s から取り込み中\n"
 
-#, python-format
-msgid "revision %s in subrepo %s is hidden\n"
+#, fuzzy, python-format
+msgid "revision %s in subrepository \"%s\" is hidden\n"
 msgstr "リビジョン %s はサブリポジトリ %s 中の不可視リビジョンです\n"
 
 #, python-format
@@ -32529,6 +37353,10 b' msgstr "\xe3\x82\xb5\xe3\x83\x96\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa %s \xe3\x81\x8b\xe3\x82\x89 %s \xe3\x81\xb8\xe5\x8f\x8d\xe6\x98\xa0\xe4\xb8\xad\\n"'
 msgid "reverting subrepo %s\n"
 msgstr "サブリポジトリ %s の変更取り消し中\n"
 
+#, fuzzy, python-format
+msgid "unsharing subrepo '%s'\n"
+msgstr "サブリポジトリ %s から %s へ反映中\n"
+
 #, python-format
 msgid "subrepo '%s' is hidden in revision %s\n"
 msgstr "サブリポジトリ '%s' の参照先はリビジョン %s 時点で不可視です\n"
@@ -32585,12 +37413,12 b' msgstr "\xe3\x82\xb5\xe3\x83\x96\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe5\x88\xa9\xe7\x94\xa8\xe3\x81\xab\xe3\x81\xaf 1.6.0 \xe4\xbb\xa5\xe9\x99\x8d\xe3\x81\xae git \xe3\x81\x8c\xe5\xbf\x85\xe8\xa6\x81\xe3\x81\xa7\xe3\x81\x99\\n"'
 msgid "git %s error %d in %s"
 msgstr "git %s 実行のエラー %d がサブリポジトリ %s で発生"
 
-#, python-format
-msgid "revision %s does not exist in subrepo %s\n"
+#, fuzzy, python-format
+msgid "revision %s does not exist in subrepository \"%s\"\n"
 msgstr "リビジョン %s はサブリポジトリ %s には存在しません\n"
 
-#, python-format
-msgid "checking out detached HEAD in subrepo %s\n"
+#, fuzzy, python-format
+msgid "checking out detached HEAD in subrepository \"%s\"\n"
 msgstr "サブリポジトリ %s において、切り離された HEAD が取り出されました。\n"
 
 msgid "check out a git branch if you intend to make changes\n"
@@ -32600,23 +37428,110 b' msgstr "\xe5\xa4\x89\xe6\x9b\xb4\xe3\x82\x92\xe5\xae\x9f\xe6\x96\xbd\xe3\x81\x99\xe3\x82\x8b\xe3\x81\xaa\xe3\x82\x89\xe3\x80\x81 git \xe3\x83\x96\xe3\x83\xa9\xe3\x83\xb3\xe3\x83\x81\xe3\x82\x92\xe5\x8f\x96\xe3\x82\x8a\xe5\x87\xba\xe3\x81\x97\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84\xe3\x80\x82\\n"'
 msgid "subrepo %s is missing"
 msgstr "サブリポジトリ %s が見つかりません"
 
-#, python-format
-msgid "unrelated git branch checked out in subrepo %s\n"
+#, fuzzy, python-format
+msgid "unrelated git branch checked out in subrepository \"%s\"\n"
 msgstr "サブリポジトリ %s は、 無関係な git ブランチで更新されています\n"
 
-#, python-format
-msgid "pushing branch %s of subrepo %s\n"
+#, fuzzy, python-format
+msgid "pushing branch %s of subrepository \"%s\"\n"
 msgstr "ブランチ %s をサブリポジトリ %s から反映中\n"
 
-#, python-format
-msgid ""
-"no branch checked out in subrepo %s\n"
+#, fuzzy, python-format
+msgid ""
+"no branch checked out in subrepository \"%s\"\n"
 "cannot push revision %s\n"
 msgstr ""
 "サブリポジトリ %s にブランチが取り出されていません。\n"
 "リビジョン %s を反映できません。\n"
 
 #, python-format
+msgid "warning: subrepo spec file '%s' not found\n"
+msgstr "警告: サブリポジトリの spec ファイル '%s' が見つかりません\n"
+
+#, python-format
+msgid "subrepo spec file '%s' not found"
+msgstr "サブリポジトリの spec ファイル '%s' が見つかりません"
+
+#, python-format
+msgid "invalid subrepository revision specifier in '%s' line %d"
+msgstr "'%s' の %d 行目におけるサブリポジトリのリビジョン指定が不正です"
+
+#, python-format
+msgid "bad subrepository pattern in %s: %s"
+msgstr "%s におけるサブリポジトリ指定の不正: %s"
+
+#, fuzzy
+msgid "missing ] in subrepository source"
+msgstr "サブリポジトリ元指定に ] がありません"
+
+#, python-format
+msgid ""
+" subrepository sources for %(s)s differ\n"
+"use (l)ocal%(l)s source (%(lo)s) or (r)emote%(o)s source (%(ro)s)?$$ &Local $"
+"$ &Remote"
+msgstr ""
+" サブリポジトリ %(s)s の連携先が異なっています。\n"
+"現行側%(l)s 連携先 (%(lo)s):(l)ocal と、他方側%(o)s 連携先 (%(ro)s):(r)emote "
+"のどちらを採用しますか？$$ &Local $$ &Remote"
+
+#, python-format
+msgid ""
+" subrepository %(s)s diverged (local revision: %(sl)s, remote revision: "
+"%(sr)s)\n"
+"(M)erge, keep (l)ocal%(l)s or keep (r)emote%(o)s?$$ &Merge $$ &Local $$ "
+"&Remote"
+msgstr ""
+" サブリポジトリ %(s)s の参照先が異なっています (現行側: %(sl)s, 他方側: "
+"%(sr)s)\n"
+"両者のマージ:(m)erge, 現行側%(l)s 参照先:(l)ocal, 他方側%(o)s 参照先:"
+"(r)emote のいずれを採用しますか？$$ &Merge $$ &Local $$ &Remote"
+
+#, python-format
+msgid ""
+" local%(l)s changed subrepository %(s)s which remote%(o)s removed\n"
+"use (c)hanged version or (d)elete?$$ &Changed $$ &Delete"
+msgstr ""
+" 現行側%(l)s でのサブリポジトリ %(s)s の変更が、他方側%(o)s での削除と衝突し"
+"ます\n"
+"変更:(c)hanged と、削除:(d)elete のどちらを採用しますか？$$ &Changed $$ "
+"&Delete"
+
+#, python-format
+msgid ""
+" remote%(o)s changed subrepository %(s)s which local%(l)s removed\n"
+"use (c)hanged version or (d)elete?$$ &Changed $$ &Delete"
+msgstr ""
+" 他方側%(o)s でのサブリポジトリ %(s)s の変更が、現行側%(l)s での削除と衝突し"
+"ます\n"
+"変更:(c)hanged と、削除:(d)elete のどちらを採用しますか？$$ &Changed $$ "
+"&Delete"
+
+#, python-format
+msgid "commit with new subrepo %s excluded"
+msgstr "コミット対象に、新規サブリポジトリ %s が含まれていません"
+
+msgid "use --subrepos for recursive commit"
+msgstr "--subrepos 指定で再帰コミット"
+
+msgid "can't commit subrepos without .hgsub"
+msgstr ".hgsub の無いサブリポジトリはコミットできません"
+
+msgid "default path for subrepository not found"
+msgstr "サブリポジトリの連携先が見つかりません"
+
+#, python-format
+msgid "invalid phases.checksubrepos configuration: %s"
+msgstr "phases.checksubrepos 設定が不正です: %s"
+
+#, python-format
+msgid "can't commit in %s phase conflicting %s from subrepository %s"
+msgstr "%s フェーズでのコミットは、%s なサブリポジトリ %s と矛盾します"
+
+#, python-format
+msgid "warning: changes are committed in %s phase from subrepository %s\n"
+msgstr "警告: %s フェーズでコミットします(サブリポジトリ %s に追従)\n"
+
+#, python-format
 msgid ""
 "automatic .hgtags merge failed\n"
 "the following %d tags are in conflict: %s\n"
@@ -32653,17 +37568,27 b' msgstr ""'
 
 msgid ""
 ":basename: Any text. Treats the text as a path, and returns the last\n"
-"    component of the path after splitting by the path separator\n"
-"    (ignoring trailing separators). For example, \"foo/bar/baz\" becomes\n"
-"    \"baz\" and \"foo/bar//\" becomes \"bar\"."
+"    component of the path after splitting by the path separator.\n"
+"    For example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes "
+"\"\"."
 msgstr ""
 ":basename: 文字列。 与えられた文字列をパスとみなし、 パス構成要素の、\n"
-"    末尾要素を取り出します (末尾パス区切りは無視されます)。\n"
-"    例) \"foo/bar/baz\" は \"baz\"、 \"foo/bar//\" は \"bar\""
+"    末尾要素を取り出します。\n"
+"    例: \"foo/bar/baz\" は \"baz\"、 \"foo/bar//\" は \"\""
 
 msgid ":count: List or text. Returns the length as an integer."
 msgstr ":count: 列挙または文字列。 長さを整数値で返します。"
 
+msgid "not countable"
+msgstr "カウント不能"
+
+msgid ""
+":dirname: Any text. Treats the text as a path, and strips the last\n"
+"    component of the path after splitting by the path separator."
+msgstr ""
+":dirname: 文字列。 与えられた文字列をパスとみなし、 パス構成要素の、\n"
+"    末尾要素を取り除いたものを返します。"
+
 msgid ""
 ":domain: Any text. Finds the first string that looks like an email\n"
 "    address, and extracts just the domain component. Example: ``User\n"
@@ -32745,37 +37670,6 b' msgstr ""'
 "    名前部分だけを取り出します。"
 
 msgid ""
-"    >>> person('foo@bar')\n"
-"    'foo'\n"
-"    >>> person('Foo Bar <foo@bar>')\n"
-"    'Foo Bar'\n"
-"    >>> person('\"Foo Bar\" <foo@bar>')\n"
-"    'Foo Bar'\n"
-"    >>> person('\"Foo \"buz\" Bar\" <foo@bar>')\n"
-"    'Foo \"buz\" Bar'\n"
-"    >>> # The following are invalid, but do exist in real-life\n"
-"    ...\n"
-"    >>> person('Foo \"buz\" Bar <foo@bar>')\n"
-"    'Foo \"buz\" Bar'\n"
-"    >>> person('\"Foo Bar <foo@bar>')\n"
-"    'Foo Bar'"
-msgstr ""
-"    >>> person('foo@bar')\n"
-"    'foo'\n"
-"    >>> person('Foo Bar <foo@bar>')\n"
-"    'Foo Bar'\n"
-"    >>> person('\"Foo Bar\" <foo@bar>')\n"
-"    'Foo Bar'\n"
-"    >>> person('\"Foo \"buz\" Bar\" <foo@bar>')\n"
-"    'Foo \"buz\" Bar'\n"
-"    >>> # The following are invalid, but do exist in real-life\n"
-"    ...\n"
-"    >>> person('Foo \"buz\" Bar <foo@bar>')\n"
-"    'Foo \"buz\" Bar'\n"
-"    >>> person('\"Foo Bar <foo@bar>')\n"
-"    'Foo Bar'"
-
-msgid ""
 ":revescape: Any text. Escapes all \"special\" characters, except @.\n"
 "    Forward slashes are escaped twice to prevent web servers from "
 "prematurely\n"
@@ -32807,19 +37701,22 b' msgid ""'
 msgstr ":short: リビジョンハッシュ 値。 12 桁程度の短縮形式にします。"
 
 msgid ""
-":shortbisect: Any text. Treats `text` as a bisection status, and\n"
+":shortbisect: Any text. Treats `label` as a bisection status, and\n"
 "    returns a single-character representing the status (G: good, B: bad,\n"
 "    S: skipped, U: untested, I: ignored). Returns single space if `text`\n"
 "    is not a valid bisection status."
 msgstr ""
-":shortbisect: 文字列。 `文字列` を二分探索 (bisect) 状態とみなし、\n"
+":shortbisect: 指定文字列を二分探索 (bisect) 状態とみなし、\n"
 "    状態に見合った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\"."
 msgstr ":shortdate: 日時情報。 \"2006-09-18\" 形式で可読化します。"
 
+msgid ":slashpath: Any text. Replaces the native path separator with slash."
+msgstr ":slashpath: 文字列。 環境依存のパス区切り文字をスラッシュで置換。"
+
 msgid ":splitlines: Any text. Split text into a list of lines."
 msgstr ":splitlines: 文字列。 文字列を行のリストに分割します。"
 
@@ -32864,263 +37761,6 b' msgstr ":emailuser: \xe6\x96\x87\xe5\xad\x97\xe5\x88\x97\xe3\x80\x82 \xe3\x83\xa1\xe3\x83\xbc\xe3\x83\xab\xe3\x82\xa2\xe3\x83\x89\xe3\x83\xac\xe3\x82\xb9\xe3\x81\xae\xe3\x83\xa6\xe3\x83\xbc\xe3\x82\xb6\xe5\x90\x8d\xe9\x83\xa8\xe5\x88\x86\xe3\x82\x92\xe5\x8f\x96\xe3\x82\x8a\xe5\x87\xba\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x99\xe3\x80\x82"'
 msgid ":utf8: Any text. Converts from the local character encoding to UTF-8."
 msgstr ":utf8: 文字列。実行環境の文字コードから UTF-8 に変換します"
 
-msgid ":author: String. The unmodified author of the changeset."
-msgstr ":author: 文字列。 リビジョンの作者名(記録情報そのまま)。"
-
-msgid ":bisect: String. The changeset bisection status."
-msgstr ":bisect: 文字列。 当該リビジョンの二分探索状態。"
-
-msgid ""
-":branch: String. The name of the branch on which the changeset was\n"
-"    committed."
-msgstr ":branch: 文字列。 リビジョンの属するブランチ名。"
-
-msgid ""
-":branches: List of strings. The name of the branch on which the\n"
-"    changeset was committed. Will be empty if the branch name was\n"
-"    default. (DEPRECATED)"
-msgstr ""
-":branches: 文字列列挙。 リビジョンの属するブランチ名。\n"
-"    ブランチ名が default の場合は空 (非推奨)"
-
-msgid ""
-":bookmarks: List of strings. Any bookmarks associated with the\n"
-"    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"
-"    associated with the changeset (DEPRECATED)"
-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."
-msgstr ":date: 日時情報。 リビジョンが記録された日時。"
-
-msgid ":desc: String. The text of the changeset description."
-msgstr ":desc:      文字列。 リビジョンのコミットログ。"
-
-msgid ""
-":diffstat: String. Statistics of changes with the following format:\n"
-"    \"modified files: +added/-removed lines\""
-msgstr ""
-":diffstat: 文字列。 以下の形式での変更概要。\n"
-"    \"変更対象ファイル: +追加行数/-削除行数\""
-
-msgid ":envvars: A dictionary of environment variables. (EXPERIMENTAL)"
-msgstr ":envvars: 環境変数の辞書。 (実験的実装)"
-
-msgid ""
-":extras: List of dicts with key, value entries of the 'extras'\n"
-"    field of this changeset."
-msgstr ""
-":extras: 辞書の列挙。当該リビジョンの 'extras' 情報一覧。\n"
-"    (※ 訳注: 各辞書は ``key`` および ``value`` というキーを持ちます)"
-
-msgid ":file_adds: List of strings. Files added by this changeset."
-msgstr ":file_adds: 文字列列挙。 当該リビジョンでの追加ファイル一覧。"
-
-msgid ""
-":file_copies: List of strings. Files copied in this changeset with\n"
-"    their sources."
-msgstr ":file_copies: 文字列列挙。  当該リビジョンでの複製元ファイル一覧。"
-
-msgid ""
-":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n"
-"    only if the --copied switch is set."
-msgstr ""
-":file_copies_switch: 文字列列挙。  \"file_copies\" と同義だが、\n"
-"    --copied 指定のある時のみ表示。"
-
-msgid ":file_dels: List of strings. Files removed by this changeset."
-msgstr ":file_dels: 文字列列挙。 当該リビジョンでの登録除外ファイル一覧。"
-
-msgid ":file_mods: List of strings. Files modified by this changeset."
-msgstr ":file_mods: 文字列列挙。 当該リビジョンでの変更ファイル一覧。"
-
-msgid ""
-":files: List of strings. All files modified, added, or removed by this\n"
-"    changeset."
-msgstr ""
-":files: 文字列列挙。 当該リビジョンでの、 変更／追加登録または\n"
-"    登録除外ファイルの一覧。"
-
-msgid ""
-":graphnode: String. The character representing the changeset node in\n"
-"    an ASCII revision graph"
-msgstr ""
-":graphnode: 文字列。 ASCII 文字での履歴グラフ表示の際に、\n"
-"    リビジョン表示で使用する文字。"
-
-msgid ":index: Integer. The current iteration of the loop. (0 indexed)"
-msgstr ":index: 整数。 繰り返しにおける現時点での添え字値。 (開始値は 0)"
-
-msgid "can't use index in this context"
-msgstr "ここでは添え字値を使用できません"
-
-msgid ""
-":latesttag: List of strings. The global tags on the most recent globally\n"
-"    tagged ancestor of this changeset.  If no such tags exist, the list\n"
-"    consists of the single string \"null\"."
-msgstr ""
-":latesttag: 文字列列挙。 当該リビジョンの祖先に対して、\n"
-"    最も最近に付与されたグローバルタグの一覧。 当該タグが存在しない場合、\n"
-"    単一要素 \"null\" を持つ配列。"
-
-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 ""
-":namespaces: Dict of lists. Names attached to this changeset per\n"
-"    namespace."
-msgstr ""
-":namespaces: 列挙の辞書。 リビジョンに関連付けられている名前を、\n"
-"    名前空間毎に列挙したもの。"
-
-msgid ""
-":node: String. The changeset identification hash, as a 40 hexadecimal\n"
-"    digit string."
-msgstr ":node: 文字列。 リビジョン識別用の 40 桁 16 進数ハッシュ値。"
-
-msgid ":obsolete: String. Whether the changeset is obsolete."
-msgstr ""
-":obsolete: 文字列。 当該リビジョンが廃止済みか否か。\n"
-"    (※ 訳注: \"obsolete\" か空文字列が返却されます)"
-
-msgid ""
-":p1rev: Integer. The repository-local revision number of the changeset's\n"
-"    first parent, or -1 if the changeset has no parents."
-msgstr ""
-":p1rev: 整数。 第1親リビジョンの、 当該リポジトリにおけるリビジョン番号。\n"
-"    親を持たないリビジョンの場合は -1。"
-
-msgid ""
-":p2rev: Integer. The repository-local revision number of the changeset's\n"
-"    second parent, or -1 if the changeset has no second parent."
-msgstr ""
-":p2rev: 整数。 第2親リビジョンの、 当該リポジトリにおけるリビジョン番号。\n"
-"    第2親を持たないリビジョンの場合は -1。"
-
-msgid ""
-":p1node: String. The identification hash of the changeset's first parent,\n"
-"    as a 40 digit hexadecimal string. If the changeset has no parents, all\n"
-"    digits are 0."
-msgstr ""
-":p1node: 文字列。 第1親リビジョンの 40 桁ハッシュ値の文字列。\n"
-"    親を持たないリビジョンの場合は、 全桁が 0 のハッシュ値文字列。"
-
-msgid ""
-":p2node: String. The identification hash of the changeset's second\n"
-"    parent, as a 40 digit hexadecimal string. If the changeset has no "
-"second\n"
-"    parent, all digits are 0."
-msgstr ""
-":p2node: 文字列。 第1親リビジョンの 40 桁ハッシュ値の文字列。\n"
-"    第2親を持たないリビジョンの場合は、 全桁が 0 のハッシュ値文字列。"
-
-msgid ""
-":parents: List of strings. The parents of the changeset in \"rev:node\"\n"
-"    format. If the changeset has only one \"natural\" parent (the "
-"predecessor\n"
-"    revision) nothing is shown."
-msgstr ""
-":parents: 文字列列挙。 当該リビジョンの親リビジョンの \"rev:node\" 形式。\n"
-"    親が単一で、 且つリビジョン番号が1つ前の場合は、 何も表示されません。"
-
-msgid ":phase: String. The changeset phase name."
-msgstr ":phase: 文字列。 当該リビジョンのフェーズ名。"
-
-msgid ":phaseidx: Integer. The changeset phase index."
-msgstr ":phaseidx: 数値。 当該リビジョンのフェーズ値。"
-
-msgid ":rev: Integer. The repository-local changeset revision number."
-msgstr ":rev: 整数。 各リポジトリ固有のリビジョン番号。"
-
-msgid ":subrepos: List of strings. Updated subrepositories in the changeset."
-msgstr ":subrepos: 文字列挙。 当該リビジョンで更新されたサブリポジトリ名。"
-
-msgid ":tags: List of strings. Any tags associated with the changeset."
-msgstr ":tags: 文字列列挙。 当該リビジョンに付与されたタグの一覧。"
-
-msgid ":termwidth: Integer. The width of the current terminal."
-msgstr ":termwidth: 整数。 端末の表示カラム数。"
-
-msgid ":troubles: List of strings. Evolution troubles affecting the changeset."
-msgstr ""
-":troubles: 文字列列挙。 当該リビジョンに関連する evolution の trouble 情報。"
-
-msgid "    (EXPERIMENTAL)"
-msgstr "    (実験的実装)"
-
-msgid "unterminated template expansion"
-msgstr "テンプレート定義が終端していません"
-
-#, python-format
-msgid "unknown method '%s'"
-msgstr "未知の処理 '%s' が指定されました"
-
-#, python-format
-msgid "expected a symbol, got '%s'"
-msgstr "シンボル (symbol) 指定が必要です (実際の指定は '%s')"
-
-msgid "expected template specifier"
-msgstr "テンプレート指定が必要です"
-
-#, python-format
-msgid "recursive reference '%s' in template"
-msgstr "テンプレートでの '%s' における再帰参照"
-
-#, python-format
-msgid "unknown function '%s'"
-msgstr "未知の関数 '%s' が指定されました"
-
-#, python-format
-msgid "template filter '%s' is not compatible with keyword '%s'"
-msgstr "フィルタ指定 '%s' はキーワード '%s' と互換性がありません"
-
-#, python-format
-msgid "incompatible use of template filter '%s'"
-msgstr "フィルタ指定 '%s' は互換性がありません"
-
-#, python-format
-msgid "keyword '%s' is not iterable"
-msgstr "キーワード '%s' にはリスト処理を適用できません"
-
-#, python-format
-msgid "%r is not iterable"
-msgstr "%r にはリスト処理を適用できません"
-
-msgid "negation needs an integer argument"
-msgstr "負値指定は整数値に対してのみ有効です"
-
-msgid "arithmetic only defined on integers"
-msgstr "算術演算は整数値に対してのみ有効です"
-
-msgid "division by zero is not defined"
-msgstr "0 での除算は未サポートです"
-
-#, python-format
-msgid "filter %s expects one argument"
-msgstr "フィルタ %s の引数は1個です"
-
 msgid ""
 ":date(date[, fmt]): Format a date. See :hg:`help dates` for formatting\n"
 "    strings. The default is a Unix date format, including the timezone:\n"
@@ -33166,6 +37806,16 b' msgid "diff expects zero, one, or two ar'
 msgstr "diff の引数は 0 〜 2 個です"
 
 msgid ""
+":extdata(source): Show a text read from the specified extdata source. "
+"(EXPERIMENTAL)"
+msgstr ""
+
+#. i18n: "extdata" is a keyword
+#, fuzzy
+msgid "extdata expects one argument"
+msgstr "relpath の引数は1個です"
+
+msgid ""
 ":files(pattern): All files of the current changeset matching the pattern. "
 "See\n"
 "    :hg:`help patterns`."
@@ -33202,6 +37852,15 b' msgid "formatnode expects one argument"'
 msgstr "formatnode の引数は1個です"
 
 msgid ""
+":mailmap(author): Return the author, updated according to the value\n"
+"    set in the .mailmap file"
+msgstr ""
+
+#, fuzzy
+msgid "mailmap expects one argument"
+msgstr "files の引数は1個です"
+
+msgid ""
 ":pad(text, width[, fillchar=' '[, left=False]]): Pad text with a\n"
 "    fill character."
 msgstr ""
@@ -33337,6 +37996,32 b' msgstr "localdate \xe3\x81\xae\xe5\x85\xa5\xe5\x8a\x9b\xe3\x81\xab\xe3\x81\xaf\xe6\x97\xa5\xe4\xbb\x98\xe6\x83\x85\xe5\xa0\xb1\xe3\x82\x92\xe4\xb8\x8e\xe3\x81\x88\xe3\x81\xa6\xe3\x81\x8f\xe3\x81\xa0\xe3\x81\x95\xe3\x81\x84"'
 msgid "localdate expects a timezone"
 msgstr "localdate の入力にはタイムゾーンを与えてください"
 
+msgid ":max(iterable): Return the max of an iterable"
+msgstr ""
+
+#. i18n: "max" is a keyword
+#, fuzzy
+msgid "max expects one argument"
+msgstr "relpath の引数は1個です"
+
+#. i18n: "max" is a keyword
+#, fuzzy
+msgid "max first argument should be an iterable"
+msgstr "extra の第1引数には文字列を指定してください"
+
+msgid ":min(iterable): Return the min of an iterable"
+msgstr ""
+
+#. i18n: "min" is a keyword
+#, fuzzy
+msgid "min expects one argument"
+msgstr "files の引数は1個です"
+
+#. i18n: "min" is a keyword
+#, fuzzy
+msgid "min first argument should be an iterable"
+msgstr "extra の第1引数には文字列を指定してください"
+
 msgid ":mod(a, b): Calculate a mod b such that a / b + a mod b == a"
 msgstr ":mod(a, b): a を b で除算した余り値 (a / b + a mod b == a)。"
 
@@ -33345,6 +38030,62 b' msgid "mod expects two arguments"'
 msgstr "mod の引数は2個です"
 
 msgid ""
+":obsfateoperations(markers): Compute obsfate related information based on "
+"markers (EXPERIMENTAL)"
+msgstr ""
+
+#. i18n: "obsfateoperations" is a keyword
+#, fuzzy
+msgid "obsfateoperations expects one argument"
+msgstr "formatnode の引数は1個です"
+
+#. i18n: "obsfateoperations" is a keyword
+msgid "obsfateoperations first argument should be an iterable"
+msgstr ""
+
+msgid ""
+":obsfatedate(markers): Compute obsfate related information based on markers "
+"(EXPERIMENTAL)"
+msgstr ""
+
+#. i18n: "obsfatedate" is a keyword
+#, fuzzy
+msgid "obsfatedate expects one argument"
+msgstr "formatnode の引数は1個です"
+
+#. i18n: "obsfatedate" is a keyword
+msgid "obsfatedate first argument should be an iterable"
+msgstr ""
+
+msgid ""
+":obsfateusers(markers): Compute obsfate related information based on markers "
+"(EXPERIMENTAL)"
+msgstr ""
+
+#. i18n: "obsfateusers" is a keyword
+#, fuzzy
+msgid "obsfateusers expects one argument"
+msgstr "フィルタ %s の引数は1個です"
+
+#. i18n: "obsfateusers" is a keyword
+msgid "obsfateusers first argument should be an iterable of obsmakers"
+msgstr ""
+
+msgid ""
+":obsfateverb(successors, markers): Compute obsfate related information based "
+"on successors (EXPERIMENTAL)"
+msgstr ""
+
+#. i18n: "obsfateverb" is a keyword
+#, fuzzy
+msgid "obsfateverb expects two arguments"
+msgstr "label の引数は2個です"
+
+#. i18n: "obsfateverb" is a keyword
+msgid "obsfateverb first argument should be countable"
+msgstr ""
+
+msgid ""
 ":relpath(path): Convert a repository-absolute path into a filesystem path "
 "relative to\n"
 "    the current working directory."
@@ -33451,9 +38192,335 b' msgstr "word \xe3\x81\xae\xe5\xbc\x95\xe6\x95\xb0\xe3\x81\xaf 2 \xe3\x80\x9c 3 \xe5\x80\x8b\xe3\x81\xa7\xe3\x81\x99 (\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\x95\xe3\x82\x8c\xe3\x81\x9f\xe5\xbc\x95\xe6\x95\xb0\xe3\x81\xaf %d \xe5\x80\x8b)"'
 msgid "word expects an integer index"
 msgstr "word にはインデックス値を数値で指定してください"
 
+#. i18n: column positioning for "hg log"
+#, python-format
+msgid ""
+"bookmark:    %s\n"
+"branch:      %s\n"
+"changeset:   %s\n"
+"copies:      %s\n"
+"date:        %s\n"
+"extra:       %s=%s\n"
+"files+:      %s\n"
+"files-:      %s\n"
+"files:       %s\n"
+"instability: %s\n"
+"manifest:    %s\n"
+"obsolete:    %s\n"
+"parent:      %s\n"
+"phase:       %s\n"
+"summary:     %s\n"
+"tag:         %s\n"
+"user:        %s\n"
+msgstr ""
+"ブックマーク: %s\n"
+"ブランチ:     %s\n"
+"リビジョン:   %s\n"
+"コピー:       %s\n"
+"日付:         %s\n"
+"その他:       %s=%s\n"
+"ファイル追加: %s\n"
+"ファイル削除: %s\n"
+"ファイル:     %s\n"
+"不定性:       %s\n"
+"manifest参照: %s\n"
+"廃止:         %s\n"
+"親リビジョン: %s\n"
+"フェーズ:     %s\n"
+"要約:         %s\n"
+"タグ:         %s\n"
+"ユーザ:       %s\n"
+
+msgid ":author: String. The unmodified author of the changeset."
+msgstr ":author: 文字列。 リビジョンの作者名(記録情報そのまま)。"
+
+msgid ":bisect: String. The changeset bisection status."
+msgstr ":bisect: 文字列。 当該リビジョンの二分探索状態。"
+
+msgid ""
+":branch: String. The name of the branch on which the changeset was\n"
+"    committed."
+msgstr ":branch: 文字列。 リビジョンの属するブランチ名。"
+
+msgid ""
+":branches: List of strings. The name of the branch on which the\n"
+"    changeset was committed. Will be empty if the branch name was\n"
+"    default. (DEPRECATED)"
+msgstr ""
+":branches: 文字列列挙。 リビジョンの属するブランチ名。\n"
+"    ブランチ名が default の場合は空 (非推奨)"
+
+msgid ""
+":bookmarks: List of strings. Any bookmarks associated with the\n"
+"    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 associated with the "
+"changeset.\n"
+"    (DEPRECATED)"
+msgstr ""
+":currentbookmark: 文字列. アクティブなブックマーク (対象リビジョンに対し、\n"
+"    関連付けられている場合のみ) (非推奨)"
+
+msgid ""
+":activebookmark: String. The active bookmark, if it is associated with the "
+"changeset."
+msgstr ""
+":activebookmark: 文字列. アクティブなブックマーク (対象リビジョンに対し、\n"
+"    関連付けられている場合のみ)"
+
+msgid ":date: Date information. The date when the changeset was committed."
+msgstr ":date: 日時情報。 リビジョンが記録された日時。"
+
+msgid ":desc: String. The text of the changeset description."
+msgstr ":desc:      文字列。 リビジョンのコミットログ。"
+
+msgid ""
+":diffstat: String. Statistics of changes with the following format:\n"
+"    \"modified files: +added/-removed lines\""
+msgstr ""
+":diffstat: 文字列。 以下の形式での変更概要。\n"
+"    \"変更対象ファイル: +追加行数/-削除行数\""
+
+msgid ":envvars: A dictionary of environment variables. (EXPERIMENTAL)"
+msgstr ":envvars: 環境変数の辞書。 (実験的実装)"
+
+msgid ""
+":extras: List of dicts with key, value entries of the 'extras'\n"
+"    field of this changeset."
+msgstr ""
+":extras: 辞書の列挙。当該リビジョンの 'extras' 情報一覧。\n"
+"    (※ 訳注: 各辞書は ``key`` および ``value`` というキーを持ちます)"
+
+msgid ":file_adds: List of strings. Files added by this changeset."
+msgstr ":file_adds: 文字列列挙。 当該リビジョンでの追加ファイル一覧。"
+
+msgid ""
+":file_copies: List of strings. Files copied in this changeset with\n"
+"    their sources."
+msgstr ":file_copies: 文字列列挙。  当該リビジョンでの複製元ファイル一覧。"
+
+msgid ""
+":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n"
+"    only if the --copied switch is set."
+msgstr ""
+":file_copies_switch: 文字列列挙。  \"file_copies\" と同義だが、\n"
+"    --copied 指定のある時のみ表示。"
+
+msgid ":file_dels: List of strings. Files removed by this changeset."
+msgstr ":file_dels: 文字列列挙。 当該リビジョンでの登録除外ファイル一覧。"
+
+msgid ":file_mods: List of strings. Files modified by this changeset."
+msgstr ":file_mods: 文字列列挙。 当該リビジョンでの変更ファイル一覧。"
+
+msgid ""
+":files: List of strings. All files modified, added, or removed by this\n"
+"    changeset."
+msgstr ""
+":files: 文字列列挙。 当該リビジョンでの、 変更／追加登録または\n"
+"    登録除外ファイルの一覧。"
+
+msgid ""
+":graphnode: String. The character representing the changeset node in an "
+"ASCII\n"
+"    revision graph."
+msgstr ""
+":graphnode: 文字列。 ASCII 文字での履歴グラフ表示の際に、\n"
+"    リビジョン表示で使用する文字。"
+
+msgid ""
+":graphwidth: Integer. The width of the graph drawn by 'log --graph' or zero."
+msgstr ":graphwidth: 整数。 'log --graph' でのグラフ表示カラム数 (または 0)。"
+
+msgid ":index: Integer. The current iteration of the loop. (0 indexed)"
+msgstr ":index: 整数。 繰り返しにおける現時点での添え字値。 (開始値は 0)"
+
+msgid "can't use index in this context"
+msgstr "ここでは添え字値を使用できません"
+
+msgid ""
+":latesttag: List of strings. The global tags on the most recent globally\n"
+"    tagged ancestor of this changeset.  If no such tags exist, the list\n"
+"    consists of the single string \"null\"."
+msgstr ""
+":latesttag: 文字列列挙。 当該リビジョンの祖先に対して、\n"
+"    最も最近に付与されたグローバルタグの一覧。 当該タグが存在しない場合、\n"
+"    単一要素 \"null\" を持つ配列。"
+
+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 ""
+":namespaces: Dict of lists. Names attached to this changeset per\n"
+"    namespace."
+msgstr ""
+":namespaces: 列挙の辞書。 リビジョンに関連付けられている名前を、\n"
+"    名前空間毎に列挙したもの。"
+
+msgid ""
+":node: String. The changeset identification hash, as a 40 hexadecimal\n"
+"    digit string."
+msgstr ":node: 文字列。 リビジョン識別用の 40 桁 16 進数ハッシュ値。"
+
+msgid ":obsolete: String. Whether the changeset is obsolete. (EXPERIMENTAL)"
+msgstr ""
+":obsolete: 文字列。 当該リビジョンの廃止状況。\n"
+"    (※ 訳注: \"obsolete\" か空文字列が返却されます) (実験的実装)"
+
+#, fuzzy
+msgid ""
+":peerurls: A dictionary of repository locations defined in the [paths] "
+"section\n"
+"    of your configuration file."
+msgstr ""
+"Mercurial 設定ファイルの ``templatealias`` セクションにおいて、\n"
+"キーワードや関数を、 独自に定義可能です::"
+
+msgid ""
+":predecessors: Returns the list if the closest visible successors. "
+"(EXPERIMENTAL)"
+msgstr ""
+
+msgid ":reporoot: String. The root directory of the current repository."
+msgstr ":reporoot: 文字列。 現リポジトリのルートディレクトリ位置。"
+
+msgid ""
+":successorssets: Returns a string of sets of successors for a changectx. "
+"Format used\n"
+"    is: [ctx1, ctx2], [ctx3] if ctx has been splitted into ctx1 and ctx2\n"
+"    while also diverged into ctx3. (EXPERIMENTAL)"
+msgstr ""
+
+msgid ""
+":succsandmarkers: Returns a list of dict for each final successor of ctx. "
+"The dict\n"
+"    contains successors node id in \"successors\" keys and the list of\n"
+"    obs-markers from ctx to the set of successors in \"markers\".\n"
+"    (EXPERIMENTAL)"
+msgstr ""
+
+msgid ""
+":p1rev: Integer. The repository-local revision number of the changeset's\n"
+"    first parent, or -1 if the changeset has no parents."
+msgstr ""
+":p1rev: 整数。 第1親リビジョンの、 当該リポジトリにおけるリビジョン番号。\n"
+"    親を持たないリビジョンの場合は -1。"
+
+msgid ""
+":p2rev: Integer. The repository-local revision number of the changeset's\n"
+"    second parent, or -1 if the changeset has no second parent."
+msgstr ""
+":p2rev: 整数。 第2親リビジョンの、 当該リポジトリにおけるリビジョン番号。\n"
+"    第2親を持たないリビジョンの場合は -1。"
+
+msgid ""
+":p1node: String. The identification hash of the changeset's first parent,\n"
+"    as a 40 digit hexadecimal string. If the changeset has no parents, all\n"
+"    digits are 0."
+msgstr ""
+":p1node: 文字列。 第1親リビジョンの 40 桁ハッシュ値の文字列。\n"
+"    親を持たないリビジョンの場合は、 全桁が 0 のハッシュ値文字列。"
+
+msgid ""
+":p2node: String. The identification hash of the changeset's second\n"
+"    parent, as a 40 digit hexadecimal string. If the changeset has no "
+"second\n"
+"    parent, all digits are 0."
+msgstr ""
+":p2node: 文字列。 第1親リビジョンの 40 桁ハッシュ値の文字列。\n"
+"    第2親を持たないリビジョンの場合は、 全桁が 0 のハッシュ値文字列。"
+
+msgid ""
+":parents: List of strings. The parents of the changeset in \"rev:node\"\n"
+"    format. If the changeset has only one \"natural\" parent (the "
+"predecessor\n"
+"    revision) nothing is shown."
+msgstr ""
+":parents: 文字列列挙。 当該リビジョンの親リビジョンの \"rev:node\" 形式。\n"
+"    親が単一で、 且つリビジョン番号が1つ前の場合は、 何も表示されません。"
+
+msgid ":phase: String. The changeset phase name."
+msgstr ":phase: 文字列。 当該リビジョンのフェーズ名。"
+
+#, fuzzy
+msgid ":phaseidx: Integer. The changeset phase index. (ADVANCED)"
+msgstr ":phaseidx: 数値。 当該リビジョンのフェーズ値。"
+
+msgid ":rev: Integer. The repository-local changeset revision number."
+msgstr ":rev: 整数。 各リポジトリ固有のリビジョン番号。"
+
+msgid ":subrepos: List of strings. Updated subrepositories in the changeset."
+msgstr ":subrepos: 文字列挙。 当該リビジョンで更新されたサブリポジトリ名。"
+
+msgid ":tags: List of strings. Any tags associated with the changeset."
+msgstr ":tags: 文字列列挙。 当該リビジョンに付与されたタグの一覧。"
+
+msgid ":termwidth: Integer. The width of the current terminal."
+msgstr ":termwidth: 整数。 端末の表示カラム数。"
+
+#, fuzzy
+msgid ""
+":instabilities: List of strings. Evolution instabilities affecting the "
+"changeset.\n"
+"    (EXPERIMENTAL)"
+msgstr ""
+":troubles: 文字列列挙。 当該リビジョンに関連する evolution の trouble 情報。"
+
+msgid ""
+":verbosity: String. The current output verbosity in 'debug', 'quiet', "
+"'verbose',\n"
+"    or ''."
+msgstr ""
+
+msgid ""
+":whyunstable: List of dicts explaining all instabilities of a changeset.\n"
+"    (EXPERIMENTAL)"
+msgstr ""
+
+msgid "unterminated template expansion"
+msgstr "テンプレート定義が終端していません"
+
+#, python-format
+msgid "unknown method '%s'"
+msgstr "未知の処理 '%s' が指定されました"
+
+#, python-format
+msgid "expected a symbol, got '%s'"
+msgstr "シンボル (symbol) 指定が必要です (実際の指定は '%s')"
+
+msgid "expected template specifier"
+msgstr "テンプレート指定が必要です"
+
+#, python-format
+msgid "recursive reference '%s' in template"
+msgstr "テンプレートでの '%s' における再帰参照"
+
+#, python-format
+msgid "unknown function '%s'"
+msgstr "未知の関数 '%s' が指定されました"
+
+#, python-format
+msgid "filter %s expects one argument"
+msgstr "フィルタ %s の引数は1個です"
+
 msgid "template alias"
 msgstr "テンプレート別名定義"
 
+#, fuzzy, python-format
+msgid "template resource not available: %s"
+msgstr "python mysql のサポートが利用できません: %s"
+
 msgid "no templates found, try `hg debuginstall` for more info"
 msgstr "テンプレートが見つかりません。`hg debuginstall` を試してみてください"
 
@@ -33483,6 +38550,50 b' msgstr "\xe3\x83\x86\xe3\x83\xb3\xe3\x83\x97\xe3\x83\xac\xe3\x83\xbc\xe3\x83\x88\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab %s: %s"'
 msgid "invalid template engine: %s"
 msgstr "不正なテンプレートエンジン指定: %s"
 
+msgid "list of strings is not mappable"
+msgstr ""
+
+#, fuzzy
+msgid "not a date tuple nor a string"
+msgstr "date には文字列を指定してください"
+
+#, fuzzy
+msgid "not an integer"
+msgstr "数値だけの名前は使用できません"
+
+#, python-format
+msgid "incompatible use of template filter '%s'"
+msgstr "フィルタ指定 '%s' は互換性がありません"
+
+#, python-format
+msgid "template filter '%s' is not compatible with keyword '%s'"
+msgstr "フィルタ指定 '%s' はキーワード '%s' と互換性がありません"
+
+#, fuzzy, python-format
+msgid "keyword '%s' is not iterable of mappings"
+msgstr "キーワード '%s' にはリスト処理を適用できません"
+
+#, fuzzy, python-format
+msgid "%r is not iterable of mappings"
+msgstr "%r にはリスト処理を適用できません"
+
+#, fuzzy, python-format
+msgid "keyword '%s' has no member"
+msgstr "キーワード '%s' にはリスト処理を適用できません"
+
+#, fuzzy, python-format
+msgid "%r has no member"
+msgstr "%r にはリスト処理を適用できません"
+
+msgid "negation needs an integer argument"
+msgstr "負値指定は整数値に対してのみ有効です"
+
+msgid "arithmetic only defined on integers"
+msgstr "算術演算は整数値に対してのみ有効です"
+
+msgid "division by zero is not defined"
+msgstr "0 での除算は未サポートです"
+
 msgid "cannot use transaction when it is already committed/aborted"
 msgstr "既に完了/中断されているためトランザクションを利用できません"
 
@@ -33550,8 +38661,8 b' msgstr "\xe3\x83\xa6\xe3\x83\xbc\xe3\x82\xb6\xe5\x90\x8d\xe3\x81\x8c\xe6\x9c\xaa\xe6\x8c\x87\xe5\xae\x9a\xe3\x81\xa7\xe3\x81\x99"'
 msgid "use 'hg config --edit' to set your username"
 msgstr "'hg config --edit' 実行でユーザ名を設定してください"
 
-#, python-format
-msgid "username %s contains a newline\n"
+#, fuzzy, python-format
+msgid "username %r contains a newline\n"
 msgstr "ユーザ名 %s が改行を含んでいます\n"
 
 #, python-format
@@ -33636,6 +38747,13 b' msgid ""'
 msgstr ""
 
 msgid ""
+"Compresion algorithm used to compress data. Some engine are faster than other"
+msgstr ""
+
+msgid "revlog content will be recompressed with the new algorithm."
+msgstr ""
+
+msgid ""
 "deltas within internal storage will be recalculated to choose an optimal "
 "base revision where this was not already done; the size of the repository "
 "may shrink and various operations may become faster; the first time this "
@@ -33673,6 +38791,19 b' msgid ""'
 "drastically slow down execution time"
 msgstr ""
 
+msgid ""
+"every revision will be re-added as if it was new content. It will go through "
+"the full storage mechanism giving extensions a chance to process it (eg. "
+"lfs). This is similar to \"redeltaall\" but even slower since more logic is "
+"involved."
+msgstr ""
+
+msgid ""
+"each revision will be added as new content to the internal storage; this "
+"will likely drastically slow down execution time, but some extensions might "
+"need it"
+msgstr ""
+
 #, python-format
 msgid ""
 "migrating %d total revisions (%d in filelogs, %d in manifests, %d in "
@@ -33897,10 +39028,6 b' msgstr "\xe6\x83\xb3\xe5\xae\x9a\xe5\xa4\x96\xe3\x81\xae\xe3\x82\xb5\xe3\x82\xa4\xe3\x82\xba\xe3\x81\xa7\xe3\x81\x99: \xe6\x83\xb3\xe5\xae\x9a %d \xe3\x81\xab\xe5\xaf\xbe\xe3\x81\x97\xe3\x81\xa6\xe5\xae\x9f\xe9\x9a\x9b\xe3\x81\xaf %d"'
 msgid "%s mismatch: expected %s, got %s"
 msgstr "想定外の %s: 想定 %s に対して実際は %s"
 
-#, python-format
-msgid "command '%s' failed: %s"
-msgstr "コマンド '%s' が失敗: %s"
-
 msgid "copying"
 msgstr "コピー中"
 
@@ -33917,63 +39044,14 b' msgstr "\xe3\x83\x87\xe3\x82\xa3\xe3\x83\xac\xe3\x82\xaf\xe3\x83\x88\xe3\x83\xaa\xe5\x90\x8d\xe3\x81\xae\xe6\x9c\xab\xe5\xb0\xbe\xe3\x81\x8c\xe3\x80\x81 Windows \xe4\xb8\x8a\xe3\x81\xa7\xe4\xb8\x8d\xe6\xad\xa3\xe3\x81\xaa\xe6\x96\x87\xe5\xad\x97 \'\\\\\' \xe3\x81\xa7\xe3\x81\x99"'
 msgid "filename contains '%s', which is reserved on Windows"
 msgstr "ファイル名に、Windows で予約されている '%s' が含まれます"
 
-#, python-format
-msgid "filename contains %r, which is invalid on Windows"
+#, fuzzy, python-format
+msgid "filename contains '%s', which is invalid on Windows"
 msgstr "ファイル名に、Windows 上で不正な %r が含まれます"
 
 #, python-format
 msgid "filename ends with '%s', which is not allowed on Windows"
 msgstr "ファイル名の末尾が、 Windows 上で不正な '%s' です"
 
-msgid "check your clock"
-msgstr "システムの時刻設定を確認してください"
-
-#, python-format
-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"
-
-#, python-format
-msgid "date exceeds 32 bits: %d"
-msgstr "日付が32ビットを超えています: %d"
-
-#, python-format
-msgid "impossible time zone offset: %d"
-msgstr "あり得ないタイムゾーン: %d"
-
-msgid "dates cannot consist entirely of whitespace"
-msgstr "空白文字だけで構成された日時指定は不正です"
-
-msgid "invalid day spec, use '<DATE'"
-msgstr "不正な日付の指定です。 '<DATE' 形式で記述してください。"
-
-msgid "invalid day spec, use '>DATE'"
-msgstr "不正な日付の指定です。 '>DATE' 形式で記述してください。"
-
-#, python-format
-msgid "invalid day spec: %s"
-msgstr "不正な日付の指定です: %s"
-
-#, python-format
-msgid "%s must be nonnegative (see 'hg help dates')"
-msgstr "%s には正の値を指定してください ('hg help dates' 参照)"
-
-#, python-format
-msgid "invalid regular expression: %s"
-msgstr "不正な正規表現: %s"
-
 msgid "line range must be positive"
 msgstr "行範囲は昇順で指定してください"
 
@@ -34027,6 +39105,10 b' msgstr "\xe3\x82\xb5\xe3\x83\xbc\xe3\x83\x93\xe3\x82\xb9 \'%s\' \xe7\x94\xa8\xe3\x81\xae\xe3\x83\x9d\xe3\x83\xbc\xe3\x83\x88\xe7\x95\xaa\xe5\x8f\xb7\xe3\x81\x8c\xe4\xb8\x8d\xe6\x98\x8e"'
 msgid "file:// URLs can only refer to localhost"
 msgstr "file:// URL が参照できるのはローカルホストのみです"
 
+#, fuzzy, python-format
+msgid "potentially unsafe url: %r"
+msgstr "潜在的セキュリティ問題の可能性がある serve --stdio 実行: %r"
+
 #, python-format
 msgid "%.0f s"
 msgstr "%.0f 秒"
@@ -34092,7 +39174,7 b' msgstr "bundle \xe5\x90\x8d %s \xe3\x81\xaf\xe7\x99\xbb\xe9\x8c\xb2\xe6\xb8\x88\xe3\x81\xbf\xe3\x81\xa7\xe3\x81\x99"'
 
 #, python-format
 msgid "bundle type %s already registered by %s"
-msgstr "bundle 種別 %s は %s として登録済みです"
+msgstr "バンドル形式 %s は %s として登録済みです"
 
 #, python-format
 msgid "wire protocol compression %s already registered by %s"
@@ -34106,6 +39188,109 b' msgstr "revlog \xe3\x83\x98\xe3\x83\x83\xe3\x83\x80 %s \xe3\x81\xaf %s \xe3\x81\xa8\xe3\x81\x97\xe3\x81\xa6\xe6\x97\xa2\xe3\x81\xab\xe7\x99\xbb\xe9\x8c\xb2\xe6\xb8\x88\xe3\x81\xbf\xe3\x81\xa7\xe3\x81\x99"'
 msgid "compression engine %s could not be loaded"
 msgstr "圧縮エンジン %s が読み込めません"
 
+msgid ""
+"``gzip``\n"
+"    zlib compression using the DEFLATE algorithm."
+msgstr ""
+
+msgid ""
+"        All Mercurial clients should support this format. The compression\n"
+"        algorithm strikes a reasonable balance between compression ratio\n"
+"        and size."
+msgstr ""
+
+msgid ""
+"``bzip2``\n"
+"    An algorithm that produces smaller bundles than ``gzip``."
+msgstr ""
+
+msgid "        All Mercurial clients should support this format."
+msgstr ""
+
+msgid ""
+"        This engine will likely produce smaller bundles than ``gzip`` but\n"
+"        will be significantly slower, both during compression and\n"
+"        decompression."
+msgstr ""
+
+msgid ""
+"        If available, the ``zstd`` engine can yield similar or better\n"
+"        compression at much higher speeds."
+msgstr ""
+
+msgid ""
+"``none``\n"
+"    No compression is performed."
+msgstr ""
+
+msgid "        Use this compression engine to explicitly disable compression."
+msgstr ""
+
+#, python-format
+msgid "stream ended unexpectedly (got %d bytes, expected %d)"
+msgstr "想定外のデータ終端 (実データ:%d バイト 期待データ:%d バイト)"
+
+msgid "check your clock"
+msgstr "システムの時刻設定を確認してください"
+
+#, python-format
+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"
+
+#, python-format
+msgid "date exceeds 32 bits: %d"
+msgstr "日付が32ビットを超えています: %d"
+
+#, python-format
+msgid "impossible time zone offset: %d"
+msgstr "あり得ないタイムゾーン: %d"
+
+msgid "dates cannot consist entirely of whitespace"
+msgstr "空白文字だけで構成された日時指定は不正です"
+
+msgid "invalid day spec, use '<DATE'"
+msgstr "不正な日付の指定です。 '<DATE' 形式で記述してください。"
+
+msgid "invalid day spec, use '>DATE'"
+msgstr "不正な日付の指定です。 '>DATE' 形式で記述してください。"
+
+#, python-format
+msgid "invalid day spec: %s"
+msgstr "不正な日付の指定です: %s"
+
+#, python-format
+msgid "%s must be nonnegative (see 'hg help dates')"
+msgstr "%s には正の値を指定してください ('hg help dates' 参照)"
+
+#, python-format
+msgid "exited with status %d"
+msgstr "終了コード %d で終了しました"
+
+#, python-format
+msgid "killed by signal %d"
+msgstr "シグナル %d で強制終了されました"
+
+#, python-format
+msgid "command '%s' failed: %s"
+msgstr "コマンド '%s' が失敗: %s"
+
+#, python-format
+msgid "invalid regular expression: %s"
+msgstr "不正な正規表現: %s"
+
 #, python-format
 msgid "empty or missing %s"
 msgstr "%s は、 空か見つかりません"
@@ -34228,8 +39413,8 b' msgid "cannot decode filename \'%s\'"'
 msgstr "ファイル名 '%s' のデコードに失敗"
 
 #, python-format
-msgid "warning: orphan revlog '%s'"
-msgstr "警告: revlog '%s' はどこからも参照されていません"
+msgid "warning: orphan data file '%s'"
+msgstr "警告: 履歴情報 '%s' はどこからも参照されていません"
 
 msgid "crosschecking files in changesets and manifests\n"
 msgstr "リビジョンとマニフェストによるファイルのクロスチェック中\n"
@@ -34313,21 +39498,120 b' msgstr "\xe8\xaa\xad\xe3\x81\xbf\xe5\x87\xba\xe3\x81\x97\xe5\xb0\x82\xe7\x94\xa8\xe3\x83\xaa\xe3\x83\x9d\xe3\x82\xb8\xe3\x83\x88\xe3\x83\xaa\xe3\x81\xb8\xe3\x81\xae\xe6\x9b\xb8\xe3\x81\x8d\xe8\xbe\xbc\xe3\x81\xbf\xe3\x81\x8c\xe7\x99\xba\xe7\x94\x9f\xe3\x81\x97\xe3\x81\xbe\xe3\x81\x97\xe3\x81\x9f"'
 msgid "can only call close() when context manager active"
 msgstr "(internal error) can only call close() when context manager active"
 
-msgid "incompatible Mercurial client; bundle2 required"
-msgstr "bundle2 未サポートの Mercurial クライアントとは互換性がありません"
-
-msgid "see https://www.mercurial-scm.org/wiki/IncompatibleClient"
-msgstr ""
-"https://www.mercurial-scm.org/wiki/IncompatibleClient を参照してください"
-
-msgid "look up remote revision"
-msgstr "連携先でのリビジョンの検索"
-
-msgid "push failed (unexpected response):"
-msgstr "履歴反映に失敗 (想定外の応答):"
-
-msgid "look up remote changes"
-msgstr "連携先での変更の検索"
+#, python-format
+msgid "illegal ssh hostname or username starting with - or /: %s"
+msgstr ""
+
+#, python-format
+msgid "received incomplete frame: got %d bytes: %s"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "frame length error: expected %d; got %d"
+msgstr "想定外のサイズです: 想定 %d に対して実際は %d"
+
+#, python-format
+msgid "received frame with even numbered stream ID: %d"
+msgstr ""
+
+msgid ""
+"received frame on unknown inactive stream without beginning of stream flag "
+"set"
+msgstr ""
+
+msgid "command request missing \"name\" field"
+msgstr ""
+
+msgid "received command request frame with both new and continuation flags set"
+msgstr ""
+
+msgid ""
+"received command request frame with neither new nor continuation flags set"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "expected command request frame; got %d"
+msgstr "想定外のコマンド: %s"
+
+#, python-format
+msgid "request with ID %d already received"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "request with ID %d is already active"
+msgstr "リビジョン %d は既に MQ 管理下にあります"
+
+msgid "received command request frame without new flag set"
+msgstr ""
+
+#, python-format
+msgid "received frame for request that is still active: %d"
+msgstr ""
+
+#, python-format
+msgid "received frame for request that is not receiving: %d"
+msgstr ""
+
+msgid "received command request frame when request frames were supposedly done"
+msgstr ""
+
+msgid "mismatch between expect data flag and previous frame"
+msgstr ""
+
+#, python-format
+msgid "received command data frame for request that is not expecting data: %d"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "received unexpected frame type: %d"
+msgstr "想定外のパラメータ: %s"
+
+msgid "command data frame without flags"
+msgstr ""
+
+#, fuzzy
+msgid "server already errored"
+msgstr "unshelve による退避情報復旧が未完了です"
+
+#, python-format
+msgid "received frame with odd numbered stream ID: %d"
+msgstr ""
+
+msgid "received frame on unknown stream without beginning of stream flag set"
+msgstr ""
+
+#, python-format
+msgid "received frame for inactive request ID: %d"
+msgstr ""
+
+msgid "Experimental API server endpoint not enabled"
+msgstr ""
+
+msgid ""
+"APIs can be accessed at /api/<name>, where <name> can be one of the "
+"following:\n"
+msgstr ""
+
+#, fuzzy
+msgid "(no available APIs)\n"
+msgstr "利用可能なスタイル:\n"
+
+#, python-format
+msgid ""
+"Unknown API: %s\n"
+"Known APIs: %s"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "API %s not enabled\n"
+msgstr "%s は改名されていません\n"
+
+msgid "requested wire protocol command is not available over HTTP"
+msgstr ""
+
+#, python-format
+msgid "unexpected parameter %r"
+msgstr "想定外のパラメータ: %s"
 
 #, python-format
 msgid "invalid compression engine defined in %s: %s"
@@ -34341,5 +39625,318 b' msgstr "\xe8\xa8\xad\xe5\xae\x9a %s \xe3\x81\xab\xe3\x81\xaf\xe6\x9c\x89\xe5\x8a\xb9\xe3\x81\xaa\xe5\x9c\xa7\xe7\xb8\xae\xe3\x82\xa8\xe3\x83\xb3\xe3\x82\xb8\xe3\x83\xb3\xe3\x81\x8c\xe8\xa8\xad\xe5\xae\x9a\xe3\x81\x95\xe3\x82\x8c\xe3\x81\xa6\xe3\x81\x84\xe3\x81\xbe\xe3\x81\x9b\xe3\x82\x93"'
 msgid "usable compression engines: %s"
 msgstr "利用可能な圧縮エンジン一覧: %s"
 
+msgid "unfulfilled batch command response"
+msgstr ""
+
+#, fuzzy
+msgid "clone bundles"
+msgstr "clone 用バンドルファイル %s を適用中\n"
+
+msgid "look up remote revision"
+msgstr "連携先でのリビジョンの検索"
+
+msgid "push failed (unexpected response):"
+msgstr "履歴反映に失敗 (想定外の応答):"
+
+msgid "look up remote changes"
+msgstr "連携先での変更の検索"
+
+msgid "incompatible Mercurial client; bundle2 required"
+msgstr "bundle2 未サポートの Mercurial クライアントとは互換性がありません"
+
+msgid "see https://www.mercurial-scm.org/wiki/IncompatibleClient"
+msgstr ""
+"https://www.mercurial-scm.org/wiki/IncompatibleClient を参照してください"
+
+msgid "server has pull-based clones disabled"
+msgstr ""
+
+#, fuzzy
+msgid "remove --pull if specified or upgrade Mercurial"
+msgstr "Mercurial の管理対象外ファイルの削除"
+
+#, fuzzy, python-format
+msgid "received %r\n"
+msgstr "%s を削除"
+
+msgid "HTTP version 2 API handler"
+msgstr ""
+
+#, python-format
+msgid "do not know how to process %s\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "unknown permission: %s"
+msgstr "'%s' は未知のリビジョンです"
+
+msgid "commands require POST requests"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "unknown wire protocol command: %s\n"
+msgstr "未知のコマンド %s"
+
+#, fuzzy, python-format
+msgid "invalid wire protocol command: %s"
+msgstr "利用可能なプロトコル: %s"
+
+#, python-format
+msgid "client MUST specify Accept header with value: %s\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "client MUST send Content-Type header with value: %s\n"
+msgstr "'%s' は壊れた Content-Type ヘッダ(%s)を送信しました"
+
+msgid "debugreflect service not available"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "wire protocol command not available: %s"
+msgstr "patch コマンドが失敗: %s"
+
+#, python-format
+msgid "insufficient permissions to execute command: %s"
+msgstr ""
+
+msgid "multiple commands cannot be issued to this URL"
+msgstr ""
+
+msgid "command in frame must match command in URL"
+msgstr ""
+
+msgid "unhandled response type from wire proto command"
+msgstr ""
+
 msgid "number of cpus must be an integer"
 msgstr "CPU 数には数値を指定してください"
+
+msgid "failed to kill worker threads while handling an exception\n"
+msgstr ""
+
+#~ msgid "not rebasing ignored %s\n"
+#~ msgstr "無視対象のリビジョン '%s' は移動されません\n"
+
+#~ msgid "cannot use revision %d as base, result would have 3 parents"
+#~ msgstr "親リビジョンが 3 つになるので、 リビジョン %d をベースにできません"
+
+#, fuzzy
+#~ msgid "could not find content for release note %s"
+#~ msgstr "サブリポジトリ '%s' で使用する 'git' がありません"
+
+#~ msgid ""
+#~ "    Output may be to a file, in which case the name of the file is\n"
+#~ "    given using a format string. The formatting rules as follows:"
+#~ msgstr ""
+#~ "    出力先指定(置換指定可能)がある場合、 出力はファイルに保存されます。\n"
+#~ "    置換指定として以下のものが使用可能です:"
+
+#~ msgid "include the specified changeset"
+#~ msgstr "複製対象に含めるリビジョン"
+
+#~ msgid "clone only the specified branch"
+#~ msgstr "指定ブランチのみを複製"
+
+#~ msgid ""
+#~ "      In some cases, you can clone repositories and the working\n"
+#~ "      directory using full hardlinks with ::"
+#~ msgstr ""
+#~ "      リポジトリの内部管理データと作業領域中のファイル全てに対する、\n"
+#~ "      ハードリンクによる複製の作成には、 以下の方法が使えるかも知れませ"
+#~ "ん::"
+
+#~ msgid "        $ cp -al REPO REPOCLONE"
+#~ msgstr "        $ cp -al REPO REPOCLONE"
+
+#~ msgid ""
+#~ "      This is the fastest way to clone, but it is not always safe. The\n"
+#~ "      operation is not atomic (making sure REPO is not modified during\n"
+#~ "      the operation is up to you) and you have to make sure your\n"
+#~ "      editor breaks hardlinks (Emacs and most Linux Kernel tools do\n"
+#~ "      so). Also, this is not compatible with certain extensions that\n"
+#~ "      place their metadata under the .hg directory, such as mq."
+#~ msgstr ""
+#~ "      この方法は最速の複製方法かもしれませんが、 常に安全とは限りませ"
+#~ "ん。\n"
+#~ "      操作の単一性は保障されません (複製中のリポジトリの変更防止は、 \n"
+#~ "      利用者責務) し、 利用するエディタのファイル変更時の振る舞いが、\n"
+#~ "      ハードリンクを破棄するものである必要があります (Emacs および多くの\n"
+#~ "      Linux 系ツールは、 そのように振舞います)。 この制約は、\n"
+#~ "      MQ エクステンションのように、 .hg ディレクトリ配下に、\n"
+#~ "      管理情報を格納するツールとは相容れません。"
+
+#~ msgid "cannot amend while merging"
+#~ msgstr "マージ実施中の作業領域では改変できません"
+
+#~ msgid "only one config item permitted"
+#~ msgstr "複数の設定項目指定は無効です"
+
+#~ msgid "unstable: %d changesets"
+#~ msgstr "unstable リビジョン: %d 個"
+
+#~ msgid "Select hunks to revert"
+#~ msgstr "取り消しに用いる差分の選択"
+
+#~ msgid "[-l REV] [-r REV] [-b BRANCH]... [OTHER]"
+#~ msgstr "[-l REV] [-r REV] [-b BRANCH]... [OTHER]"
+
+#~ msgid "push includes unstable changeset: %s!"
+#~ msgstr "履歴反映対象に非永続 (unstable) リビジョンが含まれます！: %s"
+
+#~ msgid "    %s"
+#~ msgstr "    %s"
+
+#~ msgid ""
+#~ "Copying\n"
+#~ "\"\"\"\"\"\"\"\n"
+#~ "Copyright (C) 2005-2017 Matt Mackall.\n"
+#~ "Free use of this software is granted under the terms of the GNU General\n"
+#~ "Public License version 2 or any later version."
+#~ msgstr ""
+#~ "Copying\n"
+#~ "\"\"\"\"\"\"\"\n"
+#~ "Copyright (C) 2005-2017 Matt Mackall.\n"
+#~ "本ソフトウェアは、 バージョン2またはそれ以降の GNU General\n"
+#~ "Public License の元での自由な利用が保証されています。"
+
+#~ msgid "operation not supported over http"
+#~ msgstr "http リポジトリでは未サポートの機能です"
+
+#~ msgid "revert change %d/%d to '%s'?"
+#~ msgstr "この変更 (%d 件目 / %d 件中) を '%s' に記録しますか？"
+
+#~ msgid "revert this change to '%s'?"
+#~ msgstr "この変更を '%s' に記録しますか？"
+
+#, fuzzy
+#~ msgid ""
+#~ "[Ynesfdaq?]$$ &Yes, revert this change$$ &No, skip this change$$ &Edit "
+#~ "this change manually$$ &Skip remaining changes to this file$$ Revert "
+#~ "remaining changes to this &file$$ &Done, skip remaining changes and files$"
+#~ "$ Revert &all changes to all remaining files$$ &Quit, reverting no changes"
+#~ "$$ &? (display help)"
+#~ msgstr ""
+#~ "[Ynesfdaq?]$$ この変更を記録(&yes)$$ この変更を無視(&no)$$ この変更を手動"
+#~ "で編集(&edit)$$ 同一ファイルの以後の全ての変更を無視(&skip)$$ 同一ファイル"
+#~ "(&file)の以後の全ての変更を記録$$ 以後の全ての変更を無視＝記録作業を完了"
+#~ "(&done)$$ 以後の全て(&all)の変更を記録$$ 変更の記録自体を中止(&quit)$$ ヘ"
+#~ "ルプ表示(&?)"
+
+#~ msgid "bumped takes no arguments"
+#~ msgstr "bumped には引数が指定できません"
+
+#~ msgid "%s takes no arguments or a pattern and an optional revset"
+#~ msgstr "%s にはパターンと revset しか指定できません"
+
+#~ msgid "%s expected one starting revision"
+#~ msgstr "%s には開始リビジョンを指定してください"
+
+#~ msgid "unstable takes no arguments"
+#~ msgstr "unstable には引数が指定できません"
+
+#~ msgid ""
+#~ "    >>> person('foo@bar')\n"
+#~ "    'foo'\n"
+#~ "    >>> person('Foo Bar <foo@bar>')\n"
+#~ "    'Foo Bar'\n"
+#~ "    >>> person('\"Foo Bar\" <foo@bar>')\n"
+#~ "    'Foo Bar'\n"
+#~ "    >>> person('\"Foo \"buz\" Bar\" <foo@bar>')\n"
+#~ "    'Foo \"buz\" Bar'\n"
+#~ "    >>> # The following are invalid, but do exist in real-life\n"
+#~ "    ...\n"
+#~ "    >>> person('Foo \"buz\" Bar <foo@bar>')\n"
+#~ "    'Foo \"buz\" Bar'\n"
+#~ "    >>> person('\"Foo Bar <foo@bar>')\n"
+#~ "    'Foo Bar'"
+#~ msgstr ""
+#~ "    >>> person('foo@bar')\n"
+#~ "    'foo'\n"
+#~ "    >>> person('Foo Bar <foo@bar>')\n"
+#~ "    'Foo Bar'\n"
+#~ "    >>> person('\"Foo Bar\" <foo@bar>')\n"
+#~ "    'Foo Bar'\n"
+#~ "    >>> person('\"Foo \"buz\" Bar\" <foo@bar>')\n"
+#~ "    'Foo \"buz\" Bar'\n"
+#~ "    >>> # The following are invalid, but do exist in real-life\n"
+#~ "    ...\n"
+#~ "    >>> person('Foo \"buz\" Bar <foo@bar>')\n"
+#~ "    'Foo \"buz\" Bar'\n"
+#~ "    >>> person('\"Foo Bar <foo@bar>')\n"
+#~ "    'Foo Bar'"
+
+#~ msgid "    (EXPERIMENTAL)"
+#~ msgstr "    (実験的実装)"
+
+#~ msgid "enable Mercurial color mode (DEPRECATED)"
+#~ msgstr "Mercurial の出力のカラー化 (非推奨)"
+
+#~ msgid ""
+#~ "This extension enables Mercurial color mode. The feature is now directly\n"
+#~ "available in Mercurial core. You can access it using::"
+#~ msgstr ""
+#~ "本エクステンションは Mercurial 出力をカラー化します。 カラー化機能は、\n"
+#~ "Mercurial のコア機能に取り込まれたため、 以下の設定のみで利用可能です::"
+
+#~ msgid "histedit: moving bookmarks %s from %s to %s\n"
+#~ msgstr "histedit: ブックマーク %s を %s から %s に移動中\n"
+
+#~ msgid "too many shelved changes named '%s'"
+#~ msgstr "名前のベースに '%s' を使用する退避情報が多過ぎます"
+
+#~ msgid "received changelog group is empty"
+#~ msgstr "受信した変更履歴は空です"
+
+#~ msgid "stripping intermediate changeset %s\n"
+#~ msgstr "中途リビジョン %s を除外中\n"
+
+#~ msgid "stripping amended changeset %s\n"
+#~ msgstr "改変対象リビジョン %s を除外中\n"
+
+#~ msgid "no ignore patterns found"
+#~ msgstr "無視対象ファイルの指定がありません"
+
+#~ msgid "    (in addition a boolean can be used in place always/never)"
+#~ msgstr "    (true/false 等の真偽値は always/never 相当とみなされます)"
+
+#~ msgid "8. The merge of the file fails and must be resolved before commit."
+#~ msgstr ""
+#~ "8. ファイルのマージは失敗とみなされ、 手動での :hg:`resolve` が必要です。"
+
+#~ msgid ""
+#~ "  [pager]\n"
+#~ "  enable = false"
+#~ msgstr ""
+#~ "  [pager]\n"
+#~ "  enable = false"
+
+#~ msgid ""
+#~ "this may be an intermittent failure; if the error persists, consider "
+#~ "contacting the network or server operator"
+#~ msgstr ""
+#~ "ネットワーク経路の切断が主要因です。同様のエラーが継続的に発生する場合は、"
+#~ "ネットワークあるいはサーバの管理者に問い合わせてください"
+
+#~ msgid "fileset expression with no context"
+#~ msgstr "対象リビジョン指定なしの fileset 記述"
+
+#~ msgid "index %s unknown flags %#04x for format v0"
+#~ msgstr "インデックス %s: %#04x は未知のフラグです(フォーマット v0)"
+
+#~ msgid "index %s unknown format %d"
+#~ msgstr "インデックス %s: %d は未知のフォーマットです"
+
+#~ msgid ""
+#~ "setting ciphers in [hostsecurity] is not supported by this version of "
+#~ "Python"
+#~ msgstr ""
+#~ "このバージョンの Python では [hostsecurity] での暗号形式設定は未サポートで"
+#~ "す"
+
+#~ msgid ""
+#~ "remove the config option or run Mercurial with a modern Python version "
+#~ "(preferred)"
+#~ msgstr ""
+#~ "設定を破棄するか、新しい Python で Mercurial を実行してください(後者を推"
+#~ "奨)"