##// END OF EJS Templates
merge with i18n
Augie Fackler -
r38144:d46a38c0 merge stable
parent child Browse files
Show More

The requested changes are too big and content was truncated. Show full diff

This diff has been collapsed as it changes many lines, (8779 lines changed) Show them Hide them
@@ -1,7 +1,7 b''
1 # Japanese translation for Mercurial
1 # Japanese translation for Mercurial
2 # Mercurial 日本語翻訳
2 # Mercurial 日本語翻訳
3 #
3 #
4 # Copyright (C) 2009-2017 the Mercurial team
4 # Copyright (C) 2009-2018 the Mercurial team
5 #
5 #
6 # ========================================
6 # ========================================
7 # 【翻訳用語集】
7 # 【翻訳用語集】
@@ -171,8 +171,8 b' msgid ""'
171 msgstr ""
171 msgstr ""
172 "Project-Id-Version: Mercurial\n"
172 "Project-Id-Version: Mercurial\n"
173 "Report-Msgid-Bugs-To: <mercurial-devel@mercurial-scm.org>\n"
173 "Report-Msgid-Bugs-To: <mercurial-devel@mercurial-scm.org>\n"
174 "POT-Creation-Date: 2017-04-29 22:12+0900\n"
174 "POT-Creation-Date: 2017-08-01 21:59+0900\n"
175 "PO-Revision-Date: 2017-05-01 07:00+0900\n"
175 "PO-Revision-Date: 2018-05-01 18:00+0900\n"
176 "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n"
176 "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n"
177 "Language-Team: Japanese\n"
177 "Language-Team: Japanese\n"
178 "Language: ja\n"
178 "Language: ja\n"
@@ -645,6 +645,48 b' msgid "acl: user \\"%s\\" not allowed on \\'
645 msgstr ""
645 msgstr ""
646 "acl: ユーザ \"%s\" はファイル \"%s\" が許可されていません(リビジョン \"%s\")"
646 "acl: ユーザ \"%s\" はファイル \"%s\" が許可されていません(リビジョン \"%s\")"
647
647
648 #, fuzzy
649 msgid "provide the amend command (EXPERIMENTAL)"
650 msgstr " (実験的実装)"
651
652 msgid ""
653 "This extension provides an ``amend`` command that is similar to\n"
654 "``commit --amend`` but does not prompt an editor.\n"
655 msgstr ""
656
657 msgid "mark new/missing files as added/removed before committing"
658 msgstr "新規/不在ファイルを、コミット前に登録/除外対象化"
659
660 msgid "invoke editor on commit messages"
661 msgstr "コミットログ入力にエディタを起動"
662
663 msgid "use interactive mode"
664 msgstr "操作対象変更の対話的な選択"
665
666 msgid "store a note on the amend"
667 msgstr ""
668
669 msgid "[OPTION]... [FILE]..."
670 msgstr "[OPTION]... [FILE]..."
671
672 #, fuzzy
673 msgid "amend the working copy parent with all or specified outstanding changes"
674 msgstr "作業領域の変更が未コミットです"
675
676 msgid ""
677 " Similar to :hg:`commit --amend`, but reuse the commit message without\n"
678 " invoking editor, unless ``--edit`` was set."
679 msgstr ""
680
681 #, fuzzy
682 msgid ""
683 " See :hg:`help commit` for more details.\n"
684 " "
685 msgstr "詳細は :hg:`help color` を参照してください。\n"
686
687 msgid "cannot store a note of more than 255 bytes"
688 msgstr ""
689
648 msgid "check for unrecorded moves at commit time (EXPERIMENTAL)"
690 msgid "check for unrecorded moves at commit time (EXPERIMENTAL)"
649 msgstr "ファイル移動のコミット時自動検出 (実験的実装)"
691 msgstr "ファイル移動のコミット時自動検出 (実験的実装)"
650
692
@@ -852,10 +894,11 b' msgstr ""'
852 "Bugzilla へのアクセスで使用されるユーザ名で、 メールが送信されます。\n"
894 "Bugzilla へのアクセスで使用されるユーザ名で、 メールが送信されます。\n"
853 "サポート対象の全ての版の Bugzilla で、 バグの状態を「解決」にできます。"
895 "サポート対象の全ての版の Bugzilla で、 バグの状態を「解決」にできます。"
854
896
897 #, fuzzy
855 msgid ""
898 msgid ""
856 "Access via the REST-API needs either a Bugzilla username and password\n"
899 "Access via the REST-API needs either a Bugzilla username and password\n"
857 "or an apikey specified in the configuration. Comments are made under\n"
900 "or an apikey specified in the configuration. Comments are made under\n"
858 "the given username or the user assoicated with the apikey in Bugzilla."
901 "the given username or the user associated with the apikey in Bugzilla."
859 msgstr ""
902 msgstr ""
860 "REST-API での利用には、 Bugzilla のユーザ名とパスワード、 または、\n"
903 "REST-API での利用には、 Bugzilla のユーザ名とパスワード、 または、\n"
861 "設定への APIKEY 記述のいずれかが必要です。 コメントの作成は、\n"
904 "設定への APIKEY 記述のいずれかが必要です。 コメントの作成は、\n"
@@ -1583,8 +1626,9 b' msgstr ""'
1583 msgid " Please use :hg:`log` instead::"
1626 msgid " Please use :hg:`log` instead::"
1584 msgstr " 本コマンドの代わりに :hg:`log` を使うようにしてください::"
1627 msgstr " 本コマンドの代わりに :hg:`log` を使うようにしてください::"
1585
1628
1586 msgid ""
1629 #, fuzzy
1587 " hg children => hg log -r \"children()\"\n"
1630 msgid ""
1631 " hg children => hg log -r \"children(.)\"\n"
1588 " hg children -r REV => hg log -r \"children(REV)\""
1632 " hg children -r REV => hg log -r \"children(REV)\""
1589 msgstr ""
1633 msgstr ""
1590 " hg children => hg log -r \"children()\"\n"
1634 " hg children => hg log -r \"children()\"\n"
@@ -1679,9 +1723,10 b' msgstr ""'
1679 msgid " Examples::"
1723 msgid " Examples::"
1680 msgstr " 例::"
1724 msgstr " 例::"
1681
1725
1726 #, fuzzy
1682 msgid ""
1727 msgid ""
1683 " # display count of changed lines for every committer\n"
1728 " # display count of changed lines for every committer\n"
1684 " hg churn -t \"{author|email}\""
1729 " hg churn -T \"{author|email}\""
1685 msgstr ""
1730 msgstr ""
1686 " # ユーザ毎の変更行数の表示\n"
1731 " # ユーザ毎の変更行数の表示\n"
1687 " hg churn -t \"{author|email}\""
1732 " hg churn -t \"{author|email}\""
@@ -1740,7 +1785,8 b' msgid ""'
1740 "\"clonebundles\" is a server-side extension used to advertise the existence\n"
1785 "\"clonebundles\" is a server-side extension used to advertise the existence\n"
1741 "of pre-generated, externally hosted bundle files to clients that are\n"
1786 "of pre-generated, externally hosted bundle files to clients that are\n"
1742 "cloning so that cloning can be faster, more reliable, and require less\n"
1787 "cloning so that cloning can be faster, more reliable, and require less\n"
1743 "resources on the server."
1788 "resources on the server. \"pullbundles\" is a related feature for sending\n"
1789 "pre-generated bundle files to clients as part of pull operations."
1744 msgstr ""
1790 msgstr ""
1745
1791
1746 msgid ""
1792 msgid ""
@@ -1756,8 +1802,13 b' msgid ""'
1756 msgstr ""
1802 msgstr ""
1757
1803
1758 msgid ""
1804 msgid ""
1759 "This extension provides server operators the ability to offload potentially\n"
1805 "This extension provides server operators the ability to offload\n"
1760 "expensive clone load to an external service. Here's how it works."
1806 "potentially expensive clone load to an external service. Pre-generated\n"
1807 "bundles also allow using more CPU intensive compression, reducing the\n"
1808 "effective bandwidth requirements."
1809 msgstr ""
1810
1811 msgid "Here's how clone bundles work:"
1761 msgstr ""
1812 msgstr ""
1762
1813
1763 msgid ""
1814 msgid ""
@@ -1776,7 +1827,7 b' msgid ""'
1776 "7. The client reconnects to the original server and performs the equivalent\n"
1827 "7. The client reconnects to the original server and performs the equivalent\n"
1777 " of :hg:`pull` to retrieve all repository data not in the bundle. (The\n"
1828 " of :hg:`pull` to retrieve all repository data not in the bundle. (The\n"
1778 " repository could have been updated between when the bundle was created\n"
1829 " repository could have been updated between when the bundle was created\n"
1779 " and when the client started the clone.)"
1830 " and when the client started the clone.) This may use \"pullbundles\"."
1780 msgstr ""
1831 msgstr ""
1781
1832
1782 msgid ""
1833 msgid ""
@@ -1789,15 +1840,33 b' msgid ""'
1789 "clones to less than 1% of original."
1840 "clones to less than 1% of original."
1790 msgstr ""
1841 msgstr ""
1791
1842
1843 msgid "Here's how pullbundles work:"
1844 msgstr ""
1845
1846 msgid ""
1847 "1. A manifest file listing available bundles and describing the revisions\n"
1848 " is added to the Mercurial repository on the server.\n"
1849 "2. A new-enough client informs the server that it supports partial pulls\n"
1850 " and initiates a pull.\n"
1851 "3. If the server has pull bundles enabled and sees the client advertising\n"
1852 " partial pulls, it checks for a matching pull bundle in the manifest.\n"
1853 " A bundle matches if the format is supported by the client, the client\n"
1854 " has the required revisions already and needs something from the bundle.\n"
1855 "4. If there is at least one matching bundle, the server sends it to the "
1856 "client.\n"
1857 "5. The client applies the bundle and notices that the server reply was\n"
1858 " incomplete. It initiates another pull."
1859 msgstr ""
1860
1792 msgid "To work, this extension requires the following of server operators:"
1861 msgid "To work, this extension requires the following of server operators:"
1793 msgstr ""
1862 msgstr ""
1794
1863
1795 msgid ""
1864 msgid ""
1796 "* Generating bundle files of repository content (typically periodically,\n"
1865 "* Generating bundle files of repository content (typically periodically,\n"
1797 " such as once per day).\n"
1866 " such as once per day).\n"
1798 "* A file server that clients have network access to and that Python knows\n"
1867 "* Clone bundles: A file server that clients have network access to and that\n"
1799 " how to talk to through its normal URL handling facility (typically an\n"
1868 " Python knows how to talk to through its normal URL handling facility\n"
1800 " HTTP server).\n"
1869 " (typically an HTTP/HTTPS server).\n"
1801 "* A process for keeping the bundles manifest in sync with available bundle\n"
1870 "* A process for keeping the bundles manifest in sync with available bundle\n"
1802 " files."
1871 " files."
1803 msgstr ""
1872 msgstr ""
@@ -1836,12 +1905,11 b' msgid ""'
1836 "manifest``\n"
1905 "manifest``\n"
1837 "file containing the list of available bundle files suitable for seeding\n"
1906 "file containing the list of available bundle files suitable for seeding\n"
1838 "clones. If this file does not exist, the repository will not advertise the\n"
1907 "clones. If this file does not exist, the repository will not advertise the\n"
1839 "existence of clone bundles when clients connect."
1908 "existence of clone bundles when clients connect. For pull bundles,\n"
1840 msgstr ""
1909 "``.hg/pullbundles.manifest`` is used."
1841
1910 msgstr ""
1842 msgid ""
1911
1843 "The manifest file contains a newline (\n"
1912 msgid "The manifest file contains a newline (\\n) delimited list of entries."
1844 ") delimited list of entries."
1845 msgstr ""
1913 msgstr ""
1846
1914
1847 msgid ""
1915 msgid ""
@@ -1858,6 +1926,11 b' msgid ""'
1858 msgstr ""
1926 msgstr ""
1859
1927
1860 msgid ""
1928 msgid ""
1929 "For pull bundles, the URL is a path under the ``.hg`` directory of the\n"
1930 "repository."
1931 msgstr ""
1932
1933 msgid ""
1861 "Keys in UPPERCASE are reserved for use by Mercurial and are defined below.\n"
1934 "Keys in UPPERCASE are reserved for use by Mercurial and are defined below.\n"
1862 "All non-uppercase keys can be used by site installations. An example use\n"
1935 "All non-uppercase keys can be used by site installations. An example use\n"
1863 "for custom properties is to use the *datacenter* attribute to define which\n"
1936 "for custom properties is to use the *datacenter* attribute to define which\n"
@@ -1930,13 +2003,25 b' msgid " Value should be \\"true\\"."'
1930 msgstr ""
2003 msgstr ""
1931
2004
1932 msgid ""
2005 msgid ""
2006 "heads\n"
2007 " Used for pull bundles. This contains the ``;`` separated changeset\n"
2008 " hashes of the heads of the bundle content."
2009 msgstr ""
2010
2011 msgid ""
2012 "bases\n"
2013 " Used for pull bundles. This contains the ``;`` separated changeset\n"
2014 " hashes of the roots of the bundle content. This can be skipped if\n"
2015 " the bundle was created without ``--base``."
2016 msgstr ""
2017
2018 msgid ""
1933 "Manifests can contain multiple entries. Assuming metadata is defined, "
2019 "Manifests can contain multiple entries. Assuming metadata is defined, "
1934 "clients\n"
2020 "clients\n"
1935 "will filter entries from the manifest that they don't support. The "
2021 "will filter entries from the manifest that they don't support. The "
1936 "remaining\n"
2022 "remaining\n"
1937 "entries are optionally sorted by client preferences\n"
2023 "entries are optionally sorted by client preferences\n"
1938 "(``experimental.clonebundleprefers`` config option). The client then "
2024 "(``ui.clonebundleprefers`` config option). The client then attempts\n"
1939 "attempts\n"
1940 "to fetch the bundle at the first URL in the remaining list."
2025 "to fetch the bundle at the first URL in the remaining list."
1941 msgstr ""
2026 msgstr ""
1942
2027
@@ -1972,25 +2057,30 b' msgid ""'
1972 "Mercurial server when the bundle hosting service fails.\n"
2057 "Mercurial server when the bundle hosting service fails.\n"
1973 msgstr ""
2058 msgstr ""
1974
2059
1975 msgid "enable Mercurial color mode (DEPRECATED)"
2060 msgid "adds a new flag extras to commit (ADVANCED)"
1976 msgstr "Mercurial の出力のカラー化 (非推奨)"
2061 msgstr ""
1977
2062
1978 msgid ""
2063 msgid "KEY=VALUE"
1979 "This extension enables Mercurial color mode. The feature is now directly\n"
2064 msgstr "キーワード=値"
1980 "available in Mercurial core. You can access it using::"
2065
1981 msgstr ""
2066 #, fuzzy
1982 "本エクステンションは Mercurial 出力をカラー化します。 カラー化機能は、\n"
2067 msgid "set a changeset's extra values"
1983 "Mercurial のコア機能に取り込まれたため、 以下の設定のみで利用可能です::"
2068 msgstr "電子メールによる変更内容のパッチ送付"
1984
2069
1985 msgid ""
2070 #, python-format
1986 " [ui]\n"
2071 msgid "unable to parse '%s', should follow KEY=VALUE format"
1987 " color = auto"
2072 msgstr ""
1988 msgstr ""
2073
1989 " [ui]\n"
2074 #, python-format
1990 " color = auto"
2075 msgid "unable to parse '%s', keys can't be empty"
1991
2076 msgstr ""
1992 msgid "See :hg:`help color` for details.\n"
2077
1993 msgstr "詳細は :hg:`help color` を参照してください。\n"
2078 msgid "keys can only contain ascii letters, digits, '_' and '-'"
2079 msgstr ""
2080
2081 #, python-format
2082 msgid "key '%s' is used internally, can't be set manually"
2083 msgstr ""
1994
2084
1995 msgid "import revisions from foreign VCS repositories into Mercurial"
2085 msgid "import revisions from foreign VCS repositories into Mercurial"
1996 msgstr "他の構成管理ツールから Mercurial への履歴取り込み"
2086 msgstr "他の構成管理ツールから Mercurial への履歴取り込み"
@@ -2294,11 +2384,12 b' msgstr ""'
2294 msgid " original_branch_name new_branch_name"
2384 msgid " original_branch_name new_branch_name"
2295 msgstr " 変換元ブランチ名 変換先ブランチ名"
2385 msgstr " 変換元ブランチ名 変換先ブランチ名"
2296
2386
2387 #, fuzzy
2297 msgid ""
2388 msgid ""
2298 " where \"original_branch_name\" is the name of the branch in the\n"
2389 " where \"original_branch_name\" is the name of the branch in the\n"
2299 " source repository, and \"new_branch_name\" is the name of the branch\n"
2390 " source repository, and \"new_branch_name\" is the name of the branch\n"
2300 " is the destination repository. No whitespace is allowed in the\n"
2391 " is the destination repository. No whitespace is allowed in the new\n"
2301 " branch names. This can be used to (for instance) move code in one\n"
2392 " branch name. This can be used to (for instance) move code in one\n"
2302 " repository from \"default\" to a named branch."
2393 " repository from \"default\" to a named branch."
2303 msgstr ""
2394 msgstr ""
2304 " \"変換元ブランチ名\" が変換元リポジトリにおけるブランチ名で、\n"
2395 " \"変換元ブランチ名\" が変換元リポジトリにおけるブランチ名で、\n"
@@ -2403,6 +2494,14 b' msgstr ""'
2403 " 不十分な恐れがあります。"
2494 " 不十分な恐れがあります。"
2404
2495
2405 msgid ""
2496 msgid ""
2497 " :convert.cvsps.logencoding: Specify encoding name to be used for\n"
2498 " transcoding CVS log messages. Multiple encoding names can be\n"
2499 " specified as a list (see :hg:`help config.Syntax`), but only\n"
2500 " the first acceptable encoding in the list is used per CVS log\n"
2501 " entries. This transcoding is executed before cvslog hook below."
2502 msgstr ""
2503
2504 msgid ""
2406 " :convert.cvsps.mergeto: Specify a regular expression to which\n"
2505 " :convert.cvsps.mergeto: Specify a regular expression to which\n"
2407 " commit log messages are matched. If a match occurs, then the\n"
2506 " commit log messages are matched. If a match occurs, then the\n"
2408 " conversion process will insert a dummy revision merging the\n"
2507 " 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"'
3110 msgid "%d log entries\n"
3209 msgid "%d log entries\n"
3111 msgstr "%d 件のログエントリ\n"
3210 msgstr "%d 件のログエントリ\n"
3112
3211
3212 #, fuzzy
3213 msgid "check convert.cvsps.logencoding configuration"
3214 msgstr "%s 設定を確認してください"
3215
3216 #, python-format
3217 msgid "no encoding can transcode CVS log message for %s of %s"
3218 msgstr ""
3219
3113 msgid "creating changesets\n"
3220 msgid "creating changesets\n"
3114 msgstr "リビジョン作成中\n"
3221 msgstr "リビジョン作成中\n"
3115
3222
@@ -3755,6 +3862,13 b' msgstr ""'
3755 "スナップショットディレクトリへのパス) を使って起動されます。"
3862 "スナップショットディレクトリへのパス) を使って起動されます。"
3756
3863
3757 msgid ""
3864 msgid ""
3865 "If there is more than one file being compared and the \"child\" revision\n"
3866 "is the working directory, any modifications made in the external diff\n"
3867 "program will be copied back to the working directory from the temporary\n"
3868 "directory."
3869 msgstr ""
3870
3871 msgid ""
3758 "The extdiff extension also allows you to configure new diff commands, so\n"
3872 "The extdiff extension also allows you to configure new diff commands, so\n"
3759 "you do not need to type :hg:`extdiff -p kdiff3` always. ::"
3873 "you do not need to type :hg:`extdiff -p kdiff3` always. ::"
3760 msgstr ""
3874 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)"'
4018 msgid "a specific revision you would like to pull"
4132 msgid "a specific revision you would like to pull"
4019 msgstr "取り込み対象リビジョンの指定"
4133 msgstr "取り込み対象リビジョンの指定"
4020
4134
4021 msgid "invoke editor on commit messages"
4022 msgstr "コミットログ入力にエディタを起動"
4023
4024 msgid "edit commit message (DEPRECATED)"
4135 msgid "edit commit message (DEPRECATED)"
4025 msgstr "コミットログの編集 (非推奨)"
4136 msgstr "コミットログの編集 (非推奨)"
4026
4137
@@ -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"'
4110 msgid "new changeset %d:%s merges remote changes with local\n"
4221 msgid "new changeset %d:%s merges remote changes with local\n"
4111 msgstr "新規リビジョン %d:%s により、連携先とローカルのリビジョンをマージ\n"
4222 msgstr "新規リビジョン %d:%s により、連携先とローカルのリビジョンをマージ\n"
4112
4223
4224 #, fuzzy
4225 msgid "rewrite file content in changesets or working copy (EXPERIMENTAL)"
4226 msgstr ""
4227 "``wdir``\n"
4228 " 作業領域ディレクトリを表す値 (実験的実装)"
4229
4230 msgid ""
4231 "Provides a command that runs configured tools on the contents of modified "
4232 "files,\n"
4233 "writing back any fixes to the working copy or replacing changesets."
4234 msgstr ""
4235
4236 msgid ""
4237 "Here is an example configuration that causes :hg:`fix` to apply automatic\n"
4238 "formatting fixes to modified lines in C++ code::"
4239 msgstr ""
4240
4241 msgid ""
4242 " [fix]\n"
4243 " clang-format:command=clang-format --assume-filename={rootpath}\n"
4244 " clang-format:linerange=--lines={first}:{last}\n"
4245 " clang-format:fileset=set:**.cpp or **.hpp"
4246 msgstr ""
4247
4248 msgid ""
4249 "The :command suboption forms the first part of the shell command that will "
4250 "be\n"
4251 "used to fix a file. The content of the file is passed on standard input, and "
4252 "the\n"
4253 "fixed file content is expected on standard output. If there is any output "
4254 "on\n"
4255 "standard error, the file will not be affected. Some values may be "
4256 "substituted\n"
4257 "into the command::"
4258 msgstr ""
4259
4260 msgid ""
4261 " {rootpath} The path of the file being fixed, relative to the repo root\n"
4262 " {basename} The name of the file being fixed, without the directory path"
4263 msgstr ""
4264
4265 msgid ""
4266 "If the :linerange suboption is set, the tool will only be run if there are\n"
4267 "changed lines in a file. The value of this suboption is appended to the "
4268 "shell\n"
4269 "command once for every range of changed lines in the file. Some values may "
4270 "be\n"
4271 "substituted into the command::"
4272 msgstr ""
4273
4274 msgid ""
4275 " {first} The 1-based line number of the first line in the modified range\n"
4276 " {last} The 1-based line number of the last line in the modified range"
4277 msgstr ""
4278
4279 msgid ""
4280 "The :fileset suboption determines which files will be passed through each\n"
4281 "configured tool. See :hg:`help fileset` for possible values. If there are "
4282 "file\n"
4283 "arguments to :hg:`fix`, the intersection of these filesets is used."
4284 msgstr ""
4285
4286 msgid ""
4287 "There is also a configurable limit for the maximum size of file that will "
4288 "be\n"
4289 "processed by :hg:`fix`::"
4290 msgstr ""
4291
4292 #, fuzzy
4293 msgid ""
4294 " [fix]\n"
4295 " maxfilesize=2MB"
4296 msgstr ""
4297 " [largefiles]\n"
4298 " minsize = 2"
4299
4300 msgid "fix all non-public non-obsolete revisions"
4301 msgstr ""
4302
4303 msgid ""
4304 "revisions to diff against (overrides automatic selection, and applies to "
4305 "every revision being fixed)"
4306 msgstr ""
4307
4308 #, fuzzy
4309 msgid "revisions to fix"
4310 msgstr "移植対象リビジョン"
4311
4312 #, fuzzy
4313 msgid "fix the working directory"
4314 msgstr "作業領域の変更"
4315
4316 msgid "always fix every line of a file"
4317 msgstr ""
4318
4319 #, fuzzy
4320 msgid "rewrite file content in changesets or working directory"
4321 msgstr "%s は作業領域の祖先ではありません"
4322
4323 msgid ""
4324 " Runs any configured tools to fix the content of files. Only affects "
4325 "files\n"
4326 " with changes, unless file arguments are provided. Only affects changed "
4327 "lines\n"
4328 " of files, unless the --whole flag is used. Some tools may always affect "
4329 "the\n"
4330 " whole file regardless of --whole."
4331 msgstr ""
4332
4333 msgid ""
4334 " If revisions are specified with --rev, those revisions will be checked, "
4335 "and\n"
4336 " they may be replaced with new revisions that have fixed file content. "
4337 "It is\n"
4338 " desirable to specify all descendants of each specified revision, so that "
4339 "the\n"
4340 " fixes propagate to the descendants. If all descendants are fixed at the "
4341 "same\n"
4342 " time, no merging, rebasing, or evolution will be required."
4343 msgstr ""
4344
4345 msgid ""
4346 " If --working-dir is used, files with uncommitted changes in the working "
4347 "copy\n"
4348 " will be fixed. If the checked-out revision is also fixed, the working\n"
4349 " directory will update to the replacement revision."
4350 msgstr ""
4351
4352 msgid ""
4353 " When determining what lines of each file to fix at each revision, the "
4354 "whole\n"
4355 " set of revisions being fixed is considered, so that fixes to earlier\n"
4356 " revisions are not forgotten in later ones. The --base flag can be used "
4357 "to\n"
4358 " override this default behavior, though it is not usually desirable to do "
4359 "so.\n"
4360 " "
4361 msgstr ""
4362
4363 #, fuzzy
4364 msgid "cannot specify both \"--rev\" and \"--all\""
4365 msgstr "--noupdate と --updaterev は併用できません"
4366
4367 #, fuzzy, python-format
4368 msgid "ignoring file larger than %s: %s\n"
4369 msgstr "不正な文字セットを無視します: %s\n"
4370
4371 #, fuzzy
4372 msgid "can only fix a changeset together with all its descendants"
4373 msgstr "対象の全子孫が編集対象に含まれる場合のみリビジョンの編集が可能です。"
4374
4375 msgid "wdir"
4376 msgstr ""
4377
4113 msgid "Faster status operations with the Watchman file monitor (EXPERIMENTAL)"
4378 msgid "Faster status operations with the Watchman file monitor (EXPERIMENTAL)"
4114 msgstr ""
4379 msgstr ""
4115
4380
@@ -4131,6 +4396,11 b' msgid ""'
4131 "https://facebook.github.io/watchman/ and make sure it is in your PATH."
4396 "https://facebook.github.io/watchman/ and make sure it is in your PATH."
4132 msgstr ""
4397 msgstr ""
4133
4398
4399 msgid ""
4400 "fsmonitor is incompatible with the largefiles and eol extensions, and\n"
4401 "will disable itself if any of those are active."
4402 msgstr ""
4403
4134 msgid "The following configuration options exist:"
4404 msgid "The following configuration options exist:"
4135 msgstr ""
4405 msgstr ""
4136
4406
@@ -4188,8 +4458,25 b' msgid ""'
4188 msgstr ""
4458 msgstr ""
4189
4459
4190 msgid ""
4460 msgid ""
4191 "fsmonitor is incompatible with the largefiles and eol extensions, and\n"
4461 " [fsmonitor]\n"
4192 "will disable itself if any of those are active."
4462 " warn_when_unused = (boolean)"
4463 msgstr ""
4464
4465 msgid ""
4466 "Whether to print a warning during certain operations when fsmonitor would "
4467 "be\n"
4468 "beneficial to performance but isn't enabled."
4469 msgstr ""
4470
4471 msgid ""
4472 " [fsmonitor]\n"
4473 " warn_update_file_count = (integer)"
4474 msgstr ""
4475
4476 msgid ""
4477 "If ``warn_when_unused`` is set and fsmonitor isn't enabled, a warning will\n"
4478 "be printed during working directory updates if this many files will be\n"
4479 "created.\n"
4193 msgstr ""
4480 msgstr ""
4194
4481
4195 msgid "unknown"
4482 msgid "unknown"
@@ -4224,13 +4511,181 b' msgid ""'
4224 "disabled.\n"
4511 "disabled.\n"
4225 msgstr ""
4512 msgstr ""
4226
4513
4227 #, python-format
4228 msgid "type '%s' has no property '%s'"
4229 msgstr ""
4230
4231 msgid "warning: unable to write out fsmonitor state\n"
4514 msgid "warning: unable to write out fsmonitor state\n"
4232 msgstr ""
4515 msgstr ""
4233
4516
4517 msgid "try mapping git commands to Mercurial commands"
4518 msgstr ""
4519
4520 msgid "Tries to map a given git command to a Mercurial command:"
4521 msgstr ""
4522
4523 msgid ""
4524 " $ hg githelp -- git checkout master\n"
4525 " hg update master"
4526 msgstr ""
4527
4528 msgid ""
4529 "If an unknown command or parameter combination is detected, an error is\n"
4530 "produced.\n"
4531 msgstr ""
4532
4533 msgid "hg githelp"
4534 msgstr ""
4535
4536 msgid "suggests the Mercurial equivalent of the given git command"
4537 msgstr ""
4538
4539 msgid ""
4540 " Usage: hg githelp -- <git command>\n"
4541 " "
4542 msgstr ""
4543
4544 msgid "missing git command - usage: hg githelp -- <git command>"
4545 msgstr ""
4546
4547 #, fuzzy, python-format
4548 msgid "ignoring unknown option %s\n"
4549 msgstr "未知の改行形式 '%s' (%s 由来) を無視\n"
4550
4551 msgid ""
4552 "note: Mercurial will commit when complete, as there is no staging area in "
4553 "Mercurial"
4554 msgstr ""
4555
4556 msgid "note: use hg addremove to remove files that have been deleted."
4557 msgstr ""
4558
4559 #, fuzzy
4560 msgid "See 'hg help bisect' for how to use bisect."
4561 msgstr "詳細は 'hg help histedit' を参照"
4562
4563 msgid "Mercurial has no concept of upstream branches\n"
4564 msgstr ""
4565
4566 msgid "note: use --no-backup to avoid creating .orig files"
4567 msgstr ""
4568
4569 msgid "note: hg graft does not have --abort."
4570 msgstr ""
4571
4572 msgid ""
4573 "note: Mercurial does not have bare clones. -U will clone the repo without "
4574 "checking out a commit"
4575 msgstr ""
4576
4577 msgid ""
4578 "note: Mercurial doesn't have a staging area, so there is no --all. -A will "
4579 "add and remove files for you though."
4580 msgstr ""
4581
4582 msgid ""
4583 "This command has been deprecated in the git project, thus isn't supported by "
4584 "this tool."
4585 msgstr ""
4586
4587 msgid ""
4588 "note: Mercurial has no concept of a staging area, so --cached does nothing."
4589 msgstr ""
4590
4591 msgid ""
4592 "Mercurial does not enable external difftool by default. You need to enable "
4593 "the extdiff extension in your .hgrc file by adding\n"
4594 "extdiff =\n"
4595 "to the [extensions] section and then running"
4596 msgstr ""
4597
4598 msgid "hg extdiff -p <program>"
4599 msgstr ""
4600
4601 #, fuzzy
4602 msgid "See 'hg help extdiff' and 'hg help -e extdiff' for more information.\n"
4603 msgstr ""
4604 " 用法等の詳細は :hg:`help qnew` および :hg:`help record`\n"
4605 " を参照してください。"
4606
4607 msgid ""
4608 "note: Mercurial doesn't have refspecs. -r can be used to specify which "
4609 "commits you want to pull. -B can be used to specify which bookmark you want "
4610 "to pull."
4611 msgstr ""
4612
4613 msgid ""
4614 "note: -v prints the entire commit message like Git does. To print just the "
4615 "first line, drop the -v."
4616 msgstr ""
4617
4618 #, fuzzy
4619 msgid "note: see hg help revset for information on how to filter log output."
4620 msgstr " 衝突の扱いに関する詳細は :hg:`help resolve` を参照してください。"
4621
4622 msgid ""
4623 "note: --format format:??? equates to Mercurial's --template. See hg help "
4624 "templates for more info."
4625 msgstr ""
4626
4627 msgid ""
4628 "note: --pretty/format/oneline equate to Mercurial's --style or --template. "
4629 "See hg help templates for more info."
4630 msgstr ""
4631
4632 msgid "note: Mercurial doesn't have a staging area, ignoring --stage\n"
4633 msgstr ""
4634
4635 msgid "NOTE: ancestors() is part of the revset language.\n"
4636 msgstr ""
4637
4638 msgid "Learn more about revsets with 'hg help revsets'"
4639 msgstr ""
4640
4641 msgid ""
4642 "note: Mercurial doesn't have refspecs. -r can be used to specify which "
4643 "commits you want to push. -B can be used to specify which bookmark you want "
4644 "to push."
4645 msgstr ""
4646
4647 msgid "note: hg histedit does not perform a rebase. It just edits history."
4648 msgstr ""
4649
4650 msgid ""
4651 "also note: 'hg histedit' will automatically detect your stack, so no second "
4652 "argument is necessary."
4653 msgstr ""
4654
4655 msgid ""
4656 "note: if you're trying to lift a commit off one branch, try hg rebase -d "
4657 "<destination commit> -s <commit to be lifted>"
4658 msgstr ""
4659
4660 msgid ""
4661 "note: in hg commits can be deleted from repo but we always have backups.\n"
4662 msgstr ""
4663
4664 msgid "NOTE: --mixed has no meaning since Mercurial has no staging area"
4665 msgstr ""
4666
4667 msgid "NOTE: --soft has no meaning since Mercurial has no staging area"
4668 msgstr ""
4669
4670 msgid "note: hg backout doesn't support multiple commits at once"
4671 msgstr ""
4672
4673 #, fuzzy
4674 msgid "note: hg root prints the root of the repository"
4675 msgstr " 現リポジトリのルートディレクトリ位置を表示します。"
4676
4677 msgid "note: see hg help revset for how to refer to commits\n"
4678 msgstr ""
4679
4680 msgid ""
4681 "note: Mercurial doesn't have equivalents to the git stash branch, show, "
4682 "clear, or create actions."
4683 msgstr ""
4684
4685 #, fuzzy, python-format
4686 msgid "error: unknown git svn command %s\n"
4687 msgstr "hg: 未知のコマンド '%s'\n"
4688
4234 msgid "commands to sign and verify changesets"
4689 msgid "commands to sign and verify changesets"
4235 msgstr "リビジョンへの署名および検証コマンド"
4690 msgstr "リビジョンへの署名および検証コマンド"
4236
4691
@@ -4641,6 +5096,7 b' msgstr ""'
4641 " pick 030b686bedc4 Add gamma\n"
5096 " pick 030b686bedc4 Add gamma\n"
4642 " pick 7c2fd3b9020c Add delta"
5097 " pick 7c2fd3b9020c Add delta"
4643
5098
5099 #, fuzzy
4644 msgid ""
5100 msgid ""
4645 " # Edit history between c561b4e977df and 7c2fd3b9020c\n"
5101 " # Edit history between c561b4e977df and 7c2fd3b9020c\n"
4646 " #\n"
5102 " #\n"
@@ -4653,6 +5109,7 b' msgid ""'
4653 " # r, roll = like fold, but discard this commit's description and date\n"
5109 " # r, roll = like fold, but discard this commit's description and date\n"
4654 " # d, drop = remove commit from history\n"
5110 " # d, drop = remove commit from history\n"
4655 " # m, mess = edit commit message without changing commit content\n"
5111 " # m, mess = edit commit message without changing commit content\n"
5112 " # b, base = checkout changeset and apply further changesets from there\n"
4656 " #"
5113 " #"
4657 msgstr ""
5114 msgstr ""
4658 " # リビジョン c561b4e977df から 7c2fd3b9020c にかけての履歴の改変\n"
5115 " # リビジョン 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"'
4966 msgid "histedit"
5423 msgid "histedit"
4967 msgstr "histedit"
5424 msgstr "histedit"
4968
5425
5426 #, fuzzy, python-format
5427 msgid "invalid changeset %s"
5428 msgstr "リビジョン %s の展開中"
5429
4969 #, python-format
5430 #, python-format
4970 msgid "unknown changeset %s listed"
5431 msgid "unknown changeset %s listed"
4971 msgstr "未知のリビジョン %s が指定されました"
5432 msgstr "未知のリビジョン %s が指定されました"
@@ -5029,6 +5490,9 b' msgid ""'
5029 msgstr ""
5490 msgstr ""
5030 "%s: 併合できません - 作業領域は直前のコミット %s の子孫ではありません\n"
5491 "%s: 併合できません - 作業領域は直前のコミット %s の子孫ではありません\n"
5031
5492
5493 msgid "checkout changeset and apply further changesets from there"
5494 msgstr ""
5495
5032 #, python-format
5496 #, python-format
5033 msgid "%s \"%s\" changeset was an edited list candidate"
5497 msgid "%s \"%s\" changeset was an edited list candidate"
5034 msgstr "%s の適用対象が編集対象リビジョン \"%s\" です"
5498 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"'
5130 msgid " - `edit` to edit this changeset (preserving date)"
5594 msgid " - `edit` to edit this changeset (preserving date)"
5131 msgstr " - `edit` で変更内容を再編集 (日付は保持)"
5595 msgstr " - `edit` で変更内容を再編集 (日付は保持)"
5132
5596
5597 #, fuzzy
5598 msgid ""
5599 " - `base` to checkout changeset and apply further changesets from there"
5600 msgstr "リポジトリからの、 特定リビジョンおよびその子孫の除外"
5601
5133 msgid " There are a number of ways to select the root changeset:"
5602 msgid " There are a number of ways to select the root changeset:"
5134 msgstr " 改変対象リビジョンの指定には、 以下の様な方法があります:"
5603 msgstr " 改変対象リビジョンの指定には、 以下の様な方法があります:"
5135
5604
@@ -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"'
5359 msgid "warning: histedit rules saved to: .hg/histedit-last-edit.txt\n"
5828 msgid "warning: histedit rules saved to: .hg/histedit-last-edit.txt\n"
5360 msgstr "警告: histedit の操作指示は .hg/histedit-last-edit.txt に保存\n"
5829 msgstr "警告: histedit の操作指示は .hg/histedit-last-edit.txt に保存\n"
5361
5830
5831 #, fuzzy, python-format
5832 msgid "first changeset cannot use verb \"%s\""
5833 msgstr "リビジョン %s をそれ自身で廃止することはできません"
5834
5362 msgid "no rules provided"
5835 msgid "no rules provided"
5363 msgstr "処理内容指定が空です"
5836 msgstr "処理内容指定が空です"
5364
5837
@@ -5376,10 +5849,6 b' msgstr ""'
5376 "てください。"
5849 "てください。"
5377
5850
5378 #, python-format
5851 #, python-format
5379 msgid "histedit: moving bookmarks %s from %s to %s\n"
5380 msgstr "histedit: ブックマーク %s を %s から %s に移動中\n"
5381
5382 #, python-format
5383 msgid "histedit in progress, can't strip %s"
5852 msgid "histedit in progress, can't strip %s"
5384 msgstr "histedit による履歴改変が未完了のため、%s を除外できません"
5853 msgstr "histedit による履歴改変が未完了のため、%s を除外できません"
5385
5854
@@ -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"'
5401 msgid "hg histedit --continue"
5870 msgid "hg histedit --continue"
5402 msgstr "hg histedit --continue"
5871 msgstr "hg histedit --continue"
5403
5872
5404 msgid "checkout changeset and apply further changesets from there"
5873 #, fuzzy
5405 msgstr ""
5874 msgid " store some pushes in a remote blob store on the server (EXPERIMENTAL)"
5875 msgstr "共有元情報を相対パスで保持 (実験的実装)"
5876
5877 msgid ""
5878 " [infinitepush]\n"
5879 " # Server-side and client-side option. Pattern of the infinitepush "
5880 "bookmark\n"
5881 " branchpattern = PATTERN"
5882 msgstr ""
5883
5884 msgid ""
5885 " # Server or client\n"
5886 " server = False"
5887 msgstr ""
5888
5889 msgid ""
5890 " # Server-side option. Possible values: 'disk' or 'sql'. Fails if not "
5891 "set\n"
5892 " indextype = disk"
5893 msgstr ""
5894
5895 msgid ""
5896 " # Server-side option. Used only if indextype=sql.\n"
5897 " # Format: 'IP:PORT:DB_NAME:USER:PASSWORD'\n"
5898 " sqlhost = IP:PORT:DB_NAME:USER:PASSWORD"
5899 msgstr ""
5900
5901 msgid ""
5902 " # Server-side option. Used only if indextype=disk.\n"
5903 " # Filesystem path to the index store\n"
5904 " indexpath = PATH"
5905 msgstr ""
5906
5907 msgid ""
5908 " # Server-side option. Possible values: 'disk' or 'external'\n"
5909 " # Fails if not set\n"
5910 " storetype = disk"
5911 msgstr ""
5912
5913 msgid ""
5914 " # Server-side option.\n"
5915 " # Path to the binary that will save bundle to the bundlestore\n"
5916 " # Formatted cmd line will be passed to it (see `put_args`)\n"
5917 " put_binary = put"
5918 msgstr ""
5919
5920 msgid ""
5921 " # Serser-side option. Used only if storetype=external.\n"
5922 " # Format cmd-line string for put binary. Placeholder: {filename}\n"
5923 " put_args = {filename}"
5924 msgstr ""
5925
5926 msgid ""
5927 " # Server-side option.\n"
5928 " # Path to the binary that get bundle from the bundlestore.\n"
5929 " # Formatted cmd line will be passed to it (see `get_args`)\n"
5930 " get_binary = get"
5931 msgstr ""
5932
5933 msgid ""
5934 " # Serser-side option. Used only if storetype=external.\n"
5935 " # Format cmd-line string for get binary. Placeholders: {filename} "
5936 "{handle}\n"
5937 " get_args = {filename} {handle}"
5938 msgstr ""
5939
5940 msgid ""
5941 " # Server-side option\n"
5942 " logfile = FIlE"
5943 msgstr ""
5944
5945 msgid ""
5946 " # Server-side option\n"
5947 " loglevel = DEBUG"
5948 msgstr ""
5949
5950 msgid ""
5951 " # Server-side option. Used only if indextype=sql.\n"
5952 " # Sets mysql wait_timeout option.\n"
5953 " waittimeout = 300"
5954 msgstr ""
5955
5956 msgid ""
5957 " # Server-side option. Used only if indextype=sql.\n"
5958 " # Sets mysql innodb_lock_wait_timeout option.\n"
5959 " locktimeout = 120"
5960 msgstr ""
5961
5962 msgid ""
5963 " # Server-side option. Used only if indextype=sql.\n"
5964 " # Name of the repository\n"
5965 " reponame = ''"
5966 msgstr ""
5967
5968 msgid ""
5969 " # Client-side option. Used by --list-remote option. List of remote "
5970 "scratch\n"
5971 " # patterns to list if no patterns are specified.\n"
5972 " defaultremotepatterns = ['*']"
5973 msgstr ""
5974
5975 msgid ""
5976 " # Instructs infinitepush to forward all received bundle2 parts to the\n"
5977 " # bundle for storage. Defaults to False.\n"
5978 " storeallparts = True"
5979 msgstr ""
5980
5981 msgid ""
5982 " # routes each incoming push to the bundlestore. defaults to False\n"
5983 " pushtobundlestore = True"
5984 msgstr ""
5985
5986 msgid ""
5987 " [remotenames]\n"
5988 " # Client-side option\n"
5989 " # This option should be set only if remotenames extension is enabled.\n"
5990 " # Whether remote bookmarks are tracked by remotenames extension.\n"
5991 " bookmarks = True\n"
5992 msgstr ""
5993
5994 msgid "please set infinitepush.sqlhost"
5995 msgstr ""
5996
5997 msgid "please set infinitepush.reponame"
5998 msgstr ""
5999
6000 #, fuzzy, python-format
6001 msgid "invalid log level %s"
6002 msgstr "不正なローカルアドレス: %s"
6003
6004 #, fuzzy, python-format
6005 msgid "unknown infinitepush store type specified %s"
6006 msgstr "--type に未知のバンドル種別が指定されました"
6007
6008 #, fuzzy, python-format
6009 msgid "unknown infinitepush index type specified %s"
6010 msgstr "--type に未知のバンドル種別が指定されました"
6011
6012 #, fuzzy
6013 msgid "force push to go to bundle store (EXPERIMENTAL)"
6014 msgstr "表示対象リビジョン"
6015
6016 msgid "default repository not configured!"
6017 msgstr "デフォルトの連携先が設定されていません"
6018
6019 msgid "see 'hg help config.paths'"
6020 msgstr "詳細は 'hg help config.paths' 参照"
6021
6022 #, fuzzy
6023 msgid "infinitepush bookmark '{}' does not exist in path '{}'"
6024 msgstr "ブックマーク '%s' は存在しません"
6025
6026 msgid "no changes found\n"
6027 msgstr "差分はありません\n"
6028
6029 #, fuzzy
6030 msgid "storing changesets on the bundlestore\n"
6031 msgstr "連携先リポジトリに含まれないリビジョンの表示"
6032
6033 msgid "cannot push more than one head to a scratch branch"
6034 msgstr ""
6035
6036 #, fuzzy, python-format
6037 msgid "pushing %d commit%s:\n"
6038 msgstr "%s への反映中\n"
6039
6040 #, fuzzy
6041 msgid "no commits to push"
6042 msgstr "リビジョン指定は空です"
6043
6044 #, fuzzy, python-format
6045 msgid "no server support for %r"
6046 msgstr "%s 機能が未サポートです"
6047
6048 #, fuzzy
6049 msgid "nothing to push"
6050 msgstr "rebase の必要はありません"
5406
6051
5407 msgid "track previous positions of bookmarks (EXPERIMENTAL)"
6052 msgid "track previous positions of bookmarks (EXPERIMENTAL)"
5408 msgstr ""
6053 msgstr ""
@@ -6028,79 +6673,6 b' msgstr ""'
6028 "最初の大容量ファイルを追加登録する際には、 :hg:`add` に明示的に --large \n"
6673 "最初の大容量ファイルを追加登録する際には、 :hg:`add` に明示的に --large \n"
6029 "を指定する必要があります。\n"
6674 "を指定する必要があります。\n"
6030
6675
6031 msgid "convert a normal repository to a largefiles repository"
6032 msgstr "既存リポジトリから largefiles を利用するリポジトリへの変換"
6033
6034 msgid ""
6035 " Convert repository SOURCE to a new repository DEST, identical to\n"
6036 " SOURCE except that certain files will be converted as largefiles:\n"
6037 " specifically, any file that matches any PATTERN *or* whose size is\n"
6038 " above the minimum size threshold is converted as a largefile. The\n"
6039 " size used to determine whether or not to track a file as a\n"
6040 " largefile is the size of the first version of the file. The\n"
6041 " minimum size can be specified either with --size or in\n"
6042 " configuration as ``largefiles.size``."
6043 msgstr ""
6044 " リポジトリ SOURCE を変換し、 新規リポジトリ DEST を生成します。\n"
6045 " SOURCE に対する DEST の違いは、 指定パターンへの名前の合致、 または、\n"
6046 " 指定閾値以上のサイズのファイルが、 大容量ファイル扱いになっている、\n"
6047 " という点です。 大容量ファイル扱いの要否判定に使用するサイズ値には、\n"
6048 " 各ファイルが最初に登録された時点のサイズが使用されます。\n"
6049 " サイズ閾値の指定は、 --size か、 ``largefiles.size``\n"
6050 " 設定によって行います。"
6051
6052 msgid ""
6053 " After running this command you will need to make sure that\n"
6054 " largefiles is enabled anywhere you intend to push the new\n"
6055 " repository."
6056 msgstr ""
6057 " このコマンドの実施後は、 変換後リポジトリの連携先リポジトリでも、\n"
6058 " largefiles エクステンションが有効になっている事を確認してください。"
6059
6060 msgid ""
6061 " Use --to-normal to convert largefiles back to normal files; after\n"
6062 " this, the DEST repository can be used without largefiles at all."
6063 msgstr ""
6064 " largefiles エクステンションを使用しないリポジトリへの変換には、\n"
6065 " --to-normal を指定します。 変換後リポジトリは、 largefiles\n"
6066 " エクステンション無しでも使用できます。"
6067
6068 msgid "pull largefiles for the specified revisions from the specified source"
6069 msgstr "指定リビジョンに関連する大容量ファイルの取り込み"
6070
6071 msgid ""
6072 " Pull largefiles that are referenced from local changesets but missing\n"
6073 " locally, pulling from a remote repository to the local cache."
6074 msgstr ""
6075 " 作業中リポジトリ中にある指定リビジョンに関連する大容量ファイルのうち、\n"
6076 " 未取得のものを取り込み、 キャッシュ領域に保存します。"
6077
6078 msgid ""
6079 " If SOURCE is omitted, the 'default' path will be used.\n"
6080 " See :hg:`help urls` for more information."
6081 msgstr ""
6082 " 連携先が省略された場合、 'default' パスが連携先として使用されます。\n"
6083 " 詳細は :hg:`help urls` を参照してください。"
6084
6085 msgid " Some examples:"
6086 msgstr " 例:"
6087
6088 msgid " - pull largefiles for all branch heads::"
6089 msgstr " - 全名前付きブランチのヘッドに関連する大容量ファイルを取得::"
6090
6091 msgid " hg lfpull -r \"head() and not closed()\""
6092 msgstr " hg lfpull -r \"head() and not closed()\""
6093
6094 msgid " - pull largefiles on the default branch::"
6095 msgstr " - default ブランチのリビジョンに関連する大容量ファイルを取得::"
6096
6097 msgid ""
6098 " hg lfpull -r \"branch(default)\"\n"
6099 " "
6100 msgstr ""
6101 " hg lfpull -r \"branch(default)\"\n"
6102 " "
6103
6104 #, python-format
6676 #, python-format
6105 msgid "error getting id %s from url %s for file %s: %s\n"
6677 msgid "error getting id %s from url %s for file %s: %s\n"
6106 msgstr "識別子 %s (連携先 %s のファイル %s) に対するエラー: %s\n"
6678 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"'
6141 msgid "hg lfconvert SOURCE DEST [FILE ...]"
6713 msgid "hg lfconvert SOURCE DEST [FILE ...]"
6142 msgstr "hg lfconvert SOURCE DEST [FILE ...]"
6714 msgstr "hg lfconvert SOURCE DEST [FILE ...]"
6143
6715
6716 msgid "convert a normal repository to a largefiles repository"
6717 msgstr "既存リポジトリから largefiles を利用するリポジトリへの変換"
6718
6719 msgid ""
6720 " Convert repository SOURCE to a new repository DEST, identical to\n"
6721 " SOURCE except that certain files will be converted as largefiles:\n"
6722 " specifically, any file that matches any PATTERN *or* whose size is\n"
6723 " above the minimum size threshold is converted as a largefile. The\n"
6724 " size used to determine whether or not to track a file as a\n"
6725 " largefile is the size of the first version of the file. The\n"
6726 " minimum size can be specified either with --size or in\n"
6727 " configuration as ``largefiles.size``."
6728 msgstr ""
6729 " リポジトリ SOURCE を変換し、 新規リポジトリ DEST を生成します。\n"
6730 " SOURCE に対する DEST の違いは、 指定パターンへの名前の合致、 または、\n"
6731 " 指定閾値以上のサイズのファイルが、 大容量ファイル扱いになっている、\n"
6732 " という点です。 大容量ファイル扱いの要否判定に使用するサイズ値には、\n"
6733 " 各ファイルが最初に登録された時点のサイズが使用されます。\n"
6734 " サイズ閾値の指定は、 --size か、 ``largefiles.size``\n"
6735 " 設定によって行います。"
6736
6737 msgid ""
6738 " After running this command you will need to make sure that\n"
6739 " largefiles is enabled anywhere you intend to push the new\n"
6740 " repository."
6741 msgstr ""
6742 " このコマンドの実施後は、 変換後リポジトリの連携先リポジトリでも、\n"
6743 " largefiles エクステンションが有効になっている事を確認してください。"
6744
6745 msgid ""
6746 " Use --to-normal to convert largefiles back to normal files; after\n"
6747 " this, the DEST repository can be used without largefiles at all."
6748 msgstr ""
6749 " largefiles エクステンションを使用しないリポジトリへの変換には、\n"
6750 " --to-normal を指定します。 変換後リポジトリは、 largefiles\n"
6751 " エクステンション無しでも使用できます。"
6752
6144 #, python-format
6753 #, python-format
6145 msgid "%s is not a local Mercurial repo"
6754 msgid "%s is not a local Mercurial repo"
6146 msgstr "%s はローカルの Mercurial リポジトリではありません"
6755 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"'
6207 msgid "-r REV... [-e CMD] [--remotecmd CMD] [SOURCE]"
6816 msgid "-r REV... [-e CMD] [--remotecmd CMD] [SOURCE]"
6208 msgstr "-r REV... [-e CMD] [--remotecmd CMD] [SOURCE]"
6817 msgstr "-r REV... [-e CMD] [--remotecmd CMD] [SOURCE]"
6209
6818
6819 msgid "pull largefiles for the specified revisions from the specified source"
6820 msgstr "指定リビジョンに関連する大容量ファイルの取り込み"
6821
6822 msgid ""
6823 " Pull largefiles that are referenced from local changesets but missing\n"
6824 " locally, pulling from a remote repository to the local cache."
6825 msgstr ""
6826 " 作業中リポジトリ中にある指定リビジョンに関連する大容量ファイルのうち、\n"
6827 " 未取得のものを取り込み、 キャッシュ領域に保存します。"
6828
6829 msgid ""
6830 " If SOURCE is omitted, the 'default' path will be used.\n"
6831 " See :hg:`help urls` for more information."
6832 msgstr ""
6833 " 連携先が省略された場合、 'default' パスが連携先として使用されます。\n"
6834 " 詳細は :hg:`help urls` を参照してください。"
6835
6836 msgid " Some examples:"
6837 msgstr " 例:"
6838
6839 msgid " - pull largefiles for all branch heads::"
6840 msgstr " - 全名前付きブランチのヘッドに関連する大容量ファイルを取得::"
6841
6842 msgid " hg lfpull -r \"head() and not closed()\""
6843 msgstr " hg lfpull -r \"head() and not closed()\""
6844
6845 msgid " - pull largefiles on the default branch::"
6846 msgstr " - default ブランチのリビジョンに関連する大容量ファイルを取得::"
6847
6848 msgid ""
6849 " hg lfpull -r \"branch(default)\"\n"
6850 " "
6851 msgstr ""
6852 " hg lfpull -r \"branch(default)\"\n"
6853 " "
6854
6210 msgid "no revisions specified"
6855 msgid "no revisions specified"
6211 msgstr "リビジョン指定がありません"
6856 msgstr "リビジョン指定がありません"
6212
6857
6213 #, python-format
6858 #, fuzzy, python-format
6214 msgid "pulling largefiles for revision %s\n"
6859 msgid "pulling largefiles for revision %d\n"
6215 msgstr "リビジョン %s に関連する大容量ファイルの取得中\n"
6860 msgstr "リビジョン %s に関連する大容量ファイルの取得中\n"
6216
6861
6217 #, python-format
6862 #, 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"'
6483 msgid "download all versions of all largefiles"
7128 msgid "download all versions of all largefiles"
6484 msgstr "全リビジョンに関連する大容量ファイルを取得"
7129 msgstr "全リビジョンに関連する大容量ファイルを取得"
6485
7130
7131 #, fuzzy
7132 msgid "lfs - large file support (EXPERIMENTAL)"
7133 msgstr "当該テンプレートで表示をカスタマイズ (実験的実装)"
7134
7135 msgid ""
7136 "This extension allows large files to be tracked outside of the normal\n"
7137 "repository storage and stored on a centralized server, similar to the\n"
7138 "``largefiles`` extension. The ``git-lfs`` protocol is used when\n"
7139 "communicating with the server, so existing git infrastructure can be\n"
7140 "harnessed. Even though the files are stored outside of the repository,\n"
7141 "they are still integrity checked in the same manner as normal files."
7142 msgstr ""
7143
7144 msgid ""
7145 "The files stored outside of the repository are downloaded on demand,\n"
7146 "which reduces the time to clone, and possibly the local disk usage.\n"
7147 "This changes fundamental workflows in a DVCS, so careful thought\n"
7148 "should be given before deploying it. :hg:`convert` can be used to\n"
7149 "convert LFS repositories to normal repositories that no longer\n"
7150 "require this extension, and do so without changing the commit hashes.\n"
7151 "This allows the extension to be disabled if the centralized workflow\n"
7152 "becomes burdensome. However, the pre and post convert clones will\n"
7153 "not be able to communicate with each other unless the extension is\n"
7154 "enabled on both."
7155 msgstr ""
7156
7157 msgid ""
7158 "To start a new repository, or to add LFS files to an existing one, just\n"
7159 "create an ``.hglfs`` file as described below in the root directory of\n"
7160 "the repository. Typically, this file should be put under version\n"
7161 "control, so that the settings will propagate to other repositories with\n"
7162 "push and pull. During any commit, Mercurial will consult this file to\n"
7163 "determine if an added or modified file should be stored externally. The\n"
7164 "type of storage depends on the characteristics of the file at each\n"
7165 "commit. A file that is near a size threshold may switch back and forth\n"
7166 "between LFS and normal storage, as needed."
7167 msgstr ""
7168
7169 msgid ""
7170 "Alternately, both normal repositories and largefile controlled\n"
7171 "repositories can be converted to LFS by using :hg:`convert` and the\n"
7172 "``lfs.track`` config option described below. The ``.hglfs`` file\n"
7173 "should then be created and added, to control subsequent LFS selection.\n"
7174 "The hashes are also unchanged in this case. The LFS and non-LFS\n"
7175 "repositories can be distinguished because the LFS repository will\n"
7176 "abort any command if this extension is disabled."
7177 msgstr ""
7178
7179 msgid ""
7180 "Committed LFS files are held locally, until the repository is pushed.\n"
7181 "Prior to pushing the normal repository data, the LFS files that are\n"
7182 "tracked by the outgoing commits are automatically uploaded to the\n"
7183 "configured central server. No LFS files are transferred on\n"
7184 ":hg:`pull` or :hg:`clone`. Instead, the files are downloaded on\n"
7185 "demand as they need to be read, if a cached copy cannot be found\n"
7186 "locally. Both committing and downloading an LFS file will link the\n"
7187 "file to a usercache, to speed up future access. See the `usercache`\n"
7188 "config setting described below."
7189 msgstr ""
7190
7191 msgid ".hglfs::"
7192 msgstr ""
7193
7194 #, fuzzy
7195 msgid ""
7196 " The extension reads its configuration from a versioned ``.hglfs``\n"
7197 " configuration file found in the root of the working directory. The\n"
7198 " ``.hglfs`` file uses the same syntax as all other Mercurial\n"
7199 " configuration files. It uses a single section, ``[track]``."
7200 msgstr ""
7201 "本エクステンションは、 作業領域のルート直下のファイル ``.hgeol``\n"
7202 "(履歴管理可能) から設定を読み込みます。 ``.hgeol`` ファイルの文法は、\n"
7203 "他の Mercurial 設定ファイルと同じです。 本設定ファイルでは、\n"
7204 "``[patterns]`` と ``[repository]`` の2つのセクションを記述可能です。"
7205
7206 msgid ""
7207 " The ``[track]`` section specifies which files are stored as LFS (or\n"
7208 " not). Each line is keyed by a file pattern, with a predicate value.\n"
7209 " The first file pattern match is used, so put more specific patterns\n"
7210 " first. The available predicates are ``all()``, ``none()``, and\n"
7211 " ``size()``. See \"hg help filesets.size\" for the latter."
7212 msgstr ""
7213
7214 #, fuzzy
7215 msgid " Example versioned ``.hglfs`` file::"
7216 msgstr "``.hgeol`` ファイルの記述例::"
7217
7218 msgid ""
7219 " [track]\n"
7220 " # No Makefile or python file, anywhere, will be LFS\n"
7221 " **Makefile = none()\n"
7222 " **.py = none()"
7223 msgstr ""
7224
7225 msgid ""
7226 " **.zip = all()\n"
7227 " **.exe = size(\">1MB\")"
7228 msgstr ""
7229
7230 msgid ""
7231 " # Catchall for everything not matched above\n"
7232 " ** = size(\">10MB\")"
7233 msgstr ""
7234
7235 msgid "Configs::"
7236 msgstr ""
7237
7238 msgid ""
7239 " [lfs]\n"
7240 " # Remote endpoint. Multiple protocols are supported:\n"
7241 " # - http(s)://user:pass@example.com/path\n"
7242 " # git-lfs endpoint\n"
7243 " # - file:///tmp/path\n"
7244 " # local filesystem, usually for testing\n"
7245 " # if unset, lfs will assume the remote repository also handles blob "
7246 "storage\n"
7247 " # for http(s) URLs. Otherwise, lfs will prompt to set this when it "
7248 "must\n"
7249 " # use this value.\n"
7250 " # (default: unset)\n"
7251 " url = https://example.com/repo.git/info/lfs"
7252 msgstr ""
7253
7254 msgid ""
7255 " # Which files to track in LFS. Path tests are \"**.extname\" for file\n"
7256 " # extensions, and \"path:under/some/directory\" for path prefix. Both\n"
7257 " # are relative to the repository root.\n"
7258 " # File size can be tested with the \"size()\" fileset, and tests can be\n"
7259 " # joined with fileset operators. (See \"hg help filesets.operators\".)\n"
7260 " #\n"
7261 " # Some examples:\n"
7262 " # - all() # everything\n"
7263 " # - none() # nothing\n"
7264 " # - size(\">20MB\") # larger than 20MB\n"
7265 " # - !**.txt # anything not a *.txt file\n"
7266 " # - **.zip | **.tar.gz | **.7z # some types of compressed files\n"
7267 " # - path:bin # files under \"bin\" in the project "
7268 "root\n"
7269 " # - (**.php & size(\">2MB\")) | (**.js & size(\">5MB\")) | **.tar.gz\n"
7270 " # | (path:bin & !path:/bin/README) | size(\">1GB\")\n"
7271 " # (default: none())\n"
7272 " #\n"
7273 " # This is ignored if there is a tracked '.hglfs' file, and this setting\n"
7274 " # will eventually be deprecated and removed.\n"
7275 " track = size(\">10M\")"
7276 msgstr ""
7277
7278 msgid ""
7279 " # how many times to retry before giving up on transferring an object\n"
7280 " retry = 5"
7281 msgstr ""
7282
7283 msgid ""
7284 " # the local directory to store lfs files for sharing across local "
7285 "clones.\n"
7286 " # If not set, the cache is located in an OS specific cache location.\n"
7287 " usercache = /path/to/global/cache\n"
7288 msgstr ""
7289
7290 #, fuzzy, python-format
7291 msgid "parse error in .hglfs: %s"
7292 msgstr "hg: %s での解析エラー: %s\n"
7293
7294 #. i18n: "lfs" is a keyword
7295 #, fuzzy
7296 msgid "lfs takes no arguments"
7297 msgstr "all には引数が指定できません"
7298
7299 #, fuzzy
7300 msgid "upload large files introduced by REV"
7301 msgstr "大容量ファイルの転送中"
7302
7303 #, fuzzy
7304 msgid "upload lfs blobs added by the working copy parent or given revisions"
7305 msgstr "指定リビジョンへの署名の付与"
7306
7307 #, fuzzy, python-format
7308 msgid "corrupt remote lfs object: %s"
7309 msgstr "%r オブジェクトが %s から読み込めません"
7310
7311 #, fuzzy, python-format
7312 msgid "lfs: adding %s to the usercache\n"
7313 msgstr "パッチ %s を追加中\n"
7314
7315 #, fuzzy, python-format
7316 msgid "lfs: found %s in the usercache\n"
7317 msgstr "%s はシステムキャッシュに取得済み\n"
7318
7319 #, fuzzy, python-format
7320 msgid "lfs: found %s in the local lfs store\n"
7321 msgstr "%s はリポジトリに取得済み\n"
7322
7323 #, python-format
7324 msgid "LFS HTTP error: %s (action=%s)"
7325 msgstr ""
7326
7327 #, python-format
7328 msgid "LFS server returns invalid JSON: %s"
7329 msgstr ""
7330
7331 #, fuzzy, python-format
7332 msgid "LFS server error for \"%s\": %s"
7333 msgstr "hg: %s での解析エラー: %s\n"
7334
7335 #, python-format
7336 msgid "LFS server error. Unsolicited response for oid %s"
7337 msgstr ""
7338
7339 #, python-format
7340 msgid "detected corrupt lfs object: %s"
7341 msgstr ""
7342
7343 msgid "run hg verify"
7344 msgstr ""
7345
7346 #, fuzzy, python-format
7347 msgid "HTTP error: %s (oid=%s, action=%s)"
7348 msgstr "エラー: フック %s による例外発生: %s\n"
7349
7350 msgid "lfs uploading"
7351 msgstr ""
7352
7353 msgid "lfs downloading"
7354 msgstr ""
7355
7356 #, python-format
7357 msgid "lfs: need to transfer %d objects (%s)\n"
7358 msgstr ""
7359
7360 #, python-format
7361 msgid "lfs: downloading %s (%s)\n"
7362 msgstr ""
7363
7364 #, python-format
7365 msgid "lfs: uploading %s (%s)\n"
7366 msgstr ""
7367
7368 #, python-format
7369 msgid "lfs: failed: %r (remaining retry %d)\n"
7370 msgstr ""
7371
7372 #, fuzzy, python-format
7373 msgid "lfs: processed: %s\n"
7374 msgstr "履歴反映が拒否されました: %s"
7375
7376 #, python-format
7377 msgid "lfs: uploaded %d files (%s)\n"
7378 msgstr ""
7379
7380 #, fuzzy, python-format
7381 msgid "lfs: downloaded %d files (%s)\n"
7382 msgstr "%d ファイルを再リンク (%s バイトの節約)\n"
7383
7384 #, fuzzy
7385 msgid "lfs.url needs to be configured"
7386 msgstr "デフォルトの連携先が設定されていません"
7387
7388 #, fuzzy, python-format
7389 msgid "lfs: assuming remote store: %s\n"
7390 msgstr "連携先での新規ブックマーク %s を追加中\n"
7391
7392 #, fuzzy, python-format
7393 msgid "lfs: unknown url scheme: %s"
7394 msgstr "%s: 未知のバンドル機能 %s"
7395
7396 #, python-format
7397 msgid "cannot parse git-lfs text: %r"
7398 msgstr ""
7399
7400 #, fuzzy, python-format
7401 msgid "unexpected value: %s=%r"
7402 msgstr "%r に対する旧値の指定は想定外です"
7403
7404 #, fuzzy, python-format
7405 msgid "unexpected key: %s"
7406 msgstr "想定外の記述: %s"
7407
7408 #, fuzzy, python-format
7409 msgid "missed keys: %s"
7410 msgstr "定義位置: %s\n"
7411
7412 msgid "enable the lfs extension on the server"
7413 msgstr ""
7414
7415 #, python-format
7416 msgid "lfs: corrupted pointer (%s@%s): %s\n"
7417 msgstr ""
7418
7419 #, fuzzy, python-format
7420 msgid "copying lfs blob %s\n"
7421 msgstr "%s を %s にコピー中\n"
7422
6486 msgid "send ui.log() data to a subprocess (EXPERIMENTAL)"
7423 msgid "send ui.log() data to a subprocess (EXPERIMENTAL)"
6487 msgstr ""
7424 msgstr ""
6488
7425
@@ -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"'
8083 msgid "operate on patch repository"
9020 msgid "operate on patch repository"
8084 msgstr "パッチ管理リポジトリへの操作"
9021 msgstr "パッチ管理リポジトリへの操作"
8085
9022
9023 msgid ""
9024 "create clones which fetch history data for subset of files (EXPERIMENTAL)"
9025 msgstr ""
9026
9027 msgid "no common changegroup version"
9028 msgstr "利用可能な共通のバンドル形式バージョンがありません"
9029
9030 msgid ""
9031 "server does not advertise changegroup version, can't negotiate support for "
9032 "ellipsis nodes"
9033 msgstr ""
9034
9035 #, fuzzy, python-format
9036 msgid "depth must be positive, got %d"
9037 msgstr "制限には正数を指定してください"
9038
9039 msgid "{} configuration for user {} is empty"
9040 msgstr ""
9041
9042 msgid "The following includes are not accessible for {}: {}"
9043 msgstr ""
9044
9045 #, fuzzy, python-format
9046 msgid "unexpected changespec node chunk type: %s"
9047 msgstr "想定外の revspec フォーマット文字 %s"
9048
9049 msgid "adding branch\n"
9050 msgstr "ブランチを追加中\n"
9051
9052 #, python-format
9053 msgid "error removing %s: %s\n"
9054 msgstr "ファイル %s の破棄に失敗: %s\n"
9055
9056 msgid "uncompressed size of bundle content:\n"
9057 msgstr "バンドルファイル内容の非圧縮サイズ:\n"
9058
9059 msgid "changesets"
9060 msgstr "リビジョン"
9061
9062 #, python-format
9063 msgid "%8.i (changelog)\n"
9064 msgstr "%8.i (履歴情報)\n"
9065
9066 #, fuzzy
9067 msgid "create a narrow clone of select files"
9068 msgstr "バンドルファイルの生成"
9069
9070 msgid "limit the history fetched by distance from heads"
9071 msgstr ""
9072
9073 msgid "specifically fetch this file/directory"
9074 msgstr ""
9075
9076 msgid "do not fetch this file/directory, even if included"
9077 msgstr ""
9078
9079 #, fuzzy
9080 msgid "server doesn't support narrow clones"
9081 msgstr "連携先リポジトリはブックマークが未サポートです\n"
9082
9083 #, fuzzy
9084 msgid "looking for local changes to affected paths\n"
9085 msgstr "パッチ対象ファイルに対する作業領域中の変更を破棄"
9086
9087 msgid ""
9088 "The following changeset(s) or their ancestors have local changes not on the "
9089 "remote:\n"
9090 msgstr ""
9091
9092 #, python-format
9093 msgid "...and %d more, use --verbose to list all\n"
9094 msgstr ""
9095
9096 msgid "local changes found"
9097 msgstr "作業領域に変更があります"
9098
9099 msgid "use --force-delete-local-changes to ignore"
9100 msgstr ""
9101
9102 #, fuzzy, python-format
9103 msgid "deleting %s\n"
9104 msgstr "%s の復旧中\n"
9105
9106 #, fuzzy
9107 msgid "new paths to include"
9108 msgstr "当該テンプレートで表示をカスタマイズ"
9109
9110 #, fuzzy
9111 msgid "old paths to no longer include"
9112 msgstr "word にはインデックス値を数値で指定してください"
9113
9114 #, fuzzy
9115 msgid "new paths to exclude"
9116 msgstr "当該テンプレートで表示をカスタマイズ"
9117
9118 msgid "old paths to no longer exclude"
9119 msgstr ""
9120
9121 msgid "whether to replace the existing narrowspec"
9122 msgstr ""
9123
9124 msgid "forces deletion of local changes when narrowing"
9125 msgstr ""
9126
9127 #, fuzzy
9128 msgid "[OPTIONS]... [REMOTE]"
9129 msgstr "[OPTION]... [TEXT]"
9130
9131 #, fuzzy
9132 msgid "show or change the current narrowspec"
9133 msgstr "現行パッチの名前表示"
9134
9135 msgid ""
9136 " With no argument, shows the current narrowspec entries, one per line. "
9137 "Each\n"
9138 " line will be prefixed with 'I' or 'X' for included or excluded "
9139 "patterns,\n"
9140 " respectively."
9141 msgstr ""
9142
9143 msgid ""
9144 " The narrowspec is comprised of expressions to match remote files and/or\n"
9145 " directories that should be pulled into your client.\n"
9146 " The narrowspec has *include* and *exclude* expressions, with excludes "
9147 "always\n"
9148 " trumping includes: that is, if a file matches an exclude expression, it "
9149 "will\n"
9150 " be excluded even if it also matches an include expression.\n"
9151 " Excluding files that were never included has no effect."
9152 msgstr ""
9153
9154 msgid ""
9155 " Each included or excluded entry is in the format described by\n"
9156 " 'hg help patterns'."
9157 msgstr ""
9158
9159 msgid ""
9160 " The options allow you to add or remove included and excluded expressions."
9161 msgstr ""
9162
9163 msgid ""
9164 " If --clear is specified, then all previous includes and excludes are "
9165 "DROPPED\n"
9166 " and replaced by the new ones specified to --addinclude and --"
9167 "addexclude.\n"
9168 " If --clear is specified without any further options, the narrowspec will "
9169 "be\n"
9170 " empty and will not match any files.\n"
9171 " "
9172 msgstr ""
9173
9174 msgid ""
9175 "The narrow command is only supported on respositories cloned with --narrow.\n"
9176 msgstr ""
9177
9178 #, fuzzy
9179 msgid "The --clear option is not yet supported.\n"
9180 msgstr "圧縮形式 %s は未サポートです"
9181
9182 #, python-format
9183 msgid "cannot track '%s' - it is outside the narrow clone"
9184 msgstr ""
9185
9186 #, python-format
9187 msgid "merge affects file '%s' outside narrow, which is not yet supported"
9188 msgstr ""
9189
9190 msgid "merging in the other direction may work"
9191 msgstr ""
9192
9193 #, python-format
9194 msgid "conflict in file '%s' is outside narrow clone"
9195 msgstr ""
9196
9197 msgid "expanding narrowspec\n"
9198 msgstr ""
9199
8086 msgid "hooks for sending email push notifications"
9200 msgid "hooks for sending email push notifications"
8087 msgstr "電子メールによる push 通知送信用フック集"
9201 msgstr "電子メールによる push 通知送信用フック集"
8088
9202
@@ -8316,6 +9430,17 b' msgstr ""'
8316 " メール本文に含める、 差分情報の最大行数。 0 の場合は、 差分が含まれず、\n"
9430 " メール本文に含める、 差分情報の最大行数。 0 の場合は、 差分が含まれず、\n"
8317 " -1 の場合は、 全差分行が含まれます。 デフォルト値は 300。"
9431 " -1 の場合は、 全差分行が含まれます。 デフォルト値は 300。"
8318
9432
9433 #, fuzzy
9434 msgid ""
9435 "notify.maxdiffstat\n"
9436 " Maximum number of diffstat lines to include in notification email. Set to "
9437 "-1\n"
9438 " to include all of it. Default: -1."
9439 msgstr ""
9440 "notify.maxdiff\n"
9441 " メール本文に含める、 差分情報の最大行数。 0 の場合は、 差分が含まれず、\n"
9442 " -1 の場合は、 全差分行が含まれます。 デフォルト値は 300。"
9443
8319 msgid ""
9444 msgid ""
8320 "notify.maxsubject\n"
9445 "notify.maxsubject\n"
8321 " Maximum number of characters in email's subject line. Default: 67."
9446 " 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"'
8387 msgid "notify: sending %d subscribers %d changes\n"
9512 msgid "notify: sending %d subscribers %d changes\n"
8388 msgstr "notify: %d 購読者に %d 変更を送信中\n"
9513 msgstr "notify: %d 購読者に %d 変更を送信中\n"
8389
9514
9515 #, fuzzy, python-format
9516 msgid ""
9517 "\n"
9518 "diffstat (truncated from %d to %d lines):"
9519 msgstr ""
9520 "\n"
9521 "差分 (%d 行から %d 行に切り詰め):"
9522
8390 #, python-format
9523 #, python-format
8391 msgid ""
9524 msgid ""
8392 "\n"
9525 "\n"
@@ -8609,9 +9742,6 b' msgstr ""'
8609 msgid "this patch series consists of %d patches."
9742 msgid "this patch series consists of %d patches."
8610 msgstr "一連のパッチは %d 個のパッチから構成されています。"
9743 msgstr "一連のパッチは %d 個のパッチから構成されています。"
8611
9744
8612 msgid "no changes found\n"
8613 msgstr "差分はありません\n"
8614
8615 msgid "send patches as inline message text (default)"
9745 msgid "send patches as inline message text (default)"
8616 msgstr "インラインメッセージとしてパッチを送信 (デフォルト)"
9746 msgstr "インラインメッセージとしてパッチを送信 (デフォルト)"
8617
9747
@@ -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"'
8672 msgid "send changes not in target as a binary bundle"
9802 msgid "send changes not in target as a binary bundle"
8673 msgstr "対象リポジトリに無いリビジョンをバンドル形式で送信"
9803 msgstr "対象リポジトリに無いリビジョンをバンドル形式で送信"
8674
9804
9805 #, fuzzy
9806 msgid "send changes only reachable by given bookmark"
9807 msgstr "指定ブックマークから、 到達可能なリビジョンのみを除外"
9808
8675 msgid "name of the bundle attachment file"
9809 msgid "name of the bundle attachment file"
8676 msgstr "バンドル形式添付ファイルのファイル名"
9810 msgstr "バンドル形式添付ファイルのファイル名"
8677
9811
@@ -8748,6 +9882,11 b' msgstr ""'
8748 " インラインまたは通常の添付ファイルから、 選択することができます。"
9882 " インラインまたは通常の添付ファイルから、 選択することができます。"
8749
9883
8750 msgid ""
9884 msgid ""
9885 " With -B/--bookmark changesets reachable by the given bookmark are\n"
9886 " selected."
9887 msgstr ""
9888
9889 msgid ""
8751 " With -o/--outgoing, emails will be generated for patches not found\n"
9890 " With -o/--outgoing, emails will be generated for patches not found\n"
8752 " in the destination repository (or only those which are ancestors\n"
9891 " in the destination repository (or only those which are ancestors\n"
8753 " of the specified revisions if any are provided)"
9892 " of the specified revisions if any are provided)"
@@ -8827,6 +9966,10 b' msgstr ""'
8827 " hg email -o -r 3000 DEST # 3000 以前で DEST 側に無いリビジョン"
9966 " hg email -o -r 3000 DEST # 3000 以前で DEST 側に無いリビジョン"
8828
9967
8829 msgid ""
9968 msgid ""
9969 " hg email -B feature # send all ancestors of feature bookmark"
9970 msgstr ""
9971
9972 msgid ""
8830 " hg email -b # send bundle of all patches not in default\n"
9973 " hg email -b # send bundle of all patches not in default\n"
8831 " hg email -b DEST # send bundle of all patches not in DEST\n"
9974 " hg email -b DEST # send bundle of all patches not in DEST\n"
8832 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
9975 " hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
@@ -8863,12 +10006,17 b' msgstr ""'
8863 " を参照してください。 (※ 訳注: :hg:`help config` でも参照可能)\n"
10006 " を参照してください。 (※ 訳注: :hg:`help config` でも参照可能)\n"
8864 " "
10007 " "
8865
10008
8866 msgid "specify at least one changeset with -r or -o"
10009 #, fuzzy
10010 msgid "specify at least one changeset with -B, -r or -o"
8867 msgstr "-r 又は -o を使用してリビジョンを指定してください"
10011 msgstr "-r 又は -o を使用してリビジョンを指定してください"
8868
10012
8869 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
10013 msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing"
8870 msgstr "--bundle 指定で暗黙に有効となりますので --outgoing 指定は不要です"
10014 msgstr "--bundle 指定で暗黙に有効となりますので --outgoing 指定は不要です"
8871
10015
10016 #, fuzzy
10017 msgid "-r and -B are mutually exclusive"
10018 msgstr "--message と --logfile は同時に指定できません"
10019
8872 msgid "too many destinations"
10020 msgid "too many destinations"
8873 msgstr "対象指定が多過ぎです"
10021 msgstr "対象指定が多過ぎです"
8874
10022
@@ -8876,6 +10024,10 b' msgid "use only one form to specify the '
8876 msgstr "リビジョン指定は単一の形式で行ってください"
10024 msgstr "リビジョン指定は単一の形式で行ってください"
8877
10025
8878 #, python-format
10026 #, python-format
10027 msgid "bookmark '%s' not found"
10028 msgstr "ブックマーク '%s' がありません"
10029
10030 #, python-format
8879 msgid "unable to access public repo: %s\n"
10031 msgid "unable to access public repo: %s\n"
8880 msgstr "publicurl で指定された公開リポジトリにアクセスできません: %s\n"
10032 msgstr "publicurl で指定された公開リポジトリにアクセスできません: %s\n"
8881
10033
@@ -9043,6 +10195,10 b' msgstr ""'
9043 "詳細は以下を参照してください:\n"
10195 "詳細は以下を参照してください:\n"
9044 "https://mercurial-scm.org/wiki/RebaseExtension\n"
10196 "https://mercurial-scm.org/wiki/RebaseExtension\n"
9045
10197
10198 #, python-format
10199 msgid "ambiguous automatic rebase: %r could end up on any of %r"
10200 msgstr ""
10201
9046 msgid "rebase"
10202 msgid "rebase"
9047 msgstr "rebase"
10203 msgstr "rebase"
9048
10204
@@ -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"'
9071 msgid "can't rebase public changeset %s"
10227 msgid "can't rebase public changeset %s"
9072 msgstr "public フェーズのリビジョン %s は移動できません"
10228 msgstr "public フェーズのリビジョン %s は移動できません"
9073
10229
10230 #, fuzzy
10231 msgid "--collapse does not work with multiple destinations"
10232 msgstr "p4 形式からの変換では、複数リビジョン指定は未サポートです"
10233
9074 #, python-format
10234 #, python-format
9075 msgid "reopening closed branch head %s\n"
10235 msgid "reopening closed branch head %s\n"
9076 msgstr "閉鎖済みブランチヘッド %s の閉鎖状態を解除中\n"
10236 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"'
9078 msgid "cannot collapse multiple named branches"
10238 msgid "cannot collapse multiple named branches"
9079 msgstr "複数の名前付きブランチの単一化はできません"
10239 msgstr "複数の名前付きブランチの単一化はできません"
9080
10240
10241 msgid "rebasing"
10242 msgstr "移動中"
10243
10244 msgid "rebase merging completed\n"
10245 msgstr "移動のマージ処理が完了\n"
10246
10247 #, fuzzy, python-format
10248 msgid "already rebased %s\n"
10249 msgstr "%s は %s として移動済みです\n"
10250
10251 #, fuzzy, python-format
10252 msgid ""
10253 "note: not rebasing %s and its descendants as this would cause divergence\n"
10254 msgstr "備考: %s は既に %s として移動済みなので移動しません\n"
10255
10256 #, python-format
10257 msgid "note: not rebasing %s, it has no successor\n"
10258 msgstr "備考: 廃止済みで後継リビジョンを持たない %s は移動しません\n"
10259
10260 #, python-format
10261 msgid "note: not rebasing %s, already in destination as %s\n"
10262 msgstr "備考: %s は既に %s として移動済みなので移動しません\n"
10263
9081 #, python-format
10264 #, python-format
9082 msgid "rebasing %s\n"
10265 msgid "rebasing %s\n"
9083 msgstr "リビジョン '%s' を移動中\n"
10266 msgstr "リビジョン '%s' を移動中\n"
9084
10267
9085 msgid "rebasing"
9086 msgstr "移動中"
9087
9088 msgid "changesets"
9089 msgstr "リビジョン"
9090
9091 msgid "unresolved conflicts (see hg resolve, then hg rebase --continue)"
10268 msgid "unresolved conflicts (see hg resolve, then hg rebase --continue)"
9092 msgstr ""
10269 msgstr ""
9093 "衝突が未解消です ('hg resolve' での衝突解消後に、'hg rebase --continue' を実"
10270 "衝突が未解消です ('hg resolve' での衝突解消後に、'hg rebase --continue' を実"
@@ -9098,24 +10275,9 b' msgid "note: rebase of %d:%s created no '
9098 msgstr "備考: リビジョン %d:%s は移動先で空になるため無視されます\n"
10275 msgstr "備考: リビジョン %d:%s は移動先で空になるため無視されます\n"
9099
10276
9100 #, python-format
10277 #, python-format
9101 msgid "not rebasing ignored %s\n"
9102 msgstr "無視対象のリビジョン '%s' は移動されません\n"
9103
9104 #, python-format
9105 msgid "note: not rebasing %s, already in destination as %s\n"
9106 msgstr "備考: %s は既に %s として移動済みなので移動しません\n"
9107
9108 #, python-format
9109 msgid "note: not rebasing %s, it has no successor\n"
9110 msgstr "備考: 廃止済みで後継リビジョンを持たない %s は移動しません\n"
9111
9112 #, python-format
9113 msgid "already rebased %s as %s\n"
10278 msgid "already rebased %s as %s\n"
9114 msgstr "%s は %s として移動済みです\n"
10279 msgstr "%s は %s として移動済みです\n"
9115
10280
9116 msgid "rebase merging completed\n"
9117 msgstr "移動のマージ処理が完了\n"
9118
9119 msgid "update back to initial working directory parent\n"
10281 msgid "update back to initial working directory parent\n"
9120 msgstr "移動先の親リビジョンで作業領域を更新\n"
10282 msgstr "移動先の親リビジョンで作業領域を更新\n"
9121
10283
@@ -9126,49 +10288,6 b' msgstr "\xe7\xa7\xbb\xe5\x8b\x95\xe5\xae\x8c\xe4\xba\x86\\n"'
9126 msgid "%d revisions have been skipped\n"
10288 msgid "%d revisions have been skipped\n"
9127 msgstr "%d 個のリビジョンをスキップ\n"
10289 msgstr "%d 個のリビジョンをスキップ\n"
9128
10290
9129 msgid "rebase the specified changeset and descendants"
9130 msgstr "指定リビジョンとその子孫の移動"
9131
9132 msgid "rebase everything from branching point of specified changeset"
9133 msgstr "指定リビジョンの枝分かれ元以降のリビジョンの移動"
9134
9135 msgid "rebase these revisions"
9136 msgstr "指定リビジョン群の移動"
9137
9138 msgid "rebase onto the specified changeset"
9139 msgstr "移動先リビジョン"
9140
9141 msgid "collapse the rebased changesets"
9142 msgstr "移動後に移動リビジョンを単一化"
9143
9144 msgid "use text as collapse commit message"
9145 msgstr "指定テキストを要約コミットログとして使用"
9146
9147 msgid "read collapse commit message from file"
9148 msgstr "要約コミットログをファイルから読み込み"
9149
9150 msgid "keep original changesets"
9151 msgstr "元リビジョンを維持"
9152
9153 msgid "keep original branch names"
9154 msgstr "元ブランチ名を維持"
9155
9156 #. i18n: "(DEPRECATED)" is a keyword, must be translated consistently
9157 msgid "(DEPRECATED)"
9158 msgstr "(非推奨)"
9159
9160 msgid "specify merge tool"
9161 msgstr "マージツールの指定"
9162
9163 msgid "continue an interrupted rebase"
9164 msgstr "中断された未完了の移動を再開"
9165
9166 msgid "abort an interrupted rebase"
9167 msgstr "中断による未完了な移動の情報を破棄(=中止)"
9168
9169 msgid "[-s REV | -b REV] [-d REV] [OPTION]"
9170 msgstr "[-s REV | -b REV] [-d REV] [OPTION]"
9171
9172 msgid "move changeset (and descendants) to a different branch"
10291 msgid "move changeset (and descendants) to a different branch"
9173 msgstr "別な履歴位置へのリビジョン(およびその子孫)の移動"
10292 msgstr "別な履歴位置へのリビジョン(およびその子孫)の移動"
9174
10293
@@ -9234,6 +10353,14 b' msgstr ""'
9234 " ``--base .`` 相当の指定で移動を実施"
10353 " ``--base .`` 相当の指定で移動を実施"
9235
10354
9236 msgid ""
10355 msgid ""
10356 " If ``--source`` or ``--rev`` is used, special names ``SRC`` and "
10357 "``ALLSRC``\n"
10358 " can be used in ``--dest``. Destination would be calculated per source\n"
10359 " revision with ``SRC`` substituted by that single source revision and\n"
10360 " ``ALLSRC`` substituted by all source revisions."
10361 msgstr ""
10362
10363 msgid ""
9237 " Rebase will destroy original changesets unless you use ``--keep``.\n"
10364 " Rebase will destroy original changesets unless you use ``--keep``.\n"
9238 " It will also move your bookmarks (even if you do)."
10365 " It will also move your bookmarks (even if you do)."
9239 msgstr ""
10366 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::"'
9327 msgid " hg rebase -r \"branch(featureX)\" -d 1.3 --keepbranches"
10454 msgid " hg rebase -r \"branch(featureX)\" -d 1.3 --keepbranches"
9328 msgstr " hg rebase -r \"branch(featureX)\" -d 1.3 --keepbranches"
10455 msgstr " hg rebase -r \"branch(featureX)\" -d 1.3 --keepbranches"
9329
10456
10457 msgid " - stabilize orphaned changesets so history looks linear::"
10458 msgstr ""
10459
10460 msgid ""
10461 " hg rebase -r 'orphan()-obsolete()' -d "
10462 "'first(max((successors(max(roots(ALLSRC) & ::SRC)^)-obsolete())::) + max(::"
10463 "((roots(ALLSRC) & ::SRC)^)-obsolete()))'"
10464 msgstr ""
10465
9330 msgid " Configuration Options:"
10466 msgid " Configuration Options:"
9331 msgstr " 設定項目:"
10467 msgstr " 設定項目:"
9332
10468
10469 #, fuzzy
9333 msgid ""
10470 msgid ""
9334 " You can make rebase require a destination if you set the following "
10471 " You can make rebase require a destination if you set the following "
9335 "config\n"
10472 "config\n"
9336 " option:"
10473 " option::"
9337 msgstr ""
10474 msgstr ""
9338 " 以下の項目を設定することで、 rebase 時の移動先指定を必須化できます:"
10475 " 以下の項目を設定することで、 rebase 時の移動先指定を必須化できます:"
9339
10476
9340 msgid ""
10477 msgid ""
9341 " [commands]\n"
10478 " [commands]\n"
9342 " rebase.requiredest = False"
10479 " rebase.requiredest = True"
9343 msgstr ""
10480 msgstr ""
10481
10482 #, fuzzy
10483 msgid ""
10484 " By default, rebase will close the transaction after each commit. For\n"
10485 " performance purposes, you can configure rebase to use a single "
10486 "transaction\n"
10487 " across the entire rebase. WARNING: This setting introduces a "
10488 "significant\n"
10489 " risk of losing the work you've done in a rebase if the rebase aborts\n"
10490 " unexpectedly::"
10491 msgstr ""
10492 "特に指定が無い場合、 個々の処理毎に、 トランザクションが作成されます。\n"
10493 "実行性能の観点から、 単一トランザクションでの histedit 実行も可能です。\n"
10494 "警告: histedit が予期せず中断した場合、 作業内容を失うかもしれない、\n"
10495 "深刻な危険性を持つ設定ですので、 設定の際は注意してください::"
10496
10497 #, fuzzy
10498 msgid ""
10499 " [rebase]\n"
10500 " singletransaction = True"
10501 msgstr ""
10502 " [histedit]\n"
10503 " singletransaction = True"
10504
10505 msgid ""
10506 " By default, rebase writes to the working copy, but you can configure it "
10507 "to\n"
10508 " run in-memory for for better performance, and to allow it to run if the\n"
10509 " working copy is dirty::"
10510 msgstr ""
10511
10512 #, fuzzy
10513 msgid ""
10514 " [rebase]\n"
10515 " experimental.inmemory = True"
10516 msgstr ""
10517 " [histedit]\n"
10518 " singletransaction = True"
9344
10519
9345 msgid " Return Values:"
10520 msgid " Return Values:"
9346 msgstr " コマンド終了値:"
10521 msgstr " コマンド終了値:"
@@ -9352,6 +10527,60 b' msgstr ""'
9352 " 成功時のコマンド終了値は 0、 移動が必要なリビジョンが無い場合や、\n"
10527 " 成功時のコマンド終了値は 0、 移動が必要なリビジョンが無い場合や、\n"
9353 " 未解消の衝突が発生した場合は 1 です。"
10528 " 未解消の衝突が発生した場合は 1 です。"
9354
10529
10530 msgid "rebase the specified changeset and descendants"
10531 msgstr "指定リビジョンとその子孫の移動"
10532
10533 msgid "rebase everything from branching point of specified changeset"
10534 msgstr "指定リビジョンの枝分かれ元以降のリビジョンの移動"
10535
10536 msgid "rebase these revisions"
10537 msgstr "指定リビジョン群の移動"
10538
10539 msgid "rebase onto the specified changeset"
10540 msgstr "移動先リビジョン"
10541
10542 msgid "collapse the rebased changesets"
10543 msgstr "移動後に移動リビジョンを単一化"
10544
10545 msgid "use text as collapse commit message"
10546 msgstr "指定テキストを要約コミットログとして使用"
10547
10548 msgid "read collapse commit message from file"
10549 msgstr "要約コミットログをファイルから読み込み"
10550
10551 msgid "keep original changesets"
10552 msgstr "元リビジョンを維持"
10553
10554 msgid "keep original branch names"
10555 msgstr "元ブランチ名を維持"
10556
10557 #. i18n: "(DEPRECATED)" is a keyword, must be translated consistently
10558 msgid "(DEPRECATED)"
10559 msgstr "(非推奨)"
10560
10561 msgid "specify merge tool"
10562 msgstr "マージツールの指定"
10563
10564 msgid "continue an interrupted rebase"
10565 msgstr "中断された未完了の移動を再開"
10566
10567 msgid "abort an interrupted rebase"
10568 msgstr "中断による未完了な移動の情報を破棄(=中止)"
10569
10570 msgid ""
10571 "automatically rebase orphan revisions in the specified revset (EXPERIMENTAL)"
10572 msgstr ""
10573
10574 msgid "[-s REV | -b REV] [-d REV] [OPTION]"
10575 msgstr "[-s REV | -b REV] [-d REV] [OPTION]"
10576
10577 #, fuzzy, python-format
10578 msgid "--auto-orphans is incompatible with %s"
10579 msgstr "-G/--graph と --%s は併用できません"
10580
10581 msgid "hit merge conflicts; re-running rebase without in-memory merge\n"
10582 msgstr ""
10583
9355 #, python-format
10584 #, python-format
9356 msgid ""
10585 msgid ""
9357 "interactive history editing is supported by the 'histedit' extension (see "
10586 "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"'
9420 msgid "nothing to rebase from %s to %s\n"
10649 msgid "nothing to rebase from %s to %s\n"
9421 msgstr "%s から %s への移動は不要です\n"
10650 msgstr "%s から %s への移動は不要です\n"
9422
10651
9423 #, python-format
10652 #, fuzzy, python-format
9424 msgid ""
10653 msgid "skipping %s - empty destination\n"
9425 "unable to collapse on top of %s, there is more than one external parent: %s"
10654 msgstr "%s を抑止 - ガード %s が適用されました\n"
10655
10656 #, fuzzy, python-format
10657 msgid "rebase destination for %s is not unique"
10658 msgstr "複製先 '%s' は空ではありません"
10659
10660 #, fuzzy
10661 msgid "nothing to rebase - empty destination\n"
10662 msgstr "移動操作は不要です - 作業領域の更新のみを実施します\n"
10663
10664 #, fuzzy, python-format
10665 msgid ""
10666 "unable to collapse on top of %d, there is more than one external parent: %s"
9426 msgstr ""
10667 msgstr ""
9427 "%s への移動で単一化できません。移動対象外の複数の祖先が内容に影響します: %s"
10668 "%s への移動で単一化できません。移動対象外の複数の祖先が内容に影響します: %s"
9428
10669
@@ -9430,15 +10671,27 b' msgstr ""'
9430 msgid "this rebase will cause divergences from: %s"
10671 msgid "this rebase will cause divergences from: %s"
9431 msgstr "この移動操作は %s からの分岐 (divergence) を生じます"
10672 msgstr "この移動操作は %s からの分岐 (divergence) を生じます"
9432
10673
9433 msgid "to force the rebase please set experimental.allowdivergence=True"
10674 #, fuzzy
10675 msgid ""
10676 "to force the rebase please set experimental.evolution.allowdivergence=True"
9434 msgstr "移動を強制する場合は experimental.allowdivergence=True 設定が必要です"
10677 msgstr "移動を強制する場合は experimental.allowdivergence=True 設定が必要です"
9435
10678
9436 #, python-format
10679 #, python-format
9437 msgid "cannot use revision %d as base, result would have 3 parents"
10680 msgid "cannot rebase %d:%s without moving at least one of its parents"
9438 msgstr "親リビジョンが 3 つになるので、 リビジョン %d をベースにできません"
10681 msgstr ""
9439
10682
9440 #, python-format
10683 msgid "source is ancestor of destination"
9441 msgid "updating mq patch %s to %s:%s\n"
10684 msgstr "移動元は移動先の祖先です"
10685
10686 msgid " or "
10687 msgstr ""
10688
10689 #, python-format
10690 msgid "rebasing %d:%s will include unwanted changes from %s"
10691 msgstr ""
10692
10693 #, fuzzy, python-format
10694 msgid "updating mq patch %s to %d:%s\n"
9442 msgstr "mq パッチ %s をリビジョン %s:%s に移動中\n"
10695 msgstr "mq パッチ %s をリビジョン %s:%s に移動中\n"
9443
10696
9444 msgid "missing .hg/last-message.txt for rebase"
10697 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"'
9448 msgid "warning: can't clean up public changesets %s\n"
10701 msgid "warning: can't clean up public changesets %s\n"
9449 msgstr "警告: public フェーズのリビジョン %s は破棄できません\n"
10702 msgstr "警告: public フェーズのリビジョン %s は破棄できません\n"
9450
10703
9451 msgid "warning: new changesets detected on target branch, can't strip\n"
10704 #, fuzzy
10705 msgid "warning: new changesets detected on destination branch, can't strip\n"
9452 msgstr "警告: 想定外の新規リビジョン追加により、対象ブランチを破棄できません\n"
10706 msgstr "警告: 想定外の新規リビジョン追加により、対象ブランチを破棄できません\n"
9453
10707
9454 msgid "rebase aborted\n"
10708 msgid "rebase aborted\n"
9455 msgstr "移動が中止されました\n"
10709 msgstr "移動が中止されました\n"
9456
10710
10711 #, fuzzy
10712 msgid "source and destination form a cycle"
10713 msgstr "パッチ対象のファイル名が指定されていません"
10714
9457 msgid "cannot rebase onto an applied mq patch"
10715 msgid "cannot rebase onto an applied mq patch"
9458 msgstr "MQ パッチ上への移動はできません"
10716 msgstr "MQ パッチ上への移動はできません"
9459
10717
9460 msgid "no matching revisions"
10718 msgid "no matching revisions"
9461 msgstr "合致するリビジョンはありません"
10719 msgstr "合致するリビジョンはありません"
9462
10720
9463 msgid "source is ancestor of destination"
9464 msgstr "移動元は移動先の祖先です"
9465
9466 msgid "warning: new changesets detected on source branch, not stripping\n"
9467 msgstr "警告: 移動元に新規リビジョンを検出したので、 破棄しません\n"
9468
9469 msgid "rebase destination required by configuration"
10721 msgid "rebase destination required by configuration"
9470 msgstr "設定により移動先リビジョン指定が必須となっています"
10722 msgstr "設定により移動先リビジョン指定が必須となっています"
9471
10723
@@ -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"'
9601 msgid "interactively select changes to refresh"
10853 msgid "interactively select changes to refresh"
9602 msgstr "パッチ更新内容を対話的に選択"
10854 msgstr "パッチ更新内容を対話的に選択"
9603
10855
10856 #, fuzzy
10857 msgid "generate release notes from commit messages (EXPERIMENTAL)"
10858 msgstr "操作対象変更の対話的な選択 (実験的実装)"
10859
10860 msgid ""
10861 "It is common to maintain files detailing changes in a project between\n"
10862 "releases. Maintaining these files can be difficult and time consuming.\n"
10863 "The :hg:`releasenotes` command provided by this extension makes the\n"
10864 "process simpler by automating it.\n"
10865 msgstr ""
10866
10867 msgid "New Features"
10868 msgstr ""
10869
10870 msgid "Backwards Compatibility Changes"
10871 msgstr ""
10872
10873 msgid "Bug Fixes"
10874 msgstr ""
10875
10876 msgid "Performance Improvements"
10877 msgstr ""
10878
10879 #, fuzzy
10880 msgid "API Changes"
10881 msgstr "changegroups フォーマット"
10882
10883 #, fuzzy
10884 msgid "Other Changes"
10885 msgstr "ハッシュ値を表示"
10886
10887 msgid ""
10888 "module 'fuzzywuzzy' not found, merging of similar releasenotes is disabled\n"
10889 msgstr ""
10890
10891 #, fuzzy, python-format
10892 msgid "%s already exists in %s section; ignoring\n"
10893 msgstr "\"%s\" はディレクトリとして既に存在します"
10894
10895 #, fuzzy, python-format
10896 msgid "\"%s\" already exists in notes; ignoring\n"
10897 msgstr "\"%s\" はディレクトリとして既に存在します"
10898
10899 #, fuzzy, python-format
10900 msgid "\"%s\" already exists in notes file; ignoring\n"
10901 msgstr "\"%s\" はディレクトリとして既に存在します"
10902
10903 #, fuzzy, python-format
10904 msgid ".hgreleasenotes file '%s' not found"
10905 msgstr "サブリポジトリの spec ファイル '%s' が見つかりません"
10906
10907 #, python-format
10908 msgid "Invalid admonition '%s' present in changeset %s\n"
10909 msgstr ""
10910
10911 #, python-format
10912 msgid "(did you mean %s?)\n"
10913 msgstr "(推測される候補: %s)\n"
10914
10915 #, python-format
10916 msgid "(did you mean one of %s?)\n"
10917 msgstr "(推測される候補: %s)\n"
10918
10919 #, fuzzy, python-format
10920 msgid "changeset %s: release notes directive %s lacks content"
10921 msgstr "想定外の revspec フォーマット文字 %s"
10922
10923 #, fuzzy, python-format
10924 msgid "changeset %s: unexpected block in release notes directive %s\n"
10925 msgstr "想定外の revspec フォーマット文字 %s"
10926
10927 #, fuzzy, python-format
10928 msgid "error parsing releasenotes for revision: '%s'\n"
10929 msgstr "リビジョン %s に関連する大容量ファイルの取得中\n"
10930
10931 #, fuzzy
10932 msgid "indented bullet lists not supported"
10933 msgstr "addremove は未サポートです"
10934
10935 #, fuzzy, python-format
10936 msgid "unexpected block type in release notes: %s"
10937 msgstr "想定外の連携先リポジトリ応答: %s"
10938
10939 #, fuzzy, python-format
10940 msgid "unknown release notes section: %s"
10941 msgstr "未知のストリーム圧縮形式です: %s"
10942
10943 #, fuzzy, python-format
10944 msgid "unsupported section type for %s"
10945 msgstr "未サポートの行末種別: %s"
10946
10947 msgid "revisions to process for release notes"
10948 msgstr ""
10949
10950 msgid "checks for validity of admonitions (if any)"
10951 msgstr ""
10952
10953 msgid "list the available admonitions with their title"
10954 msgstr ""
10955
10956 #, fuzzy
10957 msgid "hg releasenotes [-r REV] [-c] FILE"
10958 msgstr "hg children [-r REV] [FILE]"
10959
10960 msgid "parse release notes from commit messages into an output file"
10961 msgstr ""
10962
10963 msgid ""
10964 " Given an output file and set of revisions, this command will parse "
10965 "commit\n"
10966 " messages for release notes then add them to the output file."
10967 msgstr ""
10968
10969 msgid ""
10970 " Release notes are defined in commit messages as ReStructuredText\n"
10971 " directives. These have the form::"
10972 msgstr ""
10973
10974 #. do not translate: .. directive::
10975 msgid " .. directive:: title"
10976 msgstr ""
10977
10978 #, fuzzy
10979 msgid " content"
10980 msgstr " hg bisect --reset"
10981
10982 msgid ""
10983 " Each ``directive`` maps to an output section in a generated release "
10984 "notes\n"
10985 " file, which itself is ReStructuredText. For example, the ``.. feature::"
10986 "``\n"
10987 " directive would map to a ``New Features`` section."
10988 msgstr ""
10989
10990 msgid ""
10991 " Release note directives can be either short-form or long-form. In "
10992 "short-\n"
10993 " form, ``title`` is omitted and the release note is rendered as a bullet\n"
10994 " list. In long form, a sub-section with the title ``title`` is added to "
10995 "the\n"
10996 " section."
10997 msgstr ""
10998
10999 msgid ""
11000 " The ``FILE`` argument controls the output file to write gathered "
11001 "release\n"
11002 " notes to. The format of the file is::"
11003 msgstr ""
11004
11005 #, fuzzy
11006 msgid ""
11007 " Section 1\n"
11008 " ========="
11009 msgstr ""
11010 "セクション\n"
11011 "=========="
11012
11013 msgid " ..."
11014 msgstr ""
11015
11016 #, fuzzy
11017 msgid ""
11018 " Section 2\n"
11019 " ========="
11020 msgstr ""
11021 "セクション\n"
11022 "=========="
11023
11024 msgid " Only sections with defined release notes are emitted."
11025 msgstr ""
11026
11027 msgid ""
11028 " If a section only has short-form notes, it will consist of bullet list::"
11029 msgstr ""
11030
11031 #, fuzzy
11032 msgid ""
11033 " Section\n"
11034 " ======="
11035 msgstr ""
11036 "セクション\n"
11037 "=========="
11038
11039 msgid ""
11040 " * Release note 1\n"
11041 " * Release note 2"
11042 msgstr ""
11043
11044 msgid " If a section has long-form notes, sub-sections will be emitted::"
11045 msgstr ""
11046
11047 #, fuzzy
11048 msgid ""
11049 " Note 1 Title\n"
11050 " ------------"
11051 msgstr ""
11052 "\n"
11053 " /shortlog\n"
11054 " ---------"
11055
11056 msgid " Description of the first long-form note."
11057 msgstr ""
11058
11059 #, fuzzy
11060 msgid ""
11061 " Note 2 Title\n"
11062 " ------------"
11063 msgstr ""
11064 "\n"
11065 " /shortlog\n"
11066 " ---------"
11067
11068 msgid " Description of the second long-form note."
11069 msgstr ""
11070
11071 msgid ""
11072 " If the ``FILE`` argument points to an existing file, that file will be\n"
11073 " parsed for release notes having the format that would be generated by "
11074 "this\n"
11075 " command. The notes from the processed commit messages will be *merged*\n"
11076 " into this parsed set."
11077 msgstr ""
11078
11079 msgid " During release notes merging:"
11080 msgstr ""
11081
11082 msgid ""
11083 " * Duplicate items are automatically ignored\n"
11084 " * Items that are different are automatically ignored if the similarity "
11085 "is\n"
11086 " greater than a threshold."
11087 msgstr ""
11088
11089 msgid ""
11090 " This means that the release notes file can be updated independently "
11091 "from\n"
11092 " this command and changes should not be lost when running this command "
11093 "on\n"
11094 " that file. A particular use case for this is to tweak the wording of a\n"
11095 " release note after it has been added to the release notes file."
11096 msgstr ""
11097
11098 msgid ""
11099 " The -c/--check option checks the commit message for invalid admonitions."
11100 msgstr ""
11101
11102 msgid ""
11103 " The -l/--list option, presents the user with a list of existing "
11104 "available\n"
11105 " admonitions along with their title. This also includes the custom\n"
11106 " admonitions (if any).\n"
11107 " "
11108 msgstr ""
11109
11110 #, fuzzy
11111 msgid "cannot use both '--list' and '--rev'"
11112 msgstr "--noupdate と --updaterev は併用できません"
11113
11114 #, fuzzy
11115 msgid "cannot use both '--list' and '--check'"
11116 msgstr "--force と --keep-changes は併用できません"
11117
11118 msgid "parse release notes and print resulting data structure"
11119 msgstr ""
11120
11121 #, fuzzy, python-format
11122 msgid "section: %s\n"
11123 msgstr " 読み込み元: %s\n"
11124
11125 #, fuzzy, python-format
11126 msgid " subsection: %s\n"
11127 msgstr " 読み込み元: %s\n"
11128
11129 #, fuzzy, python-format
11130 msgid " paragraph: %s\n"
11131 msgstr " 別名: %s"
11132
11133 #, fuzzy
11134 msgid " bullet point:\n"
11135 msgstr " 障害報告先: %s\n"
11136
9604 msgid "recreates hardlinks between repository clones"
11137 msgid "recreates hardlinks between repository clones"
9605 msgstr "複製リポジトリ間でのハードリンクの再生成"
11138 msgstr "複製リポジトリ間でのハードリンクの再生成"
9606
11139
@@ -9700,6 +11233,50 b' msgstr "\xe5\x86\x8d\xe3\x83\xaa\xe3\x83\xb3\xe3\x82\xaf\xe4\xb8\xad"'
9700 msgid "relinked %d files (%s reclaimed)\n"
11233 msgid "relinked %d files (%s reclaimed)\n"
9701 msgstr "%d ファイルを再リンク (%s バイトの節約)\n"
11234 msgstr "%d ファイルを再リンク (%s バイトの節約)\n"
9702
11235
11236 #, fuzzy
11237 msgid " showing remotebookmarks and remotebranches in UI"
11238 msgstr "連携先に新しいブランチが作成されます: %s!"
11239
11240 msgid ""
11241 "By default both remotebookmarks and remotebranches are turned on. Config "
11242 "knob to\n"
11243 "control the individually are as follows."
11244 msgstr ""
11245
11246 msgid "Config options to tweak the default behaviour:"
11247 msgstr ""
11248
11249 msgid ""
11250 "remotenames.bookmarks\n"
11251 " Boolean value to enable or disable showing of remotebookmarks (default: "
11252 "True)"
11253 msgstr ""
11254
11255 msgid ""
11256 "remotenames.branches\n"
11257 " Boolean value to enable or disable showing of remotebranches (default: "
11258 "True)"
11259 msgstr ""
11260
11261 msgid ""
11262 "remotenames.hoistedpeer\n"
11263 " Name of the peer whose remotebookmarks should be hoisted into the top-"
11264 "level\n"
11265 " namespace (default: 'default')\n"
11266 msgstr ""
11267
11268 #, fuzzy
11269 msgid "remotenames takes no arguments"
11270 msgstr "removed には引数が指定できません"
11271
11272 #, fuzzy
11273 msgid "remotebranches takes no arguments"
11274 msgstr "removed には引数が指定できません"
11275
11276 #, fuzzy
11277 msgid "remotebookmarks takes no arguments"
11278 msgstr "removed には引数が指定できません"
11279
9703 msgid "extend schemes with shortcuts to repository swarms"
11280 msgid "extend schemes with shortcuts to repository swarms"
9704 msgstr "連携先リポジトリ群に対する略記指定の拡張"
11281 msgstr "連携先リポジトリ群に対する略記指定の拡張"
9705
11282
@@ -9859,7 +11436,8 b' msgstr ""'
9859 " URL」から算出したハッシュ値)。 :hg:`clone` に指定した複製元のパスや\n"
11436 " URL」から算出したハッシュ値)。 :hg:`clone` に指定した複製元のパスや\n"
9860 " URL が一致した場合のみ、 履歴管理領域が共有されます。"
11437 " URL が一致した場合のみ、 履歴管理領域が共有されます。"
9861
11438
9862 msgid " The default naming mode is \"identity.\"\n"
11439 #, fuzzy
11440 msgid " The default naming mode is \"identity\".\n"
9863 msgstr " デフォルトの設定は \"identity.\" です。\n"
11441 msgstr " デフォルトの設定は \"identity.\" です。\n"
9864
11442
9865 msgid "do not create a working directory"
11443 msgid "do not create a working directory"
@@ -9967,10 +11545,6 b' msgid "shelved change names can not star'
9967 msgstr "退避情報の名称の先頭に '.' は使用できません"
11545 msgstr "退避情報の名称の先頭に '.' は使用できません"
9968
11546
9969 #, python-format
11547 #, python-format
9970 msgid "too many shelved changes named '%s'"
9971 msgstr "名前のベースに '%s' を使用する退避情報が多過ぎます"
9972
9973 #, python-format
9974 msgid "nothing changed (%d missing files, see 'hg status')\n"
11548 msgid "nothing changed (%d missing files, see 'hg status')\n"
9975 msgstr "変更はありません (%d 個のファイルが不在。 'hg status' で確認を)\n"
11549 msgstr "変更はありません (%d 個のファイルが不在。 'hg status' で確認を)\n"
9976
11550
@@ -10286,7 +11860,30 b' msgstr ""'
10286 msgid ""
11860 msgid ""
10287 "This extension provides the :hg:`show` command, which provides a central\n"
11861 "This extension provides the :hg:`show` command, which provides a central\n"
10288 "command for displaying commonly-accessed repository data and views of that\n"
11862 "command for displaying commonly-accessed repository data and views of that\n"
10289 "data.\n"
11863 "data."
11864 msgstr ""
11865
11866 #, fuzzy
11867 msgid "The following config options can influence operation."
11868 msgstr "以下の ``share.`` セクション設定が、この機能を制御します:"
11869
11870 msgid ""
11871 "``commands``\n"
11872 "------------"
11873 msgstr ""
11874 "``commands``\n"
11875 "------------"
11876
11877 msgid ""
11878 "``show.aliasprefix``\n"
11879 " List of strings that will register aliases for views. e.g. ``s`` will\n"
11880 " effectively set config options ``alias.s<view> = show <view>`` for all\n"
11881 " views. i.e. `hg swork` would execute `hg show work`."
11882 msgstr ""
11883
11884 msgid ""
11885 " Aliases that would conflict with existing registrations will not be\n"
11886 " performed.\n"
10290 msgstr ""
11887 msgstr ""
10291
11888
10292 #, fuzzy
11889 #, fuzzy
@@ -10323,6 +11920,9 b' msgstr ""'
10323 ":activebookmark: 文字列. アクティブなブックマーク (対象リビジョンに対し、\n"
11920 ":activebookmark: 文字列. アクティブなブックマーク (対象リビジョンに対し、\n"
10324 " 関連付けられている場合のみ)"
11921 " 関連付けられている場合のみ)"
10325
11922
11923 msgid " stack current line of work"
11924 msgstr ""
11925
10326 msgid ""
11926 msgid ""
10327 " work changesets that aren't finished\n"
11927 " work changesets that aren't finished\n"
10328 " "
11928 " "
@@ -10361,6 +11961,27 b' msgid "(no bookmarks set)\\n"'
10361 msgstr "ブックマークは存在しません\n"
11961 msgstr "ブックマークは存在しません\n"
10362
11962
10363 #, fuzzy
11963 #, fuzzy
11964 msgid "stack view only available when there is a working directory"
11965 msgstr "作業領域のファイル操作状況の表示"
11966
11967 #, fuzzy
11968 msgid "(empty stack; working directory parent is a published changeset)\n"
11969 msgstr "移動対象がありません - 作業領域の親は移動先と同一です\n"
11970
11971 #, fuzzy, python-format
11972 msgid "%d commits ahead"
11973 msgstr "コミットに失敗"
11974
11975 msgid "(stack head)\n"
11976 msgstr ""
11977
11978 msgid "(multiple children)\n"
11979 msgstr ""
11980
11981 msgid "(stack base)"
11982 msgstr ""
11983
11984 #, fuzzy
10364 msgid "commitage requires a string"
11985 msgid "commitage requires a string"
10365 msgstr "date には文字列を指定してください"
11986 msgstr "date には文字列を指定してください"
10366
11987
@@ -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"'
10368 msgid "headage requires a string"
11989 msgid "headage requires a string"
10369 msgstr "date には文字列を指定してください"
11990 msgstr "date には文字列を指定してください"
10370
11991
11992 #, fuzzy
11993 msgid "allow sparse checkouts of the working directory (EXPERIMENTAL)"
11994 msgstr ""
11995 "``wdir``\n"
11996 " 作業領域ディレクトリを表す値 (実験的実装)"
11997
11998 msgid ""
11999 "(This extension is not yet protected by backwards compatibility\n"
12000 "guarantees. Any aspect may break in future releases until this\n"
12001 "notice is removed.)"
12002 msgstr ""
12003
12004 msgid ""
12005 "This extension allows the working directory to only consist of a\n"
12006 "subset of files for the revision. This allows specific files or\n"
12007 "directories to be explicitly included or excluded. Many repository\n"
12008 "operations have performance proportional to the number of files in\n"
12009 "the working directory. So only realizing a subset of files in the\n"
12010 "working directory can improve performance."
12011 msgstr ""
12012
12013 #, fuzzy
12014 msgid ""
12015 "Sparse Config Files\n"
12016 "-------------------"
12017 msgstr ""
12018 "設定例\n"
12019 "------"
12020
12021 msgid ""
12022 "The set of files that are part of a sparse checkout are defined by\n"
12023 "a sparse config file. The file defines 3 things: includes (files to\n"
12024 "include in the sparse checkout), excludes (files to exclude from the\n"
12025 "sparse checkout), and profiles (links to other config files)."
12026 msgstr ""
12027
12028 #, fuzzy
12029 msgid ""
12030 "The file format is newline delimited. Empty lines and lines beginning\n"
12031 "with ``#`` are ignored."
12032 msgstr " 空行と ``#`` で始まる行は無視されます。"
12033
12034 msgid ""
12035 "Lines beginning with ``%include `` denote another sparse config file\n"
12036 "to include. e.g. ``%include tests.sparse``. The filename is relative\n"
12037 "to the repository root."
12038 msgstr ""
12039
12040 msgid ""
12041 "The special lines ``[include]`` and ``[exclude]`` denote the section\n"
12042 "for includes and excludes that follow, respectively. It is illegal to\n"
12043 "have ``[include]`` after ``[exclude]``."
12044 msgstr ""
12045
12046 msgid ""
12047 "Non-special lines resemble file patterns to be added to either includes\n"
12048 "or excludes. The syntax of these lines is documented by :hg:`help "
12049 "patterns`.\n"
12050 "Patterns are interpreted as ``glob:`` by default and match against the\n"
12051 "root of the repository."
12052 msgstr ""
12053
12054 msgid ""
12055 "Exclusion patterns take precedence over inclusion patterns. So even\n"
12056 "if a file is explicitly included, an ``[exclude]`` entry can remove it."
12057 msgstr ""
12058
12059 msgid ""
12060 "For example, say you have a repository with 3 directories, ``frontend/``,\n"
12061 "``backend/``, and ``tools/``. ``frontend/`` and ``backend/`` correspond\n"
12062 "to different projects and it is uncommon for someone working on one\n"
12063 "to need the files for the other. But ``tools/`` contains files shared\n"
12064 "between both projects. Your sparse config files may resemble::"
12065 msgstr ""
12066
12067 msgid ""
12068 " # frontend.sparse\n"
12069 " frontend/**\n"
12070 " tools/**"
12071 msgstr ""
12072
12073 msgid ""
12074 " # backend.sparse\n"
12075 " backend/**\n"
12076 " tools/**"
12077 msgstr ""
12078
12079 msgid ""
12080 "Say the backend grows in size. Or there's a directory with thousands\n"
12081 "of files you wish to exclude. You can modify the profile to exclude\n"
12082 "certain files::"
12083 msgstr ""
12084
12085 msgid ""
12086 " [include]\n"
12087 " backend/**\n"
12088 " tools/**"
12089 msgstr ""
12090
12091 msgid ""
12092 " [exclude]\n"
12093 " tools/tests/**\n"
12094 msgstr ""
12095
12096 #, python-format
12097 msgid "type '%s' has no property '%s'"
12098 msgstr ""
12099
12100 #, fuzzy
12101 msgid "too many flags specified."
12102 msgstr "オプション指定が過剰です"
12103
12104 msgid ""
12105 "include file with `hg debugsparse --include <pattern>` or use `hg add -s "
12106 "<file>` to include file directory while adding"
12107 msgstr ""
12108
12109 #, python-format
12110 msgid "cannot add '%s' - it is outside the sparse checkout"
12111 msgstr ""
12112
12113 #, fuzzy
12114 msgid "include files in the sparse checkout"
12115 msgstr "親リビジョンの状態でファイルを復旧"
12116
12117 #, fuzzy
12118 msgid "exclude files in the sparse checkout"
12119 msgstr "親リビジョンの状態でファイルを復旧"
12120
12121 msgid "delete an include/exclude rule"
12122 msgstr ""
12123
12124 msgid "allow changing rules even with pending changes"
12125 msgstr ""
12126
12127 #, fuzzy
12128 msgid "enables the specified profile"
12129 msgstr "当該リビジョン時点での由来情報を表示"
12130
12131 #, fuzzy
12132 msgid "disables the specified profile"
12133 msgstr "履歴改変指示を指定ファイルから読み込み"
12134
12135 msgid "imports rules from a file"
12136 msgstr ""
12137
12138 msgid "clears local include/exclude rules"
12139 msgstr ""
12140
12141 msgid "updates the working after sparseness changes"
12142 msgstr ""
12143
12144 msgid "makes the repo full again"
12145 msgstr ""
12146
12147 #, fuzzy
12148 msgid "[--OPTION] PATTERN..."
12149 msgstr "[OPTION]... [PATTERN]..."
12150
12151 msgid "make the current checkout sparse, or edit the existing checkout"
12152 msgstr ""
12153
12154 msgid ""
12155 " The sparse command is used to make the current checkout sparse.\n"
12156 " This means files that don't meet the sparse condition will not be\n"
12157 " written to disk, or show up in any working copy operations. It does\n"
12158 " not affect files in history in any way."
12159 msgstr ""
12160
12161 #, fuzzy
12162 msgid " Passing no arguments prints the currently applied sparse rules."
12163 msgstr ""
12164 " 引数指定が無い場合、 現在のガード選択状況を表示します。\n"
12165 " 引数が指定された場合、 ガード選択を設定します。"
12166
12167 msgid ""
12168 " --include and --exclude are used to add and remove files from the "
12169 "sparse\n"
12170 " checkout. The effects of adding an include or exclude rule are applied\n"
12171 " immediately. If applying the new rule would cause a file with pending\n"
12172 " changes to be added or removed, the command will fail. Pass --force to\n"
12173 " force a rule change even with pending changes (the changes on disk will\n"
12174 " be preserved)."
12175 msgstr ""
12176
12177 msgid ""
12178 " --delete removes an existing include/exclude rule. The effects are\n"
12179 " immediate."
12180 msgstr ""
12181
12182 msgid ""
12183 " --refresh refreshes the files on disk based on the sparse rules. This "
12184 "is\n"
12185 " only necessary if .hg/sparse was changed by hand."
12186 msgstr ""
12187
12188 msgid ""
12189 " --enable-profile and --disable-profile accept a path to a .hgsparse "
12190 "file.\n"
12191 " This allows defining sparse checkouts and tracking them inside the\n"
12192 " repository. This is useful for defining commonly used sparse checkouts "
12193 "for\n"
12194 " many people to use. As the profile definition changes over time, the "
12195 "sparse\n"
12196 " checkout will automatically be updated appropriately, depending on "
12197 "which\n"
12198 " changeset is checked out. Changes to .hgsparse are not applied until "
12199 "they\n"
12200 " have been committed."
12201 msgstr ""
12202
12203 msgid ""
12204 " --import-rules accepts a path to a file containing rules in the ."
12205 "hgsparse\n"
12206 " format, allowing you to add --include, --exclude and --enable-profile "
12207 "rules\n"
12208 " in bulk. Like the --include, --exclude and --enable-profile switches, "
12209 "the\n"
12210 " changes are applied immediately."
12211 msgstr ""
12212
12213 msgid ""
12214 " --clear-rules removes all local include and exclude rules, while "
12215 "leaving\n"
12216 " any enabled profiles in place."
12217 msgstr ""
12218
12219 #, fuzzy
12220 msgid ""
12221 " Returns 0 if editing the sparse checkout succeeds.\n"
12222 " "
12223 msgstr ""
12224 " 成功時のコマンド終了値は 0 です。\n"
12225 " "
12226
12227 #, fuzzy
12228 msgid "too many flags specified"
12229 msgstr "オプション指定が過剰です"
12230
12231 msgid "Temporarily Included Files (for merge/rebase):\n"
12232 msgstr ""
12233
12234 #, fuzzy
12235 msgid "repo is not sparse\n"
12236 msgstr "addremove は未サポートです"
12237
12238 #, fuzzy
12239 msgid "command to split a changeset into smaller ones (EXPERIMENTAL)"
12240 msgstr "子リビジョン表示のコマンド (非推奨)"
12241
12242 #, fuzzy
12243 msgid "revision to split"
12244 msgstr "表示対象リビジョン"
12245
12246 msgid "rebase descendants after split"
12247 msgstr ""
12248
12249 msgid "hg split [--no-rebase] [[-r] REV]"
12250 msgstr ""
12251
12252 #, fuzzy
12253 msgid "split a changeset into smaller ones"
12254 msgstr "電子メールによる変更内容のパッチ送付"
12255
12256 msgid ""
12257 " Repeatedly prompt changes and commit message for new changesets until "
12258 "there\n"
12259 " is nothing left in the original changeset."
12260 msgstr ""
12261
12262 #, fuzzy
12263 msgid " If --rev was not given, split the working directory parent."
12264 msgstr " - 作業領域の親リビジョンの完全ハッシュ値の表示::"
12265
12266 msgid ""
12267 " By default, rebase connected non-obsoleted descendants onto the new\n"
12268 " changeset. Use --no-rebase to avoid the rebase.\n"
12269 " "
12270 msgstr ""
12271
12272 #, fuzzy
12273 msgid "cannot split multiple revisions"
12274 msgstr "null リビジョンにはタグ付けできません"
12275
12276 #, fuzzy
12277 msgid "nothing to split\n"
12278 msgstr "移動の必要はありません\n"
12279
12280 #, fuzzy
12281 msgid "cannot split working directory"
12282 msgstr "作業領域の親リビジョンの内容は検閲できません"
12283
12284 #, fuzzy
12285 msgid "cannot split public changeset"
12286 msgstr "public フェーズのリビジョンは改変できません: %s"
12287
12288 msgid "split would leave orphaned changesets behind"
12289 msgstr ""
12290
12291 #, fuzzy
12292 msgid "cannot split changeset with children without rebase"
12293 msgstr "子リビジョンを持つリビジョンは改変できません"
12294
12295 #, fuzzy
12296 msgid "cannot split a merge changeset"
12297 msgstr "マージ実施リビジョンは打ち消し対象にできません"
12298
12299 #, python-format
12300 msgid "HG: Splitting %s. So far it has been split into:\n"
12301 msgstr ""
12302
12303 #, fuzzy, python-format
12304 msgid "HG: - %s: %s\n"
12305 msgstr "リビジョン %s: %s\n"
12306
12307 msgid "HG: Write commit message for the next split changeset.\n"
12308 msgstr ""
12309
12310 #, python-format
12311 msgid "HG: Splitting %s. Write commit message for the first split changeset.\n"
12312 msgstr ""
12313
12314 #, fuzzy
12315 msgid "cannot split an empty revision"
12316 msgstr "null リビジョンにはタグ付けできません"
12317
10371 msgid "strip changesets and their descendants from history"
12318 msgid "strip changesets and their descendants from history"
10372 msgstr "指定リビジョンと子孫の履歴からの破棄"
12319 msgstr "指定リビジョンと子孫の履歴からの破棄"
10373
12320
@@ -10379,9 +12326,6 b' msgstr ""'
10379 "本エクステンションは、 指定リビジョンとその子孫を、 履歴から破棄します。\n"
12326 "本エクステンションは、 指定リビジョンとその子孫を、 履歴から破棄します。\n"
10380 "詳細は :hg:`help strip` を参照してください。\n"
12327 "詳細は :hg:`help strip` を参照してください。\n"
10381
12328
10382 msgid "local changes found"
10383 msgstr "作業領域に変更があります"
10384
10385 msgid "local changed subrepos found"
12329 msgid "local changed subrepos found"
10386 msgstr "サブリポジトリに変更があります"
12330 msgstr "サブリポジトリに変更があります"
10387
12331
@@ -10471,10 +12415,6 b' msgstr ""'
10471 " 他リポジトリに反映済みである場合、 そのリビジョンは pull 操作により、\n"
12415 " 他リポジトリに反映済みである場合、 そのリビジョンは pull 操作により、\n"
10472 " 再び手元のリポジトリに出現することでしょう。"
12416 " 再び手元のリポジトリに出現することでしょう。"
10473
12417
10474 #, python-format
10475 msgid "bookmark '%s' not found"
10476 msgstr "ブックマーク '%s' がありません"
10477
10478 msgid "empty revision set"
12418 msgid "empty revision set"
10479 msgstr "指定に該当するリビジョンはありません"
12419 msgstr "指定に該当するリビジョンはありません"
10480
12420
@@ -10501,8 +12441,8 b' msgstr ""'
10501 msgid "skipping already applied revision %s\n"
12441 msgid "skipping already applied revision %s\n"
10502 msgstr "適用済みリビジョン %s を無視\n"
12442 msgstr "適用済みリビジョン %s を無視\n"
10503
12443
10504 #, python-format
12444 #, fuzzy, python-format
10505 msgid "skipping merge changeset %s:%s\n"
12445 msgid "skipping merge changeset %d:%s\n"
10506 msgstr "マージ実施リビジョン %s:%s を無視\n"
12446 msgstr "マージ実施リビジョン %s:%s を無視\n"
10507
12447
10508 #, python-format
12448 #, 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"'
10746 msgid "use 'hg transplant --continue' or 'hg update' to abort"
12686 msgid "use 'hg transplant --continue' or 'hg update' to abort"
10747 msgstr "'hg transplant --continue' か 'hg update' (移植中止)を実施してください"
12687 msgstr "'hg transplant --continue' か 'hg update' (移植中止)を実施してください"
10748
12688
12689 #, fuzzy
12690 msgid "uncommit part or all of a local changeset (EXPERIMENTAL)"
12691 msgstr "操作対象変更の対話的な選択 (実験的実装)"
12692
12693 msgid ""
12694 "This command undoes the effect of a local commit, returning the affected\n"
12695 "files to their uncommitted state. This means that files modified, added or\n"
12696 "removed in the changeset will be left unchanged, and so will remain "
12697 "modified,\n"
12698 "added and removed in the working directory.\n"
12699 msgstr ""
12700
12701 msgid "allow an empty commit after uncommiting"
12702 msgstr ""
12703
12704 #, fuzzy
12705 msgid "uncommit part or all of a local changeset"
12706 msgstr "パス全体を補完"
12707
12708 msgid ""
12709 " This command undoes the effect of a local commit, returning the "
12710 "affected\n"
12711 " files to their uncommitted state. This means that files modified or\n"
12712 " deleted in the changeset will be left unchanged, and so will remain\n"
12713 " modified in the working directory."
12714 msgstr ""
12715
12716 msgid ""
12717 " If no files are specified, the commit will be pruned, unless --keep is\n"
12718 " given.\n"
12719 " "
12720 msgstr ""
12721
12722 #, fuzzy
12723 msgid "cannot uncommit merge changeset"
12724 msgstr "マージ実施リビジョンは打ち消し対象にできません"
12725
12726 #, fuzzy
12727 msgid "nothing to uncommit\n"
12728 msgstr "merge の必要はありません"
12729
12730 msgid "undo the most recent amend operation on a current changeset"
12731 msgstr ""
12732
12733 msgid ""
12734 " This command will roll back to the previous version of a changeset,\n"
12735 " leaving working directory in state in which it was before running\n"
12736 " `hg amend` (e.g. files modified as part of an amend will be\n"
12737 " marked as modified `hg status`)\n"
12738 " "
12739 msgstr ""
12740
12741 #, python-format
12742 msgid "changeset must have one predecessor, found %i predecessors"
12743 msgstr ""
12744
10749 msgid "allow the use of MBCS paths with problematic encodings"
12745 msgid "allow the use of MBCS paths with problematic encodings"
10750 msgstr "問題ある文字コードをパス名に使用する場合の対処"
12746 msgstr "問題ある文字コードをパス名に使用する場合の対処"
10751
12747
@@ -11016,9 +13012,31 b' msgid "no active bookmark"'
11016 msgstr "アクティブなブックマークがありません"
13012 msgstr "アクティブなブックマークがありません"
11017
13013
11018 #, python-format
13014 #, python-format
13015 msgid "moving bookmark '%s' forward from %s\n"
13016 msgstr "ブックマーク '%s' を %s から前方に移動中\n"
13017
13018 #, python-format
13019 msgid "bookmark '%s' already exists (use -f to force)"
13020 msgstr "ブックマーク '%s' は存在します(強制実行する場合は -f を指定)"
13021
13022 msgid "a bookmark cannot have the name of an existing branch"
13023 msgstr "既存ブランチと同名のブックマークは作成できません"
13024
13025 #, python-format
13026 msgid ""
13027 "bookmark %s matches a changeset hash\n"
13028 "(did you leave a -r out of an 'hg bookmark' command?)\n"
13029 msgstr ""
13030 "ブックマーク %s は既存のリビジョン識別ハッシュ値と合致します。\n"
13031 "('hg bookmark' 実行時に -r オプションを忘れていませんか?)\n"
13032
13033 #, python-format
11019 msgid "updating to active bookmark %s\n"
13034 msgid "updating to active bookmark %s\n"
11020 msgstr "アクティブなブックマーク %s への更新中\n"
13035 msgstr "アクティブなブックマーク %s への更新中\n"
11021
13036
13037 msgid "bad bookmark stream"
13038 msgstr "不正なブックマーク stream"
13039
11022 #, python-format
13040 #, python-format
11023 msgid "adding remote bookmark %s\n"
13041 msgid "adding remote bookmark %s\n"
11024 msgstr "連携先での新規ブックマーク %s を追加中\n"
13042 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"'
11070 msgid "deleted"
13088 msgid "deleted"
11071 msgstr "削除"
13089 msgstr "削除"
11072
13090
13091 msgid "bookmark names cannot consist entirely of whitespace"
13092 msgstr "空白文字だけで構成されたブックマーク名は不正です"
13093
13094 #, python-format
13095 msgid "bookmark '%s' does not exist"
13096 msgstr "ブックマーク '%s' は存在しません"
13097
13098 #, python-format
13099 msgid "bookmarking hidden changeset %s\n"
13100 msgstr "不可視リビジョン %s へのブックマーク設定\n"
13101
13102 msgid "no bookmarks set\n"
13103 msgstr "ブックマークは存在しません\n"
13104
11073 msgid "not a Mercurial bundle"
13105 msgid "not a Mercurial bundle"
11074 msgstr "Mercurial のバンドル形式ではありません"
13106 msgstr "Mercurial のバンドル形式ではありません"
11075
13107
@@ -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"'
11077 msgid "unknown bundle version %s"
13109 msgid "unknown bundle version %s"
11078 msgstr "未知のバンドル形式バージョン %s"
13110 msgstr "未知のバンドル形式バージョン %s"
11079
13111
13112 #, python-format
13113 msgid "stream ended unexpectedly (got %d bytes, expected %d)"
13114 msgstr "想定外のデータ終端 (実データ:%d バイト 期待データ:%d バイト)"
13115
11080 msgid "Seek failed\n"
13116 msgid "Seek failed\n"
11081 msgstr "seek に失敗しました\n"
13117 msgstr "seek に失敗しました\n"
11082
13118
11083 msgid "File pointer is not seekable"
13119 msgid "File pointer is not seekable"
11084 msgstr "対象ファイルは seek できません"
13120 msgstr "対象ファイルは seek できません"
11085
13121
13122 msgid "stream data requested but server does not allow this feature"
13123 msgstr ""
13124
13125 msgid ""
13126 "well-behaved clients should not be requesting stream data from servers not "
13127 "advertising it; the client may be buggy"
13128 msgstr ""
13129
11086 msgid "old bundle types only supports v1 changegroups"
13130 msgid "old bundle types only supports v1 changegroups"
11087 msgstr "旧来の bundle 形式で使用できるのは v1 changegroups のみです"
13131 msgstr "旧来のバンドル形式で使用できるのは v1 changegroups のみです"
11088
13132
11089 #, python-format
13133 #, python-format
11090 msgid "unknown stream compression type: %s"
13134 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:"'
11133 msgid "%i new obsolescence markers\n"
13177 msgid "%i new obsolescence markers\n"
11134 msgstr "%i 個の新規廃止情報マーカ\n"
13178 msgstr "%i 個の新規廃止情報マーカ\n"
11135
13179
13180 msgid "cannot apply stream clone to non empty repository"
13181 msgstr "stream clone bundle での複製は、空リポジトリにしか適用できません"
13182
11136 msgid "unknown parent"
13183 msgid "unknown parent"
11137 msgstr "未知の親"
13184 msgstr "未知の親"
11138
13185
11139 msgid "unknown delta base"
13186 msgid "unknown delta base"
11140 msgstr "未知の差分ベース"
13187 msgstr "未知の差分ベース"
11141
13188
13189 msgid "No changegroups found"
13190 msgstr "変更内容が含まれていません"
13191
13192 #, python-format
13193 msgid "bundle type %s cannot be read"
13194 msgstr "バンドル形式 %s は読み込めません"
13195
11142 #, python-format
13196 #, python-format
11143 msgid "Unsupported changegroup version: %s"
13197 msgid "Unsupported changegroup version: %s"
11144 msgstr "未サポートなバンドルファイルバージョンです: %s"
13198 msgstr "未サポートなバンドルファイルバージョンです: %s"
11145
13199
11146 msgid "No changegroups found"
11147 msgstr "変更内容が含まれていません"
11148
11149 #, python-format
13200 #, python-format
11150 msgid "setting parent to node %s that only exists in the bundle\n"
13201 msgid "setting parent to node %s that only exists in the bundle\n"
11151 msgstr "バンドル中にのみ存在するリビジョン %s が更新先として指定されました\n"
13202 msgstr "バンドル中にのみ存在するリビジョン %s が更新先として指定されました\n"
@@ -11154,10 +13205,6 b' msgid "cannot create new bundle reposito'
11154 msgstr "バンドルリポジトリの新規作成はできません"
13205 msgstr "バンドルリポジトリの新規作成はできません"
11155
13206
11156 #, python-format
13207 #, python-format
11157 msgid "stream ended unexpectedly (got %d bytes, expected %d)"
11158 msgstr "想定外のデータ終端 (実データ:%d バイト 期待データ:%d バイト)"
11159
11160 #, python-format
11161 msgid "invalid chunk length %d"
13208 msgid "invalid chunk length %d"
11162 msgstr "不正なデータ長: %d"
13209 msgstr "不正なデータ長: %d"
11163
13210
@@ -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"'
11170 msgid "chunks"
13217 msgid "chunks"
11171 msgstr "チャンク"
13218 msgstr "チャンク"
11172
13219
11173 msgid "received changelog group is empty"
11174 msgstr "受信した変更履歴は空です"
11175
11176 msgid "adding manifests\n"
13220 msgid "adding manifests\n"
11177 msgstr "マニフェストを追加中\n"
13221 msgstr "マニフェストを追加中\n"
11178
13222
@@ -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"'
11193 msgid "bundling"
13237 msgid "bundling"
11194 msgstr "バンドル生成中"
13238 msgstr "バンドル生成中"
11195
13239
11196 msgid "uncompressed size of bundle content:\n"
11197 msgstr "バンドルファイル内容の非圧縮サイズ:\n"
11198
11199 #, python-format
11200 msgid "%8.i (changelog)\n"
11201 msgstr "%8.i (履歴情報)\n"
11202
11203 #, python-format
13240 #, python-format
11204 msgid "%8.i (manifests)\n"
13241 msgid "%8.i (manifests)\n"
11205 msgstr "%8.i (マニフェスト)\n"
13242 msgstr "%8.i (マニフェスト)\n"
11206
13243
11207 #, python-format
13244 #, python-format
11208 msgid "empty or missing revlog for %s"
13245 msgid "empty or missing file data for %s"
11209 msgstr "%s に対するリビジョンログが空または不在です"
13246 msgstr "ファイル %s に対する履歴情報が空または不在です"
11210
13247
11211 #, python-format
13248 #, python-format
11212 msgid "%8.i %s\n"
13249 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"'
11236 msgid "empty username"
13273 msgid "empty username"
11237 msgstr "ユーザ名が空です"
13274 msgstr "ユーザ名が空です"
11238
13275
11239 #, python-format
13276 #, fuzzy, python-format
11240 msgid "username %s contains a newline"
13277 msgid "username %r contains a newline"
11241 msgstr "ユーザ名 %s が改行を含んでいます"
13278 msgstr "ユーザ名 %s が改行を含んでいます"
11242
13279
11243 #, python-format
13280 #, python-format
@@ -11251,6 +13288,114 b' msgstr "\xe4\xb8\x8d\xe6\xad\xa3\xe3\x81\xaa\xe5\xbf\x9c\xe7\xad\x94"'
11251 msgid "unexpected command: %s"
13288 msgid "unexpected command: %s"
11252 msgstr "想定外のコマンド: %s"
13289 msgstr "想定外のコマンド: %s"
11253
13290
13291 msgid "do not perform actions, just print output"
13292 msgstr "実施予定の処理内容の表示のみで処理実施は抑止"
13293
13294 msgid "ask before applying actions"
13295 msgstr "処理実施前に確認を実施"
13296
13297 msgid "specify ssh command to use"
13298 msgstr "SSH 連携で使用する ssh コマンド"
13299
13300 msgid "specify hg command to run on the remote side"
13301 msgstr "遠隔ホスト側で実行される hg コマンド"
13302
13303 msgid "do not verify server certificate (ignoring web.cacerts config)"
13304 msgstr "接続先証明書の検証省略(web.cacerts 設定の無視)"
13305
13306 msgid "PATTERN"
13307 msgstr "パターン"
13308
13309 msgid "include names matching the given patterns"
13310 msgstr "パターンに合致したファイルを処理対象に追加"
13311
13312 msgid "exclude names matching the given patterns"
13313 msgstr "パターンに合致したファイルを処理対象から除外"
13314
13315 msgid "read commit message from file"
13316 msgstr "コミットログをファイルから読み込み"
13317
13318 msgid "record the specified date as commit date"
13319 msgstr "指定日時をコミット日時として記録"
13320
13321 msgid "record the specified user as committer"
13322 msgstr "指定ユーザをコミットユーザとして記録"
13323
13324 msgid "display with template (EXPERIMENTAL)"
13325 msgstr "当該テンプレートで表示をカスタマイズ (実験的実装)"
13326
13327 msgid "STYLE"
13328 msgstr "スタイル"
13329
13330 msgid "display using template map file (DEPRECATED)"
13331 msgstr "当該スタイルで表示をカスタマイズ (非推奨)"
13332
13333 msgid "display with template"
13334 msgstr "当該テンプレートで表示をカスタマイズ"
13335
13336 msgid "do not show merges"
13337 msgstr "マージ実施リビジョンの表示抑止"
13338
13339 msgid "show the revision DAG"
13340 msgstr "履歴ツリーの表示"
13341
13342 msgid "treat all files as text"
13343 msgstr "全ファイルをテキストファイルと仮定"
13344
13345 msgid "generate binary diffs in git mode (default)"
13346 msgstr "git モード時にバイナリ差分を生成 (デフォルト挙動)"
13347
13348 msgid "omit dates from diff headers"
13349 msgstr "差分表示の際に日付情報の表示を抑止"
13350
13351 msgid "ignore white space when comparing lines"
13352 msgstr "差分判定の際に空白文字を無視"
13353
13354 msgid "ignore changes in the amount of white space"
13355 msgstr "差分判定の際に空白文字の数を無視"
13356
13357 msgid "ignore changes whose lines are all blank"
13358 msgstr "差分判定の際に空白行を無視"
13359
13360 msgid "ignore changes in whitespace at EOL"
13361 msgstr "行末空白文字における変更を無視"
13362
13363 msgid "omit a/ and b/ prefixes from filenames"
13364 msgstr "ファイル名の接頭辞 a/ と b/ の省略"
13365
13366 msgid "show which function each change is in"
13367 msgstr "差分表示の際に関数名情報を表示"
13368
13369 msgid "produce a diff that undoes the changes"
13370 msgstr "変更を取り消すための差分を生成"
13371
13372 msgid "number of lines of context to show"
13373 msgstr "差分コンテキストの行数"
13374
13375 msgid "DIR"
13376 msgstr "ディレクトリ"
13377
13378 msgid "produce diffs relative to subdirectory"
13379 msgstr "差分生成の起点ディレクトリ指定"
13380
13381 msgid "SIMILARITY"
13382 msgstr "類似度"
13383
13384 msgid "guess renamed files by similarity (0<=s<=100)"
13385 msgstr "ファイル改名推定の際の類似度(0 以上 100 以下)"
13386
13387 msgid "recurse into subrepositories"
13388 msgstr "サブリポジトリへの再帰的適用"
13389
13390 msgid "open changelog"
13391 msgstr "変更履歴の読み込み"
13392
13393 msgid "open manifest"
13394 msgstr "マニフェストの読み込み"
13395
13396 msgid "open directory manifest"
13397 msgstr "ディレクトリマニフェストの読み込み"
13398
11254 msgid "running non-interactively"
13399 msgid "running non-interactively"
11255 msgstr "非対話的な実行中"
13400 msgstr "非対話的な実行中"
11256
13401
@@ -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"'
11264 msgid "no changes to record\n"
13409 msgid "no changes to record\n"
11265 msgstr "記録可能な変更がありません\n"
13410 msgstr "記録可能な変更がありません\n"
11266
13411
13412 #, python-format
13413 msgid "'%s' not recognized"
13414 msgstr "'%s' は未知です"
13415
13416 #, python-format
13417 msgid "Unresolved merge conflicts:"
13418 msgstr "マージにおける未解消の衝突"
13419
13420 #, python-format
13421 msgid "To mark files as resolved: hg resolve --mark FILE"
13422 msgstr "衝突解消済み状態に設定: hg resolve --mark 対象ファイル"
13423
13424 msgid "No unresolved merge conflicts."
13425 msgstr "マージでの衝突は全て解消済みです。"
13426
13427 #, python-format
13428 msgid ""
13429 "To continue: %s\n"
13430 "To abort: %s"
13431 msgstr ""
13432 "処理を継続: %s\n"
13433 "途中成果を破棄: %s"
13434
13435 msgid "warning: this will discard uncommitted changes"
13436 msgstr "警告: 作業領域中の未コミット成果が破棄されます"
13437
13438 msgid ""
13439 "To mark the changeset good: hg bisect --good\n"
13440 "To mark the changeset bad: hg bisect --bad\n"
13441 "To abort: hg bisect --reset\n"
13442 msgstr ""
13443 "リビジョンを good でマーキング: hg bisect --good\n"
13444 "リビジョンを bad でマーキング: hg bisect --bad\n"
13445 "bisect を中断: hg bisect --reset\n"
13446
13447 #, python-format
13448 msgid "The repository is in an unfinished *%s* state."
13449 msgstr "リポジトリは *%s* 処理が未完了です。"
13450
13451 msgid "cannot change branch of non-linear revisions"
13452 msgstr "非直線な履歴群のブランチ名は変更できません"
13453
13454 msgid "a branch of the same name already exists"
13455 msgstr "同じ名前のブランチがすでに存在します"
13456
13457 msgid "cannot change branch of a merge commit"
13458 msgstr "マージ実施リビジョンのブランチ名は変更できません"
13459
13460 msgid "cannot change branch of a obsolete changeset"
13461 msgstr "廃止 (obsolete) リビジョンのブランチ名は変更できません"
13462
13463 msgid "cannot change branch in middle of a stack"
13464 msgstr "中間リビジョンだけのブランチ名変更はできません"
13465
13466 #, python-format
13467 msgid "changed branch on %d changesets\n"
13468 msgstr "%d 個のリビジョンのブランチ名を変更\n"
13469
11267 msgid "options --message and --logfile are mutually exclusive"
13470 msgid "options --message and --logfile are mutually exclusive"
11268 msgstr "--message と --logfile は同時に指定できません"
13471 msgstr "--message と --logfile は同時に指定できません"
11269
13472
@@ -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"'
11271 msgid "can't read commit message '%s': %s"
13474 msgid "can't read commit message '%s': %s"
11272 msgstr "コミットログ '%s' が読み込めません: %s"
13475 msgstr "コミットログ '%s' が読み込めません: %s"
11273
13476
11274 msgid "limit must be a positive integer"
13477 msgid "incomplete format spec in output filename"
11275 msgstr "制限には正数を指定してください"
13478 msgstr "出力ファイル名に不正なフォーマット指定"
11276
11277 msgid "limit must be positive"
11278 msgstr "制限には正数を指定してください"
11279
13479
11280 #, python-format
13480 #, python-format
11281 msgid "invalid format spec '%%%s' in output filename"
13481 msgid "invalid format spec '%%%s' in output filename"
@@ -11406,85 +13606,6 b' msgid "created %s"'
11406 msgstr "%s を作成"
13606 msgstr "%s を作成"
11407
13607
11408 #, python-format
13608 #, python-format
11409 msgid "warning: %s not inside relative root %s\n"
11410 msgstr "警告: %s は相対ルート %s の範囲外です\n"
11411
11412 #. i18n: column positioning for "hg log"
11413 #, python-format
11414 msgid "changeset: %d:%s\n"
11415 msgstr "リビジョン: %d:%s\n"
11416
11417 #. i18n: column positioning for "hg log"
11418 #, python-format
11419 msgid "branch: %s\n"
11420 msgstr "ブランチ: %s\n"
11421
11422 #. i18n: column positioning for "hg log"
11423 #, python-format
11424 msgid "phase: %s\n"
11425 msgstr "フェーズ: %s\n"
11426
11427 #. i18n: column positioning for "hg log"
11428 #, python-format
11429 msgid "parent: %d:%s\n"
11430 msgstr "親リビジョン: %d:%s\n"
11431
11432 #. i18n: column positioning for "hg log"
11433 #, python-format
11434 msgid "manifest: %d:%s\n"
11435 msgstr "manifest参照: %d:%s\n"
11436
11437 #. i18n: column positioning for "hg log"
11438 #, python-format
11439 msgid "user: %s\n"
11440 msgstr "ユーザ: %s\n"
11441
11442 #. i18n: column positioning for "hg log"
11443 #, python-format
11444 msgid "date: %s\n"
11445 msgstr "日付: %s\n"
11446
11447 #. i18n: column positioning for "hg log"
11448 #, python-format
11449 msgid "trouble: %s\n"
11450 msgstr "trouble: %s\n"
11451
11452 #. i18n: column positioning for "hg log"
11453 msgid "files:"
11454 msgstr "ファイル: "
11455
11456 #. i18n: column positioning for "hg log"
11457 msgid "files+:"
11458 msgstr "ファイル追加:"
11459
11460 #. i18n: column positioning for "hg log"
11461 msgid "files-:"
11462 msgstr "ファイル削除:"
11463
11464 #. i18n: column positioning for "hg log"
11465 #, python-format
11466 msgid "files: %s\n"
11467 msgstr "ファイル: %s\n"
11468
11469 #. i18n: column positioning for "hg log"
11470 #, python-format
11471 msgid "copies: %s\n"
11472 msgstr "コピー: %s\n"
11473
11474 #. i18n: column positioning for "hg log"
11475 #, python-format
11476 msgid "extra: %s=%s\n"
11477 msgstr "その他: %s=%s\n"
11478
11479 msgid "description:\n"
11480 msgstr "説明:\n"
11481
11482 #. i18n: column positioning for "hg log"
11483 #, python-format
11484 msgid "summary: %s\n"
11485 msgstr "要約: %s\n"
11486
11487 #, python-format
11488 msgid "found revision %s from %s\n"
13609 msgid "found revision %s from %s\n"
11489 msgstr "リビジョン %s (%s) が指定日時に合致します\n"
13610 msgstr "リビジョン %s (%s) が指定日時に合致します\n"
11490
13611
@@ -11503,10 +13624,6 b' msgid "can only follow copies/renames fo'
11503 msgstr "ファイル名が明示された場合のみ複製/改名を追跡可能です"
13624 msgstr "ファイル名が明示された場合のみ複製/改名を追跡可能です"
11504
13625
11505 #, python-format
13626 #, python-format
11506 msgid "-G/--graph option is incompatible with --%s"
11507 msgstr "-G/--graph と --%s は併用できません"
11508
11509 #, python-format
11510 msgid "adding %s\n"
13627 msgid "adding %s\n"
11511 msgstr "%s を追加登録中\n"
13628 msgstr "%s を追加登録中\n"
11512
13629
@@ -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"'
11514 msgid "skipping missing subrepository: %s\n"
13631 msgid "skipping missing subrepository: %s\n"
11515 msgstr "存在しないサブリポジトリへの処理を省略: %s\n"
13632 msgstr "存在しないサブリポジトリへの処理を省略: %s\n"
11516
13633
13634 msgid "cannot specify both --dry-run and --interactive"
13635 msgstr "--dry-run と --interactive は併用できません"
13636
13637 msgid ""
13638 "[Ynsa?]$$ &Yes, forget this file$$ &No, skip this file$$ &Skip remaining "
13639 "files$$ Include &all remaining files$$ &? (display help)"
13640 msgstr ""
13641 "[Ynsa?]$$ このファイルを登録除外 (&yes)$$ このファイルは無視 (&no)$$残りの"
13642 "ファイルを全て無視 (&skip)$$ 残りのファイルを全て登録除外 (&all)$$ヘルプ表示"
13643 "(&?)"
13644
13645 #, python-format
13646 msgid "forget %s %s"
13647 msgstr "%s の登録除外 %s"
13648
11517 msgid "searching"
13649 msgid "searching"
11518 msgstr "検索中"
13650 msgstr "検索中"
11519
13651
@@ -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"'
11551 msgid "copying changeset %s to %s\n"
13683 msgid "copying changeset %s to %s\n"
11552 msgstr "リビジョン %s を %s にコピー中\n"
13684 msgstr "リビジョン %s を %s にコピー中\n"
11553
13685
11554 #, python-format
11555 msgid "stripping intermediate changeset %s\n"
11556 msgstr "中途リビジョン %s を除外中\n"
11557
11558 #, python-format
11559 msgid "stripping amended changeset %s\n"
11560 msgstr "改変対象リビジョン %s を除外中\n"
11561
11562 msgid "Leave message empty to abort commit."
13686 msgid "Leave message empty to abort commit."
11563 msgstr "メッセージが空のままならコミットを中止します。"
13687 msgstr "メッセージが空のままならコミットを中止します。"
11564
13688
@@ -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"'
11685 msgid "repository root directory or name of overlay bundle file"
13809 msgid "repository root directory or name of overlay bundle file"
11686 msgstr "リポジトリのルート位置、 またはバンドルファイルのパス"
13810 msgstr "リポジトリのルート位置、 またはバンドルファイルのパス"
11687
13811
11688 msgid "DIR"
11689 msgstr "ディレクトリ"
11690
11691 msgid "change working directory"
13812 msgid "change working directory"
11692 msgstr "作業領域の変更"
13813 msgstr "作業領域の変更"
11693
13814
@@ -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"'
11750 msgid "when to paginate (boolean, always, auto, or never)"
13871 msgid "when to paginate (boolean, always, auto, or never)"
11751 msgstr "ページャの要否 (真偽値、 always auto または never)"
13872 msgstr "ページャの要否 (真偽値、 always auto または never)"
11752
13873
11753 msgid "do not perform actions, just print output"
11754 msgstr "実施予定の処理内容の表示のみで処理実施は抑止"
11755
11756 msgid "specify ssh command to use"
11757 msgstr "SSH 連携で使用する ssh コマンド"
11758
11759 msgid "specify hg command to run on the remote side"
11760 msgstr "遠隔ホスト側で実行される hg コマンド"
11761
11762 msgid "do not verify server certificate (ignoring web.cacerts config)"
11763 msgstr "接続先証明書の検証省略(web.cacerts 設定の無視)"
11764
11765 msgid "PATTERN"
11766 msgstr "パターン"
11767
11768 msgid "include names matching the given patterns"
11769 msgstr "パターンに合致したファイルを処理対象に追加"
11770
11771 msgid "exclude names matching the given patterns"
11772 msgstr "パターンに合致したファイルを処理対象から除外"
11773
11774 msgid "read commit message from file"
11775 msgstr "コミットログをファイルから読み込み"
11776
11777 msgid "record the specified date as commit date"
11778 msgstr "指定日時をコミット日時として記録"
11779
11780 msgid "record the specified user as committer"
11781 msgstr "指定ユーザをコミットユーザとして記録"
11782
11783 msgid "display with template (EXPERIMENTAL)"
11784 msgstr "当該テンプレートで表示をカスタマイズ (実験的実装)"
11785
11786 msgid "STYLE"
11787 msgstr "スタイル"
11788
11789 msgid "display using template map file (DEPRECATED)"
11790 msgstr "当該スタイルで表示をカスタマイズ (非推奨)"
11791
11792 msgid "display with template"
11793 msgstr "当該テンプレートで表示をカスタマイズ"
11794
11795 msgid "do not show merges"
11796 msgstr "マージ実施リビジョンの表示抑止"
11797
11798 msgid "show the revision DAG"
11799 msgstr "履歴ツリーの表示"
11800
11801 msgid "treat all files as text"
11802 msgstr "全ファイルをテキストファイルと仮定"
11803
11804 msgid "generate binary diffs in git mode (default)"
11805 msgstr "git モード時にバイナリ差分を生成 (デフォルト挙動)"
11806
11807 msgid "omit dates from diff headers"
11808 msgstr "差分表示の際に日付情報の表示を抑止"
11809
11810 msgid "ignore white space when comparing lines"
11811 msgstr "差分判定の際に空白文字を無視"
11812
11813 msgid "ignore changes in the amount of white space"
11814 msgstr "差分判定の際に空白文字の数を無視"
11815
11816 msgid "ignore changes whose lines are all blank"
11817 msgstr "差分判定の際に空白行を無視"
11818
11819 msgid "omit a/ and b/ prefixes from filenames"
11820 msgstr "ファイル名の接頭辞 a/ と b/ の省略"
11821
11822 msgid "show which function each change is in"
11823 msgstr "差分表示の際に関数名情報を表示"
11824
11825 msgid "produce a diff that undoes the changes"
11826 msgstr "変更を取り消すための差分を生成"
11827
11828 msgid "number of lines of context to show"
11829 msgstr "差分コンテキストの行数"
11830
11831 msgid "produce diffs relative to subdirectory"
11832 msgstr "差分生成の起点ディレクトリ指定"
11833
11834 msgid "SIMILARITY"
11835 msgstr "類似度"
11836
11837 msgid "guess renamed files by similarity (0<=s<=100)"
11838 msgstr "ファイル改名推定の際の類似度(0 以上 100 以下)"
11839
11840 msgid "recurse into subrepositories"
11841 msgstr "サブリポジトリへの再帰的適用"
11842
11843 msgid "open changelog"
11844 msgstr "変更履歴の読み込み"
11845
11846 msgid "open manifest"
11847 msgstr "マニフェストの読み込み"
11848
11849 msgid "open directory manifest"
11850 msgstr "ディレクトリマニフェストの読み込み"
11851
11852 msgid "[OPTION]... [FILE]..."
11853 msgstr "[OPTION]... [FILE]..."
11854
11855 msgid "add the specified files on the next commit"
13874 msgid "add the specified files on the next commit"
11856 msgstr "指定ファイルの追加登録予約"
13875 msgstr "指定ファイルの追加登録予約"
11857
13876
@@ -12043,9 +14062,6 b' msgstr ""'
12043 " foobar.c\n"
14062 " foobar.c\n"
12044 " r foobar.c"
14063 " r foobar.c"
12045
14064
12046 msgid "similarity must be a number"
12047 msgstr "類似度には数値を指定してください"
12048
12049 msgid "annotate the specified revision"
14065 msgid "annotate the specified revision"
12050 msgstr "当該リビジョン時点での由来情報を表示"
14066 msgstr "当該リビジョン時点での由来情報を表示"
12051
14067
@@ -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"'
12073 msgid "show line number at the first appearance"
14089 msgid "show line number at the first appearance"
12074 msgstr "由来リビジョンでの初出時の行番号を表示"
14090 msgstr "由来リビジョンでの初出時の行番号を表示"
12075
14091
14092 msgid "revision to not display (EXPERIMENTAL)"
14093 msgstr "非表示リビジョン (実験的実装)"
14094
12076 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
14095 msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
12077 msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
14096 msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
12078
14097
@@ -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"'
12545 msgid "incompatible arguments"
14564 msgid "incompatible arguments"
12546 msgstr "不正な引数の組み合わせです"
14565 msgstr "不正な引数の組み合わせです"
12547
14566
14567 #, python-format
14568 msgid "%s and %s are incompatible"
14569 msgstr "%s と %s は併用できません"
14570
12548 msgid "current bisect revision is unknown - start a new bisect to fix"
14571 msgid "current bisect revision is unknown - start a new bisect to fix"
12549 msgstr "未知のリビジョンが検証対象です - 探索を最初からやり直してください"
14572 msgstr "未知のリビジョンが検証対象です - 探索を最初からやり直してください"
12550
14573
@@ -12637,6 +14660,13 b' msgstr ""'
12637 " 履歴の分岐は :hg:`merge` で解消してください。"
14660 " 履歴の分岐は :hg:`merge` で解消してください。"
12638
14661
12639 msgid ""
14662 msgid ""
14663 " Specifying bookmark as '.' to -m or -d options is equivalent to "
14664 "specifying\n"
14665 " the active bookmark's name."
14666 msgstr ""
14667 " オプション -m/-d での '.' 指定は、 アクティブブックマーク指定と等価です"
14668
14669 msgid ""
12640 " A bookmark named '@' has the special property that :hg:`clone` will\n"
14670 " A bookmark named '@' has the special property that :hg:`clone` will\n"
12641 " check it out by default if it exists."
14671 " check it out by default if it exists."
12642 msgstr ""
14672 msgstr ""
@@ -12677,20 +14707,6 b' msgstr ""'
12677 " hg book -f @\n"
14707 " hg book -f @\n"
12678 " "
14708 " "
12679
14709
12680 msgid "bookmark names cannot consist entirely of whitespace"
12681 msgstr "空白文字だけで構成されたブックマーク名は不正です"
12682
12683 #, python-format
12684 msgid "moving bookmark '%s' forward from %s\n"
12685 msgstr "ブックマーク '%s' を %s から前方に移動中\n"
12686
12687 #, python-format
12688 msgid "bookmark '%s' already exists (use -f to force)"
12689 msgstr "ブックマーク '%s' は存在します(強制実行する場合は -f を指定)"
12690
12691 msgid "a bookmark cannot have the name of an existing branch"
12692 msgstr "既存ブランチと同名のブックマークは作成できません"
12693
12694 msgid "--delete and --rename are incompatible"
14710 msgid "--delete and --rename are incompatible"
12695 msgstr "--delete と --rename は併用できません"
14711 msgstr "--delete と --rename は併用できません"
12696
14712
@@ -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"'
12703 msgid "bookmark name required"
14719 msgid "bookmark name required"
12704 msgstr "ブックマーク名指定が必要です"
14720 msgstr "ブックマーク名指定が必要です"
12705
14721
12706 #, python-format
12707 msgid "bookmark '%s' does not exist"
12708 msgstr "ブックマーク '%s' は存在しません"
12709
12710 msgid "new bookmark name required"
14722 msgid "new bookmark name required"
12711 msgstr "新しいブックマーク名が必要です"
14723 msgstr "新しいブックマーク名が必要です"
12712
14724
12713 msgid "only one new bookmark name allowed"
14725 msgid "only one new bookmark name allowed"
12714 msgstr "新規ブックマーク名の指定は1つだけです"
14726 msgstr "新規ブックマーク名の指定は1つだけです"
12715
14727
12716 msgid "no bookmarks set\n"
12717 msgstr "ブックマークは存在しません\n"
12718
12719 msgid "no active bookmark\n"
14728 msgid "no active bookmark\n"
12720 msgstr "アクティブなブックマークがありません\n"
14729 msgstr "アクティブなブックマークがありません\n"
12721
14730
@@ -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"'
12725 msgid "reset branch name to parent branch name"
14734 msgid "reset branch name to parent branch name"
12726 msgstr "ブランチ名設定を解消し、 親リビジョンのブランチに戻る"
14735 msgstr "ブランチ名設定を解消し、 親リビジョンのブランチに戻る"
12727
14736
14737 msgid "change branches of the given revs (EXPERIMENTAL)"
14738 msgstr "指定リビジョンのブランチを変更 (実験的実装)"
14739
12728 msgid "[-fC] [NAME]"
14740 msgid "[-fC] [NAME]"
12729 msgstr "[-fC] [NAME]"
14741 msgstr "[-fC] [NAME]"
12730
14742
@@ -12779,13 +14791,13 b' msgstr ""'
12779 " 現ブランチヘッドの閉鎖には :hg:`commit --close-branch` を使用します。\n"
14791 " 現ブランチヘッドの閉鎖には :hg:`commit --close-branch` を使用します。\n"
12780 " 全ブランチヘッドの閉鎖をもって、 当該ブランチの閉鎖とみなします。"
14792 " 全ブランチヘッドの閉鎖をもって、 当該ブランチの閉鎖とみなします。"
12781
14793
14794 msgid "no branch name specified for the revisions"
14795 msgstr "指定リビジョンに対するブランチ名指定がありません"
14796
12782 #, python-format
14797 #, python-format
12783 msgid "reset working directory to branch %s\n"
14798 msgid "reset working directory to branch %s\n"
12784 msgstr "作業領域のブランチを %s にリセット\n"
14799 msgstr "作業領域のブランチを %s にリセット\n"
12785
14800
12786 msgid "a branch of the same name already exists"
12787 msgstr "同じ名前のブランチがすでに存在します"
12788
12789 #. i18n: "it" refers to an existing branch
14801 #. i18n: "it" refers to an existing branch
12790 msgid "use 'hg update' to switch to it"
14802 msgid "use 'hg update' to switch to it"
12791 msgstr "作業領域を既存ブランチに切り替えるには 'hg update' を使用してください"
14803 msgstr "作業領域を既存ブランチに切り替えるには 'hg update' を使用してください"
@@ -12856,7 +14868,9 b' msgstr "[-f] [-t BUNDLESPEC] [-a] [-r RE'
12856 msgid "create a bundle file"
14868 msgid "create a bundle file"
12857 msgstr "バンドルファイルの生成"
14869 msgstr "バンドルファイルの生成"
12858
14870
12859 msgid " Generate a bundle file containing data to be added to a repository."
14871 msgid ""
14872 " Generate a bundle file containing data to be transferred to another\n"
14873 " repository."
12860 msgstr ""
14874 msgstr ""
12861 " 連携対象リポジトリに無い履歴情報を、 バンドルファイルに書き出します。"
14875 " 連携対象リポジトリに無い履歴情報を、 バンドルファイルに書き出します。"
12862
14876
@@ -12865,7 +14879,8 b' msgid ""'
12865 " (or --base null). Otherwise, hg assumes the destination will have\n"
14879 " (or --base null). Otherwise, hg assumes the destination will have\n"
12866 " all the nodes you specify with --base parameters. Otherwise, hg\n"
14880 " all the nodes you specify with --base parameters. Otherwise, hg\n"
12867 " will assume the repository has all the nodes in destination, or\n"
14881 " will assume the repository has all the nodes in destination, or\n"
12868 " default-push/default if no destination is specified."
14882 " default-push/default if no destination is specified, where destination\n"
14883 " is the repository you provide through DEST option."
12869 msgstr ""
14884 msgstr ""
12870 " -a/--all (又は --base null) 指定がある場合、 バンドルファイルには、\n"
14885 " -a/--all (又は --base null) 指定がある場合、 バンドルファイルには、\n"
12871 " リポジトリの全ての履歴が書き出されます。 明示的な --base 指定の場合、\n"
14886 " リポジトリの全ての履歴が書き出されます。 明示的な --base 指定の場合、\n"
@@ -12957,10 +14972,13 b' msgstr ""'
12957
14972
12958 msgid ""
14973 msgid ""
12959 " Output may be to a file, in which case the name of the file is\n"
14974 " Output may be to a file, in which case the name of the file is\n"
12960 " given using a format string. The formatting rules as follows:"
14975 " given using a template string. See :hg:`help templates`. In addition\n"
12961 msgstr ""
14976 " to the common template keywords, the following formatting rules are\n"
12962 " 出力先指定(置換指定可能)がある場合、 出力はファイルに保存されます。\n"
14977 " supported:"
12963 " 置換指定として以下のものが使用可能です:"
14978 msgstr ""
14979 " 出力先指定には、 テンプレート文字列を使用可能です。 詳細は\n"
14980 " :hg:`help templates` を参照してください。\n"
14981 " 標準テンプレートキーワードに加えて、 以下のものも使用可能です:"
12964
14982
12965 msgid ""
14983 msgid ""
12966 " :``%%``: literal \"%\" character\n"
14984 " :``%%``: literal \"%\" character\n"
@@ -12971,7 +14989,8 b' msgid ""'
12971 " :``%R``: changeset revision number\n"
14989 " :``%R``: changeset revision number\n"
12972 " :``%h``: short-form changeset hash (12 hexadecimal digits)\n"
14990 " :``%h``: short-form changeset hash (12 hexadecimal digits)\n"
12973 " :``%r``: zero-padded changeset revision number\n"
14991 " :``%r``: zero-padded changeset revision number\n"
12974 " :``%b``: basename of the exporting repository"
14992 " :``%b``: basename of the exporting repository\n"
14993 " :``\\``: literal \"\\\" character"
12975 msgstr ""
14994 msgstr ""
12976 " :``%%``: \"%\" 文字そのもの\n"
14995 " :``%%``: \"%\" 文字そのもの\n"
12977 " :``%s``: 対象ファイルパスの末尾要素\n"
14996 " :``%s``: 対象ファイルパスの末尾要素\n"
@@ -12981,7 +15000,8 b' msgstr ""'
12981 " :``%R``: リビジョン番号\n"
15000 " :``%R``: リビジョン番号\n"
12982 " :``%h``: 短縮形式ハッシュ値(12 桁 16 進数)\n"
15001 " :``%h``: 短縮形式ハッシュ値(12 桁 16 進数)\n"
12983 " :``%r``: ゼロ詰めのリビジョン番号\n"
15002 " :``%r``: ゼロ詰めのリビジョン番号\n"
12984 " :``%b``: 対象リポジトリパスの末尾要素"
15003 " :``%b``: 対象リポジトリパスの末尾要素\n"
15004 " :``\\``: \"\\\" 文字そのもの"
12985
15005
12986 msgid "the clone will include an empty working directory (only a repository)"
15006 msgid "the clone will include an empty working directory (only a repository)"
12987 msgstr "複製先の作業領域を空にする(管理領域のみの複製)"
15007 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)"'
12989 msgid "revision, tag, or branch to check out"
15009 msgid "revision, tag, or branch to check out"
12990 msgstr "作業領域更新用リビジョン(タグ名/ブランチ名指定可)"
15010 msgstr "作業領域更新用リビジョン(タグ名/ブランチ名指定可)"
12991
15011
12992 msgid "include the specified changeset"
15012 msgid "do not clone everything, but include this changeset and its ancestors"
12993 msgstr "複製対象に含めるリビジョン"
15013 msgstr "指定リビジョンとその祖先のみを複製"
12994
15014
12995 msgid "clone only the specified branch"
15015 msgid ""
12996 msgstr "指定ブランチのみを複製"
15016 "do not clone everything, but include this branch's changesets and their "
15017 "ancestors"
15018 msgstr "指定ブランチ中のリビジョンとその祖先のみを複製"
15019
15020 msgid "an alias to --stream (DEPRECATED)"
15021 msgstr "--stream の別名 (非推奨)"
15022
15023 msgid "clone with minimal data processing"
15024 msgstr "最小限のデータ処理のみでの複製"
12997
15025
12998 msgid "[OPTION]... SOURCE [DEST]"
15026 msgid "[OPTION]... SOURCE [DEST]"
12999 msgstr "[OPTION]... SOURCE [DEST]"
15027 msgstr "[OPTION]... SOURCE [DEST]"
@@ -13055,6 +15083,29 b' msgstr ""'
13055 " 同様に振舞います。"
15083 " 同様に振舞います。"
13056
15084
13057 msgid ""
15085 msgid ""
15086 " In normal clone mode, the remote normalizes repository data into a "
15087 "common\n"
15088 " exchange format and the receiving end translates this data into its "
15089 "local\n"
15090 " storage format. --stream activates a different clone mode that "
15091 "essentially\n"
15092 " copies repository files from the remote with minimal data processing. "
15093 "This\n"
15094 " significantly reduces the CPU cost of a clone both remotely and "
15095 "locally.\n"
15096 " However, it often increases the transferred data size by 30-40%. This "
15097 "can\n"
15098 " result in substantially faster clones where I/O throughput is "
15099 "plentiful,\n"
15100 " especially for larger repositories. A side-effect of --stream clones is\n"
15101 " that storage settings and requirements on the remote are applied "
15102 "locally:\n"
15103 " a modern client may inherit legacy or inefficient storage used by the\n"
15104 " remote or a legacy Mercurial client may not be able to clone from a\n"
15105 " modern Mercurial remote."
15106 msgstr ""
15107
15108 msgid ""
13058 " Specifying a tag will include the tagged changeset but not the\n"
15109 " Specifying a tag will include the tagged changeset but not the\n"
13059 " changeset containing the tag."
15110 " changeset containing the tag."
13060 msgstr ""
15111 msgstr ""
@@ -13077,32 +15128,6 b' msgstr ""'
13077 " を指定することで、 ハードリンク使用を抑止してください。"
15128 " を指定することで、 ハードリンク使用を抑止してください。"
13078
15129
13079 msgid ""
15130 msgid ""
13080 " In some cases, you can clone repositories and the working\n"
13081 " directory using full hardlinks with ::"
13082 msgstr ""
13083 " リポジトリの内部管理データと作業領域中のファイル全てに対する、\n"
13084 " ハードリンクによる複製の作成には、 以下の方法が使えるかも知れません::"
13085
13086 msgid " $ cp -al REPO REPOCLONE"
13087 msgstr " $ cp -al REPO REPOCLONE"
13088
13089 msgid ""
13090 " This is the fastest way to clone, but it is not always safe. The\n"
13091 " operation is not atomic (making sure REPO is not modified during\n"
13092 " the operation is up to you) and you have to make sure your\n"
13093 " editor breaks hardlinks (Emacs and most Linux Kernel tools do\n"
13094 " so). Also, this is not compatible with certain extensions that\n"
13095 " place their metadata under the .hg directory, such as mq."
13096 msgstr ""
13097 " この方法は最速の複製方法かもしれませんが、 常に安全とは限りません。\n"
13098 " 操作の単一性は保障されません (複製中のリポジトリの変更防止は、 \n"
13099 " 利用者責務) し、 利用するエディタのファイル変更時の振る舞いが、\n"
13100 " ハードリンクを破棄するものである必要があります (Emacs および多くの\n"
13101 " Linux 系ツールは、 そのように振舞います)。 この制約は、\n"
13102 " MQ エクステンションのように、 .hg ディレクトリ配下に、\n"
13103 " 管理情報を格納するツールとは相容れません。"
13104
13105 msgid ""
13106 " Mercurial will update the working directory to the first applicable\n"
15131 " Mercurial will update the working directory to the first applicable\n"
13107 " revision from this list:"
15132 " revision from this list:"
13108 msgstr ""
15133 msgstr ""
@@ -13136,19 +15161,19 b' msgstr ""'
13136
15161
13137 msgid ""
15162 msgid ""
13138 " When cloning from servers that support it, Mercurial may fetch\n"
15163 " When cloning from servers that support it, Mercurial may fetch\n"
13139 " pre-generated data from a server-advertised URL. When this is done,\n"
15164 " pre-generated data from a server-advertised URL or inline from the\n"
13140 " hooks operating on incoming changesets and changegroups may fire "
15165 " same stream. When this is done, hooks operating on incoming "
13141 "twice,\n"
15166 "changesets\n"
13142 " once for the bundle fetched from the URL and another for any "
15167 " and changegroups may fire more than once, once for each pre-generated\n"
13143 "additional\n"
15168 " bundle and as well as for any additional remaining data. In addition,\n"
13144 " data not fetched from this URL. In addition, if an error occurs, the\n"
15169 " if an error occurs, the repository may be rolled back to a partial\n"
13145 " repository may be rolled back to a partial clone. This behavior may\n"
15170 " clone. This behavior may change in future releases.\n"
13146 " change in future releases. See :hg:`help -e clonebundles` for more."
15171 " See :hg:`help -e clonebundles` for more."
13147 msgstr ""
15172 msgstr ""
13148 " サーバ経由で複製した場合、 サーバ側で事前に作成されたデータを元に、\n"
15173 " サーバ経由で複製した場合、 サーバ側で事前に作成されたデータを元に、\n"
13149 " 複製を行う可能性があります (サーバ側設定次第)。 そのような場合、\n"
15174 " 複製を行う可能性があります (サーバ側設定次第)。 そのような場合、\n"
13150 " incoming, changegroup 系フックが、 事前作成データの取り込みで一度、\n"
15175 " incoming, changegroups 系フックが、 事前作成データに対して一度、\n"
13151 " 追加履歴の取り込みでもう一度、 合計二度実行されることになります。\n"
15176 " 残りの履歴情報に対してもう一度、 合計二度実行されることになります。\n"
13152 " また、 エラーでの複製中断時も、 複製先に履歴が残る可能性があります。\n"
15177 " また、 エラーでの複製中断時も、 複製先に履歴が残る可能性があります。\n"
13153 " この挙動は将来変更されるかもしれません。\n"
15178 " この挙動は将来変更されるかもしれません。\n"
13154 " 詳細は :hg:`help -e clonebundles` を参照してください。"
15179 " 詳細は :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)::"'
13172 msgid " hg clone ssh://user@server//home/projects/alpha/"
15197 msgid " hg clone ssh://user@server//home/projects/alpha/"
13173 msgstr " hg clone ssh://user@server//home/projects/alpha/"
15198 msgstr " hg clone ssh://user@server//home/projects/alpha/"
13174
15199
13175 msgid ""
15200 msgid " - do a streaming clone while checking out a specified version::"
13176 " - do a high-speed clone over a LAN while checking out a\n"
15201 msgstr " - stream 方式での複製と、 指定リビジョンでの作業領域更新::"
13177 " specified version::"
15202
13178 msgstr " - LAN 経由での高速複製と、 特定リビジョンでの作業領域更新::"
15203 msgid " hg clone --stream http://server/repo -u 1.5"
13179
15204 msgstr " hg clone --stream http://server/repo -u 1.5"
13180 msgid " hg clone --uncompressed http://server/repo -u 1.5"
13181 msgstr " hg clone --uncompressed http://server/repo -u 1.5"
13182
15205
13183 msgid ""
15206 msgid ""
13184 " - create a repository without changesets after a particular revision::"
15207 " - 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"'
13199 msgid "cannot specify both --noupdate and --updaterev"
15222 msgid "cannot specify both --noupdate and --updaterev"
13200 msgstr "--noupdate と --updaterev は併用できません"
15223 msgstr "--noupdate と --updaterev は併用できません"
13201
15224
13202 msgid "mark new/missing files as added/removed before committing"
13203 msgstr "新規/不在ファイルを、コミット前に登録/除外対象化"
13204
13205 msgid "mark a branch head as closed"
15225 msgid "mark a branch head as closed"
13206 msgstr "ブランチヘッドを閉鎖します"
15226 msgstr "ブランチヘッドを閉鎖します"
13207
15227
@@ -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"'
13211 msgid "use the secret phase for committing"
15231 msgid "use the secret phase for committing"
13212 msgstr "secret フェーズでコミット中"
15232 msgstr "secret フェーズでコミット中"
13213
15233
13214 msgid "use interactive mode"
13215 msgstr "操作対象変更の対話的な選択"
13216
13217 msgid "commit the specified files or all outstanding changes"
15234 msgid "commit the specified files or all outstanding changes"
13218 msgstr "指定ファイルまたは全ての変更内容のリポジトリへの記録"
15235 msgstr "指定ファイルまたは全ての変更内容のリポジトリへの記録"
13219
15236
@@ -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"'
13329 msgid "cannot amend with ui.commitsubrepos enabled"
15346 msgid "cannot amend with ui.commitsubrepos enabled"
13330 msgstr "ui.commitsubrepos が有効になっている場合は --amend を使用できません"
15347 msgstr "ui.commitsubrepos が有効になっている場合は --amend を使用できません"
13331
15348
13332 msgid "cannot amend public changesets"
13333 msgstr "public フェーズのリビジョンは改変できません"
13334
13335 msgid "cannot amend while merging"
13336 msgstr "マージ実施中の作業領域では改変できません"
13337
13338 msgid "cannot amend changeset with children"
13339 msgstr "子リビジョンを持つリビジョンは改変できません"
13340
13341 msgid "show untrusted configuration options"
15349 msgid "show untrusted configuration options"
13342 msgstr "信頼できない設定項目も表示"
15350 msgstr "信頼できない設定項目も表示"
13343
15351
@@ -13369,10 +15377,10 b' msgstr ""'
13369
15377
13370 msgid ""
15378 msgid ""
13371 " With multiple arguments, print names and values of all config\n"
15379 " With multiple arguments, print names and values of all config\n"
13372 " items with matching section names."
15380 " items with matching section names or section.names."
13373 msgstr ""
15381 msgstr ""
13374 " 複数の引数が指定された場合、 それらをセクション名とみなし、 該当する\n"
15382 " 複数の引数が指定された場合、 それらを ``セクション名`` または\n"
13375 " セクションの設定項目を全て表示します。"
15383 " ``セクション名.項目名`` とみなし、 該当する設定項目を全て表示します。"
13376
15384
13377 msgid ""
15385 msgid ""
13378 " With --edit, start an editor on the user-level config file. With\n"
15386 " 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"'
13406 msgid "edit failed"
15414 msgid "edit failed"
13407 msgstr "編集に失敗"
15415 msgstr "編集に失敗"
13408
15416
13409 msgid "only one config item permitted"
13410 msgstr "複数の設定項目指定は無効です"
13411
13412 msgid "record a copy that has already occurred"
15417 msgid "record a copy that has already occurred"
13413 msgstr "手動で複製済みのファイルに対して、 複製の旨を記録"
15418 msgstr "手動で複製済みのファイルに対して、 複製の旨を記録"
13414
15419
@@ -13454,6 +15459,21 b' msgstr ""'
13454 " 成功時のコマンドの終了値は 0、 エラー発生時は 1 です。\n"
15459 " 成功時のコマンドの終了値は 0、 エラー発生時は 1 です。\n"
13455 " "
15460 " "
13456
15461
15462 msgid "[COMMAND]"
15463 msgstr "[COMMAND]"
15464
15465 msgid "list all available commands and options"
15466 msgstr "利用可能な全コマンド/オプションの一覧表示"
15467
15468 msgid "show the command options"
15469 msgstr "当該コマンドのオプション一覧の表示"
15470
15471 msgid "[-o] CMD"
15472 msgstr "[-o] CMD"
15473
15474 msgid "returns the completion list associated with the given command"
15475 msgstr "指定コマンドの補完用リストの取得"
15476
13457 msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
15477 msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
13458 msgstr "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
15478 msgstr "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
13459
15479
@@ -13583,13 +15603,6 b' msgstr ""'
13583 " 当該リビジョンの第1親に固定されているためです。"
15603 " 当該リビジョンの第1親に固定されているためです。"
13584
15604
13585 msgid ""
15605 msgid ""
13586 " Output may be to a file, in which case the name of the file is\n"
13587 " given using a format string. The formatting rules are as follows:"
13588 msgstr ""
13589 " 出力先指定(置換指定可能)がある場合、 出力はファイルに保存されます。\n"
13590 " 置換指定として以下のものが使用可能です:"
13591
13592 msgid ""
13593 " :``%%``: literal \"%\" character\n"
15606 " :``%%``: literal \"%\" character\n"
13594 " :``%H``: changeset hash (40 hexadecimal digits)\n"
15607 " :``%H``: changeset hash (40 hexadecimal digits)\n"
13595 " :``%N``: number of patches being generated\n"
15608 " :``%N``: number of patches being generated\n"
@@ -13599,17 +15612,19 b' msgid ""'
13599 " :``%m``: first line of the commit message (only alphanumeric "
15612 " :``%m``: first line of the commit message (only alphanumeric "
13600 "characters)\n"
15613 "characters)\n"
13601 " :``%n``: zero-padded sequence number, starting at 1\n"
15614 " :``%n``: zero-padded sequence number, starting at 1\n"
13602 " :``%r``: zero-padded changeset revision number"
15615 " :``%r``: zero-padded changeset revision number\n"
15616 " :``\\``: literal \"\\\" character"
13603 msgstr ""
15617 msgstr ""
13604 " :``%%``: \"%\" 文字そのもの\n"
15618 " :``%%``: \"%\" 文字そのもの\n"
13605 " :``%H``: ハッシュ値(40 桁 16 進数)\n"
15619 " :``%H``: ハッシュ値(40 桁 16 進数)\n"
13606 " :``%N``: 生成されるファイルの総数\n"
15620 " :``%N``: 生成されるパッチファイルの総数\n"
13607 " :``%R``: リビジョン番号\n"
15621 " :``%R``: リビジョン番号\n"
13608 " :``%b``: 対象リポジトリパスの末尾要素\n"
15622 " :``%b``: 対象リポジトリパスの末尾要素\n"
13609 " :``%h``: 短縮形式ハッシュ値(12 桁 16 進数)\n"
15623 " :``%h``: 短縮形式ハッシュ値(12 桁 16 進数)\n"
13610 " :``%m``: コミットログの1行目 (英数字限定)\n"
15624 " :``%m``: コミットログの1行目 (英数字限定)\n"
13611 " :``%n``: 1から始まるゼロ詰めの通し番号\n"
15625 " :``%n``: 1から始まるゼロ詰めの通し番号\n"
13612 " :``%r``: ゼロ詰めのリビジョン番号"
15626 " :``%r``: ゼロ詰めのリビジョン番号\n"
15627 " :``\\``: \"\\\" 文字そのもの"
13613
15628
13614 msgid ""
15629 msgid ""
13615 " Without the -a/--text option, export will avoid generating diffs\n"
15630 " 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)"'
13824
15839
13825 msgid ""
15840 msgid ""
13826 " If --force is specified, revisions will be grafted even if they\n"
15841 " If --force is specified, revisions will be grafted even if they\n"
13827 " are already ancestors of or have been grafted to the destination.\n"
15842 " are already ancestors of, or have been grafted to, the destination.\n"
13828 " This is useful when the revisions have since been backed out."
15843 " This is useful when the revisions have since been backed out."
13829 msgstr ""
15844 msgstr ""
13830 " 移植対象リビジョン、 あるいはその移植先リビジョンが、 移植先にとって、\n"
15845 " 移植対象リビジョン、 あるいはその移植先リビジョンが、 移植先にとって、\n"
@@ -13910,8 +15925,8 b' msgid "graft"'
13910 msgstr "graft"
15925 msgstr "graft"
13911
15926
13912 #, python-format
15927 #, python-format
13913 msgid "skipping ungraftable merge revision %s\n"
15928 msgid "skipping ungraftable merge revision %d\n"
13914 msgstr "移植できないマージリビジョン %s を無視\n"
15929 msgstr "移植できないマージリビジョン %d を無視\n"
13915
15930
13916 #, python-format
15931 #, python-format
13917 msgid "skipping ancestor revision %d:%s\n"
15932 msgid "skipping ancestor revision %d:%s\n"
@@ -14175,9 +16190,13 b' msgstr ""'
14175
16190
14176 msgid ""
16191 msgid ""
14177 " When REV is not given, print a summary of the current state of the\n"
16192 " When REV is not given, print a summary of the current state of the\n"
14178 " repository."
16193 " repository including the working directory. Specify -r. to get "
14179 msgstr ""
16194 "information\n"
14180 " リビジョン指定無しで起動された場合は、 作業領域の状態を表示します。"
16195 " of the working directory parent without scanning uncommitted changes."
16196 msgstr ""
16197 " リビジョン指定無しで起動された場合は、 リポジトリの状態を表示します\n"
16198 " (作業領域状態含む)。 作業領域の未コミット変更等を無視する場合は、\n"
16199 " ``-r .`` を指定してください。"
14181
16200
14182 msgid ""
16201 msgid ""
14183 " Specifying a path to a repository root or Mercurial bundle will\n"
16202 " 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"'
14430 msgid "cannot use --no-commit with --bypass"
16449 msgid "cannot use --no-commit with --bypass"
14431 msgstr "--no-commit と --bypass は併用できません"
16450 msgstr "--no-commit と --bypass は併用できません"
14432
16451
16452 msgid "similarity must be a number"
16453 msgstr "類似度には数値を指定してください"
16454
14433 msgid "cannot use --similarity with --bypass"
16455 msgid "cannot use --similarity with --bypass"
14434 msgstr "--similarity と --bypass は併用できません"
16456 msgstr "--similarity と --bypass は併用できません"
14435
16457
@@ -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"'
14479 msgid ""
16501 msgid ""
14480 " Show new changesets found in the specified path/URL or the default\n"
16502 " Show new changesets found in the specified path/URL or the default\n"
14481 " pull location. These are the changesets that would have been pulled\n"
16503 " pull location. These are the changesets that would have been pulled\n"
14482 " if a pull at the time you issued this command."
16504 " by :hg:`pull` at the time you issued this command."
14483 msgstr ""
16505 msgstr ""
14484 " ファイルパス、 URL または :hg:`pull` の無指定時連携先リポジトリ中の、\n"
16506 " 連携先リポジトリ中の、 新規リビジョンを表示します (連携先は、\n"
14485 " 未取り込みリビジョンを検索します。 これらのリビジョンは\n"
16507 " 指定のファイルパス、 URL、 あるいは無指定時連携先リポジトリ設定)。\n"
14486 " :hg:`pull` を実行した際に、 取り込み対象となります。"
16508 " 表示されたリビジョンは :hg:`pull` 実行時に、 取り込み対象となります。"
14487
16509
14488 msgid " See pull for valid source format details."
16510 msgid " See pull for valid source format details."
14489 msgstr " 対象リポジトリの指定形式は :hg:`help pull` を参照してください。"
16511 msgstr " 対象リポジトリの指定形式は :hg:`help pull` を参照してください。"
@@ -14647,6 +16669,12 b' msgstr ""'
14647 msgid " See :hg:`help files` for a more versatile command."
16669 msgid " See :hg:`help files` for a more versatile command."
14648 msgstr " より高機能な :hg:`files` コマンドのヘルプを参照してください。"
16670 msgstr " より高機能な :hg:`files` コマンドのヘルプを参照してください。"
14649
16671
16672 msgid "follow line range of specified file (EXPERIMENTAL)"
16673 msgstr "指定ファイルの特定行範囲の変更を追跡 (実験的実装)"
16674
16675 msgid "FILE,RANGE"
16676 msgstr "ファイル,行範囲"
16677
14650 msgid "show revision history of entire repository or files"
16678 msgid "show revision history of entire repository or files"
14651 msgstr "リポジトリ全体またはファイルの変更履歴の表示"
16679 msgstr "リポジトリ全体またはファイルの変更履歴の表示"
14652
16680
@@ -14668,13 +16696,12 b' msgid ""'
14668 " File history is shown without following rename or copy history of\n"
16696 " File history is shown without following rename or copy history of\n"
14669 " files. Use -f/--follow with a filename to follow history across\n"
16697 " files. Use -f/--follow with a filename to follow history across\n"
14670 " renames and copies. --follow without a filename will only show\n"
16698 " renames and copies. --follow without a filename will only show\n"
14671 " ancestors or descendants of the starting revision."
16699 " ancestors of the starting revision."
14672 msgstr ""
16700 msgstr ""
14673 " ファイルの履歴表示では、 改名/複製の元ファイルにまでさかのぼった\n"
16701 " ファイルの履歴表示では、 改名/複製の元ファイルの履歴は表示しません。\n"
14674 " 履歴は表示しません。 元ファイルの履歴さかのぼる場合は、 ファイル名\n"
16702 " 元ファイルの履歴までさかのぼる場合は、 ファイル名と一緒に -f/--follow\n"
14675 " と一緒に -f/--follow を使用します。 --follow 指定の際にファイル名が\n"
16703 " を使用します。 --follow 指定の際にファイル名が指定されない場合は、\n"
14676 " 指定されない場合は、 開始リビジョンに連なるリビジョンのみを表示\n"
16704 " 表示開始対象リビジョンと、 その祖先のみを表示します。"
14677 " します。"
14678
16705
14679 msgid ""
16706 msgid ""
14680 " By default this command prints revision number and changeset id,\n"
16707 " By default this command prints revision number and changeset id,\n"
@@ -14691,15 +16718,36 b' msgstr ""'
14691 msgid ""
16718 msgid ""
14692 " With --graph the revisions are shown as an ASCII art DAG with the most\n"
16719 " With --graph the revisions are shown as an ASCII art DAG with the most\n"
14693 " recent changeset at the top.\n"
16720 " recent changeset at the top.\n"
14694 " 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,\n"
16721 " 'o' is a changeset, '@' is a working directory parent, '_' closes a "
14695 " and '+' represents a fork where the changeset from the lines below is a\n"
16722 "branch,\n"
14696 " parent of the 'o' merge on the same line."
16723 " 'x' is obsolete, '*' is unstable, and '+' represents a fork where the\n"
16724 " changeset from the lines below is a parent of the 'o' merge on the same\n"
16725 " line.\n"
16726 " Paths in the DAG are represented with '|', '/' and so forth. ':' in "
16727 "place\n"
16728 " of a '|' indicates one or more revisions in a path are omitted."
14697 msgstr ""
16729 msgstr ""
14698 " --graph 指定がある場合、 最新リビジョンを上にした履歴グラフ (DAG) を、\n"
16730 " --graph 指定がある場合、 最新リビジョンを上にした履歴グラフ (DAG) を、\n"
14699 " ASCII アートで描画します。 履歴グラフにおける 'o' はリビジョン、\n"
16731 " ASCII アートで描画します。 履歴グラフにおける 'o' は通常リビジョン、\n"
14700 " '@' は作業領域の親、 'x' は廃止 (obsoleted) リビジョンを意味します。\n"
16732 " '@' は作業領域の親、 '_' はブランチ閉鎖、 'x' は廃止 (obsoleted) \n"
16733 " '*' は非永続 (unstable) リビジョンを意味します。\n"
14701 " また '+' は、 同一行の 'o' が '+' 下方のリビジョンを親としたマージで、\n"
16734 " また '+' は、 同一行の 'o' が '+' 下方のリビジョンを親としたマージで、\n"
14702 " 且つこのマージによって、 履歴が枝分かれしていることを表します。"
16735 " 且つこのマージによって、 履歴が枝分かれしていることを表します。 グラフ"
16736 "中の履歴の枝葉は、 '|', '/' 等々で表現されます。 '|' の代わりに\n"
16737 " ':' が使用されている箇所は、 省略されたリビジョンの存在を表します。"
16738
16739 msgid ""
16740 " Use -L/--line-range FILE,M:N options to follow the history of lines\n"
16741 " from M to N in FILE. With -p/--patch only diff hunks affecting\n"
16742 " specified line range will be shown. This option requires --follow;\n"
16743 " it can be specified multiple times. Currently, this option is not\n"
16744 " compatible with --graph. This option is experimental."
16745 msgstr ""
16746 " -L/--line-range に関して: -L FILE,M:N は、 ファイル FILE\n"
16747 " の M 〜 N 行目の範囲に関連する履歴の指定となります。\n"
16748 " -p/--patch 指定時は、 当該範囲に関連する差分のみが表示されます。\n"
16749 " --follow との併用が必須です。 オプションは複数指定可能です。\n"
16750 " --graph とは併用できません。 まだ実験的実装段階です。"
14703
16751
14704 msgid ""
16752 msgid ""
14705 " :hg:`log --patch` may generate unexpected diff output for merge\n"
16753 " :hg:`log --patch` may generate unexpected diff output for merge\n"
@@ -14723,6 +16771,17 b' msgstr ""'
14723 " といったリビジョンが、 表示対象から除外される可能性があります。\n"
16771 " といったリビジョンが、 表示対象から除外される可能性があります。\n"
14724 " --removed 指定により、 これらを含む全リビジョンが表示されます。"
16772 " --removed 指定により、 これらを含む全リビジョンが表示されます。"
14725
16773
16774 msgid ""
16775 " The history resulting from -L/--line-range options depends on "
16776 "diff\n"
16777 " options; for instance if white-spaces are ignored, respective "
16778 "changes\n"
16779 " with only white-spaces in specified line range will not be listed."
16780 msgstr ""
16781 " -L/--line-range 指定時の履歴は、 diff 表示設定の影響を受けます。\n"
16782 " 例: 空白文字を無視する場合、 指定範囲の変更を行っている履歴でも、\n"
16783 " 空白文字の変更のみの履歴は、 無視されます。"
16784
14726 msgid " - changesets with full descriptions and file lists::"
16785 msgid " - changesets with full descriptions and file lists::"
14727 msgstr " - 全リビジョンのコミットログとファイル一覧の表示::"
16786 msgstr " - 全リビジョンのコミットログとファイル一覧の表示::"
14728
16787
@@ -14793,6 +16852,21 b' msgid ""'
14793 msgstr ""
16852 msgstr ""
14794 " hg log -r \"last(tagged())::\" --template \"{desc|firstline}\\n\""
16853 " hg log -r \"last(tagged())::\" --template \"{desc|firstline}\\n\""
14795
16854
16855 msgid " - changesets touching lines 13 to 23 for file.c::"
16856 msgstr " - file.c の 13 〜 23 行目に関連する履歴::"
16857
16858 msgid " hg log -L file.c,13:23"
16859 msgstr " hg log -L file.c,13:23"
16860
16861 msgid ""
16862 " - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of\n"
16863 " main.c with patch::"
16864 msgstr ""
16865 " - file.c の 13 〜 23 行目と、 main.c の 2 〜 6 行目に関連する履歴::"
16866
16867 msgid " hg log -L file.c,13:23 -L main.c,2:6 -p"
16868 msgstr " hg log -L file.c,13:23 -L main.c,2:6 -p"
16869
14796 msgid ""
16870 msgid ""
14797 " See :hg:`help revisions` for more about specifying and ordering\n"
16871 " See :hg:`help revisions` for more about specifying and ordering\n"
14798 " revisions."
16872 " revisions."
@@ -14801,10 +16875,19 b' msgstr ""'
14801
16875
14802 msgid ""
16876 msgid ""
14803 " See :hg:`help templates` for more about pre-packaged styles and\n"
16877 " See :hg:`help templates` for more about pre-packaged styles and\n"
14804 " specifying custom templates."
16878 " specifying custom templates. The default template used by the log\n"
16879 " command can be customized via the ``ui.logtemplate`` configuration\n"
16880 " setting."
14805 msgstr ""
16881 msgstr ""
14806 " 同梱されているスタイルや、テンプレートのカスタマイズ等の詳細は、\n"
16882 " 同梱されているスタイルや、テンプレートのカスタマイズ等の詳細は、\n"
14807 " :hg:`help templates` を参照してください。"
16883 " :hg:`help templates` を参照してください。 :hg:`log` での表示は、\n"
16884 " ``ui.logtemplate`` 設定経由でもカスタマイズ可能です。"
16885
16886 msgid "--line-range requires --follow"
16887 msgstr "--line-range は --follow と組み合わせてください"
16888
16889 msgid "FILE arguments are not compatible with --line-range option"
16890 msgstr "--line-range 指定時は、引数にファイル名を指定できません"
14808
16891
14809 msgid "revision to display"
16892 msgid "revision to display"
14810 msgstr "表示対象リビジョン"
16893 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"'
14855 msgid "review revisions to merge (no merge is performed)"
16938 msgid "review revisions to merge (no merge is performed)"
14856 msgstr "マージ対象リビジョンの確認(マージ処理は未実施)"
16939 msgstr "マージ対象リビジョンの確認(マージ処理は未実施)"
14857
16940
16941 msgid "abort the ongoing merge"
16942 msgstr "未コミットの merge 成果を破棄します"
16943
14858 msgid "[-P] [[-r] REV]"
16944 msgid "[-P] [[-r] REV]"
14859 msgstr "[-P] [[-r] REV]"
16945 msgstr "[-P] [[-r] REV]"
14860
16946
@@ -14904,12 +16990,12 b' msgid " See :hg:`help resolve` for in'
14904 msgstr " 衝突の扱いに関する詳細は :hg:`help resolve` を参照してください。"
16990 msgstr " 衝突の扱いに関する詳細は :hg:`help resolve` を参照してください。"
14905
16991
14906 msgid ""
16992 msgid ""
14907 " To undo an uncommitted merge, use :hg:`update --clean .` which\n"
16993 " To undo an uncommitted merge, use :hg:`merge --abort` which\n"
14908 " will check out a clean copy of the original merge parent, losing\n"
16994 " will check out a clean copy of the original merge parent, losing\n"
14909 " all changes."
16995 " all changes."
14910 msgstr ""
16996 msgstr ""
14911 " コミット前にマージ処理を取り消す場合は、 :hg:`update --clean .`\n"
16997 " 未コミットなマージ成果は、 :hg:`merge --abort` で破棄できます。\n"
14912 " が使用できますが、 マージ前の親リビジョンの内容で上書きするため、\n"
16998 " この場合、 作業領域は以前の親リビジョンの内容で上書きされ、\n"
14913 " 作業領域中の全ての変更内容が失われます。"
16999 " 作業領域中の全ての変更内容が失われます。"
14914
17000
14915 msgid ""
17001 msgid ""
@@ -14919,6 +17005,21 b' msgstr ""'
14919 " 成功時のコマンド終了値は 0、 未解消ファイルがある場合は 1 です。\n"
17005 " 成功時のコマンド終了値は 0、 未解消ファイルがある場合は 1 です。\n"
14920 " "
17006 " "
14921
17007
17008 # this is left untranslated intentionally, because untranslated word
17009 # can be treated as ACTION name.
17010 # (by foozy@lares.dti.ne.jp)
17011 msgid "merge"
17012 msgstr ""
17013
17014 msgid "cannot specify a node with --abort"
17015 msgstr "リビジョン指定と --abort は併用できません"
17016
17017 msgid "cannot specify both --rev and --abort"
17018 msgstr "--rev と --abort は併用できません"
17019
17020 msgid "cannot specify --preview with --abort"
17021 msgstr "--preview と --abort は併用できません"
17022
14922 msgid "a changeset intended to be included in the destination"
17023 msgid "a changeset intended to be included in the destination"
14923 msgstr "反映対象とするリビジョン"
17024 msgstr "反映対象とするリビジョン"
14924
17025
@@ -15136,10 +17237,11 b' msgstr ""'
15136 " 指定リビジョンのフェーズを指定値に変更します。"
17237 " 指定リビジョンのフェーズを指定値に変更します。"
15137
17238
15138 msgid ""
17239 msgid ""
15139 " Unless -f/--force is specified, :hg:`phase` won't move changeset from a\n"
17240 " Unless -f/--force is specified, :hg:`phase` won't move changesets from "
15140 " lower phase to an higher phase. Phases are ordered as follows::"
17241 "a\n"
15141 msgstr ""
17242 " lower phase to a higher phase. Phases are ordered as follows::"
15142 " -f/--force が指定されない限り、 低い方から高い方へのフェーズ変更は、\n"
17243 msgstr ""
17244 " -f/--force 指定がない限り、 フェーズ値の低い方から高い方への変更は、\n"
15143 " 実施できません。 フェーズの高低は以下のように定義されています::"
17245 " 実施できません。 フェーズの高低は以下のように定義されています::"
15144
17246
15145 msgid " public < draft < secret"
17247 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"'
15187 msgid "(run 'hg update' to get a working copy)\n"
17289 msgid "(run 'hg update' to get a working copy)\n"
15188 msgstr "(作業領域の更新は 'hg update')\n"
17290 msgstr "(作業領域の更新は 'hg update')\n"
15189
17291
15190 msgid "update to new branch head if changesets were pulled"
17292 msgid "update to new branch head if new descendants were pulled"
15191 msgstr "新規取り込みの際は、 新規ブランチヘッドで、 作業領域を更新"
17293 msgstr "作業領域の子孫が取り込まれた場合、 作業領域を新規ブランチヘッドで更新"
15192
17294
15193 msgid "run even when remote repository is unrelated"
17295 msgid "run even when remote repository is unrelated"
15194 msgstr "連携先が無関係なリポジトリでも実行"
17296 msgstr "連携先が無関係なリポジトリでも実行"
@@ -15219,6 +17321,19 b' msgstr ""'
15219 " 特に指定が無い場合、 このコマンドによる作業領域の更新はありません。"
17321 " 特に指定が無い場合、 このコマンドによる作業領域の更新はありません。"
15220
17322
15221 msgid ""
17323 msgid ""
17324 " When cloning from servers that support it, Mercurial may fetch\n"
17325 " pre-generated data. When this is done, hooks operating on incoming\n"
17326 " changesets and changegroups may fire more than once, once for each\n"
17327 " pre-generated bundle and as well as for any additional remaining\n"
17328 " data. See :hg:`help -e clonebundles` for more."
17329 msgstr ""
17330 " サーバ経由で複製した場合、 サーバ側で事前に作成されたデータを元に、\n"
17331 " 複製を行う可能性があります (サーバ側設定次第)。 そのような場合、\n"
17332 " incoming, changegroups 系フックが、 事前作成データに対して一度、\n"
17333 " 残りの履歴情報に対してもう一度、 合計二度実行されることになります。\n"
17334 " 詳細は :hg:`help -e clonebundles` を参照してください。"
17335
17336 msgid ""
15222 " Use :hg:`incoming` if you want to see what would have been added\n"
17337 " Use :hg:`incoming` if you want to see what would have been added\n"
15223 " by a pull at the time you issued this command. If you then decide\n"
17338 " by a pull at the time you issued this command. If you then decide\n"
15224 " to add those changes to the repository, you should use :hg:`pull\n"
17339 " 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"'
15262 msgid "allow pushing a new branch"
17377 msgid "allow pushing a new branch"
15263 msgstr "新規ブランチの反映を許可"
17378 msgstr "新規ブランチの反映を許可"
15264
17379
17380 msgid "variables that can be sent to server (ADVANCED)"
17381 msgstr ""
17382
15265 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
17383 msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
15266 msgstr "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
17384 msgstr "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
15267
17385
@@ -15333,18 +17451,41 b' msgstr ""'
15333 " 連携先が省略された場合、 'default' パスが連携先として使用されます。"
17451 " 連携先が省略された場合、 'default' パスが連携先として使用されます。"
15334
17452
15335 msgid ""
17453 msgid ""
17454 " The --pushvars option sends strings to the server that become\n"
17455 " environment variables prepended with ``HG_USERVAR_``. For example,\n"
17456 " ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks "
17457 "with\n"
17458 " ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment."
17459 msgstr ""
17460
17461 msgid ""
17462 " pushvars can provide for user-overridable hooks as well as set "
17463 "debug\n"
17464 " levels. One example is having a hook that blocks commits containing\n"
17465 " conflict markers, but enables the user to override the hook if the "
17466 "file\n"
17467 " is using conflict markers for testing purposes or the file format "
17468 "has\n"
17469 " strings that look like conflict markers."
17470 msgstr ""
17471
17472 msgid ""
17473 " By default, servers will ignore `--pushvars`. To enable it add the\n"
17474 " following to your configuration file::"
17475 msgstr ""
17476
17477 msgid ""
17478 " [push]\n"
17479 " pushvars.server = true"
17480 msgstr ""
17481
17482 msgid ""
15336 " Returns 0 if push was successful, 1 if nothing to push.\n"
17483 " Returns 0 if push was successful, 1 if nothing to push.\n"
15337 " "
17484 " "
15338 msgstr ""
17485 msgstr ""
15339 " 反映成功時のコマンド終了値は 0、 何も反映されなかった場合は 1 です。\n"
17486 " 反映成功時のコマンド終了値は 0、 何も反映されなかった場合は 1 です。\n"
15340 " "
17487 " "
15341
17488
15342 msgid "default repository not configured!"
15343 msgstr "デフォルトの連携先が設定されていません"
15344
15345 msgid "see 'hg help config.paths'"
15346 msgstr "詳細は 'hg help config.paths' 参照"
15347
15348 #, python-format
17489 #, python-format
15349 msgid "pushing to %s\n"
17490 msgid "pushing to %s\n"
15350 msgstr "%s への反映中\n"
17491 msgstr "%s への反映中\n"
@@ -15604,6 +17745,10 b' msgid "not unmarking %s as it is driver-'
15604 msgstr "マージドライバの処理対象 %s は衝突未解消扱いになりません\n"
17745 msgstr "マージドライバの処理対象 %s は衝突未解消扱いになりません\n"
15605
17746
15606 #, python-format
17747 #, python-format
17748 msgid "%s: path conflict must be resolved manually\n"
17749 msgstr "%s: パスの衝突は手動で解消する必要があります\n"
17750
17751 #, python-format
15607 msgid "(try: hg resolve %s%s)\n"
17752 msgid "(try: hg resolve %s%s)\n"
15608 msgstr "(推奨コマンド: hg resolve %s%s)\n"
17753 msgstr "(推奨コマンド: hg resolve %s%s)\n"
15609
17754
@@ -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"'
15626 msgid "revert to the specified revision"
17771 msgid "revert to the specified revision"
15627 msgstr "当該リビジョン時点の内容で復旧"
17772 msgstr "当該リビジョン時点の内容で復旧"
15628
17773
15629 msgid "interactively select the changes (EXPERIMENTAL)"
17774 msgid "interactively select the changes"
15630 msgstr "操作対象変更の対話的な選択 (実験的実装)"
17775 msgstr "操作対象変更の対話的な選択"
15631
17776
15632 msgid "[OPTION]... [-r REV] [NAME]..."
17777 msgid "[OPTION]... [-r REV] [NAME]..."
15633 msgstr "[OPTION]... [-r REV] [NAME]..."
17778 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"'
15638 msgid ""
17783 msgid ""
15639 " To check out earlier revisions, you should use :hg:`update REV`.\n"
17784 " To check out earlier revisions, you should use :hg:`update REV`.\n"
15640 " To cancel an uncommitted merge (and lose your changes),\n"
17785 " To cancel an uncommitted merge (and lose your changes),\n"
15641 " use :hg:`update --clean .`."
17786 " use :hg:`merge --abort`."
15642 msgstr ""
17787 msgstr ""
15643 " 指定リビジョンでの作業領域の更新は :hg:`update 対象リビジョン`\n"
17788 " 指定リビジョンでの作業領域の更新は :hg:`update 対象リビジョン`\n"
15644 " で行います。 マージ途中での取り消しは :hg:`update --clean .`\n"
17789 " で行います。 未コミットマージ成果の破棄は :hg:`merge --abort`\n"
15645 " で行います (マージにおける修正内容は破棄されます)。"
17790 " で行います (マージにおける修正内容は破棄されます)。"
15646
17791
15647 msgid ""
17792 msgid ""
@@ -15905,13 +18050,13 b' msgstr ""'
15905 msgid ""
18050 msgid ""
15906 " Please note that the server does not implement access control.\n"
18051 " Please note that the server does not implement access control.\n"
15907 " This means that, by default, anybody can read from the server and\n"
18052 " This means that, by default, anybody can read from the server and\n"
15908 " nobody can write to it by default. Set the ``web.allow_push``\n"
18053 " nobody can write to it by default. Set the ``web.allow-push``\n"
15909 " option to ``*`` to allow everybody to push to the server. You\n"
18054 " option to ``*`` to allow everybody to push to the server. You\n"
15910 " should use a real web server if you need to authenticate users."
18055 " should use a real web server if you need to authenticate users."
15911 msgstr ""
18056 msgstr ""
15912 " 本コマンドで起動されるサーバは、 アクセス制御が実装されていません。\n"
18057 " 本コマンドで起動されるサーバは、 アクセス制御が実装されていません。\n"
15913 " 特に設定が無い場合、 誰もがリポジトリを参照可能で、 且つリポジトリは\n"
18058 " 特に設定が無い場合、 誰もがリポジトリを参照可能で、 且つリポジトリは\n"
15914 " 誰にも更新できない状態にあります。 ``web.allow_push`` 設定を ``*``\n"
18059 " 誰にも更新できない状態にあります。 ``web.allow-push`` 設定を ``*``\n"
15915 " に設定することで、 誰もがリポジトリに :hg:`push` できます。\n"
18060 " に設定することで、 誰もがリポジトリに :hg:`push` できます。\n"
15916 " ユーザ認証が必要な場合は、 通常のウェブサーバを使用してください。"
18061 " ユーザ認証が必要な場合は、 通常のウェブサーバを使用してください。"
15917
18062
@@ -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"'
15959 msgid "show only ignored files"
18104 msgid "show only ignored files"
15960 msgstr "無視対象のファイルを表示"
18105 msgstr "無視対象のファイルを表示"
15961
18106
18107 msgid "show the terse output (EXPERIMENTAL)"
18108 msgstr "省略形式での表示 (実験的実装)"
18109
15962 msgid "show source of copied files"
18110 msgid "show source of copied files"
15963 msgstr "複製元ファイルを表示"
18111 msgstr "複製元ファイルを表示"
15964
18112
@@ -16040,6 +18188,41 b' msgstr ""'
16040 " = 直前に表示される新規登録予定ファイル(A)の複製元"
18188 " = 直前に表示される新規登録予定ファイル(A)の複製元"
16041
18189
16042 msgid ""
18190 msgid ""
18191 " The -t/--terse option abbreviates the output by showing only the "
18192 "directory\n"
18193 " name if all the files in it share the same status. The option takes "
18194 "an\n"
18195 " argument indicating the statuses to abbreviate: 'm' for 'modified', "
18196 "'a'\n"
18197 " for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', "
18198 "'i'\n"
18199 " for 'ignored' and 'c' for clean."
18200 msgstr ""
18201
18202 msgid ""
18203 " It abbreviates only those statuses which are passed. Note that clean "
18204 "and\n"
18205 " ignored files are not displayed with '--terse ic' unless the -c/--"
18206 "clean\n"
18207 " and -i/--ignored options are also used."
18208 msgstr ""
18209
18210 msgid ""
18211 " The -v/--verbose option shows information when the repository is in "
18212 "an\n"
18213 " unfinished merge, shelve, rebase state etc. You can have this "
18214 "behavior\n"
18215 " turned on by default by enabling the ``commands.status.verbose`` "
18216 "option."
18217 msgstr ""
18218
18219 msgid ""
18220 " You can skip displaying some of these states by setting\n"
18221 " ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',\n"
18222 " 'histedit', 'merge', 'rebase', or 'unshelve'."
18223 msgstr ""
18224
18225 msgid ""
16043 " - show changes in the working directory relative to a\n"
18226 " - show changes in the working directory relative to a\n"
16044 " changeset::"
18227 " changeset::"
16045 msgstr " - 作業領域と指定リビジョンとの間での状態変更を表示::"
18228 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)::"'
16069 msgid " hg status -an0"
18252 msgid " hg status -an0"
16070 msgstr " hg status -an0"
18253 msgstr " hg status -an0"
16071
18254
18255 msgid ""
18256 " - show more information about the repository status, abbreviating\n"
18257 " added, removed, modified, deleted, and untracked paths::"
18258 msgstr ""
18259
18260 msgid " hg status -v -t mardu"
18261 msgstr " hg status -v -t mardu"
18262
18263 msgid "cannot use --terse with --rev"
18264 msgstr "--terse と --rev は併用できません"
18265
16072 msgid "check for push and pull"
18266 msgid "check for push and pull"
16073 msgstr "push/pull 実施結果の確認"
18267 msgstr "push/pull 実施結果の確認"
16074
18268
@@ -16205,16 +18399,16 b' msgid "phases: %s\\n"'
16205 msgstr "フェーズ: %s\n"
18399 msgstr "フェーズ: %s\n"
16206
18400
16207 #, python-format
18401 #, python-format
16208 msgid "unstable: %d changesets"
18402 msgid "orphan: %d changesets"
16209 msgstr "unstable リビジョン: %d 個"
18403 msgstr "孤立リビジョン: %d 個"
16210
18404
16211 #, python-format
18405 #, python-format
16212 msgid "divergent: %d changesets"
18406 msgid "content-divergent: %d changesets"
16213 msgstr "divergent リビジョン: %d 個"
18407 msgstr "内容分岐リビジョン: %d 個"
16214
18408
16215 #, python-format
18409 #, python-format
16216 msgid "bumped: %d changesets"
18410 msgid "phase-divergent: %d changesets"
16217 msgstr "bumped リビジョン: %d 個"
18411 msgstr "フェーズ分岐リビジョン: %d 個"
16218
18412
16219 msgid "1 or more incoming"
18413 msgid "1 or more incoming"
16220 msgstr "取り込み候補リビジョンあり"
18414 msgstr "取り込み候補リビジョンあり"
@@ -16402,6 +18596,12 b' msgstr ""'
16402 " 成功時のコマンド終了値は 0、 衝突未解消ファイルがある場合は 1 です。\n"
18596 " 成功時のコマンド終了値は 0、 衝突未解消ファイルがある場合は 1 です。\n"
16403 " "
18597 " "
16404
18598
18599 msgid "packed bundles cannot be applied with \"hg unbundle\""
18600 msgstr "packed bundle は \"hg unbundle\" では適用できません"
18601
18602 msgid "use \"hg debugapplystreamclonebundle\""
18603 msgstr "\"hg debugapplystreamclonebundle\" を使用してください"
18604
16405 #, python-format
18605 #, python-format
16406 msgid "%s: unknown bundle feature, %s"
18606 msgid "%s: unknown bundle feature, %s"
16407 msgstr "%s: 未知のバンドル機能 %s"
18607 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"'
16409 msgid "see https://mercurial-scm.org/wiki/BundleFeature for more information"
18609 msgid "see https://mercurial-scm.org/wiki/BundleFeature for more information"
16410 msgstr "詳細は https://mercurial-scm.org/wiki/BundleFeature 参照"
18610 msgstr "詳細は https://mercurial-scm.org/wiki/BundleFeature 参照"
16411
18611
16412 msgid "packed bundles cannot be applied with \"hg unbundle\""
16413 msgstr "packed bundle は \"hg unbundle\" では適用できません"
16414
16415 msgid "use \"hg debugapplystreamclonebundle\""
16416 msgstr "\"hg debugapplystreamclonebundle\" を使用してください"
16417
16418 msgid "discard uncommitted changes (no backup)"
18612 msgid "discard uncommitted changes (no backup)"
16419 msgstr "未コミット変更内容の破棄(保存無し)"
18613 msgstr "未コミット変更内容の破棄(保存無し)"
16420
18614
@@ -16512,11 +18706,10 b' msgstr ""'
16512
18706
16513 msgid ""
18707 msgid ""
16514 " To cancel an uncommitted merge (and lose your changes), use\n"
18708 " To cancel an uncommitted merge (and lose your changes), use\n"
16515 " :hg:`update --clean .`."
18709 " :hg:`merge --abort`."
16516 msgstr ""
18710 msgstr ""
16517 " マージ実施を途中で取り消す場合は\n"
18711 " 未コミットマージ成果の破棄は :hg:`merge --abort`\n"
16518 " :hg:`update --clean .` を実行してください\n"
18712 " で行います (マージにおける修正内容は破棄されます)。"
16519 " (マージにおける修正内容は破棄されます)。"
16520
18713
16521 msgid ""
18714 msgid ""
16522 " Use null as the changeset to remove the working directory (like\n"
18715 " 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 \\".::\\""'
16538 msgid "can only specify one of -C/--clean, -c/--check, or -m/--merge"
18731 msgid "can only specify one of -C/--clean, -c/--check, or -m/--merge"
16539 msgstr "-C/--clean, -c/--check および -m/--merge は複数指定できません"
18732 msgstr "-C/--clean, -c/--check および -m/--merge は複数指定できません"
16540
18733
18734 #, python-format
18735 msgid "updating to a hidden changeset %s\n"
18736 msgstr "作業領域を不可視リビジョン %s で更新中\n"
18737
16541 msgid "verify the integrity of the repository"
18738 msgid "verify the integrity of the repository"
16542 msgstr "リポジトリの整合性検証"
18739 msgstr "リポジトリの整合性検証"
16543
18740
@@ -16574,11 +18771,11 b' msgid "(see https://mercurial-scm.org fo'
16574 msgstr "(詳細は https://mercurial-scm.org を参照)"
18771 msgstr "(詳細は https://mercurial-scm.org を参照)"
16575
18772
16576 msgid ""
18773 msgid ""
16577 "Copyright (C) 2005-2017 Matt Mackall and others\n"
18774 "Copyright (C) 2005-2018 Matt Mackall and others\n"
16578 "This is free software; see the source for copying conditions. There is NO\n"
18775 "This is free software; see the source for copying conditions. There is NO\n"
16579 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
18776 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
16580 msgstr ""
18777 msgstr ""
16581 "Copyright (C) 2005-2017 Matt Mackall and others\n"
18778 "Copyright (C) 2005-2018 Matt Mackall and others\n"
16582 "本製品はフリーソフトウェアです。\n"
18779 "本製品はフリーソフトウェアです。\n"
16583 "頒布条件に関しては同梱されるライセンス条項をお読みください。\n"
18780 "頒布条件に関しては同梱されるライセンス条項をお読みください。\n"
16584 "市場適合性や特定用途への可否を含め、 本製品は無保証です。\n"
18781 "市場適合性や特定用途への可否を含め、 本製品は無保証です。\n"
@@ -16626,21 +18823,14 b' msgid "not found in manifest"'
16626 msgstr "マニフェストにありません"
18823 msgstr "マニフェストにありません"
16627
18824
16628 #, python-format
18825 #, python-format
16629 msgid "hidden revision '%s'"
16630 msgstr "'%s' は不可視リビジョンです"
16631
16632 msgid "use --hidden to access hidden revisions"
16633 msgstr "不可視リビジョンへのアクセス時には --hidden 指定が必要です"
16634
16635 #, python-format
16636 msgid "filtered revision '%s' (not in '%s' subset)"
16637 msgstr "'%s' はフィルタリング対象リビジョンです ('%s' には属しません)"
16638
16639 #, python-format
16640 msgid "working directory has unknown parent '%s'!"
18826 msgid "working directory has unknown parent '%s'!"
16641 msgstr "作業領域の親 '%s' が未知のリビジョンです!"
18827 msgstr "作業領域の親 '%s' が未知のリビジョンです!"
16642
18828
16643 #, python-format
18829 #, python-format
18830 msgid "filtered revision '%s'"
18831 msgstr "'%s' は不可視リビジョンです"
18832
18833 #, python-format
16644 msgid "unknown revision '%s'"
18834 msgid "unknown revision '%s'"
16645 msgstr "'%s' は未知のリビジョンです"
18835 msgstr "'%s' は未知のリビジョンです"
16646
18836
@@ -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"'
16698 msgid "copy failed: %s is not a file or a symbolic link\n"
18888 msgid "copy failed: %s is not a file or a symbolic link\n"
16699 msgstr "コピー失敗: %s はファイルでもシンボリックリンクでもありません\n"
18889 msgstr "コピー失敗: %s はファイルでもシンボリックリンクでもありません\n"
16700
18890
18891 #, python-format
18892 msgid "skipping copytracing for '%s', more candidates than the limit: %d\n"
18893 msgstr ""
18894
16701 msgid ""
18895 msgid ""
16702 "# To remove '-' lines, make them ' ' lines (context).\n"
18896 "# To remove '-' lines, make them ' ' lines (context).\n"
16703 "# To remove '+' lines, delete them.\n"
18897 "# To remove '+' lines, delete them.\n"
@@ -16733,8 +18927,9 b' msgstr ""'
16733 msgid "starting interactive selection\n"
18927 msgid "starting interactive selection\n"
16734 msgstr "対話的な選択の開始\n"
18928 msgstr "対話的な選択の開始\n"
16735
18929
16736 msgid "Select hunks to revert"
18930 #, fuzzy
16737 msgstr "取り消しに用いる差分の選択"
18931 msgid "Select hunks to apply"
18932 msgstr "破棄する差分の選択"
16738
18933
16739 msgid "Select hunks to discard"
18934 msgid "Select hunks to discard"
16740 msgstr "破棄する差分の選択"
18935 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"'
16742 msgid "Select hunks to record"
18937 msgid "Select hunks to record"
16743 msgstr "記録する差分の選択"
18938 msgstr "記録する差分の選択"
16744
18939
18940 msgid "space: select"
18941 msgstr ""
18942
18943 msgid "space: deselect"
18944 msgstr ""
18945
16745 msgid "[x]=selected **=collapsed"
18946 msgid "[x]=selected **=collapsed"
16746 msgstr ""
18947 msgstr ""
16747
18948
@@ -16754,12 +18955,6 b' msgstr ""'
16754 msgid "arrow keys: move/expand/collapse"
18955 msgid "arrow keys: move/expand/collapse"
16755 msgstr ""
18956 msgstr ""
16756
18957
16757 msgid "space: deselect"
16758 msgstr ""
16759
16760 msgid "space: select"
16761 msgstr ""
16762
16763 msgid "?: help"
18958 msgid "?: help"
16764 msgstr ""
18959 msgstr ""
16765
18960
@@ -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"'
16859 msgid "parent id %i is larger than current id %i"
19054 msgid "parent id %i is larger than current id %i"
16860 msgstr "親 id %i が現 id %i よりも大きいです"
19055 msgstr "親 id %i が現 id %i よりも大きいです"
16861
19056
16862 #, python-format
19057 #, fuzzy, python-format
16863 msgid "invalid event type in dag: %s"
19058 msgid "invalid event type in dag: ('%s', '%s')"
16864 msgstr "dag イベント種別が不正です: %s"
19059 msgstr "dag イベント種別が不正です: %s"
16865
19060
16866 msgid "nullid"
19061 msgid "nullid"
@@ -16869,9 +19064,16 b' msgstr "nullid"'
16869 msgid "[INDEX] REV1 REV2"
19064 msgid "[INDEX] REV1 REV2"
16870 msgstr "[INDEX] REV1 REV2"
19065 msgstr "[INDEX] REV1 REV2"
16871
19066
19067 msgid "find the ancestor revision of two revisions in a given index"
19068 msgstr ""
19069
16872 msgid "either two or three arguments required"
19070 msgid "either two or three arguments required"
16873 msgstr "2または3の引数が必要です"
19071 msgstr "2または3の引数が必要です"
16874
19072
19073 #, fuzzy
19074 msgid "apply a stream clone bundle file"
19075 msgstr "バンドルファイルの適用"
19076
16875 msgid "add single file mergeable changes"
19077 msgid "add single file mergeable changes"
16876 msgstr "ファイルを1つ登録して、 マージ可能な変更をリビジョン毎に実施"
19078 msgstr "ファイルを1つ登録して、 マージ可能な変更をリビジョン毎に実施"
16877
19079
@@ -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"'
16884 msgid "[OPTION]... [TEXT]"
19086 msgid "[OPTION]... [TEXT]"
16885 msgstr "[OPTION]... [TEXT]"
19087 msgstr "[OPTION]... [TEXT]"
16886
19088
19089 msgid "builds a repo with a given DAG from scratch in the current empty repo"
19090 msgstr ""
19091
19092 msgid ""
19093 " The description of the DAG is read from stdin if not given on the\n"
19094 " command line."
19095 msgstr ""
19096
19097 #, fuzzy
19098 msgid " Elements:"
19099 msgstr " 例::"
19100
19101 msgid ""
19102 " - \"+n\" is a linear run of n nodes based on the current default "
19103 "parent\n"
19104 " - \".\" is a single node based on the current default parent\n"
19105 " - \"$\" resets the default parent to null (implied at the start);\n"
19106 " otherwise the default parent is always the last node created\n"
19107 " - \"<p\" sets the default parent to the backref p\n"
19108 " - \"*p\" is a fork at parent p, which is a backref\n"
19109 " - \"*p1/p2\" is a merge of parents p1 and p2, which are backrefs\n"
19110 " - \"/p2\" is a merge of the preceding node and p2\n"
19111 " - \":tag\" defines a local tag for the preceding node\n"
19112 " - \"@branch\" sets the named branch for subsequent nodes\n"
19113 " - \"#...\\n\" is a comment up to the end of the line"
19114 msgstr ""
19115
19116 msgid " Whitespace between the above elements is ignored."
19117 msgstr ""
19118
19119 msgid " A backref is either"
19120 msgstr ""
19121
19122 msgid ""
19123 " - a number n, which references the node curr-n, where curr is the "
19124 "current\n"
19125 " node, or\n"
19126 " - the name of a local tag you placed earlier using \":tag\", or\n"
19127 " - empty to denote the default parent."
19128 msgstr ""
19129
19130 msgid ""
19131 " All string valued-elements are either strictly alphanumeric, or must\n"
19132 " be enclosed in double quotes (\"...\"), with \"\\\" as escape "
19133 "character.\n"
19134 " "
19135 msgstr ""
19136
16887 msgid "reading DAG from stdin\n"
19137 msgid "reading DAG from stdin\n"
16888 msgstr "DAG を標準入力から読み込みます\n"
19138 msgstr "DAG を標準入力から読み込みます\n"
16889
19139
@@ -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"'
16902 msgid "show all details"
19152 msgid "show all details"
16903 msgstr "全詳細の表示"
19153 msgstr "全詳細の表示"
16904
19154
19155 #, fuzzy
19156 msgid "show only the named part type"
19157 msgstr "直前に適用したパッチのみを表示"
19158
16905 msgid "print the bundlespec of the bundle"
19159 msgid "print the bundlespec of the bundle"
16906 msgstr "バンドルファイルの仕様表示"
19160 msgstr "バンドルファイルの仕様表示"
16907
19161
19162 #, fuzzy
19163 msgid "lists the contents of a bundle"
19164 msgstr "バンドルファイルの仕様表示"
19165
19166 #, fuzzy
19167 msgid "lists the capabilities of a remote peer"
19168 msgstr "指定リビジョンにおける変更対象ファイルの一覧"
19169
19170 #, fuzzy
19171 msgid "validate the correctness of the current dirstate"
19172 msgstr "現行パッチの名前表示"
19173
16908 #, python-format
19174 #, python-format
16909 msgid "%s in state %s, but not in manifest1\n"
19175 msgid "%s in state %s, but not in manifest1\n"
16910 msgstr "%s の状態は %s ですが、 管理対象ではありません\n"
19176 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"'
16927 msgid "show all configured styles"
19193 msgid "show all configured styles"
16928 msgstr "全ての設定済みスタイルを表示"
19194 msgstr "全ての設定済みスタイルを表示"
16929
19195
19196 msgid "show available color, effects or style"
19197 msgstr ""
19198
16930 msgid "available colors:\n"
19199 msgid "available colors:\n"
16931 msgstr "利用可能な色指定:\n"
19200 msgstr "利用可能な色指定:\n"
16932
19201
16933 msgid "available style:\n"
19202 msgid "available style:\n"
16934 msgstr "利用可能なスタイル:\n"
19203 msgstr "利用可能なスタイル:\n"
16935
19204
16936 msgid "[COMMAND]"
19205 #, fuzzy
16937 msgstr "[COMMAND]"
19206 msgid "create a stream clone bundle file"
16938
19207 msgstr "バンドルファイルの生成"
16939 msgid "show the command options"
19208
16940 msgstr "当該コマンドのオプション一覧の表示"
19209 msgid ""
16941
19210 " Stream bundles are special bundles that are essentially archives of\n"
16942 msgid "[-o] CMD"
19211 " revlog files. They are commonly used for cloning very quickly.\n"
16943 msgstr "[-o] CMD"
19212 " "
19213 msgstr ""
19214
19215 msgid "(warning: stream clone bundle will contain secret revisions)\n"
19216 msgstr ""
16944
19217
16945 #, python-format
19218 #, python-format
16946 msgid "bundle requirements: %s\n"
19219 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"'
16961 msgid "[OPTION]... [FILE [REV]...]"
19234 msgid "[OPTION]... [FILE [REV]...]"
16962 msgstr "[OPTION]... [FILE [REV]...]"
19235 msgstr "[OPTION]... [FILE [REV]...]"
16963
19236
19237 msgid "format the changelog or an index DAG as a concise textual description"
19238 msgstr ""
19239
19240 msgid ""
19241 " If you pass a revlog index, the revlog's DAG is emitted. If you list\n"
19242 " revision numbers, they get labeled in the output as rN."
19243 msgstr ""
19244
19245 #, fuzzy
19246 msgid ""
19247 " Otherwise, the changelog DAG of the current repo is emitted.\n"
19248 " "
19249 msgstr " 現リポジトリの整合性を検証します。"
19250
16964 msgid "need repo for changelog dag"
19251 msgid "need repo for changelog dag"
16965 msgstr "変更履歴の DAG 出力にはリポジトリが必要です"
19252 msgstr "変更履歴の DAG 出力にはリポジトリが必要です"
16966
19253
16967 msgid "-c|-m|FILE REV"
19254 msgid "-c|-m|FILE REV"
16968 msgstr "-c|-m|FILE REV"
19255 msgstr "-c|-m|FILE REV"
16969
19256
19257 #, fuzzy
19258 msgid "dump the contents of a data file revision"
19259 msgstr "指定リビジョンのファイル内容の検閲/消去"
19260
16970 msgid "try extended date formats"
19261 msgid "try extended date formats"
16971 msgstr "拡張日時形式の使用"
19262 msgstr "拡張日時形式の使用"
16972
19263
16973 msgid "[-e] DATE [RANGE]"
19264 msgid "[-e] DATE [RANGE]"
16974 msgstr "[-e] DATE [RANGE]"
19265 msgstr "[-e] DATE [RANGE]"
16975
19266
19267 msgid "parse and display a date"
19268 msgstr ""
19269
16976 msgid "-c|-m|FILE"
19270 msgid "-c|-m|FILE"
16977 msgstr "-c|-m|FILE"
19271 msgstr "-c|-m|FILE"
16978
19272
19273 msgid "dump information about delta chains in a revlog"
19274 msgstr ""
19275
19276 msgid " Output can be templatized. Available template keywords are:"
19277 msgstr ""
19278
19279 msgid ""
19280 " :``rev``: revision number\n"
19281 " :``chainid``: delta chain identifier (numbered by unique base)\n"
19282 " :``chainlen``: delta chain length to this revision\n"
19283 " :``prevrev``: previous revision in delta chain\n"
19284 " :``deltatype``: role of delta / how it was computed\n"
19285 " :``compsize``: compressed size of revision\n"
19286 " :``uncompsize``: uncompressed size of revision\n"
19287 " :``chainsize``: total size of compressed revisions in chain\n"
19288 " :``chainratio``: total chain size divided by uncompressed revision size\n"
19289 " (new delta chains typically start at ratio 2.00)\n"
19290 " :``lindist``: linear distance from base revision in delta chain to "
19291 "end\n"
19292 " of this revision\n"
19293 " :``extradist``: total size of revisions not part of this delta chain "
19294 "from\n"
19295 " base of delta chain to end of this revision; a "
19296 "measurement\n"
19297 " of how much extra data we need to read/seek across to "
19298 "read\n"
19299 " the delta chain for this revision\n"
19300 " :``extraratio``: extradist divided by chainsize; another representation "
19301 "of\n"
19302 " how much unrelated data is needed to load this delta "
19303 "chain"
19304 msgstr ""
19305
19306 msgid ""
19307 " If the repository is configured to use the sparse read, additional "
19308 "keywords\n"
19309 " are available:"
19310 msgstr ""
19311
19312 msgid ""
19313 " :``readsize``: total size of data read from the disk for a revision\n"
19314 " (sum of the sizes of all the blocks)\n"
19315 " :``largestblock``: size of the largest block of data read from the disk\n"
19316 " :``readdensity``: density of useful bytes in the data read from the "
19317 "disk\n"
19318 " :``srchunks``: in how many data hunks the whole revision would be read"
19319 msgstr ""
19320
19321 msgid ""
19322 " The sparse read can be enabled with experimental.sparse-read = True\n"
19323 " "
19324 msgstr ""
19325
16979 msgid "do not display the saved mtime"
19326 msgid "do not display the saved mtime"
16980 msgstr "記録された mtime 情報の表示抑止"
19327 msgstr "記録された mtime 情報の表示抑止"
16981
19328
16982 msgid "sort by saved mtime"
19329 msgid "sort by saved mtime"
16983 msgstr "記録された mtime 情報で整列"
19330 msgstr "記録された mtime 情報で整列"
16984
19331
19332 #, fuzzy
19333 msgid "show the contents of the current dirstate"
19334 msgstr "現行パッチの名前表示"
19335
16985 #, python-format
19336 #, python-format
16986 msgid "copy: %s -> %s\n"
19337 msgid "copy: %s -> %s\n"
16987 msgstr "%s から %s に複製\n"
19338 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"'
16992 msgid "use old-style discovery with non-heads included"
19343 msgid "use old-style discovery with non-heads included"
16993 msgstr "non-heads 有りの旧形式探索を実施"
19344 msgstr "non-heads 有りの旧形式探索を実施"
16994
19345
16995 msgid "[-l REV] [-r REV] [-b BRANCH]... [OTHER]"
19346 #, fuzzy
16996 msgstr "[-l REV] [-r REV] [-b BRANCH]... [OTHER]"
19347 msgid "[--rev REV] [OTHER]"
19348 msgstr "[-r REV] [REV]"
19349
19350 msgid "runs the changeset discovery protocol in isolation"
19351 msgstr ""
19352
19353 #, fuzzy
19354 msgid "path"
19355 msgstr "パス"
19356
19357 msgid ""
19358 "download a resource using Mercurial logic and config\n"
19359 " "
19360 msgstr ""
19361
19362 #, fuzzy
19363 msgid "show information about active extensions"
19364 msgstr " 名前付きブランチ情報の表示。"
16997
19365
16998 msgid " (untested!)\n"
19366 msgid " (untested!)\n"
16999 msgstr " (テスト未実施!)\n"
19367 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"'
17020 msgid "[-r REV] FILESPEC"
19388 msgid "[-r REV] FILESPEC"
17021 msgstr "[-r REV] FILESPEC"
19389 msgstr "[-r REV] FILESPEC"
17022
19390
19391 msgid "parse and apply a fileset specification"
19392 msgstr ""
19393
19394 #, fuzzy
19395 msgid "display format information about the current repository"
19396 msgstr " 指定ファイルの履歴の表示。"
19397
19398 msgid ""
19399 " Use --verbose to get extra information about current config value and\n"
19400 " Mercurial default."
19401 msgstr ""
19402
17023 msgid "[PATH]"
19403 msgid "[PATH]"
17024 msgstr "[PATH]"
19404 msgstr "[PATH]"
17025
19405
19406 #, fuzzy
19407 msgid "show information detected about current filesystem"
19408 msgstr "削除されたファイル(登録除外は未実施)を表示"
19409
17026 msgid "id of head node"
19410 msgid "id of head node"
17027 msgstr "ヘッドノードの ID"
19411 msgstr "ヘッドノードの ID"
17028
19412
@@ -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"'
17032 msgid "REPO FILE [-H|-C ID]..."
19416 msgid "REPO FILE [-H|-C ID]..."
17033 msgstr "REPO FILE [-H|-C ID]..."
19417 msgstr "REPO FILE [-H|-C ID]..."
17034
19418
19419 #, fuzzy
19420 msgid "retrieves a bundle from a repo"
19421 msgstr "バンドルファイルの生成"
19422
19423 msgid ""
19424 " Every ID must be a full-length hex node id string. Saves the bundle to "
19425 "the\n"
19426 " given file.\n"
19427 " "
19428 msgstr ""
19429
17035 msgid "unknown bundle type specified with --type"
19430 msgid "unknown bundle type specified with --type"
17036 msgstr "--type に未知のバンドル種別が指定されました"
19431 msgstr "--type に未知のバンドル形式が指定されました"
17037
19432
17038 msgid "no ignore patterns found"
19433 msgid "display the combined ignore pattern and information about ignored files"
17039 msgstr "無視対象ファイルの指定がありません"
19434 msgstr ""
19435
19436 #, fuzzy
19437 msgid " With no argument display the combined ignore pattern."
19438 msgstr " 引数指定が無い場合、 コマンドの一覧と概要を表示します。"
19439
19440 msgid ""
19441 " Given space separated file names, shows if the given file is ignored "
19442 "and\n"
19443 " if so, show the ignore rule (file and line number) that matched it.\n"
19444 " "
19445 msgstr ""
17040
19446
17041 #, python-format
19447 #, python-format
17042 msgid "%s is ignored\n"
19448 msgid "%s is ignored\n"
@@ -17060,10 +19466,19 b' msgstr "revlog \xe3\x81\xae\xe5\xbd\xa2\xe5\xbc\x8f"'
17060 msgid "[-f FORMAT] -c|-m|FILE"
19466 msgid "[-f FORMAT] -c|-m|FILE"
17061 msgstr "[-f FORMAT] -c|-m|FILE"
19467 msgstr "[-f FORMAT] -c|-m|FILE"
17062
19468
19469 msgid "dump the contents of an index file"
19470 msgstr ""
19471
17063 #, python-format
19472 #, python-format
17064 msgid "unknown format %d"
19473 msgid "unknown format %d"
17065 msgstr "未知のフォーマット: %d"
19474 msgstr "未知のフォーマット: %d"
17066
19475
19476 msgid "dump an index DAG as a graphviz dot file"
19477 msgstr ""
19478
19479 msgid "test Mercurial installation"
19480 msgstr ""
19481
17067 #, python-format
19482 #, python-format
17068 msgid "checking encoding (%s)...\n"
19483 msgid "checking encoding (%s)...\n"
17069 msgstr "文字コードの検証中 (%s)...\n"
19484 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"'
17134 msgid "checking available compression engines for wire protocol (%s)\n"
19549 msgid "checking available compression engines for wire protocol (%s)\n"
17135 msgstr "通信時に利用可能な圧縮エンジンの検証中 (%s)\n"
19550 msgstr "通信時に利用可能な圧縮エンジンの検証中 (%s)\n"
17136
19551
19552 #, fuzzy, python-format
19553 msgid "checking \"re2\" regexp engine (%s)\n"
19554 msgstr "登録済み圧縮エンジンの検証中 (%s)...\n"
19555
17137 msgid " no template directories found\n"
19556 msgid " no template directories found\n"
17138 msgstr " テンプレート設定ディレクトリが存在しません\n"
19557 msgstr " テンプレート設定ディレクトリが存在しません\n"
17139
19558
@@ -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"'
17192 msgid "REPO ID..."
19611 msgid "REPO ID..."
17193 msgstr "REPO ID..."
19612 msgstr "REPO ID..."
17194
19613
19614 msgid "test whether node ids are known to a repo"
19615 msgstr ""
19616
19617 msgid ""
19618 " Every ID must be a full-length hex node id string. Returns a list of 0s\n"
19619 " and 1s indicating unknown/known.\n"
19620 " "
19621 msgstr ""
19622
17195 msgid "LABEL..."
19623 msgid "LABEL..."
17196 msgstr "LABEL..."
19624 msgstr "LABEL..."
17197
19625
19626 msgid "backwards compatibility with old bash completion scripts (DEPRECATED)"
19627 msgstr ""
19628
17198 msgid "free the store lock (DANGEROUS)"
19629 msgid "free the store lock (DANGEROUS)"
17199 msgstr "管理領域の排他の解放 (危険)"
19630 msgstr "管理領域の排他の解放 (危険)"
17200
19631
17201 msgid "free the working state lock (DANGEROUS)"
19632 msgid "free the working state lock (DANGEROUS)"
17202 msgstr "作業領域の排他の解放 (危険)"
19633 msgstr "作業領域の排他の解放 (危険)"
17203
19634
19635 msgid "set the store lock until stopped"
19636 msgstr ""
19637
19638 #, fuzzy
19639 msgid "set the working state lock until stopped"
19640 msgstr "作業領域の排他の解放 (危険)"
19641
19642 #, fuzzy
19643 msgid "show or modify state of locks"
19644 msgstr "変更されたファイルを表示"
19645
19646 msgid ""
19647 " By default, this command will show which locks are held. This\n"
19648 " includes the user and process holding the lock, the amount of time\n"
19649 " the lock has been held, and the machine name where the process is\n"
19650 " running if it's not local."
19651 msgstr ""
19652
19653 msgid ""
19654 " Locks protect the integrity of Mercurial's data, so should be\n"
19655 " treated with care. System crashes or other interruptions may cause\n"
19656 " locks to not be properly released, though Mercurial will usually\n"
19657 " detect and remove such stale locks automatically."
19658 msgstr ""
19659
19660 msgid ""
19661 " However, detecting stale locks may not always be possible (for\n"
19662 " instance, on a shared filesystem). Removing locks may also be\n"
19663 " blocked by filesystem permissions."
19664 msgstr ""
19665
19666 msgid ""
19667 " Setting a lock will prevent other commands from changing the data.\n"
19668 " The command will wait until an interruption (SIGINT, SIGTERM, ...) "
19669 "occurs.\n"
19670 " The set locks are removed when the command exits."
19671 msgstr ""
19672
19673 #, fuzzy
19674 msgid " Returns 0 if no locks are held."
19675 msgstr ""
19676 " 成功時のコマンド終了値は 0 です。\n"
19677 " "
19678
19679 #, fuzzy
19680 msgid "wlock is already held"
19681 msgstr "パッチ状態は保存済みです\n"
19682
19683 #, fuzzy
19684 msgid "lock is already held"
19685 msgstr "パッチ状態は保存済みです\n"
19686
19687 msgid "ready to release the lock (y)? $$ &Yes"
19688 msgstr ""
19689
19690 #, fuzzy
19691 msgid "print merge state"
19692 msgstr "送信予定のメールの内容を表示"
19693
19694 msgid ""
19695 " Use --verbose to print out information about whether v1 or v2 merge "
19696 "state\n"
19697 " was chosen."
19698 msgstr ""
19699
17204 msgid "NAME..."
19700 msgid "NAME..."
17205 msgstr "NAME..."
19701 msgstr "NAME..."
17206
19702
19703 msgid "complete \"names\" - tags, open branch names, bookmark names"
19704 msgstr ""
19705
17207 msgid "markers flag"
19706 msgid "markers flag"
17208 msgstr "廃止マーカ用フラグ"
19707 msgstr "廃止マーカ用フラグ"
17209
19708
@@ -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"'
17213 msgid "display markers relevant to REV"
19712 msgid "display markers relevant to REV"
17214 msgstr "指定リビジョンに関連するマーカの表示"
19713 msgstr "指定リビジョンに関連するマーカの表示"
17215
19714
19715 #, fuzzy
19716 msgid "restrict display to markers only relevant to REV"
19717 msgstr "指定リビジョンに関連するマーカの表示"
19718
17216 msgid "display index of the marker"
19719 msgid "display index of the marker"
17217 msgstr "廃止マーカのインデックス値を表示"
19720 msgstr "廃止マーカのインデックス値を表示"
17218
19721
@@ -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"'
17222 msgid "[OBSOLETED [REPLACEMENT ...]]"
19725 msgid "[OBSOLETED [REPLACEMENT ...]]"
17223 msgstr "[OBSOLETED [REPLACEMENT ...]]"
19726 msgstr "[OBSOLETED [REPLACEMENT ...]]"
17224
19727
19728 #, fuzzy
19729 msgid "create arbitrary obsolete marker"
19730 msgstr "%i 個の廃止マーカを破棄\n"
19731
19732 #, fuzzy
19733 msgid " With no arguments, displays the list of obsolescence markers."
19734 msgstr " 引数指定が無い場合、 コマンドの一覧と概要を表示します。"
19735
17225 #, python-format
19736 #, python-format
17226 msgid "invalid index value: %r"
19737 msgid "invalid index value: %r"
17227 msgstr "不正なインデックス値: %r"
19738 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"'
17249 msgid "FILESPEC..."
19760 msgid "FILESPEC..."
17250 msgstr "FILESPEC..."
19761 msgstr "FILESPEC..."
17251
19762
19763 #, fuzzy
19764 msgid "complete part or all of a tracked path"
19765 msgstr "パス全体を補完"
19766
19767 msgid ""
19768 " This command supports shells that offer path name completion. It\n"
19769 " currently completes only files already known to the dirstate."
19770 msgstr ""
19771
19772 msgid ""
19773 " Completion extends only to the next path segment unless\n"
19774 " --full is specified, in which case entire paths are used."
19775 msgstr ""
19776
19777 #, fuzzy
19778 msgid "establish a connection to a peer repository"
19779 msgstr "%s への ssl 接続に失敗"
19780
19781 #, fuzzy, python-format
19782 msgid "url: %s\n"
19783 msgstr "ユーザ: %s\n"
19784
19785 #, fuzzy, python-format
19786 msgid "local: %s\n"
19787 msgstr "a: %s\n"
19788
19789 #, fuzzy
19790 msgid "no"
19791 msgstr "now"
19792
19793 #, fuzzy
19794 msgid "yes"
19795 msgstr "バイト"
19796
19797 #, fuzzy, python-format
19798 msgid "pushable: %s\n"
19799 msgstr "履歴反映に失敗: %s"
19800
19801 #, fuzzy
19802 msgid "check for files in this revision"
19803 msgstr "指定リビジョンに対する fileset 記述の適用"
19804
19805 msgid "emulate merging change and delete"
19806 msgstr ""
19807
19808 #, fuzzy
19809 msgid "[PATTERN]..."
19810 msgstr "パターン"
19811
19812 msgid "examine which merge tool is chosen for specified file"
19813 msgstr ""
19814
19815 msgid ""
19816 " As described in :hg:`help merge-tools`, Mercurial examines\n"
19817 " configurations below in this order to decide which merge tool is\n"
19818 " chosen for specified file."
19819 msgstr ""
19820
19821 msgid ""
19822 " 1. ``--tool`` option\n"
19823 " 2. ``HGMERGE`` environment variable\n"
19824 " 3. configurations in ``merge-patterns`` section\n"
19825 " 4. configuration of ``ui.merge``\n"
19826 " 5. configurations in ``merge-tools`` section\n"
19827 " 6. ``hgmerge`` tool (for historical reason only)\n"
19828 " 7. default tool for fallback (``:merge`` or ``:prompt``)"
19829 msgstr ""
19830
19831 #, fuzzy
19832 msgid " This command writes out examination result in the style below::"
19833 msgstr ""
19834 " 本コマンドは以下と等価です (※ 訳注: 2つ目以降は FILE や `--rev REV`\n"
19835 " 指定時の挙動に対応します)::"
19836
19837 msgid " FILE = MERGETOOL"
19838 msgstr ""
19839
19840 msgid ""
19841 " By default, all files known in the first parent context of the\n"
19842 " working directory are examined. Use file patterns and/or -I/-X\n"
19843 " options to limit target files. -r/--rev is also useful to examine\n"
19844 " files in another context without actual updating to it."
19845 msgstr ""
19846
19847 msgid ""
19848 " With --debug, this command shows warning messages while matching\n"
19849 " against ``merge-patterns`` and so on, too. It is recommended to\n"
19850 " use this option with explicit file patterns and/or -I/-X options,\n"
19851 " because this option increases amount of output per file according\n"
19852 " to configurations in hgrc."
19853 msgstr ""
19854
19855 msgid ""
19856 " With -v/--verbose, this command shows configurations below at\n"
19857 " first (only if specified)."
19858 msgstr ""
19859
19860 msgid ""
19861 " - ``--tool`` option\n"
19862 " - ``HGMERGE`` environment variable\n"
19863 " - configuration of ``ui.merge``"
19864 msgstr ""
19865
19866 msgid ""
19867 " If merge tool is chosen before matching against\n"
19868 " ``merge-patterns``, this command can't show any helpful\n"
19869 " information, even with --debug. In such case, information above is\n"
19870 " useful to know why a merge tool is chosen.\n"
19871 " "
19872 msgstr ""
19873
17252 msgid "REPO NAMESPACE [KEY OLD NEW]"
19874 msgid "REPO NAMESPACE [KEY OLD NEW]"
17253 msgstr "REPO NAMESPACE [KEY OLD NEW]"
19875 msgstr "REPO NAMESPACE [KEY OLD NEW]"
17254
19876
19877 msgid "access the pushkey key/value protocol"
19878 msgstr ""
19879
19880 msgid " With two args, list the keys in the given namespace."
19881 msgstr ""
19882
19883 msgid ""
19884 " With five args, set a key to new if it currently is set to old.\n"
19885 " Reports success or failure.\n"
19886 " "
19887 msgstr ""
19888
17255 msgid "A B"
19889 msgid "A B"
17256 msgstr "A B"
19890 msgstr "A B"
17257
19891
@@ -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"'
17277 msgid "only rebuild files that are inconsistent with the working copy parent"
19911 msgid "only rebuild files that are inconsistent with the working copy parent"
17278 msgstr "作業領域の親リビジョンに対して、 不適切なファイルのみ、 状態を再構築"
19912 msgstr "作業領域の親リビジョンに対して、 不適切なファイルのみ、 状態を再構築"
17279
19913
19914 msgid "rebuild the dirstate as it would look like for the given revision"
19915 msgstr ""
19916
19917 #, fuzzy
19918 msgid " If no revision is specified the first current parent will be used."
19919 msgstr " ディレクトリが指定されない場合、 現ディレクトリが初期化されます。"
19920
19921 msgid ""
19922 " The dirstate will be set to the files of the given revision.\n"
19923 " The actual working directory content or existing dirstate\n"
19924 " information such as adds or removes is not considered."
19925 msgstr ""
19926
19927 msgid ""
19928 " ``minimal`` will only rebuild the dirstate status for files that claim "
19929 "to be\n"
19930 " tracked but are not in the parent manifest, or that exist in the parent\n"
19931 " manifest but are not in the dirstate. It will not change adds, removes, "
19932 "or\n"
19933 " modified files that are in the working copy parent."
19934 msgstr ""
19935
19936 msgid ""
19937 " One use of this command is to make the next :hg:`status` invocation\n"
19938 " check the actual file content.\n"
19939 " "
19940 msgstr ""
19941
19942 msgid "rebuild the fncache file"
19943 msgstr ""
19944
17280 msgid "revision to debug"
19945 msgid "revision to debug"
17281 msgstr "デバッグ対象リビジョン"
19946 msgstr "デバッグ対象リビジョン"
17282
19947
17283 msgid "[-r REV] FILE"
19948 msgid "[-r REV] FILE"
17284 msgstr "[-r REV] FILE"
19949 msgstr "[-r REV] FILE"
17285
19950
19951 #, fuzzy
19952 msgid "dump rename information"
19953 msgstr "共通の祖先リビジョンの情報表示"
19954
17286 #, python-format
19955 #, python-format
17287 msgid "%s renamed from %s:%s\n"
19956 msgid "%s renamed from %s:%s\n"
17288 msgstr "%s は %s:%s で改名されました\n"
19957 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"'
17294 msgid "dump index data"
19963 msgid "dump index data"
17295 msgstr "インデックスデータのダンプ"
19964 msgstr "インデックスデータのダンプ"
17296
19965
19966 msgid "show data and statistics about a revlog"
19967 msgstr ""
19968
17297 msgid "print parsed tree after optimizing (DEPRECATED)"
19969 msgid "print parsed tree after optimizing (DEPRECATED)"
17298 msgstr "最適化後の解析ツリーの表示 (非推奨)"
19970 msgstr "最適化後の解析ツリーの表示 (非推奨)"
17299
19971
19972 #, fuzzy
19973 msgid "print list of result revisions (default)"
19974 msgstr "リビジョン番号を表示(既定動作)"
19975
19976 msgid "print internal representation of result set"
19977 msgstr ""
19978
17300 msgid "print parsed tree at the given stage"
19979 msgid "print parsed tree at the given stage"
17301 msgstr "指定解析段階における解析ツリーの表示"
19980 msgstr "指定解析段階における解析ツリーの表示"
17302
19981
@@ -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"'
17306 msgid "verify optimized result"
19985 msgid "verify optimized result"
17307 msgstr "最適化結果を検証"
19986 msgstr "最適化結果を検証"
17308
19987
19988 msgid "parse and apply a revision specification"
19989 msgstr ""
19990
19991 msgid ""
19992 " Use -p/--show-stage option to print the parsed tree at the given "
19993 "stages.\n"
19994 " Use -p all to print tree at every stage."
19995 msgstr ""
19996
19997 msgid ""
19998 " Use --no-show-revs option with -s or -p to print only the set\n"
19999 " representation or the parsed tree respectively."
20000 msgstr ""
20001
20002 msgid ""
20003 " Use --verify-optimized to compare the optimized result with the "
20004 "unoptimized\n"
20005 " one. Returns 1 if the optimized result differs.\n"
20006 " "
20007 msgstr ""
20008
17309 msgid "cannot use --verify-optimized with --no-optimized"
20009 msgid "cannot use --verify-optimized with --no-optimized"
17310 msgstr "--verify-optimized と --no-optimized は併用できません"
20010 msgstr "--verify-optimized と --no-optimized は併用できません"
17311
20011
@@ -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"'
17316 msgid "invalid stage name: %s"
20016 msgid "invalid stage name: %s"
17317 msgstr "不正な解析段階名: %s"
20017 msgstr "不正な解析段階名: %s"
17318
20018
20019 msgid "run an SSH server bound to process handles"
20020 msgstr ""
20021
20022 msgid "file descriptor to log server I/O to"
20023 msgstr ""
20024
20025 msgid "file to log server I/O to"
20026 msgstr ""
20027
20028 msgid "run a server with advanced settings"
20029 msgstr ""
20030
20031 msgid ""
20032 " This command is similar to :hg:`serve`. It exists partially as a\n"
20033 " workaround to the fact that ``hg serve --stdio`` must have specific\n"
20034 " arguments for security reasons.\n"
20035 " "
20036 msgstr ""
20037
20038 #, fuzzy
20039 msgid "only --sshstdio is currently supported"
20040 msgstr " 以下のオプションを指定できます:"
20041
20042 #, fuzzy
20043 msgid "cannot use both --logiofd and --logiofile"
20044 msgstr "--force と --keep-changes は併用できません"
20045
17319 msgid "REV1 [REV2]"
20046 msgid "REV1 [REV2]"
17320 msgstr "REV1 [REV2]"
20047 msgstr "REV1 [REV2]"
17321
20048
20049 #, fuzzy
20050 msgid "manually set the parents of the current working directory"
20051 msgstr "作業領域の親リビジョンの改変"
20052
20053 msgid ""
20054 " This is useful for writing repository conversion tools, but should\n"
20055 " be used with care. For example, neither the working directory nor the\n"
20056 " dirstate is updated, so file status may be incorrect after running this\n"
20057 " command."
20058 msgstr ""
20059
20060 #, fuzzy
20061 msgid "test a secure connection to a server"
20062 msgstr "%s への ssl 接続に失敗"
20063
20064 msgid ""
20065 " This builds the certificate chain for the server on Windows, installing "
20066 "the\n"
20067 " missing intermediates and trusted root via Windows Update if necessary. "
20068 "It\n"
20069 " does nothing on other platforms."
20070 msgstr ""
20071
20072 #, fuzzy
20073 msgid ""
20074 " If SOURCE is omitted, the 'default' path will be used. If a URL is "
20075 "given,\n"
20076 " that server is used. See :hg:`help urls` for more information."
20077 msgstr ""
20078 " 連携先が省略された場合、 'default' パスが連携先として使用されます。\n"
20079 " 詳細は :hg:`help urls` を参照してください。"
20080
20081 msgid ""
20082 " If the update succeeds, retry the original operation. Otherwise, the "
20083 "cause\n"
20084 " of the SSL error is likely another issue.\n"
20085 " "
20086 msgstr ""
20087
20088 msgid "certificate chain building is only possible on Windows"
20089 msgstr ""
20090
20091 #, fuzzy
20092 msgid "there is no Mercurial repository here, and no server specified"
20093 msgstr "Mercurial リポジトリが見つかりません(.hg が不在です)"
20094
20095 #, fuzzy
20096 msgid "malformed port number in URL"
20097 msgstr "不正なパスワード文字列"
20098
20099 #, fuzzy
20100 msgid "only https and ssh connections are supported"
20101 msgstr " 以下のオプションを指定できます:"
20102
20103 #, fuzzy, python-format
20104 msgid "checking the certificate chain for %s\n"
20105 msgstr "%s 用の証明書ファイル"
20106
20107 msgid "certificate chain is incomplete, updating... "
20108 msgstr ""
20109
20110 #, fuzzy
20111 msgid "failed.\n"
20112 msgstr "seek に失敗しました\n"
20113
20114 #, fuzzy
20115 msgid "done.\n"
20116 msgstr "完了\n"
20117
20118 msgid "full certificate chain is available\n"
20119 msgstr ""
20120
17322 msgid "revision to check"
20121 msgid "revision to check"
17323 msgstr "確認対象リビジョン"
20122 msgstr "確認対象リビジョン"
17324
20123
17325 msgid "[-r REV] [REV]"
20124 msgid "[-r REV] [REV]"
17326 msgstr "[-r REV] [REV]"
20125 msgstr "[-r REV] [REV]"
17327
20126
20127 msgid "return closest successors sets only"
20128 msgstr ""
20129
17328 msgid "[REV]"
20130 msgid "[REV]"
17329 msgstr "[REV]"
20131 msgstr "[REV]"
17330
20132
20133 #, fuzzy
20134 msgid "show set of successors for revision"
20135 msgstr "親リビジョンの表示対象"
20136
20137 msgid ""
20138 " A successors set of changeset A is a consistent group of revisions that\n"
20139 " succeed A. It contains non-obsolete changesets only unless closests\n"
20140 " successors set is set."
20141 msgstr ""
20142
20143 msgid ""
20144 " In most cases a changeset A has a single successors set containing a "
20145 "single\n"
20146 " successor (changeset A replaced by A')."
20147 msgstr ""
20148
20149 msgid ""
20150 " A changeset that is made obsolete with no successors are called \"pruned"
20151 "\".\n"
20152 " Such changesets have no successors sets at all."
20153 msgstr ""
20154
20155 msgid ""
20156 " A changeset that has been \"split\" will have a successors set "
20157 "containing\n"
20158 " more than one successor."
20159 msgstr ""
20160
20161 msgid ""
20162 " A changeset that has been rewritten in multiple different ways is "
20163 "called\n"
20164 " \"divergent\". Such changesets have multiple successor sets (each of "
20165 "which\n"
20166 " may also be split, i.e. have multiple successors)."
20167 msgstr ""
20168
20169 #, fuzzy
20170 msgid " Results are displayed as follows::"
20171 msgstr " 以下のファイル形式を想定しています::"
20172
20173 msgid ""
20174 " <rev1>\n"
20175 " <successors-1A>\n"
20176 " <rev2>\n"
20177 " <successors-2A>\n"
20178 " <successors-2B1> <successors-2B2> <successors-2B3>"
20179 msgstr ""
20180
20181 msgid ""
20182 " Here rev2 has two possible (i.e. divergent) successors sets. The first\n"
20183 " holds one element, whereas the second holds three (i.e. the changeset "
20184 "has\n"
20185 " been split).\n"
20186 " "
20187 msgstr ""
20188
17331 msgid "apply template on changesets"
20189 msgid "apply template on changesets"
17332 msgstr "指定テンプレートでリビジョン表示"
20190 msgstr "指定テンプレートでリビジョン表示"
17333
20191
17334 msgid "KEY=VALUE"
17335 msgstr "キーワード=値"
17336
17337 msgid "define template keyword"
20192 msgid "define template keyword"
17338 msgstr "テンプレートキーワードを定義"
20193 msgstr "テンプレートキーワードを定義"
17339
20194
17340 msgid "[-r REV]... [-D KEY=VALUE]... TEMPLATE"
20195 msgid "[-r REV]... [-D KEY=VALUE]... TEMPLATE"
17341 msgstr "[-r REV]... [-D KEY=VALUE]... TEMPLATE"
20196 msgstr "[-r REV]... [-D KEY=VALUE]... TEMPLATE"
17342
20197
20198 #, fuzzy
20199 msgid "parse and apply a template"
20200 msgstr "テンプレートを指定してください"
20201
20202 msgid ""
20203 " If -r/--rev is given, the template is processed as a log template and\n"
20204 " applied to the given changesets. Otherwise, it is processed as a "
20205 "generic\n"
20206 " template."
20207 msgstr ""
20208
20209 msgid ""
20210 " Use --verbose to print the parsed tree.\n"
20211 " "
20212 msgstr ""
20213
17343 #, python-format
20214 #, python-format
17344 msgid "malformed keyword definition: %s"
20215 msgid "malformed keyword definition: %s"
17345 msgstr "不正なキーワード定義: %s"
20216 msgstr "不正なキーワード定義: %s"
17346
20217
20218 msgid "prompt text"
20219 msgstr ""
20220
20221 #, fuzzy
20222 msgid "[-p TEXT]"
20223 msgstr "テキスト"
20224
20225 msgid "show prompt to type password"
20226 msgstr ""
20227
20228 msgid "show plain prompt"
20229 msgstr ""
20230
20231 #, fuzzy
20232 msgid "warm all known caches in the repository"
20233 msgstr "リポジトリ中の全リビジョンをバンドルに含める"
20234
17347 msgid "extra optimization to perform"
20235 msgid "extra optimization to perform"
17348 msgstr "追加実施する最適化"
20236 msgstr "追加実施する最適化"
17349
20237
17350 msgid "performs an upgrade"
20238 msgid "performs an upgrade"
17351 msgstr "アップグレードの実施"
20239 msgstr "アップグレードの実施"
17352
20240
20241 #, fuzzy
20242 msgid "upgrade a repository to use different features"
20243 msgstr "リンク元とリンク先が同一ファイルシステム上にありません"
20244
20245 msgid ""
20246 " If no arguments are specified, the repository is evaluated for upgrade\n"
20247 " and a list of problems and potential optimizations is printed."
20248 msgstr ""
20249
20250 msgid ""
20251 " With ``--run``, a repository upgrade is performed. Behavior of the "
20252 "upgrade\n"
20253 " can be influenced via additional arguments. More details will be "
20254 "provided\n"
20255 " by the command output when run without ``--run``."
20256 msgstr ""
20257
20258 msgid ""
20259 " During the upgrade, the repository will be locked and no writes will be\n"
20260 " allowed."
20261 msgstr ""
20262
20263 msgid ""
20264 " At the end of the upgrade, the repository may not be readable while new\n"
20265 " repository data is swapped in. This window will be as long as it takes "
20266 "to\n"
20267 " rename some directories inside the ``.hg`` directory. On most machines, "
20268 "this\n"
20269 " should complete almost instantaneously and the chances of a consumer "
20270 "being\n"
20271 " unable to access the repository should be low.\n"
20272 " "
20273 msgstr ""
20274
20275 #, fuzzy
20276 msgid "show how files match on given patterns"
20277 msgstr "指定パターンに合致するファイルがありません"
20278
20279 #, fuzzy
20280 msgid "explain instabilities of a changeset"
20281 msgstr "リビジョンから参照されていないファイル"
20282
17353 msgid "REPO [OPTIONS]... [ONE [TWO]]"
20283 msgid "REPO [OPTIONS]... [ONE [TWO]]"
17354 msgstr "REPO [OPTIONS]... [ONE [TWO]]"
20284 msgstr "REPO [OPTIONS]... [ONE [TWO]]"
17355
20285
20286 msgid "indented line outside of block"
20287 msgstr ""
20288
20289 msgid "start an SSH server for this repo"
20290 msgstr ""
20291
20292 #, fuzzy
20293 msgid "construct a specific version of the peer"
20294 msgstr "指定リビジョン時点の内容表示"
20295
20296 msgid "do not read from stderr of the remote"
20297 msgstr ""
20298
20299 msgid "do not log I/O related to the peer handshake"
20300 msgstr ""
20301
20302 msgid "send wire protocol commands to a server"
20303 msgstr ""
20304
20305 msgid ""
20306 " This command can be used to issue wire protocol commands to remote\n"
20307 " peers and to debug the raw data being exchanged."
20308 msgstr ""
20309
20310 msgid ""
20311 " ``--localssh`` will start an SSH server against the current repository\n"
20312 " and connect to that. By default, the connection will perform a "
20313 "handshake\n"
20314 " and establish an appropriate peer instance."
20315 msgstr ""
20316
20317 msgid ""
20318 " ``--peer`` can be used to bypass the handshake protocol and construct a\n"
20319 " peer instance using the specified class type. Valid values are ``raw``,\n"
20320 " ``http2``, ``ssh1``, and ``ssh2``. ``raw`` instances only allow sending\n"
20321 " raw data payloads and don't support higher-level command actions."
20322 msgstr ""
20323
20324 msgid ""
20325 " ``--noreadstderr`` can be used to disable automatic reading from stderr\n"
20326 " of the peer (for SSH connections only). Disabling automatic reading of\n"
20327 " stderr is useful for making output more deterministic."
20328 msgstr ""
20329
20330 msgid ""
20331 " Commands are issued via a mini language which is specified via stdin.\n"
20332 " The language consists of individual actions to perform. An action is\n"
20333 " defined by a block. A block is defined as a line with no leading\n"
20334 " space followed by 0 or more lines with leading space. Blocks are\n"
20335 " effectively a high-level command with additional metadata."
20336 msgstr ""
20337
20338 #, fuzzy
20339 msgid " Lines beginning with ``#`` are ignored."
20340 msgstr " 空行と ``#`` で始まる行は無視されます。"
20341
20342 #, fuzzy
20343 msgid " The following sections denote available actions."
20344 msgstr "以下の ``share.`` セクション設定が、この機能を制御します:"
20345
20346 #, fuzzy
20347 msgid ""
20348 " raw\n"
20349 " ---"
20350 msgstr ""
20351 "\n"
20352 " /tags\n"
20353 " -----"
20354
20355 msgid " Send raw data to the server."
20356 msgstr ""
20357
20358 msgid ""
20359 " The block payload contains the raw data to send as one atomic send\n"
20360 " operation. The data may not actually be delivered in a single system\n"
20361 " call: it depends on the abilities of the transport being used."
20362 msgstr ""
20363
20364 msgid ""
20365 " Each line in the block is de-indented and concatenated. Then, that\n"
20366 " value is evaluated as a Python b'' literal. This allows the use of\n"
20367 " backslash escaping, etc."
20368 msgstr ""
20369
20370 #, fuzzy
20371 msgid ""
20372 " raw+\n"
20373 " ----"
20374 msgstr ""
20375 "\n"
20376 " /tags\n"
20377 " -----"
20378
20379 msgid " Behaves like ``raw`` except flushes output afterwards."
20380 msgstr ""
20381
20382 #, fuzzy
20383 msgid ""
20384 " command <X>\n"
20385 " -----------"
20386 msgstr ""
20387 "\n"
20388 " /bookmarks\n"
20389 " ----------"
20390
20391 msgid ""
20392 " Send a request to run a named command, whose name follows the "
20393 "``command``\n"
20394 " string."
20395 msgstr ""
20396
20397 msgid ""
20398 " Arguments to the command are defined as lines in this block. The format "
20399 "of\n"
20400 " each line is ``<key> <value>``. e.g.::"
20401 msgstr ""
20402
20403 msgid ""
20404 " command listkeys\n"
20405 " namespace bookmarks"
20406 msgstr ""
20407
20408 msgid ""
20409 " If the value begins with ``eval:``, it will be interpreted as a Python\n"
20410 " literal expression. Otherwise values are interpreted as Python b'' "
20411 "literals.\n"
20412 " This allows sending complex types and encoding special byte sequences "
20413 "via\n"
20414 " backslash escaping."
20415 msgstr ""
20416
20417 #, fuzzy
20418 msgid " The following arguments have special meaning:"
20419 msgstr " 以下のオプションを指定できます:"
20420
20421 msgid ""
20422 " ``PUSHFILE``\n"
20423 " When defined, the *push* mechanism of the peer will be used instead\n"
20424 " of the static request-response mechanism and the content of the\n"
20425 " file specified in the value of this argument will be sent as the\n"
20426 " command payload."
20427 msgstr ""
20428
20429 msgid " This can be used to submit a local bundle file to the remote."
20430 msgstr ""
20431
20432 #, fuzzy
20433 msgid ""
20434 " batchbegin\n"
20435 " ----------"
20436 msgstr ""
20437 "\n"
20438 " /branches\n"
20439 " ---------"
20440
20441 msgid " Instruct the peer to begin a batched send."
20442 msgstr ""
20443
20444 msgid ""
20445 " All ``command`` blocks are queued for execution until the next\n"
20446 " ``batchsubmit`` block."
20447 msgstr ""
20448
20449 #, fuzzy
20450 msgid ""
20451 " batchsubmit\n"
20452 " -----------"
20453 msgstr ""
20454 "\n"
20455 " /branches\n"
20456 " ---------"
20457
20458 msgid " Submit previously queued ``command`` blocks as a batch request."
20459 msgstr ""
20460
20461 msgid " This action MUST be paired with a ``batchbegin`` action."
20462 msgstr ""
20463
20464 #, fuzzy
20465 msgid ""
20466 " httprequest <method> <path>\n"
20467 " ---------------------------"
20468 msgstr ""
20469 "\n"
20470 " /annotate/{revision}/{path}\n"
20471 " ---------------------------"
20472
20473 msgid " (HTTP peer only)"
20474 msgstr ""
20475
20476 msgid " Send an HTTP request to the peer."
20477 msgstr ""
20478
20479 msgid ""
20480 " The HTTP request line follows the ``httprequest`` action. e.g. ``GET /"
20481 "foo``."
20482 msgstr ""
20483
20484 msgid ""
20485 " Arguments of the form ``<key>: <value>`` are interpreted as HTTP "
20486 "request\n"
20487 " headers to add to the request. e.g. ``Accept: foo``."
20488 msgstr ""
20489
20490 #, fuzzy
20491 msgid " The following arguments are special:"
20492 msgstr " 以下のオプションを指定できます:"
20493
20494 msgid ""
20495 " ``BODYFILE``\n"
20496 " The content of the file defined as the value to this argument will "
20497 "be\n"
20498 " transferred verbatim as the HTTP request body."
20499 msgstr ""
20500
20501 msgid ""
20502 " ``frame <type> <flags> <payload>``\n"
20503 " Send a unified protocol frame as part of the request body."
20504 msgstr ""
20505
20506 msgid ""
20507 " All frames will be collected and sent as the body to the HTTP\n"
20508 " request."
20509 msgstr ""
20510
20511 #, fuzzy
20512 msgid ""
20513 " close\n"
20514 " -----"
20515 msgstr ""
20516 "\n"
20517 " /tags\n"
20518 " -----"
20519
20520 #, fuzzy
20521 msgid " Close the connection to the server."
20522 msgstr "%s への ssl 接続に失敗"
20523
20524 #, fuzzy
20525 msgid ""
20526 " flush\n"
20527 " -----"
20528 msgstr ""
20529 "\n"
20530 " /tags\n"
20531 " -----"
20532
20533 msgid " Flush data written to the server."
20534 msgstr ""
20535
20536 #, fuzzy
20537 msgid ""
20538 " readavailable\n"
20539 " -------------"
20540 msgstr ""
20541 "\n"
20542 " /shortlog\n"
20543 " ---------"
20544
20545 msgid ""
20546 " Close the write end of the connection and read all available data from\n"
20547 " the server."
20548 msgstr ""
20549
20550 msgid ""
20551 " If the connection to the server encompasses multiple pipes, we poll "
20552 "both\n"
20553 " pipes and read available data."
20554 msgstr ""
20555
20556 #, fuzzy
20557 msgid ""
20558 " readline\n"
20559 " --------"
20560 msgstr ""
20561 "\n"
20562 " /branches\n"
20563 " ---------"
20564
20565 msgid ""
20566 " Read a line of output from the server. If there are multiple output\n"
20567 " pipes, reads only the main pipe."
20568 msgstr ""
20569
20570 #, fuzzy
20571 msgid ""
20572 " ereadline\n"
20573 " ---------"
20574 msgstr ""
20575 "\n"
20576 " /branches\n"
20577 " ---------"
20578
20579 msgid " Like ``readline``, but read from the stderr pipe, if available."
20580 msgstr ""
20581
20582 #, fuzzy
20583 msgid ""
20584 " read <X>\n"
20585 " --------"
20586 msgstr ""
20587 "\n"
20588 " /branches\n"
20589 " ---------"
20590
20591 msgid " ``read()`` N bytes from the server's main output pipe."
20592 msgstr ""
20593
20594 #, fuzzy
20595 msgid ""
20596 " eread <X>\n"
20597 " ---------"
20598 msgstr ""
20599 "\n"
20600 " /branches\n"
20601 " ---------"
20602
20603 msgid " ``read()`` N bytes from the server's stderr pipe, if available."
20604 msgstr ""
20605
20606 #, fuzzy
20607 msgid ""
20608 " Specifying Unified Frame-Based Protocol Frames\n"
20609 " ----------------------------------------------"
20610 msgstr " HG: ------------------------ >8 ------------------------"
20611
20612 msgid ""
20613 " It is possible to emit a *Unified Frame-Based Protocol* by using "
20614 "special\n"
20615 " syntax."
20616 msgstr ""
20617
20618 msgid ""
20619 " A frame is composed as a type, flags, and payload. These can be parsed\n"
20620 " from a string of the form:"
20621 msgstr ""
20622
20623 msgid " <request-id> <stream-id> <stream-flags> <type> <flags> <payload>"
20624 msgstr ""
20625
20626 msgid ""
20627 " ``request-id`` and ``stream-id`` are integers defining the request and\n"
20628 " stream identifiers."
20629 msgstr ""
20630
20631 msgid ""
20632 " ``type`` can be an integer value for the frame type or the string name\n"
20633 " of the type. The strings are defined in ``wireprotoframing.py``. e.g.\n"
20634 " ``command-name``."
20635 msgstr ""
20636
20637 msgid ""
20638 " ``stream-flags`` and ``flags`` are a ``|`` delimited list of flag\n"
20639 " components. Each component (and there can be just one) can be an "
20640 "integer\n"
20641 " or a flag name for stream flags or frame flags, respectively. Values "
20642 "are\n"
20643 " resolved to integers and then bitwise OR'd together."
20644 msgstr ""
20645
20646 msgid ""
20647 " ``payload`` represents the raw frame payload. If it begins with\n"
20648 " ``cbor:``, the following string is evaluated as Python code and the\n"
20649 " resulting object is fed into a CBOR encoder. Otherwise it is "
20650 "interpreted\n"
20651 " as a Python byte string literal.\n"
20652 " "
20653 msgstr ""
20654
20655 #, fuzzy
20656 msgid "--localssh requires a repository"
20657 msgstr "remote にはリポジトリパスを指定してください"
20658
20659 #, fuzzy
20660 msgid "invalid value for --peer"
20661 msgstr "--daemon-postexec への指定値が不正です: %s"
20662
20663 msgid "valid values are \"raw\", \"ssh1\", and \"ssh2\""
20664 msgstr ""
20665
20666 #, fuzzy
20667 msgid "cannot specify --localssh with an explicit path"
20668 msgstr "パッチ適用中に、 --exact 付きでのパッチ適用はできません"
20669
20670 #, fuzzy
20671 msgid "(waiting for commands on stdin)\n"
20672 msgstr "警告: ファイル %s でのコマンド解析中にエラー発生\n"
20673
20674 msgid "creating ssh peer for wire protocol version 1\n"
20675 msgstr ""
20676
20677 msgid "creating ssh peer for wire protocol version 2\n"
20678 msgstr ""
20679
20680 #, fuzzy
20681 msgid "using raw connection to peer\n"
20682 msgstr "%s への ssl 接続に失敗"
20683
20684 msgid "creating ssh peer from handshake results\n"
20685 msgstr ""
20686
20687 #, fuzzy
20688 msgid "only http:// paths are currently supported"
20689 msgstr "全てのパッチが適用中です\n"
20690
20691 msgid "creating http peer for wire protocol version 2\n"
20692 msgstr ""
20693
20694 msgid "could not instantiate HTTP peer for wire protocol version 2"
20695 msgstr ""
20696
20697 msgid ""
20698 "the server may not have the feature enabled or is not allowing this client "
20699 "version"
20700 msgstr ""
20701
20702 #, python-format
20703 msgid "--peer %s not supported with HTTP peers"
20704 msgstr ""
20705
20706 #, fuzzy
20707 msgid "unsupported connection configuration"
20708 msgstr "未サポートの行末種別: %s"
20709
20710 msgid "cannot call raw/raw+ on this peer"
20711 msgstr ""
20712
20713 #, fuzzy
20714 msgid "cannot call flush on this peer"
20715 msgstr "null リビジョンのフェーズは変更できません"
20716
20717 msgid "cannot send commands unless peer instance is available"
20718 msgstr ""
20719
20720 #, fuzzy, python-format
20721 msgid "sending %s command\n"
20722 msgstr "通知コマンド %s 実行中\n"
20723
20724 #, fuzzy, python-format
20725 msgid "result: %s\n"
20726 msgstr "認証領域(realm): %s\n"
20727
20728 #, fuzzy, python-format
20729 msgid "remote output: %s\n"
20730 msgstr "連携先: 中止: %s\n"
20731
20732 #, fuzzy, python-format
20733 msgid "response: %s\n"
20734 msgstr "連携先同期: %s\n"
20735
20736 msgid "nested batchbegin not allowed"
20737 msgstr ""
20738
20739 #, python-format
20740 msgid "sending batch with %d sub-commands\n"
20741 msgstr ""
20742
20743 #, fuzzy, python-format
20744 msgid "response #%d: %s\n"
20745 msgstr "連携先同期: %s\n"
20746
20747 msgid "cannot use httprequest without an HTTP peer"
20748 msgstr ""
20749
20750 msgid "invalid httprequest: expected format is \"httprequest <method> <path>"
20751 msgstr ""
20752
20753 #, fuzzy, python-format
20754 msgid "unknown argument to httprequest: %s"
20755 msgstr "未知のダイジェスト種別: %s"
20756
20757 #, fuzzy, python-format
20758 msgid "cbor> %s\n"
20759 msgstr "中止: %s\n"
20760
20761 #, fuzzy
20762 msgid "readavailable not available on this peer"
20763 msgstr "このシステムでは IPv6 を利用できません"
20764
20765 #, fuzzy
20766 msgid "readline not available on this peer"
20767 msgstr "このシステムでは IPv6 を利用できません"
20768
20769 #, fuzzy
20770 msgid "ereadline not available on this peer"
20771 msgstr "このシステムでは IPv6 を利用できません"
20772
20773 #, fuzzy
20774 msgid "read not available on this peer"
20775 msgstr "このシステムでは IPv6 を利用できません"
20776
20777 #, fuzzy
20778 msgid "eread not available on this peer"
20779 msgstr "このシステムでは IPv6 を利用できません"
20780
20781 #, fuzzy, python-format
20782 msgid "unknown action: %s"
20783 msgstr "未知の操作 \"%s\" が指定されました"
20784
20785 msgid "unclosed \"batchbegin\" request"
20786 msgstr ""
20787
17356 msgid ""
20788 msgid ""
17357 "multiple matching bookmarks to merge - please merge with an explicit rev or "
20789 "multiple matching bookmarks to merge - please merge with an explicit rev or "
17358 "bookmark"
20790 "bookmark"
@@ -17453,14 +20885,15 b' msgid "(committing will reopen branch \\"'
17453 msgstr "(閉鎖済みヘッドでのコミットはブランチ \"%s\" の閉鎖を解除します)\n"
20885 msgstr "(閉鎖済みヘッドでのコミットはブランチ \"%s\" の閉鎖を解除します)\n"
17454
20886
17455 #, python-format
20887 #, python-format
20888 msgid "updated to \"%s: %s\"\n"
20889 msgstr "リビジョン \"%s: %s\" で更新\n"
20890
20891 #, python-format
17456 msgid "%i other heads for branch \"%s\"\n"
20892 msgid "%i other heads for branch \"%s\"\n"
17457 msgstr "他に %i 個のヘッドがブランチ \"%s\" に存在します\n"
20893 msgstr "他に %i 個のヘッドがブランチ \"%s\" に存在します\n"
17458
20894
17459 msgid "working directory state appears damaged!"
20895 msgid "incomplete hunk"
17460 msgstr "作業領域の状態管理に問題があります!"
20896 msgstr ""
17461
17462 msgid "working directory state may be changed parallelly"
17463 msgstr "作業領域状態が平行して更新された可能性があります"
17464
20897
17465 #, python-format
20898 #, python-format
17466 msgid "directory %r already in dirstate"
20899 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"'
17474 msgid "setting %r to other parent only allowed in merges"
20907 msgid "setting %r to other parent only allowed in merges"
17475 msgstr "%r の別親への設定はマージでのみ可能です"
20908 msgstr "%r の別親への設定はマージでのみ可能です"
17476
20909
17477 #, python-format
20910 msgid "working directory state may be changed parallelly"
17478 msgid "can't close already inactivated backup: dirstate%s"
20911 msgstr "作業領域状態が平行して更新された可能性があります"
17479 msgstr "非活性化済みのバックアップは close できません: dirstate%s"
20912
17480
20913 msgid "working directory state appears damaged!"
17481 #, python-format
20914 msgstr "作業領域の状態管理に問題があります!"
17482 msgid "can't release already inactivated backup: dirstate%s"
20915
17483 msgstr "非活性化済みのバックアップは release できません: dirstate%s"
20916 #, python-format
20917 msgid "can't close already inactivated backup: %s"
20918 msgstr "非活性化済みのバックアップは close できません: %s"
20919
20920 #, python-format
20921 msgid "can't release already inactivated backup: %s"
20922 msgstr "非活性化済みのバックアップは release できません: %s"
17484
20923
17485 #, python-format
20924 #, python-format
17486 msgid "push creates new remote branches: %s!"
20925 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!"'
17489 msgid "use 'hg push --new-branch' to create new remote branches"
20928 msgid "use 'hg push --new-branch' to create new remote branches"
17490 msgstr "連携先への新規ブランチ作成は 'hg push --new-branch'"
20929 msgstr "連携先への新規ブランチ作成は 'hg push --new-branch'"
17491
20930
17492 #, python-format
17493 msgid "and %s others"
17494 msgstr "その他 %s 個"
17495
17496 msgid "remote has heads that are not known locally\n"
20931 msgid "remote has heads that are not known locally\n"
17497 msgstr "連携先には新規ヘッドが存在します\n"
20932 msgstr "連携先には新規ヘッドが存在します\n"
17498
20933
@@ -17535,14 +20970,6 b' msgid "new remote heads on branch \'%s\':\\'
17535 msgstr "以下の新しいヘッドが連携先のブランチ '%s' に作成されます:\n"
20970 msgstr "以下の新しいヘッドが連携先のブランチ '%s' に作成されます:\n"
17536
20971
17537 #, python-format
20972 #, python-format
17538 msgid "(did you mean %s?)\n"
17539 msgstr "(推測される候補: %s)\n"
17540
17541 #, python-format
17542 msgid "(did you mean one of %s?)\n"
17543 msgstr "(推測される候補: %s)\n"
17544
17545 #, python-format
17546 msgid "hg: parse error at %s: %s\n"
20973 msgid "hg: parse error at %s: %s\n"
17547 msgstr "hg: %s での解析エラー: %s\n"
20974 msgstr "hg: %s での解析エラー: %s\n"
17548
20975
@@ -17557,6 +20984,17 b' msgstr "hg: \xe8\xa7\xa3\xe6\x9e\x90\xe3\x82\xa8\xe3\x83\xa9\xe3\x83\xbc: %s\\n"'
17557 msgid "(%s)\n"
20984 msgid "(%s)\n"
17558 msgstr "(%s)\n"
20985 msgstr "(%s)\n"
17559
20986
20987 #, python-format
20988 msgid "** ProgrammingError: %s\n"
20989 msgstr ""
20990
20991 #, fuzzy, python-format
20992 msgid "** (%s)\n"
20993 msgstr "(%s)\n"
20994
20995 msgid "killed!\n"
20996 msgstr "強制終了されました!\n"
20997
17560 msgid "interrupted!\n"
20998 msgid "interrupted!\n"
17561 msgstr "中断されました!\n"
20999 msgstr "中断されました!\n"
17562
21000
@@ -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"'
17615 msgid "alias '%s' resolves to ambiguous command '%s'"
21053 msgid "alias '%s' resolves to ambiguous command '%s'"
17616 msgstr "'%s' が曖昧なコマンド '%s' の別名とみなされました"
21054 msgstr "'%s' が曖昧なコマンド '%s' の別名とみなされました"
17617
21055
21056 #, fuzzy, python-format
21057 msgid "non-ASCII character in alias definition '%s:%s'"
21058 msgstr "dag 記述に不正な文字が使われています: %s..."
21059
17618 #, python-format
21060 #, python-format
17619 msgid "'%s' is provided by '%s' extension"
21061 msgid "'%s' is provided by '%s' extension"
17620 msgstr "'%s' コマンドは '%s' エクステンションにより提供されています"
21062 msgstr "'%s' コマンドは '%s' エクステンションにより提供されています"
@@ -17638,6 +21080,10 b' msgid ""'
17638 "repository may only be abbreviated as --repo!"
21080 "repository may only be abbreviated as --repo!"
17639 msgstr "-R は単独記述(例: '-dR' は不可)、 --repository の略記は --repo のみ"
21081 msgstr "-R は単独記述(例: '-dR' は不可)、 --repository の略記は --repo のみ"
17640
21082
21083 #, fuzzy
21084 msgid "option --debugger may not be abbreviated!"
21085 msgstr "--cwd 指定値が省略されなかった可能性があります!"
21086
17641 #, python-format
21087 #, python-format
17642 msgid "time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
21088 msgid "time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
17643 msgstr "所要時間: 実時間 %.3f 秒 (ユーザ %.3f+%.3f システム %.3f+%.3f)\n"
21089 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"'
17783 msgid "destination does not support push"
21229 msgid "destination does not support push"
17784 msgstr "指定の連携先には履歴を反映できません"
21230 msgstr "指定の連携先には履歴を反映できません"
17785
21231
21232 msgid ""
21233 "cannot push: destination does not support the unbundle wire protocol command"
21234 msgstr ""
21235
17786 #, python-format
21236 #, python-format
17787 msgid "bookmark %s does not exist on the local or remote repository!\n"
21237 msgid "bookmark %s does not exist on the local or remote repository!\n"
17788 msgstr "ブックマーク %s はいずれのリポジトリにも存在しません!\n"
21238 msgstr "ブックマーク %s はいずれのリポジトリにも存在しません!\n"
@@ -17792,19 +21242,20 b' msgid "push includes obsolete changeset:'
17792 msgstr "履歴反映対象に廃止 (obsolete) リビジョンが含まれます!: %s"
21242 msgstr "履歴反映対象に廃止 (obsolete) リビジョンが含まれます!: %s"
17793
21243
17794 #, python-format
21244 #, python-format
17795 msgid "push includes unstable changeset: %s!"
21245 msgid "push includes phase-divergent changeset: %s!"
17796 msgstr "履歴反映対象に非永続 (unstable) リビジョンが含まれます!: %s"
21246 msgstr ""
17797
21247 "履歴反映対象にフェーズ分岐 (phase-divergent) した後継リビジョンが含まれま"
17798 #, python-format
21248 "す!: %s"
17799 msgid "push includes bumped changeset: %s!"
21249
17800 msgstr ""
21250 #, python-format
17801
21251 msgid "push includes content-divergent changeset: %s!"
17802 #, python-format
21252 msgstr ""
17803 msgid "push includes divergent changeset: %s!"
21253 "履歴反映対象に内容分岐 (content-divergent) した後継リビジョンが含まれます!: "
17804 msgstr "履歴反映対象に分岐 (divergent) した後継リビジョンが含まれます!: %s"
21254 "%s"
17805
21255
17806 msgid "no common changegroup version"
21256 #, python-format
17807 msgstr "利用可能な共通のバンドル形式バージョンがありません"
21257 msgid "push includes orphan changeset: %s!"
21258 msgstr "履歴反映対象に孤児 (orphan) リビジョンが含まれます!: %s"
17808
21259
17809 #, python-format
21260 #, python-format
17810 msgid "updating %s to public failed"
21261 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"'
17861 msgid "unsupported getbundle arguments: %s"
21312 msgid "unsupported getbundle arguments: %s"
17862 msgstr "getbundle プロトコルに未知の引数が指定されました: %s"
21313 msgstr "getbundle プロトコルに未知の引数が指定されました: %s"
17863
21314
21315 msgid "no common bookmarks exchange method"
21316 msgstr "ブックマーク情報が交換できません"
21317
21318 msgid "no common phases exchange method"
21319 msgstr "フェーズ情報が交換できません"
21320
17864 msgid "no clone bundles available on remote; falling back to regular clone\n"
21321 msgid "no clone bundles available on remote; falling back to regular clone\n"
17865 msgstr "連携先にclone用バンドルファイルがありません。通常clone処理を実施中\n"
21322 msgstr "連携先にclone用バンドルファイルがありません。通常clone処理を実施中\n"
17866
21323
@@ -17910,13 +21367,21 b' msgstr ""'
17910 "を無効化します)\n"
21367 "を無効化します)\n"
17911
21368
17912 #, python-format
21369 #, python-format
21370 msgid "*** failed to set up extension %s: %s\n"
21371 msgstr "*** エクステンション %s の設定に失敗: %s\n"
21372
21373 #, python-format
17913 msgid "*** failed to import extension %s from %s: %s\n"
21374 msgid "*** failed to import extension %s from %s: %s\n"
17914 msgstr "*** %s のインポートに失敗 (%s): %s\n"
21375 msgstr "*** エクステンション %s のインポートに失敗 (%s): %s\n"
17915
21376
17916 #, python-format
21377 #, python-format
17917 msgid "*** failed to import extension %s: %s\n"
21378 msgid "*** failed to import extension %s: %s\n"
17918 msgstr "*** %s のインポートに失敗: %s\n"
21379 msgstr "*** %s のインポートに失敗: %s\n"
17919
21380
21381 #, python-format
21382 msgid "*** (%s)\n"
21383 msgstr "*** (%s)\n"
21384
17920 msgid "(no help text available)"
21385 msgid "(no help text available)"
17921 msgstr "(ヘルプはありません)"
21386 msgstr "(ヘルプはありません)"
17922
21387
@@ -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)"'
17924 msgid "warning: error finding commands in %s\n"
21389 msgid "warning: error finding commands in %s\n"
17925 msgstr "警告: ファイル %s でのコマンド解析中にエラー発生\n"
21390 msgstr "警告: ファイル %s でのコマンド解析中にエラー発生\n"
17926
21391
17927 #, python-format
21392 msgid "expected int"
17928 msgid "invalid value %r for option %s, expected int"
21393 msgstr "整数値を想定"
17929 msgstr "指定値 %r は整数値を想定しているオプション %s には不適切です"
21394
17930
21395 #, python-format
17931 #, python-format
21396 msgid "invalid value %r for option %s, %s"
17932 msgid "couldn't find merge tool %s\n"
21397 msgstr "指定値 %r はオプション %s には不適切です: %s"
17933 msgstr "マージツール %s が見つかりません\n"
17934
17935 #, python-format
17936 msgid "tool %s can't handle symlinks\n"
17937 msgstr "ツール %s はシンボリックリンクを扱えません\n"
17938
17939 #, python-format
17940 msgid "tool %s can't handle binary\n"
17941 msgstr "ツール %s はバイナリを扱えません\n"
17942
17943 #, python-format
17944 msgid "tool %s requires a GUI\n"
17945 msgstr "ツール %s は GUI が必要です\n"
17946
17947 msgid ""
17948 "``:prompt``\n"
17949 "Asks the user which of the local `p1()` or the other `p2()` version to\n"
17950 " keep as the merged version."
17951 msgstr ""
17952 "``:prompt``\n"
17953 "現行側 (`p1()`) と他方側 (`p2()`) のどちらをマージ結果に採用するか、\n"
17954 " 対話的に確認します。"
17955
21398
17956 #, python-format
21399 #, python-format
17957 msgid ""
21400 msgid ""
@@ -17974,10 +21417,42 b' msgstr ""'
17974 "すか?$$ &Changed $$ &Delete $$ &Unresolved"
21417 "すか?$$ &Changed $$ &Delete $$ &Unresolved"
17975
21418
17976 #, python-format
21419 #, python-format
17977 msgid ""
21420 msgid "%s (for pattern %s)"
17978 "no tool found to merge %(fd)s\n"
21421 msgstr "%s (パターン %s)"
17979 "keep (l)ocal%(l)s, take (o)ther%(o)s, or leave (u)nresolved?$$ &Local $$ "
21422
17980 "&Other $$ &Unresolved"
21423 #, python-format
21424 msgid "couldn't find merge tool %s\n"
21425 msgstr "マージツール %s が見つかりません\n"
21426
21427 #, python-format
21428 msgid "tool %s can't handle symlinks\n"
21429 msgstr "ツール %s はシンボリックリンクを扱えません\n"
21430
21431 #, python-format
21432 msgid "tool %s can't handle binary\n"
21433 msgstr "ツール %s はバイナリを扱えません\n"
21434
21435 #, python-format
21436 msgid "tool %s requires a GUI\n"
21437 msgstr "ツール %s は GUI が必要です\n"
21438
21439 #, python-format
21440 msgid "no tool found to merge %s\n"
21441 msgstr "ファイル %s 向けマージツールは設定されていません\n"
21442
21443 msgid ""
21444 "``:prompt``\n"
21445 " Asks the user which of the local `p1()` or the other `p2()` version to\n"
21446 " keep as the merged version."
21447 msgstr ""
21448 "``:prompt``\n"
21449 " 現行側 (`p1()`) と他方側 (`p2()`) のどちらをマージ結果に採用するか、\n"
21450 " 対話的に確認します。"
21451
21452 #, fuzzy, python-format
21453 msgid ""
21454 "keep (l)ocal%(l)s, take (o)ther%(o)s, or leave (u)nresolved for %(fd)s?$$ "
21455 "&Local $$ &Other $$ &Unresolved"
17981 msgstr ""
21456 msgstr ""
17982 "ファイル %(fd)s のマージに適切なツールが見つかりません。\n"
21457 "ファイル %(fd)s のマージに適切なツールが見つかりません。\n"
17983 "現行側%(l)s:(l)ocal, 他方側%(o)s:(o)ther, 衝突未解消:(u)nresolved のいずれを"
21458 "現行側%(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"'
18020 msgid "warning: internal %s cannot merge change/delete conflict for %s\n"
21495 msgid "warning: internal %s cannot merge change/delete conflict for %s\n"
18021 msgstr "警告: 内部ツール %s は %s への変更と登録除外をマージできません\n"
21496 msgstr "警告: 内部ツール %s は %s への変更と登録除外をマージできません\n"
18022
21497
21498 #, python-format
21499 msgid ""
21500 "warning: conflicts while merging %s! (edit, then use 'hg resolve --mark')\n"
21501 msgstr ""
21502 "警告: %s のマージで衝突を検出 (編集後 'hg resolve --mark' 実施が必要です)\n"
21503
18023 msgid ""
21504 msgid ""
18024 "``:union``\n"
21505 "``:union``\n"
18025 "Uses the internal non-interactive simple merge algorithm for merging\n"
21506 "Uses the internal non-interactive simple merge algorithm for merging\n"
@@ -18030,12 +21511,6 b' msgstr ""'
18030 "非対話的な、 単純なマージ処理を実施します。 衝突があった場合、\n"
21511 "非対話的な、 単純なマージ処理を実施します。 衝突があった場合、\n"
18031 " 両方の変更内容が取り込まれます。 衝突マークは記録されません。"
21512 " 両方の変更内容が取り込まれます。 衝突マークは記録されません。"
18032
21513
18033 #, python-format
18034 msgid ""
18035 "warning: conflicts while merging %s! (edit, then use 'hg resolve --mark')\n"
18036 msgstr ""
18037 "警告: %s のマージで衝突を検出 (編集後 'hg resolve --mark' 実施が必要です)\n"
18038
18039 msgid ""
21514 msgid ""
18040 "``:merge``\n"
21515 "``:merge``\n"
18041 "Uses the internal non-interactive simple merge algorithm for merging\n"
21516 "Uses the internal non-interactive simple merge algorithm for merging\n"
@@ -18083,13 +21558,6 b' msgstr ""'
18083 "内部ツール :merge と同様の挙動ですが、 非対話的な衝突解消の際に、\n"
21558 "内部ツール :merge と同様の挙動ですが、 非対話的な衝突解消の際に、\n"
18084 " マージ対象リビジョン側 (`p2()`) の変更内容を採用します。"
21559 " マージ対象リビジョン側 (`p2()`) の変更内容を採用します。"
18085
21560
18086 msgid ""
18087 "``:tagmerge``\n"
18088 "Uses the internal tag merge algorithm (experimental)."
18089 msgstr ""
18090 "``:tagmerge``\n"
18091 "タグファイル専用のマージ処理を行います (実験的実装)"
18092
18093 #, python-format
21561 #, python-format
18094 msgid ""
21562 msgid ""
18095 "automatic tag merging of %s failed! (use 'hg resolve --tool :merge' or "
21563 "automatic tag merging of %s failed! (use 'hg resolve --tool :merge' or "
@@ -18099,6 +21567,13 b' msgstr ""'
18099 "のツールを使ってマージしてください)\n"
21567 "のツールを使ってマージしてください)\n"
18100
21568
18101 msgid ""
21569 msgid ""
21570 "``:tagmerge``\n"
21571 " Uses the internal tag merge algorithm (experimental)."
21572 msgstr ""
21573 "``:tagmerge``\n"
21574 " タグファイル専用のマージ処理を行います (実験的実装)"
21575
21576 msgid ""
18102 "``:dump``\n"
21577 "``:dump``\n"
18103 "Creates three versions of the files to merge, containing the\n"
21578 "Creates three versions of the files to merge, containing the\n"
18104 " contents of local, other and base. These files can then be used to\n"
21579 " contents of local, other and base. These files can then be used to\n"
@@ -18109,13 +21584,27 b' msgid ""'
18109 msgstr ""
21584 msgstr ""
18110 "``:dump``\n"
21585 "``:dump``\n"
18111 "作業領域側、 マージ対象リビジョン側、 および共通祖先時点の、\n"
21586 "作業領域側、 マージ対象リビジョン側、 および共通祖先時点の、\n"
18112 " それぞれの内容を持つ3つのファイルを生成します。\n"
21587 " それぞれの内容を持つ3つのファイルを生成します。\n"
18113 " これらのファイルは、事後の手動マージ等で使用してください。\n"
21588 " これらのファイルは、事後の手動マージ等で使用してください。\n"
18114 " 対象ファイル名が ``a.txt`` であった場合、\n"
21589 " 対象ファイル名が ``a.txt`` であった場合、\n"
18115 " 生成されるファイルはそれぞれ ``a.txt.local``, ``a.txt.other``\n"
21590 " 生成されるファイルはそれぞれ ``a.txt.local``, ``a.txt.other``\n"
18116 " および ``a.txt.base`` と命名され、\n"
21591 " および ``a.txt.base`` と命名され、\n"
18117 " ``a.txt`` と同じディレクトリに格納されます。"
21592 " ``a.txt`` と同じディレクトリに格納されます。"
18118
21593
21594 msgid ""
21595 " This implies premerge. Therefore, files aren't dumped, if premerge\n"
21596 " runs successfully. Use :forcedump to forcibly write files out."
21597 msgstr ""
21598 " 事前マージが成功した場合は、 ファイルが出力されません。\n"
21599 " 強制的にファイルを書き出したい場合は :forcedump を使用してください。"
21600
21601 msgid ""
21602 "``:forcedump``\n"
21603 " Creates three versions of the files as same as :dump, but omits premerge."
21604 msgstr ""
21605 "``:forcedump``\n"
21606 " 事前マージ無しで :dump と同じ要領でファイルを書き出します。"
21607
18119 #, python-format
21608 #, python-format
18120 msgid "warning: %s cannot merge change/delete conflict for %s\n"
21609 msgid "warning: %s cannot merge change/delete conflict for %s\n"
18121 msgstr "警告: マージツール %s は %s への変更と登録除外をマージできません\n"
21610 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"'
18136 msgid "merging %s\n"
21625 msgid "merging %s\n"
18137 msgstr "%s をマージ中\n"
21626 msgstr "%s をマージ中\n"
18138
21627
21628 msgid "merge halted after failed merge (see hg resolve)"
21629 msgstr ""
21630
21631 msgid "continue merge operation (yn)?$$ &Yes $$ &No"
21632 msgstr "マージ処理を継続しますか? (y/n)$$ &Yes $$ &No"
21633
18139 #, python-format
21634 #, python-format
18140 msgid "was merge of '%s' successful (yn)?$$ &Yes $$ &No"
21635 msgid "was merge of '%s' successful (yn)?$$ &Yes $$ &No"
18141 msgstr "'%s' のマージは成功しましたか?(y/n)$$ &Yes $$ &No"
21636 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"'
18157 msgid "invalid token"
21652 msgid "invalid token"
18158 msgstr "不正な記述"
21653 msgstr "不正な記述"
18159
21654
21655 msgid "not a symbol"
21656 msgstr "シンボル以外が指定されました"
21657
21658 #, fuzzy, python-format
21659 msgid "invalid pattern kind: %s"
21660 msgstr "不正パターン (%s): %s"
21661
18160 msgid "missing argument"
21662 msgid "missing argument"
18161 msgstr "引数がありません"
21663 msgstr "引数がありません"
18162
21664
21665 #, fuzzy
21666 msgid "pattern must be a string"
21667 msgstr "sort には文字列を指定してください"
21668
21669 #, fuzzy
21670 msgid "can't use negate operator in this context"
21671 msgstr "ここではリストを使用できません"
21672
18163 msgid "can't use a list in this context"
21673 msgid "can't use a list in this context"
18164 msgstr "ここではリストを使用できません"
21674 msgstr "ここではリストを使用できません"
18165
21675
@@ -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"'
18359 msgid "couldn't parse size: %s"
21869 msgid "couldn't parse size: %s"
18360 msgstr "サイズ指定の解析に失敗: %s"
21870 msgstr "サイズ指定の解析に失敗: %s"
18361
21871
21872 #. i18n: "size" is a keyword
21873 msgid "size requires an expression"
21874 msgstr "size には条件指定が必要です"
21875
18362 msgid ""
21876 msgid ""
18363 "``size(expression)``\n"
21877 "``size(expression)``\n"
18364 " File size matches the given expression. Examples:"
21878 " File size matches the given expression. Examples:"
@@ -18377,10 +21891,6 b' msgstr ""'
18377 " - size('>= .5MB') - 524288 バイト以上のファイル\n"
21891 " - size('>= .5MB') - 524288 バイト以上のファイル\n"
18378 " - size('4k - 1MB') - 4096 〜 1048576 バイトのファイル"
21892 " - size('4k - 1MB') - 4096 〜 1048576 バイトのファイル"
18379
21893
18380 #. i18n: "size" is a keyword
18381 msgid "size requires an expression"
18382 msgstr "size には条件指定が必要です"
18383
18384 msgid ""
21894 msgid ""
18385 "``encoding(name)``\n"
21895 "``encoding(name)``\n"
18386 " File can be successfully decoded with the given character\n"
21896 " 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"'
18495 msgid "starting revisions are not directly related"
22005 msgid "starting revisions are not directly related"
18496 msgstr "開始リビジョンと直接の関連がありません"
22006 msgstr "開始リビジョンと直接の関連がありません"
18497
22007
18498 #, python-format
22008 #, fuzzy, python-format
18499 msgid "inconsistent state, %s:%s is good and bad"
22009 msgid "inconsistent state, %d:%s is good and bad"
18500 msgstr "状態矛盾: %s:%s は良否判定不能"
22010 msgstr "状態矛盾: %s:%s は良否判定不能"
18501
22011
18502 #, python-format
22012 #, 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:"'
18579 msgid " ([+] can be repeated)"
22089 msgid " ([+] can be repeated)"
18580 msgstr " ([+] 印付きのオプションは複数回指定可能です)"
22090 msgstr " ([+] 印付きのオプションは複数回指定可能です)"
18581
22091
22092 #, fuzzy
22093 msgid "Bundle2"
22094 msgstr "bundle フォーマット"
22095
18582 msgid "Bundles"
22096 msgid "Bundles"
18583 msgstr "bundle フォーマット"
22097 msgstr "bundle フォーマット"
18584
22098
@@ -18588,6 +22102,9 b' msgstr "\xe6\xa4\x9c\xe9\x96\xb2"'
18588 msgid "Changegroups"
22102 msgid "Changegroups"
18589 msgstr "changegroups フォーマット"
22103 msgstr "changegroups フォーマット"
18590
22104
22105 msgid "Config Registrar"
22106 msgstr ""
22107
18591 msgid "Repository Requirements"
22108 msgid "Repository Requirements"
18592 msgstr "リポジトリの requires 設定"
22109 msgstr "リポジトリの requires 設定"
18593
22110
@@ -18609,6 +22126,10 b' msgstr "\xe8\xa8\xad\xe5\xae\x9a\xe3\x83\x95\xe3\x82\xa1\xe3\x82\xa4\xe3\x83\xab"'
18609 msgid "Date Formats"
22126 msgid "Date Formats"
18610 msgstr "日時表記"
22127 msgstr "日時表記"
18611
22128
22129 #, fuzzy
22130 msgid "Command-line flags"
22131 msgstr "コマンド"
22132
18612 msgid "File Name Patterns"
22133 msgid "File Name Patterns"
18613 msgstr "ファイル名パターン"
22134 msgstr "ファイル名パターン"
18614
22135
@@ -18668,15 +22189,11 b' msgstr ""'
18668 "\n"
22189 "\n"
18669 "別名: %s\n"
22190 "別名: %s\n"
18670
22191
18671 #, python-format
22192 #, fuzzy, python-format
18672 msgid "shell alias for::"
22193 msgid "shell alias for: %s"
18673 msgstr "シェルコマンドの別名::"
22194 msgstr "シェルコマンドの別名::"
18674
22195
18675 #, python-format
22196 #, python-format
18676 msgid " %s"
18677 msgstr " %s"
18678
18679 #, python-format
18680 msgid "defined by: %s\n"
22197 msgid "defined by: %s\n"
18681 msgstr "定義位置: %s\n"
22198 msgstr "定義位置: %s\n"
18682
22199
@@ -18862,7 +22379,7 b' msgstr ""'
18862
22379
18863 msgid ""
22380 msgid ""
18864 "<compression>-<type>\n"
22381 "<compression>-<type>\n"
18865 " The compression engine and format are delimited by a hypthen (``-``)."
22382 " The compression engine and format are delimited by a hyphen (``-``)."
18866 msgstr ""
22383 msgstr ""
18867
22384
18868 msgid ""
22385 msgid ""
@@ -18948,7 +22465,7 b' msgstr ""'
18948
22465
18949 msgid ""
22466 msgid ""
18950 "``none-v1``\n"
22467 "``none-v1``\n"
18951 " Produce a ``v2`` bundle with no compression."
22468 " Produce a ``v1`` bundle with no compression."
18952 msgstr ""
22469 msgstr ""
18953
22470
18954 msgid ""
22471 msgid ""
@@ -18962,7 +22479,8 b' msgid ""'
18962 " This errors because ``zstd`` is not supported for ``v1`` types.\n"
22479 " This errors because ``zstd`` is not supported for ``v1`` types.\n"
18963 msgstr ""
22480 msgstr ""
18964
22481
18965 msgid "Mercurial can colorizes output from several commands."
22482 #, fuzzy
22483 msgid "Mercurial colorizes output from several commands."
18966 msgstr "Mercurial は、 各種コマンドの出力を、 カラー化できます。"
22484 msgstr "Mercurial は、 各種コマンドの出力を、 カラー化できます。"
18967
22485
18968 msgid ""
22486 msgid ""
@@ -18976,9 +22494,45 b' msgstr ""'
18976 "他の多くのコマンドの出力も、 同様にカラー化されます。 カラー化設定は、\n"
22494 "他の多くのコマンドの出力も、 同様にカラー化されます。 カラー化設定は、\n"
18977 "カスタマイズ可能です。"
22495 "カスタマイズ可能です。"
18978
22496
18979 msgid "To enable color use::"
22497 #, fuzzy
22498 msgid "To enable color (default) whenever possible use::"
22499 msgstr "出力をカラー化するには、 以下の設定が必要です::"
22500
22501 #, fuzzy
22502 msgid ""
22503 " [ui]\n"
22504 " color = yes"
22505 msgstr ""
22506 " [ui]\n"
22507 " color = auto"
22508
22509 #, fuzzy
22510 msgid "To disable color use::"
18980 msgstr "出力をカラー化するには、 以下の設定が必要です::"
22511 msgstr "出力をカラー化するには、 以下の設定が必要です::"
18981
22512
22513 #, fuzzy
22514 msgid ""
22515 " [ui]\n"
22516 " color = no"
22517 msgstr ""
22518 " [ui]\n"
22519 " color = auto"
22520
22521 #, fuzzy
22522 msgid "See :hg:`help config.ui.color` for details."
22523 msgstr "詳細は :hg:`help color` を参照してください。\n"
22524
22525 msgid ""
22526 " The default pager on Windows does not support color, so enabling the "
22527 "pager\n"
22528 " will effectively disable color. See :hg:`help config.ui.paginate` to "
22529 "disable\n"
22530 " the pager. Alternately, MSYS and Cygwin shells provide `less` as a "
22531 "pager,\n"
22532 " which can be configured to support ANSI color mode. Windows 10 natively\n"
22533 " supports ANSI color mode."
22534 msgstr ""
22535
18982 msgid ""
22536 msgid ""
18983 "Mode\n"
22537 "Mode\n"
18984 "===="
22538 "===="
@@ -18986,11 +22540,12 b' msgstr ""'
18986 "モード\n"
22540 "モード\n"
18987 "======"
22541 "======"
18988
22542
18989 msgid ""
22543 #, fuzzy
18990 "Mercurial can use various system to display color. The supported modes are\n"
22544 msgid ""
22545 "Mercurial can use various systems to display color. The supported modes are\n"
18991 "``ansi``, ``win32``, and ``terminfo``. See :hg:`help config.color` for "
22546 "``ansi``, ``win32``, and ``terminfo``. See :hg:`help config.color` for "
18992 "details\n"
22547 "details\n"
18993 "about how to control the mode"
22548 "about how to control the mode."
18994 msgstr ""
22549 msgstr ""
18995 "Mercurial の出力は、 様々な方法でカラー化可能です。 カラー化方式として\n"
22550 "Mercurial の出力は、 様々な方法でカラー化可能です。 カラー化方式として\n"
18996 "``ansi``, ``win32`` および ``terminfo`` の各モードがサポートされています。\n"
22551 "``ansi``, ``win32`` および ``terminfo`` の各モードがサポートされています。\n"
@@ -19212,8 +22767,9 b' msgstr ""'
19212 "色指定のカスタマイズ\n"
22767 "色指定のカスタマイズ\n"
19213 "===================="
22768 "===================="
19214
22769
19215 msgid ""
22770 #, fuzzy
19216 "Because there are only eight standard colors, this module allows you\n"
22771 msgid ""
22772 "Because there are only eight standard colors, Mercurial allows you\n"
19217 "to define color names for other color slots which might be available\n"
22773 "to define color names for other color slots which might be available\n"
19218 "for your terminal type, assuming terminfo mode. For instance::"
22774 "for your terminal type, assuming terminfo mode. For instance::"
19219 msgstr ""
22775 msgstr ""
@@ -19893,6 +23449,14 b' msgstr ""'
19893 "``ignorews``\n"
23449 "``ignorews``\n"
19894 " 差分検出における空白文字無視の有無。"
23450 " 差分検出における空白文字無視の有無。"
19895
23451
23452 #, fuzzy
23453 msgid ""
23454 "``ignorewseol``\n"
23455 " Ignore white space at the end of a line when comparing lines."
23456 msgstr ""
23457 "``ignorews``\n"
23458 " 差分検出における空白文字無視の有無。"
23459
19896 msgid ""
23460 msgid ""
19897 "``ignorewsamount``\n"
23461 "``ignorewsamount``\n"
19898 " Ignore changes in the amount of white space."
23462 " Ignore changes in the amount of white space."
@@ -20107,13 +23671,14 b' msgstr ""'
20107 "Mercurial 出力のカラー化設定。 効果指定やスタイルのカスタマイズの詳細は、\n"
23671 "Mercurial 出力のカラー化設定。 効果指定やスタイルのカスタマイズの詳細は、\n"
20108 ":hg:`help color` を参照してください。"
23672 ":hg:`help color` を参照してください。"
20109
23673
23674 #, fuzzy
20110 msgid ""
23675 msgid ""
20111 "``mode``\n"
23676 "``mode``\n"
20112 " String: control the method used to output color. One of ``auto``, "
23677 " String: control the method used to output color. One of ``auto``, "
20113 "``ansi``,\n"
23678 "``ansi``,\n"
20114 " ``win32``, ``terminfo`` or ``debug``. In auto mode the color extension "
23679 " ``win32``, ``terminfo`` or ``debug``. In auto mode, Mercurial will\n"
20115 "will\n"
23680 " use ANSI mode by default (or win32 mode prior to Windows 10) if it "
20116 " use ANSI mode by default (or win32 mode on Windows) if it detects a\n"
23681 "detects a\n"
20117 " terminal. Any invalid value will disable color."
23682 " terminal. Any invalid value will disable color."
20118 msgstr ""
23683 msgstr ""
20119 "``mode``\n"
23684 "``mode``\n"
@@ -20122,19 +23687,19 b' msgstr ""'
20122 " 対話的実行でのカラー化方式として ansi (Windows 環境なら win32) が、\n"
23687 " 対話的実行でのカラー化方式として ansi (Windows 環境なら win32) が、\n"
20123 " デフォルトの選択となります。 不正な方式の指定は、 カラー化を抑止します。"
23688 " デフォルトの選択となります。 不正な方式の指定は、 カラー化を抑止します。"
20124
23689
23690 #, fuzzy
20125 msgid ""
23691 msgid ""
20126 "``pagermode``\n"
23692 "``pagermode``\n"
20127 " String: optinal override of ``color.mode`` used with pager (from the "
23693 " String: optional override of ``color.mode`` used with pager."
20128 "pager\n"
20129 " extensions)."
20130 msgstr ""
23694 msgstr ""
20131 "``pagermode``\n"
23695 "``pagermode``\n"
20132 " 文字列: ページャ使用時に ``color.mode`` を上書きする値 (pager\n"
23696 " 文字列: ページャ使用時に ``color.mode`` を上書きする値 (pager\n"
20133 " エクステンション由来)。"
23697 " エクステンション由来)。"
20134
23698
23699 #, fuzzy
20135 msgid ""
23700 msgid ""
20136 " On some systems, terminfo mode may cause problems when using\n"
23701 " On some systems, terminfo mode may cause problems when using\n"
20137 " color with the pager extension and less -R. less with the -R option\n"
23702 " color with ``less -R`` as a pager program. less with the -R option\n"
20138 " will only display ECMA-48 color codes, and terminfo mode may sometimes\n"
23703 " will only display ECMA-48 color codes, and terminfo mode may sometimes\n"
20139 " emit codes that less doesn't understand. You can work around this by\n"
23704 " emit codes that less doesn't understand. You can work around this by\n"
20140 " either using ansi mode (or auto mode), or by using less -r (which will\n"
23705 " either using ansi mode (or auto mode), or by using less -r (which will\n"
@@ -20149,25 +23714,19 b' msgstr ""'
20149 " (色指定を含む全ての端末制御が、 透過的に伝播されます) の使用などで、\n"
23714 " (色指定を含む全ての端末制御が、 透過的に伝播されます) の使用などで、\n"
20150 " 対処してください。"
23715 " 対処してください。"
20151
23716
23717 #, fuzzy
20152 msgid ""
23718 msgid ""
20153 " On some systems (such as MSYS in Windows), the terminal may support\n"
23719 " On some systems (such as MSYS in Windows), the terminal may support\n"
20154 " a different color mode than the pager (activated via the \"pager\"\n"
23720 " a different color mode than the pager program."
20155 " extension)."
20156 msgstr ""
23721 msgstr ""
20157 " 環境によっては、 pager エクステンションが起動するページャコマンドと、\n"
23722 " 環境によっては、 pager エクステンションが起動するページャコマンドと、\n"
20158 " ターミナルソフトの間で、 カラー化方式が異なる場合があります\n"
23723 " ターミナルソフトの間で、 カラー化方式が異なる場合があります\n"
20159 " (Windows 上の MSYS 等)。"
23724 " (Windows 上の MSYS 等)。"
20160
23725
20161 msgid ""
23726 #, fuzzy
20162 "``commands``\n"
20163 "------------"
20164 msgstr ""
20165 "``commands``\n"
20166 "------------"
20167
20168 msgid ""
23727 msgid ""
20169 "``status.relative``\n"
23728 "``status.relative``\n"
20170 " Make paths in ``hg status`` output relative to the current directory.\n"
23729 " Make paths in :hg:`status` output relative to the current directory.\n"
20171 " (default: False)"
23730 " (default: False)"
20172 msgstr ""
23731 msgstr ""
20173 "``status.relative``\n"
23732 "``status.relative``\n"
@@ -20175,10 +23734,27 b' msgstr ""'
20175 " (デフォルト値: False)"
23734 " (デフォルト値: False)"
20176
23735
20177 msgid ""
23736 msgid ""
23737 "``update.check``\n"
23738 " Determines what level of checking :hg:`update` will perform before "
23739 "moving\n"
23740 " to a destination revision. Valid values are ``abort``, ``none``,\n"
23741 " ``linear``, and ``noconflict``. ``abort`` always fails if the working\n"
23742 " directory has uncommitted changes. ``none`` performs no checking, and "
23743 "may\n"
23744 " result in a merge with uncommitted changes. ``linear`` allows any "
23745 "update\n"
23746 " as long as it follows a straight line in the revision history, and may\n"
23747 " trigger a merge with uncommitted changes. ``noconflict`` will allow any\n"
23748 " update which would not trigger a merge with uncommitted changes, if any\n"
23749 " are present.\n"
23750 " (default: ``linear``)"
23751 msgstr ""
23752
23753 #, fuzzy
23754 msgid ""
20178 "``update.requiredest``\n"
23755 "``update.requiredest``\n"
20179 " Require that the user pass a destination when running ``hg update``.\n"
23756 " Require that the user pass a destination when running :hg:`update`.\n"
20180 " For example, ``hg update .::`` will be allowed, but a plain ``hg "
23757 " For example, :hg:`update .::` will be allowed, but a plain :hg:`update`\n"
20181 "update``\n"
20182 " will be disallowed.\n"
23758 " will be disallowed.\n"
20183 " (default: False)"
23759 " (default: False)"
20184 msgstr ""
23760 msgstr ""
@@ -21035,13 +24611,14 b' msgstr ""'
21035 " # 他の incoming に先立って autobuild フックを実行\n"
24611 " # 他の incoming に先立って autobuild フックを実行\n"
21036 " priority.incoming.autobuild = 1"
24612 " priority.incoming.autobuild = 1"
21037
24613
24614 #, fuzzy
21038 msgid ""
24615 msgid ""
21039 "Most hooks are run with environment variables set that give useful\n"
24616 "Most hooks are run with environment variables set that give useful\n"
21040 "additional information. For each hook below, the environment variables\n"
24617 "additional information. For each hook below, the environment variables\n"
21041 "it is passed are listed with names of the form ``$HG_foo``. The\n"
24618 "it is passed are listed with names in the form ``$HG_foo``. The\n"
21042 "``$HG_HOOKTYPE`` and ``$HG_HOOKNAME`` variables are set for all hooks.\n"
24619 "``$HG_HOOKTYPE`` and ``$HG_HOOKNAME`` variables are set for all hooks.\n"
21043 "their respectively contains the type of hook which triggered the run and\n"
24620 "They contain the type of hook which triggered the run and the full name\n"
21044 "the full name of the hooks in the config. In the example about this will\n"
24621 "of the hook in the config, respectively. In the example above, this will\n"
21045 "be ``$HG_HOOKTYPE=incoming`` and ``$HG_HOOKNAME=incoming.email``."
24622 "be ``$HG_HOOKTYPE=incoming`` and ``$HG_HOOKNAME=incoming.email``."
21046 msgstr ""
24623 msgstr ""
21047 "多くのフックは、 環境変数に付加的情報が設定された上で実行されます。\n"
24624 "多くのフックは、 環境変数に付加的情報が設定された上で実行されます。\n"
@@ -21051,12 +24628,14 b' msgstr ""'
21051 "例えば ``$HG_HOOKTYPE=incoming`` と ``$HG_HOOKNAME=incoming.email``\n"
24628 "例えば ``$HG_HOOKTYPE=incoming`` と ``$HG_HOOKNAME=incoming.email``\n"
21052 "といった具合です。"
24629 "といった具合です。"
21053
24630
24631 #, fuzzy
21054 msgid ""
24632 msgid ""
21055 "``changegroup``\n"
24633 "``changegroup``\n"
21056 " Run after a changegroup has been added via push, pull or unbundle. ID of "
24634 " Run after a changegroup has been added via push, pull or unbundle. The ID "
21057 "the\n"
24635 "of\n"
21058 " first new changeset is in ``$HG_NODE`` and last in ``$HG_NODE_LAST``. URL\n"
24636 " the first new changeset is in ``$HG_NODE`` and last is in ``"
21059 " from which changes came is in ``$HG_URL``."
24637 "$HG_NODE_LAST``.\n"
24638 " The URL from which changes came is in ``$HG_URL``."
21060 msgstr ""
24639 msgstr ""
21061 "``changegroup``\n"
24640 "``changegroup``\n"
21062 " push、 pull、 unbundle によるリビジョン群の追加完了時に実行されます。\n"
24641 " push、 pull、 unbundle によるリビジョン群の追加完了時に実行されます。\n"
@@ -21065,9 +24644,10 b' msgstr ""'
21065 " に設定されます。 (※ 訳注: 複数リビジョン一括追加時の ``changegroup``\n"
24644 " に設定されます。 (※ 訳注: 複数リビジョン一括追加時の ``changegroup``\n"
21066 " フック実行は1回ですが、 ``incoming`` フックはリビジョン毎に実行されます)"
24645 " フック実行は1回ですが、 ``incoming`` フックはリビジョン毎に実行されます)"
21067
24646
24647 #, fuzzy
21068 msgid ""
24648 msgid ""
21069 "``commit``\n"
24649 "``commit``\n"
21070 " Run after a changeset has been created in the local repository. ID\n"
24650 " Run after a changeset has been created in the local repository. The ID\n"
21071 " of the newly created changeset is in ``$HG_NODE``. Parent changeset\n"
24651 " of the newly created changeset is in ``$HG_NODE``. Parent changeset\n"
21072 " IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
24652 " IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
21073 msgstr ""
24653 msgstr ""
@@ -21076,11 +24656,12 b' msgstr ""'
21076 " 新規作成リビジョンの ID が ``$HG_NODE`` に、親リビジョンの ID が\n"
24656 " 新規作成リビジョンの ID が ``$HG_NODE`` に、親リビジョンの ID が\n"
21077 " ``$HG_PARENT1`` および ``$HG_PARENT2`` に設定されます。"
24657 " ``$HG_PARENT1`` および ``$HG_PARENT2`` に設定されます。"
21078
24658
24659 #, fuzzy
21079 msgid ""
24660 msgid ""
21080 "``incoming``\n"
24661 "``incoming``\n"
21081 " Run after a changeset has been pulled, pushed, or unbundled into\n"
24662 " Run after a changeset has been pulled, pushed, or unbundled into\n"
21082 " the local repository. The ID of the newly arrived changeset is in\n"
24663 " the local repository. The ID of the newly arrived changeset is in\n"
21083 " ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``."
24664 " ``$HG_NODE``. The URL that was source of the changes is in ``$HG_URL``."
21084 msgstr ""
24665 msgstr ""
21085 "``incoming``\n"
24666 "``incoming``\n"
21086 " push、 pull、 unbundle によるリビジョンの追加完了時に実行されます。\n"
24667 " push、 pull、 unbundle によるリビジョンの追加完了時に実行されます。\n"
@@ -21089,11 +24670,12 b' msgstr ""'
21089 " (※ 訳注: 複数リビジョン一括追加時の ``changegroup``\n"
24670 " (※ 訳注: 複数リビジョン一括追加時の ``changegroup``\n"
21090 " フック実行は1回ですが、 ``incoming`` フックはリビジョン毎に実行されます)"
24671 " フック実行は1回ですが、 ``incoming`` フックはリビジョン毎に実行されます)"
21091
24672
24673 #, fuzzy
21092 msgid ""
24674 msgid ""
21093 "``outgoing``\n"
24675 "``outgoing``\n"
21094 " Run after sending changes from local repository to another. ID of\n"
24676 " Run after sending changes from the local repository to another. The ID of\n"
21095 " first changeset sent is in ``$HG_NODE``. Source of operation is in\n"
24677 " first changeset sent is in ``$HG_NODE``. The source of operation is in\n"
21096 " ``$HG_SOURCE``; Also see :hg:`help config.hooks.preoutgoing` hook."
24678 " ``$HG_SOURCE``. Also see :hg:`help config.hooks.preoutgoing`."
21097 msgstr ""
24679 msgstr ""
21098 "``outgoing``\n"
24680 "``outgoing``\n"
21099 " 他リポジトリへの変更反映完了後に実行されます。\n"
24681 " 他リポジトリへの変更反映完了後に実行されます。\n"
@@ -21164,11 +24746,12 b' msgstr ""'
21164 " フック実行が失敗した場合、 当該コマンドは実行されず、\n"
24746 " フック実行が失敗した場合、 当該コマンドは実行されず、\n"
21165 " Mercurial は実行失敗の終了コードを返します。"
24747 " Mercurial は実行失敗の終了コードを返します。"
21166
24748
24749 #, fuzzy
21167 msgid ""
24750 msgid ""
21168 "``prechangegroup``\n"
24751 "``prechangegroup``\n"
21169 " Run before a changegroup is added via push, pull or unbundle. Exit\n"
24752 " Run before a changegroup is added via push, pull or unbundle. Exit\n"
21170 " status 0 allows the changegroup to proceed. Non-zero status will\n"
24753 " status 0 allows the changegroup to proceed. A non-zero status will\n"
21171 " cause the push, pull or unbundle to fail. URL from which changes\n"
24754 " cause the push, pull or unbundle to fail. The URL from which changes\n"
21172 " will come is in ``$HG_URL``."
24755 " will come is in ``$HG_URL``."
21173 msgstr ""
24756 msgstr ""
21174 "``prechangegroup``\n"
24757 "``prechangegroup``\n"
@@ -21177,10 +24760,11 b' msgstr ""'
21177 " 非 0 の終了コードは、 push、 pull、 unbundle の中断を意味します。\n"
24760 " 非 0 の終了コードは、 push、 pull、 unbundle の中断を意味します。\n"
21178 " 追加リビジョン群の取り込み元 URL が ``$HG_URL`` に設定されます。"
24761 " 追加リビジョン群の取り込み元 URL が ``$HG_URL`` に設定されます。"
21179
24762
24763 #, fuzzy
21180 msgid ""
24764 msgid ""
21181 "``precommit``\n"
24765 "``precommit``\n"
21182 " Run before starting a local commit. Exit status 0 allows the\n"
24766 " Run before starting a local commit. Exit status 0 allows the\n"
21183 " commit to proceed. Non-zero status will cause the commit to fail.\n"
24767 " commit to proceed. A non-zero status will cause the commit to fail.\n"
21184 " Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
24768 " Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
21185 msgstr ""
24769 msgstr ""
21186 "``precommit``\n"
24770 "``precommit``\n"
@@ -21190,10 +24774,11 b' msgstr ""'
21190 " 親リビジョンの ID が\n"
24774 " 親リビジョンの ID が\n"
21191 " ``$HG_PARENT1`` および ``$HG_PARENT2`` に設定されます。"
24775 " ``$HG_PARENT1`` および ``$HG_PARENT2`` に設定されます。"
21192
24776
24777 #, fuzzy
21193 msgid ""
24778 msgid ""
21194 "``prelistkeys``\n"
24779 "``prelistkeys``\n"
21195 " Run before listing pushkeys (like bookmarks) in the\n"
24780 " Run before listing pushkeys (like bookmarks) in the\n"
21196 " repository. Non-zero status will cause failure. The key namespace is\n"
24781 " repository. A non-zero status will cause failure. The key namespace is\n"
21197 " in ``$HG_NAMESPACE``."
24782 " in ``$HG_NAMESPACE``."
21198 msgstr ""
24783 msgstr ""
21199 "``prelistkeys``\n"
24784 "``prelistkeys``\n"
@@ -21201,16 +24786,19 b' msgstr ""'
21201 " 非 0 の終了コードは、 処理の中断を意味します。\n"
24786 " 非 0 の終了コードは、 処理の中断を意味します。\n"
21202 " キーの名前空間が ``$HG_NAMESPACE`` に設定されます。"
24787 " キーの名前空間が ``$HG_NAMESPACE`` に設定されます。"
21203
24788
24789 #, fuzzy
21204 msgid ""
24790 msgid ""
21205 "``preoutgoing``\n"
24791 "``preoutgoing``\n"
21206 " Run before collecting changes to send from the local repository to\n"
24792 " Run before collecting changes to send from the local repository to\n"
21207 " another. Non-zero status will cause failure. This lets you prevent\n"
24793 " another. A non-zero status will cause failure. This lets you prevent\n"
21208 " pull over HTTP or SSH. Also prevents against local pull, push\n"
24794 " pull over HTTP or SSH. It can also prevent propagating commits (via\n"
21209 " (outbound) or bundle commands, but not effective, since you can\n"
24795 " local pull, push (outbound) or bundle commands), but not completely,\n"
21210 " just copy files instead then. Source of operation is in\n"
24796 " since you can just copy files instead. The source of operation is in\n"
21211 " ``$HG_SOURCE``. If \"serve\", operation is happening on behalf of remote\n"
24797 " ``$HG_SOURCE``. If \"serve\", the operation is happening on behalf of a "
21212 " SSH or HTTP repository. If \"push\", \"pull\" or \"bundle\", operation\n"
24798 "remote\n"
21213 " is happening on behalf of repository on same system."
24799 " SSH or HTTP repository. If \"push\", \"pull\" or \"bundle\", the "
24800 "operation\n"
24801 " is happening on behalf of a repository on same system."
21214 msgstr ""
24802 msgstr ""
21215 "``preoutgoing``\n"
24803 "``preoutgoing``\n"
21216 " 他リポジトリへの変更反映において、 対象リビジョン確定前に実行されます。\n"
24804 " 他リポジトリへの変更反映において、 対象リビジョン確定前に実行されます。\n"
@@ -21225,10 +24813,11 b' msgstr ""'
21225 " \"push\"、 \"pull\" または \"bundle\" が設定されている場合、\n"
24813 " \"push\"、 \"pull\" または \"bundle\" が設定されている場合、\n"
21226 " 同一ホスト上のリポジトリが処理契機となっています。"
24814 " 同一ホスト上のリポジトリが処理契機となっています。"
21227
24815
24816 #, fuzzy
21228 msgid ""
24817 msgid ""
21229 "``prepushkey``\n"
24818 "``prepushkey``\n"
21230 " Run before a pushkey (like a bookmark) is added to the\n"
24819 " Run before a pushkey (like a bookmark) is added to the\n"
21231 " repository. Non-zero status will cause the key to be rejected. The\n"
24820 " repository. A non-zero status will cause the key to be rejected. The\n"
21232 " key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,\n"
24821 " key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,\n"
21233 " the old value (if any) is in ``$HG_OLD``, and the new value is in\n"
24822 " the old value (if any) is in ``$HG_OLD``, and the new value is in\n"
21234 " ``$HG_NEW``."
24823 " ``$HG_NEW``."
@@ -21241,13 +24830,14 b' msgstr ""'
21241 " (更新の場合は) 旧値が ``$HG_OLD`` に、\n"
24830 " (更新の場合は) 旧値が ``$HG_OLD`` に、\n"
21242 " 新値が ``$HG_NEW`` に設定されます。"
24831 " 新値が ``$HG_NEW`` に設定されます。"
21243
24832
24833 #, fuzzy
21244 msgid ""
24834 msgid ""
21245 "``pretag``\n"
24835 "``pretag``\n"
21246 " Run before creating a tag. Exit status 0 allows the tag to be\n"
24836 " Run before creating a tag. Exit status 0 allows the tag to be\n"
21247 " created. Non-zero status will cause the tag to fail. ID of\n"
24837 " created. A non-zero status will cause the tag to fail. The ID of the\n"
21248 " changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag "
24838 " changeset to tag is in ``$HG_NODE``. The name of tag is in ``$HG_TAG``. "
21249 "is\n"
24839 "The\n"
21250 " local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``."
24840 " tag is local if ``$HG_LOCAL=1``, or in the repository if ``$HG_LOCAL=0``."
21251 msgstr ""
24841 msgstr ""
21252 "``pretag``\n"
24842 "``pretag``\n"
21253 " タグの新規生成前に実行されます。\n"
24843 " タグの新規生成前に実行されます。\n"
@@ -21258,10 +24848,11 b' msgstr ""'
21258 " ローカルタグの場合は ``$HG_LOCAL=1`` に、\n"
24848 " ローカルタグの場合は ``$HG_LOCAL=1`` に、\n"
21259 " 通常のタグの場合は ``$HG_LOCAL=0`` になります。"
24849 " 通常のタグの場合は ``$HG_LOCAL=0`` になります。"
21260
24850
24851 #, fuzzy
21261 msgid ""
24852 msgid ""
21262 "``pretxnopen``\n"
24853 "``pretxnopen``\n"
21263 " Run before any new repository transaction is open. The reason for the\n"
24854 " Run before any new repository transaction is open. The reason for the\n"
21264 " transaction will be in ``$HG_TXNNAME`` and a unique identifier for the\n"
24855 " transaction will be in ``$HG_TXNNAME``, and a unique identifier for the\n"
21265 " transaction will be in ``HG_TXNID``. A non-zero status will prevent the\n"
24856 " transaction will be in ``HG_TXNID``. A non-zero status will prevent the\n"
21266 " transaction from being opened."
24857 " transaction from being opened."
21267 msgstr ""
24858 msgstr ""
@@ -21270,26 +24861,56 b' msgstr ""'
21270 " ``$HG_TXNNAME`` に、 一意な識別子が ``HG_TXNID`` に設定されます。 \n"
24861 " ``$HG_TXNNAME`` に、 一意な識別子が ``HG_TXNID`` に設定されます。 \n"
21271 " 終了コードが非ゼロの場合、 トランザクションは開始されません。"
24862 " 終了コードが非ゼロの場合、 トランザクションは開始されません。"
21272
24863
24864 #, fuzzy
21273 msgid ""
24865 msgid ""
21274 "``pretxnclose``\n"
24866 "``pretxnclose``\n"
21275 " Run right before the transaction is actually finalized. Any repository "
24867 " Run right before the transaction is actually finalized. Any repository "
21276 "change\n"
24868 "change\n"
21277 " will be visible to the hook program. This lets you validate the "
24869 " will be visible to the hook program. This lets you validate the "
21278 "transaction\n"
24870 "transaction\n"
21279 " content or change it. Exit status 0 allows the commit to proceed. Non-"
24871 " content or change it. Exit status 0 allows the commit to proceed. A non-"
21280 "zero\n"
24872 "zero\n"
21281 " status will cause the transaction to be rolled back. The reason for the\n"
24873 " status will cause the transaction to be rolled back. The reason for the\n"
21282 " transaction opening will be in ``$HG_TXNNAME`` and a unique identifier "
24874 " transaction opening will be in ``$HG_TXNNAME``, and a unique identifier "
21283 "for\n"
24875 "for\n"
21284 " the transaction will be in ``HG_TXNID``. The rest of the available data "
24876 " the transaction will be in ``HG_TXNID``. The rest of the available data "
21285 "will\n"
24877 "will\n"
21286 " vary according the transaction type. New changesets will add ``$HG_NODE`` "
24878 " vary according the transaction type. New changesets will add ``$HG_NODE``\n"
21287 "(id\n"
24879 " (the ID of the first added changeset), ``$HG_NODE_LAST`` (the ID of the "
21288 " of the first added changeset), ``$HG_NODE_LAST`` (id of the last added\n"
24880 "last\n"
21289 " changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables, bookmarks and "
24881 " added changeset), ``$HG_URL`` and ``$HG_SOURCE`` variables. Bookmark and\n"
21290 "phases\n"
24882 " phase changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to "
21291 " changes will set ``HG_BOOKMARK_MOVED`` and ``HG_PHASES_MOVED`` to ``1``, "
24883 "``1``\n"
21292 "etc."
24884 " respectively, etc."
24885 msgstr ""
24886 "``pretxnclose``\n"
24887 " トランザクション完了直前に実行されます。 完了時の記録内容の全てを、\n"
24888 " フックから参照できます。 トランザクション内容の検証や変更が可能です。\n"
24889 " 終了コードが 0 の場合、 トランザクション完了処理が継続されます。\n"
24890 " それ以外の場合、 トランザクションはロールバックされます。\n"
24891 " トランザクション種別が ``$HG_TXNNAME`` に、 一意な識別子が ``HG_TXNID``\n"
24892 " に設定されます。 それ以外の情報は、 トランザクション種別に依存します。\n"
24893 " 例えば、 新規リビジョン群を追加するトランザクションの場合、 ``$HG_NODE``\n"
24894 " (追加リビジョン群の最初のものの ID)、 ``$HG_NODE_LAST`` (最後のものの\n"
24895 " ID)、 ``$HG_URL`` および ``$HG_SOURCE`` が設定されます。\n"
24896 " ブックマークやフェーズの変更の場合、 ``HG_BOOKMARK_MOVED`` や\n"
24897 " ``HG_PHASES_MOVED`` に ``1`` が設定されます。"
24898
24899 #, fuzzy
24900 msgid ""
24901 "``pretxnclose-bookmark``\n"
24902 " Run right before a bookmark change is actually finalized. Any repository\n"
24903 " change will be visible to the hook program. This lets you validate the\n"
24904 " transaction content or change it. Exit status 0 allows the commit to\n"
24905 " proceed. A non-zero status will cause the transaction to be rolled back.\n"
24906 " The name of the bookmark will be available in ``$HG_BOOKMARK``, the new\n"
24907 " bookmark location will be available in ``$HG_NODE`` while the previous\n"
24908 " location will be available in ``$HG_OLDNODE``. In case of a bookmark\n"
24909 " creation ``$HG_OLDNODE`` will be empty. In case of deletion ``$HG_NODE``\n"
24910 " will be empty.\n"
24911 " In addition, the reason for the transaction opening will be in\n"
24912 " ``$HG_TXNNAME``, and a unique identifier for the transaction will be in\n"
24913 " ``HG_TXNID``."
21293 msgstr ""
24914 msgstr ""
21294 "``pretxnclose``\n"
24915 "``pretxnclose``\n"
21295 " トランザクション完了直前に実行されます。 完了時の記録内容の全てを、\n"
24916 " トランザクション完了直前に実行されます。 完了時の記録内容の全てを、\n"
@@ -21304,12 +24925,47 b' msgstr ""'
21304 " ブックマークやフェーズの変更の場合、 ``HG_BOOKMARK_MOVED`` や\n"
24925 " ブックマークやフェーズの変更の場合、 ``HG_BOOKMARK_MOVED`` や\n"
21305 " ``HG_PHASES_MOVED`` に ``1`` が設定されます。"
24926 " ``HG_PHASES_MOVED`` に ``1`` が設定されます。"
21306
24927
24928 #, fuzzy
24929 msgid ""
24930 "``pretxnclose-phase``\n"
24931 " Run right before a phase change is actually finalized. Any repository "
24932 "change\n"
24933 " will be visible to the hook program. This lets you validate the "
24934 "transaction\n"
24935 " content or change it. Exit status 0 allows the commit to proceed. A non-"
24936 "zero\n"
24937 " status will cause the transaction to be rolled back. The hook is called\n"
24938 " multiple times, once for each revision affected by a phase change.\n"
24939 " The affected node is available in ``$HG_NODE``, the phase in ``"
24940 "$HG_PHASE``\n"
24941 " while the previous ``$HG_OLDPHASE``. In case of new node, ``"
24942 "$HG_OLDPHASE``\n"
24943 " will be empty. In addition, the reason for the transaction opening will "
24944 "be in\n"
24945 " ``$HG_TXNNAME``, and a unique identifier for the transaction will be in\n"
24946 " ``HG_TXNID``. The hook is also run for newly added revisions. In this "
24947 "case\n"
24948 " the ``$HG_OLDPHASE`` entry will be empty."
24949 msgstr ""
24950 "``pretxnclose``\n"
24951 " トランザクション完了直前に実行されます。 完了時の記録内容の全てを、\n"
24952 " フックから参照できます。 トランザクション内容の検証や変更が可能です。\n"
24953 " 終了コードが 0 の場合、 トランザクション完了処理が継続されます。\n"
24954 " それ以外の場合、 トランザクションはロールバックされます。\n"
24955 " トランザクション種別が ``$HG_TXNNAME`` に、 一意な識別子が ``HG_TXNID``\n"
24956 " に設定されます。 それ以外の情報は、 トランザクション種別に依存します。\n"
24957 " 例えば、 新規リビジョン群を追加するトランザクションの場合、 ``$HG_NODE``\n"
24958 " (追加リビジョン群の最初のものの ID)、 ``$HG_NODE_LAST`` (最後のものの\n"
24959 " ID)、 ``$HG_URL`` および ``$HG_SOURCE`` が設定されます。\n"
24960 " ブックマークやフェーズの変更の場合、 ``HG_BOOKMARK_MOVED`` や\n"
24961 " ``HG_PHASES_MOVED`` に ``1`` が設定されます。"
24962
24963 #, fuzzy
21307 msgid ""
24964 msgid ""
21308 "``txnclose``\n"
24965 "``txnclose``\n"
21309 " Run after any repository transaction has been committed. At this\n"
24966 " Run after any repository transaction has been committed. At this\n"
21310 " point, the transaction can no longer be rolled back. The hook will run\n"
24967 " point, the transaction can no longer be rolled back. The hook will run\n"
21311 " after the lock is released. See :hg:`help config.hooks.pretxnclose` docs "
24968 " after the lock is released. See :hg:`help config.hooks.pretxnclose` for\n"
21312 "for\n"
21313 " details about available variables."
24969 " details about available variables."
21314 msgstr ""
24970 msgstr ""
21315 "``txnclose``\n"
24971 "``txnclose``\n"
@@ -21318,30 +24974,64 b' msgstr ""'
21318 " 排他は解放されます。 参照可能な変数の詳細に関しては\n"
24974 " 排他は解放されます。 参照可能な変数の詳細に関しては\n"
21319 " :hg:`help config.hooks.pretxnclose` の説明を参照してください。"
24975 " :hg:`help config.hooks.pretxnclose` の説明を参照してください。"
21320
24976
24977 #, fuzzy
24978 msgid ""
24979 "``txnclose-bookmark``\n"
24980 " Run after any bookmark change has been committed. At this point, the\n"
24981 " transaction can no longer be rolled back. The hook will run after the "
24982 "lock\n"
24983 " is released. See :hg:`help config.hooks.pretxnclose-bookmark` for details\n"
24984 " about available variables."
24985 msgstr ""
24986 "``txnclose``\n"
24987 " トランザクション完了直後に実行されます。 このフックの実行結果は、\n"
24988 " トランザクションのロールバックを生じません。 フック実行に先立って、\n"
24989 " 排他は解放されます。 参照可能な変数の詳細に関しては\n"
24990 " :hg:`help config.hooks.pretxnclose` の説明を参照してください。"
24991
24992 #, fuzzy
24993 msgid ""
24994 "``txnclose-phase``\n"
24995 " Run after any phase change has been committed. At this point, the\n"
24996 " transaction can no longer be rolled back. The hook will run after the "
24997 "lock\n"
24998 " is released. See :hg:`help config.hooks.pretxnclose-phase` for details "
24999 "about\n"
25000 " available variables."
25001 msgstr ""
25002 "``txnclose``\n"
25003 " トランザクション完了直後に実行されます。 このフックの実行結果は、\n"
25004 " トランザクションのロールバックを生じません。 フック実行に先立って、\n"
25005 " 排他は解放されます。 参照可能な変数の詳細に関しては\n"
25006 " :hg:`help config.hooks.pretxnclose` の説明を参照してください。"
25007
25008 #, fuzzy
21321 msgid ""
25009 msgid ""
21322 "``txnabort``\n"
25010 "``txnabort``\n"
21323 " Run when a transaction is aborted. See :hg:`help config.hooks."
25011 " Run when a transaction is aborted. See :hg:`help config.hooks."
21324 "pretxnclose`\n"
25012 "pretxnclose`\n"
21325 " docs for details about available variables."
25013 " for details about available variables."
21326 msgstr ""
25014 msgstr ""
21327 "``txnabort``\n"
25015 "``txnabort``\n"
21328 " トランザクション中断時に実行されます。 参照可能な変数の詳細に関しては\n"
25016 " トランザクション中断時に実行されます。 参照可能な変数の詳細に関しては\n"
21329 " :hg:`help config.hooks.pretxnclose` の説明を参照してください。"
25017 " :hg:`help config.hooks.pretxnclose` の説明を参照してください。"
21330
25018
25019 #, fuzzy
21331 msgid ""
25020 msgid ""
21332 "``pretxnchangegroup``\n"
25021 "``pretxnchangegroup``\n"
21333 " Run after a changegroup has been added via push, pull or unbundle, but "
25022 " Run after a changegroup has been added via push, pull or unbundle, but "
21334 "before\n"
25023 "before\n"
21335 " the transaction has been committed. Changegroup is visible to hook "
25024 " the transaction has been committed. The changegroup is visible to the "
21336 "program.\n"
25025 "hook\n"
21337 " This lets you validate incoming changes before accepting them. Passed the "
25026 " program. This allows validation of incoming changes before accepting "
21338 "ID\n"
25027 "them.\n"
21339 " of the first new changeset in ``$HG_NODE`` and last in ``$HG_NODE_LAST``.\n"
25028 " The ID of the first new changeset is in ``$HG_NODE`` and last is in\n"
21340 " Exit status 0 allows the transaction to commit. Non-zero status will "
25029 " ``$HG_NODE_LAST``. Exit status 0 allows the transaction to commit. A non-"
21341 "cause\n"
25030 "zero\n"
21342 " the transaction to be rolled back and the push, pull or unbundle will "
25031 " status will cause the transaction to be rolled back, and the push, pull "
21343 "fail.\n"
25032 "or\n"
21344 " URL that was source of changes is in ``$HG_URL``."
25033 " unbundle will fail. The URL that was the source of changes is in ``"
25034 "$HG_URL``."
21345 msgstr ""
25035 msgstr ""
21346 "``pretxnchangegroup``\n"
25036 "``pretxnchangegroup``\n"
21347 " push、 pull、 unbundle によるリビジョン群の追加完了の際に、\n"
25037 " push、 pull、 unbundle によるリビジョン群の追加完了の際に、\n"
@@ -21354,14 +25044,16 b' msgstr ""'
21354 " push、 pull、 unbundle は中断されます。\n"
25044 " push、 pull、 unbundle は中断されます。\n"
21355 " 追加リビジョンの取り込み元 URL は ``$HG_URL`` に設定されます。"
25045 " 追加リビジョンの取り込み元 URL は ``$HG_URL`` に設定されます。"
21356
25046
25047 #, fuzzy
21357 msgid ""
25048 msgid ""
21358 "``pretxncommit``\n"
25049 "``pretxncommit``\n"
21359 " Run after a changeset has been created but the transaction not yet\n"
25050 " Run after a changeset has been created, but before the transaction is\n"
21360 " committed. Changeset is visible to hook program. This lets you\n"
25051 " committed. The changeset is visible to the hook program. This allows\n"
21361 " validate commit message and changes. Exit status 0 allows the\n"
25052 " validation of the commit message and changes. Exit status 0 allows the\n"
21362 " commit to proceed. Non-zero status will cause the transaction to\n"
25053 " commit to proceed. A non-zero status will cause the transaction to\n"
21363 " be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset\n"
25054 " be rolled back. The ID of the new changeset is in ``$HG_NODE``. The "
21364 " IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
25055 "parent\n"
25056 " changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
21365 msgstr ""
25057 msgstr ""
21366 "``pretxncommit``\n"
25058 "``pretxncommit``\n"
21367 " 新規リビジョン作成の際に、\n"
25059 " 新規リビジョン作成の際に、\n"
@@ -21374,12 +25066,14 b' msgstr ""'
21374 " 親リビジョンの ID が\n"
25066 " 親リビジョンの ID が\n"
21375 " ``$HG_PARENT1`` および ``$HG_PARENT2`` に設定されます。"
25067 " ``$HG_PARENT1`` および ``$HG_PARENT2`` に設定されます。"
21376
25068
25069 #, fuzzy
21377 msgid ""
25070 msgid ""
21378 "``preupdate``\n"
25071 "``preupdate``\n"
21379 " Run before updating the working directory. Exit status 0 allows\n"
25072 " Run before updating the working directory. Exit status 0 allows\n"
21380 " the update to proceed. Non-zero status will prevent the update.\n"
25073 " the update to proceed. A non-zero status will prevent the update.\n"
21381 " Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID\n"
25074 " The changeset ID of first new parent is in ``$HG_PARENT1``. If updating to "
21382 " of second new parent is in ``$HG_PARENT2``."
25075 "a\n"
25076 " merge, the ID of second new parent is in ``$HG_PARENT2``."
21383 msgstr ""
25077 msgstr ""
21384 "``preupdate``\n"
25078 "``preupdate``\n"
21385 " 作業領域の更新前に実行されます。\n"
25079 " 作業領域の更新前に実行されます。\n"
@@ -21414,11 +25108,14 b' msgstr ""'
21414 " (更新の場合は) 旧値が ``$HG_OLD`` に、\n"
25108 " (更新の場合は) 旧値が ``$HG_OLD`` に、\n"
21415 " 新値が ``$HG_NEW`` に設定されます。"
25109 " 新値が ``$HG_NEW`` に設定されます。"
21416
25110
25111 #, fuzzy
21417 msgid ""
25112 msgid ""
21418 "``tag``\n"
25113 "``tag``\n"
21419 " Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.\n"
25114 " Run after a tag is created. The ID of the tagged changeset is in ``"
21420 " Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in\n"
25115 "$HG_NODE``.\n"
21421 " repository if ``$HG_LOCAL=0``."
25116 " The name of tag is in ``$HG_TAG``. The tag is local if ``$HG_LOCAL=1``, or "
25117 "in\n"
25118 " the repository if ``$HG_LOCAL=0``."
21422 msgstr ""
25119 msgstr ""
21423 "``tag``\n"
25120 "``tag``\n"
21424 " タグの新規生成後に実行されます。\n"
25121 " タグの新規生成後に実行されます。\n"
@@ -21427,12 +25124,15 b' msgstr ""'
21427 " ローカルタグの場合は ``$HG_LOCAL=1`` に、\n"
25124 " ローカルタグの場合は ``$HG_LOCAL=1`` に、\n"
21428 " 通常のタグの場合は ``$HG_LOCAL=0`` になります。"
25125 " 通常のタグの場合は ``$HG_LOCAL=0`` になります。"
21429
25126
25127 #, fuzzy
21430 msgid ""
25128 msgid ""
21431 "``update``\n"
25129 "``update``\n"
21432 " Run after updating the working directory. Changeset ID of first\n"
25130 " Run after updating the working directory. The changeset ID of first\n"
21433 " new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is\n"
25131 " new parent is in ``$HG_PARENT1``. If updating to a merge, the ID of second "
21434 " in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the\n"
25132 "new\n"
21435 " update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``."
25133 " parent is in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If "
25134 "the\n"
25135 " update failed (e.g. because conflicts were not resolved), ``$HG_ERROR=1``."
21436 msgstr ""
25136 msgstr ""
21437 "``update``\n"
25137 "``update``\n"
21438 " 作業領域の更新後に実行されます。\n"
25138 " 作業領域の更新後に実行されます。\n"
@@ -21442,9 +25142,10 b' msgstr ""'
21442 " 更新処理が成功した場合は ``$HG_ERROR=0`` に、\n"
25142 " 更新処理が成功した場合は ``$HG_ERROR=0`` に、\n"
21443 " 失敗した場合 (例: 衝突解消の失敗等) は ``$HG_ERROR=1`` が設定されます。"
25143 " 失敗した場合 (例: 衝突解消の失敗等) は ``$HG_ERROR=1`` が設定されます。"
21444
25144
25145 #, fuzzy
21445 msgid ""
25146 msgid ""
21446 " It is generally better to use standard hooks rather than the\n"
25147 " It is generally better to use standard hooks rather than the\n"
21447 " generic pre- and post- command hooks as they are guaranteed to be\n"
25148 " generic pre- and post- command hooks, as they are guaranteed to be\n"
21448 " called in the appropriate contexts for influencing transactions.\n"
25149 " called in the appropriate contexts for influencing transactions.\n"
21449 " Also, hooks like \"commit\" will be called in all contexts that\n"
25150 " Also, hooks like \"commit\" will be called in all contexts that\n"
21450 " generate a commit (e.g. tag) and not just the commit command."
25151 " generate a commit (e.g. tag) and not just the commit command."
@@ -21660,13 +25361,15 b' msgstr ""'
21660 " 対応するホストとの接続にのみ適用される点以外は、 先述した ``ciphers``\n"
25361 " 対応するホストとの接続にのみ適用される点以外は、 先述した ``ciphers``\n"
21661 " 設定と同じです。"
25362 " 設定と同じです。"
21662
25363
25364 #, fuzzy
21663 msgid ""
25365 msgid ""
21664 "``fingerprints``\n"
25366 "``fingerprints``\n"
21665 " A list of hashes of the DER encoded peer/remote certificate. Values "
25367 " A list of hashes of the DER encoded peer/remote certificate. Values "
21666 "have\n"
25368 "have\n"
21667 " the form ``algorithm``:``fingerprint``. e.g.\n"
25369 " the form ``algorithm``:``fingerprint``. e.g.\n"
21668 " ``sha256:"
25370 " ``sha256:"
21669 "c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2``."
25371 "c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2``.\n"
25372 " In addition, colons (``:``) can appear in the fingerprint part."
21670 msgstr ""
25373 msgstr ""
21671 "``fingerprints``\n"
25374 "``fingerprints``\n"
21672 " 対応するホストの、 DER 符号化された証明書の SHA-1 ハッシュ値です。\n"
25375 " 対応するホストの、 DER 符号化された証明書の SHA-1 ハッシュ値です。\n"
@@ -21761,6 +25464,7 b' msgstr ""'
21761 " ... (base64 PEM 符号化形式の証明書) ...\n"
25464 " ... (base64 PEM 符号化形式の証明書) ...\n"
21762 " -----END CERTIFICATE-----"
25465 " -----END CERTIFICATE-----"
21763
25466
25467 #, fuzzy
21764 msgid ""
25468 msgid ""
21765 " [hostsecurity]\n"
25469 " [hostsecurity]\n"
21766 " hg.example.com:fingerprints = sha256:"
25470 " hg.example.com:fingerprints = sha256:"
@@ -21768,6 +25472,8 b' msgid ""'
21768 " hg2.example.com:fingerprints = "
25472 " hg2.example.com:fingerprints = "
21769 "sha1:914f1aff87249c09b6859b88b1906d30756491ca, sha1:fc:e2:8d:d9:51:cd:cb:"
25473 "sha1:914f1aff87249c09b6859b88b1906d30756491ca, sha1:fc:e2:8d:d9:51:cd:cb:"
21770 "c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33\n"
25474 "c1:4d:18:6b:b7:44:8d:49:72:57:e6:cd:33\n"
25475 " hg3.example.com:fingerprints = sha256:9a:b0:dc:e2:75:ad:8a:b7:84:58:"
25476 "e5:1f:07:32:f1:87:e6:bd:24:22:af:b7:ce:8e:9c:b4:10:cf:b9:f4:0e:d2\n"
21771 " foo.example.com:verifycertsfile = /etc/ssl/trusted-ca-certs.pem"
25477 " foo.example.com:verifycertsfile = /etc/ssl/trusted-ca-certs.pem"
21772 msgstr ""
25478 msgstr ""
21773 " [hostsecurity]\n"
25479 " [hostsecurity]\n"
@@ -21895,6 +25601,20 b' msgstr ""'
21895 " (デフォルト値: ``abort``)"
25601 " (デフォルト値: ``abort``)"
21896
25602
21897 msgid ""
25603 msgid ""
25604 "``on-failure``\n"
25605 " When set to ``continue`` (the default), the merge process attempts to\n"
25606 " merge all unresolved files using the merge chosen tool, regardless of\n"
25607 " whether previous file merge attempts during the process succeeded or "
25608 "not.\n"
25609 " Setting this to ``prompt`` will prompt after any merge failure continue\n"
25610 " or halt the merge process. Setting this to ``halt`` will automatically\n"
25611 " halt the merge process on any merge tool failure. The merge process\n"
25612 " can be restarted by using the ``resolve`` command. When a merge is\n"
25613 " halted, the repository is left in a normal ``unresolved`` merge state.\n"
25614 " (default: ``continue``)"
25615 msgstr ""
25616
25617 msgid ""
21898 "``merge-patterns``\n"
25618 "``merge-patterns``\n"
21899 "------------------"
25619 "------------------"
21900 msgstr ""
25620 msgstr ""
@@ -22011,15 +25731,21 b' msgid ""'
22011 "``args``\n"
25731 "``args``\n"
22012 " The arguments to pass to the tool executable. You can refer to the\n"
25732 " The arguments to pass to the tool executable. You can refer to the\n"
22013 " files being merged as well as the output file through these\n"
25733 " files being merged as well as the output file through these\n"
22014 " variables: ``$base``, ``$local``, ``$other``, ``$output``. The meaning\n"
25734 " variables: ``$base``, ``$local``, ``$other``, ``$output``."
22015 " of ``$local`` and ``$other`` can vary depending on which action is being\n"
25735 msgstr ""
22016 " performed. During and update or merge, ``$local`` represents the original\n"
25736
22017 " state of the file, while ``$other`` represents the commit you are "
25737 #, fuzzy
22018 "updating\n"
25738 msgid ""
22019 " to or the commit you are merging with. During a rebase ``$local``\n"
25739 " The meaning of ``$local`` and ``$other`` can vary depending on which "
22020 " represents the destination of the rebase, and ``$other`` represents the\n"
25740 "action is\n"
22021 " commit being rebased.\n"
25741 " being performed. During an update or merge, ``$local`` represents the "
22022 " (default: ``$local $base $other``)"
25742 "original\n"
25743 " state of the file, while ``$other`` represents the commit you are updating "
25744 "to or\n"
25745 " the commit you are merging with. During a rebase, ``$local`` represents "
25746 "the\n"
25747 " destination of the rebase, and ``$other`` represents the commit being "
25748 "rebased."
22023 msgstr ""
25749 msgstr ""
22024 "``args``\n"
25750 "``args``\n"
22025 " 実行時にツールに指定される引数。 ``$base``, ``$local``, ``$other``, \n"
25751 " 実行時にツールに指定される引数。 ``$base``, ``$local``, ``$other``, \n"
@@ -22033,6 +25759,17 b' msgstr ""'
22033 " (デフォルト値: ``$local $base $other``)"
25759 " (デフォルト値: ``$local $base $other``)"
22034
25760
22035 msgid ""
25761 msgid ""
25762 " Some operations define custom labels to assist with identifying the "
25763 "revisions,\n"
25764 " accessible via ``$labellocal``, ``$labelother``, and ``$labelbase``. If "
25765 "custom\n"
25766 " labels are not available, these will be ``local``, ``other``, and "
25767 "``base``,\n"
25768 " respectively.\n"
25769 " (default: ``$local $base $other``)"
25770 msgstr ""
25771
25772 msgid ""
22036 "``premerge``\n"
25773 "``premerge``\n"
22037 " Attempt to run internal non-interactive 3-way merge tool before\n"
25774 " Attempt to run internal non-interactive 3-way merge tool before\n"
22038 " launching external tool. Options are ``true``, ``false``, ``keep`` or\n"
25775 " launching external tool. Options are ``true``, ``false``, ``keep`` or\n"
@@ -22111,6 +25848,30 b' msgstr ""'
22111 " (デフォルト値: False)"
25848 " (デフォルト値: False)"
22112
25849
22113 msgid ""
25850 msgid ""
25851 "``mergemarkers``\n"
25852 " Controls whether the labels passed via ``$labellocal``, ``$labelother``, "
25853 "and\n"
25854 " ``$labelbase`` are ``detailed`` (respecting ``mergemarkertemplate``) or\n"
25855 " ``basic``. If ``premerge`` is ``keep`` or ``keep-merge3``, the conflict\n"
25856 " markers generated during premerge will be ``detailed`` if either this "
25857 "option or\n"
25858 " the corresponding option in the ``[ui]`` section is ``detailed``.\n"
25859 " (default: ``basic``)"
25860 msgstr ""
25861
25862 msgid ""
25863 "``mergemarkertemplate``\n"
25864 " This setting can be used to override ``mergemarkertemplate`` from the "
25865 "``[ui]``\n"
25866 " section on a per-tool basis; this applies to the ``$label``-prefixed "
25867 "variables\n"
25868 " and to the conflict markers that are generated if ``premerge`` is ``keep` "
25869 "or\n"
25870 " ``keep-merge3``. See the corresponding variable in ``[ui]`` for more\n"
25871 " information."
25872 msgstr ""
25873
25874 msgid ""
22114 " ``regkey``\n"
25875 " ``regkey``\n"
22115 " Windows registry key which describes install location of this\n"
25876 " Windows registry key which describes install location of this\n"
22116 " tool. Mercurial will search for this key first under\n"
25877 " tool. Mercurial will search for this key first under\n"
@@ -22156,8 +25917,57 b' msgstr ""'
22156 " 当該レジストリキーからの読み出し値に付加する値。 典型的な設定値は、\n"
25917 " 当該レジストリキーからの読み出し値に付加する値。 典型的な設定値は、\n"
22157 " ツールの実行可能ファイル名です。 (デフォルト値: None)"
25918 " ツールの実行可能ファイル名です。 (デフォルト値: None)"
22158
25919
22159 msgid ""
25920 #, fuzzy
22160 "\n"
25921 msgid ""
25922 "``pager``\n"
25923 "---------"
25924 msgstr ""
25925 "``phases``\n"
25926 "----------"
25927
25928 msgid ""
25929 "Setting used to control when to paginate and with what external tool. See\n"
25930 ":hg:`help pager` for details."
25931 msgstr ""
25932
25933 msgid ""
25934 "``pager``\n"
25935 " Define the external tool used as pager."
25936 msgstr ""
25937
25938 #, fuzzy
25939 msgid ""
25940 " If no pager is set, Mercurial uses the environment variable $PAGER.\n"
25941 " If neither pager.pager, nor $PAGER is set, a default pager will be\n"
25942 " used, typically `less` on Unix and `more` on Windows. Example::"
25943 msgstr ""
25944 "上記設定が無い場合、 Mercurial は PAGER 環境変数を参照します。\n"
25945 "どちらも未設定の場合、 Mercurial はデフォルトのページャを使用します\n"
25946 "(通常は `more` コマンド)。"
25947
25948 #, fuzzy
25949 msgid ""
25950 " [pager]\n"
25951 " pager = less -FRX"
25952 msgstr ""
25953 " [pager]\n"
25954 " pager = less -FRX"
25955
25956 msgid ""
25957 "``ignore``\n"
25958 " List of commands to disable the pager for. Example::"
25959 msgstr ""
25960
25961 #, fuzzy
25962 msgid ""
25963 " [pager]\n"
25964 " ignore = version, help, update"
25965 msgstr ""
25966 " [pager]\n"
25967 " ignore = version, help, update"
25968
25969 #, fuzzy
25970 msgid ""
22161 "``patch``\n"
25971 "``patch``\n"
22162 "---------"
25972 "---------"
22163 msgstr ""
25973 msgstr ""
@@ -22405,11 +26215,11 b' msgstr ""'
22405 "精密プロファイル (名称: ``ls``) と、 サンプリングプロファイル (名称:\n"
26215 "精密プロファイル (名称: ``ls``) と、 サンプリングプロファイル (名称:\n"
22406 "``stat``) の2種類です。"
26216 "``stat``) の2種類です。"
22407
26217
26218 #, fuzzy
22408 msgid ""
26219 msgid ""
22409 "In this section description, 'profiling data' stands for the raw data\n"
26220 "In this section description, 'profiling data' stands for the raw data\n"
22410 "collected during profiling, while 'profiling report' stands for a\n"
26221 "collected during profiling, while 'profiling report' stands for a\n"
22411 "statistical text report generated from the profiling data. The\n"
26222 "statistical text report generated from the profiling data."
22412 "profiling is done using lsprof."
22413 msgstr ""
26223 msgstr ""
22414 "以下の説明では、 プロファイル期間に採取される生データの事を\n"
26224 "以下の説明では、 プロファイル期間に採取される生データの事を\n"
22415 "'プロファイルデータ'、 プロファイルデータを元にした、\n"
26225 "'プロファイルデータ'、 プロファイルデータを元にした、\n"
@@ -22552,13 +26362,14 b' msgstr ""'
22552 "``limit``\n"
26362 "``limit``\n"
22553 " 表示対象行数。 詳細プロファイラ ``ls`` 固有の設定。 (デフォルト値: 30)"
26363 " 表示対象行数。 詳細プロファイラ ``ls`` 固有の設定。 (デフォルト値: 30)"
22554
26364
26365 #, fuzzy
22555 msgid ""
26366 msgid ""
22556 "``nested``\n"
26367 "``nested``\n"
22557 " Show at most this number of lines of drill-down info after each main "
26368 " Show at most this number of lines of drill-down info after each main "
22558 "entry.\n"
26369 "entry.\n"
22559 " This can help explain the difference between Total and Inline.\n"
26370 " This can help explain the difference between Total and Inline.\n"
22560 " Specific to the ``ls`` instrumenting profiler.\n"
26371 " Specific to the ``ls`` instrumenting profiler.\n"
22561 " (default: 5)"
26372 " (default: 0)"
22562 msgstr ""
26373 msgstr ""
22563 "``nested``\n"
26374 "``nested``\n"
22564 " 個々のメインエントリ以後の、 掘り下げ (drill-down) 情報表示の、\n"
26375 " 個々のメインエントリ以後の、 掘り下げ (drill-down) 情報表示の、\n"
@@ -22566,6 +26377,33 b' msgstr ""'
22566 " 詳細プロファイラ ``ls`` 固有の設定。 (デフォルト値: 5)"
26377 " 詳細プロファイラ ``ls`` 固有の設定。 (デフォルト値: 5)"
22567
26378
22568 msgid ""
26379 msgid ""
26380 "``showmin``\n"
26381 " Minimum fraction of samples an entry must have for it to be displayed.\n"
26382 " Can be specified as a float between ``0.0`` and ``1.0`` or can have a\n"
26383 " ``%`` afterwards to allow values up to ``100``. e.g. ``5%``."
26384 msgstr ""
26385
26386 msgid " Only used by the ``stat`` profiler."
26387 msgstr ""
26388
26389 msgid ""
26390 " For the ``hotpath`` format, default is ``0.05``.\n"
26391 " For the ``chrome`` format, default is ``0.005``."
26392 msgstr ""
26393
26394 msgid " The option is unused on other formats."
26395 msgstr ""
26396
26397 msgid ""
26398 "``showmax``\n"
26399 " Maximum fraction of samples an entry can have before it is ignored in\n"
26400 " display. Values format is the same as ``showmin``."
26401 msgstr ""
26402
26403 msgid " For the ``chrome`` format, default is ``0.999``."
26404 msgstr ""
26405
26406 msgid ""
22569 "``progress``\n"
26407 "``progress``\n"
22570 "------------"
26408 "------------"
22571 msgstr ""
26409 msgstr ""
@@ -22600,6 +26438,12 b' msgstr ""'
22600 " (デフォルト値: 1.0)"
26438 " (デフォルト値: 1.0)"
22601
26439
22602 msgid ""
26440 msgid ""
26441 "``estimateinterval``\n"
26442 " Maximum sampling interval in seconds for speed and estimated time\n"
26443 " calculation. (default: 60)"
26444 msgstr ""
26445
26446 msgid ""
22603 "``refresh``\n"
26447 "``refresh``\n"
22604 " Time in seconds between refreshes of the progress bar. (default: 0.1)"
26448 " Time in seconds between refreshes of the progress bar. (default: 0.1)"
22605 msgstr ""
26449 msgstr ""
@@ -22669,8 +26513,9 b' msgstr ""'
22669 "``rebase``\n"
26513 "``rebase``\n"
22670 "----------"
26514 "----------"
22671
26515
22672 msgid ""
26516 #, fuzzy
22673 "``allowdivergence``\n"
26517 msgid ""
26518 "``evolution.allowdivergence``\n"
22674 " Default to False, when True allow creating divergence when performing\n"
26519 " Default to False, when True allow creating divergence when performing\n"
22675 " rebase of obsolete changesets."
26520 " rebase of obsolete changesets."
22676 msgstr ""
26521 msgstr ""
@@ -22701,6 +26546,19 b' msgid "Controls generic server settings.'
22701 msgstr "一般的なサーバ機能の設定。"
26546 msgstr "一般的なサーバ機能の設定。"
22702
26547
22703 msgid ""
26548 msgid ""
26549 "``bookmarks-pushkey-compat``\n"
26550 " Trigger pushkey hook when being pushed bookmark updates. This config "
26551 "exist\n"
26552 " for compatibility purpose (default to True)"
26553 msgstr ""
26554
26555 msgid ""
26556 " If you use ``pushkey`` and ``pre-pushkey`` hooks to control bookmark\n"
26557 " movement we recommend you migrate them to ``txnclose-bookmark`` and\n"
26558 " ``pretxnclose-bookmark``."
26559 msgstr ""
26560
26561 msgid ""
22704 "``compressionengines``\n"
26562 "``compressionengines``\n"
22705 " List of compression engines and their relative priority to advertise\n"
26563 " List of compression engines and their relative priority to advertise\n"
22706 " to clients."
26564 " to clients."
@@ -22748,6 +26606,16 b' msgstr ""'
22748 " 一時的な書き込みロックが保持されます。\n"
26606 " 一時的な書き込みロックが保持されます。\n"
22749 " (デフォルト値: True)"
26607 " (デフォルト値: True)"
22750
26608
26609 #, fuzzy
26610 msgid ""
26611 "``uncompressedallowsecret``\n"
26612 " Whether to allow stream clones when the repository contains secret\n"
26613 " changesets. (default: False)"
26614 msgstr ""
26615 "``allowgz``\n"
26616 " (非推奨) .tar.gz 形式でのアーカイブダウンロードの可否。\n"
26617 " (デフォルト値: False)"
26618
22751 msgid ""
26619 msgid ""
22752 "``preferuncompressed``\n"
26620 "``preferuncompressed``\n"
22753 " When set, clients will try to use the uncompressed streaming\n"
26621 " When set, clients will try to use the uncompressed streaming\n"
@@ -22758,6 +26626,52 b' msgstr ""'
22758 " (デフォルト値: False)"
26626 " (デフォルト値: False)"
22759
26627
22760 msgid ""
26628 msgid ""
26629 "``disablefullbundle``\n"
26630 " When set, servers will refuse attempts to do pull-based clones.\n"
26631 " If this option is set, ``preferuncompressed`` and/or clone bundles\n"
26632 " are highly recommended. Partial clones will still be allowed.\n"
26633 " (default: False)"
26634 msgstr ""
26635
26636 msgid ""
26637 "``streamunbundle``\n"
26638 " When set, servers will apply data sent from the client directly,\n"
26639 " otherwise it will be written to a temporary file first. This option\n"
26640 " effectively prevents concurrent pushes."
26641 msgstr ""
26642
26643 msgid ""
26644 "``pullbundle``\n"
26645 " When set, the server will check pullbundle.manifest for bundles\n"
26646 " covering the requested heads and common nodes. The first matching\n"
26647 " entry will be streamed to the client."
26648 msgstr ""
26649
26650 msgid ""
26651 " For HTTP transport, the stream will still use zlib compression\n"
26652 " for older clients."
26653 msgstr ""
26654
26655 msgid ""
26656 "``concurrent-push-mode``\n"
26657 " Level of allowed race condition between two pushing clients."
26658 msgstr ""
26659
26660 msgid ""
26661 " - 'strict': push is abort if another client touched the repository\n"
26662 " while the push was preparing. (default)\n"
26663 " - 'check-related': push is only aborted if it affects head that got "
26664 "also\n"
26665 " affected while the push was preparing."
26666 msgstr ""
26667
26668 msgid ""
26669 " This requires compatible client (version 4.3 and later). Old client "
26670 "will\n"
26671 " use 'strict'."
26672 msgstr ""
26673
26674 msgid ""
22761 "``validate``\n"
26675 "``validate``\n"
22762 " Whether to validate the completeness of pushed changesets by\n"
26676 " Whether to validate the completeness of pushed changesets by\n"
22763 " checking that all new file revisions specified in manifests are\n"
26677 " checking that all new file revisions specified in manifests are\n"
@@ -22980,6 +26894,74 b' msgstr ""'
22980 "絶対パス化前の参照先に対し、 合致判定/買い替えを再度実施します。\n"
26894 "絶対パス化前の参照先に対し、 合致判定/買い替えを再度実施します。\n"
22981 "書き換えの適用は、 記述順に実施されます。"
26895 "書き換えの適用は、 記述順に実施されます。"
22982
26896
26897 #, fuzzy
26898 msgid ""
26899 "``subrepos``\n"
26900 "------------"
26901 msgstr ""
26902 "\n"
26903 "``subpaths``\n"
26904 "------------"
26905
26906 msgid ""
26907 "This section contains options that control the behavior of the\n"
26908 "subrepositories feature. See also :hg:`help subrepos`."
26909 msgstr ""
26910
26911 msgid ""
26912 "Security note: auditing in Mercurial is known to be insufficient to\n"
26913 "prevent clone-time code execution with carefully constructed Git\n"
26914 "subrepos. It is unknown if a similar detect is present in Subversion\n"
26915 "subrepos. Both Git and Subversion subrepos are disabled by default\n"
26916 "out of security concerns. These subrepo types can be enabled using\n"
26917 "the respective options below."
26918 msgstr ""
26919
26920 #, fuzzy
26921 msgid ""
26922 "``allowed``\n"
26923 " Whether subrepositories are allowed in the working directory."
26924 msgstr ""
26925 "``parents([set])``\n"
26926 " 指定リビジョン群または作業領域の、 全親リビジョン群。"
26927
26928 msgid ""
26929 " When false, commands involving subrepositories (like :hg:`update`)\n"
26930 " will fail for all subrepository types.\n"
26931 " (default: true)"
26932 msgstr ""
26933
26934 msgid ""
26935 "``hg:allowed``\n"
26936 " Whether Mercurial subrepositories are allowed in the working\n"
26937 " directory. This option only has an effect if ``subrepos.allowed``\n"
26938 " is true.\n"
26939 " (default: true)"
26940 msgstr ""
26941
26942 msgid ""
26943 "``git:allowed``\n"
26944 " Whether Git subrepositories are allowed in the working directory.\n"
26945 " This option only has an effect if ``subrepos.allowed`` is true."
26946 msgstr ""
26947
26948 msgid ""
26949 " See the security note above before enabling Git subrepos.\n"
26950 " (default: false)"
26951 msgstr ""
26952
26953 msgid ""
26954 "``svn:allowed``\n"
26955 " Whether Subversion subrepositories are allowed in the working\n"
26956 " directory. This option only has an effect if ``subrepos.allowed``\n"
26957 " is true."
26958 msgstr ""
26959
26960 msgid ""
26961 " See the security note above before enabling Subversion subrepos.\n"
26962 " (default: false)"
26963 msgstr ""
26964
22983 msgid ""
26965 msgid ""
22984 "``templatealias``\n"
26966 "``templatealias``\n"
22985 "-----------------"
26967 "-----------------"
@@ -23186,13 +27168,14 b' msgstr ""'
23186 msgid " By default, the first bundle advertised by the server is used."
27168 msgid " By default, the first bundle advertised by the server is used."
23187 msgstr ""
27169 msgstr ""
23188
27170
27171 #, fuzzy
23189 msgid ""
27172 msgid ""
23190 "``color``\n"
27173 "``color``\n"
23191 " String: when to use to colorize output. possible value are auto, "
27174 " When to colorize output. Possible value are Boolean (\"yes\" or \"no\"), "
23192 "always,\n"
27175 "or\n"
23193 " never, or debug (default: auto). 'auto' will use color whenever it "
27176 " \"debug\", or \"always\". (default: \"yes\"). \"yes\" will use color "
23194 "seems\n"
27177 "whenever it\n"
23195 " possible. See :hg:`help color` for details."
27178 " seems possible. See :hg:`help color` for details."
23196 msgstr ""
27179 msgstr ""
23197 "``color``\n"
27180 "``color``\n"
23198 " 文字列: コマンド出力のカラー化設定。 指定可能な値は auto, always,\n"
27181 " 文字列: コマンド出力のカラー化設定。 指定可能な値は auto, always,\n"
@@ -23200,9 +27183,6 b' msgstr ""'
23200 " 可能な範囲でカラー化されます。 詳細は :hg:`help color`\n"
27183 " 可能な範囲でカラー化されます。 詳細は :hg:`help color`\n"
23201 " を参照してください。"
27184 " を参照してください。"
23202
27185
23203 msgid " (in addition a boolean can be used in place always/never)"
23204 msgstr " (true/false 等の真偽値は always/never 相当とみなされます)"
23205
23206 msgid ""
27186 msgid ""
23207 "``commitsubrepos``\n"
27187 "``commitsubrepos``\n"
23208 " Whether to commit modified subrepositories when committing the\n"
27188 " Whether to commit modified subrepositories when committing the\n"
@@ -23365,16 +27345,31 b' msgstr ""'
23365 " 文字コード混在による深刻な問題を生じます。"
27345 " 文字コード混在による深刻な問題を生じます。"
23366
27346
23367 msgid ""
27347 msgid ""
27348 " Can be overridden per-merge-tool, see the ``[merge-tools]`` section."
27349 msgstr ""
27350
27351 #, fuzzy
27352 msgid ""
23368 "``origbackuppath``\n"
27353 "``origbackuppath``\n"
23369 " The path to a directory used to store generated .orig files. If the path "
27354 " The path to a directory used to store generated .orig files. If the path "
23370 "is\n"
27355 "is\n"
23371 " not a directory, one will be created."
27356 " not a directory, one will be created. If set, files stored in this\n"
27357 " directory have the same name as the original file and do not have a ."
27358 "orig\n"
27359 " suffix."
23372 msgstr ""
27360 msgstr ""
23373 "``origbackuppath``\n"
27361 "``origbackuppath``\n"
23374 " バックアップ用の .orig ファイル格納先のディレクトリ名。 格納時点で、\n"
27362 " バックアップ用の .orig ファイル格納先のディレクトリ名。 格納時点で、\n"
23375 " 対象ディレクトリが不在の場合は、 新規に作成されます。"
27363 " 対象ディレクトリが不在の場合は、 新規に作成されます。"
23376
27364
23377 msgid ""
27365 msgid ""
27366 "``paginate``\n"
27367 " Control the pagination of command output (default: True). See :hg:`help "
27368 "pager`\n"
27369 " for details."
27370 msgstr ""
27371
27372 msgid ""
23378 "``patch``\n"
27373 "``patch``\n"
23379 " An optional external tool that ``hg import`` and some extensions\n"
27374 " An optional external tool that ``hg import`` and some extensions\n"
23380 " will use for applying patches. By default Mercurial uses an\n"
27375 " will use for applying patches. By default Mercurial uses an\n"
@@ -23491,6 +27486,11 b' msgstr ""'
23491
27486
23492 msgid ""
27487 msgid ""
23493 "``slash``\n"
27488 "``slash``\n"
27489 " (Deprecated. Use ``slashpath`` template filter instead.)"
27490 msgstr ""
27491
27492 #, fuzzy
27493 msgid ""
23494 " Display paths using a slash (``/``) as the path separator. This\n"
27494 " Display paths using a slash (``/``) as the path separator. This\n"
23495 " only makes a difference on systems where the default path\n"
27495 " only makes a difference on systems where the default path\n"
23496 " separator is not the slash character (e.g. Windows uses the\n"
27496 " separator is not the slash character (e.g. Windows uses the\n"
@@ -23518,6 +27518,12 b' msgstr ""'
23518 " SSH 接続に使用するコマンド。 (デフォルト値: ``ssh``)"
27518 " SSH 接続に使用するコマンド。 (デフォルト値: ``ssh``)"
23519
27519
23520 msgid ""
27520 msgid ""
27521 "``ssherrorhint``\n"
27522 " A hint shown to the user in the case of SSH error (e.g.\n"
27523 " ``Please see http://company/internalwiki/ssh.html``)"
27524 msgstr ""
27525
27526 msgid ""
23521 "``strict``\n"
27527 "``strict``\n"
23522 " Require exact command names, instead of allowing unambiguous\n"
27528 " Require exact command names, instead of allowing unambiguous\n"
23523 " abbreviations. (default: False)"
27529 " abbreviations. (default: False)"
@@ -23568,6 +27574,17 b' msgstr ""'
23568 " ロック解放待ちにおけるタイムアウト時間指定 (単位: 秒)。\n"
27574 " ロック解放待ちにおけるタイムアウト時間指定 (単位: 秒)。\n"
23569 " 負値はタイムアウト無しを意味します。 (デフォルト値: 600)"
27575 " 負値はタイムアウト無しを意味します。 (デフォルト値: 600)"
23570
27576
27577 #, fuzzy
27578 msgid ""
27579 "``timeout.warn``\n"
27580 " Time (in seconds) before a warning is printed about held lock. A "
27581 "negative\n"
27582 " value means no warning. (default: 0)"
27583 msgstr ""
27584 "``timeout``\n"
27585 " ロック解放待ちにおけるタイムアウト時間指定 (単位: 秒)。\n"
27586 " 負値はタイムアウト無しを意味します。 (デフォルト値: 600)"
27587
23571 msgid ""
27588 msgid ""
23572 "``traceback``\n"
27589 "``traceback``\n"
23573 " Mercurial always prints a traceback when an unknown exception\n"
27590 " Mercurial always prints a traceback when an unknown exception\n"
@@ -23581,6 +27598,18 b' msgstr ""'
23581 " MemoryError) であっても、トレースバックを表示します。\n"
27598 " MemoryError) であっても、トレースバックを表示します。\n"
23582 " (デフォルト値: False)"
27599 " (デフォルト値: False)"
23583
27600
27601 msgid "``tweakdefaults``"
27602 msgstr ""
27603
27604 msgid ""
27605 " By default Mercurial's behavior changes very little from release\n"
27606 " to release, but over time the recommended config settings\n"
27607 " shift. Enable this config to opt in to get automatic tweaks to\n"
27608 " Mercurial's behavior over time. This config setting will have no\n"
27609 " effet if ``HGPLAIN` is set or ``HGPLAINEXCEPT`` is set and does\n"
27610 " not include ``tweakdefaults``. (default: False)"
27611 msgstr ""
27612
23584 msgid ""
27613 msgid ""
23585 "``username``\n"
27614 "``username``\n"
23586 " The committer of a changeset created when running \"commit\".\n"
27615 " The committer of a changeset created when running \"commit\".\n"
@@ -23654,7 +27683,8 b' msgstr ""'
23654 "信頼できる環境 (例: 私的な LAN 配下で、 全ての利用者に :hg:`push` 許可)\n"
27683 "信頼できる環境 (例: 私的な LAN 配下で、 全ての利用者に :hg:`push` 許可)\n"
23655 "において、 素早くサーバを立ち上げたい場合、 以下の起動形式が良いでしょう::"
27684 "において、 素早くサーバを立ち上げたい場合、 以下の起動形式が良いでしょう::"
23656
27685
23657 msgid " $ hg --config web.allow_push=* --config web.push_ssl=False serve"
27686 #, fuzzy
27687 msgid " $ hg --config web.allow-push=* --config web.push_ssl=False serve"
23658 msgstr " $ hg --config web.allow_push=* --config web.push_ssl=False serve"
27688 msgstr " $ hg --config web.allow_push=* --config web.push_ssl=False serve"
23659
27689
23660 msgid ""
27690 msgid ""
@@ -23710,21 +27740,23 b' msgstr ""'
23710 " (非推奨) .tar.gz 形式でのアーカイブダウンロードの可否。\n"
27740 " (非推奨) .tar.gz 形式でのアーカイブダウンロードの可否。\n"
23711 " (デフォルト値: False)"
27741 " (デフォルト値: False)"
23712
27742
23713 msgid ""
27743 #, fuzzy
23714 "``allowpull``\n"
27744 msgid ""
27745 "``allow-pull``\n"
23715 " Whether to allow pulling from the repository. (default: True)"
27746 " Whether to allow pulling from the repository. (default: True)"
23716 msgstr ""
27747 msgstr ""
23717 "``allowpull``\n"
27748 "``allowpull``\n"
23718 " :hg:`pull` 要求への応答の可否。 (デフォルト値: True)"
27749 " :hg:`pull` 要求への応答の可否。 (デフォルト値: True)"
23719
27750
23720 msgid ""
27751 #, fuzzy
23721 "``allow_push``\n"
27752 msgid ""
27753 "``allow-push``\n"
23722 " Whether to allow pushing to the repository. If empty or not set,\n"
27754 " Whether to allow pushing to the repository. If empty or not set,\n"
23723 " pushing is not allowed. If the special value ``*``, any remote\n"
27755 " pushing is not allowed. If the special value ``*``, any remote\n"
23724 " user can push, including unauthenticated users. Otherwise, the\n"
27756 " user can push, including unauthenticated users. Otherwise, the\n"
23725 " remote user must have been authenticated, and the authenticated\n"
27757 " remote user must have been authenticated, and the authenticated\n"
23726 " user name must be present in this list. The contents of the\n"
27758 " user name must be present in this list. The contents of the\n"
23727 " allow_push list are examined after the deny_push list."
27759 " allow-push list are examined after the deny_push list."
23728 msgstr ""
27760 msgstr ""
23729 "``allow_push``\n"
27761 "``allow_push``\n"
23730 " :hg:`push` 要求への応答の可否。 空または未設定の場合、 :hg:`push`\n"
27762 " :hg:`push` 要求への応答の可否。 空または未設定の場合、 :hg:`push`\n"
@@ -23901,13 +27933,14 b' msgid ""'
23901 " threat model."
27933 " threat model."
23902 msgstr ""
27934 msgstr ""
23903
27935
27936 #, fuzzy
23904 msgid ""
27937 msgid ""
23905 "``deny_push``\n"
27938 "``deny_push``\n"
23906 " Whether to deny pushing to the repository. If empty or not set,\n"
27939 " Whether to deny pushing to the repository. If empty or not set,\n"
23907 " push is not denied. If the special value ``*``, all remote users are\n"
27940 " push is not denied. If the special value ``*``, all remote users are\n"
23908 " denied push. Otherwise, unauthenticated users are all denied, and\n"
27941 " denied push. Otherwise, unauthenticated users are all denied, and\n"
23909 " any authenticated user name present in this list is also denied. The\n"
27942 " any authenticated user name present in this list is also denied. The\n"
23910 " contents of the deny_push list are examined before the allow_push list."
27943 " contents of the deny_push list are examined before the allow-push list."
23911 msgstr ""
27944 msgstr ""
23912 "``deny_push``\n"
27945 "``deny_push``\n"
23913 " :hg:`push` 要求拒否の要否。 空または未設定の場合、 :hg:`push` は、\n"
27946 " :hg:`push` 要求拒否の要否。 空または未設定の場合、 :hg:`push` は、\n"
@@ -24133,6 +28166,11 b' msgstr ""'
24133 " (デフォルト値: 20)"
28166 " (デフォルト値: 20)"
24134
28167
24135 msgid ""
28168 msgid ""
28169 "``server-header``\n"
28170 " Value for HTTP ``Server`` response header."
28171 msgstr ""
28172
28173 msgid ""
24136 "``staticurl``\n"
28174 "``staticurl``\n"
24137 " Base URL to use for static files. If unset, static files (e.g. the\n"
28175 " Base URL to use for static files. If unset, static files (e.g. the\n"
24138 " hgicon.png favicon) will be served by the CGI script itself. Use\n"
28176 " hgicon.png favicon) will be served by the CGI script itself. Use\n"
@@ -24259,6 +28297,16 b' msgstr ""'
24259 "並列実施に関する設定。 現状では、 Unix 系システムにおける作業領域更新で、\n"
28297 "並列実施に関する設定。 現状では、 Unix 系システムにおける作業領域更新で、\n"
24260 "処理の並列実施により、 大規模リポジトリでの大幅な性能改善が見込まれます。"
28298 "処理の並列実施により、 大規模リポジトリでの大幅な性能改善が見込まれます。"
24261
28299
28300 #, fuzzy
28301 msgid ""
28302 "``enabled``\n"
28303 " Whether to enable workers code to be used.\n"
28304 " (default: true)"
28305 msgstr ""
28306 "``enabled``\n"
28307 " プロファイラの有効化。\n"
28308 " (デフォルト値: false)"
28309
24262 msgid ""
28310 msgid ""
24263 "``numcpus``\n"
28311 "``numcpus``\n"
24264 " Number of CPUs to use for parallel operations. A zero or\n"
28312 " Number of CPUs to use for parallel operations. A zero or\n"
@@ -24470,7 +28518,8 b' msgstr ""'
24470 " コミットの際のメッセージ入力を行うためのエディタの名前。\n"
28518 " コミットの際のメッセージ入力を行うためのエディタの名前。\n"
24471 " EDITOR 環境変数についても参照してください。"
28519 " EDITOR 環境変数についても参照してください。"
24472
28520
24473 msgid " (deprecated, use configuration file)"
28521 #, fuzzy
28522 msgid " (deprecated, see :hg:`help config.ui.editor`)"
24474 msgstr " (非推奨: 設定ファイル経由で指定してください)"
28523 msgstr " (非推奨: 設定ファイル経由で指定してください)"
24475
28524
24476 msgid ""
28525 msgid ""
@@ -24533,6 +28582,10 b' msgstr ""'
24533 " 作業領域のファイル、 マージ対象別リビジョンのファイル、\n"
28582 " 作業領域のファイル、 マージ対象別リビジョンのファイル、\n"
24534 " 両者の親リビジョンのファイルを表す、 3つの引数が指定されます。"
28583 " 両者の親リビジョンのファイルを表す、 3つの引数が指定されます。"
24535
28584
28585 #, fuzzy
28586 msgid " (deprecated, see :hg:`help config.ui.merge`)"
28587 msgstr " (非推奨: 設定ファイル経由で指定してください)"
28588
24536 msgid ""
28589 msgid ""
24537 "HGRCPATH\n"
28590 "HGRCPATH\n"
24538 " A list of files or directories to search for configuration\n"
28591 " A list of files or directories to search for configuration\n"
@@ -24574,12 +28627,26 b' msgstr ""'
24574 " ツール等から Mercurial を使用する場合に有用です。"
28627 " ツール等から Mercurial を使用する場合に有用です。"
24575
28628
24576 msgid ""
28629 msgid ""
28630 " In addition to the features disabled by ``HGPLAIN=``, the following\n"
28631 " values can be specified to adjust behavior:"
28632 msgstr ""
28633
28634 msgid ""
28635 " ``+strictflags``\n"
28636 " Restrict parsing of command line flags."
28637 msgstr ""
28638
28639 msgid ""
24577 " Equivalent options set via command line flags or environment\n"
28640 " Equivalent options set via command line flags or environment\n"
24578 " variables are not overridden."
28641 " variables are not overridden."
24579 msgstr ""
28642 msgstr ""
24580 " コマンドラインや環境変数によって、 同等のオプションが、\n"
28643 " コマンドラインや環境変数によって、 同等のオプションが、\n"
24581 " 明示的に指定された場合には、 こららは無視されません。"
28644 " 明示的に指定された場合には、 こららは無視されません。"
24582
28645
28646 #, fuzzy
28647 msgid " See :hg:`help scripting` for details."
28648 msgstr "詳細は :hg:`help color` を参照してください。\n"
28649
24583 msgid ""
28650 msgid ""
24584 "HGPLAINEXCEPT\n"
28651 "HGPLAINEXCEPT\n"
24585 " This is a comma-separated list of features to preserve when\n"
28652 " This is a comma-separated list of features to preserve when\n"
@@ -24589,9 +28656,12 b' msgstr ""'
24589 " HGPLAIN による設定無効化の際でも、 継続して利用したい機能名を、\n"
28656 " HGPLAIN による設定無効化の際でも、 継続して利用したい機能名を、\n"
24590 " カンマ区切りで列挙します。 現在利用可能な機能名は以下の通り:"
28657 " カンマ区切りで列挙します。 現在利用可能な機能名は以下の通り:"
24591
28658
28659 #, fuzzy
24592 msgid ""
28660 msgid ""
24593 " ``alias``\n"
28661 " ``alias``\n"
24594 " Don't remove aliases.\n"
28662 " Don't remove aliases.\n"
28663 " ``color``\n"
28664 " Don't disable colored output.\n"
24595 " ``i18n``\n"
28665 " ``i18n``\n"
24596 " Preserve internationalization.\n"
28666 " Preserve internationalization.\n"
24597 " ``revsetalias``\n"
28667 " ``revsetalias``\n"
@@ -24641,6 +28711,10 b' msgstr ""'
24641 " - 対話的な入力\n"
28711 " - 対話的な入力\n"
24642 " - LOGNAME 環境変数値(``@hostname`` が付与されます)"
28712 " - LOGNAME 環境変数値(``@hostname`` が付与されます)"
24643
28713
28714 #, fuzzy
28715 msgid " (deprecated, see :hg:`help config.ui.username`)"
28716 msgstr " (非推奨: 設定ファイル経由で指定してください)"
28717
24644 msgid ""
28718 msgid ""
24645 "EMAIL\n"
28719 "EMAIL\n"
24646 " May be used as the author of a commit; see HGUSER."
28720 " May be used as the author of a commit; see HGUSER."
@@ -24783,12 +28857,14 b' msgstr ""'
24783 "(※ 訳注: いわゆる「関数」的なもの) を提供しており、\n"
28857 "(※ 訳注: いわゆる「関数」的なもの) を提供しており、\n"
24784 "二項演算子による結合や、 括弧によるグループ化も可能です。"
28858 "二項演算子による結合や、 括弧によるグループ化も可能です。"
24785
28859
28860 #, fuzzy
24786 msgid ""
28861 msgid ""
24787 "Identifiers such as filenames or patterns must be quoted with single\n"
28862 "Identifiers such as filenames or patterns must be quoted with single\n"
24788 "or double quotes if they contain characters outside of\n"
28863 "or double quotes if they contain characters outside of\n"
24789 "``[.*{}[]?/\\_a-zA-Z0-9\\x80-\\xff]`` or if they match one of the\n"
28864 "``[.*{}[]?/\\_a-zA-Z0-9\\x80-\\xff]`` or if they match one of the\n"
24790 "predefined predicates. This generally applies to file patterns other\n"
28865 "predefined predicates. This generally applies to file patterns other\n"
24791 "than globs and arguments for predicates."
28866 "than globs and arguments for predicates. Pattern prefixes such as\n"
28867 "``path:`` may be specified without quoting."
24792 msgstr ""
28868 msgstr ""
24793 "ファイル名やパターンが、 ``[.*{}[]?/\\_a-zA-Z0-9\\x80-\\xff]``\n"
28869 "ファイル名やパターンが、 ``[.*{}[]?/\\_a-zA-Z0-9\\x80-\\xff]``\n"
24794 "以外の文字や、 既存の述語と一致する場合、 引用符(') または二重引用符(\")\n"
28870 "以外の文字や、 既存の述語と一致する場合、 引用符(') または二重引用符(\")\n"
@@ -24905,9 +28981,224 b' msgstr " hg revert \\"set:revs(\'wdir()'
24905 msgid "- Remove files listed in foo.lst that contain the letter a or b::"
28981 msgid "- Remove files listed in foo.lst that contain the letter a or b::"
24906 msgstr "- foo.lst の一覧中で a 又は b を名前に含むファイルを登録除外::"
28982 msgstr "- foo.lst の一覧中で a 又は b を名前に含むファイルを登録除外::"
24907
28983
24908 msgid " hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\"\n"
28984 #, fuzzy
28985 msgid " hg remove \"set: listfile:foo.lst and (**a* or **b*)\"\n"
24909 msgstr " hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\"\n"
28986 msgstr " hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\"\n"
24910
28987
28988 msgid "Most Mercurial commands accept various flags."
28989 msgstr ""
28990
28991 #, fuzzy
28992 msgid ""
28993 "Flag names\n"
28994 "=========="
28995 msgstr ""
28996 "記述例\n"
28997 "======"
28998
28999 msgid ""
29000 "Flags for each command are listed in :hg:`help` for that command.\n"
29001 "Additionally, some flags, such as --repository, are global and can be used "
29002 "with\n"
29003 "any command - those are seen in :hg:`help -v`, and can be specified before "
29004 "or\n"
29005 "after the command."
29006 msgstr ""
29007
29008 msgid ""
29009 "Every flag has at least a long name, such as --repository. Some flags may "
29010 "also\n"
29011 "have a short one-letter name, such as the equivalent -R. Using the short or "
29012 "long\n"
29013 "name is equivalent and has the same effect."
29014 msgstr ""
29015
29016 msgid ""
29017 "Flags that have a short name can also be bundled together - for instance, "
29018 "to\n"
29019 "specify both --edit (short -e) and --interactive (short -i), one could use::"
29020 msgstr ""
29021
29022 #, fuzzy
29023 msgid " hg commit -ei"
29024 msgstr "hg commit"
29025
29026 msgid ""
29027 "If any of the bundled flags takes a value (i.e. is not a boolean), it must "
29028 "be\n"
29029 "last, followed by the value::"
29030 msgstr ""
29031
29032 #, fuzzy
29033 msgid " hg commit -im 'Message'"
29034 msgstr "指定テキストをコミットログとして使用"
29035
29036 #, fuzzy
29037 msgid ""
29038 "Flag types\n"
29039 "=========="
29040 msgstr ""
29041 "フィルタ\n"
29042 "========"
29043
29044 msgid ""
29045 "Mercurial command-line flags can be strings, numbers, booleans, or lists of\n"
29046 "strings."
29047 msgstr ""
29048
29049 #, fuzzy
29050 msgid ""
29051 "Specifying flag values\n"
29052 "======================"
29053 msgstr ""
29054 "単一リビジョンの指定\n"
29055 "===================="
29056
29057 msgid ""
29058 "The following syntaxes are allowed, assuming a flag 'flagname' with short "
29059 "name\n"
29060 "'f'::"
29061 msgstr ""
29062
29063 msgid ""
29064 " --flagname=foo\n"
29065 " --flagname foo\n"
29066 " -f foo\n"
29067 " -ffoo"
29068 msgstr ""
29069
29070 msgid ""
29071 "This syntax applies to all non-boolean flags (strings, numbers or lists)."
29072 msgstr ""
29073
29074 #, fuzzy
29075 msgid ""
29076 "Specifying boolean flags\n"
29077 "========================"
29078 msgstr ""
29079 "単一リビジョンの指定\n"
29080 "===================="
29081
29082 msgid ""
29083 "Boolean flags do not take a value parameter. To specify a boolean, use the "
29084 "flag\n"
29085 "name to set it to true, or the same name prefixed with 'no-' to set it to\n"
29086 "false::"
29087 msgstr ""
29088
29089 msgid ""
29090 " hg commit --interactive\n"
29091 " hg commit --no-interactive"
29092 msgstr ""
29093
29094 #, fuzzy
29095 msgid ""
29096 "Specifying list flags\n"
29097 "====================="
29098 msgstr ""
29099 "単一リビジョンの指定\n"
29100 "===================="
29101
29102 msgid ""
29103 "List flags take multiple values. To specify them, pass the flag multiple "
29104 "times::"
29105 msgstr ""
29106
29107 msgid " hg files --include mercurial --include tests"
29108 msgstr ""
29109
29110 #, fuzzy
29111 msgid ""
29112 "Setting flag defaults\n"
29113 "====================="
29114 msgstr ""
29115 "インタフェースの選択\n"
29116 "===================="
29117
29118 msgid ""
29119 "In order to set a default value for a flag in an hgrc file, it is "
29120 "recommended to\n"
29121 "use aliases::"
29122 msgstr ""
29123
29124 msgid ""
29125 " [alias]\n"
29126 " commit = commit --interactive"
29127 msgstr ""
29128
29129 #, fuzzy
29130 msgid "For more information on hgrc files, see :hg:`help config`."
29131 msgstr ""
29132 " (フェーズに関する詳細は、 :hg:`help phases` を参照してください)\n"
29133 " "
29134
29135 #, fuzzy
29136 msgid ""
29137 "Overriding flags on the command line\n"
29138 "===================================="
29139 msgstr ""
29140 "Mercurial コマンドとの連携\n"
29141 "=========================="
29142
29143 msgid ""
29144 "If the same non-list flag is specified multiple times on the command line, "
29145 "the\n"
29146 "latest specification is used::"
29147 msgstr ""
29148
29149 msgid " hg commit -m \"Ignored value\" -m \"Used value\""
29150 msgstr ""
29151
29152 msgid "This includes the use of aliases - e.g., if one has::"
29153 msgstr ""
29154
29155 msgid ""
29156 " [alias]\n"
29157 " committemp = commit -m \"Ignored value\""
29158 msgstr ""
29159
29160 msgid "then the following command will override that -m::"
29161 msgstr ""
29162
29163 msgid " hg committemp -m \"Used value\""
29164 msgstr ""
29165
29166 #, fuzzy
29167 msgid ""
29168 "Overriding flag defaults\n"
29169 "========================"
29170 msgstr ""
29171 "サブリポジトリの削除\n"
29172 "===================="
29173
29174 msgid ""
29175 "Every flag has a default value, and you may also set your own defaults in "
29176 "hgrc\n"
29177 "as described above.\n"
29178 "Except for list flags, defaults can be overridden on the command line simply "
29179 "by\n"
29180 "specifying the flag in that location."
29181 msgstr ""
29182
29183 #, fuzzy
29184 msgid ""
29185 "Hidden flags\n"
29186 "============"
29187 msgstr ""
29188 "等価性\n"
29189 "======"
29190
29191 msgid ""
29192 "Some flags are not shown in a command's help by default - specifically, "
29193 "those\n"
29194 "that are deemed to be experimental, deprecated or advanced. To show all "
29195 "flags,\n"
29196 "add the --verbose flag for the help command::"
29197 msgstr ""
29198
29199 msgid " hg help --verbose commit\n"
29200 msgstr ""
29201
24911 msgid ""
29202 msgid ""
24912 "Ancestor\n"
29203 "Ancestor\n"
24913 " Any changeset that can be reached by an unbroken chain of parent\n"
29204 " Any changeset that can be reached by an unbroken chain of parent\n"
@@ -26176,16 +30467,17 b' msgstr ""'
26176 "\"\"\"\"\"\"\"\"\"\"\n"
30467 "\"\"\"\"\"\"\"\"\"\"\n"
26177 "|hgignore(5)|_, |hgrc(5)|_"
30468 "|hgignore(5)|_, |hgrc(5)|_"
26178
30469
30470 #, fuzzy
26179 msgid ""
30471 msgid ""
26180 "Copying\n"
30472 "Copying\n"
26181 "\"\"\"\"\"\"\"\n"
30473 "\"\"\"\"\"\"\"\n"
26182 "Copyright (C) 2005-2017 Matt Mackall.\n"
30474 "Copyright (C) 2005-2018 Matt Mackall.\n"
26183 "Free use of this software is granted under the terms of the GNU General\n"
30475 "Free use of this software is granted under the terms of the GNU General\n"
26184 "Public License version 2 or any later version."
30476 "Public License version 2 or any later version."
26185 msgstr ""
30477 msgstr ""
26186 "Copying\n"
30478 "Copying\n"
26187 "\"\"\"\"\"\"\"\n"
30479 "\"\"\"\"\"\"\"\n"
26188 "Copyright (C) 2005-2017 Matt Mackall.\n"
30480 "Copyright (C) 2005-2016 Matt Mackall.\n"
26189 "本ソフトウェアは、 バージョン2またはそれ以降の GNU General\n"
30481 "本ソフトウェアは、 バージョン2またはそれ以降の GNU General\n"
26190 "Public License の元での自由な利用が保証されています。"
30482 "Public License の元での自由な利用が保証されています。"
26191
30483
@@ -26239,11 +30531,12 b' msgstr ""'
26239 "==========\n"
30531 "==========\n"
26240 "|hg(1)|_, |hgrc(5)|_"
30532 "|hg(1)|_, |hgrc(5)|_"
26241
30533
30534 #, fuzzy
26242 msgid ""
30535 msgid ""
26243 "Copying\n"
30536 "Copying\n"
26244 "=======\n"
30537 "=======\n"
26245 "This manual page is copyright 2006 Vadim Gelfer.\n"
30538 "This manual page is copyright 2006 Vadim Gelfer.\n"
26246 "Mercurial is copyright 2005-2017 Matt Mackall.\n"
30539 "Mercurial is copyright 2005-2018 Matt Mackall.\n"
26247 "Free use of this software is granted under the terms of the GNU General\n"
30540 "Free use of this software is granted under the terms of the GNU General\n"
26248 "Public License version 2 or any later version."
30541 "Public License version 2 or any later version."
26249 msgstr ""
30542 msgstr ""
@@ -26527,11 +30820,12 b' msgstr ""'
26527 "==========\n"
30820 "==========\n"
26528 "|hg(1)|_, |hgignore(5)|_"
30821 "|hg(1)|_, |hgignore(5)|_"
26529
30822
30823 #, fuzzy
26530 msgid ""
30824 msgid ""
26531 "Copying\n"
30825 "Copying\n"
26532 "=======\n"
30826 "=======\n"
26533 "This manual page is copyright 2005 Bryan O'Sullivan.\n"
30827 "This manual page is copyright 2005 Bryan O'Sullivan.\n"
26534 "Mercurial is copyright 2005-2017 Matt Mackall.\n"
30828 "Mercurial is copyright 2005-2018 Matt Mackall.\n"
26535 "Free use of this software is granted under the terms of the GNU General\n"
30829 "Free use of this software is granted under the terms of the GNU General\n"
26536 "Public License version 2 or any later version."
30830 "Public License version 2 or any later version."
26537 msgstr ""
30831 msgstr ""
@@ -26897,15 +31191,15 b' msgstr ""'
26897 "7. マージ対象ファイルがシンボリックリンクやバイナリファイルでない場合、\n"
31191 "7. マージ対象ファイルがシンボリックリンクやバイナリファイルでない場合、\n"
26898 " 内部ツールの ``:merge`` が使用されます。"
31192 " 内部ツールの ``:merge`` が使用されます。"
26899
31193
26900 msgid "8. The merge of the file fails and must be resolved before commit."
31194 msgid "8. Otherwise, ``:prompt`` is used."
26901 msgstr ""
31195 msgstr ""
26902 "8. ファイルのマージは失敗とみなされ、 手動での :hg:`resolve` が必要です。"
31196
26903
31197 #, fuzzy
26904 msgid ""
31198 msgid ""
26905 " After selecting a merge program, Mercurial will by default attempt\n"
31199 " After selecting a merge program, Mercurial will by default attempt\n"
26906 " to merge the files using a simple merge algorithm first. Only if it "
31200 " to merge the files using a simple merge algorithm first. Only if it "
26907 "doesn't\n"
31201 "doesn't\n"
26908 " succeed because of conflicting changes Mercurial will actually execute "
31202 " succeed because of conflicting changes will Mercurial actually execute "
26909 "the\n"
31203 "the\n"
26910 " merge program. Whether to use the simple merge algorithm first can be\n"
31204 " merge program. Whether to use the simple merge algorithm first can be\n"
26911 " controlled by the premerge setting of the merge tool. Premerge is enabled "
31205 " controlled by the premerge setting of the merge tool. Premerge is enabled "
@@ -26927,8 +31221,9 b' msgstr ""'
26927 "マージツールの設定詳細に関しては、 hgrc(5) における merge-tools や\n"
31221 "マージツールの設定詳細に関しては、 hgrc(5) における merge-tools や\n"
26928 "ui セクションを参照してください。 (※ 訳注: :hg:`help config` でも参照可能)\n"
31222 "ui セクションを参照してください。 (※ 訳注: :hg:`help config` でも参照可能)\n"
26929
31223
26930 msgid ""
31224 #, fuzzy
26931 "Some Mercurial commands produce a lot of output, and Mercurial will\n"
31225 msgid ""
31226 "Some Mercurial commands can produce a lot of output, and Mercurial will\n"
26932 "attempt to use a pager to make those commands more pleasant."
31227 "attempt to use a pager to make those commands more pleasant."
26933 msgstr ""
31228 msgstr ""
26934 "Mercurial のコマンドには、 大量の情報を出力するものがありますが、\n"
31229 "Mercurial のコマンドには、 大量の情報を出力するものがありますが、\n"
@@ -26944,16 +31239,31 b' msgstr ""'
26944 " [pager]\n"
31239 " [pager]\n"
26945 " pager = less -FRX"
31240 " pager = less -FRX"
26946
31241
26947 msgid ""
31242 #, fuzzy
26948 "If no pager is set, the pager extensions uses the environment variable\n"
31243 msgid ""
26949 "$PAGER. If neither pager.pager, nor $PAGER is set, a default pager\n"
31244 "If no pager is set in the user or repository configuration, Mercurial uses "
26950 "will be used, typically `more`."
31245 "the\n"
31246 "environment variable $PAGER. If $PAGER is not set, pager.pager from the "
31247 "default\n"
31248 "or system configuration is used. If none of these are set, a default pager "
31249 "will\n"
31250 "be used, typically `less` on Unix and `more` on Windows."
26951 msgstr ""
31251 msgstr ""
26952 "上記設定が無い場合、 Mercurial は PAGER 環境変数を参照します。\n"
31252 "上記設定が無い場合、 Mercurial は PAGER 環境変数を参照します。\n"
26953 "どちらも未設定の場合、 Mercurial はデフォルトのページャを使用します\n"
31253 "どちらも未設定の場合、 Mercurial はデフォルトのページャを使用します\n"
26954 "(通常は `more` コマンド)。"
31254 "(通常は `more` コマンド)。"
26955
31255
26956 msgid ""
31256 msgid ""
31257 " On Windows, `more` is not color aware, so using it effectively disables "
31258 "color.\n"
31259 " MSYS and Cygwin shells provide `less` as a pager, which can be configured "
31260 "to\n"
31261 " support ANSI color codes. See :hg:`help config.color.pagermode` to "
31262 "configure\n"
31263 " the color mode when invoking a pager."
31264 msgstr ""
31265
31266 msgid ""
26957 "You can disable the pager for certain commands by adding them to the\n"
31267 "You can disable the pager for certain commands by adding them to the\n"
26958 "pager.ignore list::"
31268 "pager.ignore list::"
26959 msgstr ""
31269 msgstr ""
@@ -26975,13 +31285,15 b' msgstr ""'
26975 "ページャ使用を抑止したい場合、 個人の設定ファイル中で、\n"
31285 "ページャ使用を抑止したい場合、 個人の設定ファイル中で、\n"
26976 "その旨を明記してください。"
31286 "その旨を明記してください。"
26977
31287
31288 #, fuzzy
26978 msgid ""
31289 msgid ""
26979 "To control whether the pager is used at all for an individual command,\n"
31290 "To control whether the pager is used at all for an individual command,\n"
26980 "you can use --pager=<value>::"
31291 "you can use --pager=<value>:"
26981 msgstr ""
31292 msgstr ""
26982 "--pager=<value> を指定することで、 ページャの使用を、コマンド実行の都度、\n"
31293 "--pager=<value> を指定することで、 ページャの使用を、コマンド実行の都度、\n"
26983 "明示することができます::"
31294 "明示することができます::"
26984
31295
31296 #, fuzzy
26985 msgid ""
31297 msgid ""
26986 " - use as needed: `auto`.\n"
31298 " - use as needed: `auto`.\n"
26987 " - require the pager: `yes` or `on`.\n"
31299 " - require the pager: `yes` or `on`.\n"
@@ -26996,11 +31308,9 b' msgid "To globally turn off all attempts'
26996 msgstr "ページャ使用を全面的に抑止する場合は、 以下のように設定します::"
31308 msgstr "ページャ使用を全面的に抑止する場合は、 以下のように設定します::"
26997
31309
26998 msgid ""
31310 msgid ""
26999 " [pager]\n"
31311 " [ui]\n"
27000 " enable = false"
31312 " paginate = never"
27001 msgstr ""
31313 msgstr ""
27002 " [pager]\n"
27003 " enable = false"
27004
31314
27005 msgid "which will prevent the pager from running.\n"
31315 msgid "which will prevent the pager from running.\n"
27006 msgstr "この設定により、 ページャ使用は完全に抑止されます。\n"
31316 msgstr "この設定により、 ページャ使用は完全に抑止されます。\n"
@@ -27130,12 +31440,14 b' msgstr ""'
27130 msgid "Glob examples::"
31440 msgid "Glob examples::"
27131 msgstr "ワイルドカード指定例::"
31441 msgstr "ワイルドカード指定例::"
27132
31442
31443 #, fuzzy
27133 msgid ""
31444 msgid ""
27134 " glob:*.c any name ending in \".c\" in the current directory\n"
31445 " glob:*.c any name ending in \".c\" in the current directory\n"
27135 " *.c any name ending in \".c\" in the current directory\n"
31446 " *.c any name ending in \".c\" in the current directory\n"
27136 " **.c any name ending in \".c\" in any subdirectory of the\n"
31447 " **.c any name ending in \".c\" in any subdirectory of the\n"
27137 " current directory including itself.\n"
31448 " current directory including itself.\n"
27138 " foo/* any file in directory foo plus all its subdirectories,\n"
31449 " foo/* any file in directory foo\n"
31450 " foo/** any file in directory foo plus all its subdirectories,\n"
27139 " recursively\n"
31451 " recursively\n"
27140 " foo/*.c any name ending in \".c\" in the directory foo\n"
31452 " foo/*.c any name ending in \".c\" in the directory foo\n"
27141 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
31453 " foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
@@ -27250,8 +31562,9 b' msgstr ""'
27250 "必要であれば :hg:`phase` コマンドによる手動でのフェーズ変更も可能です。\n"
31562 "必要であれば :hg:`phase` コマンドによる手動でのフェーズ変更も可能です。\n"
27251 "実行例に関しては :hg:`help -v phase` を参照してください。"
31563 "実行例に関しては :hg:`help -v phase` を参照してください。"
27252
31564
27253 msgid ""
31565 #, fuzzy
27254 "To make yours commits secret by default, put this in your\n"
31566 msgid ""
31567 "To make your commits secret by default, put this in your\n"
27255 "configuration file::"
31568 "configuration file::"
27256 msgstr ""
31569 msgstr ""
27257 "以下の記述を設定ファイルに追加することで、\n"
31570 "以下の記述を設定ファイルに追加することで、\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::"'
27362 msgid " hg phase --force --draft ."
31675 msgid " hg phase --force --draft ."
27363 msgstr " hg phase --force --draft ."
31676 msgstr " hg phase --force --draft ."
27364
31677
27365 msgid " - show a list of changeset revision and phase::"
31678 #, fuzzy
31679 msgid " - show a list of changeset revisions and each corresponding phase::"
27366 msgstr " - リビジョン番号とフェーズを表示::"
31680 msgstr " - リビジョン番号とフェーズを表示::"
27367
31681
27368 msgid " hg log --template \"{rev} {phase}\\n\""
31682 msgid " hg log --template \"{rev} {phase}\\n\""
@@ -27566,9 +31880,11 b' msgstr ""'
27566 " n には 0 1 または 2 を指定可能。\n"
31880 " n には 0 1 または 2 を指定可能。\n"
27567 " n == 0 ならリビジョン自身、 n == 1 なら第1親、 n == 2 なら第2親。"
31881 " n == 0 ならリビジョン自身、 n == 1 なら第1親、 n == 2 なら第2親。"
27568
31882
31883 #, fuzzy
27569 msgid ""
31884 msgid ""
27570 "``x~n``\n"
31885 "``x~n``\n"
27571 " The nth first ancestor of x; ``x~0`` is x; ``x~3`` is ``x^^^``."
31886 " The nth first ancestor of x; ``x~0`` is x; ``x~3`` is ``x^^^``.\n"
31887 " For n < 0, the nth unambiguous descendent of x."
27572 msgstr ""
31888 msgstr ""
27573 "``x~n``\n"
31889 "``x~n``\n"
27574 " リビジョン群 x 中の各リビジョンの、 第1親側の n 番目の祖先。\n"
31890 " リビジョン群 x 中の各リビジョンの、 第1親側の n 番目の祖先。\n"
@@ -27600,11 +31916,11 b' msgstr ""'
27600 " issue(a1) = grep(r'\\bissue[ :]?' ## a1 ## r'\\b|\\bbug\\(' ## a1 ## "
31916 " issue(a1) = grep(r'\\bissue[ :]?' ## a1 ## r'\\b|\\bbug\\(' ## a1 ## "
27601 "r'\\)')"
31917 "r'\\)')"
27602
31918
31919 #, fuzzy
27603 msgid ""
31920 msgid ""
27604 " ``issue(1234)`` is equivalent to\n"
31921 " ``issue(1234)`` is equivalent to\n"
27605 " ``grep(r'\\bissue[ :]?1234\\b|\\bbug\\(1234\\)')``\n"
31922 " ``grep(r'\\bissue[ :]?1234\\b|\\bbug\\(1234\\)')``\n"
27606 " in this case. This matches against all of \"issue 1234\", "
31923 " in this case. This matches against all of \"issue 1234\", \"issue:1234\",\n"
27607 "\"issue:1234\",\n"
27608 " \"issue1234\" and \"bug(1234)\"."
31924 " \"issue1234\" and \"bug(1234)\"."
27609 msgstr ""
31925 msgstr ""
27610 " 上記の別名が定義されている場合、 ``issue(1234)`` という記述は\n"
31926 " 上記の別名が定義されている場合、 ``issue(1234)`` という記述は\n"
@@ -27653,9 +31969,10 b' msgstr ""'
27653 "そのような述語の合致判定で、 文字大小を無視したい場合は、 ``(?i)``\n"
31969 "そのような述語の合致判定で、 文字大小を無視したい場合は、 ``(?i)``\n"
27654 "で始まる正規表現を使ってください。"
31970 "で始まる正規表現を使ってください。"
27655
31971
27656 msgid ""
31972 #, fuzzy
27657 " ``tag(r're:(?i)release')`` matches \"release\" or \"RELEASE\" or "
31973 msgid ""
27658 "\"Release\", etc"
31974 "For example, ``tag(r're:(?i)release')`` matches \"release\" or \"RELEASE\"\n"
31975 "or \"Release\", etc."
27659 msgstr ""
31976 msgstr ""
27660 " ``tag(r're:(?i)release')``\n"
31977 " ``tag(r're:(?i)release')``\n"
27661 "\n"
31978 "\n"
@@ -27784,8 +32101,10 b' msgid ""'
27784 msgstr ""
32101 msgstr ""
27785 " hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tag())\""
32102 " hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tag())\""
27786
32103
27787 msgid ""
32104 #, fuzzy
27788 "- Update to commit that bookmark @ is pointing too, without activating the\n"
32105 msgid ""
32106 "- Update to the commit that bookmark @ is pointing to, without activating "
32107 "the\n"
27789 " bookmark (this works because the last revision of the revset is used)::"
32108 " bookmark (this works because the last revision of the revset is used)::"
27790 msgstr ""
32109 msgstr ""
27791 "- ブックマーク @ 参照先に更新しつつ、 ブックマークのアクティブ化を回避\n"
32110 "- ブックマーク @ 参照先に更新しつつ、 ブックマークのアクティブ化を回避\n"
@@ -27968,6 +32287,50 b' msgstr ""'
27968 " (※ 訳注: 例えば largefiles 無効化は、 リポジトリアクセスを阻害します)\n"
32287 " (※ 訳注: 例えば largefiles 無効化は、 リポジトリアクセスを阻害します)\n"
27969 " 等に対して、 予期せぬ影響を生じ得る点に、 留意してください。"
32288 " 等に対して、 予期せぬ影響を生じ得る点に、 留意してください。"
27970
32289
32290 #, fuzzy
32291 msgid ""
32292 "Command-line Flags\n"
32293 "=================="
32294 msgstr ""
32295 "コマンドと URL\n"
32296 "=============="
32297
32298 msgid ""
32299 "Mercurial's default command-line parser is designed for humans, and is not\n"
32300 "robust against malicious input. For instance, you can start a debugger by\n"
32301 "passing ``--debugger`` as an option value::"
32302 msgstr ""
32303
32304 msgid " $ REV=--debugger sh -c 'hg log -r \"$REV\"'"
32305 msgstr ""
32306
32307 msgid ""
32308 "This happens because several command-line flags need to be scanned without\n"
32309 "using a concrete command table, which may be modified while loading "
32310 "repository\n"
32311 "settings and extensions."
32312 msgstr ""
32313
32314 msgid ""
32315 "Since Mercurial 4.4.2, the parsing of such flags may be restricted by "
32316 "setting\n"
32317 "``HGPLAIN=+strictflags``. When this feature is enabled, all early options\n"
32318 "(e.g. ``-R/--repository``, ``--cwd``, ``--config``) must be specified first\n"
32319 "amongst the other global options, and cannot be injected to an arbitrary\n"
32320 "location::"
32321 msgstr ""
32322
32323 msgid " $ HGPLAIN=+strictflags hg -R \"$REPO\" log -r \"$REV\""
32324 msgstr ""
32325
32326 msgid ""
32327 "In earlier Mercurial versions where ``+strictflags`` isn't available, you\n"
32328 "can mitigate the issue by concatenating an option value with its flag::"
32329 msgstr ""
32330
32331 msgid " $ hg log -r\"$REV\" --keyword=\"$KEYWORD\""
32332 msgstr ""
32333
27971 msgid ""
32334 msgid ""
27972 "Consuming Command Output\n"
32335 "Consuming Command Output\n"
27973 "========================"
32336 "========================"
@@ -28372,8 +32735,9 b' msgstr ""'
28372 ":archive: -S/--subrepos 指定が無い限り、 アーカイブの作成は、\n"
32735 ":archive: -S/--subrepos 指定が無い限り、 アーカイブの作成は、\n"
28373 " 再帰的には実施されません。"
32736 " 再帰的には実施されません。"
28374
32737
28375 msgid ""
32738 #, fuzzy
28376 ":cat: cat currently only handles exact file matches in subrepos.\n"
32739 msgid ""
32740 ":cat: Git subrepositories only support exact file matches.\n"
28377 " Subversion subrepositories are currently ignored."
32741 " Subversion subrepositories are currently ignored."
28378 msgstr ""
32742 msgstr ""
28379 ":cat: 現状では、 サブリポジトリ中のファイルと厳密一致した場合のみ、\n"
32743 ":cat: 現状では、 サブリポジトリ中のファイルと厳密一致した場合のみ、\n"
@@ -28678,7 +33042,8 b' msgstr ""'
28678 " 乗算用の *\n"
33042 " 乗算用の *\n"
28679 " 除算用の / (除算結果は、 マイナス無限大方向の整数値に丸められます)"
33043 " 除算用の / (除算結果は、 マイナス無限大方向の整数値に丸められます)"
28680
33044
28681 msgid "Division fulfils the law x = x / y + mod(x, y)."
33045 #, fuzzy
33046 msgid "Division fulfills the law x = x / y + mod(x, y)."
28682 msgstr "除算結果は x = x / y + mod(x, y) を満たします。"
33047 msgstr "除算結果は x = x / y + mod(x, y) を満たします。"
28683
33048
28684 msgid ""
33049 msgid ""
@@ -28698,6 +33063,16 b' msgstr ""'
28698 "テンプレートとしての解釈を抑止する場合は、 ``\\{`` で開始するか、\n"
33063 "テンプレートとしての解釈を抑止する場合は、 ``\\{`` で開始するか、\n"
28699 "文字列指定の冒頭に ``r`` を付けて下さい (例: ``r'...'``)"
33064 "文字列指定の冒頭に ``r`` を付けて下さい (例: ``r'...'``)"
28700
33065
33066 msgid "The dot operator can be used as a shorthand for accessing a sub item:"
33067 msgstr ""
33068
33069 msgid ""
33070 "- ``expr.member`` is roughly equivalent to ``expr % '{member}'`` if "
33071 "``expr``\n"
33072 " returns a non-list/dict. The returned value is not stringified.\n"
33073 "- ``dict.key`` is identical to ``get(dict, 'key')``."
33074 msgstr ""
33075
28701 msgid ""
33076 msgid ""
28702 "New keywords and functions can be defined in the ``templatealias`` section "
33077 "New keywords and functions can be defined in the ``templatealias`` section "
28703 "of\n"
33078 "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::"'
28751 msgid " $ hg log -r . -Tnodedate"
33126 msgid " $ hg log -r . -Tnodedate"
28752 msgstr " $ hg log -r . -Tnodedate"
33127 msgstr " $ hg log -r . -Tnodedate"
28753
33128
33129 msgid ""
33130 "A template defined in ``templates`` section can also be referenced from\n"
33131 "another template::"
33132 msgstr ""
33133
33134 #, fuzzy
33135 msgid " $ hg log -r . -T \"{rev} {nodedate}\""
33136 msgstr " $ hg log -r . -Tnodedate"
33137
33138 msgid ""
33139 "but be aware that the keywords cannot be overridden by templates. For "
33140 "example,\n"
33141 "a template defined as ``templates.rev`` cannot be referenced as ``{rev}``."
33142 msgstr ""
33143
33144 msgid ""
33145 "A template defined in ``templates`` section may have sub templates which\n"
33146 "are inserted before/after/between items::"
33147 msgstr ""
33148
33149 msgid ""
33150 " [templates]\n"
33151 " myjson = ' {dict(rev, node|short)|json}'\n"
33152 " myjson:docheader = '\\{\\n'\n"
33153 " myjson:docfooter = '\\n}\\n'\n"
33154 " myjson:separator = ',\\n'"
33155 msgstr ""
33156
28754 msgid "Some sample command line templates:"
33157 msgid "Some sample command line templates:"
28755 msgstr "コマンドラインでのテンプレート指定例:"
33158 msgstr "コマンドラインでのテンプレート指定例:"
28756
33159
@@ -28951,9 +33354,10 b' msgstr ""'
28951 msgid "Some notes about using SSH with Mercurial:"
33354 msgid "Some notes about using SSH with Mercurial:"
28952 msgstr "Mercurial と SSH を併用する場合の注意点:"
33355 msgstr "Mercurial と SSH を併用する場合の注意点:"
28953
33356
33357 #, fuzzy
28954 msgid ""
33358 msgid ""
28955 "- SSH requires an accessible shell account on the destination machine\n"
33359 "- SSH requires an accessible shell account on the destination machine\n"
28956 " and a copy of hg in the remote path or specified with as remotecmd.\n"
33360 " and a copy of hg in the remote path or specified with remotecmd.\n"
28957 "- path is relative to the remote user's home directory by default. Use\n"
33361 "- path is relative to the remote user's home directory by default. Use\n"
28958 " an extra slash at the start of a path to specify an absolute path::"
33362 " an extra slash at the start of a path to specify an absolute path::"
28959 msgstr ""
33363 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"'
29134 msgid "(activating bookmark %s)\n"
33538 msgid "(activating bookmark %s)\n"
29135 msgstr "(ブックマーク %s をアクティブ化中)\n"
33539 msgstr "(ブックマーク %s をアクティブ化中)\n"
29136
33540
29137 msgid ""
33541 #, python-format
29138 "use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to "
33542 msgid "aborting the merge, updating back to %s\n"
33543 msgstr "マージを中断し、 作業領域を %s へと戻します\n"
33544
33545 msgid ""
33546 "use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to "
29139 "abandon\n"
33547 "abandon\n"
29140 msgstr ""
33548 msgstr ""
29141 "'hg resolve' で再度衝突解消するか、 'hg up -C .' で変更破棄してください\n"
33549 "'hg resolve' で衝突解消するか 'hg merge --abort' で変更破棄してください\n"
29142
33550
29143 msgid "(branch merge, don't forget to commit)\n"
33551 msgid "(branch merge, don't forget to commit)\n"
29144 msgstr "(マージ結果の commit を忘れずに)\n"
33552 msgstr "(マージ結果の commit を忘れずに)\n"
@@ -29155,10 +33563,6 b' msgid "listening at http://%s%s/%s (boun'
29155 msgstr "http://%s%s/%s で待ち受け開始(バインド先は %s:%d)\n"
33563 msgstr "http://%s%s/%s で待ち受け開始(バインド先は %s:%d)\n"
29156
33564
29157 #, python-format
33565 #, python-format
29158 msgid "config file %s not found!"
29159 msgstr "設定ファイル %s が見つかりません!"
29160
29161 #, python-format
29162 msgid "error reading %s/.hg/hgrc: %s\n"
33566 msgid "error reading %s/.hg/hgrc: %s\n"
29163 msgstr "%s/.hg/hgrc の読み込みに失敗: %s\n"
33567 msgstr "%s/.hg/hgrc の読み込みに失敗: %s\n"
29164
33568
@@ -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"'
29166 msgid "error accessing repository at %s\n"
33570 msgid "error accessing repository at %s\n"
29167 msgstr "リポジトリ %s へのアクセス失敗\n"
33571 msgstr "リポジトリ %s へのアクセス失敗\n"
29168
33572
33573 #, python-format
33574 msgid "config file %s not found!"
33575 msgstr "設定ファイル %s が見つかりません!"
33576
29169 msgid "SSL support is unavailable"
33577 msgid "SSL support is unavailable"
29170 msgstr "SSL サポートが利用できません"
33578 msgstr "SSL サポートが利用できません"
29171
33579
@@ -29519,6 +33927,15 b' msgstr ""'
29519 msgid " Show changeset information for each line in a file."
33927 msgid " Show changeset information for each line in a file."
29520 msgstr " ファイル各行の由来リビジョンの表示。"
33928 msgstr " ファイル各行の由来リビジョンの表示。"
29521
33929
33930 msgid ""
33931 " The ``ignorews``, ``ignorewsamount``, ``ignorewseol``, and\n"
33932 " ``ignoreblanklines`` query string arguments have the same meaning as\n"
33933 " their ``[annotate]`` config equivalents. It uses the hgrc boolean\n"
33934 " parsing logic to interpret the value. e.g. ``0`` and ``false`` are\n"
33935 " false and ``1`` and ``true`` are true. If not defined, the server\n"
33936 " default settings are used."
33937 msgstr ""
33938
29522 msgid " The ``fileannotate`` template is rendered."
33939 msgid " The ``fileannotate`` template is rendered."
29523 msgstr " 結果出力には ``fileannotate`` テンプレートを使用します。"
33940 msgstr " 結果出力には ``fileannotate`` テンプレートを使用します。"
29524
33941
@@ -29602,7 +34019,10 b' msgid ""'
29602 " representations of repository topology."
34019 " representations of repository topology."
29603 msgstr " この機能は、 履歴の木構造をグラフで描画します。"
34020 msgstr " この機能は、 履歴の木構造をグラフで描画します。"
29604
34021
29605 msgid " The ``revision`` URL parameter controls the starting changeset."
34022 #, fuzzy
34023 msgid ""
34024 " The ``revision`` URL parameter controls the starting changeset. If it's\n"
34025 " absent, the default is ``tip``."
29606 msgstr " URL パス要素 ``{revision}`` で、表示開始リビジョンを指定できます。"
34026 msgstr " URL パス要素 ``{revision}`` で、表示開始リビジョンを指定できます。"
29607
34027
29608 msgid ""
34028 msgid ""
@@ -29612,6 +34032,13 b' msgid ""'
29612 msgstr ""
34032 msgstr ""
29613 " クエリ文字列引数 ``revcount`` で、 読み込みの最大数を指定できます。"
34033 " クエリ文字列引数 ``revcount`` で、 読み込みの最大数を指定できます。"
29614
34034
34035 msgid ""
34036 " The ``graphtop`` query string argument can specify the starting "
34037 "changeset\n"
34038 " for producing ``jsdata`` variable that is used for rendering graph in\n"
34039 " JavaScript. By default it has the same value as ``revision``."
34040 msgstr ""
34041
29615 msgid " This handler will render the ``graph`` template."
34042 msgid " This handler will render the ``graph`` template."
29616 msgstr " 結果出力には ``graph`` テンプレートを使用します。"
34043 msgstr " 結果出力には ``graph`` テンプレートを使用します。"
29617
34044
@@ -29648,6 +34075,9 b' msgstr ""'
29648 msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
34075 msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
29649 msgstr " 更新ファイル数 %d、 追加 %d 行(+)、 削除 %d 行(-)\n"
34076 msgstr " 更新ファイル数 %d、 追加 %d 行(+)、 削除 %d 行(-)\n"
29650
34077
34078 msgid "not displayable without template"
34079 msgstr "テンプレート指定なしでは表示できません"
34080
29651 #, python-format
34081 #, python-format
29652 msgid "websub: invalid pattern for %s: %s\n"
34082 msgid "websub: invalid pattern for %s: %s\n"
29653 msgstr "websub: %s のパターンが不正です: %s\n"
34083 msgstr "websub: %s のパターンが不正です: %s\n"
@@ -29756,20 +34186,6 b' msgstr ""'
29756 msgid "HTTP request error (%s)"
34186 msgid "HTTP request error (%s)"
29757 msgstr "HTTP 要求エラー (%s)"
34187 msgstr "HTTP 要求エラー (%s)"
29758
34188
29759 msgid ""
29760 "this may be an intermittent failure; if the error persists, consider "
29761 "contacting the network or server operator"
29762 msgstr ""
29763 "ネットワーク経路の切断が主要因です。同様のエラーが継続的に発生する場合は、"
29764 "ネットワークあるいはサーバの管理者に問い合わせてください"
29765
29766 #, python-format
29767 msgid "unsupported URL component: \"%s\""
29768 msgstr "URL 要素 \"%s\" は未サポートです"
29769
29770 msgid "operation not supported over http"
29771 msgstr "http リポジトリでは未サポートの機能です"
29772
29773 #, python-format
34189 #, python-format
29774 msgid "real URL is %s\n"
34190 msgid "real URL is %s\n"
29775 msgstr "実際の URL: %s\n"
34191 msgstr "実際の URL: %s\n"
@@ -29786,6 +34202,9 b' msgstr ""'
29786 "%s\n"
34202 "%s\n"
29787 "---%%<---\n"
34203 "---%%<---\n"
29788
34204
34205 msgid "unexpected CBOR response from server"
34206 msgstr "想定外の CBOR サーバ応答"
34207
29789 #, python-format
34208 #, python-format
29790 msgid "'%s' sent a broken Content-Type header (%s)"
34209 msgid "'%s' sent a broken Content-Type header (%s)"
29791 msgstr "'%s' は壊れた Content-Type ヘッダ(%s)を送信しました"
34210 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"'
29798 msgid "push failed: %s"
34217 msgid "push failed: %s"
29799 msgstr "履歴反映に失敗: %s"
34218 msgstr "履歴反映に失敗: %s"
29800
34219
29801 msgid "Python support for SSL and HTTPS is not installed"
34220 #, python-format
29802 msgstr "SSL と HTTPS をサポートした Python がインストールされていません"
34221 msgid "cannot make request requiring multiple permissions: %s"
34222 msgstr ""
34223
34224 #, fuzzy
34225 msgid "unfulfilled command response"
34226 msgstr "入力が不正です\n"
34227
34228 #, python-format
34229 msgid ""
34230 "cannot %s; client or remote repository does not support the %r capability"
34231 msgstr "%s ができません。 クライアントまたは連携先は機能 %r が未サポートです"
34232
34233 msgid "error decoding CBOR from remote server"
34234 msgstr "連携先サーバからの CBOR 応答が復号できません"
34235
34236 msgid "try again and consider contacting the server operator"
34237 msgstr "再実行するなり連携先リポジトリの管理者に連絡するなりしてください"
34238
34239 #, python-format
34240 msgid "unexpected response type from server: %s"
34241 msgstr "連携先サーバからの想定外の応答種別: %s"
34242
34243 #, python-format
34244 msgid "unsupported URL component: \"%s\""
34245 msgstr "URL 要素 \"%s\" は未サポートです"
29803
34246
29804 msgid "cannot create new http repository"
34247 msgid "cannot create new http repository"
29805 msgstr "http リポジトリの新規作成はできません"
34248 msgstr "http リポジトリの新規作成はできません"
29806
34249
34250 msgid "Python support for SSL and HTTPS is not installed"
34251 msgstr "SSL と HTTPS をサポートした Python がインストールされていません"
34252
29807 msgid "(falling back to static-http)\n"
34253 msgid "(falling back to static-http)\n"
29808 msgstr "(static-http との連携に切り替え中)\n"
34254 msgstr "(static-http との連携に切り替え中)\n"
29809
34255
29810 #, python-format
34256 #, python-format
34257 msgid "bad HTTP status line: %s"
34258 msgstr "不正な HTTP ステータス行: %s"
34259
34260 msgid "cannot perform stream clone against local peer"
34261 msgstr ""
34262
34263 #, python-format
29811 msgid "repository %s not found"
34264 msgid "repository %s not found"
29812 msgstr "リポジトリ '%s' が見つかりません"
34265 msgstr "リポジトリ '%s' が見つかりません"
29813
34266
@@ -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"'
29819 msgid ".hg/sharedpath points to nonexistent directory %s"
34272 msgid ".hg/sharedpath points to nonexistent directory %s"
29820 msgstr ".hg/sharedpath の参照先 %s は存在しません"
34273 msgstr ".hg/sharedpath の参照先 %s は存在しません"
29821
34274
29822 #, python-format
34275 msgid ""
29823 msgid "obsolete feature not enabled but %i markers found!\n"
34276 "repository is using sparse feature but sparse is not enabled; enable the "
29824 msgstr "obsolete 機能は無効ですが、 %i 個の廃止情報マーカが存在します!\n"
34277 "\"sparse\" extensions to access"
34278 msgstr ""
29825
34279
29826 #, python-format
34280 #, python-format
29827 msgid "warning: ignoring unknown working parent %s!\n"
34281 msgid "warning: ignoring unknown working parent %s!\n"
@@ -29843,12 +34297,12 b' msgid "no rollback information available'
29843 msgstr "利用可能なロールバック情報がありません\n"
34297 msgstr "利用可能なロールバック情報がありません\n"
29844
34298
29845 #, python-format
34299 #, python-format
29846 msgid "repository tip rolled back to revision %s (undo %s: %s)\n"
34300 msgid "repository tip rolled back to revision %d (undo %s: %s)\n"
29847 msgstr "tip をリビジョン %s へと巻き戻し(%s %s の取り消し)\n"
34301 msgstr "tip をリビジョン %d へと巻き戻し (%s %s の取り消し)\n"
29848
34302
29849 #, python-format
34303 #, python-format
29850 msgid "repository tip rolled back to revision %s (undo %s)\n"
34304 msgid "repository tip rolled back to revision %d (undo %s)\n"
29851 msgstr "tip をリビジョン %s へと巻き戻し(%s の取り消し)\n"
34305 msgstr "tip をリビジョン %d へと巻き戻し (%s の取り消し)\n"
29852
34306
29853 msgid "rolling back unknown transaction\n"
34307 msgid "rolling back unknown transaction\n"
29854 msgstr "未知のトランザクションの巻き戻し\n"
34308 msgstr "未知のトランザクションの巻き戻し\n"
@@ -29872,10 +34326,6 b' msgid "working directory now based on re'
29872 msgstr "%d が作業領域の親リビジョンになりました\n"
34326 msgstr "%d が作業領域の親リビジョンになりました\n"
29873
34327
29874 #, python-format
34328 #, python-format
29875 msgid "waiting for lock on %s held by process %r on host %r\n"
29876 msgstr "%s のロック (プロセス %r/ホスト %s が保持) の解放を待っています\n"
29877
29878 #, python-format
29879 msgid "repository %s"
34329 msgid "repository %s"
29880 msgstr "リポジトリ '%s'"
34330 msgstr "リポジトリ '%s'"
29881
34331
@@ -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!"'
29899 msgid "cannot partially commit a merge (do not specify files or patterns)"
34349 msgid "cannot partially commit a merge (do not specify files or patterns)"
29900 msgstr "マージの部分コミットはできません(ファイル名/パターンは指定できません)"
34350 msgstr "マージの部分コミットはできません(ファイル名/パターンは指定できません)"
29901
34351
29902 #, python-format
29903 msgid "commit with new subrepo %s excluded"
29904 msgstr "コミット対象に、新規サブリポジトリ %s が含まれていません"
29905
29906 msgid "use --subrepos for recursive commit"
29907 msgstr "--subrepos 指定で再帰コミット"
29908
29909 msgid "can't commit subrepos without .hgsub"
29910 msgstr ".hgsub の無いサブリポジトリはコミットできません"
29911
29912 msgid "cannot commit merge with missing files"
34352 msgid "cannot commit merge with missing files"
29913 msgstr "管理対象ファイルが不在の状況では、マージ結果をコミットできません"
34353 msgstr "管理対象ファイルが不在の状況では、マージ結果をコミットできません"
29914
34354
@@ -29948,6 +34388,43 b' msgid "run \\"hg debuginstall\\" to list a'
29948 msgstr ""
34388 msgstr ""
29949 "\"hg debuginstall\" で表示される利用可能圧縮エンジン一覧を確認してください"
34389 "\"hg debuginstall\" で表示される利用可能圧縮エンジン一覧を確認してください"
29950
34390
34391 #, python-format
34392 msgid "waiting for lock on %s held by process %r on host %r\n"
34393 msgstr "%s のロック (プロセス %r/ホスト %s が保持) の解放を待っています\n"
34394
34395 #, python-format
34396 msgid "got lock after %d seconds\n"
34397 msgstr "%d 秒遅れでロックを獲得\n"
34398
34399 msgid "limit must be a positive integer"
34400 msgstr "制限には正数を指定してください"
34401
34402 msgid "limit must be positive"
34403 msgstr "制限には正数を指定してください"
34404
34405 #, python-format
34406 msgid "warning: %s not inside relative root %s\n"
34407 msgstr "警告: %s は相対ルート %s の範囲外です\n"
34408
34409 msgid "description:\n"
34410 msgstr "説明:\n"
34411
34412 #, python-format
34413 msgid "malformatted line-range pattern %s"
34414 msgstr "不正な行範囲指定 %s"
34415
34416 #, python-format
34417 msgid "invalid line range for %s"
34418 msgstr "不正な行範囲指定 %s"
34419
34420 #, python-format
34421 msgid "line range pattern '%s' must match exactly one file"
34422 msgstr "行範囲指定 '%s' は単一ファイルにのみ合致する必要があります"
34423
34424 #, python-format
34425 msgid "-G/--graph option is incompatible with --%s"
34426 msgstr "-G/--graph と --%s は併用できません"
34427
29951 msgid "can't use TLS: Python SSL support not installed"
34428 msgid "can't use TLS: Python SSL support not installed"
29952 msgstr "TLS を利用できません: Python SSL サポートがインストールされていません"
34429 msgstr "TLS を利用できません: Python SSL サポートがインストールされていません"
29953
34430
@@ -30010,9 +34487,6 b' msgid "cannot ask for manifest directory'
30010 msgstr ""
34487 msgstr ""
30011 "フラットなマニフェストではマニフェストディレクトリ '%s' を指定できません"
34488 "フラットなマニフェストではマニフェストディレクトリ '%s' を指定できません"
30012
34489
30013 msgid "fileset expression with no context"
30014 msgstr "対象リビジョン指定なしの fileset 記述"
30015
30016 #, python-format
34490 #, python-format
30017 msgid "unable to read file list (%s)"
34491 msgid "unable to read file list (%s)"
30018 msgstr "一覧ファイル(%s)が読み込めません"
34492 msgstr "一覧ファイル(%s)が読み込めません"
@@ -30062,6 +34536,14 b' msgid "%s.%s not valid (\'%s\' is none of '
30062 msgstr "%s.%s は無効です (指定値: '%s' 指定可能値: %s)"
34536 msgstr "%s.%s は無効です (指定値: '%s' 指定可能値: %s)"
30063
34537
30064 #, python-format
34538 #, python-format
34539 msgid "%s: untracked file conflicts with directory\n"
34540 msgstr "%s: 管理対象外ファイルが管理対象ファイルのディレクトリ名と衝突\n"
34541
34542 #, python-format
34543 msgid "%s: untracked directory conflicts with file\n"
34544 msgstr "%s: 管理対象外ディレクトリが管理対象ファイル名と衝突\n"
34545
34546 #, python-format
30065 msgid "%s: untracked file differs\n"
34547 msgid "%s: untracked file differs\n"
30066 msgstr "%s: 管理対象外ファイルに差分あり\n"
34548 msgstr "%s: 管理対象外ファイルに差分あり\n"
30067
34549
@@ -30074,6 +34556,10 b' msgid "%s: replacing untracked file\\n"'
30074 msgstr "%s: 管理対象外ファイルの内容を書き換え\n"
34556 msgstr "%s: 管理対象外ファイルの内容を書き換え\n"
30075
34557
30076 #, python-format
34558 #, python-format
34559 msgid "%s: replacing untracked files in directory\n"
34560 msgstr "%s: ディレクトリ配下の管理対象外ファイルの内容を書き換え\n"
34561
34562 #, python-format
30077 msgid "case-folding collision between %s and %s"
34563 msgid "case-folding collision between %s and %s"
30078 msgstr "ファイル名の文字大小の問題で %s と %s が衝突します"
34564 msgstr "ファイル名の文字大小の問題で %s と %s が衝突します"
30079
34565
@@ -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"'
30081 msgid "case-folding collision between %s and directory of %s"
34567 msgid "case-folding collision between %s and directory of %s"
30082 msgstr "ファイル名の文字大小の問題で %s とディレクトリ %s が衝突します"
34568 msgstr "ファイル名の文字大小の問題で %s とディレクトリ %s が衝突します"
30083
34569
34570 #, python-format
34571 msgid "%s: is both a file and a directory\n"
34572 msgstr "%s: ファイル名/ディレクトリ名の両方で使用\n"
34573
34574 msgid "destination manifest contains path conflicts"
34575 msgstr "指定リビジョンの管理対象ファイルにパスの衝突が含まれます"
34576
30084 msgid "resolving manifests\n"
34577 msgid "resolving manifests\n"
30085 msgstr "管理ファイル一覧の解決中\n"
34578 msgstr "管理ファイル一覧の解決中\n"
30086
34579
@@ -30146,6 +34639,22 b' msgid "updating"'
30146 msgstr "更新中"
34639 msgstr "更新中"
30147
34640
30148 #, python-format
34641 #, python-format
34642 msgid "%s: path conflict - a file or link has the same name as a directory\n"
34643 msgstr "%s: パス衝突 - ファイル名/リンク名がディレクトリ名と一致\n"
34644
34645 #, python-format
34646 msgid "the local file has been renamed to %s\n"
34647 msgstr ""
34648
34649 #, python-format
34650 msgid "the remote file has been renamed to %s\n"
34651 msgstr ""
34652
34653 #, python-format
34654 msgid "resolve manually then use 'hg resolve --mark %s'\n"
34655 msgstr "手動での衝突解消後、'hg resolve --mark %s' を実施してください\n"
34656
34657 #, python-format
30149 msgid "getting %s to %s\n"
34658 msgid "getting %s to %s\n"
30150 msgstr "%s から %s に複製中\n"
34659 msgstr "%s から %s に複製中\n"
30151
34660
@@ -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"'
30193 msgid "note: possible conflict - %s was deleted and renamed to:\n"
34702 msgid "note: possible conflict - %s was deleted and renamed to:\n"
30194 msgstr "備考: 衝突の可能性 - 削除と平行して %s への改名があります:\n"
34703 msgstr "備考: 衝突の可能性 - 削除と平行して %s への改名があります:\n"
30195
34704
34705 msgid ""
34706 "(warning: large working directory being used without fsmonitor enabled; "
34707 "enable fsmonitor to improve performance; see \"hg help -e fsmonitor\")\n"
34708 msgstr ""
34709
30196 msgid "unresolved merge conflicts (see 'hg help resolve')"
34710 msgid "unresolved merge conflicts (see 'hg help resolve')"
30197 msgstr "未解消の衝突が残っています ('hg help resolve' を参照)"
34711 msgstr "未解消の衝突が残っています ('hg help resolve' を参照)"
30198
34712
@@ -30202,6 +34716,21 b' msgstr ""'
30202 msgid "run \"hg resolve --all\" to resolve"
34716 msgid "run \"hg resolve --all\" to resolve"
30203 msgstr "衝突解消には \"hg resolve --all\" を実行してください"
34717 msgstr "衝突解消には \"hg resolve --all\" を実行してください"
30204
34718
34719 #, fuzzy
34720 msgid "invalid file pattern"
34721 msgstr "不正パターン"
34722
34723 #, fuzzy, python-format
34724 msgid "reserved character: %s"
34725 msgstr "想定外の revspec フォーマット文字 %s"
34726
34727 #, fuzzy, python-format
34728 msgid "unsupported file pattern: %s"
34729 msgstr "未サポートなパーサ状態です: %s"
34730
34731 msgid "paths must be prefixed with \"path:\""
34732 msgstr ""
34733
30205 msgid "Attention:"
34734 msgid "Attention:"
30206 msgstr "注意:"
34735 msgstr "注意:"
30207
34736
@@ -30229,20 +34758,36 b' msgstr "\xe6\x83\x85\xe5\xa0\xb1:"'
30229 msgid "Warning!"
34758 msgid "Warning!"
30230 msgstr "警告!"
34759 msgstr "警告!"
30231
34760
30232 #. i18n: column positioning for "hg log"
30233 #, python-format
30234 msgid "bookmark: %s\n"
30235 msgstr "ブックマーク: %s\n"
30236
30237 #. i18n: column positioning for "hg log"
30238 #, python-format
30239 msgid "tag: %s\n"
30240 msgstr "タグ: %s\n"
30241
30242 #, python-format
34761 #, python-format
30243 msgid "no such name: %s"
34762 msgid "no such name: %s"
30244 msgstr "指定の名前は存在しません: %s"
34763 msgstr "指定の名前は存在しません: %s"
30245
34764
34765 msgid "narrowspec includes section must appear at most once, before excludes"
34766 msgstr ""
34767
34768 msgid "narrowspec excludes section must appear at most once"
34769 msgstr ""
34770
34771 #, fuzzy, python-format
34772 msgid "Invalid narrowspec pattern line: \"%s\""
34773 msgstr "不正なマッチングパターン: %s"
34774
34775 #, python-format
34776 msgid "Invalid key \"%s\" in server response"
34777 msgstr ""
34778
34779 msgid "newlines are not allowed in narrowspec paths"
34780 msgstr ""
34781
34782 msgid "\".\" and \"..\" are not allowed in narrowspec paths"
34783 msgstr ""
34784
34785 msgid ""
34786 "'createmarkers' obsolete option must be enabled if other obsolete options "
34787 "are enabled"
34788 msgstr ""
34789 "廃止情報機能の各オプションの有効化には 'createmarkers' の有効化が必須です"
34790
30246 #, python-format
34791 #, python-format
30247 msgid ""
34792 msgid ""
30248 "parsing obsolete marker: metadata is too short, %d bytes expected, got %d"
34793 "parsing obsolete marker: metadata is too short, %d bytes expected, got %d"
@@ -30266,6 +34811,10 b' msgid "creating obsolete markers is not '
30266 msgstr "廃止マーカの作成機能は無効化されています"
34811 msgstr "廃止マーカの作成機能は無効化されています"
30267
34812
30268 #, python-format
34813 #, python-format
34814 msgid "obsolete feature not enabled but %i markers found!\n"
34815 msgstr "obsolete 機能は無効ですが、 %i 個の廃止情報マーカが存在します!\n"
34816
34817 #, python-format
30269 msgid "unknown key: %r"
34818 msgid "unknown key: %r"
30270 msgstr "未知のキーです: %r"
34819 msgstr "未知のキーです: %r"
30271
34820
@@ -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"'
30281 msgid "changeset %s cannot obsolete itself"
34830 msgid "changeset %s cannot obsolete itself"
30282 msgstr "リビジョン %s をそれ自身で廃止することはできません"
34831 msgstr "リビジョン %s をそれ自身で廃止することはできません"
30283
34832
30284 msgid ""
34833 #, fuzzy, python-format
30285 "'createmarkers' obsolete option must be enabled if other obsolete options "
34834 msgid "hidden revision '%s' is pruned"
30286 "are enabled"
34835 msgstr "'%s' は不可視リビジョンです"
30287 msgstr ""
34836
30288 "廃止情報機能の各オプションの有効化には 'createmarkers' の有効化が必須です"
34837 #, fuzzy, python-format
34838 msgid "hidden revision '%s' has diverged"
34839 msgstr "'%s' は不可視リビジョンです"
34840
34841 #, fuzzy, python-format
34842 msgid "hidden revision '%s' was rewritten as: %s"
34843 msgstr "'%s' は不可視リビジョンです"
34844
34845 #, fuzzy, python-format
34846 msgid "hidden revision '%s' was split as: %s"
34847 msgstr "'%s' は不可視リビジョンです"
34848
34849 #, python-format
34850 msgid "hidden revision '%s' was split as: %s and %d more"
34851 msgstr ""
30289
34852
30290 #, python-format
34853 #, python-format
30291 msgid "unexpected token: %s"
34854 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"'
30409 msgid "%d hunks, %d lines changed\n"
34972 msgid "%d hunks, %d lines changed\n"
30410 msgstr "%d 個の差分、 %d 行の変更\n"
34973 msgstr "%d 個の差分、 %d 行の変更\n"
30411
34974
34975 #, fuzzy, python-format
34976 msgid "apply change %d/%d to '%s'?"
34977 msgstr "この変更 (%d 件目 / %d 件中) を '%s' から破棄しますか?"
34978
30412 #, python-format
34979 #, python-format
30413 msgid "discard change %d/%d to '%s'?"
34980 msgid "discard change %d/%d to '%s'?"
30414 msgstr "この変更 (%d 件目 / %d 件中) を '%s' から破棄しますか?"
34981 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"'
30417 msgid "record change %d/%d to '%s'?"
34984 msgid "record change %d/%d to '%s'?"
30418 msgstr "この変更 (%d 件目 / %d 件中) を '%s' に記録しますか?"
34985 msgstr "この変更 (%d 件目 / %d 件中) を '%s' に記録しますか?"
30419
34986
30420 #, python-format
34987 #, fuzzy, python-format
30421 msgid "revert change %d/%d to '%s'?"
34988 msgid "apply this change to '%s'?"
30422 msgstr "この変更 (%d 件目 / %d 件中) を '%s' に記録しますか?"
34989 msgstr "この変更を '%s' から破棄しますか?"
30423
34990
30424 #, python-format
34991 #, python-format
30425 msgid "discard this change to '%s'?"
34992 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"'
30429 msgid "record this change to '%s'?"
34996 msgid "record this change to '%s'?"
30430 msgstr "この変更を '%s' に記録しますか?"
34997 msgstr "この変更を '%s' に記録しますか?"
30431
34998
30432 #, python-format
34999 #, fuzzy
30433 msgid "revert this change to '%s'?"
35000 msgid ""
30434 msgstr "この変更を '%s' に記録しますか?"
35001 "[Ynesfdaq?]$$ &Yes, apply this change$$ &No, skip this change$$ &Edit this "
35002 "change manually$$ &Skip remaining changes to this file$$ Apply remaining "
35003 "changes to this &file$$ &Done, skip remaining changes and files$$ Apply &all "
35004 "changes to all remaining files$$ &Quit, applying no changes$$ &? (display "
35005 "help)"
35006 msgstr ""
35007 "[Ynesfdaq?]$$ この変更を記録(&yes)$$ この変更を無視(&no)$$ この変更を手動で編"
35008 "集(&edit)$$ 同一ファイルの以後の全ての変更を無視(&skip)$$ 同一ファイル(&file)"
35009 "の以後の全ての変更を記録$$ 以後の全ての変更を無視=記録作業を完了(&done)$$ 以"
35010 "後の全て(&all)の変更を記録$$ 変更の記録自体を中止(&quit)$$ ヘルプ表示(&?)"
35011
35012 #, fuzzy
35013 msgid ""
35014 "[Ynesfdaq?]$$ &Yes, discard this change$$ &No, skip this change$$ &Edit this "
35015 "change manually$$ &Skip remaining changes to this file$$ Discard remaining "
35016 "changes to this &file$$ &Done, skip remaining changes and files$$ Discard "
35017 "&all changes to all remaining files$$ &Quit, discarding no changes$$ &? "
35018 "(display help)"
35019 msgstr ""
35020 "[Ynesfdaq?]$$ この変更を記録(&yes)$$ この変更を無視(&no)$$ この変更を手動で編"
35021 "集(&edit)$$ 同一ファイルの以後の全ての変更を無視(&skip)$$ 同一ファイル(&file)"
35022 "の以後の全ての変更を記録$$ 以後の全ての変更を無視=記録作業を完了(&done)$$ 以"
35023 "後の全て(&all)の変更を記録$$ 変更の記録自体を中止(&quit)$$ ヘルプ表示(&?)"
30435
35024
30436 msgid ""
35025 msgid ""
30437 "[Ynesfdaq?]$$ &Yes, record this change$$ &No, skip this change$$ &Edit this "
35026 "[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"'
30480 msgid "bad hunk #%d"
35069 msgid "bad hunk #%d"
30481 msgstr "不正な差分: #%d"
35070 msgstr "不正な差分: #%d"
30482
35071
35072 #, fuzzy, python-format
35073 msgid "bad hunk #%d: %s"
35074 msgstr "不正な差分: #%d"
35075
30483 #, python-format
35076 #, python-format
30484 msgid "bad hunk #%d old text line %d"
35077 msgid "bad hunk #%d old text line %d"
30485 msgstr "不正な差分: #%d 元テキスト %d 行目"
35078 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"'
30565 msgid "%s not under root '%s'"
35158 msgid "%s not under root '%s'"
30566 msgstr "%s はルートディレクトリ '%s' の配下にはありません"
35159 msgstr "%s はルートディレクトリ '%s' の配下にはありません"
30567
35160
30568 #, python-format
35161 msgid "bad phase-heads stream"
30569 msgid "cannot %s; remote repository does not support the %r capability"
35162 msgstr ""
30570 msgstr "%s ができません。 連携先は機能 %r が未サポートです"
30571
35163
30572 msgid "cannot lookup negative revision"
35164 msgid "cannot lookup negative revision"
30573 msgstr "負値のリビジョン指定は無効です"
35165 msgstr "負値のリビジョン指定は無効です"
@@ -30588,12 +35180,8 b' msgid "phases.new-commit: not a valid ph'
30588 msgstr "phases.new-commit: 不正なフェーズ名です ('%s')"
35180 msgstr "phases.new-commit: 不正なフェーズ名です ('%s')"
30589
35181
30590 #, python-format
35182 #, python-format
30591 msgid "exited with status %d"
35183 msgid "illegal ssh hostname or username starting with -: %s"
30592 msgstr "終了コード %d で終了しました"
35184 msgstr "SSH 連携のホスト名またはユーザ名が - で始まる不正なものです: %s"
30593
30594 #, python-format
30595 msgid "killed by signal %d"
30596 msgstr "シグナル %d で強制終了されました"
30597
35185
30598 #, python-format
35186 #, python-format
30599 msgid "unrecognized profiling format '%s' - Ignored\n"
35187 msgid "unrecognized profiling format '%s' - Ignored\n"
@@ -30663,13 +35251,6 b' msgstr "%d %s/\xe7\xa7\x92"'
30663 msgid "saved backup bundle to %s\n"
35251 msgid "saved backup bundle to %s\n"
30664 msgstr "バックアップのバンドルを %s に保存\n"
35252 msgstr "バックアップのバンドルを %s に保存\n"
30665
35253
30666 msgid "adding branch\n"
30667 msgstr "ブランチを追加中\n"
30668
30669 #, python-format
30670 msgid "error removing %s: %s\n"
30671 msgstr "ファイル %s の破棄に失敗: %s\n"
30672
30673 #, python-format
35254 #, python-format
30674 msgid "strip failed, backup bundle stored in '%s'\n"
35255 msgid "strip failed, backup bundle stored in '%s'\n"
30675 msgstr "リビジョン除外に失敗: バックアップバンドルを '%s' に保存\n"
35256 msgstr "リビジョン除外に失敗: バックアップバンドルを '%s' に保存\n"
@@ -30683,6 +35264,10 b' msgid ""'
30683 "(fix the problem, then recover the changesets with \"hg unbundle '%s'\")\n"
35264 "(fix the problem, then recover the changesets with \"hg unbundle '%s'\")\n"
30684 msgstr "(問題解決後に \"hg unbundle '%s'\" で履歴を復旧してください)\n"
35265 msgstr "(問題解決後に \"hg unbundle '%s'\" で履歴を復旧してください)\n"
30685
35266
35267 #, python-format
35268 msgid "warning: orphaned descendants detected, not stripping %s\n"
35269 msgstr "警告: 孤立するリビジョンがあるため、破棄しません: %s\n"
35270
30686 msgid "(not rebuilding fncache because repository does not support fncache)\n"
35271 msgid "(not rebuilding fncache because repository does not support fncache)\n"
30687 msgstr "(fncache 未サポートのリポジトリのため、fncache の再構築は省略)\n"
35272 msgstr "(fncache 未サポートのリポジトリのため、fncache の再構築は省略)\n"
30688
35273
@@ -30697,6 +35282,10 b' msgid "fncache already up to date\\n"'
30697 msgstr "fncache は最新の状態です\n"
35282 msgstr "fncache は最新の状態です\n"
30698
35283
30699 #, python-format
35284 #, python-format
35285 msgid "cannot %s; remote repository does not support the %r capability"
35286 msgstr "%s ができません。 連携先は機能 %r が未サポートです"
35287
35288 #, python-format
30700 msgid "cannot register processor on unknown flag '%#x'."
35289 msgid "cannot register processor on unknown flag '%#x'."
30701 msgstr ""
35290 msgstr ""
30702
35291
@@ -30708,8 +35297,12 b' msgstr ""'
30708 msgid "cannot register multiple processors on flag '%#x'."
35297 msgid "cannot register multiple processors on flag '%#x'."
30709 msgstr ""
35298 msgstr ""
30710
35299
30711 msgid "index entry flags need RevlogNG"
35300 #, python-format
30712 msgstr "インデックスエントリフラグは RevlogNG 対応が必要です"
35301 msgid "node %s is not censored"
35302 msgstr "ノード %s は検閲対象ではありません"
35303
35304 msgid "index entry flags need revlog version 1"
35305 msgstr "インデックスエントリフラグは revlog version 1 対応が必要です"
30713
35306
30714 #, python-format
35307 #, python-format
30715 msgid "revlog chunk cache size %r is not greater than 0"
35308 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"'
30719 msgid "revlog chunk cache size %r is not a power of 2"
35312 msgid "revlog chunk cache size %r is not a power of 2"
30720 msgstr "revlog chunk のキャッシュサイズ %r は2の累乗ではありません"
35313 msgstr "revlog chunk のキャッシュサイズ %r は2の累乗ではありません"
30721
35314
30722 #, python-format
35315 #, fuzzy, python-format
30723 msgid "index %s unknown flags %#04x for format v0"
35316 msgid "unknown flags (%#04x) in version %d revlog %s"
30724 msgstr "インデックス %s: %#04x は未知のフラグです(フォーマット v0)"
30725
30726 #, python-format
30727 msgid "index %s unknown flags %#04x for revlogng"
30728 msgstr "インデックス %s: %#04x は未知のフラグです(revlogng)"
35317 msgstr "インデックス %s: %#04x は未知のフラグです(revlogng)"
30729
35318
30730 #, python-format
35319 #, fuzzy, python-format
30731 msgid "index %s unknown format %d"
35320 msgid "unknown version (%d) in revlog %s"
30732 msgstr "インデックス %s: %d は未知のフォーマットです"
35321 msgstr "未知のエンコーディング '%s' が指定されました"
30733
35322
30734 #, python-format
35323 #, python-format
30735 msgid "index %s is corrupted"
35324 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"'
30777 msgid "unknown compression type %r"
35366 msgid "unknown compression type %r"
30778 msgstr "%r は未知の圧縮形式です"
35367 msgstr "%r は未知の圧縮形式です"
30779
35368
30780 #, python-format
35369 #, fuzzy, python-format
30781 msgid "node %s is not censored"
35370 msgid "%s: attempt to add null revision"
30782 msgstr "ノード %s は検閲対象ではありません"
35371 msgstr "null リビジョンにはタグ付けできません"
35372
35373 #, fuzzy, python-format
35374 msgid "%s: attempt to add wdir revision"
35375 msgstr "%s は有効なリビジョンではありません"
30783
35376
30784 #, python-format
35377 #, python-format
30785 msgid "value for deltareuse invalid: %s"
35378 msgid "value for deltareuse invalid: %s"
@@ -30794,6 +35387,22 b' msgstr ""'
30794 msgid "destination revlog has filtered revisions"
35387 msgid "destination revlog has filtered revisions"
30795 msgstr ""
35388 msgstr ""
30796
35389
35390 #, fuzzy
35391 msgid "empty string is not a valid revision"
35392 msgstr "%s は有効なリビジョンではありません"
35393
35394 #, fuzzy
35395 msgid "can't use a relation in this context"
35396 msgstr "ここではリストを使用できません"
35397
35398 #, fuzzy
35399 msgid "relation subscript must be an integer"
35400 msgstr "CPU 数には数値を指定してください"
35401
35402 #, fuzzy
35403 msgid "can't use a subscript in this context"
35404 msgstr "ここではリストを使用できません"
35405
30797 msgid "see hg help \"revsets.x or y\""
35406 msgid "see hg help \"revsets.x or y\""
30798 msgstr "hg help \"revsets.x or y\" を参照してください"
35407 msgstr "hg help \"revsets.x or y\" を参照してください"
30799
35408
@@ -30836,13 +35445,38 b' msgstr ""'
30836 " 1つのリビジョンだけが指定された場合、\n"
35445 " 1つのリビジョンだけが指定された場合、\n"
30837 " そのリビジョン自身が『共通の祖先』とみなされます。"
35446 " そのリビジョン自身が『共通の祖先』とみなされます。"
30838
35447
30839 msgid ""
35448 #, fuzzy
30840 "``ancestors(set)``\n"
35449 msgid ""
30841 " Changesets that are ancestors of a changeset in set."
35450 "``ancestors(set[, depth])``\n"
35451 " Changesets that are ancestors of changesets in set, including the\n"
35452 " given changesets themselves."
30842 msgstr ""
35453 msgstr ""
30843 "``ancestors(set)``\n"
35454 "``ancestors(set)``\n"
30844 " set 中のリビジョンに対する祖先リビジョン群。"
35455 " set 中のリビジョンに対する祖先リビジョン群。"
30845
35456
35457 msgid ""
35458 " If depth is specified, the result only includes changesets up to\n"
35459 " the specified generation."
35460 msgstr ""
35461
35462 #. i18n: "ancestors" is a keyword
35463 #, fuzzy
35464 msgid "ancestors takes at least 1 argument"
35465 msgstr "extra には最低1つの引数が必要です"
35466
35467 #. i18n: "ancestors" is a keyword
35468 #, fuzzy
35469 msgid "ancestors expects an integer depth"
35470 msgstr "word にはインデックス値を数値で指定してください"
35471
35472 #, fuzzy
35473 msgid "negative depth"
35474 msgstr "負値のオフセットは指定できません"
35475
35476 #, fuzzy
35477 msgid "revision in set has more than one child"
35478 msgstr "リビジョン %d は1つ以上のブランチの分岐点です"
35479
30846 msgid "~ expects a number"
35480 msgid "~ expects a number"
30847 msgstr "~ には数値を指定してください"
35481 msgstr "~ には数値を指定してください"
30848
35482
@@ -30931,21 +35565,26 b' msgstr ""'
30931 msgid "branch '%s' does not exist"
35565 msgid "branch '%s' does not exist"
30932 msgstr "ブランチ '%s' は存在しません"
35566 msgstr "ブランチ '%s' は存在しません"
30933
35567
30934 msgid ""
35568 #, fuzzy
30935 "``bumped()``\n"
35569 msgid ""
35570 "``phasedivergent()``\n"
30936 " Mutable changesets marked as successors of public changesets."
35571 " Mutable changesets marked as successors of public changesets."
30937 msgstr ""
35572 msgstr ""
30938 "``bumped()``\n"
35573 "``bumped()``\n"
30939 " public フェーズなリビジョンの後継で、 且つ改変可能なリビジョン。"
35574 " public フェーズなリビジョンの後継で、 且つ改変可能なリビジョン。"
30940
35575
30941 msgid " Only non-public and non-obsolete changesets can be `bumped`."
35576 #, fuzzy
35577 msgid ""
35578 " Only non-public and non-obsolete changesets can be `phasedivergent`.\n"
35579 " (EXPERIMENTAL)"
30942 msgstr ""
35580 msgstr ""
30943 " 非 public で、且つ廃止設定されていないリビジョンのみが `bumped`\n"
35581 " 非 public で、且つ廃止設定されていないリビジョンのみが `bumped`\n"
30944 " とみなされます。"
35582 " とみなされます。"
30945
35583
30946 #. i18n: "bumped" is a keyword
35584 #. i18n: "phasedivergent" is a keyword
30947 msgid "bumped takes no arguments"
35585 #, fuzzy
30948 msgstr "bumped には引数が指定できません"
35586 msgid "phasedivergent takes no arguments"
35587 msgstr "divergent には引数が指定できません"
30949
35588
30950 msgid ""
35589 msgid ""
30951 "``bundle()``\n"
35590 "``bundle()``\n"
@@ -31039,13 +35678,25 b' msgstr ""'
31039 msgid "desc requires a string"
35678 msgid "desc requires a string"
31040 msgstr "desc には文字列を指定してください"
35679 msgstr "desc には文字列を指定してください"
31041
35680
31042 msgid ""
35681 #, fuzzy
31043 "``descendants(set)``\n"
35682 msgid ""
31044 " Changesets which are descendants of changesets in set."
35683 "``descendants(set[, depth])``\n"
35684 " Changesets which are descendants of changesets in set, including the\n"
35685 " given changesets themselves."
31045 msgstr ""
35686 msgstr ""
31046 "``descendants(set)``\n"
35687 "``descendants(set)``\n"
31047 " 指定リビジョン群の子孫リビジョン群。"
35688 " 指定リビジョン群の子孫リビジョン群。"
31048
35689
35690 #. i18n: "descendants" is a keyword
35691 #, fuzzy
35692 msgid "descendants takes at least 1 argument"
35693 msgstr "extra には最低1つの引数が必要です"
35694
35695 #. i18n: "descendants" is a keyword
35696 #, fuzzy
35697 msgid "descendants expects an integer depth"
35698 msgstr "pad() の width 引数には数値を指定してください"
35699
31049 msgid ""
35700 msgid ""
31050 "``destination([set])``\n"
35701 "``destination([set])``\n"
31051 " Changesets that were created by a graft, transplant or rebase "
35702 " Changesets that were created by a graft, transplant or rebase "
@@ -31059,18 +35710,33 b' msgstr ""'
31059 " 生成されたリビジョン群。 set 指定が省略された場合、 ``all()``\n"
35710 " 生成されたリビジョン群。 set 指定が省略された場合、 ``all()``\n"
31060 " 指定相当とみなします。"
35711 " 指定相当とみなします。"
31061
35712
31062 msgid ""
35713 #, fuzzy
31063 "``divergent()``\n"
35714 msgid ""
31064 " Final successors of changesets with an alternative set of final "
35715 "``contentdivergent()``\n"
31065 "successors."
35716 " Final successors of changesets with an alternative set of final\n"
35717 " successors. (EXPERIMENTAL)"
31066 msgstr ""
35718 msgstr ""
31067 "``divergent()``\n"
35719 "``divergent()``\n"
31068 " 他の最終後継リビジョンが存在する、 最終後継リビジョン群。"
35720 " 他の最終後継リビジョンが存在する、 最終後継リビジョン群。"
31069
35721
31070 #. i18n: "divergent" is a keyword
35722 #. i18n: "contentdivergent" is a keyword
31071 msgid "divergent takes no arguments"
35723 #, fuzzy
35724 msgid "contentdivergent takes no arguments"
31072 msgstr "divergent には引数が指定できません"
35725 msgstr "divergent には引数が指定できません"
31073
35726
35727 #, fuzzy
35728 msgid ""
35729 "``extdata(source)``\n"
35730 " Changesets in the specified extdata source. (EXPERIMENTAL)"
35731 msgstr ""
35732 "``bisect(string)``\n"
35733 " 探索状態に合致するリビジョン群:"
35734
35735 #. i18n: "extdata" is a keyword
35736 #, fuzzy
35737 msgid "extdata takes at least 1 string argument"
35738 msgstr "extra には最低1つの引数が必要です"
35739
31074 msgid ""
35740 msgid ""
31075 "``extinct()``\n"
35741 "``extinct()``\n"
31076 " Obsolete changesets with obsolete descendants only."
35742 " Obsolete changesets with obsolete descendants only."
@@ -31151,22 +35817,15 b' msgstr ""'
31151 " limit() 記述の別名。"
35817 " limit() 記述の別名。"
31152
35818
31153 #, python-format
35819 #, python-format
31154 msgid "%s takes no arguments or a pattern and an optional revset"
31155 msgstr "%s にはパターンと revset しか指定できません"
31156
31157 #, python-format
31158 msgid "%s expected a pattern"
35820 msgid "%s expected a pattern"
31159 msgstr "%s にはパターン文字列を指定してください"
35821 msgstr "%s にはパターン文字列を指定してください"
31160
35822
31161 #, python-format
35823 #, fuzzy
31162 msgid "%s expected one starting revision"
35824 msgid ""
31163 msgstr "%s には開始リビジョンを指定してください"
35825 "``follow([file[, startrev]])``\n"
31164
31165 msgid ""
31166 "``follow([pattern[, startrev]])``\n"
31167 " An alias for ``::.`` (ancestors of the working directory's first "
35826 " An alias for ``::.`` (ancestors of the working directory's first "
31168 "parent).\n"
35827 "parent).\n"
31169 " If pattern is specified, the histories of files matching given\n"
35828 " If file pattern is specified, the histories of files matching given\n"
31170 " pattern in the revision given by startrev are followed, including copies."
35829 " pattern in the revision given by startrev are followed, including copies."
31171 msgstr ""
35830 msgstr ""
31172 "``follow([pattern[, startrev]])``\n"
35831 "``follow([pattern[, startrev]])``\n"
@@ -31207,22 +35866,27 b' msgstr ""'
31207 msgid "followlines requires a line range"
35866 msgid "followlines requires a line range"
31208 msgstr "followlines には行範囲を指定してください"
35867 msgstr "followlines には行範囲を指定してください"
31209
35868
35869 #. i18n: "followlines" is a keyword
31210 msgid "followlines expects exactly one revision"
35870 msgid "followlines expects exactly one revision"
31211 msgstr "followlines に指定可能なリビジョンは1つのみです"
35871 msgstr "followlines に指定可能なリビジョンは1つのみです"
31212
35872
31213 msgid "followlines requires a pattern"
35873 msgid "followlines requires a pattern"
31214 msgstr "followlines にはパターンを指定してください"
35874 msgstr "followlines にはパターンを指定してください"
31215
35875
35876 #. i18n: "followlines" is a keyword
31216 msgid "followlines expects exactly one file"
35877 msgid "followlines expects exactly one file"
31217 msgstr "followlines に指定可能なファイルは1つのみです"
35878 msgstr "followlines に指定可能なファイルは1つのみです"
31218
35879
35880 #. i18n: "followlines" is a keyword
31219 msgid "followlines expects a line range"
35881 msgid "followlines expects a line range"
31220 msgstr "followlines には行範囲を指定してください"
35882 msgstr "followlines には行範囲を指定してください"
31221
35883
31222 msgid "line range bounds must be integers"
35884 msgid "line range bounds must be integers"
31223 msgstr "行範囲指定には整数値を使用してください"
35885 msgstr "行範囲指定には整数値を使用してください"
31224
35886
31225 msgid "'descend' argument must be a boolean"
35887 #. i18n: "descend" is a keyword
35888 #, fuzzy
35889 msgid "descend argument must be a boolean"
31226 msgstr "descend 引数には真偽値を指定してください"
35890 msgstr "descend 引数には真偽値を指定してください"
31227
35891
31228 msgid ""
35892 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"'
31339 msgid "limit expects a number"
36003 msgid "limit expects a number"
31340 msgstr "limit には数値を指定してください"
36004 msgstr "limit には数値を指定してください"
31341
36005
36006 #, fuzzy
36007 msgid "negative number to select"
36008 msgstr "負値のオフセットは指定できません"
36009
31342 msgid "negative offset"
36010 msgid "negative offset"
31343 msgstr "負値のオフセットは指定できません"
36011 msgstr "負値のオフセットは指定できません"
31344
36012
@@ -31557,6 +36225,12 b' msgstr ""'
31557 msgid "secret takes no arguments"
36225 msgid "secret takes no arguments"
31558 msgstr "secret には引数が指定できません"
36226 msgstr "secret には引数が指定できません"
31559
36227
36228 msgid ""
36229 "``stack([revs])``\n"
36230 " Experimental revset for the stack of changesets or working directory\n"
36231 " parent. (EXPERIMENTAL)"
36232 msgstr ""
36233
31560 msgid "^ expects a number 0, 1, or 2"
36234 msgid "^ expects a number 0, 1, or 2"
31561 msgstr "^ には 0、 1 または 2 を指定してください"
36235 msgstr "^ には 0、 1 または 2 を指定してください"
31562
36236
@@ -31794,6 +36468,11 b' msgid "subrepo requires a pattern"'
31794 msgstr "subrepo にはパターン指定が必要です"
36468 msgstr "subrepo にはパターン指定が必要です"
31795
36469
31796 msgid ""
36470 msgid ""
36471 "``successors(set)``\n"
36472 " All successors for set, including the given set themselves"
36473 msgstr ""
36474
36475 msgid ""
31797 "``tag([name])``\n"
36476 "``tag([name])``\n"
31798 " The specified tag by name, or all tagged revisions if no name is given."
36477 " The specified tag by name, or all tagged revisions if no name is given."
31799 msgstr ""
36478 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"'
31815 msgid "the argument to tag must be a string"
36494 msgid "the argument to tag must be a string"
31816 msgstr "tag には文字列を指定してください"
36495 msgstr "tag には文字列を指定してください"
31817
36496
31818 msgid ""
36497 #, fuzzy
31819 "``unstable()``\n"
36498 msgid ""
31820 " Non-obsolete changesets with obsolete ancestors."
36499 "``orphan()``\n"
36500 " Non-obsolete changesets with obsolete ancestors. (EXPERIMENTAL)"
31821 msgstr ""
36501 msgstr ""
31822 "``unstable()``\n"
36502 "``unstable()``\n"
31823 " 祖先に廃止リビジョンを持つ、非廃止リビジョン群 (※ 訳注: 日本語訳では\n"
36503 " 祖先に廃止リビジョンを持つ、非廃止リビジョン群 (※ 訳注: 日本語訳では\n"
31824 " unstable を『非永続』と訳しています)"
36504 " unstable を『非永続』と訳しています)"
31825
36505
31826 #. i18n: "unstable" is a keyword
36506 #. i18n: "orphan" is a keyword
31827 msgid "unstable takes no arguments"
36507 #, fuzzy
31828 msgstr "unstable には引数が指定できません"
36508 msgid "orphan takes no arguments"
36509 msgstr "head には引数が指定できません"
31829
36510
31830 msgid ""
36511 msgid ""
31831 "``user(string)``\n"
36512 "``user(string)``\n"
@@ -31834,8 +36515,9 b' msgstr ""'
31834 "``user(string)``\n"
36515 "``user(string)``\n"
31835 " 文字列をユーザ名に持つリビジョン群。 合致判定は文字大小を無視。"
36516 " 文字列をユーザ名に持つリビジョン群。 合致判定は文字大小を無視。"
31836
36517
31837 msgid ""
36518 #, fuzzy
31838 "``wdir``\n"
36519 msgid ""
36520 "``wdir()``\n"
31839 " Working directory. (EXPERIMENTAL)"
36521 " Working directory. (EXPERIMENTAL)"
31840 msgstr ""
36522 msgstr ""
31841 "``wdir``\n"
36523 "``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"'
31852 msgid "syntax error in revset '%s'"
36534 msgid "syntax error in revset '%s'"
31853 msgstr "revsets 表記 '%s' での文法エラー"
36535 msgstr "revsets 表記 '%s' での文法エラー"
31854
36536
31855 msgid "not a symbol"
36537 #, fuzzy
31856 msgstr "シンボル以外が指定されました"
36538 msgid "can't use '::' in this context"
36539 msgstr "ここでは添え字値を使用できません"
31857
36540
31858 msgid "can't negate that"
36541 msgid "can't negate that"
31859 msgstr "負値にできません"
36542 msgstr "負値にできません"
@@ -31865,26 +36548,67 b' msgstr "revset \xe5\x88\xa5\xe5\x90\x8d\xe5\xae\x9a\xe7\xbe\xa9"'
31865 msgid "\"##\" can't concatenate \"%s\" element"
36548 msgid "\"##\" can't concatenate \"%s\" element"
31866 msgstr "\"##\" 演算子は \"%s\" 要素を結合できません"
36549 msgstr "\"##\" 演算子は \"%s\" 要素を結合できません"
31867
36550
36551 msgid "here"
36552 msgstr ""
36553
31868 #, python-format
36554 #, python-format
31869 msgid "unexpected revspec format character %s"
36555 msgid "unexpected revspec format character %s"
31870 msgstr "想定外の revspec フォーマット文字 %s"
36556 msgstr "想定外の revspec フォーマット文字 %s"
31871
36557
36558 #, fuzzy
36559 msgid "incomplete revspec format character"
36560 msgstr "想定外の revspec フォーマット文字 %s"
36561
36562 #, fuzzy
36563 msgid "missing argument for revspec"
36564 msgstr "引数がありません"
36565
36566 #, fuzzy
36567 msgid "invalid argument for revspec"
36568 msgstr "引数が不正です"
36569
36570 #, fuzzy
36571 msgid "too many revspec arguments specified"
36572 msgstr "オプション指定が過剰です"
36573
36574 #, python-format
36575 msgid "cannot %s null changeset"
36576 msgstr "null リビジョンに対する %s 操作はできません"
36577
36578 msgid "no changeset checked out"
36579 msgstr "作業領域が未更新です"
36580
36581 #, python-format
36582 msgid "cannot %s while merging"
36583 msgstr "マージ実施中は %s 操作はできません"
36584
36585 #, python-format
36586 msgid "cannot %s public changesets"
36587 msgstr "public フェーズのリビジョンに対する %s 操作はできません"
36588
36589 #, python-format
36590 msgid "cannot %s changeset with children"
36591 msgstr "子孫を持つリビジョンに対する %s 操作はできません"
36592
31872 #, python-format
36593 #, python-format
31873 msgid "no changes found (ignored %d secret changesets)\n"
36594 msgid "no changes found (ignored %d secret changesets)\n"
31874 msgstr "差分はありません (secret フェーズの %d 個のリビジョンは無視)\n"
36595 msgstr "差分はありません (secret フェーズの %d 個のリビジョンは無視)\n"
31875
36596
31876 #, python-format
36597 #, python-format
31877 msgid "timed out waiting for lock held by %s"
36598 msgid "timed out waiting for lock held by %r"
31878 msgstr "%s のロック解放待ちを断念"
36599 msgstr "%s のロック解放待ちを断念"
31879
36600
31880 #, python-format
36601 #, python-format
31881 msgid "lock held by %s"
36602 msgid "lock held by %r"
31882 msgstr "%s によるロック保持"
36603 msgstr "%s によるロック保持"
31883
36604
31884 #, python-format
36605 #, python-format
31885 msgid "abort: %s: %s\n"
36606 msgid "abort: %s: %s\n"
31886 msgstr "中止: %s: %s\n"
36607 msgstr "中止: %s: %s\n"
31887
36608
36609 msgid "(lock might be very busy)\n"
36610 msgstr "(ロック要求殺到中と思われます)\n"
36611
31888 #, python-format
36612 #, python-format
31889 msgid "abort: could not lock %s: %s\n"
36613 msgid "abort: could not lock %s: %s\n"
31890 msgstr "中止: %s のロックに失敗: %s\n"
36614 msgstr "中止: %s のロックに失敗: %s\n"
@@ -31910,8 +36634,8 b' msgstr " \xe7\xa9\xba\xe6\x96\x87\xe5\xad\x97\xe5\x88\x97\\n"'
31910 msgid "abort: file censored %s!\n"
36634 msgid "abort: file censored %s!\n"
31911 msgstr "中止: 検閲対象ファイルです: %s\n"
36635 msgstr "中止: 検閲対象ファイルです: %s\n"
31912
36636
31913 msgid "killed!\n"
36637 msgid "abort: working directory revision cannot be specified\n"
31914 msgstr "強制終了されました!\n"
36638 msgstr "中止: 作業領域 (wdir) は指定できません\n"
31915
36639
31916 msgid "(did you forget to compile extensions?)\n"
36640 msgid "(did you forget to compile extensions?)\n"
31917 msgstr "(エクステンションのコンパイルを忘れていませんか?)\n"
36641 msgstr "(エクステンションのコンパイルを忘れていませんか?)\n"
@@ -31938,6 +36662,10 b' msgid "cannot use an integer as a name"'
31938 msgstr "数値だけの名前は使用できません"
36662 msgstr "数値だけの名前は使用できません"
31939
36663
31940 #, python-format
36664 #, python-format
36665 msgid "leading or trailing whitespace in name %r"
36666 msgstr "名称 %r の冒頭/末尾に空白文字があります"
36667
36668 #, python-format
31941 msgid "ui.portablefilenames value is invalid ('%s')"
36669 msgid "ui.portablefilenames value is invalid ('%s')"
31942 msgstr "ui.portablefilenames 値が不正です ('%s')"
36670 msgstr "ui.portablefilenames 値が不正です ('%s')"
31943
36671
@@ -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\')"'
31945 msgid "possible case-folding collision for %s"
36673 msgid "possible case-folding collision for %s"
31946 msgstr "ファイル名の文字大小の問題で %s が衝突します"
36674 msgstr "ファイル名の文字大小の問題で %s が衝突します"
31947
36675
36676 #, python-format
36677 msgid "hidden revision '%s'"
36678 msgstr "'%s' は不可視リビジョンです"
36679
36680 msgid "use --hidden to access hidden revisions"
36681 msgstr "不可視リビジョンへのアクセス時には --hidden 指定が必要です"
36682
36683 #, python-format
36684 msgid "filtered revision '%s' (not in '%s' subset)"
36685 msgstr "'%s' はフィルタリング対象リビジョンです ('%s' には属しません)"
36686
31948 msgid "empty revision range"
36687 msgid "empty revision range"
31949 msgstr "該当するリビジョンがありません"
36688 msgstr "該当するリビジョンがありません"
31950
36689
@@ -31956,6 +36695,14 b' msgid "creating directory: %s\\n"'
31956 msgstr "ディレクトリの作成中: %s\n"
36695 msgstr "ディレクトリの作成中: %s\n"
31957
36696
31958 #, python-format
36697 #, python-format
36698 msgid "removing conflicting file: %s\n"
36699 msgstr "同名ファイルの削除中: %s\n"
36700
36701 #, python-format
36702 msgid "removing conflicting directory: %s\n"
36703 msgstr "同名ディレクトリの削除中: %s\n"
36704
36705 #, python-format
31959 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
36706 msgid "recording removal of %s as rename to %s (%d%% similar)\n"
31960 msgstr "%s の削除を %s へのファイル名変更として記録中 (類似度 %d%%)\n"
36707 msgstr "%s の削除を %s へのファイル名変更として記録中 (類似度 %d%%)\n"
31961
36708
@@ -31974,13 +36721,56 b' msgid ""'
31974 "see https://mercurial-scm.org/wiki/MissingRequirement for more information"
36721 "see https://mercurial-scm.org/wiki/MissingRequirement for more information"
31975 msgstr "詳細は https://mercurial-scm.org/wiki/MissingRequirement 参照"
36722 msgstr "詳細は https://mercurial-scm.org/wiki/MissingRequirement 参照"
31976
36723
31977 msgid "child process failed to start"
36724 #, python-format
31978 msgstr "子プロセスの生成に失敗"
36725 msgid "unknown extdata source '%s'"
36726 msgstr "外部データソース '%s' は未知のものです"
36727
36728 #, python-format
36729 msgid "extdata command '%s' failed: %s"
36730 msgstr "外部データコマンド '%s' が失敗: %s"
36731
36732 msgid "empty simplekeyvalue file"
36733 msgstr "simplekeyvalue ファイルが空です"
36734
36735 #, python-format
36736 msgid "%r can't be used as a key"
36737 msgstr "%r はキーとして使用できません"
36738
36739 #, python-format
36740 msgid "obsoleted %i changesets\n"
36741 msgstr "%i 個のリビジョンを廃止\n"
36742
36743 #, python-format
36744 msgid "%i new %s changesets\n"
36745 msgstr "%i 個のリビジョンを新規 %s 化\n"
36746
36747 #, python-format
36748 msgid "new changesets %s\n"
36749 msgstr "新規リビジョン範囲 %s\n"
36750
36751 #, python-format
36752 msgid "%s and %d others"
36753 msgstr "%s 他 %d 個"
36754
36755 #, python-format
36756 msgid "rejecting multiple heads on branch \"%s\""
36757 msgstr "ブランチ \"%s\" の複数ヘッド化を拒否"
36758
36759 #, python-format
36760 msgid "%d heads: %s"
36761 msgstr "%d 個のヘッド: %s"
36762
36763 #, python-format
36764 msgid "warning: accessing hidden changesets for write operation: %s\n"
36765 msgstr "警告: 不可視リビジョンへの改変操作: %s\n"
31979
36766
31980 #, python-format
36767 #, python-format
31981 msgid "invalid value for --daemon-postexec: %s"
36768 msgid "invalid value for --daemon-postexec: %s"
31982 msgstr "--daemon-postexec への指定値が不正です: %s"
36769 msgstr "--daemon-postexec への指定値が不正です: %s"
31983
36770
36771 msgid "child process failed to start"
36772 msgstr "子プロセスの生成に失敗"
36773
31984 #, python-format
36774 #, python-format
31985 msgid "unknown mode %s"
36775 msgid "unknown mode %s"
31986 msgstr "未知のモード %s"
36776 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"'
32019 msgid "can only specify three labels."
36809 msgid "can only specify three labels."
32020 msgstr "ラベルは3つのみ指定可。"
36810 msgstr "ラベルは3つのみ指定可。"
32021
36811
32022 #, python-format
36812 msgid "sparse config cannot have includes after excludes"
32023 msgid "couldn't parse location %s"
36813 msgstr ""
32024 msgstr "URL %s の解析に失敗"
36814
32025
36815 #, python-format
32026 msgid "password in URL not supported"
36816 msgid "sparse config entry outside of section: %s"
32027 msgstr "パスワード付き URL は未サポートです"
36817 msgstr ""
32028
36818
32029 msgid "could not create remote repo"
36819 msgid "add an [include] or [exclude] line to declare the entry type"
32030 msgstr "指定リポジトリの作成に失敗"
36820 msgstr ""
36821
36822 #, python-format
36823 msgid "warning: sparse profile cannot use paths starting with /, ignoring %s\n"
36824 msgstr ""
36825
36826 #, fuzzy
36827 msgid "cannot parse sparse patterns from working directory"
36828 msgstr "作業領域の親リビジョンの内容は検閲できません"
36829
36830 msgid "dropping temporarily included sparse files"
36831 msgstr ""
36832
36833 #, python-format
36834 msgid "cleaned up %d temporarily added file(s) from the sparse checkout\n"
36835 msgstr ""
36836
36837 #, python-format
36838 msgid "temporarily included %d file(s) in the sparse checkout for merging\n"
36839 msgstr ""
36840
36841 #, fuzzy, python-format
36842 msgid "pending changes to '%s'\n"
36843 msgstr "リビジョン %s を改変中\n"
36844
36845 #, fuzzy
36846 msgid "could not update sparseness due to pending changes"
36847 msgstr "変更をコミットするか、変更を破棄 (update --clean) してください"
36848
36849 msgid ""
36850 "cannot change sparseness due to pending changes (delete the files or use --"
36851 "force to bring them back dirty)"
36852 msgstr ""
36853
36854 #, fuzzy
36855 msgid "paths cannot be absolute"
36856 msgstr "%s の削除に失敗"
36857
36858 #, fuzzy, python-format
36859 msgid "Profiles changed: %d\n"
36860 msgstr "ファイル変更なし"
36861
36862 #, fuzzy, python-format
36863 msgid "Include rules changed: %d\n"
36864 msgstr "履歴反映対象に非永続 (unstable) リビジョンが含まれます!: %s"
36865
36866 #, fuzzy, python-format
36867 msgid "Exclude rules changed: %d\n"
36868 msgstr "履歴反映対象に非永続 (unstable) リビジョンが含まれます!: %s"
36869
36870 #, python-format
36871 msgid "Files added: %d\n"
36872 msgstr ""
36873
36874 #, python-format
36875 msgid "Files dropped: %d\n"
36876 msgstr ""
36877
36878 #, python-format
36879 msgid "Files conflicting: %d\n"
36880 msgstr ""
32031
36881
32032 msgid "no suitable response from remote hg"
36882 msgid "no suitable response from remote hg"
32033 msgstr "連携先リポジトリからの応答が不適切"
36883 msgstr "連携先リポジトリからの応答が不適切"
@@ -32040,12 +36890,21 b' msgid "check previous remote output"'
32040 msgstr "連携先からの直前の出力を確認してください"
36890 msgstr "連携先からの直前の出力を確認してください"
32041
36891
32042 #, python-format
36892 #, python-format
32043 msgid "push refused: %s"
36893 msgid "unknown version of SSH protocol: %s"
32044 msgstr "履歴反映が拒否されました: %s"
36894 msgstr "未知の SSH プロトコルバージョン: %s"
32045
36895
32046 #, python-format
36896 #, python-format
32047 msgid "unexpected parameter %r"
36897 msgid "couldn't parse location %s"
32048 msgstr "想定外のパラメータ: %s"
36898 msgstr "URL %s の解析に失敗"
36899
36900 msgid "password in URL not supported"
36901 msgstr "パスワード付き URL は未サポートです"
36902
36903 msgid "could not create remote repo"
36904 msgstr "指定リポジトリの作成に失敗"
36905
36906 msgid "capability exchange failed"
36907 msgstr "連携機能確認に失敗しました"
32049
36908
32050 msgid "capath not supported"
36909 msgid "capath not supported"
32051 msgstr "capath は未サポートです"
36910 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"'
32053 msgid "cadata not supported"
36912 msgid "cadata not supported"
32054 msgstr "cadata は未サポートです"
36913 msgstr "cadata は未サポートです"
32055
36914
32056 msgid ""
32057 "setting ciphers in [hostsecurity] is not supported by this version of Python"
32058 msgstr ""
32059 "このバージョンの Python では [hostsecurity] での暗号形式設定は未サポートです"
32060
32061 msgid ""
32062 "remove the config option or run Mercurial with a modern Python version "
32063 "(preferred)"
32064 msgstr ""
32065 "設定を破棄するか、新しい Python で Mercurial を実行してください(後者を推奨)"
32066
32067 #, python-format
36915 #, python-format
32068 msgid "unsupported protocol from hostsecurity.%s: %s"
36916 msgid "unsupported protocol from hostsecurity.%s: %s"
32069 msgstr "hostsecurity.%s での未サポートプロトコルの指定: %s"
36917 msgstr "hostsecurity.%s での未サポートプロトコルの指定: %s"
@@ -32119,6 +36967,13 b' msgid "serverhostname argument is requir'
32119 msgstr "内部エラー: serverhostname 引数が未指定です"
36967 msgstr "内部エラー: serverhostname 引数が未指定です"
32120
36968
32121 #, python-format
36969 #, python-format
36970 msgid "certificate file (%s) does not exist; cannot connect to %s"
36971 msgstr "証明書ファイル (%s) が存在しません。%s に接続できません。"
36972
36973 msgid "restore missing file or fix references in Mercurial config"
36974 msgstr ""
36975
36976 #, python-format
32122 msgid "could not set ciphers: %s"
36977 msgid "could not set ciphers: %s"
32123 msgstr "暗号形式の指定に失敗: %s"
36978 msgstr "暗号形式の指定に失敗: %s"
32124
36979
@@ -32190,9 +37045,18 b' msgstr ""'
32190 msgid "(see https://mercurial-scm.org/wiki/SecureConnections for more info)\n"
37045 msgid "(see https://mercurial-scm.org/wiki/SecureConnections for more info)\n"
32191 msgstr "(詳細は https://mercurial-scm.org/wiki/SecureConnections 参照)\n"
37046 msgstr "(詳細は https://mercurial-scm.org/wiki/SecureConnections 参照)\n"
32192
37047
37048 msgid ""
37049 "(the full certificate chain may not be available locally; see \"hg help "
37050 "debugssl\")\n"
37051 msgstr ""
37052
32193 msgid "ssl connection failed"
37053 msgid "ssl connection failed"
32194 msgstr "ssl 接続に失敗"
37054 msgstr "ssl 接続に失敗"
32195
37055
37056 #, python-format
37057 msgid "referenced certificate file (%s) does not exist"
37058 msgstr "指定された証明書ファイル (%s) が存在しません"
37059
32196 msgid "TLS 1.1 not supported by this Python"
37060 msgid "TLS 1.1 not supported by this Python"
32197 msgstr "利用中の Python では TLS 1.1 が未サポートです"
37061 msgstr "利用中の Python では TLS 1.1 が未サポートです"
32198
37062
@@ -32263,14 +37127,14 b' msgstr ""'
32263 #, python-format
37127 #, python-format
32264 msgid ""
37128 msgid ""
32265 "(SHA-1 fingerprint for %s found in legacy [hostfingerprints] section; if you "
37129 "(SHA-1 fingerprint for %s found in legacy [hostfingerprints] section; if you "
32266 "trust this fingerprint, set the following config value in [hostsecurity] and "
37130 "trust this fingerprint, remove the old SHA-1 fingerprint from "
32267 "remove the old one from [hostfingerprints] to upgrade to a more secure "
37131 "[hostfingerprints] and add the following entry to the new [hostsecurity] "
32268 "SHA-256 fingerprint: %s.fingerprints=%s)\n"
37132 "section: %s:fingerprints=%s)\n"
32269 msgstr ""
37133 msgstr ""
32270 "(旧来の [hostfingerprints] セクションに %s 向けの SHA-1 フィンガープリントが"
37134 "(旧来の [hostfingerprints] セクションに %s 向けの SHA-1 フィンガープリントが"
32271 "記述されています。この値が信用できる場合は、後述する設定を [hostsecurity]セク"
37135 "記述されています。この値が信用できる場合は、SHA-1 フィンガープリントを旧来の"
32272 "ションに記述した上で、[hostfingerprints] のエントリを削除することで、より強固"
37136 "[hostfingerprints] エントリから削除し、後述する設定を [hostsecurity]セクショ"
32273 "な SHA-256 フィンガープリントに移行してください: %s.fingerprints=%s)\n"
37137 "ンに記述してください: %s.fingerprints=%s)\n"
32274
37138
32275 #, python-format
37139 #, python-format
32276 msgid "certificate for %s has unexpected fingerprint %s"
37140 msgid "certificate for %s has unexpected fingerprint %s"
@@ -32313,6 +37177,9 b' msgstr ""'
32313 msgid "'%s' does not appear to be an hg repository"
37177 msgid "'%s' does not appear to be an hg repository"
32314 msgstr "'%s' は Mercurial リポジトリ形式とは思われません"
37178 msgstr "'%s' は Mercurial リポジトリ形式とは思われません"
32315
37179
37180 msgid "lock not available"
37181 msgstr "ロックできません"
37182
32316 msgid "cannot lock static-http repository"
37183 msgid "cannot lock static-http repository"
32317 msgstr "static-http リポジトリはロックできません"
37184 msgstr "static-http リポジトリはロックできません"
32318
37185
@@ -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"'
32323 msgid "invalid entry in fncache, line %d"
37190 msgid "invalid entry in fncache, line %d"
32324 msgstr "ファイル名キャッシュに不正なエントリ: %d 行目"
37191 msgstr "ファイル名キャッシュに不正なエントリ: %d 行目"
32325
37192
37193 msgid "warning: stream clone requested but server has them disabled\n"
37194 msgstr ""
37195
37196 #, python-format
37197 msgid ""
37198 "warning: stream clone requested but client is missing requirements: %s\n"
37199 msgstr ""
37200
37201 msgid ""
37202 "(see https://www.mercurial-scm.org/wiki/MissingRequirement for more "
37203 "information)\n"
37204 msgstr "(詳細は https://www.mercurial-scm.org/wiki/MissingRequirement 参照)\n"
37205
32326 msgid "unexpected response from remote server:"
37206 msgid "unexpected response from remote server:"
32327 msgstr "想定外の連携先サーバ応答:"
37207 msgstr "想定外の連携先サーバ応答:"
32328
37208
@@ -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"'
32372 msgid "unable to apply stream clone: unsupported format: %s"
37252 msgid "unable to apply stream clone: unsupported format: %s"
32373 msgstr "stream clone が適用できません: 未サポートな形式 %s"
37253 msgstr "stream clone が適用できません: 未サポートな形式 %s"
32374
37254
32375 #, python-format
37255 #, fuzzy, python-format
32376 msgid "(in subrepo %s)"
37256 msgid "(in subrepository \"%s\")"
32377 msgstr "(サブリポジトリ %s で発生)"
37257 msgstr "(サブリポジトリ %s で発生)"
32378
37258
32379 #, python-format
37259 #, python-format
32380 msgid "warning: subrepo spec file '%s' not found\n"
32381 msgstr "警告: サブリポジトリの spec ファイル '%s' が見つかりません\n"
32382
32383 #, python-format
32384 msgid "subrepo spec file '%s' not found"
32385 msgstr "サブリポジトリの spec ファイル '%s' が見つかりません"
32386
32387 #, python-format
32388 msgid "invalid subrepository revision specifier in '%s' line %d"
32389 msgstr "'%s' の %d 行目におけるサブリポジトリのリビジョン指定が不正です"
32390
32391 #, python-format
32392 msgid "bad subrepository pattern in %s: %s"
32393 msgstr "%s におけるサブリポジトリ指定の不正: %s"
32394
32395 msgid "missing ] in subrepo source"
32396 msgstr "サブリポジトリ元指定に ] がありません"
32397
32398 #, python-format
32399 msgid ""
32400 " subrepository sources for %(s)s differ\n"
32401 "use (l)ocal%(l)s source (%(lo)s) or (r)emote%(o)s source (%(ro)s)?$$ &Local $"
32402 "$ &Remote"
32403 msgstr ""
32404 " サブリポジトリ %(s)s の連携先が異なっています。\n"
32405 "現行側%(l)s 連携先 (%(lo)s):(l)ocal と、他方側%(o)s 連携先 (%(ro)s):(r)emote "
32406 "のどちらを採用しますか?$$ &Local $$ &Remote"
32407
32408 #, python-format
32409 msgid ""
32410 " subrepository %(s)s diverged (local revision: %(sl)s, remote revision: "
32411 "%(sr)s)\n"
32412 "(M)erge, keep (l)ocal%(l)s or keep (r)emote%(o)s?$$ &Merge $$ &Local $$ "
32413 "&Remote"
32414 msgstr ""
32415 " サブリポジトリ %(s)s の参照先が異なっています (現行側: %(sl)s, 他方側: "
32416 "%(sr)s)\n"
32417 "両者のマージ:(m)erge, 現行側%(l)s 参照先:(l)ocal, 他方側%(o)s 参照先:"
32418 "(r)emote のいずれを採用しますか?$$ &Merge $$ &Local $$ &Remote"
32419
32420 #, python-format
32421 msgid ""
32422 " local%(l)s changed subrepository %(s)s which remote%(o)s removed\n"
32423 "use (c)hanged version or (d)elete?$$ &Changed $$ &Delete"
32424 msgstr ""
32425 " 現行側%(l)s でのサブリポジトリ %(s)s の変更が、他方側%(o)s での削除と衝突し"
32426 "ます\n"
32427 "変更:(c)hanged と、削除:(d)elete のどちらを採用しますか?$$ &Changed $$ "
32428 "&Delete"
32429
32430 #, python-format
32431 msgid ""
32432 " remote%(o)s changed subrepository %(s)s which local%(l)s removed\n"
32433 "use (c)hanged version or (d)elete?$$ &Changed $$ &Delete"
32434 msgstr ""
32435 " 他方側%(o)s でのサブリポジトリ %(s)s の変更が、現行側%(l)s での削除と衝突し"
32436 "ます\n"
32437 "変更:(c)hanged と、削除:(d)elete のどちらを採用しますか?$$ &Changed $$ "
32438 "&Delete"
32439
32440 #, python-format
32441 msgid ""
37260 msgid ""
32442 " subrepository sources for %s differ\n"
37261 " subrepository sources for %s differ\n"
32443 "use (l)ocal source (%s) or (r)emote source (%s)?$$ &Local $$ &Remote"
37262 "use (l)ocal source (%s) or (r)emote source (%s)?$$ &Local $$ &Remote"
@@ -32455,31 +37274,32 b' msgstr ""'
32455 "現行内容 (%s):(l)ocal と、他方側参照先 (%s):(r)emote のどちらを採用しますか?"
37274 "現行内容 (%s):(l)ocal と、他方側参照先 (%s):(r)emote のどちらを採用しますか?"
32456 "$$ &Local $$ &Remote"
37275 "$$ &Local $$ &Remote"
32457
37276
32458 msgid "default path for subrepository not found"
32459 msgstr "サブリポジトリの連携先が見つかりません"
32460
32461 #, python-format
37277 #, python-format
32462 msgid "warning: removing potentially hostile 'hgrc' in '%s'\n"
37278 msgid "warning: removing potentially hostile 'hgrc' in '%s'\n"
32463 msgstr "警告: 潜在的な問題となりえる '%s' 中の hgrc ファイルを破棄します\n"
37279 msgstr "警告: 潜在的な問題となりえる '%s' 中の hgrc ファイルを破棄します\n"
32464
37280
37281 #, fuzzy, python-format
37282 msgid "subrepo '%s' traverses symbolic link"
37283 msgstr "パス %r はシンボリックリンク '%r' が含まれています"
37284
37285 #, fuzzy
37286 msgid "subrepos not enabled"
37287 msgstr "%r にはリスト処理を適用できません"
37288
37289 #, fuzzy
37290 msgid "see 'hg help config.subrepos' for details"
37291 msgstr "詳細は 'hg help phases' 参照"
37292
37293 #, python-format
37294 msgid "%s subrepos not allowed"
37295 msgstr ""
37296
32465 #, python-format
37297 #, python-format
32466 msgid "unknown subrepo type %s"
37298 msgid "unknown subrepo type %s"
32467 msgstr "未知のサブリポジトリ種別 '%s'"
37299 msgstr "未知のサブリポジトリ種別 '%s'"
32468
37300
32469 #, python-format
37301 #, fuzzy, python-format
32470 msgid "invalid phases.checksubrepos configuration: %s"
37302 msgid "uncommitted changes in subrepository \"%s\""
32471 msgstr "phases.checksubrepos 設定が不正です: %s"
32472
32473 #, python-format
32474 msgid "can't commit in %s phase conflicting %s from subrepository %s"
32475 msgstr "%s フェーズでのコミットは、%s なサブリポジトリ %s と矛盾します"
32476
32477 #, python-format
32478 msgid "warning: changes are committed in %s phase from subrepository %s\n"
32479 msgstr "警告: %s フェーズでコミットします(サブリポジトリ %s に追従)\n"
32480
32481 #, python-format
32482 msgid "uncommitted changes in subrepository '%s'"
32483 msgstr "サブリポジトリ '%s' の変更が未コミットです"
37303 msgstr "サブリポジトリ '%s' の変更が未コミットです"
32484
37304
32485 msgid "addremove is not supported"
37305 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"'
32505 msgid "removing subrepo %s\n"
37325 msgid "removing subrepo %s\n"
32506 msgstr "サブリポジトリの %s を登録除外中\n"
37326 msgstr "サブリポジトリの %s を登録除外中\n"
32507
37327
37328 #, fuzzy, python-format
37329 msgid "sharing subrepo %s from %s\n"
37330 msgstr "サブリポジトリ %s に %s から複製中\n"
37331
32508 #, python-format
37332 #, python-format
32509 msgid "cloning subrepo %s from %s\n"
37333 msgid "cloning subrepo %s from %s\n"
32510 msgstr "サブリポジトリ %s に %s から複製中\n"
37334 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"'
32513 msgid "pulling subrepo %s from %s\n"
37337 msgid "pulling subrepo %s from %s\n"
32514 msgstr "サブリポジトリ %s に %s から取り込み中\n"
37338 msgstr "サブリポジトリ %s に %s から取り込み中\n"
32515
37339
32516 #, python-format
37340 #, fuzzy, python-format
32517 msgid "revision %s in subrepo %s is hidden\n"
37341 msgid "revision %s in subrepository \"%s\" is hidden\n"
32518 msgstr "リビジョン %s はサブリポジトリ %s 中の不可視リビジョンです\n"
37342 msgstr "リビジョン %s はサブリポジトリ %s 中の不可視リビジョンです\n"
32519
37343
32520 #, python-format
37344 #, 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"'
32529 msgid "reverting subrepo %s\n"
37353 msgid "reverting subrepo %s\n"
32530 msgstr "サブリポジトリ %s の変更取り消し中\n"
37354 msgstr "サブリポジトリ %s の変更取り消し中\n"
32531
37355
37356 #, fuzzy, python-format
37357 msgid "unsharing subrepo '%s'\n"
37358 msgstr "サブリポジトリ %s から %s へ反映中\n"
37359
32532 #, python-format
37360 #, python-format
32533 msgid "subrepo '%s' is hidden in revision %s\n"
37361 msgid "subrepo '%s' is hidden in revision %s\n"
32534 msgstr "サブリポジトリ '%s' の参照先はリビジョン %s 時点で不可視です\n"
37362 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"'
32585 msgid "git %s error %d in %s"
37413 msgid "git %s error %d in %s"
32586 msgstr "git %s 実行のエラー %d がサブリポジトリ %s で発生"
37414 msgstr "git %s 実行のエラー %d がサブリポジトリ %s で発生"
32587
37415
32588 #, python-format
37416 #, fuzzy, python-format
32589 msgid "revision %s does not exist in subrepo %s\n"
37417 msgid "revision %s does not exist in subrepository \"%s\"\n"
32590 msgstr "リビジョン %s はサブリポジトリ %s には存在しません\n"
37418 msgstr "リビジョン %s はサブリポジトリ %s には存在しません\n"
32591
37419
32592 #, python-format
37420 #, fuzzy, python-format
32593 msgid "checking out detached HEAD in subrepo %s\n"
37421 msgid "checking out detached HEAD in subrepository \"%s\"\n"
32594 msgstr "サブリポジトリ %s において、切り離された HEAD が取り出されました。\n"
37422 msgstr "サブリポジトリ %s において、切り離された HEAD が取り出されました。\n"
32595
37423
32596 msgid "check out a git branch if you intend to make changes\n"
37424 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"'
32600 msgid "subrepo %s is missing"
37428 msgid "subrepo %s is missing"
32601 msgstr "サブリポジトリ %s が見つかりません"
37429 msgstr "サブリポジトリ %s が見つかりません"
32602
37430
32603 #, python-format
37431 #, fuzzy, python-format
32604 msgid "unrelated git branch checked out in subrepo %s\n"
37432 msgid "unrelated git branch checked out in subrepository \"%s\"\n"
32605 msgstr "サブリポジトリ %s は、 無関係な git ブランチで更新されています\n"
37433 msgstr "サブリポジトリ %s は、 無関係な git ブランチで更新されています\n"
32606
37434
32607 #, python-format
37435 #, fuzzy, python-format
32608 msgid "pushing branch %s of subrepo %s\n"
37436 msgid "pushing branch %s of subrepository \"%s\"\n"
32609 msgstr "ブランチ %s をサブリポジトリ %s から反映中\n"
37437 msgstr "ブランチ %s をサブリポジトリ %s から反映中\n"
32610
37438
32611 #, python-format
37439 #, fuzzy, python-format
32612 msgid ""
37440 msgid ""
32613 "no branch checked out in subrepo %s\n"
37441 "no branch checked out in subrepository \"%s\"\n"
32614 "cannot push revision %s\n"
37442 "cannot push revision %s\n"
32615 msgstr ""
37443 msgstr ""
32616 "サブリポジトリ %s にブランチが取り出されていません。\n"
37444 "サブリポジトリ %s にブランチが取り出されていません。\n"
32617 "リビジョン %s を反映できません。\n"
37445 "リビジョン %s を反映できません。\n"
32618
37446
32619 #, python-format
37447 #, python-format
37448 msgid "warning: subrepo spec file '%s' not found\n"
37449 msgstr "警告: サブリポジトリの spec ファイル '%s' が見つかりません\n"
37450
37451 #, python-format
37452 msgid "subrepo spec file '%s' not found"
37453 msgstr "サブリポジトリの spec ファイル '%s' が見つかりません"
37454
37455 #, python-format
37456 msgid "invalid subrepository revision specifier in '%s' line %d"
37457 msgstr "'%s' の %d 行目におけるサブリポジトリのリビジョン指定が不正です"
37458
37459 #, python-format
37460 msgid "bad subrepository pattern in %s: %s"
37461 msgstr "%s におけるサブリポジトリ指定の不正: %s"
37462
37463 #, fuzzy
37464 msgid "missing ] in subrepository source"
37465 msgstr "サブリポジトリ元指定に ] がありません"
37466
37467 #, python-format
37468 msgid ""
37469 " subrepository sources for %(s)s differ\n"
37470 "use (l)ocal%(l)s source (%(lo)s) or (r)emote%(o)s source (%(ro)s)?$$ &Local $"
37471 "$ &Remote"
37472 msgstr ""
37473 " サブリポジトリ %(s)s の連携先が異なっています。\n"
37474 "現行側%(l)s 連携先 (%(lo)s):(l)ocal と、他方側%(o)s 連携先 (%(ro)s):(r)emote "
37475 "のどちらを採用しますか?$$ &Local $$ &Remote"
37476
37477 #, python-format
37478 msgid ""
37479 " subrepository %(s)s diverged (local revision: %(sl)s, remote revision: "
37480 "%(sr)s)\n"
37481 "(M)erge, keep (l)ocal%(l)s or keep (r)emote%(o)s?$$ &Merge $$ &Local $$ "
37482 "&Remote"
37483 msgstr ""
37484 " サブリポジトリ %(s)s の参照先が異なっています (現行側: %(sl)s, 他方側: "
37485 "%(sr)s)\n"
37486 "両者のマージ:(m)erge, 現行側%(l)s 参照先:(l)ocal, 他方側%(o)s 参照先:"
37487 "(r)emote のいずれを採用しますか?$$ &Merge $$ &Local $$ &Remote"
37488
37489 #, python-format
37490 msgid ""
37491 " local%(l)s changed subrepository %(s)s which remote%(o)s removed\n"
37492 "use (c)hanged version or (d)elete?$$ &Changed $$ &Delete"
37493 msgstr ""
37494 " 現行側%(l)s でのサブリポジトリ %(s)s の変更が、他方側%(o)s での削除と衝突し"
37495 "ます\n"
37496 "変更:(c)hanged と、削除:(d)elete のどちらを採用しますか?$$ &Changed $$ "
37497 "&Delete"
37498
37499 #, python-format
37500 msgid ""
37501 " remote%(o)s changed subrepository %(s)s which local%(l)s removed\n"
37502 "use (c)hanged version or (d)elete?$$ &Changed $$ &Delete"
37503 msgstr ""
37504 " 他方側%(o)s でのサブリポジトリ %(s)s の変更が、現行側%(l)s での削除と衝突し"
37505 "ます\n"
37506 "変更:(c)hanged と、削除:(d)elete のどちらを採用しますか?$$ &Changed $$ "
37507 "&Delete"
37508
37509 #, python-format
37510 msgid "commit with new subrepo %s excluded"
37511 msgstr "コミット対象に、新規サブリポジトリ %s が含まれていません"
37512
37513 msgid "use --subrepos for recursive commit"
37514 msgstr "--subrepos 指定で再帰コミット"
37515
37516 msgid "can't commit subrepos without .hgsub"
37517 msgstr ".hgsub の無いサブリポジトリはコミットできません"
37518
37519 msgid "default path for subrepository not found"
37520 msgstr "サブリポジトリの連携先が見つかりません"
37521
37522 #, python-format
37523 msgid "invalid phases.checksubrepos configuration: %s"
37524 msgstr "phases.checksubrepos 設定が不正です: %s"
37525
37526 #, python-format
37527 msgid "can't commit in %s phase conflicting %s from subrepository %s"
37528 msgstr "%s フェーズでのコミットは、%s なサブリポジトリ %s と矛盾します"
37529
37530 #, python-format
37531 msgid "warning: changes are committed in %s phase from subrepository %s\n"
37532 msgstr "警告: %s フェーズでコミットします(サブリポジトリ %s に追従)\n"
37533
37534 #, python-format
32620 msgid ""
37535 msgid ""
32621 "automatic .hgtags merge failed\n"
37536 "automatic .hgtags merge failed\n"
32622 "the following %d tags are in conflict: %s\n"
37537 "the following %d tags are in conflict: %s\n"
@@ -32653,17 +37568,27 b' msgstr ""'
32653
37568
32654 msgid ""
37569 msgid ""
32655 ":basename: Any text. Treats the text as a path, and returns the last\n"
37570 ":basename: Any text. Treats the text as a path, and returns the last\n"
32656 " component of the path after splitting by the path separator\n"
37571 " component of the path after splitting by the path separator.\n"
32657 " (ignoring trailing separators). For example, \"foo/bar/baz\" becomes\n"
37572 " For example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes "
32658 " \"baz\" and \"foo/bar//\" becomes \"bar\"."
37573 "\"\"."
32659 msgstr ""
37574 msgstr ""
32660 ":basename: 文字列。 与えられた文字列をパスとみなし、 パス構成要素の、\n"
37575 ":basename: 文字列。 与えられた文字列をパスとみなし、 パス構成要素の、\n"
32661 " 末尾要素を取り出します (末尾パス区切りは無視されます)。\n"
37576 " 末尾要素を取り出します。\n"
32662 " 例) \"foo/bar/baz\" は \"baz\"、 \"foo/bar//\" は \"bar\""
37577 " 例: \"foo/bar/baz\" は \"baz\"、 \"foo/bar//\" は \"\""
32663
37578
32664 msgid ":count: List or text. Returns the length as an integer."
37579 msgid ":count: List or text. Returns the length as an integer."
32665 msgstr ":count: 列挙または文字列。 長さを整数値で返します。"
37580 msgstr ":count: 列挙または文字列。 長さを整数値で返します。"
32666
37581
37582 msgid "not countable"
37583 msgstr "カウント不能"
37584
37585 msgid ""
37586 ":dirname: Any text. Treats the text as a path, and strips the last\n"
37587 " component of the path after splitting by the path separator."
37588 msgstr ""
37589 ":dirname: 文字列。 与えられた文字列をパスとみなし、 パス構成要素の、\n"
37590 " 末尾要素を取り除いたものを返します。"
37591
32667 msgid ""
37592 msgid ""
32668 ":domain: Any text. Finds the first string that looks like an email\n"
37593 ":domain: Any text. Finds the first string that looks like an email\n"
32669 " address, and extracts just the domain component. Example: ``User\n"
37594 " address, and extracts just the domain component. Example: ``User\n"
@@ -32745,37 +37670,6 b' msgstr ""'
32745 " 名前部分だけを取り出します。"
37670 " 名前部分だけを取り出します。"
32746
37671
32747 msgid ""
37672 msgid ""
32748 " >>> person('foo@bar')\n"
32749 " 'foo'\n"
32750 " >>> person('Foo Bar <foo@bar>')\n"
32751 " 'Foo Bar'\n"
32752 " >>> person('\"Foo Bar\" <foo@bar>')\n"
32753 " 'Foo Bar'\n"
32754 " >>> person('\"Foo \"buz\" Bar\" <foo@bar>')\n"
32755 " 'Foo \"buz\" Bar'\n"
32756 " >>> # The following are invalid, but do exist in real-life\n"
32757 " ...\n"
32758 " >>> person('Foo \"buz\" Bar <foo@bar>')\n"
32759 " 'Foo \"buz\" Bar'\n"
32760 " >>> person('\"Foo Bar <foo@bar>')\n"
32761 " 'Foo Bar'"
32762 msgstr ""
32763 " >>> person('foo@bar')\n"
32764 " 'foo'\n"
32765 " >>> person('Foo Bar <foo@bar>')\n"
32766 " 'Foo Bar'\n"
32767 " >>> person('\"Foo Bar\" <foo@bar>')\n"
32768 " 'Foo Bar'\n"
32769 " >>> person('\"Foo \"buz\" Bar\" <foo@bar>')\n"
32770 " 'Foo \"buz\" Bar'\n"
32771 " >>> # The following are invalid, but do exist in real-life\n"
32772 " ...\n"
32773 " >>> person('Foo \"buz\" Bar <foo@bar>')\n"
32774 " 'Foo \"buz\" Bar'\n"
32775 " >>> person('\"Foo Bar <foo@bar>')\n"
32776 " 'Foo Bar'"
32777
32778 msgid ""
32779 ":revescape: Any text. Escapes all \"special\" characters, except @.\n"
37673 ":revescape: Any text. Escapes all \"special\" characters, except @.\n"
32780 " Forward slashes are escaped twice to prevent web servers from "
37674 " Forward slashes are escaped twice to prevent web servers from "
32781 "prematurely\n"
37675 "prematurely\n"
@@ -32807,19 +37701,22 b' msgid ""'
32807 msgstr ":short: リビジョンハッシュ 値。 12 桁程度の短縮形式にします。"
37701 msgstr ":short: リビジョンハッシュ 値。 12 桁程度の短縮形式にします。"
32808
37702
32809 msgid ""
37703 msgid ""
32810 ":shortbisect: Any text. Treats `text` as a bisection status, and\n"
37704 ":shortbisect: Any text. Treats `label` as a bisection status, and\n"
32811 " returns a single-character representing the status (G: good, B: bad,\n"
37705 " returns a single-character representing the status (G: good, B: bad,\n"
32812 " S: skipped, U: untested, I: ignored). Returns single space if `text`\n"
37706 " S: skipped, U: untested, I: ignored). Returns single space if `text`\n"
32813 " is not a valid bisection status."
37707 " is not a valid bisection status."
32814 msgstr ""
37708 msgstr ""
32815 ":shortbisect: 文字列。 `文字列` を二分探索 (bisect) 状態とみなし、\n"
37709 ":shortbisect: 指定文字列を二分探索 (bisect) 状態とみなし、\n"
32816 " 状態に見合った1文字 (G: good, B: bad, S: skipped, U: untested, I:\n"
37710 " 状態に見合った1文字 (G: good, B: bad, S: skipped, U: untested, I:\n"
32817 " ignored) を返します。 `文字列` が二分探索状態として不適切な場合、\n"
37711 " ignored) を返します。 指定文字列が二分探索状態として不適切な場合、\n"
32818 " 空白文字を返します。"
37712 " 空白文字を返します。"
32819
37713
32820 msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
37714 msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
32821 msgstr ":shortdate: 日時情報。 \"2006-09-18\" 形式で可読化します。"
37715 msgstr ":shortdate: 日時情報。 \"2006-09-18\" 形式で可読化します。"
32822
37716
37717 msgid ":slashpath: Any text. Replaces the native path separator with slash."
37718 msgstr ":slashpath: 文字列。 環境依存のパス区切り文字をスラッシュで置換。"
37719
32823 msgid ":splitlines: Any text. Split text into a list of lines."
37720 msgid ":splitlines: Any text. Split text into a list of lines."
32824 msgstr ":splitlines: 文字列。 文字列を行のリストに分割します。"
37721 msgstr ":splitlines: 文字列。 文字列を行のリストに分割します。"
32825
37722
@@ -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"'
32864 msgid ":utf8: Any text. Converts from the local character encoding to UTF-8."
37761 msgid ":utf8: Any text. Converts from the local character encoding to UTF-8."
32865 msgstr ":utf8: 文字列。実行環境の文字コードから UTF-8 に変換します"
37762 msgstr ":utf8: 文字列。実行環境の文字コードから UTF-8 に変換します"
32866
37763
32867 msgid ":author: String. The unmodified author of the changeset."
32868 msgstr ":author: 文字列。 リビジョンの作者名(記録情報そのまま)。"
32869
32870 msgid ":bisect: String. The changeset bisection status."
32871 msgstr ":bisect: 文字列。 当該リビジョンの二分探索状態。"
32872
32873 msgid ""
32874 ":branch: String. The name of the branch on which the changeset was\n"
32875 " committed."
32876 msgstr ":branch: 文字列。 リビジョンの属するブランチ名。"
32877
32878 msgid ""
32879 ":branches: List of strings. The name of the branch on which the\n"
32880 " changeset was committed. Will be empty if the branch name was\n"
32881 " default. (DEPRECATED)"
32882 msgstr ""
32883 ":branches: 文字列列挙。 リビジョンの属するブランチ名。\n"
32884 " ブランチ名が default の場合は空 (非推奨)"
32885
32886 msgid ""
32887 ":bookmarks: List of strings. Any bookmarks associated with the\n"
32888 " changeset. Also sets 'active', the name of the active bookmark."
32889 msgstr ""
32890 ":bookmarks: 文字列列挙。 当該リビジョンに付与されたブックマークの一覧。\n"
32891 " アクティブブックマークが存在する場合は 'active' キーワードも利用可能。"
32892
32893 msgid ":children: List of strings. The children of the changeset."
32894 msgstr ":children: 文字列列挙。 リビジョンの子供。"
32895
32896 msgid ""
32897 ":currentbookmark: String. The active bookmark, if it is\n"
32898 " associated with the changeset (DEPRECATED)"
32899 msgstr ""
32900 ":currentbookmark: 文字列. アクティブなブックマーク (対象リビジョンに対し、\n"
32901 " 関連付けられている場合のみ) (非推奨)"
32902
32903 msgid ""
32904 ":activebookmark: String. The active bookmark, if it is\n"
32905 " associated with the changeset"
32906 msgstr ""
32907 ":activebookmark: 文字列. アクティブなブックマーク (対象リビジョンに対し、\n"
32908 " 関連付けられている場合のみ)"
32909
32910 msgid ":date: Date information. The date when the changeset was committed."
32911 msgstr ":date: 日時情報。 リビジョンが記録された日時。"
32912
32913 msgid ":desc: String. The text of the changeset description."
32914 msgstr ":desc: 文字列。 リビジョンのコミットログ。"
32915
32916 msgid ""
32917 ":diffstat: String. Statistics of changes with the following format:\n"
32918 " \"modified files: +added/-removed lines\""
32919 msgstr ""
32920 ":diffstat: 文字列。 以下の形式での変更概要。\n"
32921 " \"変更対象ファイル: +追加行数/-削除行数\""
32922
32923 msgid ":envvars: A dictionary of environment variables. (EXPERIMENTAL)"
32924 msgstr ":envvars: 環境変数の辞書。 (実験的実装)"
32925
32926 msgid ""
32927 ":extras: List of dicts with key, value entries of the 'extras'\n"
32928 " field of this changeset."
32929 msgstr ""
32930 ":extras: 辞書の列挙。当該リビジョンの 'extras' 情報一覧。\n"
32931 " (※ 訳注: 各辞書は ``key`` および ``value`` というキーを持ちます)"
32932
32933 msgid ":file_adds: List of strings. Files added by this changeset."
32934 msgstr ":file_adds: 文字列列挙。 当該リビジョンでの追加ファイル一覧。"
32935
32936 msgid ""
32937 ":file_copies: List of strings. Files copied in this changeset with\n"
32938 " their sources."
32939 msgstr ":file_copies: 文字列列挙。 当該リビジョンでの複製元ファイル一覧。"
32940
32941 msgid ""
32942 ":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n"
32943 " only if the --copied switch is set."
32944 msgstr ""
32945 ":file_copies_switch: 文字列列挙。 \"file_copies\" と同義だが、\n"
32946 " --copied 指定のある時のみ表示。"
32947
32948 msgid ":file_dels: List of strings. Files removed by this changeset."
32949 msgstr ":file_dels: 文字列列挙。 当該リビジョンでの登録除外ファイル一覧。"
32950
32951 msgid ":file_mods: List of strings. Files modified by this changeset."
32952 msgstr ":file_mods: 文字列列挙。 当該リビジョンでの変更ファイル一覧。"
32953
32954 msgid ""
32955 ":files: List of strings. All files modified, added, or removed by this\n"
32956 " changeset."
32957 msgstr ""
32958 ":files: 文字列列挙。 当該リビジョンでの、 変更/追加登録または\n"
32959 " 登録除外ファイルの一覧。"
32960
32961 msgid ""
32962 ":graphnode: String. The character representing the changeset node in\n"
32963 " an ASCII revision graph"
32964 msgstr ""
32965 ":graphnode: 文字列。 ASCII 文字での履歴グラフ表示の際に、\n"
32966 " リビジョン表示で使用する文字。"
32967
32968 msgid ":index: Integer. The current iteration of the loop. (0 indexed)"
32969 msgstr ":index: 整数。 繰り返しにおける現時点での添え字値。 (開始値は 0)"
32970
32971 msgid "can't use index in this context"
32972 msgstr "ここでは添え字値を使用できません"
32973
32974 msgid ""
32975 ":latesttag: List of strings. The global tags on the most recent globally\n"
32976 " tagged ancestor of this changeset. If no such tags exist, the list\n"
32977 " consists of the single string \"null\"."
32978 msgstr ""
32979 ":latesttag: 文字列列挙。 当該リビジョンの祖先に対して、\n"
32980 " 最も最近に付与されたグローバルタグの一覧。 当該タグが存在しない場合、\n"
32981 " 単一要素 \"null\" を持つ配列。"
32982
32983 msgid ":latesttagdistance: Integer. Longest path to the latest tag."
32984 msgstr ":latesttagdistance: 整数。 最新タグへの最長パス"
32985
32986 msgid ":changessincelatesttag: Integer. All ancestors not in the latest tag."
32987 msgstr ""
32988 ":changessincelatesttag: 数値。 最新タグ以降の全祖先リビジョン数。\n"
32989 " (※ 訳注: 履歴中に分岐がない場合は latesttagdistance と等価です)"
32990
32991 msgid ""
32992 ":namespaces: Dict of lists. Names attached to this changeset per\n"
32993 " namespace."
32994 msgstr ""
32995 ":namespaces: 列挙の辞書。 リビジョンに関連付けられている名前を、\n"
32996 " 名前空間毎に列挙したもの。"
32997
32998 msgid ""
32999 ":node: String. The changeset identification hash, as a 40 hexadecimal\n"
33000 " digit string."
33001 msgstr ":node: 文字列。 リビジョン識別用の 40 桁 16 進数ハッシュ値。"
33002
33003 msgid ":obsolete: String. Whether the changeset is obsolete."
33004 msgstr ""
33005 ":obsolete: 文字列。 当該リビジョンが廃止済みか否か。\n"
33006 " (※ 訳注: \"obsolete\" か空文字列が返却されます)"
33007
33008 msgid ""
33009 ":p1rev: Integer. The repository-local revision number of the changeset's\n"
33010 " first parent, or -1 if the changeset has no parents."
33011 msgstr ""
33012 ":p1rev: 整数。 第1親リビジョンの、 当該リポジトリにおけるリビジョン番号。\n"
33013 " 親を持たないリビジョンの場合は -1。"
33014
33015 msgid ""
33016 ":p2rev: Integer. The repository-local revision number of the changeset's\n"
33017 " second parent, or -1 if the changeset has no second parent."
33018 msgstr ""
33019 ":p2rev: 整数。 第2親リビジョンの、 当該リポジトリにおけるリビジョン番号。\n"
33020 " 第2親を持たないリビジョンの場合は -1。"
33021
33022 msgid ""
33023 ":p1node: String. The identification hash of the changeset's first parent,\n"
33024 " as a 40 digit hexadecimal string. If the changeset has no parents, all\n"
33025 " digits are 0."
33026 msgstr ""
33027 ":p1node: 文字列。 第1親リビジョンの 40 桁ハッシュ値の文字列。\n"
33028 " 親を持たないリビジョンの場合は、 全桁が 0 のハッシュ値文字列。"
33029
33030 msgid ""
33031 ":p2node: String. The identification hash of the changeset's second\n"
33032 " parent, as a 40 digit hexadecimal string. If the changeset has no "
33033 "second\n"
33034 " parent, all digits are 0."
33035 msgstr ""
33036 ":p2node: 文字列。 第1親リビジョンの 40 桁ハッシュ値の文字列。\n"
33037 " 第2親を持たないリビジョンの場合は、 全桁が 0 のハッシュ値文字列。"
33038
33039 msgid ""
33040 ":parents: List of strings. The parents of the changeset in \"rev:node\"\n"
33041 " format. If the changeset has only one \"natural\" parent (the "
33042 "predecessor\n"
33043 " revision) nothing is shown."
33044 msgstr ""
33045 ":parents: 文字列列挙。 当該リビジョンの親リビジョンの \"rev:node\" 形式。\n"
33046 " 親が単一で、 且つリビジョン番号が1つ前の場合は、 何も表示されません。"
33047
33048 msgid ":phase: String. The changeset phase name."
33049 msgstr ":phase: 文字列。 当該リビジョンのフェーズ名。"
33050
33051 msgid ":phaseidx: Integer. The changeset phase index."
33052 msgstr ":phaseidx: 数値。 当該リビジョンのフェーズ値。"
33053
33054 msgid ":rev: Integer. The repository-local changeset revision number."
33055 msgstr ":rev: 整数。 各リポジトリ固有のリビジョン番号。"
33056
33057 msgid ":subrepos: List of strings. Updated subrepositories in the changeset."
33058 msgstr ":subrepos: 文字列挙。 当該リビジョンで更新されたサブリポジトリ名。"
33059
33060 msgid ":tags: List of strings. Any tags associated with the changeset."
33061 msgstr ":tags: 文字列列挙。 当該リビジョンに付与されたタグの一覧。"
33062
33063 msgid ":termwidth: Integer. The width of the current terminal."
33064 msgstr ":termwidth: 整数。 端末の表示カラム数。"
33065
33066 msgid ":troubles: List of strings. Evolution troubles affecting the changeset."
33067 msgstr ""
33068 ":troubles: 文字列列挙。 当該リビジョンに関連する evolution の trouble 情報。"
33069
33070 msgid " (EXPERIMENTAL)"
33071 msgstr " (実験的実装)"
33072
33073 msgid "unterminated template expansion"
33074 msgstr "テンプレート定義が終端していません"
33075
33076 #, python-format
33077 msgid "unknown method '%s'"
33078 msgstr "未知の処理 '%s' が指定されました"
33079
33080 #, python-format
33081 msgid "expected a symbol, got '%s'"
33082 msgstr "シンボル (symbol) 指定が必要です (実際の指定は '%s')"
33083
33084 msgid "expected template specifier"
33085 msgstr "テンプレート指定が必要です"
33086
33087 #, python-format
33088 msgid "recursive reference '%s' in template"
33089 msgstr "テンプレートでの '%s' における再帰参照"
33090
33091 #, python-format
33092 msgid "unknown function '%s'"
33093 msgstr "未知の関数 '%s' が指定されました"
33094
33095 #, python-format
33096 msgid "template filter '%s' is not compatible with keyword '%s'"
33097 msgstr "フィルタ指定 '%s' はキーワード '%s' と互換性がありません"
33098
33099 #, python-format
33100 msgid "incompatible use of template filter '%s'"
33101 msgstr "フィルタ指定 '%s' は互換性がありません"
33102
33103 #, python-format
33104 msgid "keyword '%s' is not iterable"
33105 msgstr "キーワード '%s' にはリスト処理を適用できません"
33106
33107 #, python-format
33108 msgid "%r is not iterable"
33109 msgstr "%r にはリスト処理を適用できません"
33110
33111 msgid "negation needs an integer argument"
33112 msgstr "負値指定は整数値に対してのみ有効です"
33113
33114 msgid "arithmetic only defined on integers"
33115 msgstr "算術演算は整数値に対してのみ有効です"
33116
33117 msgid "division by zero is not defined"
33118 msgstr "0 での除算は未サポートです"
33119
33120 #, python-format
33121 msgid "filter %s expects one argument"
33122 msgstr "フィルタ %s の引数は1個です"
33123
33124 msgid ""
37764 msgid ""
33125 ":date(date[, fmt]): Format a date. See :hg:`help dates` for formatting\n"
37765 ":date(date[, fmt]): Format a date. See :hg:`help dates` for formatting\n"
33126 " strings. The default is a Unix date format, including the timezone:\n"
37766 " 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'
33166 msgstr "diff の引数は 0 〜 2 個です"
37806 msgstr "diff の引数は 0 〜 2 個です"
33167
37807
33168 msgid ""
37808 msgid ""
37809 ":extdata(source): Show a text read from the specified extdata source. "
37810 "(EXPERIMENTAL)"
37811 msgstr ""
37812
37813 #. i18n: "extdata" is a keyword
37814 #, fuzzy
37815 msgid "extdata expects one argument"
37816 msgstr "relpath の引数は1個です"
37817
37818 msgid ""
33169 ":files(pattern): All files of the current changeset matching the pattern. "
37819 ":files(pattern): All files of the current changeset matching the pattern. "
33170 "See\n"
37820 "See\n"
33171 " :hg:`help patterns`."
37821 " :hg:`help patterns`."
@@ -33202,6 +37852,15 b' msgid "formatnode expects one argument"'
33202 msgstr "formatnode の引数は1個です"
37852 msgstr "formatnode の引数は1個です"
33203
37853
33204 msgid ""
37854 msgid ""
37855 ":mailmap(author): Return the author, updated according to the value\n"
37856 " set in the .mailmap file"
37857 msgstr ""
37858
37859 #, fuzzy
37860 msgid "mailmap expects one argument"
37861 msgstr "files の引数は1個です"
37862
37863 msgid ""
33205 ":pad(text, width[, fillchar=' '[, left=False]]): Pad text with a\n"
37864 ":pad(text, width[, fillchar=' '[, left=False]]): Pad text with a\n"
33206 " fill character."
37865 " fill character."
33207 msgstr ""
37866 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"'
33337 msgid "localdate expects a timezone"
37996 msgid "localdate expects a timezone"
33338 msgstr "localdate の入力にはタイムゾーンを与えてください"
37997 msgstr "localdate の入力にはタイムゾーンを与えてください"
33339
37998
37999 msgid ":max(iterable): Return the max of an iterable"
38000 msgstr ""
38001
38002 #. i18n: "max" is a keyword
38003 #, fuzzy
38004 msgid "max expects one argument"
38005 msgstr "relpath の引数は1個です"
38006
38007 #. i18n: "max" is a keyword
38008 #, fuzzy
38009 msgid "max first argument should be an iterable"
38010 msgstr "extra の第1引数には文字列を指定してください"
38011
38012 msgid ":min(iterable): Return the min of an iterable"
38013 msgstr ""
38014
38015 #. i18n: "min" is a keyword
38016 #, fuzzy
38017 msgid "min expects one argument"
38018 msgstr "files の引数は1個です"
38019
38020 #. i18n: "min" is a keyword
38021 #, fuzzy
38022 msgid "min first argument should be an iterable"
38023 msgstr "extra の第1引数には文字列を指定してください"
38024
33340 msgid ":mod(a, b): Calculate a mod b such that a / b + a mod b == a"
38025 msgid ":mod(a, b): Calculate a mod b such that a / b + a mod b == a"
33341 msgstr ":mod(a, b): a を b で除算した余り値 (a / b + a mod b == a)。"
38026 msgstr ":mod(a, b): a を b で除算した余り値 (a / b + a mod b == a)。"
33342
38027
@@ -33345,6 +38030,62 b' msgid "mod expects two arguments"'
33345 msgstr "mod の引数は2個です"
38030 msgstr "mod の引数は2個です"
33346
38031
33347 msgid ""
38032 msgid ""
38033 ":obsfateoperations(markers): Compute obsfate related information based on "
38034 "markers (EXPERIMENTAL)"
38035 msgstr ""
38036
38037 #. i18n: "obsfateoperations" is a keyword
38038 #, fuzzy
38039 msgid "obsfateoperations expects one argument"
38040 msgstr "formatnode の引数は1個です"
38041
38042 #. i18n: "obsfateoperations" is a keyword
38043 msgid "obsfateoperations first argument should be an iterable"
38044 msgstr ""
38045
38046 msgid ""
38047 ":obsfatedate(markers): Compute obsfate related information based on markers "
38048 "(EXPERIMENTAL)"
38049 msgstr ""
38050
38051 #. i18n: "obsfatedate" is a keyword
38052 #, fuzzy
38053 msgid "obsfatedate expects one argument"
38054 msgstr "formatnode の引数は1個です"
38055
38056 #. i18n: "obsfatedate" is a keyword
38057 msgid "obsfatedate first argument should be an iterable"
38058 msgstr ""
38059
38060 msgid ""
38061 ":obsfateusers(markers): Compute obsfate related information based on markers "
38062 "(EXPERIMENTAL)"
38063 msgstr ""
38064
38065 #. i18n: "obsfateusers" is a keyword
38066 #, fuzzy
38067 msgid "obsfateusers expects one argument"
38068 msgstr "フィルタ %s の引数は1個です"
38069
38070 #. i18n: "obsfateusers" is a keyword
38071 msgid "obsfateusers first argument should be an iterable of obsmakers"
38072 msgstr ""
38073
38074 msgid ""
38075 ":obsfateverb(successors, markers): Compute obsfate related information based "
38076 "on successors (EXPERIMENTAL)"
38077 msgstr ""
38078
38079 #. i18n: "obsfateverb" is a keyword
38080 #, fuzzy
38081 msgid "obsfateverb expects two arguments"
38082 msgstr "label の引数は2個です"
38083
38084 #. i18n: "obsfateverb" is a keyword
38085 msgid "obsfateverb first argument should be countable"
38086 msgstr ""
38087
38088 msgid ""
33348 ":relpath(path): Convert a repository-absolute path into a filesystem path "
38089 ":relpath(path): Convert a repository-absolute path into a filesystem path "
33349 "relative to\n"
38090 "relative to\n"
33350 " the current working directory."
38091 " 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)"'
33451 msgid "word expects an integer index"
38192 msgid "word expects an integer index"
33452 msgstr "word にはインデックス値を数値で指定してください"
38193 msgstr "word にはインデックス値を数値で指定してください"
33453
38194
38195 #. i18n: column positioning for "hg log"
38196 #, python-format
38197 msgid ""
38198 "bookmark: %s\n"
38199 "branch: %s\n"
38200 "changeset: %s\n"
38201 "copies: %s\n"
38202 "date: %s\n"
38203 "extra: %s=%s\n"
38204 "files+: %s\n"
38205 "files-: %s\n"
38206 "files: %s\n"
38207 "instability: %s\n"
38208 "manifest: %s\n"
38209 "obsolete: %s\n"
38210 "parent: %s\n"
38211 "phase: %s\n"
38212 "summary: %s\n"
38213 "tag: %s\n"
38214 "user: %s\n"
38215 msgstr ""
38216 "ブックマーク: %s\n"
38217 "ブランチ: %s\n"
38218 "リビジョン: %s\n"
38219 "コピー: %s\n"
38220 "日付: %s\n"
38221 "その他: %s=%s\n"
38222 "ファイル追加: %s\n"
38223 "ファイル削除: %s\n"
38224 "ファイル: %s\n"
38225 "不定性: %s\n"
38226 "manifest参照: %s\n"
38227 "廃止: %s\n"
38228 "親リビジョン: %s\n"
38229 "フェーズ: %s\n"
38230 "要約: %s\n"
38231 "タグ: %s\n"
38232 "ユーザ: %s\n"
38233
38234 msgid ":author: String. The unmodified author of the changeset."
38235 msgstr ":author: 文字列。 リビジョンの作者名(記録情報そのまま)。"
38236
38237 msgid ":bisect: String. The changeset bisection status."
38238 msgstr ":bisect: 文字列。 当該リビジョンの二分探索状態。"
38239
38240 msgid ""
38241 ":branch: String. The name of the branch on which the changeset was\n"
38242 " committed."
38243 msgstr ":branch: 文字列。 リビジョンの属するブランチ名。"
38244
38245 msgid ""
38246 ":branches: List of strings. The name of the branch on which the\n"
38247 " changeset was committed. Will be empty if the branch name was\n"
38248 " default. (DEPRECATED)"
38249 msgstr ""
38250 ":branches: 文字列列挙。 リビジョンの属するブランチ名。\n"
38251 " ブランチ名が default の場合は空 (非推奨)"
38252
38253 msgid ""
38254 ":bookmarks: List of strings. Any bookmarks associated with the\n"
38255 " changeset. Also sets 'active', the name of the active bookmark."
38256 msgstr ""
38257 ":bookmarks: 文字列列挙。 当該リビジョンに付与されたブックマークの一覧。\n"
38258 " アクティブブックマークが存在する場合は 'active' キーワードも利用可能。"
38259
38260 msgid ":children: List of strings. The children of the changeset."
38261 msgstr ":children: 文字列列挙。 リビジョンの子供。"
38262
38263 msgid ""
38264 ":currentbookmark: String. The active bookmark, if it is associated with the "
38265 "changeset.\n"
38266 " (DEPRECATED)"
38267 msgstr ""
38268 ":currentbookmark: 文字列. アクティブなブックマーク (対象リビジョンに対し、\n"
38269 " 関連付けられている場合のみ) (非推奨)"
38270
38271 msgid ""
38272 ":activebookmark: String. The active bookmark, if it is associated with the "
38273 "changeset."
38274 msgstr ""
38275 ":activebookmark: 文字列. アクティブなブックマーク (対象リビジョンに対し、\n"
38276 " 関連付けられている場合のみ)"
38277
38278 msgid ":date: Date information. The date when the changeset was committed."
38279 msgstr ":date: 日時情報。 リビジョンが記録された日時。"
38280
38281 msgid ":desc: String. The text of the changeset description."
38282 msgstr ":desc: 文字列。 リビジョンのコミットログ。"
38283
38284 msgid ""
38285 ":diffstat: String. Statistics of changes with the following format:\n"
38286 " \"modified files: +added/-removed lines\""
38287 msgstr ""
38288 ":diffstat: 文字列。 以下の形式での変更概要。\n"
38289 " \"変更対象ファイル: +追加行数/-削除行数\""
38290
38291 msgid ":envvars: A dictionary of environment variables. (EXPERIMENTAL)"
38292 msgstr ":envvars: 環境変数の辞書。 (実験的実装)"
38293
38294 msgid ""
38295 ":extras: List of dicts with key, value entries of the 'extras'\n"
38296 " field of this changeset."
38297 msgstr ""
38298 ":extras: 辞書の列挙。当該リビジョンの 'extras' 情報一覧。\n"
38299 " (※ 訳注: 各辞書は ``key`` および ``value`` というキーを持ちます)"
38300
38301 msgid ":file_adds: List of strings. Files added by this changeset."
38302 msgstr ":file_adds: 文字列列挙。 当該リビジョンでの追加ファイル一覧。"
38303
38304 msgid ""
38305 ":file_copies: List of strings. Files copied in this changeset with\n"
38306 " their sources."
38307 msgstr ":file_copies: 文字列列挙。 当該リビジョンでの複製元ファイル一覧。"
38308
38309 msgid ""
38310 ":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n"
38311 " only if the --copied switch is set."
38312 msgstr ""
38313 ":file_copies_switch: 文字列列挙。 \"file_copies\" と同義だが、\n"
38314 " --copied 指定のある時のみ表示。"
38315
38316 msgid ":file_dels: List of strings. Files removed by this changeset."
38317 msgstr ":file_dels: 文字列列挙。 当該リビジョンでの登録除外ファイル一覧。"
38318
38319 msgid ":file_mods: List of strings. Files modified by this changeset."
38320 msgstr ":file_mods: 文字列列挙。 当該リビジョンでの変更ファイル一覧。"
38321
38322 msgid ""
38323 ":files: List of strings. All files modified, added, or removed by this\n"
38324 " changeset."
38325 msgstr ""
38326 ":files: 文字列列挙。 当該リビジョンでの、 変更/追加登録または\n"
38327 " 登録除外ファイルの一覧。"
38328
38329 msgid ""
38330 ":graphnode: String. The character representing the changeset node in an "
38331 "ASCII\n"
38332 " revision graph."
38333 msgstr ""
38334 ":graphnode: 文字列。 ASCII 文字での履歴グラフ表示の際に、\n"
38335 " リビジョン表示で使用する文字。"
38336
38337 msgid ""
38338 ":graphwidth: Integer. The width of the graph drawn by 'log --graph' or zero."
38339 msgstr ":graphwidth: 整数。 'log --graph' でのグラフ表示カラム数 (または 0)。"
38340
38341 msgid ":index: Integer. The current iteration of the loop. (0 indexed)"
38342 msgstr ":index: 整数。 繰り返しにおける現時点での添え字値。 (開始値は 0)"
38343
38344 msgid "can't use index in this context"
38345 msgstr "ここでは添え字値を使用できません"
38346
38347 msgid ""
38348 ":latesttag: List of strings. The global tags on the most recent globally\n"
38349 " tagged ancestor of this changeset. If no such tags exist, the list\n"
38350 " consists of the single string \"null\"."
38351 msgstr ""
38352 ":latesttag: 文字列列挙。 当該リビジョンの祖先に対して、\n"
38353 " 最も最近に付与されたグローバルタグの一覧。 当該タグが存在しない場合、\n"
38354 " 単一要素 \"null\" を持つ配列。"
38355
38356 msgid ":latesttagdistance: Integer. Longest path to the latest tag."
38357 msgstr ":latesttagdistance: 整数。 最新タグへの最長パス"
38358
38359 msgid ":changessincelatesttag: Integer. All ancestors not in the latest tag."
38360 msgstr ""
38361 ":changessincelatesttag: 数値。 最新タグ以降の全祖先リビジョン数。\n"
38362 " (※ 訳注: 履歴中に分岐がない場合は latesttagdistance と等価です)"
38363
38364 msgid ""
38365 ":namespaces: Dict of lists. Names attached to this changeset per\n"
38366 " namespace."
38367 msgstr ""
38368 ":namespaces: 列挙の辞書。 リビジョンに関連付けられている名前を、\n"
38369 " 名前空間毎に列挙したもの。"
38370
38371 msgid ""
38372 ":node: String. The changeset identification hash, as a 40 hexadecimal\n"
38373 " digit string."
38374 msgstr ":node: 文字列。 リビジョン識別用の 40 桁 16 進数ハッシュ値。"
38375
38376 msgid ":obsolete: String. Whether the changeset is obsolete. (EXPERIMENTAL)"
38377 msgstr ""
38378 ":obsolete: 文字列。 当該リビジョンの廃止状況。\n"
38379 " (※ 訳注: \"obsolete\" か空文字列が返却されます) (実験的実装)"
38380
38381 #, fuzzy
38382 msgid ""
38383 ":peerurls: A dictionary of repository locations defined in the [paths] "
38384 "section\n"
38385 " of your configuration file."
38386 msgstr ""
38387 "Mercurial 設定ファイルの ``templatealias`` セクションにおいて、\n"
38388 "キーワードや関数を、 独自に定義可能です::"
38389
38390 msgid ""
38391 ":predecessors: Returns the list if the closest visible successors. "
38392 "(EXPERIMENTAL)"
38393 msgstr ""
38394
38395 msgid ":reporoot: String. The root directory of the current repository."
38396 msgstr ":reporoot: 文字列。 現リポジトリのルートディレクトリ位置。"
38397
38398 msgid ""
38399 ":successorssets: Returns a string of sets of successors for a changectx. "
38400 "Format used\n"
38401 " is: [ctx1, ctx2], [ctx3] if ctx has been splitted into ctx1 and ctx2\n"
38402 " while also diverged into ctx3. (EXPERIMENTAL)"
38403 msgstr ""
38404
38405 msgid ""
38406 ":succsandmarkers: Returns a list of dict for each final successor of ctx. "
38407 "The dict\n"
38408 " contains successors node id in \"successors\" keys and the list of\n"
38409 " obs-markers from ctx to the set of successors in \"markers\".\n"
38410 " (EXPERIMENTAL)"
38411 msgstr ""
38412
38413 msgid ""
38414 ":p1rev: Integer. The repository-local revision number of the changeset's\n"
38415 " first parent, or -1 if the changeset has no parents."
38416 msgstr ""
38417 ":p1rev: 整数。 第1親リビジョンの、 当該リポジトリにおけるリビジョン番号。\n"
38418 " 親を持たないリビジョンの場合は -1。"
38419
38420 msgid ""
38421 ":p2rev: Integer. The repository-local revision number of the changeset's\n"
38422 " second parent, or -1 if the changeset has no second parent."
38423 msgstr ""
38424 ":p2rev: 整数。 第2親リビジョンの、 当該リポジトリにおけるリビジョン番号。\n"
38425 " 第2親を持たないリビジョンの場合は -1。"
38426
38427 msgid ""
38428 ":p1node: String. The identification hash of the changeset's first parent,\n"
38429 " as a 40 digit hexadecimal string. If the changeset has no parents, all\n"
38430 " digits are 0."
38431 msgstr ""
38432 ":p1node: 文字列。 第1親リビジョンの 40 桁ハッシュ値の文字列。\n"
38433 " 親を持たないリビジョンの場合は、 全桁が 0 のハッシュ値文字列。"
38434
38435 msgid ""
38436 ":p2node: String. The identification hash of the changeset's second\n"
38437 " parent, as a 40 digit hexadecimal string. If the changeset has no "
38438 "second\n"
38439 " parent, all digits are 0."
38440 msgstr ""
38441 ":p2node: 文字列。 第1親リビジョンの 40 桁ハッシュ値の文字列。\n"
38442 " 第2親を持たないリビジョンの場合は、 全桁が 0 のハッシュ値文字列。"
38443
38444 msgid ""
38445 ":parents: List of strings. The parents of the changeset in \"rev:node\"\n"
38446 " format. If the changeset has only one \"natural\" parent (the "
38447 "predecessor\n"
38448 " revision) nothing is shown."
38449 msgstr ""
38450 ":parents: 文字列列挙。 当該リビジョンの親リビジョンの \"rev:node\" 形式。\n"
38451 " 親が単一で、 且つリビジョン番号が1つ前の場合は、 何も表示されません。"
38452
38453 msgid ":phase: String. The changeset phase name."
38454 msgstr ":phase: 文字列。 当該リビジョンのフェーズ名。"
38455
38456 #, fuzzy
38457 msgid ":phaseidx: Integer. The changeset phase index. (ADVANCED)"
38458 msgstr ":phaseidx: 数値。 当該リビジョンのフェーズ値。"
38459
38460 msgid ":rev: Integer. The repository-local changeset revision number."
38461 msgstr ":rev: 整数。 各リポジトリ固有のリビジョン番号。"
38462
38463 msgid ":subrepos: List of strings. Updated subrepositories in the changeset."
38464 msgstr ":subrepos: 文字列挙。 当該リビジョンで更新されたサブリポジトリ名。"
38465
38466 msgid ":tags: List of strings. Any tags associated with the changeset."
38467 msgstr ":tags: 文字列列挙。 当該リビジョンに付与されたタグの一覧。"
38468
38469 msgid ":termwidth: Integer. The width of the current terminal."
38470 msgstr ":termwidth: 整数。 端末の表示カラム数。"
38471
38472 #, fuzzy
38473 msgid ""
38474 ":instabilities: List of strings. Evolution instabilities affecting the "
38475 "changeset.\n"
38476 " (EXPERIMENTAL)"
38477 msgstr ""
38478 ":troubles: 文字列列挙。 当該リビジョンに関連する evolution の trouble 情報。"
38479
38480 msgid ""
38481 ":verbosity: String. The current output verbosity in 'debug', 'quiet', "
38482 "'verbose',\n"
38483 " or ''."
38484 msgstr ""
38485
38486 msgid ""
38487 ":whyunstable: List of dicts explaining all instabilities of a changeset.\n"
38488 " (EXPERIMENTAL)"
38489 msgstr ""
38490
38491 msgid "unterminated template expansion"
38492 msgstr "テンプレート定義が終端していません"
38493
38494 #, python-format
38495 msgid "unknown method '%s'"
38496 msgstr "未知の処理 '%s' が指定されました"
38497
38498 #, python-format
38499 msgid "expected a symbol, got '%s'"
38500 msgstr "シンボル (symbol) 指定が必要です (実際の指定は '%s')"
38501
38502 msgid "expected template specifier"
38503 msgstr "テンプレート指定が必要です"
38504
38505 #, python-format
38506 msgid "recursive reference '%s' in template"
38507 msgstr "テンプレートでの '%s' における再帰参照"
38508
38509 #, python-format
38510 msgid "unknown function '%s'"
38511 msgstr "未知の関数 '%s' が指定されました"
38512
38513 #, python-format
38514 msgid "filter %s expects one argument"
38515 msgstr "フィルタ %s の引数は1個です"
38516
33454 msgid "template alias"
38517 msgid "template alias"
33455 msgstr "テンプレート別名定義"
38518 msgstr "テンプレート別名定義"
33456
38519
38520 #, fuzzy, python-format
38521 msgid "template resource not available: %s"
38522 msgstr "python mysql のサポートが利用できません: %s"
38523
33457 msgid "no templates found, try `hg debuginstall` for more info"
38524 msgid "no templates found, try `hg debuginstall` for more info"
33458 msgstr "テンプレートが見つかりません。`hg debuginstall` を試してみてください"
38525 msgstr "テンプレートが見つかりません。`hg debuginstall` を試してみてください"
33459
38526
@@ -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"'
33483 msgid "invalid template engine: %s"
38550 msgid "invalid template engine: %s"
33484 msgstr "不正なテンプレートエンジン指定: %s"
38551 msgstr "不正なテンプレートエンジン指定: %s"
33485
38552
38553 msgid "list of strings is not mappable"
38554 msgstr ""
38555
38556 #, fuzzy
38557 msgid "not a date tuple nor a string"
38558 msgstr "date には文字列を指定してください"
38559
38560 #, fuzzy
38561 msgid "not an integer"
38562 msgstr "数値だけの名前は使用できません"
38563
38564 #, python-format
38565 msgid "incompatible use of template filter '%s'"
38566 msgstr "フィルタ指定 '%s' は互換性がありません"
38567
38568 #, python-format
38569 msgid "template filter '%s' is not compatible with keyword '%s'"
38570 msgstr "フィルタ指定 '%s' はキーワード '%s' と互換性がありません"
38571
38572 #, fuzzy, python-format
38573 msgid "keyword '%s' is not iterable of mappings"
38574 msgstr "キーワード '%s' にはリスト処理を適用できません"
38575
38576 #, fuzzy, python-format
38577 msgid "%r is not iterable of mappings"
38578 msgstr "%r にはリスト処理を適用できません"
38579
38580 #, fuzzy, python-format
38581 msgid "keyword '%s' has no member"
38582 msgstr "キーワード '%s' にはリスト処理を適用できません"
38583
38584 #, fuzzy, python-format
38585 msgid "%r has no member"
38586 msgstr "%r にはリスト処理を適用できません"
38587
38588 msgid "negation needs an integer argument"
38589 msgstr "負値指定は整数値に対してのみ有効です"
38590
38591 msgid "arithmetic only defined on integers"
38592 msgstr "算術演算は整数値に対してのみ有効です"
38593
38594 msgid "division by zero is not defined"
38595 msgstr "0 での除算は未サポートです"
38596
33486 msgid "cannot use transaction when it is already committed/aborted"
38597 msgid "cannot use transaction when it is already committed/aborted"
33487 msgstr "既に完了/中断されているためトランザクションを利用できません"
38598 msgstr "既に完了/中断されているためトランザクションを利用できません"
33488
38599
@@ -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"'
33550 msgid "use 'hg config --edit' to set your username"
38661 msgid "use 'hg config --edit' to set your username"
33551 msgstr "'hg config --edit' 実行でユーザ名を設定してください"
38662 msgstr "'hg config --edit' 実行でユーザ名を設定してください"
33552
38663
33553 #, python-format
38664 #, fuzzy, python-format
33554 msgid "username %s contains a newline\n"
38665 msgid "username %r contains a newline\n"
33555 msgstr "ユーザ名 %s が改行を含んでいます\n"
38666 msgstr "ユーザ名 %s が改行を含んでいます\n"
33556
38667
33557 #, python-format
38668 #, python-format
@@ -33636,6 +38747,13 b' msgid ""'
33636 msgstr ""
38747 msgstr ""
33637
38748
33638 msgid ""
38749 msgid ""
38750 "Compresion algorithm used to compress data. Some engine are faster than other"
38751 msgstr ""
38752
38753 msgid "revlog content will be recompressed with the new algorithm."
38754 msgstr ""
38755
38756 msgid ""
33639 "deltas within internal storage will be recalculated to choose an optimal "
38757 "deltas within internal storage will be recalculated to choose an optimal "
33640 "base revision where this was not already done; the size of the repository "
38758 "base revision where this was not already done; the size of the repository "
33641 "may shrink and various operations may become faster; the first time this "
38759 "may shrink and various operations may become faster; the first time this "
@@ -33673,6 +38791,19 b' msgid ""'
33673 "drastically slow down execution time"
38791 "drastically slow down execution time"
33674 msgstr ""
38792 msgstr ""
33675
38793
38794 msgid ""
38795 "every revision will be re-added as if it was new content. It will go through "
38796 "the full storage mechanism giving extensions a chance to process it (eg. "
38797 "lfs). This is similar to \"redeltaall\" but even slower since more logic is "
38798 "involved."
38799 msgstr ""
38800
38801 msgid ""
38802 "each revision will be added as new content to the internal storage; this "
38803 "will likely drastically slow down execution time, but some extensions might "
38804 "need it"
38805 msgstr ""
38806
33676 #, python-format
38807 #, python-format
33677 msgid ""
38808 msgid ""
33678 "migrating %d total revisions (%d in filelogs, %d in manifests, %d in "
38809 "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"'
33897 msgid "%s mismatch: expected %s, got %s"
39028 msgid "%s mismatch: expected %s, got %s"
33898 msgstr "想定外の %s: 想定 %s に対して実際は %s"
39029 msgstr "想定外の %s: 想定 %s に対して実際は %s"
33899
39030
33900 #, python-format
33901 msgid "command '%s' failed: %s"
33902 msgstr "コマンド '%s' が失敗: %s"
33903
33904 msgid "copying"
39031 msgid "copying"
33905 msgstr "コピー中"
39032 msgstr "コピー中"
33906
39033
@@ -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"'
33917 msgid "filename contains '%s', which is reserved on Windows"
39044 msgid "filename contains '%s', which is reserved on Windows"
33918 msgstr "ファイル名に、Windows で予約されている '%s' が含まれます"
39045 msgstr "ファイル名に、Windows で予約されている '%s' が含まれます"
33919
39046
33920 #, python-format
39047 #, fuzzy, python-format
33921 msgid "filename contains %r, which is invalid on Windows"
39048 msgid "filename contains '%s', which is invalid on Windows"
33922 msgstr "ファイル名に、Windows 上で不正な %r が含まれます"
39049 msgstr "ファイル名に、Windows 上で不正な %r が含まれます"
33923
39050
33924 #, python-format
39051 #, python-format
33925 msgid "filename ends with '%s', which is not allowed on Windows"
39052 msgid "filename ends with '%s', which is not allowed on Windows"
33926 msgstr "ファイル名の末尾が、 Windows 上で不正な '%s' です"
39053 msgstr "ファイル名の末尾が、 Windows 上で不正な '%s' です"
33927
39054
33928 msgid "check your clock"
33929 msgstr "システムの時刻設定を確認してください"
33930
33931 #, python-format
33932 msgid "negative timestamp: %d"
33933 msgstr "負のタイムスタンプ: %d"
33934
33935 msgid "now"
33936 msgstr "now"
33937
33938 msgid "today"
33939 msgstr "today"
33940
33941 msgid "yesterday"
33942 msgstr "yesterday"
33943
33944 #, python-format
33945 msgid "invalid date: %r"
33946 msgstr "不正な日付: %r"
33947
33948 #, python-format
33949 msgid "date exceeds 32 bits: %d"
33950 msgstr "日付が32ビットを超えています: %d"
33951
33952 #, python-format
33953 msgid "impossible time zone offset: %d"
33954 msgstr "あり得ないタイムゾーン: %d"
33955
33956 msgid "dates cannot consist entirely of whitespace"
33957 msgstr "空白文字だけで構成された日時指定は不正です"
33958
33959 msgid "invalid day spec, use '<DATE'"
33960 msgstr "不正な日付の指定です。 '<DATE' 形式で記述してください。"
33961
33962 msgid "invalid day spec, use '>DATE'"
33963 msgstr "不正な日付の指定です。 '>DATE' 形式で記述してください。"
33964
33965 #, python-format
33966 msgid "invalid day spec: %s"
33967 msgstr "不正な日付の指定です: %s"
33968
33969 #, python-format
33970 msgid "%s must be nonnegative (see 'hg help dates')"
33971 msgstr "%s には正の値を指定してください ('hg help dates' 参照)"
33972
33973 #, python-format
33974 msgid "invalid regular expression: %s"
33975 msgstr "不正な正規表現: %s"
33976
33977 msgid "line range must be positive"
39055 msgid "line range must be positive"
33978 msgstr "行範囲は昇順で指定してください"
39056 msgstr "行範囲は昇順で指定してください"
33979
39057
@@ -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"'
34027 msgid "file:// URLs can only refer to localhost"
39105 msgid "file:// URLs can only refer to localhost"
34028 msgstr "file:// URL が参照できるのはローカルホストのみです"
39106 msgstr "file:// URL が参照できるのはローカルホストのみです"
34029
39107
39108 #, fuzzy, python-format
39109 msgid "potentially unsafe url: %r"
39110 msgstr "潜在的セキュリティ問題の可能性がある serve --stdio 実行: %r"
39111
34030 #, python-format
39112 #, python-format
34031 msgid "%.0f s"
39113 msgid "%.0f s"
34032 msgstr "%.0f 秒"
39114 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"'
34092
39174
34093 #, python-format
39175 #, python-format
34094 msgid "bundle type %s already registered by %s"
39176 msgid "bundle type %s already registered by %s"
34095 msgstr "bundle 種別 %s は %s として登録済みです"
39177 msgstr "バンドル形式 %s は %s として登録済みです"
34096
39178
34097 #, python-format
39179 #, python-format
34098 msgid "wire protocol compression %s already registered by %s"
39180 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"'
34106 msgid "compression engine %s could not be loaded"
39188 msgid "compression engine %s could not be loaded"
34107 msgstr "圧縮エンジン %s が読み込めません"
39189 msgstr "圧縮エンジン %s が読み込めません"
34108
39190
39191 msgid ""
39192 "``gzip``\n"
39193 " zlib compression using the DEFLATE algorithm."
39194 msgstr ""
39195
39196 msgid ""
39197 " All Mercurial clients should support this format. The compression\n"
39198 " algorithm strikes a reasonable balance between compression ratio\n"
39199 " and size."
39200 msgstr ""
39201
39202 msgid ""
39203 "``bzip2``\n"
39204 " An algorithm that produces smaller bundles than ``gzip``."
39205 msgstr ""
39206
39207 msgid " All Mercurial clients should support this format."
39208 msgstr ""
39209
39210 msgid ""
39211 " This engine will likely produce smaller bundles than ``gzip`` but\n"
39212 " will be significantly slower, both during compression and\n"
39213 " decompression."
39214 msgstr ""
39215
39216 msgid ""
39217 " If available, the ``zstd`` engine can yield similar or better\n"
39218 " compression at much higher speeds."
39219 msgstr ""
39220
39221 msgid ""
39222 "``none``\n"
39223 " No compression is performed."
39224 msgstr ""
39225
39226 msgid " Use this compression engine to explicitly disable compression."
39227 msgstr ""
39228
39229 #, python-format
39230 msgid "stream ended unexpectedly (got %d bytes, expected %d)"
39231 msgstr "想定外のデータ終端 (実データ:%d バイト 期待データ:%d バイト)"
39232
39233 msgid "check your clock"
39234 msgstr "システムの時刻設定を確認してください"
39235
39236 #, python-format
39237 msgid "negative timestamp: %d"
39238 msgstr "負のタイムスタンプ: %d"
39239
39240 msgid "now"
39241 msgstr "now"
39242
39243 msgid "today"
39244 msgstr "today"
39245
39246 msgid "yesterday"
39247 msgstr "yesterday"
39248
39249 #, python-format
39250 msgid "invalid date: %r"
39251 msgstr "不正な日付: %r"
39252
39253 #, python-format
39254 msgid "date exceeds 32 bits: %d"
39255 msgstr "日付が32ビットを超えています: %d"
39256
39257 #, python-format
39258 msgid "impossible time zone offset: %d"
39259 msgstr "あり得ないタイムゾーン: %d"
39260
39261 msgid "dates cannot consist entirely of whitespace"
39262 msgstr "空白文字だけで構成された日時指定は不正です"
39263
39264 msgid "invalid day spec, use '<DATE'"
39265 msgstr "不正な日付の指定です。 '<DATE' 形式で記述してください。"
39266
39267 msgid "invalid day spec, use '>DATE'"
39268 msgstr "不正な日付の指定です。 '>DATE' 形式で記述してください。"
39269
39270 #, python-format
39271 msgid "invalid day spec: %s"
39272 msgstr "不正な日付の指定です: %s"
39273
39274 #, python-format
39275 msgid "%s must be nonnegative (see 'hg help dates')"
39276 msgstr "%s には正の値を指定してください ('hg help dates' 参照)"
39277
39278 #, python-format
39279 msgid "exited with status %d"
39280 msgstr "終了コード %d で終了しました"
39281
39282 #, python-format
39283 msgid "killed by signal %d"
39284 msgstr "シグナル %d で強制終了されました"
39285
39286 #, python-format
39287 msgid "command '%s' failed: %s"
39288 msgstr "コマンド '%s' が失敗: %s"
39289
39290 #, python-format
39291 msgid "invalid regular expression: %s"
39292 msgstr "不正な正規表現: %s"
39293
34109 #, python-format
39294 #, python-format
34110 msgid "empty or missing %s"
39295 msgid "empty or missing %s"
34111 msgstr "%s は、 空か見つかりません"
39296 msgstr "%s は、 空か見つかりません"
@@ -34228,8 +39413,8 b' msgid "cannot decode filename \'%s\'"'
34228 msgstr "ファイル名 '%s' のデコードに失敗"
39413 msgstr "ファイル名 '%s' のデコードに失敗"
34229
39414
34230 #, python-format
39415 #, python-format
34231 msgid "warning: orphan revlog '%s'"
39416 msgid "warning: orphan data file '%s'"
34232 msgstr "警告: revlog '%s' はどこからも参照されていません"
39417 msgstr "警告: 履歴情報 '%s' はどこからも参照されていません"
34233
39418
34234 msgid "crosschecking files in changesets and manifests\n"
39419 msgid "crosschecking files in changesets and manifests\n"
34235 msgstr "リビジョンとマニフェストによるファイルのクロスチェック中\n"
39420 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"'
34313 msgid "can only call close() when context manager active"
39498 msgid "can only call close() when context manager active"
34314 msgstr "(internal error) can only call close() when context manager active"
39499 msgstr "(internal error) can only call close() when context manager active"
34315
39500
34316 msgid "incompatible Mercurial client; bundle2 required"
39501 #, python-format
34317 msgstr "bundle2 未サポートの Mercurial クライアントとは互換性がありません"
39502 msgid "illegal ssh hostname or username starting with - or /: %s"
34318
39503 msgstr ""
34319 msgid "see https://www.mercurial-scm.org/wiki/IncompatibleClient"
39504
34320 msgstr ""
39505 #, python-format
34321 "https://www.mercurial-scm.org/wiki/IncompatibleClient を参照してください"
39506 msgid "received incomplete frame: got %d bytes: %s"
34322
39507 msgstr ""
34323 msgid "look up remote revision"
39508
34324 msgstr "連携先でのリビジョンの検索"
39509 #, fuzzy, python-format
34325
39510 msgid "frame length error: expected %d; got %d"
34326 msgid "push failed (unexpected response):"
39511 msgstr "想定外のサイズです: 想定 %d に対して実際は %d"
34327 msgstr "履歴反映に失敗 (想定外の応答):"
39512
34328
39513 #, python-format
34329 msgid "look up remote changes"
39514 msgid "received frame with even numbered stream ID: %d"
34330 msgstr "連携先での変更の検索"
39515 msgstr ""
39516
39517 msgid ""
39518 "received frame on unknown inactive stream without beginning of stream flag "
39519 "set"
39520 msgstr ""
39521
39522 msgid "command request missing \"name\" field"
39523 msgstr ""
39524
39525 msgid "received command request frame with both new and continuation flags set"
39526 msgstr ""
39527
39528 msgid ""
39529 "received command request frame with neither new nor continuation flags set"
39530 msgstr ""
39531
39532 #, fuzzy, python-format
39533 msgid "expected command request frame; got %d"
39534 msgstr "想定外のコマンド: %s"
39535
39536 #, python-format
39537 msgid "request with ID %d already received"
39538 msgstr ""
39539
39540 #, fuzzy, python-format
39541 msgid "request with ID %d is already active"
39542 msgstr "リビジョン %d は既に MQ 管理下にあります"
39543
39544 msgid "received command request frame without new flag set"
39545 msgstr ""
39546
39547 #, python-format
39548 msgid "received frame for request that is still active: %d"
39549 msgstr ""
39550
39551 #, python-format
39552 msgid "received frame for request that is not receiving: %d"
39553 msgstr ""
39554
39555 msgid "received command request frame when request frames were supposedly done"
39556 msgstr ""
39557
39558 msgid "mismatch between expect data flag and previous frame"
39559 msgstr ""
39560
39561 #, python-format
39562 msgid "received command data frame for request that is not expecting data: %d"
39563 msgstr ""
39564
39565 #, fuzzy, python-format
39566 msgid "received unexpected frame type: %d"
39567 msgstr "想定外のパラメータ: %s"
39568
39569 msgid "command data frame without flags"
39570 msgstr ""
39571
39572 #, fuzzy
39573 msgid "server already errored"
39574 msgstr "unshelve による退避情報復旧が未完了です"
39575
39576 #, python-format
39577 msgid "received frame with odd numbered stream ID: %d"
39578 msgstr ""
39579
39580 msgid "received frame on unknown stream without beginning of stream flag set"
39581 msgstr ""
39582
39583 #, python-format
39584 msgid "received frame for inactive request ID: %d"
39585 msgstr ""
39586
39587 msgid "Experimental API server endpoint not enabled"
39588 msgstr ""
39589
39590 msgid ""
39591 "APIs can be accessed at /api/<name>, where <name> can be one of the "
39592 "following:\n"
39593 msgstr ""
39594
39595 #, fuzzy
39596 msgid "(no available APIs)\n"
39597 msgstr "利用可能なスタイル:\n"
39598
39599 #, python-format
39600 msgid ""
39601 "Unknown API: %s\n"
39602 "Known APIs: %s"
39603 msgstr ""
39604
39605 #, fuzzy, python-format
39606 msgid "API %s not enabled\n"
39607 msgstr "%s は改名されていません\n"
39608
39609 msgid "requested wire protocol command is not available over HTTP"
39610 msgstr ""
39611
39612 #, python-format
39613 msgid "unexpected parameter %r"
39614 msgstr "想定外のパラメータ: %s"
34331
39615
34332 #, python-format
39616 #, python-format
34333 msgid "invalid compression engine defined in %s: %s"
39617 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"'
34341 msgid "usable compression engines: %s"
39625 msgid "usable compression engines: %s"
34342 msgstr "利用可能な圧縮エンジン一覧: %s"
39626 msgstr "利用可能な圧縮エンジン一覧: %s"
34343
39627
39628 msgid "unfulfilled batch command response"
39629 msgstr ""
39630
39631 #, fuzzy
39632 msgid "clone bundles"
39633 msgstr "clone 用バンドルファイル %s を適用中\n"
39634
39635 msgid "look up remote revision"
39636 msgstr "連携先でのリビジョンの検索"
39637
39638 msgid "push failed (unexpected response):"
39639 msgstr "履歴反映に失敗 (想定外の応答):"
39640
39641 msgid "look up remote changes"
39642 msgstr "連携先での変更の検索"
39643
39644 msgid "incompatible Mercurial client; bundle2 required"
39645 msgstr "bundle2 未サポートの Mercurial クライアントとは互換性がありません"
39646
39647 msgid "see https://www.mercurial-scm.org/wiki/IncompatibleClient"
39648 msgstr ""
39649 "https://www.mercurial-scm.org/wiki/IncompatibleClient を参照してください"
39650
39651 msgid "server has pull-based clones disabled"
39652 msgstr ""
39653
39654 #, fuzzy
39655 msgid "remove --pull if specified or upgrade Mercurial"
39656 msgstr "Mercurial の管理対象外ファイルの削除"
39657
39658 #, fuzzy, python-format
39659 msgid "received %r\n"
39660 msgstr "%s を削除"
39661
39662 msgid "HTTP version 2 API handler"
39663 msgstr ""
39664
39665 #, python-format
39666 msgid "do not know how to process %s\n"
39667 msgstr ""
39668
39669 #, fuzzy, python-format
39670 msgid "unknown permission: %s"
39671 msgstr "'%s' は未知のリビジョンです"
39672
39673 msgid "commands require POST requests"
39674 msgstr ""
39675
39676 #, fuzzy, python-format
39677 msgid "unknown wire protocol command: %s\n"
39678 msgstr "未知のコマンド %s"
39679
39680 #, fuzzy, python-format
39681 msgid "invalid wire protocol command: %s"
39682 msgstr "利用可能なプロトコル: %s"
39683
39684 #, python-format
39685 msgid "client MUST specify Accept header with value: %s\n"
39686 msgstr ""
39687
39688 #, fuzzy, python-format
39689 msgid "client MUST send Content-Type header with value: %s\n"
39690 msgstr "'%s' は壊れた Content-Type ヘッダ(%s)を送信しました"
39691
39692 msgid "debugreflect service not available"
39693 msgstr ""
39694
39695 #, fuzzy, python-format
39696 msgid "wire protocol command not available: %s"
39697 msgstr "patch コマンドが失敗: %s"
39698
39699 #, python-format
39700 msgid "insufficient permissions to execute command: %s"
39701 msgstr ""
39702
39703 msgid "multiple commands cannot be issued to this URL"
39704 msgstr ""
39705
39706 msgid "command in frame must match command in URL"
39707 msgstr ""
39708
39709 msgid "unhandled response type from wire proto command"
39710 msgstr ""
39711
34344 msgid "number of cpus must be an integer"
39712 msgid "number of cpus must be an integer"
34345 msgstr "CPU 数には数値を指定してください"
39713 msgstr "CPU 数には数値を指定してください"
39714
39715 msgid "failed to kill worker threads while handling an exception\n"
39716 msgstr ""
39717
39718 #~ msgid "not rebasing ignored %s\n"
39719 #~ msgstr "無視対象のリビジョン '%s' は移動されません\n"
39720
39721 #~ msgid "cannot use revision %d as base, result would have 3 parents"
39722 #~ msgstr "親リビジョンが 3 つになるので、 リビジョン %d をベースにできません"
39723
39724 #, fuzzy
39725 #~ msgid "could not find content for release note %s"
39726 #~ msgstr "サブリポジトリ '%s' で使用する 'git' がありません"
39727
39728 #~ msgid ""
39729 #~ " Output may be to a file, in which case the name of the file is\n"
39730 #~ " given using a format string. The formatting rules as follows:"
39731 #~ msgstr ""
39732 #~ " 出力先指定(置換指定可能)がある場合、 出力はファイルに保存されます。\n"
39733 #~ " 置換指定として以下のものが使用可能です:"
39734
39735 #~ msgid "include the specified changeset"
39736 #~ msgstr "複製対象に含めるリビジョン"
39737
39738 #~ msgid "clone only the specified branch"
39739 #~ msgstr "指定ブランチのみを複製"
39740
39741 #~ msgid ""
39742 #~ " In some cases, you can clone repositories and the working\n"
39743 #~ " directory using full hardlinks with ::"
39744 #~ msgstr ""
39745 #~ " リポジトリの内部管理データと作業領域中のファイル全てに対する、\n"
39746 #~ " ハードリンクによる複製の作成には、 以下の方法が使えるかも知れませ"
39747 #~ "ん::"
39748
39749 #~ msgid " $ cp -al REPO REPOCLONE"
39750 #~ msgstr " $ cp -al REPO REPOCLONE"
39751
39752 #~ msgid ""
39753 #~ " This is the fastest way to clone, but it is not always safe. The\n"
39754 #~ " operation is not atomic (making sure REPO is not modified during\n"
39755 #~ " the operation is up to you) and you have to make sure your\n"
39756 #~ " editor breaks hardlinks (Emacs and most Linux Kernel tools do\n"
39757 #~ " so). Also, this is not compatible with certain extensions that\n"
39758 #~ " place their metadata under the .hg directory, such as mq."
39759 #~ msgstr ""
39760 #~ " この方法は最速の複製方法かもしれませんが、 常に安全とは限りませ"
39761 #~ "ん。\n"
39762 #~ " 操作の単一性は保障されません (複製中のリポジトリの変更防止は、 \n"
39763 #~ " 利用者責務) し、 利用するエディタのファイル変更時の振る舞いが、\n"
39764 #~ " ハードリンクを破棄するものである必要があります (Emacs および多くの\n"
39765 #~ " Linux 系ツールは、 そのように振舞います)。 この制約は、\n"
39766 #~ " MQ エクステンションのように、 .hg ディレクトリ配下に、\n"
39767 #~ " 管理情報を格納するツールとは相容れません。"
39768
39769 #~ msgid "cannot amend while merging"
39770 #~ msgstr "マージ実施中の作業領域では改変できません"
39771
39772 #~ msgid "only one config item permitted"
39773 #~ msgstr "複数の設定項目指定は無効です"
39774
39775 #~ msgid "unstable: %d changesets"
39776 #~ msgstr "unstable リビジョン: %d 個"
39777
39778 #~ msgid "Select hunks to revert"
39779 #~ msgstr "取り消しに用いる差分の選択"
39780
39781 #~ msgid "[-l REV] [-r REV] [-b BRANCH]... [OTHER]"
39782 #~ msgstr "[-l REV] [-r REV] [-b BRANCH]... [OTHER]"
39783
39784 #~ msgid "push includes unstable changeset: %s!"
39785 #~ msgstr "履歴反映対象に非永続 (unstable) リビジョンが含まれます!: %s"
39786
39787 #~ msgid " %s"
39788 #~ msgstr " %s"
39789
39790 #~ msgid ""
39791 #~ "Copying\n"
39792 #~ "\"\"\"\"\"\"\"\n"
39793 #~ "Copyright (C) 2005-2017 Matt Mackall.\n"
39794 #~ "Free use of this software is granted under the terms of the GNU General\n"
39795 #~ "Public License version 2 or any later version."
39796 #~ msgstr ""
39797 #~ "Copying\n"
39798 #~ "\"\"\"\"\"\"\"\n"
39799 #~ "Copyright (C) 2005-2017 Matt Mackall.\n"
39800 #~ "本ソフトウェアは、 バージョン2またはそれ以降の GNU General\n"
39801 #~ "Public License の元での自由な利用が保証されています。"
39802
39803 #~ msgid "operation not supported over http"
39804 #~ msgstr "http リポジトリでは未サポートの機能です"
39805
39806 #~ msgid "revert change %d/%d to '%s'?"
39807 #~ msgstr "この変更 (%d 件目 / %d 件中) を '%s' に記録しますか?"
39808
39809 #~ msgid "revert this change to '%s'?"
39810 #~ msgstr "この変更を '%s' に記録しますか?"
39811
39812 #, fuzzy
39813 #~ msgid ""
39814 #~ "[Ynesfdaq?]$$ &Yes, revert this change$$ &No, skip this change$$ &Edit "
39815 #~ "this change manually$$ &Skip remaining changes to this file$$ Revert "
39816 #~ "remaining changes to this &file$$ &Done, skip remaining changes and files$"
39817 #~ "$ Revert &all changes to all remaining files$$ &Quit, reverting no changes"
39818 #~ "$$ &? (display help)"
39819 #~ msgstr ""
39820 #~ "[Ynesfdaq?]$$ この変更を記録(&yes)$$ この変更を無視(&no)$$ この変更を手動"
39821 #~ "で編集(&edit)$$ 同一ファイルの以後の全ての変更を無視(&skip)$$ 同一ファイル"
39822 #~ "(&file)の以後の全ての変更を記録$$ 以後の全ての変更を無視=記録作業を完了"
39823 #~ "(&done)$$ 以後の全て(&all)の変更を記録$$ 変更の記録自体を中止(&quit)$$ ヘ"
39824 #~ "ルプ表示(&?)"
39825
39826 #~ msgid "bumped takes no arguments"
39827 #~ msgstr "bumped には引数が指定できません"
39828
39829 #~ msgid "%s takes no arguments or a pattern and an optional revset"
39830 #~ msgstr "%s にはパターンと revset しか指定できません"
39831
39832 #~ msgid "%s expected one starting revision"
39833 #~ msgstr "%s には開始リビジョンを指定してください"
39834
39835 #~ msgid "unstable takes no arguments"
39836 #~ msgstr "unstable には引数が指定できません"
39837
39838 #~ msgid ""
39839 #~ " >>> person('foo@bar')\n"
39840 #~ " 'foo'\n"
39841 #~ " >>> person('Foo Bar <foo@bar>')\n"
39842 #~ " 'Foo Bar'\n"
39843 #~ " >>> person('\"Foo Bar\" <foo@bar>')\n"
39844 #~ " 'Foo Bar'\n"
39845 #~ " >>> person('\"Foo \"buz\" Bar\" <foo@bar>')\n"
39846 #~ " 'Foo \"buz\" Bar'\n"
39847 #~ " >>> # The following are invalid, but do exist in real-life\n"
39848 #~ " ...\n"
39849 #~ " >>> person('Foo \"buz\" Bar <foo@bar>')\n"
39850 #~ " 'Foo \"buz\" Bar'\n"
39851 #~ " >>> person('\"Foo Bar <foo@bar>')\n"
39852 #~ " 'Foo Bar'"
39853 #~ msgstr ""
39854 #~ " >>> person('foo@bar')\n"
39855 #~ " 'foo'\n"
39856 #~ " >>> person('Foo Bar <foo@bar>')\n"
39857 #~ " 'Foo Bar'\n"
39858 #~ " >>> person('\"Foo Bar\" <foo@bar>')\n"
39859 #~ " 'Foo Bar'\n"
39860 #~ " >>> person('\"Foo \"buz\" Bar\" <foo@bar>')\n"
39861 #~ " 'Foo \"buz\" Bar'\n"
39862 #~ " >>> # The following are invalid, but do exist in real-life\n"
39863 #~ " ...\n"
39864 #~ " >>> person('Foo \"buz\" Bar <foo@bar>')\n"
39865 #~ " 'Foo \"buz\" Bar'\n"
39866 #~ " >>> person('\"Foo Bar <foo@bar>')\n"
39867 #~ " 'Foo Bar'"
39868
39869 #~ msgid " (EXPERIMENTAL)"
39870 #~ msgstr " (実験的実装)"
39871
39872 #~ msgid "enable Mercurial color mode (DEPRECATED)"
39873 #~ msgstr "Mercurial の出力のカラー化 (非推奨)"
39874
39875 #~ msgid ""
39876 #~ "This extension enables Mercurial color mode. The feature is now directly\n"
39877 #~ "available in Mercurial core. You can access it using::"
39878 #~ msgstr ""
39879 #~ "本エクステンションは Mercurial 出力をカラー化します。 カラー化機能は、\n"
39880 #~ "Mercurial のコア機能に取り込まれたため、 以下の設定のみで利用可能です::"
39881
39882 #~ msgid "histedit: moving bookmarks %s from %s to %s\n"
39883 #~ msgstr "histedit: ブックマーク %s を %s から %s に移動中\n"
39884
39885 #~ msgid "too many shelved changes named '%s'"
39886 #~ msgstr "名前のベースに '%s' を使用する退避情報が多過ぎます"
39887
39888 #~ msgid "received changelog group is empty"
39889 #~ msgstr "受信した変更履歴は空です"
39890
39891 #~ msgid "stripping intermediate changeset %s\n"
39892 #~ msgstr "中途リビジョン %s を除外中\n"
39893
39894 #~ msgid "stripping amended changeset %s\n"
39895 #~ msgstr "改変対象リビジョン %s を除外中\n"
39896
39897 #~ msgid "no ignore patterns found"
39898 #~ msgstr "無視対象ファイルの指定がありません"
39899
39900 #~ msgid " (in addition a boolean can be used in place always/never)"
39901 #~ msgstr " (true/false 等の真偽値は always/never 相当とみなされます)"
39902
39903 #~ msgid "8. The merge of the file fails and must be resolved before commit."
39904 #~ msgstr ""
39905 #~ "8. ファイルのマージは失敗とみなされ、 手動での :hg:`resolve` が必要です。"
39906
39907 #~ msgid ""
39908 #~ " [pager]\n"
39909 #~ " enable = false"
39910 #~ msgstr ""
39911 #~ " [pager]\n"
39912 #~ " enable = false"
39913
39914 #~ msgid ""
39915 #~ "this may be an intermittent failure; if the error persists, consider "
39916 #~ "contacting the network or server operator"
39917 #~ msgstr ""
39918 #~ "ネットワーク経路の切断が主要因です。同様のエラーが継続的に発生する場合は、"
39919 #~ "ネットワークあるいはサーバの管理者に問い合わせてください"
39920
39921 #~ msgid "fileset expression with no context"
39922 #~ msgstr "対象リビジョン指定なしの fileset 記述"
39923
39924 #~ msgid "index %s unknown flags %#04x for format v0"
39925 #~ msgstr "インデックス %s: %#04x は未知のフラグです(フォーマット v0)"
39926
39927 #~ msgid "index %s unknown format %d"
39928 #~ msgstr "インデックス %s: %d は未知のフォーマットです"
39929
39930 #~ msgid ""
39931 #~ "setting ciphers in [hostsecurity] is not supported by this version of "
39932 #~ "Python"
39933 #~ msgstr ""
39934 #~ "このバージョンの Python では [hostsecurity] での暗号形式設定は未サポートで"
39935 #~ "す"
39936
39937 #~ msgid ""
39938 #~ "remove the config option or run Mercurial with a modern Python version "
39939 #~ "(preferred)"
39940 #~ msgstr ""
39941 #~ "設定を破棄するか、新しい Python で Mercurial を実行してください(後者を推"
39942 #~ "奨)"
1 NO CONTENT: modified file
NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff
General Comments 0
You need to be logged in to leave comments. Login now